[Tinyos-2-commits] [tinyos-main] r5913 committed - removed atomic block from i2cbasicaddr.write, as the new (4.5.x...

tinyos-main at googlecode.com tinyos-main at googlecode.com
Fri Feb 24 05:35:37 PST 2012


Revision: 5913
Author:   ayer at handhelds.org
Date:     Fri Feb 24 05:35:10 2012
Log:      removed atomic block from i2cbasicaddr.write, as the new (4.5.x
forward) toolchain's optimizer breaks the stateI2C variable assignment
during the setting of atomic context).

http://code.google.com/p/tinyos-main/source/detail?r=5913

Modified:
  /trunk/tos/platforms/shimmer/chips/msp430/Msp430I2CP.nc

=======================================
--- /trunk/tos/platforms/shimmer/chips/msp430/Msp430I2CP.nc	Wed Aug 24  
09:26:36 2011
+++ /trunk/tos/platforms/shimmer/chips/msp430/Msp430I2CP.nc	Fri Feb 24  
05:35:10 2012
@@ -194,13 +194,11 @@

      uint8_t _state;

-    atomic {
-      _state = stateI2C;
-      if (_state == IDLE) {
-	stateI2C = PACKET_WRITE;
-      }
-    }
-
+    _state = stateI2C;
+    if (_state == IDLE) {
+      stateI2C = PACKET_WRITE;
+    }
+
      if (_state == IDLE) {
        // perform register modifications with interrupts disabled
        atomic {


More information about the Tinyos-2-commits mailing list