f10736a5aa410ff0818754c3d5635e9f0d9f05cd

diff --git a/simavr/cores/sim_core_declare.h b/simavr/cores/sim_core_declare.h
index 1c74dfcfc24eabe8fa039857025bfe19c63cce1a..7d6dac7bc41cd8549c1b97d5550f1f6b22f2e013 100644 (file)
--- a/simavr/cores/sim_core_declare.h
+++ b/simavr/cores/sim_core_declare.h
@@ -71,10 +71,10 @@
 # define _FUSE_HELPER { 0 }
 #endif
 
-#ifdef MCUSR
-# define MCU_STATUS_REG MCUSR
-#else
+#ifdef MCUCSR
 # define MCU_STATUS_REG MCUCSR
+#else
+# define MCU_STATUS_REG MCUSR
 #endif
 
 #ifdef SIGNATURE_0

diff --git a/simavr/cores/sim_mega128.c b/simavr/cores/sim_mega128.c
index 3b11f2ae771ce3e96796556d865b6bbe3f5a47bf..9c8a427309ce3af8515a5ec15ec97d645d3cda31 100644 (file)
--- a/simavr/cores/sim_mega128.c
+++ b/simavr/cores/sim_mega128.c
@@ -20,7 +20,6 @@
  */
 
 #include "sim_avr.h"
-#include "sim_core_declare.h"
 #include "avr_eeprom.h"
 #include "avr_flash.h"
 #include "avr_watchdog.h"
@@ -40,6 +39,8 @@ void m128_reset(struct avr_t * avr);
 #define __ASSEMBLER__
 #include "avr/iom128.h"
 
+#include "sim_core_declare.h"
+
 /*
  * This is a template for all of the 128 devices, hopefully
  */

diff --git a/simavr/cores/sim_mega1280.c b/simavr/cores/sim_mega1280.c
index cff44a10191e4542e8e5b555529dca755c435cf9..316bfd67a48b4c9f3f30ed1394bc4b6b0648d57f 100644 (file)
--- a/simavr/cores/sim_mega1280.c
+++ b/simavr/cores/sim_mega1280.c
@@ -20,7 +20,6 @@
  */
 
 #include "sim_avr.h"
-#include "sim_core_declare.h"
 #include "avr_eeprom.h"
 #include "avr_flash.h"
 #include "avr_watchdog.h"
@@ -43,6 +42,8 @@ void m1280_reset(struct avr_t * avr);
 #endif
 #include "avr/iom1280.h"
 
+#include "sim_core_declare.h"
+
 /*
  * This is a template for all of the 1280 devices, hopefully
  */

diff --git a/simavr/cores/sim_mega1281.c b/simavr/cores/sim_mega1281.c
index 3bf28a0dc478f0f016bb3493195ff132cff4fcfc..222743c601660c0aaf9f0e0edf824467e2b26d88 100644 (file)
--- a/simavr/cores/sim_mega1281.c
+++ b/simavr/cores/sim_mega1281.c
@@ -20,7 +20,6 @@
  */
 
 #include "sim_avr.h"
-#include "sim_core_declare.h"
 #include "avr_eeprom.h"
 #include "avr_flash.h"
 #include "avr_watchdog.h"
@@ -40,6 +39,8 @@ void m1281_reset(struct avr_t * avr);
 #define __ASSEMBLER__
 #include "avr/iom1281.h"
 
+#include "sim_core_declare.h"
+
 /*
  * This is a template for all of the 1281 devices, hopefully
  */

diff --git a/simavr/cores/sim_mega128rfa1.c b/simavr/cores/sim_mega128rfa1.c
index 5fa61413c201983684e349b0bc3b3f743c173e25..2821e83eb1f4fdef47768166dda16b4ff7fa49d3 100644 (file)
--- a/simavr/cores/sim_mega128rfa1.c
+++ b/simavr/cores/sim_mega128rfa1.c
@@ -22,7 +22,6 @@
  */
 
 #include "sim_avr.h"
-#include "sim_core_declare.h"
 #include "avr_eeprom.h"
 #include "avr_flash.h"
 #include "avr_watchdog.h"
@@ -42,6 +41,8 @@ void m128rfa1_reset(struct avr_t * avr);
 #define __ASSEMBLER__
 #include "avr/iom128rfa1.h"
 
+#include "sim_core_declare.h"
+
 /*
  * This is a template for all of the 128rfa1 devices, hopefully
  */

diff --git a/simavr/cores/sim_mega128rfr2.c b/simavr/cores/sim_mega128rfr2.c
index 1eb844bb256612ae21e56f329cdaf15c93ba4c95..5ffbab96093c405bf261bc90850fdca046d6ffcf 100644 (file)
--- a/simavr/cores/sim_mega128rfr2.c
+++ b/simavr/cores/sim_mega128rfr2.c
@@ -22,7 +22,6 @@
  */
 
 #include "sim_avr.h"
-#include "sim_core_declare.h"
 #include "avr_eeprom.h"
 #include "avr_flash.h"
 #include "avr_watchdog.h"
@@ -42,6 +41,8 @@ void m128rfr2_reset(struct avr_t * avr);
 #define __ASSEMBLER__
 #include "avr/iom128rfr2.h"
 
+#include "sim_core_declare.h"
+
 /*
  * Temporary hack for mangled avr-libc headers
  */

diff --git a/simavr/cores/sim_mega169.c b/simavr/cores/sim_mega169.c
index 81c53190a8ccb280c4671e516f8580d04546b8e9..209ff2ff9b839f77b4066bf153b65136d1400e96 100644 (file)
--- a/simavr/cores/sim_mega169.c
+++ b/simavr/cores/sim_mega169.c
@@ -3,7 +3,6 @@
  */
 
 #include "sim_avr.h"
-#include "sim_core_declare.h"
 #include "avr_eeprom.h"
 #include "avr_flash.h"
 #include "avr_watchdog.h"
@@ -30,6 +29,8 @@ void m169p_reset(struct avr_t * avr);
 #define MCUCSR MCUSR
 #endif
 
