[Tinyos-beta-commits] CVS: tinyos-1.x/beta/platform/telosb hardware.h, 1.7, 1.8

[Cory Sharp]

Update of /cvsroot/tinyos/tinyos-1.x/beta/platform/telosb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28343

Modified Files:
	hardware.h 
Log Message:
Since there's a big'ol block of register initialization, it's easier and more
appropriate to put it all in one big atomic block.  For atomic to work inside
the header file, the function was prefixed with #undef atomic.


Index: hardware.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/telosb/hardware.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** hardware.h	7 Nov 2004 09:27:19 -0000	1.7
--- hardware.h	7 Nov 2004 18:57:58 -0000	1.8
***************
*** 138,144 ****
--- 138,148 ----
  
  
+ // need to undef atomic inside header files or nesC ignores the directive
+ #undef atomic
  void TOSH_SET_PIN_DIRECTIONS(void)
  {
    // reset all of the ports to be input and using i/o functionality
+   atomic
+   {
    P1SEL = 0;
    P2SEL = 0;
***************
*** 153,158 ****
    P5DIR = 0;
    P6DIR = 0;
!   { MSP430REG_NORACE2(p,P1IE); p=0; }
!   { MSP430REG_NORACE2(p,P2IE); p=0; }
  
    //LEDS
--- 157,164 ----
    P5DIR = 0;
    P6DIR = 0;
!   P1IE = 0;
!   P2IE = 0;
!   //{ MSP430REG_NORACE2(p,P1IE); p=0; }
!   //{ MSP430REG_NORACE2(p,P2IE); p=0; }
  
    //LEDS
***************
*** 195,198 ****
--- 201,205 ----
    TOSH_CLR_HUM_SDA_PIN();
    TOSH_CLR_HUM_PWR_PIN();
+   }//atomic
  }