[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/tda5250 Tda5250RadioC.nc, 1.6, 1.7 Tda5250RadioP.nc, 1.7, 1.8

[Vlado Handziski]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6241/tos/chips/tda5250

Modified Files:
	Tda5250RadioC.nc Tda5250RadioP.nc 
Log Message:
There was a missing #ifdef guard in Tda5250RadioP.nc, reverting back to pre-LNDW versions

Index: Tda5250RadioC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/Tda5250RadioC.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Tda5250RadioC.nc	13 Jun 2008 13:40:59 -0000	1.6
--- Tda5250RadioC.nc	17 Jun 2008 16:53:50 -0000	1.7
***************
*** 48,54 ****
      interface RadioByteComm;
      interface ClkDiv;
- #ifdef LNDW
-     interface RfPower;
- #endif
    }
  }
--- 48,51 ----
***************
*** 69,75 ****
    SplitControl = Tda5250RadioP;
    ClkDiv = Tda5250RadioP;
! #ifdef LNDW
!   RfPower = Tda5250RadioP;
! #endif
    Tda5250RadioP.DelayTimer -> DelayTimer;
    
--- 66,70 ----
    SplitControl = Tda5250RadioP;
    ClkDiv = Tda5250RadioP;
! 
    Tda5250RadioP.DelayTimer -> DelayTimer;
    

Index: Tda5250RadioP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/Tda5250RadioP.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Tda5250RadioP.nc	13 Jun 2008 13:40:59 -0000	1.7
--- Tda5250RadioP.nc	17 Jun 2008 16:53:50 -0000	1.8
***************
*** 56,62 ****
          interface ResourceRequested;
          interface ClkDiv;
- #ifdef LNDW
-         interface RfPower;
- #endif
      }
      uses {
--- 56,59 ----
***************
*** 83,107 ****
      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() {
--- 80,83 ----
***************
*** 181,185 ****
                  atomic radioMode = RADIO_MODE_SLEEP;
                  signal Tda5250Control.SleepModeDone();
-                 if(rfpowerdirty) post setRfPower();
                  break;
              case RADIO_MODE_TX_TRANSITION:
--- 157,160 ----
***************
*** 480,491 ****
        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
  }
--- 455,457 ----