From 1dbd19fe0179302afdf6fde2b945fb9354aab0f6 Mon Sep 17 00:00:00 2001
From: janhauer <janhauer>
Date: Mon, 25 Jun 2007 13:44:49 +0000
Subject: [PATCH] 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).

---
 .../adc12/Msp430Adc12ClientAutoDMA_RVGC.nc    |  5 +-
 .../msp430/adc12/Msp430Adc12ClientAutoRVGC.nc |  7 ++-
 .../msp430/adc12/Msp430Adc12ConfAlertC.nc     | 51 +++++++++++++++++++
 3 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 tos/chips/msp430/adc12/Msp430Adc12ConfAlertC.nc

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