cVS: ----------------------------------------------------------------------

Change to follow TEP 109 .

diff --git a/tos/sensorboards/mts300/AccelReadP.nc b/tos/sensorboards/mts300/AccelReadP.nc
new file mode 100644 (file)
index 0000000..7d73585
--- /dev/null
+++ b/tos/sensorboards/mts300/AccelReadP.nc
@@ -0,0 +1,34 @@
+configuration AccelReadP
+{
+  provides 
+  {
+    interface Read<uint16_t> as ReadX[uint8_t client];
+    interface Read<uint16_t> as ReadY[uint8_t client];
+  }
+  uses
+  {
+    interface Read<uint16_t> as ActualX[uint8_t client];
+    interface Read<uint16_t> as ActualY[uint8_t client];
+  }
+}
+implementation
+{
+  components AccelConfigP,
+//    new MultiplexedReadC(uint16_t) as MultiplexX,
+//    new MultiplexedReadC(uint16_t) as MultiplexY,
+    new ArbitratedReadC(uint16_t) as MultiplexX,
+    new ArbitratedReadC(uint16_t) as MultiplexY;
+//    new AdcReadClientC() as AdcX,
+//    new AdcReadClientC() as AdcY;
+
+  ReadX = MultiplexX;
+  MultiplexX.Resource -> AccelConfigP;
+  MultiplexX.Service = ActualX;
+  //AdcX.Atm128AdcConfig -> AccelConfigP.ConfigX;
+
+  ReadY = MultiplexY;
+  MultiplexY.Resource -> AccelConfigP;
+  MultiplexY.Service = ActualY;
+  //AdcY.Atm128AdcConfig -> AccelConfigP.ConfigY;
+}
+

diff --git a/tos/sensorboards/mts300/AccelReadStreamP.nc b/tos/sensorboards/mts300/AccelReadStreamP.nc
new file mode 100644 (file)
index 0000000..3db96e8
--- /dev/null
+++ b/tos/sensorboards/mts300/AccelReadStreamP.nc
@@ -0,0 +1,29 @@
+configuration AccelReadStreamP
+{
+  provides {
+    interface ReadStream<uint16_t> as ReadStreamX[uint8_t client];
+    interface ReadStream<uint16_t> as ReadStreamY[uint8_t client];
+  }
+  uses {
+    interface ReadStream<uint16_t> as ActualX[uint8_t client];
+    interface ReadStream<uint16_t> as ActualY[uint8_t client];
+  }
+}
+implementation
+{
+  enum {
+    NACCEL_CLIENTS = uniqueCount(UQ_ACCEL_RESOURCE)
+  };
+  components AccelConfigP,
+    new ArbitratedReadStreamC(NACCEL_CLIENTS, uint16_t) as MultiplexX,
+    new ArbitratedReadStreamC(NACCEL_CLIENTS, uint16_t) as MultiplexY;
+
+  ReadStreamX = MultiplexX;
+  MultiplexX.Resource -> AccelConfigP;
+  MultiplexX.Service = ActualX;
+
+  ReadStreamY = MultiplexY;
+  MultiplexY.Resource -> AccelConfigP;
+  MultiplexY.Service = ActualY;
+}
+

diff --git a/tos/sensorboards/mts300/AccelXC.nc b/tos/sensorboards/mts300/AccelXC.nc
new file mode 100644 (file)
index 0000000..2d203a7
--- /dev/null
+++ b/tos/sensorboards/mts300/AccelXC.nc
@@ -0,0 +1,33 @@
+/* $Id$
+ * Copyright (c) 2006 Intel Corporation
+ * All rights reserved.
+ *
+ * This file is distributed under the terms in the attached INTEL-LICENSE     
+ * file. If you do not find these files, copies can be found by writing to
+ * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
+ * 94704.  Attention:  Intel License Inquiry.
+ */
+/**
+ * Acceldiode of the basicsb sensor board.
+ * 
+ * @author David Gay
+ */
+
+#include "mts300.h"
+
+generic configuration AccelXC()
+{
+  provides interface Read<uint16_t>;
+}
+implementation {
+  enum {
+    ID = unique(UQ_ACCEL_RESOURCE)
+  };
+  
+  components AccelReadP,AccelConfigP, new AdcReadClientC() as AdcX;
+
+  Read = AccelReadP.ReadX[ID];
+  AccelReadP.ActualX[ID] -> AdcX;
+  AdcX.Atm128AdcConfig -> AccelConfigP.ConfigX;
+}
+

diff --git a/tos/sensorboards/mts300/AccelXStreamC.nc b/tos/sensorboards/mts300/AccelXStreamC.nc
new file mode 100644 (file)
index 0000000..ee0efbe
--- /dev/null
+++ b/tos/sensorboards/mts300/AccelXStreamC.nc
@@ -0,0 +1,30 @@
+/* $Id$
+ * Copyright (c) 2006 Intel Corporation
+ * All rights reserved.
+ *
+ * This file is distributed under the terms in the attached INTEL-LICENSE     
+ * file. If you do not find these files, copies can be found by writing to
+ * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
+ * 94704.  Attention:  Intel License Inquiry.
+ */
+/**
+ * AccelXdiode of the basicsb sensor board.
+ * 
+ * @author David Gay
+ */
+
+#include "mts300.h"
+
+generic configuration AccelXStreamC() {
+  provides interface ReadStream<uint16_t>;
+}
+implementation {
+  enum {
+    ID = unique(UQ_ACCEL_RESOURCE)
+  };
+  components AccelReadStreamP, AccelConfigP, new AdcReadStreamClientC();
+
+  ReadStream = AccelReadStreamP.ReadStreamX[ID];
+  AccelReadStreamP.ActualX[ID] -> AdcReadStreamClientC;
+  AdcReadStreamClientC.Atm128AdcConfig -> AccelConfigP.ConfigX;
+}

