--- c/src/lib/libbsp/arm/csb337/include/bsp.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/c/src/lib/libbsp/arm/csb337/include/bsp.h b/c/src/lib/libbsp/arm/csb337/include/bsp.h index c9a6353..b752b00 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 */ -- 1.9.3 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel