Changes to MultiSampleC

[tinyos-2.x.git] / tos / platforms / tmirws / sensors / MultiSampleC.nc

diff --git a/tos/platforms/tmirws/sensors/MultiSampleC.nc b/tos/platforms/tmirws/sensors/MultiSampleC.nc
index 50069c86b03e7e537968989defa04a25ea2c87e1..ac9c3c4c48bf531851228a8be3a9f99ba57e9b5f 100644 (file)
--- a/tos/platforms/tmirws/sensors/MultiSampleC.nc
+++ b/tos/platforms/tmirws/sensors/MultiSampleC.nc
@@ -28,25 +28,25 @@
  */
  
 /**
- * A generic component that multiply samples via the ADC, returning the sum of
- * ADC sample values.
+ * A generic component that multiply samples via the ADC, returning an array
+ * of ADC results.
  * 
  * @author R. Steve McKown <smckown@gmail.com>
  */
  
 #include <Msp430Adc12.h>
 
-generic configuration MultiSampleC(typedef val_t @integer(), uint16_t count) {
+generic configuration MultiSampleC(uint16_t count) {
   provides {
     interface Get<uint16_t> as Count;
-    interface Read<val_t>;
+    interface ReadRef<uint16_t>;
   }
   uses interface AdcConfigure<const msp430adc12_channel_config_t*>;
 }
 implementation {
-  components new MultiSampleP(val_t, count);
+  components new MultiSampleP(count);
   Count = MultiSampleP;
-  Read = MultiSampleP;
+  ReadRef = MultiSampleP;
 
   components new AdcReadStreamClientC();
   AdcConfigure = AdcReadStreamClientC;