Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / chips / msp430 / adc12 / HplAdc12P.nc

diff --git a/tos/chips/msp430/adc12/HplAdc12P.nc b/tos/chips/msp430/adc12/HplAdc12P.nc
index 157d65cfb10ea590b5c2fac2a1ce643623acdfc0..b8ba9d0dd42c3e1757467f88d8e3476089e576ab 100644 (file)
--- a/tos/chips/msp430/adc12/HplAdc12P.nc
+++ b/tos/chips/msp430/adc12/HplAdc12P.nc
@@ -53,98 +53,72 @@ implementation
   MSP430REG_NORACE(ADC12IFG);
   MSP430REG_NORACE(ADC12IE);
   MSP430REG_NORACE(ADC12IV);
+
+  DEFINE_UNION_CAST(int2adc12ctl0,adc12ctl0_t,uint16_t)
+  DEFINE_UNION_CAST(int2adc12ctl1,adc12ctl1_t,uint16_t)
+  DEFINE_UNION_CAST(adc12ctl0cast2int,uint16_t,adc12ctl0_t)
+  DEFINE_UNION_CAST(adc12ctl1cast2int,uint16_t,adc12ctl1_t)
+  DEFINE_UNION_CAST(adc12memctl2int,uint8_t,adc12memctl_t)
+  DEFINE_UNION_CAST(int2adc12memctl,adc12memctl_t,uint8_t)
   
   async command void HplAdc12.setCtl0(adc12ctl0_t control0){
-    ADC12CTL0 = *(uint16_t*)&control0; 
+    ADC12CTL0 = adc12ctl0cast2int(control0); 
   }
   
   async command void HplAdc12.setCtl1(adc12ctl1_t control1){
-    ADC12CTL1 = *(uint16_t*)&control1; 
+    ADC12CTL1 = adc12ctl1cast2int(control1); 
   }
   
   async command adc12ctl0_t HplAdc12.getCtl0(){ 
-    return *(adc12ctl0_t*) &ADC12CTL0; 
+    return int2adc12ctl0(ADC12CTL0); 
   }
   
   async command adc12ctl1_t HplAdc12.getCtl1(){
-    return *(adc12ctl1_t*) &ADC12CTL1; 
+    return int2adc12ctl1(ADC12CTL1); 
   }
   
-  async command void HplAdc12.setMCtl(uint8_t i, adc12memctl_t memControl){
-    uint8_t *memCtlPtr = (uint8_t*) ADC12MCTL;
-    memCtlPtr += i;
-    *memCtlPtr = *(uint8_t*)&memControl; 
+  async command void HplAdc12.setMCtl(uint8_t i, adc12memctl_t memCtl){
+    ADC12MCTL[i] = adc12memctl2int(memCtl);
   }
    
   async command adc12memctl_t HplAdc12.getMCtl(uint8_t i){
-    adc12memctl_t x = {inch: 0, sref: 0, eos: 0 };    
-    uint8_t *memCtlPtr = (uint8_t*) ADC12MCTL;
-    memCtlPtr += i;
-    x = *(adc12memctl_t*) memCtlPtr;
-    return x;
+    return int2adc12memctl(ADC12MCTL[i]);
   }  
   
   async command uint16_t HplAdc12.getMem(uint8_t i){
-    return *((uint16_t*) ADC12MEM + i);
+    return ADC12MEM[i];
   }
 
   async command void HplAdc12.setIEFlags(uint16_t mask){ ADC12IE = mask; } 
-  async command uint16_t HplAdc12.getIEFlags(){ return (uint16_t) ADC12IE; } 
+  async command uint16_t HplAdc12.getIEFlags(){ return ADC12IE; } 
   
   async command void HplAdc12.resetIFGs(){ 
-    if (!ADC12IFG)
-      return;
-    else {
-      // workaround, because ADC12IFG is not writable 
-      uint8_t i;
-      volatile uint16_t tmp;
-      for (i=0; i<16; i++)
-        tmp = call HplAdc12.getMem(i);
-    }
+    ADC12IV = 0; 
+    ADC12IFG = 0;
   } 
   
-  async command uint16_t HplAdc12.getIFGs(){ return (uint16_t) ADC12IFG; } 
-
-  async command bool HplAdc12.isBusy(){ return ADC12CTL1 & ADC12BUSY; }
-  
-  async command void HplAdc12.enableConversion(){ ADC12CTL0 |= ENC;}
-  async command void HplAdc12.disableConversion(){ ADC12CTL0 &= ~ENC; }
-  async command void HplAdc12.startConversion(){ ADC12CTL0 |= ADC12SC + ENC; }
-  async command void HplAdc12.stopConversion(){ 
-    ADC12CTL1 &= ~(CONSEQ_1 | CONSEQ_3); 
-    ADC12CTL0 &= ~ENC; 
+  async command void HplAdc12.startConversion(){ 
+    ADC12CTL0 |= ADC12ON; 
+    ADC12CTL0 |= (ADC12SC + ENC); 
   }
   
-  async command void HplAdc12.setMSC(){ ADC12CTL0 |= MSC; }
-  async command void HplAdc12.resetMSC(){ ADC12CTL0 &= ~MSC; }
-  
-  async command void HplAdc12.setRefOn(){ ADC12CTL0 |= REFON;}
-  async command void HplAdc12.resetRefOn(){ ADC12CTL0 &= ~REFON;}
-  async command uint8_t HplAdc12.getRefon(){ return (ADC12CTL0 & REFON) >> 5;}
-  async command void HplAdc12.setRef1_5V(){ ADC12CTL0 &= ~REF2_5V;}
-  async command void HplAdc12.setRef2_5V(){ ADC12CTL0 |= REF2_5V;}
-  async command uint8_t HplAdc12.isRef2_5V(){ return (ADC12CTL0 & REF2_5V) >> 6;}
-  
-  async command void HplAdc12.setSHT(uint8_t sht){
-    uint16_t ctl0 = ADC12CTL0;
-    uint16_t shttemp = sht & 0x0F;    
-    ctl0 &= 0x00FF;
-    ctl0 |= (shttemp << 8);
-    ctl0 |= (shttemp << 12);
-    ADC12CTL0 = ctl0; 
+  async command void HplAdc12.stopConversion(){
+    // stop conversion mode immediately, conversion data is unreliable
+    uint16_t ctl1 = ADC12CTL1;
+    ADC12CTL1 &= ~(CONSEQ0 | CONSEQ1);
+    ADC12CTL0 &= ~(ADC12SC + ENC); 
+    ADC12CTL0 &= ~(ADC12ON);
+    ADC12CTL1 |= (ctl1 & (CONSEQ0 | CONSEQ1));
   }
   
-  async command void HplAdc12.adcOff(){ ADC12CTL0 &= ~ADC12ON; }
-  async command void HplAdc12.adcOn(){ ADC12CTL0 |= ADC12ON; }
+  async command void HplAdc12.enableConversion(){ 
+    ADC12CTL0 |= ENC; 
+  }
+    
+  async command bool HplAdc12.isBusy(){ return (ADC12CTL1 & ADC12BUSY); }
 
   TOSH_SIGNAL(ADC_VECTOR) {
-    uint16_t iv = ADC12IV;
-    switch(iv)
-    {
-      case  2: signal HplAdc12.memOverflow(); return;
-      case  4: signal HplAdc12.conversionTimeOverflow(); return;
-    }
-    signal HplAdc12.conversionDone(iv);
+    signal HplAdc12.conversionDone(ADC12IV);
   }
 }