[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/eyesIFX/chips/tda5250 HplTda5250DataIOC.nc, NONE, 1.1.4.2 HplTda5250DataIOP.nc, NONE, 1.1.4.2 Tda5250ASKNFSKFakePinP.nc, NONE, 1.1.4.2 Tda5250RadioIOC.nc, 1.1.2.2, 1.1.2.2.8.1 Tda5250RegCommC.nc, 1.1.2.5.4.1, 1.1.2.5.4.2 tda5250RegDefaultSettings.h, 1.1.2.3, 1.1.2.3.2.1

Thu Oct 5 01:37:49 PDT 2006

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

Modified Files:
      Tag: tos-2-msp430-usart-configure-candidate
	Tda5250RadioIOC.nc Tda5250RegCommC.nc 
	tda5250RegDefaultSettings.h 
Added Files:
      Tag: tos-2-msp430-usart-configure-candidate
	HplTda5250DataIOC.nc HplTda5250DataIOP.nc 
	Tda5250ASKNFSKFakePinP.nc 
Log Message:
- optimized usart configure using unions

--- NEW FILE: HplTda5250DataIOC.nc ---
/*
* Copyright (c) 2004, Technische Universitat Berlin
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* - Redistributions of source code must retain the above copyright notice,
*   this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright
*   notice, this list of conditions and the following disclaimer in the
*   documentation and/or other materials provided with the distribution.
* - Neither the name of the Technische Universitat Berlin nor the names
*   of its contributors may be used to endorse or promote products derived
*   from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* - Revision -------------------------------------------------------------
* $Revision: 1.1.4.2 $
* $Date: 2006/10/05 08:37:46 $
* ========================================================================
*/


/**
 * Wiring the TDA5250 with the Msp430 Uart abstraction.
 * 
 * @author Philipp Hupertz (huppertz at tkn.tu-berlin.de)
 */
configuration HplTda5250DataIOC {
  provides {
		interface Resource;
    interface ResourceRequested;
		interface SerialByteComm;
		interface HplTda5250DataControl;		
  }
}
implementation {

  components 
      new Msp430Uart0C(),
			HplTda5250DataIOP;

	Resource = Msp430Uart0C.Resource;
  ResourceRequested = Msp430Uart0C.ResourceRequested;
	SerialByteComm = Msp430Uart0C.SerialByteComm;
	
	HplTda5250DataControl = HplTda5250DataIOP;
//   HplTda5250DataIOP.UartControl -> Msp430Uart0C.UartControl;
	HplTda5250DataIOP.UartResourceConfigure <- Msp430Uart0C.Msp430UartConfigure;  
}

--- NEW FILE: HplTda5250DataIOP.nc ---
/*
 * Copyright (c) 2004, Technische Universitat Berlin
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * - Redistributions of source code must retain the above copyright notice,
 *   this list of conditions and the following disclaimer.
 * - Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 * - Neither the name of the Technische Universitat Berlin nor the names
 *   of its contributors may be used to endorse or promote products derived
 *   from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
 * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
 * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * - Revision -------------------------------------------------------------
 * $Revision: 1.1.4.2 $
 * $Date: 2006/10/05 08:37:46 $
 * ========================================================================
 */

#include "msp430usart.h"
#include "tda5250BusResourceSettings.h"

 /**
 * Wrapper module for the Msp430 Uart abstraction.
 *
 * @author Philipp Hupertz (huppertz at tkn.tu-berlin.de)
  */
module HplTda5250DataIOP {
  provides {
    interface HplTda5250DataControl;
		interface Msp430UartConfigure as UartResourceConfigure;
  }
//   uses {
//      interface Msp430UartControl as UartControl;
//   }
}

implementation {
  
  async command error_t HplTda5250DataControl.setToTx() {
    //call UartControl.setModeTx();
    tda5250_uart_config.uartConfig.urxe = 0;
    tda5250_uart_config.uartConfig.utxe = 1;
    return SUCCESS;
  }

  async command error_t HplTda5250DataControl.setToRx() {
   // call UartControl.setModeRx();
   tda5250_uart_config.uartConfig.urxe = 1;
   tda5250_uart_config.uartConfig.utxe = 0;
   return SUCCESS;
  }
	
	async command msp430_uart_union_config_t* UartResourceConfigure.getConfig() {
		return &tda5250_uart_config;
	}

}

--- NEW FILE: Tda5250ASKNFSKFakePinP.nc ---
/*
* The ASKNFSK Pin is not connected on the eyes platforms...
*/

module Tda5250ASKNFSKFakePinP {
  provides interface	GeneralIO;
}

implementation {
  async command void GeneralIO.set(){}
  async command void GeneralIO.clr(){}
  async command void GeneralIO.toggle(){}
  async command bool GeneralIO.get(){ return FALSE; }
  async command void GeneralIO.makeInput(){}
  async command bool GeneralIO.isOutput() { return FALSE; }
  async command void GeneralIO.makeOutput(){}
  async command bool GeneralIO.isInput() { return FALSE; }
}

Index: Tda5250RadioIOC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/chips/tda5250/Tda5250RadioIOC.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.8.1
diff -C2 -d -r1.1.2.2 -r1.1.2.2.8.1
*** Tda5250RadioIOC.nc	31 Jan 2006 12:25:32 -0000	1.1.2.2
--- Tda5250RadioIOC.nc	5 Oct 2006 08:37:46 -0000	1.1.2.2.8.1
***************
*** 40,43 ****
--- 40,44 ----
  configuration Tda5250RadioIOC
  {
+   provides interface GeneralIO as Tda5250RadioPASKNFSK;
    provides interface GeneralIO as Tda5250RadioBUSM;
    provides interface GeneralIO as Tda5250RadioENTDA;
***************
*** 49,52 ****
--- 50,54 ----
    components
        HplMsp430GeneralIOC as MspGeneralIO
+     , Tda5250ASKNFSKFakePinP      
      , new Msp430GpioC() as rBUSM
      , new Msp430GpioC() as rENTDA
***************
*** 62,65 ****
--- 64,68 ----
    Tda5250RadioPWDDD = rPWDD;
  
+   Tda5250RadioPASKNFSK = Tda5250ASKNFSKFakePinP;
    rBUSM -> MspGeneralIO.Port15;
    rENTDA -> MspGeneralIO.Port16;


Index: tda5250RegDefaultSettings.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/chips/tda5250/tda5250RegDefaultSettings.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -C2 -d -r1.1.2.3 -r1.1.2.3.2.1
*** tda5250RegDefaultSettings.h	31 May 2006 13:53:03 -0000	1.1.2.3
--- tda5250RegDefaultSettings.h	5 Oct 2006 08:37:46 -0000	1.1.2.3.2.1
***************
*** 43,47 ****
  
  // Default values of data registers
! #define TDA5250_REG_DEFAULT_SETTING_CONFIG           0x94F9
  #define TDA5250_REG_DEFAULT_SETTING_FSK              0x0A0C
  #define TDA5250_REG_DEFAULT_SETTING_XTAL_TUNING      0x0012
--- 43,48 ----
  
  // Default values of data registers
! 
! #define TDA5250_REG_DEFAULT_SETTING_CONFIG           0x84F9 
  #define TDA5250_REG_DEFAULT_SETTING_FSK              0x0A0C
  #define TDA5250_REG_DEFAULT_SETTING_XTAL_TUNING      0x0012