+#include "sim_core_declare.h"
+
 const struct mcu_t {
        avr_t          core;
        avr_eeprom_t    eeprom;

diff --git a/simavr/cores/sim_mega2560.c b/simavr/cores/sim_mega2560.c
index fc3812eb93631fd362c0f257dbb1afa80a571c57..2004498af768e43accbfc12d63d05edb5e69bf56 100644 (file)
--- a/simavr/cores/sim_mega2560.c
+++ b/simavr/cores/sim_mega2560.c
@@ -21,7 +21,6 @@
  */
 
 #include "sim_avr.h"
-#include "sim_core_declare.h"
 #include "avr_eeprom.h"
 #include "avr_flash.h"
 #include "avr_watchdog.h"
@@ -44,6 +43,8 @@ void m2560_reset(struct avr_t * avr);
 #endif
 #include "avr/iom2560.h"
 
+#include "sim_core_declare.h"
+
 /*
  * This is a template for all of the 2560 devices, hopefully
  */

diff --git a/simavr/cores/sim_mega32u4.c b/simavr/cores/sim_mega32u4.c
index 583448ee5fe3ffcb2fa6de33b7d384f58a242538..ea79fac1fc5a8ccb2de3da0a4d1d6d7b398127c8 100644 (file)
--- a/simavr/cores/sim_mega32u4.c
+++ b/simavr/cores/sim_mega32u4.c
@@ -36,7 +36,6 @@
 #define PE6    6
 
 #include "sim_avr.h"
-#include "sim_core_declare.h"
 #include "avr_eeprom.h"
 #include "avr_flash.h"
 #include "avr_watchdog.h"
@@ -60,6 +59,8 @@ void m32u4_reset(struct avr_t * avr);
 #endif
 #include "avr/iom32u4.h"
 
+#include "sim_core_declare.h"
+
 /*
  * ATmega32u4 definitions
  */

diff --git a/simavr/cores/sim_tiny13.c b/simavr/cores/sim_tiny13.c
index 34b439ead6f70fdf67e465ac88c177faaa1ce246..a741ef47f76b9b3f7d2f6931ccca98645294b07e 100644 (file)
--- a/simavr/cores/sim_tiny13.c
+++ b/simavr/cores/sim_tiny13.c
@@ -21,7 +21,6 @@
  */
 
 #include "sim_avr.h"
-#include "sim_core_declare.h"
 #include "avr_eeprom.h"
 #include "avr_watchdog.h"
 #include "avr_extint.h"
@@ -34,6 +33,8 @@
 #define __ASSEMBLER__
 #include "avr/iotn13.h"
 
+#include "sim_core_declare.h"
+
 static void init(struct avr_t * avr);
 static void reset(struct avr_t * avr);
 

diff --git a/simavr/cores/sim_tiny2313.c b/simavr/cores/sim_tiny2313.c
index 537401b58e12b8f41078e1dc93bbf1addd4caa0e..7bca9884721148da08c33f88a2387e2d77f03a50 100644 (file)
--- a/simavr/cores/sim_tiny2313.c
+++ b/simavr/cores/sim_tiny2313.c
@@ -19,7 +19,6 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sim_core_declare.h"
 #include "avr_eeprom.h"
 #include "avr_watchdog.h"
 #include "avr_extint.h"
@@ -35,6 +34,8 @@ static void reset(struct avr_t * avr);
 #define __ASSEMBLER__
 #include "avr/iotn2313.h"
 
+#include "sim_core_declare.h"
+
 /*
  * This is a template for all of the tinyx5 devices, hopefully
  */

diff --git a/simavr/cores/sim_tiny2313a.c b/simavr/cores/sim_tiny2313a.c
index ce605da25777d3d83e153dab33f3c2848cb4c698..66c30a51c4a717278428ce0640f61a1aef147f8a 100644 (file)
--- a/simavr/cores/sim_tiny2313a.c
+++ b/simavr/cores/sim_tiny2313a.c
@@ -19,7 +19,6 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sim_core_declare.h"
 #include "avr_eeprom.h"
 #include "avr_watchdog.h"
 #include "avr_extint.h"
@@ -35,6 +34,8 @@ static void reset(struct avr_t * avr);
 #define __ASSEMBLER__
 #include "avr/iotn2313a.h"
 
+#include "sim_core_declare.h"
+
 /*
  * This is a template for all of the tinyx5 devices, hopefully
  */

diff --git a/simavr/cores/sim_tiny4313.c b/simavr/cores/sim_tiny4313.c
index 1dba4231836c8d7ad81589228234a9975b692176..812382393c8deeb67be4e358d97b316d6d2779d8 100644 (file)
--- a/simavr/cores/sim_tiny4313.c
+++ b/simavr/cores/sim_tiny4313.c
@@ -19,7 +19,6 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sim_core_declare.h"
 #include "avr_eeprom.h"
 #include "avr_watchdog.h"
 #include "avr_extint.h"
@@ -35,6 +34,8 @@ static void reset(struct avr_t * avr);
 #define __ASSEMBLER__
 #include "avr/iotn4313.h"
 
+#include "sim_core_declare.h"
+
 /*
  * This is a template for all of the tinyx5 devices, hopefully
  */

diff --git a/simavr/cores/sim_usb162.c b/simavr/cores/sim_usb162.c
index 9a45d15df0e8e61d8b834e6c0c07705839e7cc34..0ed9874eb4edc3f9575325377de8beb07c48c808 100644 (file)
--- a/simavr/cores/sim_usb162.c
+++ b/simavr/cores/sim_usb162.c
@@ -20,7 +20,6 @@
  */
 
 #include "sim_avr.h"
-#include "sim_core_declare.h"
 #include "avr_eeprom.h"
 #include "avr_flash.h"
 #include "avr_watchdog.h"
@@ -40,6 +39,8 @@ void usb162_reset(struct avr_t * avr);
 #define __ASSEMBLER__
 #include "avr/iousb162.h"
 
+#include "sim_core_declare.h"
+
 const struct mcu_t {
        avr_t                    core;
        avr_eeprom_t    eeprom;