deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Convert obsolete MCU_MHZ to F_CPU and add 14745600MHz case using patch from Tobias Schfer

Browse source
This commit is contained in:
dak664 2010-12-03 18:16:56 +00:00
parent 8ab0467705
commit 21b10e8021
4 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cpu/avr/dev/rs232_at90usb1287.h
View file

@ -33,7 +33,7 @@
/** /**
* \file * \file
* AVR specific definitions for the rs232 port. * AVR specific definitions for the rs232 port.
* *
* \author * \author
* Simon Barner <barner@in.tum.de * Simon Barner <barner@in.tum.de
@ -55,7 +55,7 @@
/******************************************************************************/ /******************************************************************************/
/*** Baud rates */ /*** Baud rates */
/******************************************************************************/ /******************************************************************************/
#if MCU_MHZ == 16 #if (F_CPU == 16000000UL)
/* Single speed operation (U2X = 0)*/ /* Single speed operation (U2X = 0)*/
#warning 16MHz #warning 16MHz
#define USART_BAUD_2400 416 #define USART_BAUD_2400 416
@ -72,7 +72,7 @@
#define USART_BAUD_250000 3 #define USART_BAUD_250000 3
#define USART_BAUD_500000 1 #define USART_BAUD_500000 1
#define USART_BAUD_1000000 0 #define USART_BAUD_1000000 0
#elif MCU_MHZ == 8 #elif (F_CPU == 8000000UL)
/* Single speed operation (U2X = 0)*/ /* Single speed operation (U2X = 0)*/
#define USART_BAUD_2400 207 #define USART_BAUD_2400 207
#define USART_BAUD_4800 103 #define USART_BAUD_4800 103

24
cpu/avr/dev/rs232_atmega128.h
View file

@ -33,7 +33,7 @@
/** /**
* \file * \file
* AVR specific definitions for the rs232 port. * AVR specific definitions for the rs232 port.
* *
* \author * \author
* Simon Barner <barner@in.tum.de * Simon Barner <barner@in.tum.de
@ -55,7 +55,7 @@
/******************************************************************************/ /******************************************************************************/
/*** Baud rates */ /*** Baud rates */
/******************************************************************************/ /******************************************************************************/
#if MCU_MHZ == 16 #if (F_CPU == 16000000UL)
/* Single speed operation (U2X = 0)*/ /* Single speed operation (U2X = 0)*/
#define USART_BAUD_2400 416 #define USART_BAUD_2400 416
#define USART_BAUD_4800 207 #define USART_BAUD_4800 207
@ -71,7 +71,23 @@
#define USART_BAUD_250000 3 #define USART_BAUD_250000 3
#define USART_BAUD_500000 1 #define USART_BAUD_500000 1
#define USART_BAUD_1000000 0 #define USART_BAUD_1000000 0
#elif MCU_MHZ == 8 #elif (F_CPU == 14745600UL)
/* Single speed operation (U2X = 0)*/
#define USART_BAUD_2400 383
#define USART_BAUD_4800 191
#define USART_BAUD_9600 95
#define USART_BAUD_14400 63
#define USART_BAUD_19200 47
#define USART_BAUD_28800 31
#define USART_BAUD_38400 23
#define USART_BAUD_57600 15
#define USART_BAUD_76800 11
#define USART_BAUD_115200 7
#define USART_BAUD_230400 3
#define USART_BAUD_250000 3
#define USART_BAUD_500000 1
#define USART_BAUD_1000000 0
#elif (F_CPU == 8000000UL)
/* Single speed operation (U2X = 0)*/ /* Single speed operation (U2X = 0)*/
#define USART_BAUD_2400 207 #define USART_BAUD_2400 207
#define USART_BAUD_4800 103 #define USART_BAUD_4800 103
@ -87,7 +103,7 @@
#define USART_BAUD_250000 1 #define USART_BAUD_250000 1
#define USART_BAUD_500000 0 #define USART_BAUD_500000 0
/* For Micaz the MCU clock rate is 7.3728 MHz*/ /* For Micaz the MCU clock rate is 7.3728 MHz*/
#elif MCU_MHZ == 7 #elif (F_CPU == 7372800UL)
/* Single speed operation (U2X = 0)*/ /* Single speed operation (U2X = 0)*/
#define USART_BAUD_2400 191 #define USART_BAUD_2400 191
#define USART_BAUD_4800 95 #define USART_BAUD_4800 95

6
cpu/avr/dev/rs232_atmega1281.h
View file

@ -33,7 +33,7 @@
/** /**
* \file * \file
* AVR specific definitions for the rs232 port. * AVR specific definitions for the rs232 port.
* *
* \author * \author
* Simon Barner <barner@in.tum.de * Simon Barner <barner@in.tum.de
@ -55,7 +55,7 @@
/******************************************************************************/ /******************************************************************************/
/*** Baud rates */ /*** Baud rates */
/******************************************************************************/ /******************************************************************************/
#if MCU_MHZ == 16 #if (F_CPU == 16000000UL)
/* Single speed operation (U2X = 0)*/ /* Single speed operation (U2X = 0)*/
#define USART_BAUD_2400 416 #define USART_BAUD_2400 416
#define USART_BAUD_4800 207 #define USART_BAUD_4800 207
@ -71,7 +71,7 @@
#define USART_BAUD_250000 3 #define USART_BAUD_250000 3
#define USART_BAUD_500000 1 #define USART_BAUD_500000 1
#define USART_BAUD_1000000 0 #define USART_BAUD_1000000 0
#elif MCU_MHZ == 8 #elif (F_CPU == 8000000UL)
/* Single speed operation (U2X = 0)*/ /* Single speed operation (U2X = 0)*/
#define USART_BAUD_2400 207 #define USART_BAUD_2400 207
#define USART_BAUD_4800 103 #define USART_BAUD_4800 103

6
cpu/avr/dev/rs232_atmega1284.h
View file

@ -33,7 +33,7 @@
/** /**
* \file * \file
* AVR specific definitions for the rs232 port. * AVR specific definitions for the rs232 port.
* *
* \author * \author
* Simon Barner <barner@in.tum.de * Simon Barner <barner@in.tum.de
@ -55,7 +55,7 @@
/******************************************************************************/ /******************************************************************************/
/*** Baud rates */ /*** Baud rates */
/******************************************************************************/ /******************************************************************************/
#if MCU_MHZ == 16 #if (F_CPU == 16000000UL)
/* Single speed operation (U2X = 0)*/ /* Single speed operation (U2X = 0)*/
#define USART_BAUD_2400 416 #define USART_BAUD_2400 416
#define USART_BAUD_4800 207 #define USART_BAUD_4800 207
@ -71,7 +71,7 @@
#define USART_BAUD_250000 3 #define USART_BAUD_250000 3
#define USART_BAUD_500000 1 #define USART_BAUD_500000 1
#define USART_BAUD_1000000 0 #define USART_BAUD_1000000 0
#elif MCU_MHZ == 8 #elif (F_CPU == 8000000UL)
/* Single speed operation (U2X = 0)*/ /* Single speed operation (U2X = 0)*/
#define USART_BAUD_2400 207 #define USART_BAUD_2400 207
#define USART_BAUD_4800 103 #define USART_BAUD_4800 103