Patch rtems-rc-19991011-3.diff from Ralf Corsepius.

5 files changed, 35 insertions, 29 deletions

diff --git a/c/src/exec/score/cpu/sh/rtems/score/sh.h b/c/src/exec/score/cpu/sh/rtems/score/sh.h
index 03d9077d3e..96e10bfb1b 100644
--- a/c/src/exec/score/cpu/sh/rtems/score/sh.h
+++ b/c/src/exec/score/cpu/sh/rtems/score/sh.h
@@ -148,31 +148,6 @@ static inline unsigned int sh_swap_u16(
 #define CPU_swap_u32( value ) sh_swap_u32( value )
 #define CPU_swap_u16( value ) sh_swap_u16( value )
 
-/*
- *  Simple spin delay in microsecond units for device drivers.
- *  This is very dependent on the clock speed of the target.
- *
- *  Since we don't have a real time clock, this is a very rough
- *  approximation, assuming that each cycle of the delay loop takes
- *  approx. 4 machine cycles.
- *
- *  e.g.: MHZ = 20 =>     5e-8 secs per instruction
- *                 => 4 * 5e-8 secs per delay loop
- */
-
-#define sh_delay( microseconds ) \
-{ register unsigned int _delay = (microseconds) * (MHZ / 4 ); \
-  asm volatile ( \
-"0:	add  #-1,%0\n \
-	nop\n \
-	cmp/pl %0\n \
-	bt 0b\
-	nop" \
-    :: "r" (_delay) );  \
-}
-
-#define CPU_delay( microseconds ) sh_delay( microseconds )
-
 extern unsigned int sh_set_irq_priority( 
   unsigned int irq, 
   unsigned int prio );
diff --git a/c/src/lib/libbsp/sh/gensh1/include/bsp.h b/c/src/lib/libbsp/sh/gensh1/include/bsp.h
index 8f676d07fe..8422599b42 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/bsp.h
+++ b/c/src/lib/libbsp/sh/gensh1/include/bsp.h
@@ -68,8 +68,39 @@ extern "C" {
 #define Lower_tm27_intr()
 
 /* Constants */
+#ifndef MHZ
+#error Missing MHZ
+#endif
+
+/*
+ *  Simple spin delay in microsecond units for device drivers.
+ *  This is very dependent on the clock speed of the target.
+ *
+ *  Since we don't have a real time clock, this is a very rough
+ *  approximation, assuming that each cycle of the delay loop takes
+ *  approx. 4 machine cycles.
+ *
+ *  e.g.: MHZ = 20 =>     5e-8 secs per instruction
+ *                 => 4 * 5e-8 secs per delay loop
+ */
+
+#define delay( microseconds ) \
+{ register unsigned int _delay = (microseconds) * (MHZ / 4 ); \
+  asm volatile ( \
+"0:	add  #-1,%0\n \
+	nop\n \
+	cmp/pl %0\n \
+	bt 0b\
+	nop" \
+    :: "r" (_delay) );  \
+}
 
-#define MHZ 20
+/*
+ * For backward compatibility only.
+ * Do not rely on them being present in future
+ */
+#define CPU_delay( microseconds ) delay( microseconds )
+#define sh_deley( microseconds ) delay( microseconds )
 
 /*
  * Defined in the linker script 'linkcmds'
diff --git a/c/src/lib/libbsp/sh/gensh1/startup/Makefile.in b/c/src/lib/libbsp/sh/gensh1/startup/Makefile.in
index c2eca457b9..3d03489ca3 100644
--- a/c/src/lib/libbsp/sh/gensh1/startup/Makefile.in
+++ b/c/src/lib/libbsp/sh/gensh1/startup/Makefile.in
@@ -47,7 +47,7 @@ $(INSTALLDIRS):
 #
 
 DEFINES +=
-CPPFLAGS +=
+CPPFLAGS += $(BSP_CPPFLAGS)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/lib/libcpu/sh/sh7032/clock/Makefile.in b/c/src/lib/libcpu/sh/sh7032/clock/Makefile.in
index 5617ae594e..c9bd2ac92d 100644
--- a/c/src/lib/libcpu/sh/sh7032/clock/Makefile.in
+++ b/c/src/lib/libcpu/sh/sh7032/clock/Makefile.in
@@ -40,7 +40,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 #
 
 DEFINES +=
-CPPFLAGS +=
+CPPFLAGS += -DMHZ=$(MHZ)
 CFLAGS += $(CFLAGS_OS_V)
 
 LD_PATHS +=
diff --git a/c/src/lib/libcpu/sh/sh7032/timer/Makefile.in b/c/src/lib/libcpu/sh/sh7032/timer/Makefile.in
index ce19bbb25c..735ef3961d 100644
--- a/c/src/lib/libcpu/sh/sh7032/timer/Makefile.in
+++ b/c/src/lib/libcpu/sh/sh7032/timer/Makefile.in
@@ -40,7 +40,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 #
 
 DEFINES +=
-CPPFLAGS +=
+CPPFLAGS += -DMHZ=$(MHZ)
 CFLAGS +=
 
 LD_PATHS +=