X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Flib%2Fmac%2Ftkn154%2Fdummies%2FNoCoordCfpP.nc;h=45497e6aac02a1c48cf8b96e788d9a280fa4888b;hb=280de4fedba9a7080138600e623cdadf22bf728a;hp=5ea629328d749c123c722e43d0aa99b5c8de30bb;hpb=cfc8b8448d14883d4d47e0852797366ef0c13a75;p=tinyos-2.x.git

diff --git a/tos/lib/mac/tkn154/dummies/NoCoordCfpP.nc b/tos/lib/mac/tkn154/dummies/NoCoordCfpP.nc
index 5ea62932..45497e6a 100644
--- a/tos/lib/mac/tkn154/dummies/NoCoordCfpP.nc
+++ b/tos/lib/mac/tkn154/dummies/NoCoordCfpP.nc
@@ -32,7 +32,7 @@
  * @author Jan Hauer <hauer@tkn.tu-berlin.de>
  * ========================================================================
  */
-
+ 
 /**
  * The contention free period (CFP) in beacon mode, a.k.a. GTS, is not yet
  * implemented - this is only an empty placeholder. In contrast to the CAP
@@ -55,15 +55,9 @@ module NoCoordCfpP
     interface ResourceTransferred as TokenTransferred;
     interface ResourceTransfer as TokenToBeaconTransmit;
     interface ResourceRequested as TokenRequested;
-    interface GetNow<bool> as IsTokenRequested;
-    interface GetNow<bool> as IsTrackingBeacons; 
-    interface GetNow<uint32_t> as CfpEnd; 
-    interface GetNow<ieee154_reftime_t*> as CapStartRefTime; 
-    interface GetNow<uint8_t*> as GtsField; 
-    interface GetNow<uint32_t> as SfSlotDuration; 
-    interface GetNow<uint8_t> as FinalCapSlot; 
     interface Alarm<TSymbolIEEE802154,uint32_t> as CfpSlotAlarm;
     interface Alarm<TSymbolIEEE802154,uint32_t> as CfpEndAlarm;
+    interface SuperframeStructure as OutgoingSF; 
     interface RadioTx;
     interface RadioRx;
     interface RadioOff;
@@ -96,8 +90,6 @@ implementation
     // the CFP has started, this component now owns the token -  
     // because GTS is not implemented we pass it back to the
     // BeaconTransmitP component
-    // Note: this component must not use the Resource
-    // interface to release the token!
     call TokenToBeaconTransmit.transfer();
   }
 
@@ -123,11 +115,10 @@ implementation
     return 1;
   }  
 
-  async event void RadioTx.loadDone(){}
-  async event void RadioTx.transmitDone(ieee154_txframe_t *frame, ieee154_reftime_t *txTime){}
+  async event void RadioTx.transmitDone(ieee154_txframe_t *frame, const ieee154_timestamp_t *timestamp, error_t result){}
 
-  async event void RadioRx.prepareDone(){} 
-  event message_t* RadioRx.received(message_t *frame, ieee154_reftime_t *timestamp){return frame;}
+  async event void RadioRx.enableRxDone(){} 
+  event message_t* RadioRx.received(message_t *frame, const ieee154_timestamp_t *timestamp){return frame;}
 
   async event void TokenRequested.requested()
   {
@@ -137,8 +128,4 @@ implementation
   }
 
   async event void TokenRequested.immediateRequested(){ }
-  async event void RadioTx.transmitUnslottedCsmaCaDone(ieee154_txframe_t *frame,
-      bool ackPendingFlag, ieee154_csma_t *csmaParams, error_t result){}
-  async event void RadioTx.transmitSlottedCsmaCaDone(ieee154_txframe_t *frame, ieee154_reftime_t *txTime, 
-      bool ackPendingFlag, uint16_t remainingBackoff, ieee154_csma_t *csmaParams, error_t result){} 
 }