Merge TinyOS 2.1.1 into master.

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

diff --git a/tos/chips/cc2420_tkn154/CC2420Tx.nc b/tos/chips/cc2420_tkn154/CC2420Tx.nc
index 53e1fc9fda513b145d5aece88c893717465140bf..d27f89253d24afd448b9fa486fc346ec0c90b723 100644 (file)
--- a/tos/chips/cc2420_tkn154/CC2420Tx.nc
+++ b/tos/chips/cc2420_tkn154/CC2420Tx.nc
@@ -40,8 +40,8 @@ interface CC2420Tx {
   async command error_t loadTXFIFO(ieee154_txframe_t *data);
   async event void loadTXFIFODone(ieee154_txframe_t *data, error_t error );
 
-  async command void send(bool cca);
-  async event void sendDone(ieee154_txframe_t *frame, ieee154_reftime_t *referenceTime, 
+  async command error_t send(bool cca);
+  async event void sendDone(ieee154_txframe_t *frame, ieee154_timestamp_t *referenceTime, 
       bool ackPendingFlag, error_t error);
 
   async command bool cca();