diff options
| author | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2011-10-18 18:26:36 +0000 |
|---|---|---|
| committer | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2011-10-18 18:26:36 +0000 |
| commit | bdd3b6375bc2079f2095758d098383dd9fd6dbb3 (patch) | |
| tree | 18c9434c157bd223eb40cd42a44e9ce5c569eaf8 /c/src/lib/libbsp/arm/rtl22xx | |
| parent | 2011-10-18 Jennifer Averett <Jennifer.Averett@OARcorp.com> (diff) | |
| download | rtems-bdd3b6375bc2079f2095758d098383dd9fd6dbb3.tar.bz2 | |
2011-10-18 Jennifer Averett <Jennifer.Averett@OARcorp.com>
PR 1917/bsps
* Makefile.am, console/uart.c: Modifications to add dynamic tables for
libchip serial drivers.
Diffstat (limited to 'c/src/lib/libbsp/arm/rtl22xx')
| -rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/Makefile.am | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/console/uart.c | 8 |
3 files changed, 11 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog index 992be0f685..e22b7f3084 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog +++ b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog @@ -1,3 +1,9 @@ +2011-10-18 Jennifer Averett <Jennifer.Averett@OARcorp.com> + + PR 1917/bsps + * Makefile.am, console/uart.c: Modifications to add dynamic tables for + libchip serial drivers. + 2011-10-07 Ralf Corsépius <ralf.corsepius@rtems.org> * make/custom/rtl22xx_t.cfg: Remove USE_THUMB (Violates *.cfg diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am index 5ae5fa357a..bebdff5b79 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am +++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am @@ -41,7 +41,9 @@ libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/gnatinstallhandler.c # console -libbsp_a_SOURCES += ../../shared/console.c +libbsp_a_SOURCES += ../../shared/console.c \ + ../../shared/console_select.c ../../shared/console_control.c \ + ../../shared/console_read.c ../../shared/console_write.c # IRQ include_bsp_HEADERS += ../../shared/include/irq-generic.h \ ../../shared/include/irq-info.h diff --git a/c/src/lib/libbsp/arm/rtl22xx/console/uart.c b/c/src/lib/libbsp/arm/rtl22xx/console/uart.c index 63a9f672e1..fe83b88b38 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/console/uart.c +++ b/c/src/lib/libbsp/arm/rtl22xx/console/uart.c @@ -45,11 +45,7 @@ static void uart_write_polled(int minor, char c); static int uart_set_attributes(int minor, const struct termios *t); /* These are used by code in console.c */ -unsigned long Console_Port_Count = NUM_DEVS; -console_data Console_Port_Data[NUM_DEVS]; - -/* rtems console uses the following minor number */ -rtems_device_minor_number Console_Port_Minor = 0; +unsigned long Console_Configuration_Count = NUM_DEVS; /* Pointers to functions for handling the UART. */ console_fns uart_fns = @@ -72,7 +68,7 @@ console_fns uart_fns = * by console.c, but may be used by drivers in libchip * */ -console_tbl Console_Port_Tbl[] = { +console_tbl Console_Configuration_Ports[] = { { "/dev/console", /* sDeviceName */ SERIAL_CUSTOM, /* deviceType */ |