diff --git a/cpu/avr/dev/clock-avr.h b/cpu/avr/dev/clock-avr.h index 8b031379c..cce949593 100644 --- a/cpu/avr/dev/clock-avr.h +++ b/cpu/avr/dev/clock-avr.h @@ -36,7 +36,7 @@ */ \ TIMSK = _BV (OCIE0); -#elif defined (__AVR_ATmega1284P__) || (__AVR_AT90USB1287__) +#elif defined (__AVR_ATmega1284P__) || (__AVR_AT90USB1287__) || (__AVR_ATmega1281__) #define OCRSetup() \ /* Select internal clock */ \ diff --git a/cpu/avr/dev/rs232.c b/cpu/avr/dev/rs232.c index addfad59b..6e9bfb307 100644 --- a/cpu/avr/dev/rs232.c +++ b/cpu/avr/dev/rs232.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: rs232.c,v 1.3 2008/10/14 19:06:51 c_oflynn Exp $ + * @(#)$Id: rs232.c,v 1.4 2008/11/09 15:39:49 c_oflynn Exp $ */ #include @@ -49,7 +49,7 @@ #define RS232_PRINTF_BUFFER_LENGTH 64 #endif -#if defined (__AVR_ATmega128__) || defined(__AVR_ATmega1284P__) +#if defined (__AVR_ATmega128__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1281__) typedef struct { volatile uint8_t * UDR; volatile uint8_t * UBRRH; diff --git a/cpu/avr/dev/rs232.h b/cpu/avr/dev/rs232.h index 97be415a6..276ae6b31 100644 --- a/cpu/avr/dev/rs232.h +++ b/cpu/avr/dev/rs232.h @@ -31,7 +31,7 @@ * Author: Adam Dunkels * Simon Barner * - * @(#)$Id: rs232.h,v 1.3 2008/10/14 19:06:51 c_oflynn Exp $ + * @(#)$Id: rs232.h,v 1.4 2008/11/09 15:39:49 c_oflynn Exp $ */ #ifndef __RS232_H__ @@ -46,6 +46,8 @@ #include "dev/rs232_atmega1284.h" #elif defined (__AVR_AT90USB1287__) #include "dev/rs232_at90usb1287.h" +#elif defined (__AVR_ATmega1281__) +#include "dev/rs232_atmega1281.h" #else #error "Please implement a rs232 header for your MCU (or set the MCU type \ in contiki-conf.h)." diff --git a/cpu/avr/dev/rs232_atmega1281.h b/cpu/avr/dev/rs232_atmega1281.h new file mode 100644 index 000000000..9b3b9cc6e --- /dev/null +++ b/cpu/avr/dev/rs232_atmega1281.h @@ -0,0 +1,142 @@ +/* + * Copyright (c) 2006, Technical University of Munich + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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. + * 3. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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. + * + * This file is part of the Contiki operating system. + * + * @(#)$$ + */ + +/** + * \file + * AVR specific definitions for the rs232 port. + * + * \author + * Simon Barner + +/******************************************************************************/ +/*** RS232 ports */ +/******************************************************************************/ +#define RS232_PORT_0 0 +#define RS232_PORT_1 1 + +/******************************************************************************/ +/*** Baud rates */ +/******************************************************************************/ +#if MCU_MHZ == 16 +/* Single speed operation (U2X = 0)*/ +#define USART_BAUD_2400 416 +#define USART_BAUD_4800 207 +#define USART_BAUD_9600 103 +#define USART_BAUD_14400 68 +#define USART_BAUD_19200 51 +#define USART_BAUD_28800 34 +#define USART_BAUD_38400 25 +#define USART_BAUD_57600 16 +#define USART_BAUD_76800 12 +#define USART_BAUD_115200 8 +#define USART_BAUD_230400 3 +#define USART_BAUD_250000 3 +#define USART_BAUD_500000 1 +#define USART_BAUD_1000000 0 +#elif MCU_MHZ == 8 +/* Single speed operation (U2X = 0)*/ +#define USART_BAUD_2400 207 +#define USART_BAUD_4800 103 +#define USART_BAUD_9600 51 +#define USART_BAUD_14400 34 +#define USART_BAUD_19200 25 +#define USART_BAUD_28800 16 +#define USART_BAUD_38400 12 +#define USART_BAUD_57600 8 +#define USART_BAUD_76800 6 +#define USART_BAUD_115200 3 +#define USART_BAUD_230400 1 +#define USART_BAUD_250000 1 +#define USART_BAUD_500000 0 +#else +#error "Please define the baud rates for your CPU clock: ATmega128 handbook p. \ +195-198 or set the rate in contiki-conf.h" +#endif + + +/******************************************************************************/ +/*** Interrupt settings */ +/******************************************************************************/ +#define USART_INTERRUPT_RX_COMPLETE _BV (RXCIE0) +#define USART_INTERRUPT_TX_COMPLETE _BV (TXCIE0) +#define USART_INTERRUPT_DATA_REG_EMPTY _BV (UDRIE0) + +/******************************************************************************/ +/*** Receiver / transmitter */ +/******************************************************************************/ +#define USART_RECEIVER_ENABLE _BV (RXEN0) +#define USART_TRANSMITTER_ENABLE _BV (TXEN0) + +/******************************************************************************/ +/*** Mode select */ +/******************************************************************************/ +#define USART_MODE_ASYNC 0x00 +#define USART_MODE_SYNC _BV (UMSEL00) + +/******************************************************************************/ +/*** Parity */ +/******************************************************************************/ +#define USART_PARITY_NONE 0x00 +#define USART_PARITY_EVEN _BV (UPM01) +#define USART_PARITY_ODD _BV (UPM01) | _BV (UPM00) + +/******************************************************************************/ +/*** Stop bits */ +/******************************************************************************/ +#define USART_STOP_BITS_1 0x00 +#define USART_STOP_BITS_2 _BV (USBS) + +/******************************************************************************/ +/*** Character size */ +/******************************************************************************/ +#define USART_DATA_BITS_5 0x00 +#define USART_DATA_BITS_6 _BV (UCSZ00) +#define USART_DATA_BITS_7 _BV (UCSZ01) +#define USART_DATA_BITS_8 _BV (UCSZ01) | _BV (UCSZ00) +// #define USART_DATA_BITS_9 (needs also UCSZ2 bit in UCSRnB) + +/******************************************************************************/ +/*** Clock polarity */ +/******************************************************************************/ +#define USART_RISING_XCKN_EDGE 0x00 +#define USART_FALLING_XCKN_EDGE _BV (UCPOL0) + +#endif /* #ifndef __RS232_ATMEGA1281__ */ diff --git a/cpu/avr/radio/rf230/hal.h b/cpu/avr/radio/rf230/hal.h index 946ba6c9d..8bc2c9520 100644 --- a/cpu/avr/radio/rf230/hal.h +++ b/cpu/avr/radio/rf230/hal.h @@ -47,7 +47,7 @@ * \file * \brief This file contains low-level radio driver code. * - * $Id: hal.h,v 1.2 2008/10/14 18:37:28 c_oflynn Exp $ + * $Id: hal.h,v 1.3 2008/11/09 15:39:49 c_oflynn Exp $ */ #ifndef HAL_AVR_H @@ -72,9 +72,28 @@ /* Define all possible revisions here */ #define RAVEN_D 0 #define RAVENUSB_C 1 +#define RCB_B 2 +#if RCB_REVISION == RCB_B +/* 1281 rcb */ +# define SSPORT B +# define SSPIN (0x00) +# define SPIPORT B +# define MOSIPIN (0x02) +# define MISOPIN (0x03) +# define SCKPIN (0x01) +# define RSTPORT B +# define RSTPIN (0x05) +# define IRQPORT D +# define IRQPIN (0x04) +# define SLPTRPORT B +# define SLPTRPIN (0x04) +# define USART 1 +# define USARTVECT USART1_RX_vect +# define TICKTIMER 3 +# define HAS_SPARE_TIMER -#if RAVEN_REVISION == RAVEN_D +#elif RAVEN_REVISION == RAVEN_D /* 1284 raven */ # define SSPORT B