[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/Deluge/TOSBoot Makefile, 1.1, 1.2 TOSBootM.nc, 1.2, 1.3 TOSBootSTM25PM.nc, 1.2, 1.3

[Jonathan Hui]

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

Modified Files:
	Makefile TOSBootM.nc TOSBootSTM25PM.nc 
Log Message:
- Updated bootloader to disable SPI before invoking app. Allows the
msp to go into a sleep state.



Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	22 Nov 2004 05:30:57 -0000	1.1
--- Makefile	4 Dec 2004 07:22:48 -0000	1.2
***************
*** 4,9 ****
  PFLAGS += \
  -DDELUGE_LEDS \
! -I%T/lib/Deluge2 \
! -I%T/lib/Deluge2/TOSBoot \
  -DBOOTLOADER_START=0x4000
  
--- 4,9 ----
  PFLAGS += \
  -DDELUGE_LEDS \
! -I%T/../beta/Deluge/Deluge \
! -I%T/../beta/Deluge/Deluge/TOSBoot \
  -DBOOTLOADER_START=0x4000
  

Index: TOSBootM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/TOSBootM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TOSBootM.nc	26 Nov 2004 18:59:11 -0000	1.2
--- TOSBootM.nc	4 Dec 2004 07:22:48 -0000	1.3
***************
*** 137,140 ****
--- 137,141 ----
  
    void runApp() {
+     call SubControl.stop();
      __asm__ __volatile__ ("br #0x5000\n\t" ::);
    }

Index: TOSBootSTM25PM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/TOSBootSTM25PM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TOSBootSTM25PM.nc	26 Nov 2004 18:59:11 -0000	1.2
--- TOSBootSTM25PM.nc	4 Dec 2004 07:22:48 -0000	1.3
***************
*** 49,53 ****
  
    command result_t StdControl.start() { return SUCCESS; }
!   command result_t StdControl.stop() { return SUCCESS; }
  
    void powerOnFlash() {
--- 49,57 ----
  
    command result_t StdControl.start() { return SUCCESS; }
! 
!   command result_t StdControl.stop() { 
!     call USARTControl.disableSPI();
!     return SUCCESS; 
!   }
  
    void powerOnFlash() {