[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/atm128/spi Atm128SpiP.nc, 1.7, 1.8

[John Regehr]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/spi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16648/spi

Modified Files:
	Atm128SpiP.nc 
Log Message:
safe tinyos annotations

Index: Atm128SpiP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/spi/Atm128SpiP.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Atm128SpiP.nc	24 Apr 2008 22:31:25 -0000	1.7
--- Atm128SpiP.nc	3 Jun 2008 03:00:59 -0000	1.8
***************
*** 88,94 ****
  }
  implementation {
-   uint8_t* txBuffer;
-   uint8_t* rxBuffer;
    uint16_t len;
    uint16_t pos;
    
--- 88,94 ----
  }
  implementation {
    uint16_t len;
+   uint8_t* COUNT_NOK(len) txBuffer;
+   uint8_t* COUNT_NOK(len) rxBuffer;
    uint16_t pos;
    
***************
*** 163,170 ****
      uint16_t end;
      uint16_t tmpPos;
!     uint8_t* tx;
!     uint8_t* rx;
      
      atomic {
        tx = txBuffer;
        rx = rxBuffer;
--- 163,172 ----
      uint16_t end;
      uint16_t tmpPos;
!     uint16_t myLen;
!     uint8_t* COUNT_NOK(myLen) tx;
!     uint8_t* COUNT_NOK(myLen) rx;
      
      atomic {
+       myLen = len;
        tx = txBuffer;
        rx = rxBuffer;
***************
*** 204,214 ****
  
    task void zeroTask() {
-      uint8_t* rx;
-      uint8_t* tx;
       uint16_t  myLen;
       atomic {
         rx = rxBuffer;
         tx = txBuffer;
-        myLen = len;
         rxBuffer = NULL;
         txBuffer = NULL;
--- 206,217 ----
  
    task void zeroTask() {
       uint16_t  myLen;
+      uint8_t* COUNT_NOK(myLen) rx;
+      uint8_t* COUNT_NOK(myLen) tx;
+ 
       atomic {
+        myLen = len;
         rx = rxBuffer;
         tx = txBuffer;
         rxBuffer = NULL;
         txBuffer = NULL;
***************
*** 241,247 ****
      uint8_t discard;
      atomic {
        txBuffer = writeBuf;
        rxBuffer = readBuf;
-       len = bufLen;
        pos = 0;
      }
--- 244,250 ----
      uint8_t discard;
      atomic {
+       len = bufLen;
        txBuffer = writeBuf;
        rxBuffer = readBuf;
        pos = 0;
      }
***************
*** 280,292 ****
     }
     else {
-      uint8_t* rx;
-      uint8_t* tx;
-      uint16_t  myLen;
       uint8_t discard;
       
       atomic {
         rx = rxBuffer;
         tx = txBuffer;
-        myLen = len;
         rxBuffer = NULL;
         txBuffer = NULL;
--- 283,295 ----
     }
     else {
       uint8_t discard;
+      uint16_t  myLen;
+      uint8_t* COUNT_NOK(myLen) rx;
+      uint8_t* COUNT_NOK(myLen) tx;
       
       atomic {
+        myLen = len;
         rx = rxBuffer;
         tx = txBuffer;
         rxBuffer = NULL;
         txBuffer = NULL;