[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/eyesIFX eyesIFXSerialP.nc, 1.1.2.1, 1.1.2.2 .family, 1.1.2.4, 1.1.2.5 PlatformSerialC.nc, 1.1.2.4, 1.1.2.5 RadioDataLinkC.nc, 1.1.2.6, 1.1.2.7

[Philipp Huppertz]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	eyesIFXSerialP.nc .family PlatformSerialC.nc RadioDataLinkC.nc 
Log Message:
- updated eyes platform to use usart configure
- a few bug fixes

Index: eyesIFXSerialP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/eyesIFXSerialP.nc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** eyesIFXSerialP.nc	1 Feb 2006 18:34:04 -0000	1.1.2.1
--- eyesIFXSerialP.nc	3 Aug 2006 18:17:52 -0000	1.1.2.2
***************
*** 1,14 ****
  module eyesIFXSerialP {
   provides interface StdControl;
   uses interface Resource;
  }
  implementation {
!  command error_t StdControl.start(){
!    return call Resource.immediateRequest();
!  }
!  command error_t StdControl.stop(){
!    call Resource.release();
!    return SUCCESS;
!  }
!  event void Resource.granted(){}
  }
--- 1,22 ----
  module eyesIFXSerialP {
   provides interface StdControl;
+  provides interface Msp430UartConfigure;
   uses interface Resource;
  }
  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(){
!     return call Resource.immediateRequest();
!   }
!   command error_t StdControl.stop(){
!     call Resource.release();
!     return SUCCESS;
!   }
!   event void Resource.granted(){}
! 
!   async command msp430_uart_config_t* Msp430UartConfigure.getConfig() {
!     return &msp430_uart_telos_config;
!   }
  }

Index: .family
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/.family,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** .family	31 May 2006 13:53:03 -0000	1.1.2.4
--- .family	3 Aug 2006 18:17:52 -0000	1.1.2.5
***************
*** 6,13 ****
  
  push( @includes, qw(
! 
    %T/platforms/eyesIFX
    %T/platforms/eyesIFX/chips/tda5250
    %T/platforms/eyesIFX/chips/ad5200
    %T/platforms/eyesIFX/sensors
    %T/platforms/eyesIFX/byte_radio
--- 6,14 ----
  
  push( @includes, qw(
! # normal platform includes
    %T/platforms/eyesIFX
    %T/platforms/eyesIFX/chips/tda5250
    %T/platforms/eyesIFX/chips/ad5200
+   %T/platforms/eyesIFX/chips/msp430
    %T/platforms/eyesIFX/sensors
    %T/platforms/eyesIFX/byte_radio

Index: PlatformSerialC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/PlatformSerialC.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
*** PlatformSerialC.nc	1 Feb 2006 19:10:09 -0000	1.1.2.4
--- PlatformSerialC.nc	3 Aug 2006 18:17:52 -0000	1.1.2.5
***************
*** 1,14 ****
  configuration PlatformSerialC {
-   provides interface Init;
    provides interface StdControl;
    provides interface SerialByteComm;
  }
  implementation {
!   components new Uart1C() as UartC, eyesIFXSerialP;
  
-   Init = UartC;
-   StdControl = UartC;
    SerialByteComm = UartC;
    StdControl = eyesIFXSerialP;
    eyesIFXSerialP.Resource -> UartC.Resource;
  }
--- 1,12 ----
  configuration PlatformSerialC {
    provides interface StdControl;
    provides interface SerialByteComm;
  }
  implementation {
!   components new Msp430Uart1C() as UartC, eyesIFXSerialP;
  
    SerialByteComm = UartC;
    StdControl = eyesIFXSerialP;
+   eyesIFXSerialP.Msp430UartConfigure <- UartC.Msp430UartConfigure;
    eyesIFXSerialP.Resource -> UartC.Resource;
  }

Index: RadioDataLinkC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/RadioDataLinkC.nc,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** RadioDataLinkC.nc	7 Jun 2006 19:54:53 -0000	1.1.2.6
--- RadioDataLinkC.nc	3 Aug 2006 18:17:52 -0000	1.1.2.7
***************
*** 53,57 ****
          PacketSerializerP  as PacketSerializer,  //The PacketSerializer turns Bytes into Packets
          CsmaMacC as Mac,                         //The MAC protocol to use
-         //SyncSampleMacC as Mac,
          LinkLayerC as Llc;                       //The Link Layer Control module to use
      
--- 53,56 ----
***************
*** 69,77 ****
      Receive = Llc.Receive;
      PacketAcknowledgements = Llc;
!     Packet = PacketSerializer;
    
      Llc.SendDown->Mac.MacSend;
      Llc.ReceiveLower->Mac.MacReceive;
!     Llc.Packet->PacketSerializer.Packet;
      
      Mac.PacketSend->PacketSerializer.PhySend;
--- 68,77 ----
      Receive = Llc.Receive;
      PacketAcknowledgements = Llc;
!     Packet = Mac;
    
      Llc.SendDown->Mac.MacSend;
      Llc.ReceiveLower->Mac.MacReceive;
!     Llc.Packet->Mac.Packet;
!     Mac.SubPacket->PacketSerializer.Packet;
      
      Mac.PacketSend->PacketSerializer.PhySend;
***************
*** 79,83 ****
      Mac.Tda5250Control->Radio;
      Mac.UartPhyControl -> UartPhy;
!     
      PacketSerializer.RadioByteComm -> UartPhy.SerializerRadioByteComm;
      PacketSerializer.PhyPacketTx -> UartPhy.PhyPacketTx;
--- 79,84 ----
      Mac.Tda5250Control->Radio;
      Mac.UartPhyControl -> UartPhy;
! 
!     Mac.RadioTimeStamping -> PacketSerializer.RadioTimeStamping;
      PacketSerializer.RadioByteComm -> UartPhy.SerializerRadioByteComm;
      PacketSerializer.PhyPacketTx -> UartPhy.PhyPacketTx;