Convert to Unix-style line terminators.

[tinyos-2.x.git] / tos / sensorboards / mts300 / MagConfigP.nc

diff --git a/tos/sensorboards/mts300/MagConfigP.nc b/tos/sensorboards/mts300/MagConfigP.nc
index 6f44f72f14cc8fc28f6d47052bb06e19097ec01a..ad341096c441954933761f3abd7154df0cb273f9 100644 (file)
--- a/tos/sensorboards/mts300/MagConfigP.nc
+++ b/tos/sensorboards/mts300/MagConfigP.nc
@@ -1,50 +1,51 @@
-/* $Id$\r
- * Copyright (c) 2006 Intel Corporation\r
- * All rights reserved.\r
- *\r
- * This file is distributed under the terms in the attached INTEL-LICENSE\r
- * file. If you do not find these files, copies can be found by writing to\r
- * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA,\r
- * 94704.  Attention:  Intel License Inquiry.\r
- */\r
-/**\r
- * Internal component for basicsb photodiode. Arbitrates access to the photo\r
- * diode and automatically turns it on or off based on user requests.\r
- *\r
- * @author David Gay\r
- */\r
-\r
-#include "mts300.h"\r
-#include "I2C.h"\r
-\r
-configuration MagConfigP {\r
-  provides {\r
-    interface Init;\r
-    interface StdControl;\r
-    interface Mag;\r
-\r
-    interface Atm128AdcConfig as ConfigX;\r
-    interface Atm128AdcConfig as ConfigY;\r
-    interface ResourceConfigure as ResourceX;\r
-    interface ResourceConfigure as ResourceY;\r
-  }\r
-}\r
-implementation {\r
-  components MagP, MicaBusC, new Atm128I2CMasterC() as I2CPot;\r
-\r
-       Init = MagP;\r
-       StdControl = MagP;\r
-       Mag = MagP;\r
-\r
-  ConfigX = MagP.ConfigX;\r
-  ConfigY = MagP.ConfigY;\r
-  ResourceX = MagP.ResourceX;\r
-  ResourceY = MagP.ResourceY;\r
-\r
-  MagP.I2CPacket -> I2CPot;\r
-  MagP.Resource -> I2CPot;\r
-\r
-  MagP.MagPower -> MicaBusC.PW5;\r
-  MagP.MagAdcX -> MicaBusC.Adc6;\r
-  MagP.MagAdcY -> MicaBusC.Adc5;\r
-}\r
+/* $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.
+ */
+/**
+ * Internal component for basicsb photodiode. Arbitrates access to the photo
+ * diode and automatically turns it on or off based on user requests.
+ *
+ * @author Alif Chen
+ */
+
+#include "mts300.h"
+#include "I2C.h"
+
+configuration MagConfigP {
+  provides {
+    interface Mag;
+    interface Resource[uint8_t client];
+    interface Atm128AdcConfig as ConfigX;
+    interface Atm128AdcConfig as ConfigY;
+  }
+}
+implementation {
+  components MagP, MicaBusC, new Atm128I2CMasterC() as I2CPot,
+               new TimerMilliC() as WarmupTimer,
+    new RoundRobinArbiterC(UQ_MAG_RESOURCE) as Arbiter,
+    new SplitControlPowerManagerC() as PowerManager;
+
+       Mag = MagP;
+
+  Resource = Arbiter;
+  ConfigX = MagP.ConfigX;
+  ConfigY = MagP.ConfigY;
+
+  PowerManager.ResourceDefaultOwner -> Arbiter;
+  PowerManager.ArbiterInfo -> Arbiter;
+  PowerManager.SplitControl -> MagP;
+
+  MagP.I2CPacket -> I2CPot;
+  MagP.I2CResource -> I2CPot;
+
+  MagP.Timer -> WarmupTimer;
+  MagP.MagPower -> MicaBusC.PW5;
+  MagP.MagAdcX -> MicaBusC.Adc6;
+  MagP.MagAdcY -> MicaBusC.Adc5;
+}