Added a generic that generates a nesC warning if someone wired to RefVolt arbiter

but forgot to wire the AdcConfigure interface (the component does not generate
any code).

diff --git a/tos/chips/msp430/adc12/Msp430Adc12ClientAutoDMA_RVGC.nc b/tos/chips/msp430/adc12/Msp430Adc12ClientAutoDMA_RVGC.nc
index 6fea1bd392292ffd520bd45b6c0b06686d4b59b6..7377496e18c158d7e7e7460a1085804e42644b13 100644 (file)
--- a/tos/chips/msp430/adc12/Msp430Adc12ClientAutoDMA_RVGC.nc
+++ b/tos/chips/msp430/adc12/Msp430Adc12ClientAutoDMA_RVGC.nc
@@ -58,7 +58,10 @@ generic configuration Msp430Adc12ClientAutoDMA_RVGC()
   Resource = Msp430RefVoltArbiterP.ClientResource[ID];\r
   \r
   Msp430RefVoltArbiterP.AdcResource[ID] -> Msp430Adc12P.Resource[ID];\r
-  AdcConfigure = Msp430RefVoltArbiterP.Config[ID]; \r
+\r
+  components new Msp430Adc12ConfAlertC();\r
+  AdcConfigure = Msp430Adc12ConfAlertC.ConfUp;\r
+  Msp430RefVoltArbiterP.Config[ID] -> Msp430Adc12ConfAlertC.ConfSub;   \r
 \r
   components Msp430DmaC, Msp430Adc12DMAP;\r
   \r

diff --git a/tos/chips/msp430/adc12/Msp430Adc12ClientAutoRVGC.nc b/tos/chips/msp430/adc12/Msp430Adc12ClientAutoRVGC.nc
index 9c732a5027968267c70566b64c06c3fc4ac94453..246f5860859b37a6ed64169723c21951a984444f 100644 (file)
--- a/tos/chips/msp430/adc12/Msp430Adc12ClientAutoRVGC.nc
+++ b/tos/chips/msp430/adc12/Msp430Adc12ClientAutoRVGC.nc
@@ -45,6 +45,7 @@ generic configuration Msp430Adc12ClientAutoRVGC()
   provides {\r
     interface Resource;\r
     interface Msp430Adc12SingleChannel;\r
+    interface Msp430Adc12MultiChannel;\r
   }\r
   uses interface AdcConfigure<const msp430adc12_channel_config_t*>;\r
 } implementation {\r
@@ -55,7 +56,11 @@ generic configuration Msp430Adc12ClientAutoRVGC()
   };\r
   Resource = Msp430RefVoltArbiterP.ClientResource[ID];\r
   Msp430Adc12SingleChannel = Msp430Adc12P.SingleChannel[ID];\r
+  Msp430Adc12MultiChannel = Msp430Adc12P.MultiChannel[ID];\r
   \r
   Msp430RefVoltArbiterP.AdcResource[ID] -> Msp430Adc12P.Resource[ID];\r
-  AdcConfigure = Msp430RefVoltArbiterP.Config[ID]; \r
+\r
+  components new Msp430Adc12ConfAlertC();\r
+  AdcConfigure = Msp430Adc12ConfAlertC.ConfUp;\r
+  Msp430RefVoltArbiterP.Config[ID] -> Msp430Adc12ConfAlertC.ConfSub; \r
 }\r

diff --git a/tos/chips/msp430/adc12/Msp430Adc12ConfAlertC.nc b/tos/chips/msp430/adc12/Msp430Adc12ConfAlertC.nc
new file mode 100644 (file)
index 0000000..65a1e85
--- /dev/null
+++ b/tos/chips/msp430/adc12/Msp430Adc12ConfAlertC.nc
@@ -0,0 +1,51 @@
+/* \r
+ * Copyright (c) 2006, Technische Universitaet Berlin All rights reserved.\r
+ *\r
+ * Redistribution and use in source and binary forms, with or without\r
+ * modification, are permitted provided that the following conditions are met:\r
+ * - Redistributions of source code must retain the above copyright notice,\r
+ * this list of conditions and the following disclaimer.  - Redistributions in\r
+ * binary form must reproduce the above copyright notice, this list of\r
+ * conditions and the following disclaimer in the documentation and/or other\r
+ * materials provided with the distribution.  - Neither the name of the\r
+ * Technische Universitaet Berlin nor the names of its contributors may be used\r
+ * to endorse or promote products derived from this software without specific\r
+ * prior written permission.\r
+ *\r
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"\r
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\r
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE\r
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\r
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\r
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\r
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\r
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\r
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\r
+ * POSSIBILITY OF SUCH DAMAGE.\r
+ *\r
+ * - Revision -------------------------------------------------------------\r
+ * $Revision$ $Date$ @author: Jan Hauer\r
+ * <hauer@tkn.tu-berlin.de>\r
+ * ========================================================================\r
+ */\r
+ \r
+/** \r
+ * The only purpose of this component is to generate a nesC warning\r
+ * if someone has wired to Msp430Adc12ClientAutoRVGC or \r
+ * Msp430Adc12ClientAutoDMA_RVGC and forgotten to wire to AdcConfigure.\r
+ * (nesC optimizes all of its code away).\r
+ *\r
+ * @author: Jan Hauer\r
+ */\r
+#include <Msp430Adc12.h> \r
+generic module Msp430Adc12ConfAlertC()\r
+{\r
+  provides interface AdcConfigure<const msp430adc12_channel_config_t*> as ConfSub;\r
+  uses interface AdcConfigure<const msp430adc12_channel_config_t*> as ConfUp;\r
+} implementation {\r
+  async command const msp430adc12_channel_config_t* ConfSub.getConfiguration()\r
+  {\r
+    return call ConfUp.getConfiguration();\r
+  }\r
+}\r