Merge over into the trunk.

[tinyos-2.x.git] / tos / chips / cc1000 / CC1000SendReceiveP.nc

diff --git a/tos/chips/cc1000/CC1000SendReceiveP.nc b/tos/chips/cc1000/CC1000SendReceiveP.nc
index a72f08cba46ca2de96c502ec7c8ec3a78efd2402..e4e4d77d9d95ac26eefc87d5682404fb74615e62 100644 (file)
--- a/tos/chips/cc1000/CC1000SendReceiveP.nc
+++ b/tos/chips/cc1000/CC1000SendReceiveP.nc
@@ -262,7 +262,7 @@ implementation
          txBufPtr = msg;
        }
       }
-    signal ByteRadio.rts();
+    signal ByteRadio.rts(msg);
 
     return SUCCESS;
   }
@@ -476,9 +476,9 @@ implementation
     cc1000_metadata_t *rxMetadata = getMetadata(rxBufPtr);
 
     if (result != SUCCESS)
-      rxMetadata->strength = 0;
+      rxMetadata->strength_or_preamble = 0;
     else
-      rxMetadata->strength = data;
+      rxMetadata->strength_or_preamble = data;
   }
 
   void rxData(uint8_t in) {
@@ -522,7 +522,7 @@ implementation
 
     if (f.ack &&
        rxFooter->crc &&
-       rxHeader->addr == call amAddress())
+       rxHeader->dest == call amAddress())
       {
        enterAckState();
        call CC1000Control.txMode();