Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / mac / tkn154 / interfaces / MLME / MLME_RESET.nc

diff --git a/tos/lib/mac/tkn154/interfaces/MLME/MLME_RESET.nc b/tos/lib/mac/tkn154/interfaces/MLME/MLME_RESET.nc
index 480a1b90ca24e8f1bf10e527d840826e6dbdf02b..90aab473ca4f955483a48fa82997ade166ca8cd1 100644 (file)
--- a/tos/lib/mac/tkn154/interfaces/MLME/MLME_RESET.nc
+++ b/tos/lib/mac/tkn154/interfaces/MLME/MLME_RESET.nc
@@ -33,16 +33,18 @@
  * ========================================================================
  */
 
+/** 
+ * MLME-SAP reset primitives specify how to reset the MAC sublayer to
+ * its default values. (IEEE 802.15.4-2006, Sect. 7.1.9)
+ */
+
 #include "TKN154.h"
 interface MLME_RESET {
 
   /**
    * Allows the next higher layer to request that the MLME performs a
-   * reset operation. This command initializes the MAC and must be called 
-   * before calling any other MAC primitive. It extends the standard  
-   * interface definition by a parameter <tt>PANType</tt>, which defines 
-   * whether the device/coordinator will operate on a beacon-enabled PAN
-   * or on a nonbeacon-enabled PAN.
+   * reset operation. This command initializes the MAC and must be 
+   * called at least once before the MAC can be used.
    *
    * Two things are important:
    * (1) This command will fail while promiscuous mode is enabled 
@@ -58,8 +60,6 @@ interface MLME_RESET {
    *                      FALSE, the MAC sublayer is reset but all MAC PIB
    *                      attributes retain their values prior to the
    *                      generation of the reset primitive.
-   * @param PANType       Either BEACON_ENABLED_PAN for beacon-enabled PANs
-   *                      or NONBEACON_ENABLED_PAN for nonbeacon-enabled PANs
    *
    * @return       IEEE154_SUCCESS if the request succeeded and a confirm event
    *               will be signalled, an appropriate error code otherwise 
@@ -67,8 +67,7 @@ interface MLME_RESET {
    *                      
    */
   command ieee154_status_t request  (
-                          bool SetDefaultPIB,
-                          uint8_t PANType
+                          bool SetDefaultPIB
                         );
 
   /**