[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/Deluge/TOSBoot TOSBootM.nc, 1.5, 1.6

[Jonathan Hui]

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

Modified Files:
	TOSBootM.nc 
Log Message:
- TOSBoot waits a short period before sampling the user interrupt pin
since it takes a while to stabilize.
- TOSH_uwait replaced with for loops, reducing code size by nearly 100
bytes.



Index: TOSBootM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/TOSBootM.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TOSBootM.nc	17 May 2005 20:48:23 -0000	1.5
--- TOSBootM.nc	18 May 2005 02:55:23 -0000	1.6
***************
*** 27,30 ****
--- 27,31 ----
  
  includes crc;
+ includes hardware;
  
  module TOSBootM {
***************
*** 45,52 ****
    };
  
-   void wait(uint16_t t) {
-     TOSH_uwait(t);
-   }
- 
    void startupLeds() {
  
--- 46,49 ----
***************
*** 57,65 ****
      call Leds.set(0x7);
      for (i = 0; i < 3; i++, output >>= 1 ) {
!       for (j = 1024; j > 0; j -= 4) {
  	call Leds.set(output);
  	wait(j);
  	call Leds.set(output >> 0x1);
! 	wait(1024-j);
        }
      }
--- 54,62 ----
      call Leds.set(0x7);
      for (i = 0; i < 3; i++, output >>= 1 ) {
!       for (j = 1536; j > 0; j -= 4) {
  	call Leds.set(output);
  	wait(j);
  	call Leds.set(output >> 0x1);
! 	wait(1536-j);
        }
      }
***************
*** 75,79 ****
        call Leds.set(output);
        for ( j = 0; j < 4; j++ )
! 	wait(0x7fff);
      }
  
--- 72,76 ----
        call Leds.set(output);
        for ( j = 0; j < 4; j++ )
! 	wait(0xffff);
      }
  
***************
*** 261,265 ****
      BCSCTL1 = RSEL0 + RSEL1 + RSEL2;
      DCOCTL = DCO0 + DCO1 + DCO2;
!     
      call SubControl.init();
      call SubControl.start();
--- 258,265 ----
      BCSCTL1 = RSEL0 + RSEL1 + RSEL2;
      DCOCTL = DCO0 + DCO1 + DCO2;
! 
!     // wait a short period for things to stabilize
!     wait(0xffff);
! 
      call SubControl.init();
      call SubControl.start();