There was a missing #ifdef guard in Tda5250RadioP.nc, reverting back to pre-LNDW...

diff --git a/tos/chips/tda5250/Tda5250RadioC.nc b/tos/chips/tda5250/Tda5250RadioC.nc
index fafba5bc89f8007a248221471f3e7f143924022f..0989c774a44e78abef46478fd7b375a35add3dea 100644 (file)
--- a/tos/chips/tda5250/Tda5250RadioC.nc
+++ b/tos/chips/tda5250/Tda5250RadioC.nc
@@ -47,9 +47,6 @@ configuration Tda5250RadioC {
     interface ResourceRequested;
     interface RadioByteComm;
     interface ClkDiv;
-#ifdef LNDW
-    interface RfPower;
-#endif
   }
 }
 implementation {
@@ -68,9 +65,7 @@ implementation {
   RadioByteComm = Tda5250RadioP;
   SplitControl = Tda5250RadioP;
   ClkDiv = Tda5250RadioP;
-#ifdef LNDW
-  RfPower = Tda5250RadioP;
-#endif
+
   Tda5250RadioP.DelayTimer -> DelayTimer;
   
   Tda5250RadioP.ConfigResource -> HplTda5250ConfigC;

diff --git a/tos/chips/tda5250/Tda5250RadioP.nc b/tos/chips/tda5250/Tda5250RadioP.nc
index 975fcaa63a54289dcec488190ea5dde638a3aa56..a1ea56a82814a46faeae1de3bfc57c1a1eae58f0 100644 (file)
--- a/tos/chips/tda5250/Tda5250RadioP.nc
+++ b/tos/chips/tda5250/Tda5250RadioP.nc
@@ -55,9 +55,6 @@ module Tda5250RadioP {
         interface RadioByteComm;
         interface ResourceRequested;
         interface ClkDiv;
-#ifdef LNDW
-        interface RfPower;
-#endif
     }
     uses {
         interface HplTda5250Config;
@@ -82,27 +79,6 @@ implementation {
     radioMode_t radioMode;    // Current Mode of the Radio
     float onTime, offTime;
 
-#ifdef LNDW
-    norace bool rfpowerdirty = FALSE;
-    norace uint8_t rfpower = INITIAL_RF_POWER;
-    task void setRfPower() {
-        uint8_t rp, rd;
-        atomic {
-            rp = rfpower;
-            rd = rfpowerdirty;
-        }
-        if(rd) {
-            if(call ConfigResource.immediateRequest() == SUCCESS)  {
-                call HplTda5250Config.SetRFPower(rp);                
-                atomic rfpowerdirty = FALSE;
-            }
-            else {
-                post setRfPower();
-            }
-        }
-    }
-#endif
-    
     /**************** Radio Init *****************/
     command error_t Init.init() {
         radioMode = RADIO_MODE_OFF;
@@ -180,7 +156,6 @@ implementation {
                 call HplTda5250Config.SetSleepMode();
                 atomic radioMode = RADIO_MODE_SLEEP;
                 signal Tda5250Control.SleepModeDone();
-                if(rfpowerdirty) post setRfPower();
                 break;
             case RADIO_MODE_TX_TRANSITION:
                 call HplTda5250Config.SetSlaveMode();
@@ -479,13 +454,4 @@ implementation {
       }
       default async event void ClkDiv.stopping() {
       }
-#ifdef LNDW
-      async command error_t RfPower.set(uint8_t setting) {
-          atomic {
-              rfpower = setting;
-              rfpowerdirty = TRUE;
-          }
-          return SUCCESS;
-      }
-#endif
 }