[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/tda5250/mac RedMacP.nc, 1.2, 1.3 RedMacC.nc, 1.2, 1.3 CsmaMacP.nc, 1.4, 1.5 CsmaMacC.nc, 1.4, 1.5

[akoepke]

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

Modified Files:
	RedMacP.nc RedMacC.nc CsmaMacP.nc CsmaMacC.nc 
Log Message:
looks like Cory's continous DcoCalib fix also fixes our problem


Index: RedMacP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac/RedMacP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RedMacP.nc	12 Dec 2006 18:23:14 -0000	1.2
--- RedMacP.nc	24 Jan 2007 19:40:27 -0000	1.3
***************
*** 52,56 ****
          interface Teamgeist;
          interface ChannelCongestion;
-         interface McuPowerOverride;
      }
      uses {
--- 52,55 ----
***************
*** 195,200 ****
          MAX_TIME_VALUE=0xFFFFFFFF,
          MAXTIMERVALUE=0xFFFF,        // helps to compute backoff
!         //DEFAULT_SLEEP_TIME=3250,
!         DEFAULT_SLEEP_TIME=6500,
          // DEFAULT_SLEEP_TIME=9750,
          DATA_DETECT_TIME=17,
--- 194,199 ----
          MAX_TIME_VALUE=0xFFFFFFFF,
          MAXTIMERVALUE=0xFFFF,        // helps to compute backoff
!         DEFAULT_SLEEP_TIME=3250,
!         // DEFAULT_SLEEP_TIME=6500,
          // DEFAULT_SLEEP_TIME=9750,
          DATA_DETECT_TIME=17,
***************
*** 1314,1329 ****
      async event void RadioModes.SelfPollingModeDone() {}
      async event void RadioModes.PWDDDInterrupt() {}
- 
-     /** prevent MCU from going into a too low power mode */
-     async command mcu_power_t McuPowerOverride.lowestState() {
-         mcu_power_t mp;
-         if(macState != SLEEP) {
-             mp = MSP430_POWER_LPM1;
-         }
-         else {
-             mp = MSP430_POWER_LPM3;
-         }
-         return mp;
-     }
  }
  
--- 1313,1316 ----

Index: RedMacC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac/RedMacC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RedMacC.nc	12 Dec 2006 18:23:13 -0000	1.2
--- RedMacC.nc	24 Jan 2007 19:40:27 -0000	1.3
***************
*** 58,66 ****
          RedMacP,
          RssiFixedThresholdCMC as Cca,
!         new Alarm32khzC() as Timer,
!         new Alarm32khzC() as SampleTimer,
          RandomLfsrC,
!         McuSleepC,
!         Counter32khzC;
      
      components ActiveMessageAddressC;
--- 58,65 ----
          RedMacP,
          RssiFixedThresholdCMC as Cca,
!         new Alarm32khz16C() as Timer,
!         new Alarm32khz16C() as SampleTimer,
          RandomLfsrC,
!         Counter32khz16C as Counter;
      
      components ActiveMessageAddressC;
***************
*** 70,74 ****
                
      SplitControl = RedMacP;
-     McuSleepC.McuPowerOverride -> RedMacP;
      MacSend = RedMacP;
      MacReceive = RedMacP;
--- 69,72 ----
***************
*** 96,100 ****
      RedMacP.Timer -> Timer;
      RedMacP.SampleTimer -> SampleTimer;
!     RedMacP.Counter32khz16 -> Counter32khzC.Counter32khz16;
  /*    
      components PlatformLedsC;
--- 94,98 ----
      RedMacP.Timer -> Timer;
      RedMacP.SampleTimer -> SampleTimer;
!     RedMacP.Counter32khz16 -> Counter;
  /*    
      components PlatformLedsC;

Index: CsmaMacP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac/CsmaMacP.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CsmaMacP.nc	12 Dec 2006 18:23:13 -0000	1.4
--- CsmaMacP.nc	24 Jan 2007 19:40:27 -0000	1.5
***************
*** 51,55 ****
          interface MacReceive;
          interface Packet;
-         interface McuPowerOverride;
      }
      uses {
--- 51,54 ----
***************
*** 1013,1021 ****
      // we don't care about urgent Resource requestes
      async event void RadioResourceRequested.immediateRequested() {}
- 
-     /** prevent MCU from going into a too low power mode */
-     async command mcu_power_t McuPowerOverride.lowestState() {
-         return MSP430_POWER_LPM1;
-     }
  }
  
--- 1012,1015 ----

Index: CsmaMacC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac/CsmaMacC.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CsmaMacC.nc	12 Dec 2006 18:23:13 -0000	1.4
--- CsmaMacC.nc	24 Jan 2007 19:40:27 -0000	1.5
***************
*** 60,64 ****
        new Alarm32khz16C() as Timer,
        new TimerMilliC() as ReRxTimer,
-       McuSleepC,
        RandomLfsrC
  #ifdef MAC_DEBUG
--- 60,63 ----
***************
*** 68,73 ****
                
      MainC.SoftwareInit -> CsmaMacP;
- 
-     McuSleepC.McuPowerOverride -> CsmaMacP;
      
      SplitControl = CsmaMacP;
--- 67,70 ----