Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / chips / cc2420_tkn154 / ReliableWait.nc

diff --git a/tos/chips/cc2420_tkn154/ReliableWait.nc b/tos/chips/cc2420_tkn154/ReliableWait.nc
index 02140b1116fb1181ff4e5dff2cddd9a5b56979e8..9cd3b0dfe6dc64842cecc0098780d3b50493305d 100644 (file)
--- a/tos/chips/cc2420_tkn154/ReliableWait.nc
+++ b/tos/chips/cc2420_tkn154/ReliableWait.nc
@@ -32,18 +32,11 @@
  */
 interface ReliableWait
 {
-
-  async command void busyWait(uint16_t dt);
-
-  /*
-   * The following command/event pairs are platform-specific
-   * busy-waits. 
-   */
-  
-  async command void waitRx(ieee154_reftime_t *t0, uint16_t dt);
+  async command void waitRx(uint32_t t0, uint32_t dt);
   async event void waitRxDone();
-  async command void waitCCA(ieee154_reftime_t *t0, uint16_t dt);
-  async event void waitCCADone();
-  async command void waitTx(ieee154_reftime_t *t0, uint16_t dt);
+  async command void waitTx(ieee154_timestamp_t *t0, uint32_t dt);
   async event void waitTxDone();
+  async command void waitBackoff(uint32_t dt);
+  async event void waitBackoffDone();
+  async command bool ccaOnBackoffBoundary(ieee154_timestamp_t *slot0);
 }