[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/eyesIFX/chips/tda5250 HplTda5250DataIOC.nc, 1.3, 1.4 HplTda5250DataIOP.nc, 1.3, 1.4 Tda5250RadioIOC.nc, 1.3, 1.4 Tda5250RadioInterruptC.nc, 1.3, 1.4 Tda5250RegCommC.nc, 1.3, 1.4 tda5250BusResourceSettings.h, 1.3, 1.4 tda5250RegDefaultSettings.h, 1.3, 1.4 HplTda5250DataC.nc, 1.2, NONE tda5250BusResourceId.h, 1.2, NONE

[Vlado Handziski]

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

Modified Files:
	HplTda5250DataIOC.nc HplTda5250DataIOP.nc Tda5250RadioIOC.nc 
	Tda5250RadioInterruptC.nc Tda5250RegCommC.nc 
	tda5250BusResourceSettings.h tda5250RegDefaultSettings.h 
Removed Files:
	HplTda5250DataC.nc tda5250BusResourceId.h 
Log Message:
Swapping HEAD and DEVEL branches

Index: HplTda5250DataIOC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/chips/tda5250/HplTda5250DataIOC.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HplTda5250DataIOC.nc	7 Nov 2006 19:31:23 -0000	1.3
--- HplTda5250DataIOC.nc	12 Dec 2006 18:23:41 -0000	1.4
***************
*** 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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HplTda5250DataIOP.nc	7 Nov 2006 19:31:23 -0000	1.3
--- HplTda5250DataIOP.nc	12 Dec 2006 18:23:41 -0000	1.4
***************
*** 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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tda5250BusResourceSettings.h	7 Nov 2006 19:31:23 -0000	1.3
--- tda5250BusResourceSettings.h	12 Dec 2006 18:23:41 -0000	1.4
***************
*** 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: 1, 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} };
  
  


--- HplTda5250DataC.nc DELETED ---

--- tda5250BusResourceId.h DELETED ---