Change to follow TEP 109 .

[tinyos-2.x.git] / tos / sensorboards / mts300 / MicC.nc

diff --git a/tos/sensorboards/mts300/MicC.nc b/tos/sensorboards/mts300/MicC.nc
index 0d096d3bc055c215f6208fc965abf6e95bfb02a6..c4de55055a8ce5504213eec7842b1c5c8741f18b 100644 (file)
--- a/tos/sensorboards/mts300/MicC.nc
+++ b/tos/sensorboards/mts300/MicC.nc
@@ -31,20 +31,17 @@
 #include "mts300.h"
 
 generic configuration MicC() {
-  provides interface Init;
-  provides interface StdControl;
   provides interface Read<uint16_t>;
-  provides interface Mic;
-  provides interface MicInterrupt;
+  provides interface MicSetting;
 }
 implementation {
-  components new AdcReadClientC(), MicDeviceP;
+  enum {
+    ID = unique(UQ_MIC_RESOURCE)
+  };
+  components MicReadP, MicDeviceP, new AdcReadClientC();
 
-  Init = MicDeviceP;
-       StdControl = MicDeviceP;
-  Read = AdcReadClientC;
-  Mic = MicDeviceP;
-  MicInterrupt = MicDeviceP;
-  AdcReadClientC.Atm128AdcConfig -> MicDeviceP;
-  AdcReadClientC.ResourceConfigure -> MicDeviceP;
+  Read = MicReadP.Read[ID];
+  MicReadP.ActualRead[ID] -> AdcReadClientC;
+  AdcReadClientC.Atm128AdcConfig -> MicDeviceP.Atm128AdcConfig;
+  MicSetting = MicDeviceP;
 }