[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/telosa TelosSerialP.nc, 1.1.2.3, 1.1.2.4

Philipp Huppertz phihup at users.sourceforge.net
Thu Nov 30 05:27:55 PST 2006


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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	TelosSerialP.nc 
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: TelosSerialP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/telosa/TelosSerialP.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** TelosSerialP.nc	4 Aug 2006 02:59:12 -0000	1.1.2.3
--- TelosSerialP.nc	30 Nov 2006 13:27:53 -0000	1.1.2.4
***************
*** 6,10 ****
  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};
  
    command error_t StdControl.start(){
--- 6,10 ----
  implementation {
    
!   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(){
***************
*** 17,21 ****
    event void Resource.granted(){}
  
!   async command msp430_uart_config_t* Msp430UartConfigure.getConfig() {
      return &msp430_uart_telos_config;
    }
--- 17,21 ----
    event void Resource.granted(){}
  
!   async command msp430_uart_union_config_t* Msp430UartConfigure.getConfig() {
      return &msp430_uart_telos_config;
    }



More information about the Tinyos-2-commits mailing list