[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/eyesIFX eyesIFXSerialP.nc, 1.1.2.3, 1.1.2.4 RadioDataLinkC.nc, 1.1.2.10, 1.1.2.11

[Philipp Huppertz]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	eyesIFXSerialP.nc RadioDataLinkC.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: eyesIFXSerialP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/eyesIFXSerialP.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
*** eyesIFXSerialP.nc	9 Aug 2006 16:51:50 -0000	1.1.2.3
--- eyesIFXSerialP.nc	30 Nov 2006 13:27:52 -0000	1.1.2.4
***************
*** 5,13 ****
  }
  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};
  
    command error_t StdControl.start(){
--- 5,9 ----
  }
  implementation {
!   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(){
***************
*** 20,24 ****
    event void Resource.granted(){}
  
!   async command msp430_uart_config_t* Msp430UartConfigure.getConfig() {
      return &msp430_uart_eyes_config;
    }
--- 16,20 ----
    event void Resource.granted(){}
  
!   async command msp430_uart_union_config_t* Msp430UartConfigure.getConfig() {
      return &msp430_uart_eyes_config;
    }

Index: RadioDataLinkC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/RadioDataLinkC.nc,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -C2 -d -r1.1.2.10 -r1.1.2.11
*** RadioDataLinkC.nc	7 Nov 2006 23:15:14 -0000	1.1.2.10
--- RadioDataLinkC.nc	30 Nov 2006 13:27:53 -0000	1.1.2.11
***************
*** 52,57 ****
          Uart4b6bPhyC as UartPhy,                 //The UartPhy turns Bits into Bytes
          PacketSerializerP  as PacketSerializer,  //The PacketSerializer turns Bytes into Packets
          CsmaMacC as Mac,                         //The MAC protocol to use
!         LinkLayerC as Llc;                       //The Link Layer Control module to use
      
      //Don't change wirings below this point, just change which components
--- 52,59 ----
          Uart4b6bPhyC as UartPhy,                 //The UartPhy turns Bits into Bytes
          PacketSerializerP  as PacketSerializer,  //The PacketSerializer turns Bytes into Packets
+         //BasicMacC as Mac,                         //The MAC protocol to use
          CsmaMacC as Mac,                         //The MAC protocol to use
! 
!             LinkLayerC as Llc;                       //The Link Layer Control module to use
      
      //Don't change wirings below this point, just change which components