Changeset 2837

Timestamp:

11/09/09 11:19:18 (7 weeks ago)

Author:

stevedh

Message:

• more nits
  

Location:

code/tinyos-2.x/tos/chips/cc2420_hotmac

Files:

• HotmacC.nc (modified) (4 diffs)
• hotmac.h (modified) (1 diff)
• receive/HotmacReceiveP.nc (modified) (9 diffs)
• transmit/HotmacTransmitP.nc (modified) (3 diffs)

code/tinyos-2.x/tos/chips/cc2420_hotmac/HotmacC.nc

@@ -16 +16 @@
   components new StateC();
   components NeighborTableC;
+  components RandomC;
 
   SplitControl = HotmacReceiveP;
@@ -38 +39 @@
   HotmacReceiveP.CC2420PacketBody -> CC2420PacketC;
   HotmacReceiveP.Packet -> CC2420PacketC;
-/*   HotmacReceiveP.MessagePool -> PoolC; */
   HotmacReceiveP.SubReceive -> CC2420ReceiveC;
   HotmacReceiveP.ReceiveIndicator -> CC2420ReceiveC;
@@ -44 +44 @@
   HotmacReceiveP.CC2420Config -> CC2420ControlC;
   HotmacReceiveP.CC2420Receive -> CC2420ReceiveC;
-  // HotmacReceiveP.TransmitTransfer -> HotmacTransmitP.TransmitTransfer;
   HotmacReceiveP.PacketTimeStamp -> CC2420PacketC.PacketTimeStamp32khz;
+  HotmacReceiveP.PowerCycleInfo -> CC2420PowerC;
+  HotmacReceiveP.Random -> RandomC;
 
   // Transmit wiring
   components new Alarm32khz32C() as SendAlarmC;
-  // components new Alarm32khz32C() as ShutdownAlarmC;
+  components new Alarm32khz32C() as ShutdownAlarmC;
   components new TimerMilliC() as ShutdownTimerC;
-  components RandomC;
   MainC.SoftwareInit -> HotmacTransmitP.Init;
   HotmacTransmitP.CC2420PacketBody -> CC2420PacketC;
@@ -66 +66 @@
   HotmacTransmitP.PacketAcknowledgements -> CC2420PacketC;
 
+
   components NoLedsC as LedsC;
   HotmacReceiveP.Leds -> LedsC;
   HotmacTransmitP.Leds -> LedsC;
+
+  //components new Alarm32khz32C();
 } 
 

code/tinyos-2.x/tos/chips/cc2420_hotmac/hotmac.h

@@ -53 +53 @@
 
   // jiffies
-  HOTMAC_DEFAULT_CHECK_PERIOD = 64L << 5,
+  HOTMAC_DEFAULT_CHECK_PERIOD = 1024L << 5,
 
   // how long to wait for a beacon each time we wake up.  this is

code/tinyos-2.x/tos/chips/cc2420_hotmac/receive/HotmacReceiveP.nc

@@ -29 +29 @@
     interface CC2420Receive;
     interface PacketTimeStamp<T32khz, uint32_t>;
-
+    interface Random;
+
+    interface PowerCycleInfo;
     interface Leds;
   }
@@ -35 +37 @@
 
   // phase in the 32khz time 
-  uint32_t probe_phase = 0;
+  uint32_t probe_phase;
   // how many 32khz tics between probes
   uint32_t probe_interval = HOTMAC_DEFAULT_CHECK_PERIOD;
@@ -53 +55 @@
   command error_t Init.init() {
     printfUART_init();
-    probe_interval = HOTMAC_DEFAULT_CHECK_PERIOD; // T_HOTMAC_PERIOD(HOTMAC_DEFAULT_CHECK_PERIOD);
+    probe_interval = HOTMAC_DEFAULT_CHECK_PERIOD;
     probe_phase    = 0;
     current_probe = &probe;
     return SUCCESS;
-    // call HotmacState.forceState(S_OFF);
   }
 
@@ -88 +89 @@
         }
 
-        // call Leds.led0Toggle();
         // reset the contention window used by senders
         cwl = 1;
@@ -95 +95 @@
         // we turned and scheduled the probe for NOW
         call Leds.led1Toggle();
-        // printfUART("probe: %i\n", current_dsn);
+
         if (call CC2420Transmit.resend(TRUE) != SUCCESS) {
           goto fail;
@@ -125 +125 @@
   }
 
+  event void PowerCycleInfo.stopDone(uint32_t on_time) {
+    printfUART("awake for %i\n", on_time);
+  }
+
   event void RadioControl.stopDone(error_t err) {
     atomic {
       if (call HotmacState.isState(S_RECEIVE)) {
         call HotmacState.toIdle();
-        // call Leds.led2Toggle();
       }
     }
@@ -176 +179 @@
   task void stopAndPut() {
     uint32_t now = call ProbeAlarm.getNow();
-    uint32_t current_phase = (now - probe_phase) % probe_interval;
-    uint32_t wake_dt = probe_interval - current_phase;
+    uint32_t wake_dt;
     
+    if (now > probe_phase) {
+      wake_dt = probe_interval - 
+        ((now - probe_phase) % probe_interval);
+    } else {
+      wake_dt = probe_phase - now;
+    }
+
     if (wake_dt < HOTMAC_WAKEUP_LOAD_TIME) {
       // we schedule the wakeup a little before when we need to send
@@ -201 +210 @@
         // compute exactly when to send the next beacon
         uint32_t now = call ProbeAlarm.getNow();
-        uint32_t current_phase = (now - probe_phase) % probe_interval;
-        uint32_t wake_dt = probe_interval - current_phase + probe_phase;
+        uint32_t wake_dt;
+    
+        if (now > probe_phase) {
+          wake_dt = probe_interval - 
+            ((now - probe_phase) % probe_interval);
+        } else {
+          wake_dt = probe_phase - now;
+        }
 
         if (wake_dt > HOTMAC_WAKEUP_TOO_LONG) {
@@ -355 +370 @@
   command error_t SplitControl.start() {
     stopping = FALSE;
+    probe_phase = (call Random.rand16()) % probe_phase;
     call HotmacState.forceState(S_IDLE);
     call ProbeAlarm.start(probe_interval + probe_phase);

code/tinyos-2.x/tos/chips/cc2420_hotmac/transmit/HotmacTransmitP.nc

@@ -53 +53 @@
   void sendDone(error_t error, uint32_t shutdown_delay);
   void giveupRadio();
-  void scheduleWakeup(uint16_t extra);
+  void scheduleWakeup();
 
   command error_t Init.init() {
@@ -72 +72 @@
   }
 
-  void scheduleWakeup(uint16_t extra) {
+  void scheduleWakeup() {
     struct hotmac_neigh_entry *entry;
 
@@ -83 +83 @@
     } else {
       uint32_t now = call SendAlarm.getNow();
-      uint32_t wakeTime = now + extra;
+      uint32_t wakeTime;
       if (wakeTime > entry->phase) {
         wakeTime = entry->period - 
           ((wakeTime - entry->phase) % entry->period);
       } else {
-        wakeTime = entry->phase - wakeTime;
+        wakeTime = entry->phase - now;
       }