diff options
| author | Gedare Bloom <gedare@rtems.org> | 2011-11-27 17:30:18 +0000 |
|---|---|---|
| committer | Gedare Bloom <gedare@rtems.org> | 2011-11-27 17:30:18 +0000 |
| commit | b8ee42cd81e239ebac3bb3355af063afc25dda60 (patch) | |
| tree | 57ce49280aa74ad0a88e8bc88069d5e7c5f4db73 /c | |
| parent | 2011-11-27 Sebastien Bourdeauducq <seb@tmplab.org> (diff) | |
| download | rtems-b8ee42cd81e239ebac3bb3355af063afc25dda60.tar.bz2 | |
2011-11-27 Sebastien Bourdeauducq <seb@tmplab.org>
PR 1970/bsps
* milkymist_clock/ckinit.c, milkymist_console/console.c,
milkymist_console/uart.c, milkymist_timer/timer.c: Support for the
new Milkymist sysctl and clock frequency detection.
Diffstat (limited to 'c')
5 files changed, 11 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/lm32/shared/ChangeLog b/c/src/lib/libbsp/lm32/shared/ChangeLog index 39062618ef..6f4b58c35c 100644 --- a/c/src/lib/libbsp/lm32/shared/ChangeLog +++ b/c/src/lib/libbsp/lm32/shared/ChangeLog @@ -1,5 +1,12 @@ 2011-11-27 Sebastien Bourdeauducq <seb@tmplab.org> + PR 1970/bsps + * milkymist_clock/ckinit.c, milkymist_console/console.c, + milkymist_console/uart.c, milkymist_timer/timer.c: Support for the + new Milkymist sysctl and clock frequency detection. + +2011-11-27 Sebastien Bourdeauducq <seb@tmplab.org> + PR 1966/bsps * milkymist_console/console.c, milkymist_console/uart.c, milkymist_console/uart.h, milkymist_midi/midi.c: support for the new diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c b/c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c index 72c770b608..3aad14074b 100644 --- a/c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c +++ b/c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c @@ -35,7 +35,7 @@ void Clock_driver_support_initialize_hardware(void) { MM_WRITE(MM_TIMER0_COMPARE, - (CPU_FREQUENCY/(1000000/rtems_configuration_get_microseconds_per_tick()))); + (MM_READ(MM_FREQUENCY)/(1000000/rtems_configuration_get_microseconds_per_tick()))); MM_WRITE(MM_TIMER0_COUNTER, 0); MM_WRITE(MM_TIMER0_CONTROL, TIMER_ENABLE | TIMER_AUTORESTART); bsp_interrupt_vector_enable(MM_IRQ_TIMER0); diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_console/console.c b/c/src/lib/libbsp/lm32/shared/milkymist_console/console.c index 04b2c1f12e..c945b356d0 100644 --- a/c/src/lib/libbsp/lm32/shared/milkymist_console/console.c +++ b/c/src/lib/libbsp/lm32/shared/milkymist_console/console.c @@ -109,7 +109,7 @@ static int mmconsole_set_attributes(int minor, const struct termios *t) } if (baud > 0) - MM_WRITE(MM_UART_DIV, CPU_FREQUENCY/baud/16); + MM_WRITE(MM_UART_DIV, MM_READ(MM_FREQUENCY)/baud/16); return 0; } diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_console/uart.c b/c/src/lib/libbsp/lm32/shared/milkymist_console/uart.c index 8ca8950b99..2ebfe3526f 100644 --- a/c/src/lib/libbsp/lm32/shared/milkymist_console/uart.c +++ b/c/src/lib/libbsp/lm32/shared/milkymist_console/uart.c @@ -19,7 +19,7 @@ void BSP_uart_init(int baud) { - MM_WRITE(MM_UART_DIV, CPU_FREQUENCY/baud/16); + MM_WRITE(MM_UART_DIV, MM_READ(MM_FREQUENCY)/baud/16); } void BSP_uart_polled_write(char ch) diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_timer/timer.c b/c/src/lib/libbsp/lm32/shared/milkymist_timer/timer.c index ece2cf3912..83acc43961 100644 --- a/c/src/lib/libbsp/lm32/shared/milkymist_timer/timer.c +++ b/c/src/lib/libbsp/lm32/shared/milkymist_timer/timer.c @@ -58,7 +58,7 @@ uint32_t benchmark_timer_read(void) if (ticks == 0xffffffff) printk("Timer overflow!\n"); - total = ticks / (CPU_FREQUENCY / 1000000); + total = ticks / (MM_READ(MM_FREQUENCY) / 1000000); if (benchmark_timer_find_average_overhead) return total; |