]> oss.titaniummirror.com Git - tinyos-2.x.git/commitdiff
warning fixes
authormaxmul <maxmul>
Fri, 25 Jul 2008 10:18:22 +0000 (10:18 +0000)
committermaxmul <maxmul>
Fri, 25 Jul 2008 10:18:22 +0000 (10:18 +0000)
tos/chips/xe1205/XE1205SendReceiveP.nc
tos/chips/xe1205/phy/XE1205PhyP.nc
tos/chips/xe1205/phy/XE1205PhyRssi.nc

index e8e41e7b57fc5c4df174ab9ed3391c4c252111b7..fcb8c7b7abb81782f0a955a6b542eded4ae02ced 100644 (file)
@@ -431,7 +431,7 @@ implementation {
      return datalen + sizeof(xe1205_header_t) + sizeof(xe1205_footer_t) + sizeof(xe1205_phy_header_t);
  }
 
- task void signalPacketReceived()   __attribute__ ((noinline)) {
+ task void signalPacketReceived() {
      
      atomic { 
         getMetadata((message_t*) rxMsgPtr)->length = rxPhyHdr.length; 
@@ -464,8 +464,7 @@ implementation {
         (((getHeader((message_t*)rxMsgPtr))->ack)& 0x01)==1) {
         post sendAck();
      } else {
-        atomic rxBufPtr = NULL;
-        rxMsgPtr =  signal Receive.receive(rxMsgPtr, rxMsgPtr->data, getMetadata(rxMsgPtr)->length);
+        post signalPacketReceived();
      }
 
  }
index 3a8f79f49b70eef3d9fb8d48865863ea4fc815a0..f588b84828d6f954abdec84568734b95e64cd64b 100644 (file)
@@ -246,7 +246,7 @@ implementation {
      }
  }
 
- command uint8_t  XE1205PhyRssi.readRxRssi() {
async command uint8_t  XE1205PhyRssi.readRxRssi() {
      return rssiTab[(rssiH<<2) |rssiL];
  }
 
index 6e0fc60abdc6935273aa611ab34d6364325e3ec3..a7158b694a6cf9e5ed7ada2af72d1d8a51e5d205 100644 (file)
@@ -1,6 +1,6 @@
 interface XE1205PhyRssi {
 
     async command error_t getRssi();
-    command uint8_t readRxRssi();
+    async command uint8_t readRxRssi();
     async event void rssiDone(uint8_t _rssi);
 }