[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/eyesIFX/chips/tda5250 tda5250BusResourceSettings.h, NONE, 1.1.2.1 HplTda5250DataC.nc, 1.1.2.6, 1.1.2.6.4.1 Tda5250RegCommC.nc, 1.1.2.5, 1.1.2.5.4.1 tda5250BusResourceId.h, 1.1.2.2, NONE

[Vlado Handziski]

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

Modified Files:
      Tag: tos-2-msp430-usart-configure-candidate
	HplTda5250DataC.nc Tda5250RegCommC.nc 
Added Files:
      Tag: tos-2-msp430-usart-configure-candidate
	tda5250BusResourceSettings.h 
Removed Files:
      Tag: tos-2-msp430-usart-configure-candidate
	tda5250BusResourceId.h 
Log Message:
TDA5250 update for the new Msp430UartControl/Configure interfaces

--- NEW FILE: tda5250BusResourceSettings.h ---
/*
 * Copyright (c) 2006, 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.2.1 $
 * $Date: 2006/07/13 20:38:21 $
 * ========================================================================
 */

#include "msp430usart.h"

#ifndef TDA5250BUSRESOURCEID_H
#define TDA5250BUSRESOURCEID_H

enum {
    TDA5250_UART_BUS_ID = unique(MSP430_UARTO_BUS)
};

msp430_uart_config_t tda5250_uart_config = {ubr: UBR_1MHZ_38400, umctl: UMCTL_1MHZ_38400, ssel: 0x02, pena: 0, pev: 0, spb: 0, clen: 1, listen: 0, mm: 0, ckpl: 0, urxse: 0, urxeie: 1, urxwie: 0};


#endif

Index: HplTda5250DataC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/chips/tda5250/HplTda5250DataC.nc,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.6.4.1
diff -C2 -d -r1.1.2.6 -r1.1.2.6.4.1
*** HplTda5250DataC.nc	15 Mar 2006 16:40:35 -0000	1.1.2.6
--- HplTda5250DataC.nc	13 Jul 2006 20:38:21 -0000	1.1.2.6.4.1
***************
*** 32,37 ****
  */
  
! #include "msp430baudrates.h"
! #include "tda5250BusResourceId.h"
  
  /**
--- 32,37 ----
  */
  
! #include "msp430usart.h"
! #include "tda5250BusResourceSettings.h"
  
  /**
***************
*** 44,47 ****
--- 44,48 ----
      interface Init;
      interface HplTda5250Data;
+     //interface ResourceRequested;
      interface Resource as Resource;
    }
***************
*** 51,55 ****
  
    components HplTda5250DataP
!       , new Msp430Usart0C()
        , Tda5250RadioIOC
        ;
--- 52,57 ----
  
    components HplTda5250DataP
!       , new Msp430Uart0C()
!       //, Msp430UsartShare0P
        , Tda5250RadioIOC
        ;
***************
*** 60,65 ****
  
    HplTda5250DataP.DATA -> Tda5250RadioIOC.Tda5250RadioDATA;
!   HplTda5250DataP.Usart -> Msp430Usart0C;
!   HplTda5250DataP.UsartInterrupts -> Msp430Usart0C;
!   HplTda5250DataP.UartResource -> Msp430Usart0C.Resource;
  }
--- 62,68 ----
  
    HplTda5250DataP.DATA -> Tda5250RadioIOC.Tda5250RadioDATA;
!   HplTda5250DataP.Uart -> Msp430Uart0C.SerialByteComm;
!   HplTda5250DataP.UartControl -> Msp430Uart0C.UartControl;
!   HplTda5250DataP.UartResourceConfigure <- Msp430Uart0C.Msp430UartConfigure;  
!   HplTda5250DataP.UartResource -> Msp430Uart0C.Resource;
  }

Index: Tda5250RegCommC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/chips/tda5250/Tda5250RegCommC.nc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.5.4.1
diff -C2 -d -r1.1.2.5 -r1.1.2.5.4.1
*** Tda5250RegCommC.nc	15 Mar 2006 16:40:35 -0000	1.1.2.5
--- Tda5250RegCommC.nc	13 Jul 2006 20:38:21 -0000	1.1.2.5.4.1
***************
*** 37,41 ****
   */
  
! #include "tda5250BusResourceId.h"
  
  /**
--- 37,41 ----
   */
  
! #include "tda5250BusResourceSettings.h"
  
  /**

--- tda5250BusResourceId.h DELETED ---