Swapping HEAD and DEVEL branches

[tinyos-2.x.git] / tos / sensorboards / im2sb / MAX136xInternalC.nc

diff --git a/tos/sensorboards/im2sb/MAX136xInternalC.nc b/tos/sensorboards/im2sb/MAX136xInternalC.nc
index f03d2c69c645d6608a46dca31f9c3031e802f6cb..7f7bdbd4140c0f9962b6162c980b3b8d5afa3e1f 100644 (file)
--- a/tos/sensorboards/im2sb/MAX136xInternalC.nc
+++ b/tos/sensorboards/im2sb/MAX136xInternalC.nc
@@ -47,7 +47,11 @@ implementation {
   Resource = Arbiter;
 
   components new HplMAX136xLogicP(MAX136_SLAVE_ADDR) as Logic;
-  MainC.SoftwareInit -> Logic;
+  //MainC.SoftwareInit -> Logic;
+
+ components GeneralIOC;
+  Logic.InterruptAlert -> GeneralIOC.GpioInterrupt[GPIO_MAX1363_ANALOG_INT];
+  Logic.InterruptPin -> GeneralIOC.GeneralIO[GPIO_MAX1363_ANALOG_INT];
 
   components new HalPXA27xI2CMasterC(TRUE) as I2CC;
   Logic.I2CPacket -> I2CC;
@@ -55,9 +59,12 @@ implementation {
   components MAX136xInternalP as Internal;
   HplMAX136x = Internal.HplMAX136x;
   Internal.ToHPLC -> Logic.HplMAX136x;
-
+  Internal.SubInit -> Logic.Init;
+  Internal.InterruptAlert -> GeneralIOC.GpioInterrupt[GPIO_MAX1363_ANALOG_INT];
+  MainC.SoftwareInit -> Internal.Init;
   SplitControl = Logic;
 
+ 
   components HplPXA27xGPIOC;
   I2CC.I2CSCL -> HplPXA27xGPIOC.HplPXA27xGPIOPin[I2C_SCL];
   I2CC.I2CSDA -> HplPXA27xGPIOC.HplPXA27xGPIOPin[I2C_SDA];