From ede9699cf408b3bc394471e7ac1b580e2942ad3f Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 16 Aug 2001 21:07:41 +0000 Subject: 2001-08-01 Radzislaw Galler * include/bsp.h: Disabled redefinition of CONSOLE_DRIVER_TABLE_ENTRY. Some "FIXME:" comments added. * console/config.c: New file. Definitions of externs referenced from libbsp/shared/console.c. * console/Makefile.am: Changed VPATH to point to libbsp/shared. Added config.c to C_FILES and EXTRA_DIST. --- c/src/lib/libbsp/sh/gensh2/ChangeLog | 9 +++++++++ c/src/lib/libbsp/sh/gensh2/README | 16 +++++++++------- c/src/lib/libbsp/sh/gensh2/README.EVB7045F | 2 +- c/src/lib/libbsp/sh/gensh2/console/Makefile.am | 6 ++++-- c/src/lib/libbsp/sh/gensh2/include/bsp.h | 13 ++++++++++++- 5 files changed, 35 insertions(+), 11 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/sh/gensh2/ChangeLog b/c/src/lib/libbsp/sh/gensh2/ChangeLog index 0613ad69eb..fa644461eb 100644 --- a/c/src/lib/libbsp/sh/gensh2/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh2/ChangeLog @@ -1,3 +1,12 @@ +2001-08-01 Radzislaw Galler + + * include/bsp.h: Disabled redefinition of + CONSOLE_DRIVER_TABLE_ENTRY. Some "FIXME:" comments added. + * console/config.c: New file. Definitions of externs referenced + from libbsp/shared/console.c. + * console/Makefile.am: Changed VPATH to point to + libbsp/shared. Added config.c to C_FILES and EXTRA_DIST. + 2001-06-19 Ralf Corsepius * configure.in: Add bspopts.h. diff --git a/c/src/lib/libbsp/sh/gensh2/README b/c/src/lib/libbsp/sh/gensh2/README index 7efa43143e..c05974f4cb 100644 --- a/c/src/lib/libbsp/sh/gensh2/README +++ b/c/src/lib/libbsp/sh/gensh2/README @@ -7,7 +7,7 @@ BSP NAME: generic SH2 (gensh2) -BOARD: n/a +BOARD: EVB7045F (note 2) BUS: n/a CPU FAMILY: Hitachi SH CPU: SH 7045F @@ -37,12 +37,12 @@ TTY DRIVER: /dev/console STDIO ===== -PORT: /dev/sci1 -ELECTRICAL: n/a -BAUD: n/a -BITS PER CHARACTER: n/a -PARITY: n/a -STOP BITS: n/a +PORT: /dev/sci0 +ELECTRICAL: SCI0 +BAUD: 9600 +BITS PER CHARACTER: 8 +PARITY: NONE +STOP BITS: 1 NOTES ===== @@ -56,3 +56,5 @@ NOTES These are both minimal functions intended to support the RTEMS test suites. + +(2) See README.EVB7045F diff --git a/c/src/lib/libbsp/sh/gensh2/README.EVB7045F b/c/src/lib/libbsp/sh/gensh2/README.EVB7045F index ef0ca60b64..f459b0ec39 100644 --- a/c/src/lib/libbsp/sh/gensh2/README.EVB7045F +++ b/c/src/lib/libbsp/sh/gensh2/README.EVB7045F @@ -138,7 +138,7 @@ Hello World an MS stuff anymore... ;) It is possible to repeat the success on MS Windows only. To do the - same on Linux only you a tool to downlad 'gdbstubs' on the + same on Linux only you need a tool to downlad 'gdbstubs' on the board. This should be no problem to find it on the net but right now I don't know about it. diff --git a/c/src/lib/libbsp/sh/gensh2/console/Makefile.am b/c/src/lib/libbsp/sh/gensh2/console/Makefile.am index deddacb7e7..88f41701d1 100644 --- a/c/src/lib/libbsp/sh/gensh2/console/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/console/Makefile.am @@ -4,11 +4,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 -VPATH = @srcdir@:@srcdir@/../../shared +VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/console.rel -C_FILES = console.c +C_FILES = console.c config.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) @@ -31,4 +31,6 @@ all-local: $(ARCH) $(OBJS) $(PGM) .PRECIOUS: $(PGM) +EXTRA_DIST = config.c + include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/gensh2/include/bsp.h b/c/src/lib/libbsp/sh/gensh2/include/bsp.h index 514c82cdfd..5bf802b51b 100644 --- a/c/src/lib/libbsp/sh/gensh2/include/bsp.h +++ b/c/src/lib/libbsp/sh/gensh2/include/bsp.h @@ -62,8 +62,14 @@ extern "C" { #define BSP_CONSOLE_DRIVER_TABLE_ENTRY DEVNULL_DRIVER_TABLE_ENTRY #else #include +/* FIXME: + * These definitions will be no longer necessary if the old + * implementation of SCI driver will be droped + */ #define BSP_CONSOLE_DEVNAME "/dev/sci0" +#define BSP_CONSOLE_MINOR_NUMBER ((rtems_device_minor_number) 0) #define BSP_CONSOLE_DRIVER_TABLE_ENTRY DEVSCI_DRIVER_TABLE_ENTRY +#define BSP_CONSOLE_DEVICE_TERMIOS_HANDLERS (sh_sci_get_termios_handlers(TRUE)) #endif /* @@ -131,13 +137,18 @@ extern void bsp_cleanup( void ); /* * We redefine CONSOLE_DRIVER_TABLE_ENTRY to redirect /dev/console + * + * FIXME: Since console driver works properly this is not + * necessary. When enabled - causes error in console_initialize. */ +#if 0 #undef CONSOLE_DRIVER_TABLE_ENTRY #define CONSOLE_DRIVER_TABLE_ENTRY \ BSP_CONSOLE_DRIVER_TABLE_ENTRY, \ { console_initialize, console_open, console_close, \ console_read, console_write, console_control } - +#endif + /* * NOTE: Use the standard Clock driver entry */ -- cgit v1.2.3