Merge over into the trunk.

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

diff --git a/tos/sensorboards/im2sb/MAX136xInternalC.nc b/tos/sensorboards/im2sb/MAX136xInternalC.nc
index 3c564f27c78446ce54a3ae40aa31e030cb9f79b3..f03d2c69c645d6608a46dca31f9c3031e802f6cb 100644 (file)
--- a/tos/sensorboards/im2sb/MAX136xInternalC.nc
+++ b/tos/sensorboards/im2sb/MAX136xInternalC.nc
@@ -42,15 +42,14 @@ configuration MAX136xInternalC {
 }
 
 implementation {
-  components new FcfsArbiterC( "MAX136x.Resource" )as Arbiter;
+  components new SimpleFcfsArbiterC( "MAX136x.Resource" )as Arbiter;
   components MainC;
   Resource = Arbiter;
-  MainC.SoftwareInit -> Arbiter;
 
   components new HplMAX136xLogicP(MAX136_SLAVE_ADDR) as Logic;
   MainC.SoftwareInit -> Logic;
 
-  components HalPXA27xI2CMasterC as I2CC;
+  components new HalPXA27xI2CMasterC(TRUE) as I2CC;
   Logic.I2CPacket -> I2CC;
 
   components MAX136xInternalP as Internal;