[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/telosa ActiveMessageC.nc, 1.2, 1.3 DemoSensorC.nc, 1.2, 1.3 Msp430Timer32khzMapC.nc, 1.2, 1.3 PlatformC.nc, 1.2, 1.3 PlatformLedsC.nc, 1.2, 1.3 PlatformSerialC.nc, 1.2, 1.3 TelosSerialP.nc, 1.2, 1.3 platform_message.h, 1.2, 1.3

Phil Levis scipio at users.sourceforge.net
Tue Nov 7 11:32:16 PST 2006


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

Modified Files:
	ActiveMessageC.nc DemoSensorC.nc Msp430Timer32khzMapC.nc 
	PlatformC.nc PlatformLedsC.nc PlatformSerialC.nc 
	TelosSerialP.nc platform_message.h 
Log Message:
Merge over into the trunk.




Index: Msp430Timer32khzMapC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/telosa/Msp430Timer32khzMapC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Msp430Timer32khzMapC.nc	12 Jul 2006 17:03:01 -0000	1.2
--- Msp430Timer32khzMapC.nc	7 Nov 2006 19:31:26 -0000	1.3
***************
*** 24,29 ****
   * MSP430Timer32khzMapC presents as paramaterized interfaces all of
   * the 32khz hardware timers on the MSP430 that are available for
!  * compile time allocation by "new Alarm32khzC()", "new
!  * AlarmMilliC()", and so on.  
   *
   * Platforms based on the MSP430 are * encouraged to copy in and
--- 24,29 ----
   * MSP430Timer32khzMapC presents as paramaterized interfaces all of
   * the 32khz hardware timers on the MSP430 that are available for
!  * compile time allocation by "new Alarm32khz16C()", "new
!  * AlarmMilli32C()", and so on.  
   *
   * Platforms based on the MSP430 are * encouraged to copy in and



Index: PlatformSerialC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/telosa/PlatformSerialC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PlatformSerialC.nc	12 Jul 2006 17:03:04 -0000	1.2
--- PlatformSerialC.nc	7 Nov 2006 19:31:26 -0000	1.3
***************
*** 1,14 ****
  configuration PlatformSerialC {
!   provides interface Init;
    provides interface StdControl;
!   provides interface SerialByteComm;
  }
- implementation {
-   components new Uart1C() as UartC, TelosSerialP;
  
!   Init = UartC;
!   StdControl = UartC;
    StdControl = TelosSerialP;
!   SerialByteComm = UartC;
    TelosSerialP.Resource -> UartC.Resource;
  }
--- 1,19 ----
+ 
  configuration PlatformSerialC {
!   
    provides interface StdControl;
!   provides interface UartStream;
!   
  }
  
! implementation {
!   
!   components new Msp430Uart1C() as UartC;
!   UartStream = UartC;  
!   
!   components TelosSerialP;
    StdControl = TelosSerialP;
!   TelosSerialP.Msp430UartConfigure <- UartC.Msp430UartConfigure;
    TelosSerialP.Resource -> UartC.Resource;
+   
  }

Index: TelosSerialP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/telosa/TelosSerialP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TelosSerialP.nc	12 Jul 2006 17:03:05 -0000	1.2
--- TelosSerialP.nc	7 Nov 2006 19:31:26 -0000	1.3
***************
*** 1,7 ****
--- 1,11 ----
  module TelosSerialP {
    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();
***************
*** 12,14 ****
--- 16,23 ----
    }
    event void Resource.granted(){}
+ 
+   async command msp430_uart_config_t* Msp430UartConfigure.getConfig() {
+     return &msp430_uart_telos_config;
+   }
+   
  }




More information about the Tinyos-2-commits mailing list