diff options
| author | Ben Gras <beng@rtems.org> | 2014-12-15 13:35:26 +0100 |
|---|---|---|
| committer | Ben Gras <beng@rtems.org> | 2014-12-15 19:19:15 +0100 |
| commit | 1e587f7d6d76bbe4baf3ec403ac6ed9bffc58f62 (patch) | |
| tree | e0e7c628ba78061d85ea073d7abc0c03da00ba6d | |
| parent | mcf5225x-testsuite.tcfg: Add fileio (diff) | |
| download | rtems-1e587f7d6d76bbe4baf3ec403ac6ed9bffc58f62.tar.bz2 | |
bsp/beagle: Fix some warnings
The extra includes in console_*.c are to solve a 'no previous prototype'
warning.
Solves #2212 in trac.
| -rw-r--r-- | c/src/lib/libbsp/arm/beagle/clock.c | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/beagle/irq.c | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/shared/console_control.c | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/shared/console_read.c | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/shared/console_write.c | 1 |
5 files changed, 6 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/arm/beagle/clock.c b/c/src/lib/libbsp/arm/beagle/clock.c index b2582d11cb..7e32c781b1 100644 --- a/c/src/lib/libbsp/arm/beagle/clock.c +++ b/c/src/lib/libbsp/arm/beagle/clock.c @@ -44,6 +44,7 @@ static omap_timer_registers_t regs_v1 = { .TOWR = OMAP3_TIMER_TOWR, }; +#if IS_AM335X /* AM335X has a different ip block for the non 1ms timers */ static omap_timer_registers_t regs_v2 = { .TIDR = AM335X_TIMER_TIDR, @@ -67,6 +68,7 @@ static omap_timer_registers_t regs_v2 = { .TOCR = -1, /* UNDEF */ .TOWR = -1 /* UNDEF */ }; +#endif /* which timers are in use? target-dependent. * initialize at compile time. @@ -264,8 +266,6 @@ beagle_clock_initialize(void) static void beagle_clock_at_tick(void) { - uint32_t tisr; - last_tick_nanoseconds = read_frc(); mmio_write(timer->base + timer->regs->TISR, diff --git a/c/src/lib/libbsp/arm/beagle/irq.c b/c/src/lib/libbsp/arm/beagle/irq.c index 063034498b..81a511ae7e 100644 --- a/c/src/lib/libbsp/arm/beagle/irq.c +++ b/c/src/lib/libbsp/arm/beagle/irq.c @@ -136,7 +136,7 @@ rtems_status_code bsp_interrupt_facility_initialize(void) /* Install generic interrupt handler */ arm_cp15_set_exception_handler(ARM_EXCEPTION_IRQ, _ARMV4_Exception_interrupt); - arm_cp15_set_vector_base_address((uint32_t) bsp_vector_table_begin); + arm_cp15_set_vector_base_address(bsp_vector_table_begin); return RTEMS_SUCCESSFUL; } diff --git a/c/src/lib/libbsp/shared/console_control.c b/c/src/lib/libbsp/shared/console_control.c index 69946822f0..9bf029151d 100644 --- a/c/src/lib/libbsp/shared/console_control.c +++ b/c/src/lib/libbsp/shared/console_control.c @@ -26,6 +26,7 @@ #include <termios.h> #include <rtems/termiostypes.h> +#include <rtems/console.h> #include <libchip/serial.h> #include "console_private.h" diff --git a/c/src/lib/libbsp/shared/console_read.c b/c/src/lib/libbsp/shared/console_read.c index 3c349f9161..407d5e61db 100644 --- a/c/src/lib/libbsp/shared/console_read.c +++ b/c/src/lib/libbsp/shared/console_read.c @@ -25,6 +25,7 @@ #include <termios.h> #include <rtems/termiostypes.h> +#include <rtems/console.h> #include <libchip/serial.h> #include "console_private.h" diff --git a/c/src/lib/libbsp/shared/console_write.c b/c/src/lib/libbsp/shared/console_write.c index 8b942e6f3d..cc69b83b5a 100644 --- a/c/src/lib/libbsp/shared/console_write.c +++ b/c/src/lib/libbsp/shared/console_write.c @@ -25,6 +25,7 @@ #include <termios.h> #include <rtems/termiostypes.h> +#include <rtems/console.h> #include <libchip/serial.h> #include "console_private.h" |