SH1: Changed UIE() to use the same reset method as on coldfire, using the watchdog timer. Should be more reliable this way. Disabled LED handling and added reboot-with-on for Ondio. * All: #ifdef cleanup in panicf(), added reboot-with-on for Ondio.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7799 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 6 insertions, 3 deletions

diff --git a/firmware/export/sh7034.h b/firmware/export/sh7034.h
index c15ee2a88f..242e5687f1 100644
--- a/firmware/export/sh7034.h
+++ b/firmware/export/sh7034.h
@@ -294,9 +294,12 @@
 #define RTCNT      (*((volatile unsigned short*)RTCNT_ADDR)) 
 #define RTCOR      (*((volatile unsigned short*)RTCOR_ADDR)) 
 
-#define TCSR       (*((volatile unsigned char*)TCSR_ADDR))   
-#define TCNT       (*((volatile unsigned char*)TCNT_ADDR))   
-#define RSTCSR     (*((volatile unsigned char*)RSTCSR_ADDR)) 
+#define TCSR_R     (*((volatile unsigned char*)TCSR_ADDR))
+#define TCSR_W     (*((volatile unsigned short*)(TCSR_ADDR & ~1)))
+#define TCNT_R     (*((volatile unsigned char*)TCNT_ADDR))
+#define TCNT_W     (*((volatile unsigned short*)(TCNT_ADDR & ~1)))
+#define RSTCSR_R   (*((volatile unsigned char*)RSTCSR_ADDR))
+#define RSTCSR_W   (*((volatile unsigned short*)(RSTCSR_ADDR & ~1)))
 
 #define SBYCR      (*((volatile unsigned char*)SBYCR_ADDR))