[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/adc12 HplAdc12P.nc, 1.6, 1.7 Msp430Adc12P.nc, 1.6, 1.7

[Kevin Klues]

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

Modified Files:
	HplAdc12P.nc Msp430Adc12P.nc 
Log Message:
Reverting back to decentralized handling of interrupts on the msp430.  Centralizing them has the side effect of forcing all interrupt handlers to be included regardless of whether the component that actually DEPENDS on it is included or not.  Leads to unnecessary code bloat.  Original motivation for centralizing them in the first place was in anticipation of adding tosthreads in the upcoming release.  A better way of supporting them without the need for centralized interrupt handlers was found, hence the rollback.

Index: HplAdc12P.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12/HplAdc12P.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** HplAdc12P.nc	17 Apr 2008 22:38:34 -0000	1.6
--- HplAdc12P.nc	15 May 2008 23:57:13 -0000	1.7
***************
*** 45,49 ****
  module HplAdc12P {
    provides interface HplAdc12;
-   uses interface HplMsp430InterruptSig as SIGNAL_ADC_VECTOR;
  }
  implementation
--- 45,48 ----
***************
*** 120,124 ****
    async command bool HplAdc12.isBusy(){ return ADC12CTL1 & ADC12BUSY; }
  
!   inline async event void SIGNAL_ADC_VECTOR.fired() {
      signal HplAdc12.conversionDone(ADC12IV);
    }
--- 119,123 ----
    async command bool HplAdc12.isBusy(){ return ADC12CTL1 & ADC12BUSY; }
  
!   TOSH_SIGNAL(ADC_VECTOR) {
      signal HplAdc12.conversionDone(ADC12IV);
    }

Index: Msp430Adc12P.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12/Msp430Adc12P.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Msp430Adc12P.nc	17 Apr 2008 22:38:34 -0000	1.6
--- Msp430Adc12P.nc	15 May 2008 23:57:13 -0000	1.7
***************
*** 78,84 ****
    Msp430Adc12ImplP.CompareA1 -> Msp430TimerC.CompareA1;
  #endif
- 
-   components HplMsp430InterruptSigP;
-   HplAdc12P.SIGNAL_ADC_VECTOR -> HplMsp430InterruptSigP.SIGNAL_ADC_VECTOR;
  }
  
--- 78,81 ----