[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/Deluge/TOSBoot/stm25p ExtFlashC.nc, 1.1, 1.2 ExtFlashM.nc, 1.1, 1.2

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/stm25p
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv338/stm25p

Modified Files:
	ExtFlashC.nc ExtFlashM.nc 
Log Message:
- Added mica2 support to TOSBoot for Deluge 2.0.



Index: ExtFlashC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/stm25p/ExtFlashC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExtFlashC.nc	17 Jul 2005 20:53:19 -0000	1.1
--- ExtFlashC.nc	21 Jul 2005 18:54:26 -0000	1.2
***************
*** 1,8 ****
  // $Id$
  
! /*									tab:4
   *
   *
!  * "Copyright (c) 2000-2004 The Regents of the University  of California.  
   * All rights reserved.
   *
--- 1,8 ----
  // $Id$
  
! /*									tab:2
   *
   *
!  * "Copyright (c) 2000-2005 The Regents of the University  of California.  
   * All rights reserved.
   *
***************
*** 32,36 ****
    provides {
      interface StdControl;
!     interface TOSBootExtFlash;
    }
  }
--- 32,36 ----
    provides {
      interface StdControl;
!     interface ExtFlash;
    }
  }
***************
*** 43,47 ****
  
    StdControl = ExtFlashM;
!   TOSBootExtFlash = ExtFlashM;
  
    ExtFlashM.USARTControl -> HPLUSART0M;
--- 43,47 ----
  
    StdControl = ExtFlashM;
!   ExtFlash = ExtFlashM;
  
    ExtFlashM.USARTControl -> HPLUSART0M;

Index: ExtFlashM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/stm25p/ExtFlashM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExtFlashM.nc	17 Jul 2005 20:53:19 -0000	1.1
--- ExtFlashM.nc	21 Jul 2005 18:54:26 -0000	1.2
***************
*** 29,33 ****
    provides {
      interface StdControl;
!     interface TOSBootExtFlash;
    }
    uses {
--- 29,33 ----
    provides {
      interface StdControl;
!     interface ExtFlash;
    }
    uses {
***************
*** 55,59 ****
      
      call USARTControl.tx(0xb9);
!     while(!(call USARTControl.isTxIntrPending()));
  
      TOSH_SET_FLASH_CS_PIN();
--- 55,59 ----
      
      call USARTControl.tx(0xb9);
!     while(!(call USARTControl.isTxEmpty()));
  
      TOSH_SET_FLASH_CS_PIN();
***************
*** 81,85 ****
    }
  
!   command void TOSBootExtFlash.startRead(uint32_t addr) {
  
      uint8_t i;
--- 81,85 ----
    }
  
!   command void ExtFlash.startRead(uint32_t addr) {
  
      uint8_t i;
***************
*** 100,104 ****
    }
  
!   command uint8_t TOSBootExtFlash.readByte() {
      call USARTControl.rx();
      call USARTControl.tx(0);
--- 100,104 ----
    }
  
!   command uint8_t ExtFlash.readByte() {
      call USARTControl.rx();
      call USARTControl.tx(0);
***************
*** 107,111 ****
    }
  
!   command void TOSBootExtFlash.stopRead() {
      TOSH_SET_FLASH_CS_PIN();
    }
--- 107,111 ----
    }
  
!   command void ExtFlash.stopRead() {
      TOSH_SET_FLASH_CS_PIN();
    }