]> oss.titaniummirror.com Git - tinyos-2.x.git/commitdiff
remove bogus state check
authoridgay <idgay>
Tue, 3 Jun 2008 20:32:09 +0000 (20:32 +0000)
committeridgay <idgay>
Tue, 3 Jun 2008 20:32:09 +0000 (20:32 +0000)
tos/chips/cc1000/CC1000SendReceiveP.nc

index 62ca40b0f2de6da1a943fb7d9f76427080646700..a9485a89de34bd86fec18e0b1ad3c742d306e58a 100644 (file)
@@ -568,22 +568,16 @@ implementation
   }
 
   void packetReceiveDone() {
-    message_t* pBuf;
     uint16_t snr;
-    atomic {
-      if (radioState != RECEIVED_STATE) {
-       return;
-      }
-      pBuf = rxBufPtr;
-    }
-    snr = (uint16_t) getMetadata(pBuf)->strength_or_preamble;
+
+    snr = (uint16_t) getMetadata(rxBufPtr)->strength_or_preamble;
     /* Higher signal strengths have lower voltages. So see if we're
        CC1000_WHITE_BIT_THRESH *below* the noise floor. */
     if ((snr + CC1000_WHITE_BIT_THRESH) < ((call CC1000Squelch.get()))) {
-      getMetadata(pBuf)->metadataBits |= CC1000_WHITE_BIT;
+      getMetadata(rxBufPtr)->metadataBits |= CC1000_WHITE_BIT;
     }
     else {
-      getMetadata(pBuf)->metadataBits &= ~CC1000_WHITE_BIT;
+      getMetadata(rxBufPtr)->metadataBits &= ~CC1000_WHITE_BIT;
     }
     
     post signalPacketReceived();