2011-10-18 Jennifer Averett <Jennifer.Averett@OARcorp.com>

PR 1917/bsps
	* Makefile.am, console/erc32_console.c: Modifications to add dynamic
	tables for libchip serial drivers.
This commit is contained in:
Jennifer Averett
2011-10-18 18:30:22 +00:00
parent a7f3a657a9
commit 5976658617
3 changed files with 12 additions and 8 deletions

View File

@@ -1,3 +1,9 @@
2011-10-18 Jennifer Averett <Jennifer.Averett@OARcorp.com>
PR 1917/bsps
* Makefile.am, console/erc32_console.c: Modifications to add dynamic
tables for libchip serial drivers.
2011-06-19 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Fix broken path to clockdrv_shell.h.

View File

@@ -44,7 +44,9 @@ libbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
# gnatsupp
libbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
# console
libbsp_a_SOURCES += console/erc32_console.c ../../shared/console.c
libbsp_a_SOURCES += console/erc32_console.c ../../shared/console.c \
../../shared/console_select.c ../../shared/console_control.c \
../../shared/console_read.c ../../shared/console_write.c
# debugio
libbsp_a_SOURCES += console/debugputs.c
# clock

View File

@@ -58,8 +58,6 @@ static int erc32_console_first_open(int major, int minor, void *arg);
#endif
static void erc32_console_initialize(int minor);
rtems_device_minor_number Console_Port_Minor = 0;
#if (CONSOLE_USE_INTERRUPTS)
console_fns erc32_fns = {
libchip_serial_default_probe, /* deviceProbe */
@@ -86,7 +84,7 @@ rtems_device_minor_number Console_Port_Minor = 0;
};
#endif
console_tbl Console_Port_Tbl [] = {
console_tbl Console_Configuration_Ports [] = {
{
.sDeviceName = "/dev/console_a",
.deviceType = SERIAL_CUSTOM,
@@ -130,9 +128,7 @@ console_tbl Console_Port_Tbl [] = {
/* always exactly two uarts for erc32 */
#define ERC32_UART_COUNT (2)
unsigned long Console_Port_Count = ERC32_UART_COUNT;
console_data Console_Port_Data [ERC32_UART_COUNT];
unsigned long Console_Configuration_Count = ERC32_UART_COUNT;
static int erc32_console_first_open(int major, int minor, void *arg)
{
@@ -143,7 +139,7 @@ static int erc32_console_first_open(int major, int minor, void *arg)
rtems_libio_open_close_args_t *oca = arg;
struct rtems_termios_tty *tty = oca->iop->data1;
console_tbl *ct = &Console_Port_Tbl [minor];
console_tbl *ct = Console_Port_Tbl [minor];
console_data *cd = &Console_Port_Data [minor];
cd->termios_data = tty;