summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libcpu/mips
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-11-26 22:58:07 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-11-26 22:58:07 +0000
commitb72f5799822637c57b18cf1574bc64806bbbb1ee (patch)
tree86765fbda434be7dc3116c3eee1b8efb4fa0a77c /c/src/lib/libcpu/mips
parent2007-11-26 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
downloadrtems-b72f5799822637c57b18cf1574bc64806bbbb1ee.tar.bz2
2007-11-26 Joel Sherrill <joel.sherrill@oarcorp.com>
* clock/ckinit.c: Eliminate the clicks_per_microsecond field in the MIPS CPU Table and define another mechanism for drivers to obtain this information.
Diffstat (limited to 'c/src/lib/libcpu/mips')
-rw-r--r--c/src/lib/libcpu/mips/ChangeLog6
-rw-r--r--c/src/lib/libcpu/mips/clock/ckinit.c11
2 files changed, 9 insertions, 8 deletions
diff --git a/c/src/lib/libcpu/mips/ChangeLog b/c/src/lib/libcpu/mips/ChangeLog
index 78b792f145..2c6e285229 100644
--- a/c/src/lib/libcpu/mips/ChangeLog
+++ b/c/src/lib/libcpu/mips/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-26 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * clock/ckinit.c: Eliminate the clicks_per_microsecond field in the
+ MIPS CPU Table and define another mechanism for drivers to obtain
+ this information.
+
2007-03-12 Joel Sherrill <joel@OARcorp.com>
* au1x00/include/au1x00.h, au1x00/vectorisrs/maxvectors.c,
diff --git a/c/src/lib/libcpu/mips/clock/ckinit.c b/c/src/lib/libcpu/mips/clock/ckinit.c
index 9e335f10e8..c92037b5e3 100644
--- a/c/src/lib/libcpu/mips/clock/ckinit.c
+++ b/c/src/lib/libcpu/mips/clock/ckinit.c
@@ -47,13 +47,8 @@
#include "clock.h"
-/* formerly in the BSP */
-#if 0
-#define CLOCKS_PER_MICROSECOND ( CPU_CLOCK_RATE_MHZ ) /* equivalent to CPU clock speed in MHz */
-#endif
+extern uint32_t bsp_clicks_per_microsecond;
-#define CLOCKS_PER_MICROSECOND \
- rtems_cpu_configuration_get_clicks_per_microsecond()
/* to avoid including the bsp */
mips_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int );
@@ -165,8 +160,8 @@ void Install_clock(
* Hardware specific initialize goes here
*/
- mips_timer_rate =
- rtems_configuration_get_microseconds_per_tick() * CLOCKS_PER_MICROSECOND;
+ mips_timer_rate = rtems_configuration_get_microseconds_per_tick() *
+ bsp_clicks_per_microsecond;
mips_set_timer( mips_timer_rate );
mips_enable_in_interrupt_mask(CLOCK_VECTOR_MASK);