X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fmsp430%2Fadc12%2FMsp430Adc12P.nc;h=e662eea537146704af97c4bcbb4096525191b8e1;hb=957a31040a83efd1fc9c7a563b7898459ef6d572;hp=bb1afb6d9e2c174773412f9e62de7c535b7b219d;hpb=9634a9f83d8a9cc448d078823107c85e6ca29e40;p=tinyos-2.x.git

diff --git a/tos/chips/msp430/adc12/Msp430Adc12P.nc b/tos/chips/msp430/adc12/Msp430Adc12P.nc
index bb1afb6d..e662eea5 100644
--- a/tos/chips/msp430/adc12/Msp430Adc12P.nc
+++ b/tos/chips/msp430/adc12/Msp430Adc12P.nc
@@ -44,7 +44,7 @@ configuration Msp430Adc12P
     interface AsyncStdControl as DMAExtension[uint8_t id];
   }
 } implementation { 
-  components Msp430Adc12ImplP, HplAdc12P, Msp430TimerC, MainC, HplMsp430GeneralIOC, 
+  components Msp430Adc12ImplP, HplAdc12P, MainC, 
              new SimpleRoundRobinArbiterC(MSP430ADC12_RESOURCE) as Arbiter;
 
   Resource = Arbiter;
@@ -56,6 +56,9 @@ configuration Msp430Adc12P
   Msp430Adc12ImplP.Init <- MainC;
   Msp430Adc12ImplP.ADCArbiterInfo -> Arbiter;
   Msp430Adc12ImplP.HplAdc12 -> HplAdc12P;
+
+#ifdef ADC12_P6PIN_AUTO_CONFIGURE
+  components HplMsp430GeneralIOC;
   Msp430Adc12ImplP.Port60 -> HplMsp430GeneralIOC.Port60;
   Msp430Adc12ImplP.Port61 -> HplMsp430GeneralIOC.Port61;
   Msp430Adc12ImplP.Port62 -> HplMsp430GeneralIOC.Port62;
@@ -64,11 +67,15 @@ configuration Msp430Adc12P
   Msp430Adc12ImplP.Port65 -> HplMsp430GeneralIOC.Port65;
   Msp430Adc12ImplP.Port66 -> HplMsp430GeneralIOC.Port66;
   Msp430Adc12ImplP.Port67 -> HplMsp430GeneralIOC.Port67;
+#endif
 
+#ifdef ADC12_TIMERA_ENABLED
+  components Msp430TimerC;
   Msp430Adc12ImplP.TimerA -> Msp430TimerC.TimerA;
   Msp430Adc12ImplP.ControlA0 -> Msp430TimerC.ControlA0;
   Msp430Adc12ImplP.ControlA1 -> Msp430TimerC.ControlA1;
   Msp430Adc12ImplP.CompareA0 -> Msp430TimerC.CompareA0;
   Msp430Adc12ImplP.CompareA1 -> Msp430TimerC.CompareA1;
+#endif
 }