[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/handhelds/tos/lib/RovingNetworks RovingNetworksM.nc, 1.9, 1.10

[steve ayer]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/tos/lib/RovingNetworks
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17521

Modified Files:
	RovingNetworksM.nc 
Log Message:

a modification to stdcontrol.init and stdcontrol.stop to allow for
both polarities of bt power supply control pins; an ifdef for the
BT_PWR_LOGIC_TRUE flag should cover this issue.


Index: RovingNetworksM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/tos/lib/RovingNetworks/RovingNetworksM.nc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** RovingNetworksM.nc	30 Jun 2008 14:22:29 -0000	1.9
--- RovingNetworksM.nc	30 Jun 2008 15:50:01 -0000	1.10
***************
*** 371,380 ****
    command result_t StdControl.init(){
      TOSH_MAKE_BT_RTS_INPUT();      
! 
      TOSH_MAKE_BT_RXD_INPUT();
      TOSH_SEL_BT_RXD_MODFUNC();
! 
!     TOSH_CLR_SW_BT_PWR_N_PIN();   // this powers it up on models so equipped, otherwise harmless
! 
      newMode = FALSE;
      radioMode = SLAVE_MODE;   
--- 371,385 ----
    command result_t StdControl.init(){
      TOSH_MAKE_BT_RTS_INPUT();      
!     
      TOSH_MAKE_BT_RXD_INPUT();
      TOSH_SEL_BT_RXD_MODFUNC();
!     
!     // this powers it up on models so equipped, otherwise harmless 
! #ifdef BT_PWR_LOGIC_TRUE
!     TOSH_SET_SW_BT_PWR_N_PIN();
! #else	
!     TOSH_CLR_SW_BT_PWR_N_PIN();   
! #endif
!     
      newMode = FALSE;
      radioMode = SLAVE_MODE;   
***************
*** 419,431 ****
    command result_t StdControl.stop(){
      disableRN();
! 
!     TOSH_SET_SW_BT_PWR_N_PIN();   // power off, see .init()
! 
      call MessagePool.free(incomingMsg);
      call MessagePool.free(outgoingMsg);
! 
      return SUCCESS;
    }
! 
    /* this will turn off the Bluetooth module */
    /* 
--- 424,440 ----
    command result_t StdControl.stop(){
      disableRN();
!     
! #ifdef BT_PWR_LOGIC_TRUE
!     TOSH_CLR_SW_BT_PWR_N_PIN();
! #else	
!     TOSH_SET_SW_BT_PWR_N_PIN();   
! #endif
!     
      call MessagePool.free(incomingMsg);
      call MessagePool.free(outgoingMsg);
!     
      return SUCCESS;
    }
!   
    /* this will turn off the Bluetooth module */
    /*