[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/timer Msp430TimerCapComP.nc, 1.4, 1.5 Msp430TimerControl.nc, 1.2, 1.3

[Vlado Handziski]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/timer
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29303/timer

Modified Files:
	Msp430TimerCapComP.nc Msp430TimerControl.nc 
Log Message:
Align the interface definition for the capture configuration with the implementation. Problem reported by Eric Decker

Index: Msp430TimerCapComP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/timer/Msp430TimerCapComP.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Msp430TimerCapComP.nc	31 May 2008 20:21:35 -0000	1.4
--- Msp430TimerCapComP.nc	23 Jun 2008 19:54:50 -0000	1.5
***************
*** 62,66 ****
    {
      cc_t x = {
!       cm : l_cm & 0x03,    // capture on rising edge
        ccis : 0,  // capture/compare input select
        clld : 0,  // TBCL1 loads on write to TBCCR1
--- 62,66 ----
    {
      cc_t x = {
!       cm : l_cm & 0x03,  // capture on none, rising, falling or both edges
        ccis : 0,  // capture/compare input select
        clld : 0,  // TBCL1 loads on write to TBCCR1

Index: Msp430TimerControl.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/timer/Msp430TimerControl.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Msp430TimerControl.nc	12 Jul 2006 17:01:46 -0000	1.2
--- Msp430TimerControl.nc	23 Jun 2008 19:54:50 -0000	1.3
***************
*** 33,39 ****
    async command void clearPendingInterrupt();
  
!   async command void setControl(msp430_compare_control_t control );
    async command void setControlAsCompare();
!   async command void setControlAsCapture(bool low_to_high);
  
    async command void enableEvents();
--- 33,46 ----
    async command void clearPendingInterrupt();
  
!   async command void setControl(msp430_compare_control_t control);
    async command void setControlAsCompare();
!   
!   /** 
!   * Sets the timer in capture mode.
!   * @param cm configures the capture to occur on none, rising, falling or rising_and_falling edges
!   * Msp430Timer.h has convenience definitions:
!   * MSP430TIMER_CM_NONE, MSP430TIMER_CM_RISING, MSP430TIMER_CM_FALLING, MSP430TIMER_CM_BOTH
!   */ 
!   async command void setControlAsCapture(uint8_t cm);
  
    async command void enableEvents();