From: r-studio <r-studio>
Date: Mon, 7 Sep 2009 14:05:02 +0000 (+0000)
Subject: added support for mulle in net programing
X-Git-Tag: rc_6_tinyos_2_1_1~292
X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=commitdiff_plain;h=519e9d318b8708ee9cd8a63c177ec70b8adb87b8;p=tinyos-2.x.git

added support for mulle in net programing
---

diff --git a/tos/lib/net/Deluge/extra/NetProgC.nc b/tos/lib/net/Deluge/extra/NetProgC.nc
index 462ff7da..9857964a 100644
--- a/tos/lib/net/Deluge/extra/NetProgC.nc
+++ b/tos/lib/net/Deluge/extra/NetProgC.nc
@@ -53,7 +53,11 @@ implementation {
   components LedsC;
   NetProgM.Leds -> LedsC;
   
-  components CC2420ControlP, ActiveMessageAddressC;
-  NetProgM.CC2420Config -> CC2420ControlP;
+  components ActiveMessageAddressC;
   NetProgM.setAmAddress -> ActiveMessageAddressC;
+
+#if !defined(PLATFORM_MULLE)
+  components CC2420ControlP;
+  NetProgM.CC2420Config -> CC2420ControlP;
+#endif
 }
diff --git a/tos/lib/net/Deluge/extra/NetProgM.nc b/tos/lib/net/Deluge/extra/NetProgM.nc
index e77ebeed..95f4d30b 100644
--- a/tos/lib/net/Deluge/extra/NetProgM.nc
+++ b/tos/lib/net/Deluge/extra/NetProgM.nc
@@ -40,7 +40,9 @@ module NetProgM {
     interface InternalFlash as IFlash;
     interface Crc;
     interface Leds;
+#if !defined(PLATFORM_MULLE)
     interface CC2420Config;
+#endif
     async command void setAmAddress(am_addr_t a);
     interface ReprogramGuard;
   }