USCI UART output on USCI_A1 is working, using ACLK as BRCLK. Baud rate

[tinyos-2.x.git] / tos / chips / msp430 / usci / Msp430SpiB1C.nc

diff --git a/tos/chips/msp430/usci/Msp430SpiB1C.nc b/tos/chips/msp430/usci/Msp430SpiB1C.nc
index 980f637fb8f21f5731b518540ef79bc7da80f648..ad0997a4a1e14762a94c480156c66dc3eba16456 100644 (file)
--- a/tos/chips/msp430/usci/Msp430SpiB1C.nc
+++ b/tos/chips/msp430/usci/Msp430SpiB1C.nc
@@ -38,7 +38,9 @@
 #error "Target does not have a USCI_B1 peripheral (SPI)"
 #endif
 
-configuration Msp430SpiB1C {
+#include "Msp430Usci.h"
+
+generic configuration Msp430SpiB1C() {
   provides {
     interface Resource;
     interface ResourceRequested;
@@ -53,12 +55,12 @@ implementation {
     CLIENT_ID = unique(MSP430_USCIB1_RESOURCE)
   };
 
-  components Msp430SpiP as SpiP;
+  components new Msp430SpiP() as SpiP;
   SpiByte = SpiP;
   SpiPacket = SpiP;
   Msp430UsciSpiConfigure = SpiP;
 
-  components new Msp430UsciA0C() as UsciC;
+  components Msp430UsciA0C as UsciC;
   Resource = UsciC.Resource[CLIENT_ID];
   ResourceRequested = UsciC.ResourceRequested[CLIENT_ID];
   ArbiterInfo = UsciC.ArbiterInfo;