Update of the default CC2420 to the low power listening stack. The "acknowledgement...

[tinyos-2.x.git] / tos / chips / cc2420 / CC2420Transmit.nc

diff --git a/tos/chips/cc2420/CC2420Transmit.nc b/tos/chips/cc2420/CC2420Transmit.nc
index e556f77a09082be572830c57531ec27ad6a7530e..d30a84b644444640bc94f983b0fb9bfdd13ed000 100644 (file)
--- a/tos/chips/cc2420/CC2420Transmit.nc
+++ b/tos/chips/cc2420/CC2420Transmit.nc
@@ -40,34 +40,20 @@
 interface CC2420Transmit {
 
   /**
-   * Send a message with CCA enabled.
+   * Send a message
    *
    * @param p_msg message to send.
+   * @param useCca TRUE if this Tx should use clear channel assessments
    * @return SUCCESS if the request was accepted, FAIL otherwise.
    */
-  async command error_t sendCCA( message_t* p_msg );
+  async command error_t send( message_t* p_msg, bool useCca );
 
   /**
-   * Send a message with CCA disabled.
-   *
-   * @param p_msg message to send.
-   * @return SUCCESS if the request was accepted, FAIL otherwise.
-   */
-  async command error_t send( message_t* p_msg );
-
-  /**
-   * Send the previous message again with CCA enabled.
-   *
-   * @return SUCCESS if the request was accepted, FAIL otherwise.
-   */
-  async command error_t resendCCA();
-
-  /**
-   * Send the previous message again with CCA disabled.
-   *
+   * Send the previous message again
+   * @param useCca TRUE if this re-Tx should use clear channel assessments
    * @return SUCCESS if the request was accepted, FAIL otherwise.
    */
-  async command error_t resend();
+  async command error_t resend(bool useCca);
 
   /**
    * Cancel sending of the message.