diff options
| author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-10-20 09:25:41 -0500 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-10-20 10:02:05 -0500 |
| commit | c2e32ffc7d78de4e672f1e76bfeec0af73a772b1 (patch) | |
| tree | 7c93f6a15d7eb80f6a239b5302f1eb4a74f39c98 | |
| parent | arm/csb337/console/fbcons.c: Fix warning (diff) | |
| download | rtems-c2e32ffc7d78de4e672f1e76bfeec0af73a772b1.tar.bz2 | |
lm32 BSP shared and lm32_evr: Fix BSPs
| -rw-r--r-- | c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h | 7 | ||||
| -rw-r--r-- | c/src/lib/libbsp/lm32/shared/console/console.c | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/lm32/shared/console/uart.c | 9 |
3 files changed, 13 insertions, 9 deletions
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h b/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h index e63e9fe222..facfc2d89c 100644 --- a/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h +++ b/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h @@ -76,6 +76,13 @@ rtems_isr_entry set_vector( /* returns old vector */ int type /* RTEMS or RAW intr */ ); +/* + * Prototypes for BSP methods that cross file boundaries + */ +void BSP_uart_polled_write(char ch); +int BSP_uart_polled_read( void ); +char BSP_uart_is_character_ready(char *ch); + #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/lm32/shared/console/console.c b/c/src/lib/libbsp/lm32/shared/console/console.c index 233555c45d..e2741fc7ff 100644 --- a/c/src/lib/libbsp/lm32/shared/console/console.c +++ b/c/src/lib/libbsp/lm32/shared/console/console.c @@ -16,14 +16,9 @@ #define NO_BSP_INIT -#include <rtems.h> #include <bsp.h> #include <rtems/libio.h> -void BSP_uart_polled_write(char ch); -int BSP_uart_polled_read( void ); -char BSP_uart_is_character_ready(char *ch); - /* console_initialize * * This routine initializes the console IO driver. @@ -59,7 +54,6 @@ static int inbyte( void ) /* * If polling, wait until a character is available. */ - return BSP_uart_polled_read(); } diff --git a/c/src/lib/libbsp/lm32/shared/console/uart.c b/c/src/lib/libbsp/lm32/shared/console/uart.c index 1ce5c87852..9adbd4063d 100644 --- a/c/src/lib/libbsp/lm32/shared/console/uart.c +++ b/c/src/lib/libbsp/lm32/shared/console/uart.c @@ -1,6 +1,8 @@ /* * Uart driver for Lattice Mico32 (lm32) UART - * + */ + +/* * COPYRIGHT (c) 1989-1999. * On-Line Applications Research Corporation (OAR). * @@ -14,6 +16,7 @@ #include "../include/system_conf.h" #include "uart.h" +#include <bsp.h> #include <rtems/libio.h> static inline int uartread(unsigned int reg) @@ -51,11 +54,11 @@ void BSP_uart_polled_write(char ch) uartwrite(LM32_UART_RBR, ch); } -char BSP_uart_polled_read( void ) +int BSP_uart_polled_read( void ) { /* Wait until there is a byte in RBR */ while (!(uartread(LM32_UART_LSR) & LM32_UART_LSR_DR)); - return (char) uartread(LM32_UART_RBR); + return (int) uartread(LM32_UART_RBR); } char BSP_uart_is_character_ready(char *ch) |