diff options
author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-10-09 10:46:43 -0500 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-10-10 10:17:17 -0500 |
commit | bc77bdadb375a0be0715a9534d855e68a78259d9 (patch) | |
tree | fe7046eabb6208902ad25f30f3ae8a3c8e18623b /c/src/lib/libbsp/arm/csb337 | |
parent | libchip/rtc/mc146818a.c: Compiles again and clean up (diff) | |
download | rtems-bc77bdadb375a0be0715a9534d855e68a78259d9.tar.bz2 |
csb337/include/bsp.h: Do not include libchip/serial to avoid conflicts when building libchip/rtc
Diffstat (limited to 'c/src/lib/libbsp/arm/csb337')
-rw-r--r-- | c/src/lib/libbsp/arm/csb337/include/bsp.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/arm/csb337/include/bsp.h b/c/src/lib/libbsp/arm/csb337/include/bsp.h index c9a6353adc..b752b00017 100644 --- a/c/src/lib/libbsp/arm/csb337/include/bsp.h +++ b/c/src/lib/libbsp/arm/csb337/include/bsp.h @@ -29,7 +29,6 @@ extern "C" { #include <rtems.h> #include <rtems/console.h> #include <rtems/clockdrv.h> -#include <libchip/serial.h> /** * @defgroup arm_csb337 CSB337 Support @@ -50,7 +49,13 @@ extern "C" { /* What is the last interrupt? */ #define BSP_MAX_INT AT91RM9200_MAX_INT +/* + * forward reference the type to avoid conflicts between libchip serial + * and libchip rtc get and set register types. + */ +typedef struct _console_tbl console_tbl; console_tbl *BSP_get_uart_from_minor(int minor); + static inline int32_t BSP_get_baud(void) {return 38400;} #define ST_PIMR_PIV 33 /* 33 ticks of the 32.768Khz clock ~= 1msec */ |