Restored warnings (and replaced tabs by spaces in Msp430Adc12ImplP.nc)

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

diff --git a/tos/chips/msp430/adc12/Msp430Adc12ImplP.nc b/tos/chips/msp430/adc12/Msp430Adc12ImplP.nc
index e815ee61e0ef5b1dcd5154fd81843957b6c3e289..65ef88e0781d50ff25a934a8a6425a9d82b9e903 100644 (file)
--- a/tos/chips/msp430/adc12/Msp430Adc12ImplP.nc
+++ b/tos/chips/msp430/adc12/Msp430Adc12ImplP.nc
@@ -42,10 +42,10 @@ module Msp430Adc12ImplP
     interface Msp430Adc12MultiChannel as MultiChannel[uint8_t id];
     interface Msp430Adc12Overflow as Overflow[uint8_t id];
     interface AsyncStdControl as DMAExtension[uint8_t id];
-       }
-       uses {
+  }
+  uses {
     interface ArbiterInfo as ADCArbiterInfo;
-         interface HplAdc12;
+    interface HplAdc12;
     interface Msp430Timer as TimerA;;
     interface Msp430TimerControl as ControlA0;
     interface Msp430TimerControl as ControlA1;
@@ -59,7 +59,7 @@ module Msp430Adc12ImplP
     interface HplMsp430GeneralIO as Port65;
     interface HplMsp430GeneralIO as Port66;
     interface HplMsp430GeneralIO as Port67;
-       }
+  }
 }
 implementation
 { 
@@ -79,8 +79,9 @@ implementation
 
   uint8_t state;                  /* see enum above */
   
-  uint16_t *resultBuffer;         /* conversion results */
   uint16_t resultBufferLength;    /* length of buffer */
+  uint16_t *COUNT_NOK(resultBufferLength) resultBufferStart;
+  uint16_t *BND_NOK(resultBufferStart, resultBufferStart+resultBufferLength) resultBuffer;         /* conversion results */
   uint16_t resultBufferIndex;     /* offset into buffer */
   uint8_t numChannels;            /* number of channels (multi-channel conversion) */
   uint8_t clientID;               /* ID of client that called getData() */
@@ -549,6 +550,7 @@ implementation
       case MULTI_CHANNEL:
         {
           uint16_t i = 0, k;
+          resultBufferStart = resultBuffer;
           do {
             *resultBuffer++ = call HplAdc12.getMem(i);
           } while (++i < numChannels);
@@ -566,6 +568,7 @@ implementation
       case MULTIPLE_DATA:
         {
           uint16_t i = 0, length, k;
+          resultBufferStart = resultBuffer;
           if (resultBufferLength - resultBufferIndex > 16) 
             length = 16;
           else
@@ -594,6 +597,7 @@ implementation
       case MULTIPLE_DATA_REPEAT:
         {
           uint8_t i = 0;
+          resultBufferStart = resultBuffer;
           do {
             *resultBuffer++ = call HplAdc12.getMem(i);
           } while (++i < resultBufferLength);