[Tinyos-commits] CVS: tinyos-1.x/tos/lib/Deluge/TOSBoot/telosb PowerOffM.nc, 1.2, 1.3 hardware.h, 1.1, 1.2

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-1.x/tos/lib/Deluge/TOSBoot/telosb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14730/telosb

Modified Files:
	PowerOffM.nc hardware.h 
Log Message:

Changes requested by Joe Polastre. Reduced code size for msp.



Index: PowerOffM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/Deluge/TOSBoot/telosb/PowerOffM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PowerOffM.nc	24 Aug 2005 02:32:25 -0000	1.2
--- PowerOffM.nc	16 Sep 2005 23:13:47 -0000	1.3
***************
*** 70,75 ****
        wait(0xffff);
  
-     TOSH_MAKE_USERINT_INPUT();
-     
      // if user button is pressed, power down
      if (!TOSH_READ_USERINT_PIN())
--- 70,73 ----

Index: hardware.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/Deluge/TOSBoot/telosb/hardware.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** hardware.h	22 Jul 2005 17:40:11 -0000	1.1
--- hardware.h	16 Sep 2005 23:13:47 -0000	1.2
***************
*** 60,69 ****
  void TOSH_SET_PIN_DIRECTIONS(void)
  {
!   P1SEL = 0;
!   P2SEL = 0;
!   P3SEL = 0;
!   P4SEL = 0;
!   P5SEL = 0;
!   P6SEL = 0;
    
    P1DIR = 0xe0;
--- 60,64 ----
  void TOSH_SET_PIN_DIRECTIONS(void)
  {
!   P3SEL = 0x0E; // set SPI and I2C to mod func
    
    P1DIR = 0xe0;
***************
*** 84,90 ****
    P6DIR = 0xff;
    P6OUT = 0x00;
-   
-   P1IE = 0;
-   P2IE = 0;
  }
  
--- 79,82 ----