From e1ddcec09e6f7721ae0d625df31261a023c15a6c Mon Sep 17 00:00:00 2001 From: Jennifer Averett Date: Tue, 18 Oct 2011 18:35:25 +0000 Subject: 2011-10-18 Jennifer Averett PR 1917/bsps * Makefile.am, console/conscfg.c: Modifications to add dynamic tables for libchip serial drivers. --- c/src/lib/libbsp/m68k/sim68000/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/sim68000/Makefile.am | 4 +++- c/src/lib/libbsp/m68k/sim68000/console/conscfg.c | 10 +++------- 3 files changed, 12 insertions(+), 8 deletions(-) (limited to 'c/src/lib/libbsp/m68k/sim68000') diff --git a/c/src/lib/libbsp/m68k/sim68000/ChangeLog b/c/src/lib/libbsp/m68k/sim68000/ChangeLog index 676c99163e..b8fd953dda 100644 --- a/c/src/lib/libbsp/m68k/sim68000/ChangeLog +++ b/c/src/lib/libbsp/m68k/sim68000/ChangeLog @@ -1,3 +1,9 @@ +2011-10-18 Jennifer Averett + + PR 1917/bsps + * Makefile.am, console/conscfg.c: Modifications to add dynamic tables + for libchip serial drivers. + 2011-02-11 Ralf Corsépius * include/bsp.h: diff --git a/c/src/lib/libbsp/m68k/sim68000/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/Makefile.am index a3a4300998..a3d34d2395 100644 --- a/c/src/lib/libbsp/m68k/sim68000/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/Makefile.am @@ -40,7 +40,9 @@ libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \ # clock libbsp_a_SOURCES += clock/clockdrv.c ../../../shared/clockdrv_shell.h # console -libbsp_a_SOURCES += console/conscfg.c ../../shared/console.c +libbsp_a_SOURCES += console/conscfg.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/debugio.c # timer diff --git a/c/src/lib/libbsp/m68k/sim68000/console/conscfg.c b/c/src/lib/libbsp/m68k/sim68000/console/conscfg.c index 7173145d8d..0a878cc588 100644 --- a/c/src/lib/libbsp/m68k/sim68000/console/conscfg.c +++ b/c/src/lib/libbsp/m68k/sim68000/console/conscfg.c @@ -38,7 +38,7 @@ #define MC68681_FUNCTIONS &mc68681_fns_polled #endif -console_tbl Console_Port_Tbl[] = { +console_tbl Console_Configuration_Ports[] = { { "/dev/com0", /* sDeviceName */ SERIAL_MC68681, /* deviceType */ @@ -64,10 +64,6 @@ console_tbl Console_Port_Tbl[] = { * Declare some information used by the console driver */ -#define NUM_CONSOLE_PORTS (sizeof(Console_Port_Tbl)/sizeof(console_tbl)) +#define NUM_CONSOLE_PORTS (sizeof(Console_Configuration_Ports)/sizeof(console_tbl)) -unsigned long Console_Port_Count = NUM_CONSOLE_PORTS; - -console_data Console_Port_Data[NUM_CONSOLE_PORTS]; - -rtems_device_minor_number Console_Port_Minor; +unsigned long Console_Configuration_Count = NUM_CONSOLE_PORTS; -- cgit v1.2.3