diff --git a/tos/sensorboards/mts300/AccelYC.nc b/tos/sensorboards/mts300/AccelYC.nc
new file mode 100644 (file)
index 0000000..7231d24
--- /dev/null
+++ b/tos/sensorboards/mts300/AccelYC.nc
@@ -0,0 +1,32 @@
+/* $Id$
+ * Copyright (c) 2006 Intel Corporation
+ * All rights reserved.
+ *
+ * This file is distributed under the terms in the attached INTEL-LICENSE     
+ * file. If you do not find these files, copies can be found by writing to
+ * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
+ * 94704.  Attention:  Intel License Inquiry.
+ */
+/**
+ * Acceldiode of the basicsb sensor board.
+ * 
+ * @author David Gay
+ */
+
+#include "mts300.h"
+
+generic configuration AccelYC()
+{
+  provides interface Read<uint16_t>;
+}
+implementation {
+  enum {
+    ID = unique(UQ_ACCEL_RESOURCE)
+  };
+  
+  components AccelReadP,AccelConfigP, new AdcReadClientC() as AdcY;
+
+  Read = AccelReadP.ReadY[ID];
+  AccelReadP.ActualY[ID] -> AdcY;
+  AdcY.Atm128AdcConfig -> AccelConfigP.ConfigY;
+}
\ No newline at end of file

diff --git a/tos/sensorboards/mts300/AccelYStreamC.nc b/tos/sensorboards/mts300/AccelYStreamC.nc
new file mode 100644 (file)
index 0000000..5118213
--- /dev/null
+++ b/tos/sensorboards/mts300/AccelYStreamC.nc
@@ -0,0 +1,30 @@
+/* $Id$
+ * Copyright (c) 2006 Intel Corporation
+ * All rights reserved.
+ *
+ * This file is distributed under the terms in the attached INTEL-LICENSE     
+ * file. If you do not find these files, copies can be found by writing to
+ * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
+ * 94704.  Attention:  Intel License Inquiry.
+ */
+/**
+ * AccelXdiode of the basicsb sensor board.
+ * 
+ * @author David Gay
+ */
+
+#include "mts300.h"
+
+generic configuration AccelYStreamC() {
+  provides interface ReadStream<uint16_t>;
+}
+implementation {
+  enum {
+    ID = unique(UQ_ACCEL_RESOURCE)
+  };
+  components AccelReadStreamP, AccelConfigP, new AdcReadStreamClientC();
+
+  ReadStream = AccelReadStreamP.ReadStreamY[ID];
+  AccelReadStreamP.ActualY[ID] -> AdcReadStreamClientC;
+  AdcReadStreamClientC.Atm128AdcConfig -> AccelConfigP.ConfigY;
+}

diff --git a/tos/sensorboards/mts300/ArbitratedPhotoDeviceP.nc b/tos/sensorboards/mts300/ArbitratedPhotoDeviceP.nc
new file mode 100644 (file)
index 0000000..d0c7f8a
--- /dev/null
+++ b/tos/sensorboards/mts300/ArbitratedPhotoDeviceP.nc
@@ -0,0 +1,13 @@
+configuration ArbitratedPhotoDeviceP
+{
+  provides interface Read<uint16_t>[uint8_t client];
+}
+implementation
+{
+  components PhotoTempDeviceC,
+    new ArbitratedReadC(uint16_t) as ArbitrateRead;
+
+  Read = ArbitrateRead;
+  ArbitrateRead.Service -> PhotoTempDeviceC.ReadPhoto;
+  ArbitrateRead.Resource -> PhotoTempDeviceC.PhotoResource;
+}

diff --git a/tos/sensorboards/mts300/ArbitratedTempDeviceP.nc b/tos/sensorboards/mts300/ArbitratedTempDeviceP.nc
new file mode 100644 (file)
index 0000000..35559ed
--- /dev/null
+++ b/tos/sensorboards/mts300/ArbitratedTempDeviceP.nc
@@ -0,0 +1,13 @@
+configuration ArbitratedTempDeviceP\r
+{\r
+  provides interface Read<uint16_t>[uint8_t client];\r
+}\r
+implementation\r
+{\r
+  components PhotoTempDeviceC,\r
+    new ArbitratedReadC(uint16_t) as ArbitrateRead;\r
+\r
+  Read = ArbitrateRead;\r
+  ArbitrateRead.Service -> PhotoTempDeviceC.ReadTemp;\r
+  ArbitrateRead.Resource -> PhotoTempDeviceC.TempResource;\r
+}\r