Change parameter name to idx instead of index for compatibility with nesC 1.3. In...

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

diff --git a/tos/chips/msp430/adc12/HplAdc12.nc b/tos/chips/msp430/adc12/HplAdc12.nc
index 0eb04afc4b3ff2be0c2187ba33ec9731b12516db..dd42c30c211672af12f0821787c53002dbc80ad5 100644 (file)
--- a/tos/chips/msp430/adc12/HplAdc12.nc
+++ b/tos/chips/msp430/adc12/HplAdc12.nc
@@ -69,24 +69,24 @@ interface HplAdc12
   
   /** 
    * Sets the ADC12 conversion memory control register ADC12MCTLx.
-   * @param index The register index (the 'x' in ADC12MCTLx) [0..15] 
+   * @param idx The register index (the 'x' in ADC12MCTLx) [0..15] 
    * @param memControl ADC12MCTLx register data.
    */
-  async command void setMCtl(uint8_t index, adc12memctl_t memControl); 
+  async command void setMCtl(uint8_t idx, adc12memctl_t memControl); 
   
   /** 
    * Returns the ADC12 conversion memory control register ADC12MCTLx.
-   * @param index The register index (the 'x' in ADC12MCTLx) [0..15] 
+   * @param idx The register index (the 'x' in ADC12MCTLx) [0..15] 
    * @return memControl ADC12MCTLx register data.
    */
-  async command adc12memctl_t getMCtl(uint8_t index); 
+  async command adc12memctl_t getMCtl(uint8_t idx); 
 
   /** 
    * Returns the ADC12 conversion memory register ADC12MEMx.
-   * @param index The register index (the 'x' in ADC12MEMx) [0..15] 
+   * @param idx The register index (the 'x' in ADC12MEMx) [0..15] 
    * @return ADC12MEMx 
    */  
-  async command uint16_t getMem(uint8_t index); 
+  async command uint16_t getMem(uint8_t idx); 
 
   /** 
    * Sets the ADC12 interrupt enable register, ADC12IE.
@@ -105,16 +105,6 @@ interface HplAdc12
    */
   async command void resetIFGs(); 
 
-  /** 
-   * Signals an ADC12MEMx overflow.
-   */ 
-  async event void memOverflow();
-
-  /** 
-   * Signals a Conversion time overflow.
-   */ 
-  async event void conversionTimeOverflow();
-
   /** 
    * Signals a conversion result. 
    * @param iv ADC12 interrupt vector value 0x6, 0x8, ... , 0x24
@@ -137,5 +127,10 @@ interface HplAdc12
    */
   async command void startConversion();
 
+  /**
+   * Enables conversion (sets the ENC bit).
+   */
+  async command void enableConversion();
+
 }