[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/eyesIFX ActiveMessageC.nc, 1.1.2.6, 1.1.2.6.2.1 eyesIFXSerialP.nc, 1.1.2.1.8.1, 1.1.2.1.8.2 .family, 1.1.2.4, 1.1.2.4.2.1 RadioDataLinkC.nc, 1.1.2.6, 1.1.2.6.2.1 Msp430Timer32khzMapC.nc, 1.1.2.1, NONE

Thu Oct 5 01:25:46 PDT 2006

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

Modified Files:
      Tag: tos-2-msp430-usart-configure-candidate
	ActiveMessageC.nc eyesIFXSerialP.nc .family RadioDataLinkC.nc 
Removed Files:
      Tag: tos-2-msp430-usart-configure-candidate
	Msp430Timer32khzMapC.nc 
Log Message:
- optimized version of usart configure using unions

Index: ActiveMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/ActiveMessageC.nc,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.6.2.1
diff -C2 -d -r1.1.2.6 -r1.1.2.6.2.1
*** ActiveMessageC.nc	27 May 2006 21:23:15 -0000	1.1.2.6
--- ActiveMessageC.nc	5 Oct 2006 08:25:44 -0000	1.1.2.6.2.1
***************
*** 61,70 ****
  }
  implementation {
    components Tda5250ActiveMessageC as AM;
  
    SplitControl = AM;
-   AMSend       = AM;
-   Receive      = AM.Receive;
-   Snoop        = AM.Snoop;
    Packet       = AM;
    AMPacket     = AM;
--- 61,76 ----
  }
  implementation {
+   components ActiveMessageFilterC as Filter;
    components Tda5250ActiveMessageC as AM;
+   
+   AMSend       = Filter;
+   Receive      = Filter.Receive;
+   Snoop        = Filter.Snoop;
+ 
+   Filter.SubAMSend -> AM;
+   Filter.SubReceive -> AM.Receive;
+   Filter.SubSnoop  -> AM.Snoop;
  
    SplitControl = AM;
    Packet       = AM;
    AMPacket     = AM;

Index: eyesIFXSerialP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/eyesIFXSerialP.nc,v
retrieving revision 1.1.2.1.8.1
retrieving revision 1.1.2.1.8.2
diff -C2 -d -r1.1.2.1.8.1 -r1.1.2.1.8.2
*** eyesIFXSerialP.nc	15 Jun 2006 19:31:29 -0000	1.1.2.1.8.1
--- eyesIFXSerialP.nc	5 Oct 2006 08:25:44 -0000	1.1.2.1.8.2
***************
*** 4,10 ****
   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(){
--- 4,11 ----
   uses interface Resource;
  }
! implementation { 
!   // when the tda5250 is in receive mode we get problems with 115200 baud 
!   // on the serial line ...
!       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(){
***************
*** 17,22 ****
    event void Resource.granted(){}
  
!   async command msp430_uart_config_t Msp430UartConfigure.getConfig() {
!     return msp430_uart_telos_config;
    }
  }
--- 18,23 ----
    event void Resource.granted(){}
  
!   async command msp430_uart_union_config_t* Msp430UartConfigure.getConfig() {
!     return &msp430_uart_eyes_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.4.2.1
diff -C2 -d -r1.1.2.4 -r1.1.2.4.2.1
*** .family	31 May 2006 13:53:03 -0000	1.1.2.4
--- .family	5 Oct 2006 08:25:44 -0000	1.1.2.4.2.1
***************
*** 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: 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.6.2.1
diff -C2 -d -r1.1.2.6 -r1.1.2.6.2.1
*** RadioDataLinkC.nc	7 Jun 2006 19:54:53 -0000	1.1.2.6
--- RadioDataLinkC.nc	5 Oct 2006 08:25:44 -0000	1.1.2.6.2.1
***************
*** 50,57 ****
          //Change components below as desired
          Tda5250RadioC as Radio,                  //The actual Tda5250 radio over which data is receives/transmitted
!         UartPhyC 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
-         //SyncSampleMacC as Mac,
          LinkLayerC as Llc;                       //The Link Layer Control module to use
      
--- 50,56 ----
          //Change components below as desired
          Tda5250RadioC as Radio,                  //The actual Tda5250 radio over which data is receives/transmitted
!         UartManchPhyC 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
      
***************
*** 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;

--- Msp430Timer32khzMapC.nc DELETED ---