From a39316315db8a149e85abe1d6d0bab8cf37ff82b Mon Sep 17 00:00:00 2001 From: Jennifer Averett Date: Tue, 18 Oct 2011 18:25:35 +0000 Subject: 2011-10-18 Jennifer Averett PR 1917/bsps * Makefile.am, console/console-config.c: Modifications to add dynamic tables for libchip serial drivers. --- c/src/lib/libbsp/arm/lpc24xx/ChangeLog | 6 ++++++ c/src/lib/libbsp/arm/lpc24xx/Makefile.am | 4 +++- c/src/lib/libbsp/arm/lpc24xx/console/console-config.c | 11 +++-------- 3 files changed, 12 insertions(+), 9 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/arm/lpc24xx/ChangeLog b/c/src/lib/libbsp/arm/lpc24xx/ChangeLog index 8cbe5d5a25..bf3cf09f6c 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/ChangeLog +++ b/c/src/lib/libbsp/arm/lpc24xx/ChangeLog @@ -1,3 +1,9 @@ +2011-10-18 Jennifer Averett + + PR 1917/bsps + * Makefile.am, console/console-config.c: Modifications to add dynamic + tables for libchip serial drivers. + 2011-10-17 Sebastian Huber * include/start-config.h, make/custom/lpc24xx_plx800_rom_int.cfg, diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am index 68747d9e81..c7db738f06 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am @@ -111,7 +111,9 @@ libbsp_a_SOURCES += ../../shared/src/irq-generic.c \ # Console libbsp_a_SOURCES += ../../shared/console.c \ - console/console-config.c + console/console-config.c ../../shared/console_select.c \ + ../../shared/console_read.c ../../shared/console_write.c \ + ../../shared/console_control.c # Clock libbsp_a_SOURCES += ../shared/lpc/clock/lpc-clock-config.c diff --git a/c/src/lib/libbsp/arm/lpc24xx/console/console-config.c b/c/src/lib/libbsp/arm/lpc24xx/console/console-config.c index 6c64530369..33b8686410 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/console/console-config.c +++ b/c/src/lib/libbsp/arm/lpc24xx/console/console-config.c @@ -89,9 +89,7 @@ static void lpc24xx_uart_set_register(uint32_t addr, uint8_t i, uint8_t val) } #endif -rtems_device_minor_number Console_Port_Minor = 0; - -console_tbl Console_Port_Tbl [] = { +console_tbl Console_Configuration_Ports [] = { #ifdef LPC24XX_CONFIG_CONSOLE { .sDeviceName = "/dev/ttyS0", @@ -179,8 +177,5 @@ console_tbl Console_Port_Tbl [] = { }; #define LPC24XX_UART_COUNT \ - (sizeof(Console_Port_Tbl) / sizeof(Console_Port_Tbl [0])) - -unsigned long Console_Port_Count = LPC24XX_UART_COUNT; - -console_data Console_Port_Data [LPC24XX_UART_COUNT]; + (sizeof(Console_Configuration_Ports) / sizeof(console_tbl)) +unsigned long Console_Configuration_Count = LPC24XX_UART_COUNT; -- cgit v1.2.3