Merge over into the trunk.

[tinyos-2.x.git] / tos / platforms / intelmote2 / chips / cc2420 / IM2CC2420SpiP.nc

diff --git a/tos/platforms/intelmote2/chips/cc2420/IM2CC2420SpiP.nc b/tos/platforms/intelmote2/chips/cc2420/IM2CC2420SpiP.nc
index 7787169a7efa8db350e99e622e14be74606d6ae6..7cf3ca661c692d5fe97d1985dc1ab10ad24f0dc0 100644 (file)
--- a/tos/platforms/intelmote2/chips/cc2420/IM2CC2420SpiP.nc
+++ b/tos/platforms/intelmote2/chips/cc2420/IM2CC2420SpiP.nc
@@ -45,9 +45,9 @@ configuration IM2CC2420SpiP
 implementation \r
 {\r
 \r
-  components new FcfsArbiterC("CC2420SpiClient");\r
-  components new HalPXA27xSpiDMAM(0,1,0x7,FALSE) as HalPXA27xSpiM; // 6.5 Mbps, 8bit width\r
-  //components new HalPXA27xSpiPioM(0,1,0x7,FALSE) as HalPXA27xSpiM; // SPI, 6.5 Mbps, 8bit width, noRWOT\r
+  components new SimpleFcfsArbiterC("CC2420SpiClient") as FcfsArbiterC;\r
+  components new HalPXA27xSpiDMAC(1,0x7,FALSE) as HalPXA27xSpiM; // 6.5 Mbps, 8bit width\r
+  //components new HalPXA27xSpiPioC(1,0x7,FALSE) as HalPXA27xSpiM; // 6.5 Mbps, 8bit width\r
   components IM2CC2420InitSpiP;\r
   components HplPXA27xSSP3C;\r
   components HplPXA27xDMAC;\r
@@ -55,7 +55,6 @@ implementation
   components PlatformP;\r
 \r
   Init = IM2CC2420InitSpiP;\r
-  Init = FcfsArbiterC.Init;\r
   Init = HalPXA27xSpiM.Init;\r
 \r
   SpiByte = HalPXA27xSpiM;\r