[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/adc12 Msp430Adc12ImplP.nc, 1.12, 1.13

[Jan-Hinrich Hauer]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26640/tos/chips/msp430/adc12

Modified Files:
	Msp430Adc12ImplP.nc 
Log Message:
The commit from Jun 17 that introduced deputy annotations created a problem for the MultiChannel interface in Msp430Adc12ImplP ISR - this is now fixed. I also extended the test app.

Index: Msp430Adc12ImplP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12/Msp430Adc12ImplP.nc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Msp430Adc12ImplP.nc	27 Jun 2008 18:05:23 -0000	1.12
--- Msp430Adc12ImplP.nc	29 Sep 2008 15:51:24 -0000	1.13
***************
*** 380,384 ****
      atomic {
        if (call ADCArbiterInfo.userId() == id){
!         if (state & MULTIPLE_DATA_REPEAT && !resultBufferStart)
            return EINVAL;
          if (state & ADC_BUSY)
--- 380,384 ----
      atomic {
        if (call ADCArbiterInfo.userId() == id){
!         if ((state & MULTIPLE_DATA_REPEAT) && !resultBufferStart)
            return EINVAL;
          if (state & ADC_BUSY)
***************
*** 555,559 ****
          {
            uint16_t i = 0, k;
!           resultBuffer = resultBufferStart;
            do {
              *resultBuffer++ = call HplAdc12.getMem(i);
--- 555,559 ----
          {
            uint16_t i = 0, k;
!           resultBuffer = resultBufferStart + resultBufferIndex;
            do {
              *resultBuffer++ = call HplAdc12.getMem(i);
***************
*** 567,571 ****
              signal MultiChannel.dataReady[clientID](resultBuffer, 
                  overflow ? k : resultBufferLength);
!           } else call HplAdc12.enableConversion();
          }
          break;
--- 567,571 ----
              signal MultiChannel.dataReady[clientID](resultBuffer, 
                  overflow ? k : resultBufferLength);
!           }
          }
          break;