Merge over into the trunk.

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

diff --git a/tos/sensorboards/im2sb/TMP175InternalC.nc b/tos/sensorboards/im2sb/TMP175InternalC.nc
index 0d631a3a0969ae7a2030c3bd348f69ca9504b6ed..b707ee48da40b51544b6d89f45500bd3435aa2c9 100644 (file)
--- a/tos/sensorboards/im2sb/TMP175InternalC.nc
+++ b/tos/sensorboards/im2sb/TMP175InternalC.nc
@@ -46,10 +46,9 @@ implementation {
     ADV_ID = unique("TMP175.HplAccess"),
   };
   
-  components new FcfsArbiterC( "TMP175.Resource" ) as Arbiter;
+  components new SimpleFcfsArbiterC( "TMP175.Resource" ) as Arbiter;
   components MainC;
   Resource = Arbiter;
-  MainC.SoftwareInit -> Arbiter;
 
   components new HplTMP175LogicP(TMP175_SLAVE_ADDR) as Logic;
   MainC.SoftwareInit -> Logic;
@@ -58,7 +57,7 @@ implementation {
   Logic.AlertInterrupt -> GeneralIOC.GpioInterrupt[GPIO_TMP175_TEMP_ALERT];
   Logic.InterruptPin -> GeneralIOC.GeneralIO[GPIO_TMP175_TEMP_ALERT];
 
-  components HalPXA27xI2CMasterC as I2CC;
+  components new HalPXA27xI2CMasterC(TRUE) as I2CC;
   Logic.I2CPacket -> I2CC;
 
   components TMP175InternalP as Internal;