diff options
-rw-r--r-- | cpukit/score/cpu/powerpc/ChangeLog | 23 | ||||
-rw-r--r-- | cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h | 36 | ||||
-rw-r--r-- | cpukit/score/cpu/powerpc/rtems/score/cpu.h | 35 |
3 files changed, 59 insertions, 35 deletions
diff --git a/cpukit/score/cpu/powerpc/ChangeLog b/cpukit/score/cpu/powerpc/ChangeLog index 847357e048..7cd5d8ad1d 100644 --- a/cpukit/score/cpu/powerpc/ChangeLog +++ b/cpukit/score/cpu/powerpc/ChangeLog @@ -1,5 +1,28 @@ 2005-02-18 Ralf Corsepius <ralf.corsepius@rtems.org> + * rtems/score/cpu.h: + (rtems_cpu_configuration_get_serial_per_sec, + rtems_cpu_configuration_get_serial_external_clock, + rtems_cpu_configuration_get_serial_xon_xoff, + rtems_cpu_configuration_get_serial_cts_rts, + rtems_cpu_configuration_get_serial_rate, + rtems_cpu_configuration_get_timer_average_overhead, + rtems_cpu_configuration_get_timer_least_valid, + rtems_cpu_configuration_get_timer_internal_clock, + rtems_cpu_configuration_get_clock_speed): New. + * rtems/old-exceptions/cpu.h: + (rtems_cpu_configuration_get_serial_per_sec, + rtems_cpu_configuration_get_serial_external_clock, + rtems_cpu_configuration_get_serial_xon_xoff, + rtems_cpu_configuration_get_serial_cts_rts, + rtems_cpu_configuration_get_serial_rate, + rtems_cpu_configuration_get_timer_average_overhead, + rtems_cpu_configuration_get_timer_least_valid, + rtems_cpu_configuration_get_timer_internal_clock, + rtems_cpu_configuration_get_clock_speed): Remove. + +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. diff --git a/cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h b/cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h index 3512eb6115..4f9ba967e8 100644 --- a/cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h +++ b/cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h @@ -343,41 +343,7 @@ typedef struct { #ifndef ASM #define rtems_cpu_configuration_get_spurious_handler() \ (_CPU_Table.spurious_handler) - -#if (defined(ppc403) || defined(ppc405) || defined(mpc860) || defined(mpc821)) - -#define rtems_cpu_configuration_get_serial_per_sec() \ - (_CPU_Table.serial_per_sec) - -#define rtems_cpu_configuration_get_serial_external_clock() \ - (_CPU_Table.serial_external_clock) - -#define rtems_cpu_configuration_get_serial_xon_xoff() \ - (_CPU_Table.serial_xon_xoff) - -#define rtems_cpu_configuration_get_serial_cts_rts() \ - (_CPU_Table.serial_cts_rts) - -#define rtems_cpu_configuration_get_serial_rate() \ - (_CPU_Table.serial_rate) - -#define rtems_cpu_configuration_get_timer_average_overhead() \ - (_CPU_Table.timer_average_overhead) - -#define rtems_cpu_configuration_get_timer_least_valid() \ - (_CPU_Table.timer_least_valid) - -#define rtems_cpu_configuration_get_timer_internal_clock() \ - (_CPU_Table.timer_internal_clock) - -#endif - -#if (defined(mpc860) || defined(mpc821)) -#define rtems_cpu_configuration_get_clock_speed() \ - (_CPU_Table.clock_speed) -#endif - -#endif +#endif /* ASM */ /* * The following type defines an entry in the PPC's trap table. diff --git a/cpukit/score/cpu/powerpc/rtems/score/cpu.h b/cpukit/score/cpu/powerpc/rtems/score/cpu.h index cc29e2ac0e..c006886928 100644 --- a/cpukit/score/cpu/powerpc/rtems/score/cpu.h +++ b/cpukit/score/cpu/powerpc/rtems/score/cpu.h @@ -283,6 +283,41 @@ static inline uint32_t CPU_swap_u32( #define rtems_cpu_configuration_get_exceptions_in_ram() \ (_CPU_Table.exceptions_in_RAM) +#if (defined(ppc403) || defined(ppc405) \ + || defined(mpc860) || defined(mpc821) || defined(mpc8260)) + +#define rtems_cpu_configuration_get_serial_per_sec() \ + (_CPU_Table.serial_per_sec) + +#define rtems_cpu_configuration_get_serial_external_clock() \ + (_CPU_Table.serial_external_clock) + +#define rtems_cpu_configuration_get_serial_xon_xoff() \ + (_CPU_Table.serial_xon_xoff) + +#define rtems_cpu_configuration_get_serial_cts_rts() \ + (_CPU_Table.serial_cts_rts) + +#define rtems_cpu_configuration_get_serial_rate() \ + (_CPU_Table.serial_rate) + +#define rtems_cpu_configuration_get_timer_average_overhead() \ + (_CPU_Table.timer_average_overhead) + +#define rtems_cpu_configuration_get_timer_least_valid() \ + (_CPU_Table.timer_least_valid) + +#define rtems_cpu_configuration_get_timer_internal_clock() \ + (_CPU_Table.timer_internal_clock) + +#endif + +#if (defined(mpc555) \ + || defined(mpc860) || defined(mpc821) || defined(mpc8260)) +#define rtems_cpu_configuration_get_clock_speed() \ + (_CPU_Table.clock_speed) +#endif + #endif /* ASM */ #ifndef ASM |