summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cpukit/score/cpu/powerpc/ChangeLog5
-rw-r--r--cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h6
-rw-r--r--cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h6
3 files changed, 13 insertions, 4 deletions
diff --git a/cpukit/score/cpu/powerpc/ChangeLog b/cpukit/score/cpu/powerpc/ChangeLog
index 6e88a6948a..847357e048 100644
--- a/cpukit/score/cpu/powerpc/ChangeLog
+++ b/cpukit/score/cpu/powerpc/ChangeLog
@@ -1,5 +1,10 @@
2005-02-18 Ralf Corsepius <ralf.corsepius@rtems.org>
+ * rtems/new-exceptions/cpu.h, rtems/old-exceptions/cpu.h
+ (rtems_cpu_table): Sync defines between {old|new}-exceptions.
+
+2005-02-18 Ralf Corsepius <ralf.corsepius@rtems.org>
+
* rtems/new-exceptions/cpu.h (Context_Control,
Context_Control_fp, CPU_Interrupt_frame): Remove.
* rtems/old-exceptions/cpu.h (Context_Control,
diff --git a/cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h b/cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h
index 1493cd5e17..225b1b4854 100644
--- a/cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h
+++ b/cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h
@@ -290,7 +290,8 @@ typedef struct {
uint32_t clicks_per_usec; /* Timer clicks per microsecond */
boolean exceptions_in_RAM; /* TRUE if in RAM */
-#if (defined(ppc403) || defined(mpc860) || defined(mpc821) || defined(mpc8260))
+#if (defined(ppc403) || defined(ppc405) \
+ || defined(mpc860) || defined(mpc821) || defined(mpc8260))
uint32_t serial_per_sec; /* Serial clocks per second */
boolean serial_external_clock;
boolean serial_xon_xoff;
@@ -301,7 +302,8 @@ typedef struct {
boolean timer_internal_clock; /* TRUE, when timer runs with CPU clk */
#endif
-#if (defined(mpc555) || defined(mpc860) || defined(mpc821) || defined(mpc8260))
+#if (defined(mpc555) \
+ || defined(mpc860) || defined(mpc821) || defined(mpc8260))
uint32_t clock_speed; /* Speed of CPU in Hz */
#endif
} rtems_cpu_table;
diff --git a/cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h b/cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h
index a63059aa2a..3512eb6115 100644
--- a/cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h
+++ b/cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h
@@ -312,7 +312,8 @@ typedef struct {
void (*spurious_handler)(uint32_t vector, CPU_Interrupt_frame *);
boolean exceptions_in_RAM; /* TRUE if in RAM */
-#if (defined(ppc403) || defined(ppc405) || defined(mpc860) || defined(mpc821))
+#if (defined(ppc403) || defined(ppc405) \
+ || defined(mpc860) || defined(mpc821) || defined(mpc8260))
uint32_t serial_per_sec; /* Serial clocks per second */
boolean serial_external_clock;
boolean serial_xon_xoff;
@@ -323,7 +324,8 @@ typedef struct {
boolean timer_internal_clock; /* TRUE, when timer runs with CPU clk */
#endif
-#if (defined(mpc860) || defined(mpc821))
+#if (defined(mpc555) \
+ || defined(mpc860) || defined(mpc821) || defined(mpc8260))
uint32_t clock_speed; /* Speed of CPU in Hz */
#endif
} rtems_cpu_table;