[Tinyos-beta-commits] CVS: tinyos-1.x/beta/platform/cc2420dbk
HPLUART0M.nc, NONE, 1.1 HPLUART1M.nc, NONE, 1.1 HPLUARTC.nc,
NONE, 1.1
Joe Polastre
jpolastre at users.sourceforge.net
Wed Jan 19 14:37:16 PST 2005
Update of /cvsroot/tinyos/tinyos-1.x/beta/platform/cc2420dbk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29985
Added Files:
HPLUART0M.nc HPLUART1M.nc HPLUARTC.nc
Log Message:
adding HPLUART for cc2420dbk, submitted by Paul Young
Getting UART working for the cc2420dbk.
The cc2420dbk board uses a UART1 connection. Also, the HPLUART files were taken
from the MICA2 platform. But this is based off of a 7.3MHz, not the 8MHz found
in the cc2420dbk.
To get this to work copy these files into cc2420dbk platform directory.
included files:
HPLUARTC.nc
HPLUART0M.nc
HPLUART1M.nc
Changes:
1. Switch the UART implementation in HPLUARTC.nc from UART0 to UART1.
2. UART1 was not fully implemented in the file HPLUART1M.nc
It is missing a close function.
I copied over HPLUART0M.nc from the MICA2 platform, added the missing
function, and added some updates so that the two looked equivalent.
3. Changed the baud rate from 57600 to 38400
<old>
// Set to 57.6 KBps
outp(0,UBRR1H);
outp(15, UBRR1L);
<end old>
<new>
// Set to 38.4 KBps
outp(0,UBRR1H);
outp(25, UBRR1L);
<end new>
~Paul Young
mrmud at berkeley.edu
--- NEW FILE: HPLUART0M.nc ---
// $Id: HPLUART0M.nc,v 1.1 2005/01/19 22:37:14 jpolastre Exp $
/* tab:4
* "Copyright (c) 2000-2003 The Regents of the University of California.
* All rights reserved.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation for any purpose, without fee, and without written agreement is
* hereby granted, provided that the above copyright notice, the following
* two paragraphs and the author appear in all copies of this software.
*
* IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
* DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
* OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
* CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
* ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
*
* Copyright (c) 2002-2003 Intel Corporation
* All rights reserved.
*
* This file is distributed under the terms in the attached INTEL-LICENSE
* file. If you do not find these files, copies can be found by writing to
* Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA,
* 94704. Attention: Intel License Inquiry.
*/
/*
*
* Authors: Jason Hill, David Gay, Philip Levis, Phil Buonadonna, Joe Polastre
* Date last modified: $Revision: 1.1 $
*
*/
// The hardware presentation layer. See hpl.h for the C side.
// Note: there's a separate C side (hpl.h) to get access to the avr macros
// The model is that HPL is stateless. If the desired interface is as stateless
// it can be implemented here (Clock, FlashBitSPI). Otherwise you should
// create a separate component
/**
* @author Jason Hill
* @author David Gay
* @author Philip Levis
* @author Phil Buonadonna
* @author Joe Polastre
*/
module HPLUART0M {
provides interface HPLUART as UART;
}
implementation
{
async command result_t UART.init() {
// UART will run at:
// 115kbps, N-8-1
// Set 57.6 KBps
// outp(0,UBRR0H);
// outp(15, UBRR0L);
//PAUL MODIFIED
// Set to 38.4 KBps
outp(0,UBRR0H);
outp(25, UBRR0L);
// Set UART double speed
outp((1<<U2X),UCSR0A);
// Set frame format: 8 data-bits, 1 stop-bit
outp(((1 << UCSZ1) | (1 << UCSZ0)) , UCSR0C);
// Enable reciever and transmitter and their interrupts
outp(((1 << RXCIE) | (1 << TXCIE) | (1 << RXEN) | (1 << TXEN)) ,UCSR0B);
return SUCCESS;
}
async command result_t UART.stop() {
outp(0x00, UCSR0A);
outp(0x00, UCSR0B);
outp(0x00, UCSR0C);
return SUCCESS;
}
default async event result_t UART.get(uint8_t data) { return SUCCESS; }
TOSH_SIGNAL(SIG_UART0_RECV) {
if (inp(UCSR0A) & (1 << RXC))
signal UART.get(inp(UDR0));
}
default async event result_t UART.putDone() { return SUCCESS; }
#ifdef ENABLE_UART_DEBUG
#warning "UART Interrups Redirected"
#else
TOSH_INTERRUPT(SIG_UART0_TRANS) {
signal UART.putDone();
}
#endif
command async result_t UART.put(uint8_t data) {
atomic{
outp(data, UDR0);
sbi(UCSR0A, TXC);
}
return SUCCESS;
}
}
--- NEW FILE: HPLUART1M.nc ---
// $Id: HPLUART1M.nc,v 1.1 2005/01/19 22:37:14 jpolastre Exp $
/* tab:4
* "Copyright (c) 2000-2003 The Regents of the University of California.
* All rights reserved.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation for any purpose, without fee, and without written agreement is
* hereby granted, provided that the above copyright notice, the following
* two paragraphs and the author appear in all copies of this software.
*
* IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
* DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
* OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
* CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
* ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
*
* Copyright (c) 2002-2003 Intel Corporation
* All rights reserved.
*
* This file is distributed under the terms in the attached INTEL-LICENSE
* file. If you do not find these files, copies can be found by writing to
* Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA,
* 94704. Attention: Intel License Inquiry.
*/
/*
*
* Authors: Jason Hill, David Gay, Philip Levis, Phil Buonadonna
* Date last modified: $Revision: 1.1 $
*
*/
// The hardware presentation layer. See hpl.h for the C side.
// Note: there's a separate C side (hpl.h) to get access to the avr macros
// The model is that HPL is stateless. If the desired interface is as stateless
// it can be implemented here (Clock, FlashBitSPI). Otherwise you should
// create a separate component
/**
* @author Jason Hill
* @author David Gay
* @author Philip Levis
* @author Phil Buonadonna
*/
module HPLUART1M {
provides interface HPLUART as UART;
}
implementation
{
async command result_t UART.init() {
// UART will run at:
// 115kbps, N-8-1
// Set to 38.4 KBps
outp(0,UBRR1H);
outp(25, UBRR1L);
// Set UART double speed
outp((1<<U2X),UCSR1A);
// Set frame format: 8 data-bits, 1 stop-bit
outp(((1 << UCSZ1) | (1 << UCSZ0)) , UCSR1C);
// Enable reciever and transmitter and their interrupts
outp(((1 << RXCIE) | (1 << TXCIE) | (1 << RXEN) | (1 << TXEN)) ,UCSR1B);
return SUCCESS;
}
async command result_t UART.stop() {
outp(0x00, UCSR1A);
outp(0x00, UCSR1B);
outp(0x00, UCSR1C);
return SUCCESS;
}
default async event result_t UART.get(uint8_t data) { return SUCCESS; }
TOSH_SIGNAL(SIG_UART1_RECV) {
if (inp(UCSR1A) & (1 << RXC))
signal UART.get(inp(UDR1));
}
default async event result_t UART.putDone() { return SUCCESS; }
#ifdef ENABLE_UART_DEBUG
#warning "UART Interrups Redirected"
#else
TOSH_INTERRUPT(SIG_UART1_TRANS) {
signal UART.putDone();
}
#endif
command async result_t UART.put(uint8_t data) {
atomic{
outp(data, UDR1);
sbi(UCSR1A, TXC);
}
return SUCCESS;
}
}
--- NEW FILE: HPLUARTC.nc ---
// $Id: HPLUARTC.nc,v 1.1 2005/01/19 22:37:14 jpolastre Exp $
/* tab:4
* "Copyright (c) 2000-2003 The Regents of the University of California.
* All rights reserved.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation for any purpose, without fee, and without written agreement is
* hereby granted, provided that the above copyright notice, the following
* two paragraphs and the author appear in all copies of this software.
*
* IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
* DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
* OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
* CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
* ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
*
* Copyright (c) 2002-2003 Intel Corporation
* All rights reserved.
*
* This file is distributed under the terms in the attached INTEL-LICENSE
* file. If you do not find these files, copies can be found by writing to
* Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA,
* 94704. Attention: Intel License Inquiry.
*/
/*
*
* Authors: Jason Hill, David Gay, Philip Levis
* Date last modified: $Id: HPLUARTC.nc,v 1.1 2005/01/19 22:37:14 jpolastre Exp $
*
*/
// The hardware presentation layer. See hpl.h for the C side.
// Note: there's a separate C side (hpl.h) to get access to the avr macros
// The model is that HPL is stateless. If the desired interface is as stateless
// it can be implemented here (Clock, FlashBitSPI). Otherwise you should
// create a separate component
/**
* @author Jason Hill
* @author David Gay
* @author Philip Levis
*/
configuration HPLUARTC {
provides interface HPLUART as UART;
}
implementation
{
//cc2420dbk platform uses UART1
components HPLUART1M;
UART = HPLUART1M;
}
More information about the Tinyos-beta-commits
mailing list