From 21b10e80210436eca1d8781d2de5d1fb1985a7b9 Mon Sep 17 00:00:00 2001
From: dak664 <dak664>
Date: Fri, 3 Dec 2010 18:16:56 +0000
Subject: [PATCH] =?UTF-8?q?Convert=20obsolete=20=20MCU=5FMHZ=20to=20=20F?=
 =?UTF-8?q?=5FCPU=20and=20add=2014745600MHz=20case=20using=20patch=20from?=
 =?UTF-8?q?=20Tobias=20Sch=E4fer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cpu/avr/dev/rs232_at90usb1287.h |  6 +++---
 cpu/avr/dev/rs232_atmega128.h   | 24 ++++++++++++++++++++----
 cpu/avr/dev/rs232_atmega1281.h  |  6 +++---
 cpu/avr/dev/rs232_atmega1284.h  |  6 +++---
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/cpu/avr/dev/rs232_at90usb1287.h b/cpu/avr/dev/rs232_at90usb1287.h
index cb3439e7f..18c85e192 100644
--- a/cpu/avr/dev/rs232_at90usb1287.h
+++ b/cpu/avr/dev/rs232_at90usb1287.h
@@ -33,7 +33,7 @@
 
 /**
  * \file
- *         AVR specific definitions for the rs232 port.   
+ *         AVR specific definitions for the rs232 port.
  *
  * \author
  *         Simon Barner <barner@in.tum.de
@@ -55,7 +55,7 @@
 /******************************************************************************/
 /***   Baud rates                                                             */
 /******************************************************************************/
-#if MCU_MHZ == 16
+#if (F_CPU == 16000000UL)
 /* Single speed operation (U2X = 0)*/
 #warning 16MHz
 #define USART_BAUD_2400 416
@@ -72,7 +72,7 @@
 #define USART_BAUD_250000 3
 #define USART_BAUD_500000 1
 #define USART_BAUD_1000000 0
-#elif MCU_MHZ == 8
+#elif (F_CPU == 8000000UL)
 /* Single speed operation (U2X = 0)*/
 #define USART_BAUD_2400 207
 #define USART_BAUD_4800 103
diff --git a/cpu/avr/dev/rs232_atmega128.h b/cpu/avr/dev/rs232_atmega128.h
index 855274dcc..d2f6ef844 100644
--- a/cpu/avr/dev/rs232_atmega128.h
+++ b/cpu/avr/dev/rs232_atmega128.h
@@ -33,7 +33,7 @@
 
 /**
  * \file
- *         AVR specific definitions for the rs232 port.   
+ *         AVR specific definitions for the rs232 port.
  *
  * \author
  *         Simon Barner <barner@in.tum.de
@@ -55,7 +55,7 @@
 /******************************************************************************/
 /***   Baud rates                                                             */
 /******************************************************************************/
-#if MCU_MHZ == 16
+#if (F_CPU == 16000000UL)
 /* Single speed operation (U2X = 0)*/
 #define USART_BAUD_2400 416
 #define USART_BAUD_4800 207
@@ -71,7 +71,23 @@
 #define USART_BAUD_250000 3
 #define USART_BAUD_500000 1
 #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)*/
 #define USART_BAUD_2400 207
 #define USART_BAUD_4800 103
@@ -87,7 +103,7 @@
 #define USART_BAUD_250000 1
 #define USART_BAUD_500000 0
 /* For Micaz the MCU clock rate is 7.3728 MHz*/
-#elif MCU_MHZ == 7
+#elif (F_CPU == 7372800UL)
 /* Single speed operation (U2X = 0)*/
 #define USART_BAUD_2400 191
 #define USART_BAUD_4800 95
diff --git a/cpu/avr/dev/rs232_atmega1281.h b/cpu/avr/dev/rs232_atmega1281.h
index 9b3b9cc6e..f96878a89 100644
--- a/cpu/avr/dev/rs232_atmega1281.h
+++ b/cpu/avr/dev/rs232_atmega1281.h
@@ -33,7 +33,7 @@
 
 /**
  * \file
- *         AVR specific definitions for the rs232 port.   
+ *         AVR specific definitions for the rs232 port.
  *
  * \author
  *         Simon Barner <barner@in.tum.de
@@ -55,7 +55,7 @@
 /******************************************************************************/
 /***   Baud rates                                                             */
 /******************************************************************************/
-#if MCU_MHZ == 16
+#if (F_CPU == 16000000UL)
 /* Single speed operation (U2X = 0)*/
 #define USART_BAUD_2400 416
 #define USART_BAUD_4800 207
@@ -71,7 +71,7 @@
 #define USART_BAUD_250000 3
 #define USART_BAUD_500000 1
 #define USART_BAUD_1000000 0
-#elif MCU_MHZ == 8
+#elif (F_CPU == 8000000UL)
 /* Single speed operation (U2X = 0)*/
 #define USART_BAUD_2400 207
 #define USART_BAUD_4800 103
diff --git a/cpu/avr/dev/rs232_atmega1284.h b/cpu/avr/dev/rs232_atmega1284.h
index 3572847c1..262d974ca 100644
--- a/cpu/avr/dev/rs232_atmega1284.h
+++ b/cpu/avr/dev/rs232_atmega1284.h
@@ -33,7 +33,7 @@
 
 /**
  * \file
- *         AVR specific definitions for the rs232 port.   
+ *         AVR specific definitions for the rs232 port.
  *
  * \author
  *         Simon Barner <barner@in.tum.de
@@ -55,7 +55,7 @@
 /******************************************************************************/
 /***   Baud rates                                                             */
 /******************************************************************************/
-#if MCU_MHZ == 16
+#if (F_CPU == 16000000UL)
 /* Single speed operation (U2X = 0)*/
 #define USART_BAUD_2400 416
 #define USART_BAUD_4800 207
@@ -71,7 +71,7 @@
 #define USART_BAUD_250000 3
 #define USART_BAUD_500000 1
 #define USART_BAUD_1000000 0
-#elif MCU_MHZ == 8
+#elif (F_CPU == 8000000UL)
 /* Single speed operation (U2X = 0)*/
 #define USART_BAUD_2400 207
 #define USART_BAUD_4800 103