From 8f6c7a55df64586d4fa72f8a8761284d75d324db Mon Sep 17 00:00:00 2001 From: klueska Date: Thu, 22 May 2008 17:45:00 +0000 Subject: [PATCH] Change parameter name to idx instead of index for compatibility with nesC 1.3. In nesC 1.3, parameter names are no longer renamed in interfaces, and 'index' is an illegal parameter name because it shadows the *built-in* definition of index from gcc. This has been fixed in newer versions of gcc, but the msp430-gcc we use (and have to use) is pretty old. Moral of the story.... don't use index as a paramter name. --- tos/chips/msp430/adc12/HplAdc12.nc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tos/chips/msp430/adc12/HplAdc12.nc b/tos/chips/msp430/adc12/HplAdc12.nc index 2f6d4067..dd42c30c 100644 --- 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. -- 2.39.2