- re-designed the radio driver interfaces, restructured/improved the CC2420 radio...

[tinyos-2.x.git] / tos / lib / mac / tkn154 / PromiscuousModeP.nc

diff --git a/tos/lib/mac/tkn154/PromiscuousModeP.nc b/tos/lib/mac/tkn154/PromiscuousModeP.nc
index 8261c7d8b422778ea535cb82d050d3641e683f60..76a7f743cb73f3526176f6df770aeb030be07ef5 100644 (file)
--- a/tos/lib/mac/tkn154/PromiscuousModeP.nc
+++ b/tos/lib/mac/tkn154/PromiscuousModeP.nc
@@ -47,80 +47,66 @@ module PromiscuousModeP
     interface RadioRx as PromiscuousRx;
     interface RadioOff;
     interface Set<bool> as RadioPromiscuousMode;
-    interface Ieee802154Debug as Debug;
   }
 }
 implementation
 {
-  enum promiscuous_state {
-    S_IDLE,
+  norace enum promiscuous_state {
+    S_STOPPING,
+    S_STOPPED,
     S_STARTING,
     S_STARTED,
-    S_STOPPING,
-  } m_promiscuousState;
-
-  task void prepareDoneTask();
-  task void radioOffDoneTask();
+  } m_state;
 
   command error_t Init.init()
   {
-    m_promiscuousState = S_IDLE;
+    m_state = S_STOPPED;
     return SUCCESS;
   }
 
-/* ----------------------- Promiscuous Mode ----------------------- */
+  /* ----------------------- Promiscuous Mode ----------------------- */
 
   command bool PromiscuousModeGet.get()
   {
-    return (m_promiscuousState == S_STARTED);
+    return (m_state == S_STARTED);
   }
 
   command error_t PromiscuousMode.start()
   {
-    if (m_promiscuousState != S_IDLE)
-      return FAIL;
-    m_promiscuousState = S_STARTING;
-    call Token.request();
-    call Debug.log(DEBUG_LEVEL_INFO, EnableRxP_PROMISCUOUS_REQUEST, m_promiscuousState, 0, 0);
-    call Debug.flush();
-    return SUCCESS;
+    error_t result = FAIL;
+    if (m_state == S_STOPPED) {
+      m_state = S_STARTING;
+      call Token.request();
+      result = SUCCESS;
+    }
+    dbg_serial("PromiscuousModeP", "PromiscuousMode.start -> result: %lu\n", (uint32_t) result);
+    return result;
   }
 
   event void Token.granted()
   {
-    if (m_promiscuousState != S_STARTING){
-      call Token.release();
-      return;
-    }
     call RadioPromiscuousMode.set(TRUE);
-    if (call PromiscuousRx.prepare() != IEEE154_SUCCESS){
-      m_promiscuousState = S_IDLE;
-      call Token.release();
-      call Debug.log(DEBUG_LEVEL_IMPORTANT, EnableRxP_RADIORX_ERROR, 0, 0, 0);
-      signal PromiscuousMode.startDone(FAIL);
-    }
+    if (call RadioOff.isOff())
+      signal RadioOff.offDone();
+    else
+      call RadioOff.off();
   }
 
-  async event void PromiscuousRx.prepareDone()
+  task void signalStartDoneTask()
   {
-    post prepareDoneTask();
+    m_state = S_STARTED;
+    dbg_serial("PromiscuousModeP", "Promiscuous mode enabled.\n");
+    signal PromiscuousMode.startDone(SUCCESS);
   }
 
-  task void prepareDoneTask()
+  async event void PromiscuousRx.enableRxDone()
   {
-    if (m_promiscuousState != S_STARTING){
-      call Token.release();
-      return;
-    }    
-    m_promiscuousState = S_STARTED;
-    call PromiscuousRx.receive(NULL, 0);
-    signal PromiscuousMode.startDone(SUCCESS);
-    call Debug.log(DEBUG_LEVEL_INFO, EnableRxP_PROMISCUOUS_ON, m_promiscuousState, 0, 0);
+    post signalStartDoneTask();
   }
 
-  event message_t* PromiscuousRx.received(message_t *frame, ieee154_reftime_t *timestamp)
+  event message_t* PromiscuousRx.received(message_t *frame, const ieee154_timestamp_t *timestamp)
   {
-    if (m_promiscuousState == S_STARTED){
+    if (m_state == S_STARTED) {
       ((ieee154_header_t*) frame->header)->length |= FRAMECTL_PROMISCUOUS;
       return signal FrameRx.received(frame);
     } else
@@ -129,31 +115,33 @@ implementation
 
   command error_t PromiscuousMode.stop()
   {
-    if (m_promiscuousState != S_STARTED)
-      return FAIL;
-    m_promiscuousState = S_STOPPING;
-    call RadioOff.off();
-    return SUCCESS;
-  }
-
-  async event void RadioOff.offDone()
-  {
-    post radioOffDoneTask();
+    error_t result = FAIL;
+    if (m_state == S_STARTED) {
+      m_state = S_STOPPING;
+      call RadioOff.off();
+      result = SUCCESS;
+    }
+    dbg_serial("PromiscuousModeP", "PromiscuousMode.stop -> result: %lu\n", (uint32_t) result);
+    return result;
   }
 
-  task void radioOffDoneTask()
+  task void continueStopTask()
   {
-    if (m_promiscuousState != S_STOPPING){
-      call Token.release();
-      return;
-    }
-    m_promiscuousState = S_IDLE;
     call RadioPromiscuousMode.set(FALSE);
+    m_state = S_STOPPED;
     call Token.release();
+    dbg_serial("PromiscuousModeP", "Promiscuous mode disabled.\n");
     signal PromiscuousMode.stopDone(SUCCESS);
-    call Debug.log(DEBUG_LEVEL_INFO, EnableRxP_PROMISCUOUS_OFF, m_promiscuousState, 0, 0);
   }
 
-  default event void PromiscuousMode.startDone(error_t error){}
-  default event void PromiscuousMode.stopDone(error_t error){}
+  async event void RadioOff.offDone()
+  {
+    if (m_state == S_STARTING) {
+      call PromiscuousRx.enableRx(0, 0);
+    } else
+      post continueStopTask();
+  }
+
+  default event void PromiscuousMode.startDone(error_t error) {}
+  default event void PromiscuousMode.stopDone(error_t error) {}
 }