From 0ef1009aaaddff9318422a047faf29d168334214 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 31 Jan 2011 17:41:09 +0000 Subject: 2011-01-31 Joel Sherrill * Makefile.am, configure.ac, console/console-io.c, include/bsp.h, start/start.S: Create dedicated bsp_reset() and clean up. --- c/src/lib/libbsp/m32r/m32rsim/ChangeLog | 5 ++++ c/src/lib/libbsp/m32r/m32rsim/Makefile.am | 2 +- c/src/lib/libbsp/m32r/m32rsim/configure.ac | 2 +- c/src/lib/libbsp/m32r/m32rsim/console/console-io.c | 27 +--------------------- c/src/lib/libbsp/m32r/m32rsim/include/bsp.h | 17 ++++++++++++++ c/src/lib/libbsp/m32r/m32rsim/start/start.S | 1 - 6 files changed, 25 insertions(+), 29 deletions(-) (limited to 'c/src/lib/libbsp/m32r') diff --git a/c/src/lib/libbsp/m32r/m32rsim/ChangeLog b/c/src/lib/libbsp/m32r/m32rsim/ChangeLog index a61e1ebe68..7f69095d18 100644 --- a/c/src/lib/libbsp/m32r/m32rsim/ChangeLog +++ b/c/src/lib/libbsp/m32r/m32rsim/ChangeLog @@ -1,3 +1,8 @@ +2011-01-31 Joel Sherrill + + * Makefile.am, configure.ac, console/console-io.c, include/bsp.h, + start/start.S: Create dedicated bsp_reset() and clean up. + 2010-05-31 Joel Sherrill * start/start.S: Pass 0/NULL for argc/argv. diff --git a/c/src/lib/libbsp/m32r/m32rsim/Makefile.am b/c/src/lib/libbsp/m32r/m32rsim/Makefile.am index c774745253..f796b5d8cf 100644 --- a/c/src/lib/libbsp/m32r/m32rsim/Makefile.am +++ b/c/src/lib/libbsp/m32r/m32rsim/Makefile.am @@ -32,7 +32,7 @@ startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c ../../shared/bsppretaskinghook.c \ ../../shared/bspgetworkarea.c ../../shared/bsppost.c \ ../../shared/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \ - ../../shared/gnatinstallhandler.c + ../../shared/gnatinstallhandler.c startup/bspreset.c clock_SOURCES = ../../shared/clock_driver_simidle.c console_SOURCES = ../../shared/console-polled.c console/console-io.c \ console/trap0.S diff --git a/c/src/lib/libbsp/m32r/m32rsim/configure.ac b/c/src/lib/libbsp/m32r/m32rsim/configure.ac index dd29fc2f41..1c4be922d6 100644 --- a/c/src/lib/libbsp/m32r/m32rsim/configure.ac +++ b/c/src/lib/libbsp/m32r/m32rsim/configure.ac @@ -15,7 +15,7 @@ RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS RTEMS_PROG_CCAS -RTEMS_BSP_CLEANUP_OPTIONS(0, 0) +RTEMS_BSP_CLEANUP_OPTIONS(0, 1) # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/m32r/m32rsim/console/console-io.c b/c/src/lib/libbsp/m32r/m32rsim/console/console-io.c index 77d2e804eb..4a479991e7 100644 --- a/c/src/lib/libbsp/m32r/m32rsim/console/console-io.c +++ b/c/src/lib/libbsp/m32r/m32rsim/console/console-io.c @@ -1,8 +1,5 @@ /* - * This file contains the hardware specific portions of the TTY driver - * for the serial ports on the erc32. - * - * COPYRIGHT (c) 1989-2008. + * COPYRIGHT (c) 1989-2011. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -18,28 +15,6 @@ #include #include -/* From Newlib 1.16.0 */ -#define SYS_exit 1 -#define SYS_open 2 -#define SYS_close 3 -#define SYS_read 4 -#define SYS_write 5 -#define SYS_lseek 6 -#define SYS_unlink 7 -#define SYS_getpid 8 -#define SYS_kill 9 -#define SYS_fstat 10 - -int __trap0 (int function, int p1, int p2, int p3, struct _reent *r); - -#define TRAP0(f, p1, p2, p3) \ -__trap0 (f, (int) (p1), (int) (p2), (int) (p3), _REENT) - -void sys_exit(void) -{ - TRAP0(SYS_exit, 0, 0, 0); -} - /* * console_initialize_hardware * diff --git a/c/src/lib/libbsp/m32r/m32rsim/include/bsp.h b/c/src/lib/libbsp/m32r/m32rsim/include/bsp.h index 5a1e679f84..f42cdcfd0c 100644 --- a/c/src/lib/libbsp/m32r/m32rsim/include/bsp.h +++ b/c/src/lib/libbsp/m32r/m32rsim/include/bsp.h @@ -31,6 +31,23 @@ extern "C" { Thread clock_driver_sim_idle_body(uintptr_t); #define BSP_IDLE_TASK_BODY clock_driver_sim_idle_body +/* Trap support interface from Newlib 1.16.0 */ +#define SYS_exit 1 +#define SYS_open 2 +#define SYS_close 3 +#define SYS_read 4 +#define SYS_write 5 +#define SYS_lseek 6 +#define SYS_unlink 7 +#define SYS_getpid 8 +#define SYS_kill 9 +#define SYS_fstat 10 + +int __trap0 (int function, int p1, int p2, int p3, struct _reent *r); + +#define TRAP0(f, p1, p2, p3) \ + __trap0 (f, (int) (p1), (int) (p2), (int) (p3), _REENT) + /* * Simple spin delay in microsecond units for device drivers. * This is very dependent on the clock speed of the target. diff --git a/c/src/lib/libbsp/m32r/m32rsim/start/start.S b/c/src/lib/libbsp/m32r/m32rsim/start/start.S index cccf323cd4..aaf96e2abc 100644 --- a/c/src/lib/libbsp/m32r/m32rsim/start/start.S +++ b/c/src/lib/libbsp/m32r/m32rsim/start/start.S @@ -52,7 +52,6 @@ _start: ldi r1, #0 ; r1 = argv ldi r0, #0 ; r0 = argc bl boot_card - bl sys_exit # If that fails just loop. -- cgit v1.2.3