From 5e86086f1e99103a4f3e2533baa060085aa1042c Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 6 Nov 2012 10:34:42 +0100 Subject: sapi: Use rtems_config*_get_microseconds_per_tick --- c/src/lib/libbsp/m68k/idp/clock/ckinit.c | 2 +- c/src/lib/libbsp/m68k/mcf52235/clock/clock.c | 4 ++-- c/src/lib/libbsp/m68k/mcf5225x/clock/clock.c | 4 ++-- c/src/lib/libbsp/m68k/mcf5329/clock/clock.c | 4 ++-- c/src/lib/libcpu/arm/pxa255/clock/clock.c | 8 ++++---- cpukit/libmisc/capture/capture.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/c/src/lib/libbsp/m68k/idp/clock/ckinit.c b/c/src/lib/libbsp/m68k/idp/clock/ckinit.c index efc4aa58a2..8391f8cb52 100644 --- a/c/src/lib/libbsp/m68k/idp/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/idp/clock/ckinit.c @@ -90,7 +90,7 @@ void Install_clock( rtems_isr_entry clock_isr ) { Clock_driver_ticks = 0; - Clock_isrs = (int)(Configuration.microseconds_per_tick / 1000); + Clock_isrs = (int)(rtems_configuration_get_microseconds_per_tick() / 1000); /* led_putnum('c'); * for debugging purposes */ Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 ); diff --git a/c/src/lib/libbsp/m68k/mcf52235/clock/clock.c b/c/src/lib/libbsp/m68k/mcf52235/clock/clock.c index fd79dfefa9..c22393d5ae 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/clock/clock.c +++ b/c/src/lib/libbsp/m68k/mcf52235/clock/clock.c @@ -60,7 +60,7 @@ static void Clock_driver_support_shutdown_hardware(void) /* * Set up the clock hardware * - * We need to have 1 interrupt every BSP_Configuration.microseconds_per_tick + * We need to have 1 interrupt every rtems_configuration_get_microseconds_per_tick() */ static void Clock_driver_support_initialize_hardware(void) { @@ -68,7 +68,7 @@ static void Clock_driver_support_initialize_hardware(void) uint32_t pmr; uint32_t preScaleCode = 0; uint32_t clk = bsp_get_CPU_clock_speed() >> 1; - uint32_t tps = 1000000 / Configuration.microseconds_per_tick; + uint32_t tps = 1000000 / rtems_configuration_get_microseconds_per_tick(); while (preScaleCode < 15) { pmr = (clk >> preScaleCode) / tps; diff --git a/c/src/lib/libbsp/m68k/mcf5225x/clock/clock.c b/c/src/lib/libbsp/m68k/mcf5225x/clock/clock.c index 4e1882838f..d058126798 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/clock/clock.c +++ b/c/src/lib/libbsp/m68k/mcf5225x/clock/clock.c @@ -52,7 +52,7 @@ static void Clock_driver_support_shutdown_hardware(void) /* * Set up the clock hardware * - * We need to have 1 interrupt every BSP_Configuration.microseconds_per_tick + * We need to have 1 interrupt every BSP_rtems_configuration_get_microseconds_per_tick() */ static void Clock_driver_support_initialize_hardware(void) { @@ -60,7 +60,7 @@ static void Clock_driver_support_initialize_hardware(void) uint32_t pmr; uint32_t preScaleCode = 0; uint32_t clk = bsp_get_CPU_clock_speed() >> 1; - uint32_t tps = 1000000 / Configuration.microseconds_per_tick; + uint32_t tps = 1000000 / rtems_configuration_get_microseconds_per_tick(); while (preScaleCode < 15) { pmr = (clk >> preScaleCode) / tps; diff --git a/c/src/lib/libbsp/m68k/mcf5329/clock/clock.c b/c/src/lib/libbsp/m68k/mcf5329/clock/clock.c index a96e211898..ed11320bba 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/clock/clock.c +++ b/c/src/lib/libbsp/m68k/mcf5329/clock/clock.c @@ -59,7 +59,7 @@ static void Clock_driver_support_shutdown_hardware(void) /* * Set up the clock hardware * - * We need to have 1 interrupt every BSP_Configuration.microseconds_per_tick + * We need to have 1 interrupt every rtems_configuration_get_microseconds_per_tick() */ static void Clock_driver_support_initialize_hardware(void) { @@ -67,7 +67,7 @@ static void Clock_driver_support_initialize_hardware(void) uint32_t pmr; uint32_t preScaleCode = 0; uint32_t clk = bsp_get_BUS_clock_speed(); - uint32_t tps = 1000000 / Configuration.microseconds_per_tick; + uint32_t tps = 1000000 / rtems_configuration_get_microseconds_per_tick(); while (preScaleCode < 15) { pmr = (clk >> preScaleCode) / tps; diff --git a/c/src/lib/libcpu/arm/pxa255/clock/clock.c b/c/src/lib/libcpu/arm/pxa255/clock/clock.c index 0bb2b0822f..0736b14909 100644 --- a/c/src/lib/libcpu/arm/pxa255/clock/clock.c +++ b/c/src/lib/libcpu/arm/pxa255/clock/clock.c @@ -50,9 +50,9 @@ static void clock_isr_on(const rtems_irq_connect_data *unused) XSCALE_OS_TIMER_IER |= 0x1; #if ON_SKYEYE==1 - period_num = (TIMER_RATE* Configuration.microseconds_per_tick)/100000; + period_num = (TIMER_RATE* rtems_configuration_get_microseconds_per_tick())/100000; #else - period_num = (TIMER_RATE* Configuration.microseconds_per_tick)/10000; + period_num = (TIMER_RATE* rtems_configuration_get_microseconds_per_tick())/10000; #endif XSCALE_OS_TIMER_MR0 = XSCALE_OS_TIMER_TCR + period_num; @@ -103,9 +103,9 @@ rtems_irq_connect_data clock_isr_data = { void Clock_driver_support_initialize_hardware(void) { #if ON_SKYEYE==1 - period_num = (TIMER_RATE* Configuration.microseconds_per_tick)/100000; + period_num = (TIMER_RATE* rtems_configuration_get_microseconds_per_tick())/100000; #else - period_num = (TIMER_RATE* Configuration.microseconds_per_tick)/10000; + period_num = (TIMER_RATE* rtems_configuration_get_microseconds_per_tick())/10000; #endif } diff --git a/cpukit/libmisc/capture/capture.c b/cpukit/libmisc/capture/capture.c index 9f068f96fa..d3f8c5b39c 100644 --- a/cpukit/libmisc/capture/capture.c +++ b/cpukit/libmisc/capture/capture.c @@ -1031,7 +1031,7 @@ rtems_capture_open (uint32_t size, rtems_capture_timestamp timestamp __attribu /* * Get the tick period from the BSP Configuration Table. */ - capture_tick_period = Configuration.microseconds_per_tick; + capture_tick_period = rtems_configuration_get_microseconds_per_tick(); /* * Register the user extension handlers for the CAPture Engine. -- cgit v1.2.3