[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/eyesIFX/chips/tda5250 HplTda5250DataIOC.nc, 1.1.2.4, 1.1.2.5 HplTda5250DataIOP.nc, 1.1.2.4, 1.1.2.5 tda5250BusResourceSettings.h, 1.1.4.4, 1.1.4.5

[Philipp Huppertz]

Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/chips/tda5250
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1527/tos/platforms/eyesIFX/chips/tda5250

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	HplTda5250DataIOC.nc HplTda5250DataIOP.nc 
	tda5250BusResourceSettings.h 
Log Message:
- changed usart to use union configurations 
- implementation of Usart0 and Usart1 is consistent again (don't configure in different ways)
- changed the way configure is done (don't rely on unconfiguring)
- do all configuring stuff in SWRST !
- fixed Spi.write(): rx interrupt is cleared now
- Spi.write() now relies on configure to disable rx interrupt
- fixed semantics of Usart.isTxIntrPending (dos not clear interrupt), now it behaves like Usart.isRxIntrPending
- removed UartControl: is no longer needed can be rx/tx can be set via config

Index: HplTda5250DataIOC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/chips/tda5250/HplTda5250DataIOC.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** HplTda5250DataIOC.nc	7 Nov 2006 23:15:14 -0000	1.1.2.4
--- HplTda5250DataIOC.nc	30 Nov 2006 13:27:52 -0000	1.1.2.5
***************
*** 57,61 ****
    UartDataControl = HplTda5250DataIOP.UartDataControl;
    
-   HplTda5250DataIOP.Msp430UartControl -> Msp430Uart0C.UartControl;
  	HplTda5250DataIOP.UartResourceConfigure <- Msp430Uart0C.Msp430UartConfigure;  
  }
--- 57,60 ----

Index: HplTda5250DataIOP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/chips/tda5250/HplTda5250DataIOP.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** HplTda5250DataIOP.nc	7 Nov 2006 23:15:14 -0000	1.1.2.4
--- HplTda5250DataIOP.nc	30 Nov 2006 13:27:52 -0000	1.1.2.5
***************
*** 45,51 ****
  		interface Msp430UartConfigure as UartResourceConfigure;
    } 
-   uses {
-     interface  Msp430UartControl;
-   }
  }
  
--- 45,48 ----
***************
*** 53,66 ****
    
    async command error_t UartDataControl.setToTx() {
!     call Msp430UartControl.setModeTx();
      return SUCCESS;
    }
  
    async command error_t UartDataControl.setToRx() {
!     call Msp430UartControl.setModeRx();
      return SUCCESS;
    }
  	
! 	async command msp430_uart_config_t* UartResourceConfigure.getConfig() {
  		return &tda5250_uart_config;
  	}
--- 50,69 ----
    
    async command error_t UartDataControl.setToTx() {
!         atomic {
!       tda5250_uart_config.uartConfig.utxe = 1;
!       tda5250_uart_config.uartConfig.urxe = 0;
!     }
      return SUCCESS;
    }
  
    async command error_t UartDataControl.setToRx() {
!     atomic {
!       tda5250_uart_config.uartConfig.utxe = 0;
!       tda5250_uart_config.uartConfig.urxe = 1;
!     }
      return SUCCESS;
    }
  	
! 	async command msp430_uart_union_config_t* UartResourceConfigure.getConfig() {
  		return &tda5250_uart_config;
  	}

Index: tda5250BusResourceSettings.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/chips/tda5250/tda5250BusResourceSettings.h,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -C2 -d -r1.1.4.4 -r1.1.4.5
*** tda5250BusResourceSettings.h	27 Nov 2006 18:22:53 -0000	1.1.4.4
--- tda5250BusResourceSettings.h	30 Nov 2006 13:27:52 -0000	1.1.4.5
***************
*** 41,45 ****
  };
  
! msp430_uart_config_t tda5250_uart_config = {ubr: UBR_1MHZ_38400, umctl: UMCTL_1MHZ_38400, ssel: 0x02, pena: 0, pev: 0, spb: 0, clen: 1, listen: 0, mm: 0, ckpl: 0, urxse: 0, urxeie: 0, urxwie: 0};
  
  
--- 41,45 ----
  };
  
! msp430_uart_union_config_t tda5250_uart_config = { {ubr: UBR_1MHZ_38400, umctl: UMCTL_1MHZ_38400, 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: 0} };