Swapping HEAD and DEVEL branches

[tinyos-2.x.git] / tos / platforms / eyesIFX / eyesIFXSerialP.nc

diff --git a/tos/platforms/eyesIFX/eyesIFXSerialP.nc b/tos/platforms/eyesIFX/eyesIFXSerialP.nc
index 55ff4ac5ccc591a41261251bbef49c01a390c12f..dc93e52a54526cb06da6cbd924cd0c9b496a49e7 100644 (file)
--- a/tos/platforms/eyesIFX/eyesIFXSerialP.nc
+++ b/tos/platforms/eyesIFX/eyesIFXSerialP.nc
@@ -4,11 +4,7 @@ module eyesIFXSerialP {
  uses interface Resource;
 }
 implementation {
-  //msp430_uart_config_t msp430_uart_eyes_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};
-  
-  // when the tda5250 is in receive mode we get problems with 115200 baud 
-  // on the serial line ...
-  msp430_uart_config_t msp430_uart_eyes_config = {ubr: UBR_1MHZ_57600, umctl: UMCTL_1MHZ_57600, 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_eyes_config = { {ubr: UBR_1MHZ_57600, umctl: UMCTL_1MHZ_57600, ssel: 0x02, pena: 0, pev: 0, spb: 0, clen: 1, listen: 0, mm: 0, ckpl: 0, urxse: 0, urxeie: 1, urxwie: 0, urxe: 1, utxe: 1} };
 
   command error_t StdControl.start(){
     return call Resource.immediateRequest();
@@ -19,7 +15,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_eyes_config;
   }
 }