From 47f56094daf27c6a025ac77550a6a54d0847587b Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 7 Nov 2011 08:26:12 +0000 Subject: 2011-11-07 Sebastian Huber PR 1951/bsps * Makefile.am, console/console-config.c: Update due to API changes. --- c/src/lib/libbsp/arm/lm3s69xx/ChangeLog | 5 +++++ c/src/lib/libbsp/arm/lm3s69xx/Makefile.am | 10 +++++++--- c/src/lib/libbsp/arm/lm3s69xx/console/console-config.c | 15 +++++++-------- 3 files changed, 19 insertions(+), 11 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/arm/lm3s69xx/ChangeLog b/c/src/lib/libbsp/arm/lm3s69xx/ChangeLog index 6f193de016..8caa86e110 100644 --- a/c/src/lib/libbsp/arm/lm3s69xx/ChangeLog +++ b/c/src/lib/libbsp/arm/lm3s69xx/ChangeLog @@ -1,3 +1,8 @@ +2011-11-07 Sebastian Huber + + PR 1951/bsps + * Makefile.am, console/console-config.c: Update due to API changes. + 2011-09-24 Sebastian Huber * 0001-Fixed-interrupt-handling-for-ARMv7M.patch, diff --git a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am index 7d2a6fda7e..a68056a08b 100644 --- a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am @@ -88,9 +88,13 @@ libbsp_a_SOURCES += ../../shared/src/irq-generic.c \ irq/irq.c # Console -libbsp_a_SOURCES += ../../shared/console.c \ - console/console-config.c \ - console/uart.c +libbsp_a_SOURCES += ../../shared/console.c +libbsp_a_SOURCES += ../../shared/console_control.c +libbsp_a_SOURCES += ../../shared/console_read.c +libbsp_a_SOURCES += ../../shared/console_select.c +libbsp_a_SOURCES += ../../shared/console_write.c +libbsp_a_SOURCES += console/console-config.c +libbsp_a_SOURCES += console/uart.c # Clock libbsp_a_SOURCES += clock/clock-config.c \ diff --git a/c/src/lib/libbsp/arm/lm3s69xx/console/console-config.c b/c/src/lib/libbsp/arm/lm3s69xx/console/console-config.c index 00864b5bc6..006528e382 100644 --- a/c/src/lib/libbsp/arm/lm3s69xx/console/console-config.c +++ b/c/src/lib/libbsp/arm/lm3s69xx/console/console-config.c @@ -23,7 +23,7 @@ #include #include -console_tbl Console_Port_Tbl [] = { +console_tbl Console_Configuration_Ports [] = { #ifdef LM3S69XX_ENABLE_UART_0 { .sDeviceName = "/dev/ttyS0", @@ -56,17 +56,16 @@ console_tbl Console_Port_Tbl [] = { #endif }; -#define PORT_COUNT (sizeof(Console_Port_Tbl) / sizeof(Console_Port_Tbl [0])) +#define PORT_COUNT \ + (sizeof(Console_Configuration_Ports) \ + / sizeof(Console_Configuration_Ports [0])) -unsigned long Console_Port_Count = PORT_COUNT; - -rtems_device_minor_number Console_Port_Minor; - -console_data Console_Port_Data [PORT_COUNT]; +unsigned long Console_Configuration_Count = PORT_COUNT; static void output_char(char c) { - const console_fns *con = Console_Port_Tbl [Console_Port_Minor].pDeviceFns; + const console_fns *con = + Console_Configuration_Ports [Console_Port_Minor].pDeviceFns; if (c == '\n') { con->deviceWritePolled((int) Console_Port_Minor, '\r'); -- cgit v1.2.3