Swapping HEAD and DEVEL branches

[tinyos-2.x.git] / tos / platforms / telosa / TelosSerialP.nc

diff --git a/tos/platforms/telosa/TelosSerialP.nc b/tos/platforms/telosa/TelosSerialP.nc
index 9d4f36082f261f9f44df61ee6ac2156c423323e9..cf5eee2d18c02cbd357d69f5d6fb3d7cd6f95271 100644 (file)
--- a/tos/platforms/telosa/TelosSerialP.nc
+++ b/tos/platforms/telosa/TelosSerialP.nc
@@ -5,7 +5,7 @@ module TelosSerialP {
 }
 implementation {
   
-  msp430_uart_config_t msp430_uart_telos_config = {ubr: UBR_1MHZ_115200, umctl: UMCTL_1MHZ_115200, ssel: 0x02, pena: 0, pev: 0, spb: 0, clen: 1, listen: 0, mm: 0, ckpl: 0, urxse: 0, urxeie: 1, urxwie: 0};
+  msp430_uart_union_config_t msp430_uart_telos_config = { {ubr: UBR_1MHZ_115200, umctl: UMCTL_1MHZ_115200, ssel: 0x02, pena: 0, pev: 0, spb: 0, clen: 1, listen: 0, mm: 0, ckpl: 0, urxse: 0, urxeie: 1, urxwie: 0, utxe : 1, urxe : 1} };
 
   command error_t StdControl.start(){
     return call Resource.immediateRequest();
@@ -16,7 +16,7 @@ implementation {
   }
   event void Resource.granted(){}
 
-  async command msp430_uart_config_t* Msp430UartConfigure.getConfig() {
+  async command msp430_uart_union_config_t* Msp430UartConfigure.getConfig() {
     return &msp430_uart_telos_config;
   }