From 8cc0bb8a1e3754cdbe7f6d99992eb5b7c4d29034 Mon Sep 17 00:00:00 2001
From: Enrico Joerns <e.joerns@tu-bs.de>
Date: Sat, 30 Aug 2014 01:58:18 +0200
Subject: [PATCH] [avr] Removed usage of deprecated MCUSR

Since avr-libc 1.8.0 MCUSR is marked as poison as it was replaced by the
correct name MCUCSR.
Thus code still using the old MCUSR name does not compile anymore.

This commit replaces usages of former MCUSR by its new name MCUCSR and
modifies the alias fallback accordingly.
---
 cpu/avr/bootloader.c | 14 ++++++++------
 cpu/avr/watchdog.c   | 13 +++++++------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/cpu/avr/bootloader.c b/cpu/avr/bootloader.c
index 5cee7d1b2..20a174ed0 100644
--- a/cpu/avr/bootloader.c
+++ b/cpu/avr/bootloader.c
@@ -9,10 +9,12 @@
 #include <avr/interrupt.h>
 #include <avr/eeprom.h>
 
-/* Not all AVR toolchains alias MCUSR to the older MSUSCR name */
-#if !defined (MCUSR) && defined (MCUCSR)
-#warning *** MCUSR not defined, using MCUCSR instead ***
-#define MCUSR MCUCSR
+/* MCUSR is a deprecated name but older avr-libc versions may define it */
+#if !defined (MCUCSR)
+# if defined (MCUSR)
+#  warning *** MCUCSR not defined, using MCUSR instead ***
+#  define MCUCSR MCUSR
+# endif
 #endif
 
 #ifndef EEPROM_MAGIC_BYTE_ADDR
@@ -69,8 +71,8 @@ Bootloader_Jump_Check(void)
   /* If the reset source was the bootloader and the key is correct,
    * clear it and jump to the bootloader
    */
-  if(MCUSR & (1 << WDRF)) {
-    MCUSR = 0;
+  if(MCUCSR & (1 << WDRF)) {
+    MCUCSR = 0;
     if(Boot_Key == MAGIC_BOOT_KEY) {
       Boot_Key = 0;
       wdt_disable();
diff --git a/cpu/avr/watchdog.c b/cpu/avr/watchdog.c
index 04734fcdf..e7aaee9bd 100644
--- a/cpu/avr/watchdog.c
+++ b/cpu/avr/watchdog.c
@@ -64,11 +64,12 @@
 #include <avr/wdt.h>
 #include <avr/interrupt.h>
 
-//Not all AVR toolchains alias MCUSR to the older MSUSCR name
-//#if defined (__AVR_ATmega8__) || defined (__AVR_ATmega8515__) || defined (__AVR_ATmega16__)
-#if !defined (MCUSR) && defined (MCUCSR)
-#warning *** MCUSR not defined, using MCUCSR instead ***
-#define MCUSR MCUCSR
+/* MCUSR is a deprecated name but older avr-libc versions may define it */
+#if !defined (MCUCSR)
+# if defined (MCUSR)
+#  warning *** MCUCSR not defined, using MCUSR instead ***
+#  define MCUCSR MCUSR
+# endif
 #endif
 
 #if WATCHDOG_CONF_BALANCE && WATCHDOG_CONF_TIMEOUT >= 0
@@ -82,7 +83,7 @@ watchdog_init(void)
 /*  Clear startup bit and disable the wdt, whether or not it will be used.
     Random code may have caused the last reset.
  */
-	MCUSR&=~(1<<WDRF);
+	MCUCSR&=~(1<<WDRF);
     wdt_disable();
 #if WATCHDOG_CONF_BALANCE && WATCHDOG_CONF_TIMEOUT >= 0
 	stopped = 1;