Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / mac / tkn154 / dummies / NoScanP.nc

diff --git a/tos/lib/mac/tkn154/dummies/NoScanP.nc b/tos/lib/mac/tkn154/dummies/NoScanP.nc
index 38a7697a0c56a5beb77849ae96ddd1f56fa04c75..4bfaff48522e36bcf75ab8a39c9b031783f05d21 100644 (file)
--- a/tos/lib/mac/tkn154/dummies/NoScanP.nc
+++ b/tos/lib/mac/tkn154/dummies/NoScanP.nc
@@ -33,6 +33,8 @@
  * ========================================================================
  */
 
+ /** Empty placeholder component for ScanP. */
+
 #include "TKN154_MAC.h"
 
 module NoScanP
@@ -42,6 +44,7 @@ module NoScanP
     interface Init;
     interface MLME_SCAN;
     interface MLME_BEACON_NOTIFY;
+    interface GetNow<token_requested_t> as IsRadioTokenRequested;
   }
   uses
   {
@@ -56,7 +59,7 @@ module NoScanP
     interface Timer<TSymbolIEEE802154> as ScanTimer;
     interface Pool<ieee154_txframe_t> as TxFramePool;
     interface Pool<ieee154_txcontrol_t> as TxControlPool;
-    interface Resource as Token;
+    interface TransferableResource as RadioToken;
     interface FrameUtility;
     interface Leds;
   }
@@ -81,26 +84,26 @@ implementation
     return IEEE154_TRANSACTION_OVERFLOW;
   }
 
-  event void Token.granted()
+  event void RadioToken.granted()
   {
-    call Token.release();
+    ASSERT(0);
   }
 
   event void EnergyDetection.done(error_t status, int8_t EnergyLevel){}
 
-  async event void RadioRx.prepareDone() { }
+  async event void RadioRx.enableRxDone(){}
 
-  event message_t* RadioRx.received(message_t *frame, ieee154_reftime_t *time)
+  event message_t* RadioRx.received(message_t *frame, const ieee154_timestamp_t *timestamp)
   {
     return frame;
   }
 
-  async event void RadioTx.loadDone() { }
-  
-  async event void RadioTx.transmitDone(ieee154_txframe_t *frame, ieee154_reftime_t *t0, 
-      bool ackPendingFlag, error_t error){}
- 
+  async event void RadioTx.transmitDone(ieee154_txframe_t *frame, 
+      const ieee154_timestamp_t *timestamp, error_t result){}
+
   event void ScanTimer.fired() { }
 
   async event void RadioOff.offDone() { }
+  async event void RadioToken.transferredFrom(uint8_t fromClient){ASSERT(0);}
+  async command token_requested_t IsRadioTokenRequested.getNow(){ return FALSE;}
 }