From 4e568769d337e3681f99cba97feed7b572700829 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 29 Jan 2001 18:35:10 +0000 Subject: 2001-01-27 Ralf Corsepius * Makefile.am: Add scitab, gdbsci to SUBDIRS. * include/gdbsci.h: New file. * include/.cvsignore: Add stamp-h? and bspopts.h*. * console/Makefile.am: Use shared/console.c. * console/console-io.c, console/console-support.S: Remove. --- c/src/lib/libbsp/sh/shsim/ChangeLog | 8 +++ c/src/lib/libbsp/sh/shsim/Makefile.am | 2 +- c/src/lib/libbsp/sh/shsim/console/Makefile.am | 16 ++--- c/src/lib/libbsp/sh/shsim/console/console-io.c | 78 ---------------------- .../lib/libbsp/sh/shsim/console/console-support.S | 21 ------ c/src/lib/libbsp/sh/shsim/include/.cvsignore | 2 + c/src/lib/libbsp/sh/shsim/include/gdbsci.h | 69 +++++++++++++++++++ 7 files changed, 86 insertions(+), 110 deletions(-) delete mode 100644 c/src/lib/libbsp/sh/shsim/console/console-io.c delete mode 100644 c/src/lib/libbsp/sh/shsim/console/console-support.S create mode 100644 c/src/lib/libbsp/sh/shsim/include/gdbsci.h (limited to 'c/src/lib/libbsp/sh/shsim') diff --git a/c/src/lib/libbsp/sh/shsim/ChangeLog b/c/src/lib/libbsp/sh/shsim/ChangeLog index 512b5711c1..3604cceb78 100644 --- a/c/src/lib/libbsp/sh/shsim/ChangeLog +++ b/c/src/lib/libbsp/sh/shsim/ChangeLog @@ -1,3 +1,11 @@ +2001-01-29 Ralf Corsepius + + * Makefile.am: Add scitab, gdbsci to SUBDIRS. + * include/gdbsci.h: New file. + * include/.cvsignore: Add stamp-h? and bspopts.h*. + * console/Makefile.am: Use shared/console.c. + * console/console-io.c, console/console-support.S: Remove. + 2001-01-25 Ralf Corsepius * gdbsci/, scitab/, trap34/: Add directories. diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am index 1dd00f6334..ba2889655e 100644 --- a/c/src/lib/libbsp/sh/shsim/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/Makefile.am @@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../../../../../aclocal # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUBDIRS = include start startup clock console wrapup +SUBDIRS = include start startup clock scitab gdbsci console wrapup include $(top_srcdir)/../../bsp.am diff --git a/c/src/lib/libbsp/sh/shsim/console/Makefile.am b/c/src/lib/libbsp/sh/shsim/console/Makefile.am index 01cc97d615..563ae4cc64 100644 --- a/c/src/lib/libbsp/sh/shsim/console/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/console/Makefile.am @@ -4,17 +4,14 @@ AUTOMAKE_OPTIONS = foreign 1.4 -VPATH = @srcdir@:@srcdir@/../../../shared +VPATH = @srcdir@:@srcdir@/../../shared PGM = $(ARCH)/console.rel -C_FILES = console-io.c console-polled.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_FILES = console.c +C_O_FILES = $(C_FILES:shared/%.c=$(ARCH)/%.o) -S_FILES = console-support.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) - -OBJS = $(C_O_FILES) $(S_O_FILES) +OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am @@ -27,12 +24,11 @@ include $(top_srcdir)/../../../../../../automake/lib.am $(PGM): $(OBJS) $(make-rel) -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile +# the .rel file built here will be put into libbsp.a by +# ../wrapup/Makefile all-local: $(ARCH) $(OBJS) $(PGM) .PRECIOUS: $(PGM) -EXTRA_DIST = console.c - include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/shsim/console/console-io.c b/c/src/lib/libbsp/sh/shsim/console/console-io.c deleted file mode 100644 index ec3caafb00..0000000000 --- a/c/src/lib/libbsp/sh/shsim/console/console-io.c +++ /dev/null @@ -1,78 +0,0 @@ -/* - * This file contains the hardware specific portions of the TTY driver - * for the simulators stdin/out. - * - * Logic based on newlib-1.8.2/newlib/libc/sys/sh/syscalls.c - * - * COPYRIGHT (c) 1989-2000. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - -#include -#include -#include -#include - - -#define SYS_exit 1 -#define SYS_read 3 -#define SYS_write 4 - -int errno ; - -extern int __trap34(int, int, void*, int ); - -/* - * console_initialize_hardware - * - * This routine initializes the console hardware. - * - */ - -void console_initialize_hardware(void) -{ - return; -} - -/* - * console_outbyte_polled - * - * This routine transmits a character using polling. - */ - -void console_outbyte_polled( - int port, - char ch -) -{ - __trap34 (SYS_write, 1, &ch, 1); - return; -} - -/* - * console_inbyte_nonblocking - * - * This routine polls for a character. - */ - -int console_inbyte_nonblocking( - int port -) -{ - unsigned char c; - - return __trap34 (SYS_read, 0, &c, 1); -} - -/* XXX wrong place for this */ -_sys_exit (n) -{ - return __trap34 (SYS_exit, n, 0, 0); -} - diff --git a/c/src/lib/libbsp/sh/shsim/console/console-support.S b/c/src/lib/libbsp/sh/shsim/console/console-support.S deleted file mode 100644 index b4b9d9ae76..0000000000 --- a/c/src/lib/libbsp/sh/shsim/console/console-support.S +++ /dev/null @@ -1,21 +0,0 @@ -/* - * newlib-1.8.2/newlib/libc/sys/sh/trap.S - * - * $Id$ - */ - .text - .global ___trap34 -___trap34: - trapa #34 - tst r1,r1 ! r1 is errno - bt ret - mov.l perrno,r2 - mov.l r1,@r2 -ret: - rts - nop - - .align 2 -perrno: - .long _errno - diff --git a/c/src/lib/libbsp/sh/shsim/include/.cvsignore b/c/src/lib/libbsp/sh/shsim/include/.cvsignore index 282522db03..2be206e5ff 100644 --- a/c/src/lib/libbsp/sh/shsim/include/.cvsignore +++ b/c/src/lib/libbsp/sh/shsim/include/.cvsignore @@ -1,2 +1,4 @@ Makefile Makefile.in +stamp-h* +bspopts.h* diff --git a/c/src/lib/libbsp/sh/shsim/include/gdbsci.h b/c/src/lib/libbsp/sh/shsim/include/gdbsci.h new file mode 100644 index 0000000000..5234fc253a --- /dev/null +++ b/c/src/lib/libbsp/sh/shsim/include/gdbsci.h @@ -0,0 +1,69 @@ +/* + * Driver for gdb's sh-simulator's sci emulation + * + * Author: Ralf Corsepius (corsepiu@faw.uni-ulm.de) + * + * COPYRIGHT (c) 2001, Ralf Corsepius, Ulm, Germany + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * $Id$ + */ + +#ifndef _sh_gdbsci_h +#define _sh_gdbsci_h + +#ifdef __cplusplus +extern "C" { +#endif + +/* + */ + +#define DEVGDBSCI_DRIVER_TABLE_ENTRY \ + { sh_gdbsci_initialize, sh_gdbsci_open, sh_gdbsci_close, sh_gdbsci_read, \ + sh_gdbsci_write, sh_gdbsci_control } + +extern rtems_device_driver sh_gdbsci_initialize( + rtems_device_major_number, + rtems_device_minor_number, + void * +); + +extern rtems_device_driver sh_gdbsci_open( + rtems_device_major_number, + rtems_device_minor_number, + void * +); + +extern rtems_device_driver sh_gdbsci_close( + rtems_device_major_number, + rtems_device_minor_number, + void * +); + +extern rtems_device_driver sh_gdbsci_read( + rtems_device_major_number, + rtems_device_minor_number, + void * +); + +extern rtems_device_driver sh_gdbsci_write( + rtems_device_major_number, + rtems_device_minor_number, + void * +); + +extern rtems_device_driver sh_gdbsci_control( + rtems_device_major_number, + rtems_device_minor_number, + void * +); + +#ifdef __cplusplus +} +#endif + +#endif -- cgit v1.2.3