Swapping HEAD and DEVEL branches

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

diff --git a/tos/sensorboards/im2sb/Tsl2561InternalC.nc b/tos/sensorboards/im2sb/Tsl2561InternalC.nc
index 94794f83bd5dfa3b18e5d390863377358a5ffddc..4ab2610f826b2aac6194acd12aa10f9fe786acec 100644 (file)
--- a/tos/sensorboards/im2sb/Tsl2561InternalC.nc
+++ b/tos/sensorboards/im2sb/Tsl2561InternalC.nc
@@ -46,26 +46,29 @@ implementation {
 
   };
 
-  components new FcfsArbiterC( "Tsl2561.Resource" ) as Arbiter;
+  components new SimpleFcfsArbiterC( "Tsl2561.Resource" ) as Arbiter;
   components MainC;
   Resource = Arbiter;
-  MainC.SoftwareInit -> Arbiter;
   
   components new HplTSL2561LogicP(TSL2561_SLAVE_ADDR) as Logic;
-  MainC.SoftwareInit -> Logic;
+  //MainC.SoftwareInit -> Logic;
 
+  components LedsC;
+  Logic.Leds -> LedsC;
   components GeneralIOC;
   Logic.InterruptAlert -> GeneralIOC.GpioInterrupt[GPIO_TSL2561_LIGHT_INT];
   Logic.InterruptPin -> GeneralIOC.GeneralIO[GPIO_TSL2561_LIGHT_INT];
 
-  components HalPXA27xI2CMasterC as I2CC;
+  components new HalPXA27xI2CMasterC(TRUE) as I2CC;
   Logic.I2CPacket -> I2CC;
 
   components Tsl2561InternalP as Internal;
   HplTSL256x = Internal.HplTSL256x;
   Internal.ToHPLC -> Logic.HplTSL256x;
-
+  Internal.SubInit -> Logic.Init;
+  Internal.InterruptAlert -> GeneralIOC.GpioInterrupt[GPIO_TSL2561_LIGHT_INT];
   SplitControl = Logic;
+  MainC.SoftwareInit -> Internal;
 
   components HplPXA27xGPIOC;
   I2CC.I2CSCL -> HplPXA27xGPIOC.HplPXA27xGPIOPin[I2C_SCL];