switch to metric MHz for SMCLK, adjust constants, include SmclkManager

[tinyos-2.x.git] / tos / chips / tda5250 / Tda5250RadioP.nc

diff --git a/tos/chips/tda5250/Tda5250RadioP.nc b/tos/chips/tda5250/Tda5250RadioP.nc
index 20d39dcf9e563cbb0650354613aac7349a2b89f3..a1ea56a82814a46faeae1de3bfc57c1a1eae58f0 100644 (file)
--- a/tos/chips/tda5250/Tda5250RadioP.nc
+++ b/tos/chips/tda5250/Tda5250RadioP.nc
@@ -54,6 +54,7 @@ module Tda5250RadioP {
         interface Tda5250Control;
         interface RadioByteComm;
         interface ResourceRequested;
+        interface ClkDiv;
     }
     uses {
         interface HplTda5250Config;
@@ -86,6 +87,7 @@ implementation {
 
     /**************** Radio Start  *****************/
     task void startDoneTask() {
+        signal ClkDiv.startDone();
         signal SplitControl.startDone(SUCCESS);
     }
       
@@ -135,18 +137,21 @@ implementation {
         switch(mode) {
             case RADIO_MODE_ON_TRANSITION:
                 call HplTda5250Config.reset();
-                call HplTda5250Config.SetRFPower(255);
+                call HplTda5250Config.SetRFPower(INITIAL_RF_POWER);
+                // call HplTda5250Config.SetClockOnDuringPowerDown();
                 call ConfigResource.release();
                 atomic radioMode = RADIO_MODE_ON;
                 post startDoneTask();
                 break;
             case RADIO_MODE_OFF_TRANSITION:
+                signal ClkDiv.stopping();
                 call HplTda5250Config.SetSleepMode();
                 call ConfigResource.release();
                 atomic radioMode = RADIO_MODE_OFF;
                 post stopDoneTask();
                 break;
             case RADIO_MODE_SLEEP_TRANSITION:
+                signal ClkDiv.stopping();
                 call HplTda5250Config.SetSlaveMode();
                 call HplTda5250Config.SetSleepMode();
                 atomic radioMode = RADIO_MODE_SLEEP;
@@ -405,6 +410,7 @@ implementation {
             signal Tda5250Control.RssiStable();
             break;
           case RECEIVER_DELAY :
+              signal ClkDiv.startDone();
             delayTimer = RSSISTABLE_DELAY;
             call DelayTimer.start(TDA5250_RSSI_STABLE_TIME-TDA5250_RECEIVER_SETUP_TIME);
             if (call DataResource.immediateRequest() == SUCCESS) {
@@ -414,6 +420,7 @@ implementation {
             }
             break;
           case TRANSMITTER_DELAY :
+              signal ClkDiv.startDone();
             if (call DataResource.immediateRequest() == SUCCESS) {
               switchDataResource();
             } else {
@@ -443,4 +450,8 @@ implementation {
       }
       default async event void RadioByteComm.txByteReady(error_t error) {
       }
+      default async event void ClkDiv.startDone() {
+      }
+      default async event void ClkDiv.stopping() {
+      }
 }