use async power manager for adc

[tinyos-2.x.git] / tos / chips / atm128 / adc / HplAtm128AdcC.nc

diff --git a/tos/chips/atm128/adc/HplAtm128AdcC.nc b/tos/chips/atm128/adc/HplAtm128AdcC.nc
index 08a3e916434a4f32d0997d699e365da0d0da14ce..7f0987f9118dfe1a5a255a696fc69e26bd7d9f65 100644 (file)
--- a/tos/chips/atm128/adc/HplAtm128AdcC.nc
+++ b/tos/chips/atm128/adc/HplAtm128AdcC.nc
@@ -32,96 +32,12 @@
  * @author David Gay
  */
 
-module HplAtm128AdcC {
+configuration HplAtm128AdcC {
   provides interface HplAtm128Adc;
 }
 implementation {
-  //=== Direct read of HW registers. =================================
-  async command Atm128Admux_t HplAtm128Adc.getAdmux() { 
-    return *(Atm128Admux_t*)&ADMUX; 
-  }
-  async command Atm128Adcsra_t HplAtm128Adc.getAdcsra() { 
-    return *(Atm128Adcsra_t*)&ADCSRA; 
-  }
-  async command uint16_t HplAtm128Adc.getValue() { 
-    return ADC; 
-  }
+  components HplAtm128AdcP, McuSleepC;
 
-  DEFINE_UNION_CAST(Admux2int, Atm128Admux_t, uint8_t);
-  DEFINE_UNION_CAST(Adcsra2int, Atm128Adcsra_t, uint8_t);
-
-  //=== Direct write of HW registers. ================================
-  async command void HplAtm128Adc.setAdmux( Atm128Admux_t x ) { 
-    ADMUX = Admux2int(x); 
-  }
-  async command void HplAtm128Adc.setAdcsra( Atm128Adcsra_t x ) { 
-    ADCSRA = Adcsra2int(x); 
-  }
-
-  async command void HplAtm128Adc.setPrescaler(uint8_t scale){
-    Atm128Adcsra_t  current_val = call HplAtm128Adc.getAdcsra(); 
-    current_val.adif = FALSE;
-    current_val.adps = scale;
-    call HplAtm128Adc.setAdcsra(current_val);
-  }
-
-  // Individual bit manipulation. These all clear any pending A/D interrupt.
-  // It's not clear these are that useful...
-  async command void HplAtm128Adc.enableAdc() { SET_BIT(ADCSRA, ADEN); }
-  async command void HplAtm128Adc.disableAdc() { CLR_BIT(ADCSRA, ADEN); }
-  async command void HplAtm128Adc.enableInterruption() { SET_BIT(ADCSRA, ADIE); }
-  async command void HplAtm128Adc.disableInterruption() { CLR_BIT(ADCSRA, ADIE); }
-  async command void HplAtm128Adc.setContinuous() { SET_BIT(ADCSRA, ADFR); }
-  async command void HplAtm128Adc.setSingle() { CLR_BIT(ADCSRA, ADFR); }
-  async command void HplAtm128Adc.resetInterrupt() { SET_BIT(ADCSRA, ADIF); }
-  async command void HplAtm128Adc.startConversion() { SET_BIT(ADCSRA, ADSC); }
-
-
-  /* A/D status checks */
-  async command bool HplAtm128Adc.isEnabled()     {       
-    return (call HplAtm128Adc.getAdcsra()).aden; 
-  }
-
-  async command bool HplAtm128Adc.isStarted()     {
-    return (call HplAtm128Adc.getAdcsra()).adsc; 
-  }
-  
-  async command bool HplAtm128Adc.isComplete()    {
-    return (call HplAtm128Adc.getAdcsra()).adif; 
-  }
-
-  /* A/D interrupt handlers. Signals dataReady event with interrupts enabled */
-  AVR_ATOMIC_HANDLER(SIG_ADC) {
-    uint16_t data = call HplAtm128Adc.getValue();
-    
-    __nesc_enable_interrupt();
-    signal HplAtm128Adc.dataReady(data);
-  }
-
-  default async event void HplAtm128Adc.dataReady(uint16_t done) { }
-
-  async command bool HplAtm128Adc.cancel() { 
-    /* This is tricky */
-    atomic
-      {
-       Atm128Adcsra_t oldSr = call HplAtm128Adc.getAdcsra(), newSr;
-
-       /* To cancel a conversion, first turn off ADEN, then turn off
-          ADSC. We also cancel any pending interrupt.
-          Finally we reenable the ADC.
-       */
-       newSr = oldSr;
-       newSr.aden = FALSE;
-       newSr.adif = TRUE; /* This clears a pending interrupt... */
-       newSr.adie = FALSE; /* We don't want to start sampling again at the
-                              next sleep */
-       call HplAtm128Adc.setAdcsra(newSr);
-       newSr.adsc = FALSE;
-       call HplAtm128Adc.setAdcsra(newSr);
-       newSr.aden = TRUE;
-       call HplAtm128Adc.setAdcsra(newSr);
-
-       return oldSr.adif || oldSr.adsc;
-      }
-  }
+  HplAtm128Adc = HplAtm128AdcP;
+  HplAtm128AdcP.McuPowerState -> McuSleepC;
 }