From 0dba2a55d7d89c20d119b0f15eaf0d696cdff7c0 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 19 Sep 2008 15:50:44 +0000 Subject: 2008-09-19 Joel Sherrill * Makefile.am, console/debugio.c: Split out bspstart contents. Use shared stub for bsp_start. * startup/bsppretaskinghook.c: New file. * startup/bspstart.c: Removed. --- c/src/lib/libbsp/c4x/c4xsim/ChangeLog | 7 +++ c/src/lib/libbsp/c4x/c4xsim/Makefile.am | 5 +- c/src/lib/libbsp/c4x/c4xsim/console/debugio.c | 48 ++------------------ .../libbsp/c4x/c4xsim/startup/bsppretaskinghook.c | 19 ++++++++ c/src/lib/libbsp/c4x/c4xsim/startup/bspstart.c | 53 ---------------------- 5 files changed, 34 insertions(+), 98 deletions(-) create mode 100644 c/src/lib/libbsp/c4x/c4xsim/startup/bsppretaskinghook.c delete mode 100644 c/src/lib/libbsp/c4x/c4xsim/startup/bspstart.c (limited to 'c/src/lib/libbsp/c4x/c4xsim') diff --git a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog index a4cb9f057b..5f43cffe6a 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog +++ b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog @@ -1,3 +1,10 @@ +2008-09-19 Joel Sherrill + + * Makefile.am, console/debugio.c: Split out bspstart contents. Use + shared stub for bsp_start. + * startup/bsppretaskinghook.c: New file. + * startup/bspstart.c: Removed. + 2008-09-18 Joel Sherrill * include/bsp.h: Remove unnecessary boilerplate comments. diff --git a/c/src/lib/libbsp/c4x/c4xsim/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/Makefile.am index 1595cb40db..7ed079805a 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/Makefile.am +++ b/c/src/lib/libbsp/c4x/c4xsim/Makefile.am @@ -33,7 +33,7 @@ dist_project_lib_DATA += startup/linkcmds startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \ - ../../shared/bsppost.c startup/bspstart.c \ + ../../shared/bsppost.c startup/bsppretaksinghook.c ../../shared/bspstart.c \ ../../shared/bootcard.c ../../shared/sbrk.c ../../shared/setvec.c \ ../../c4x/shared/c3xspurious.c ../../c4x/shared/c4xspurious.c \ ../../c4x/shared/bspspuriousinit.c startup/spurious.c \ @@ -41,11 +41,12 @@ startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ clock_SOURCES = clock/clock.c console_SOURCES = console/consolereserveresources.c console/debugio.c \ console/simio.c ../../shared/console.c +debugio_SOURCES = console/debugio.c timer_SOURCES = timer/timer.c noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ - $(timer_SOURCES) + $(debugio_SOURCES) $(timer_SOURCES) EXTRA_DIST += times diff --git a/c/src/lib/libbsp/c4x/c4xsim/console/debugio.c b/c/src/lib/libbsp/c4x/c4xsim/console/debugio.c index a8bcf206c0..abc2e66cba 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/console/debugio.c +++ b/c/src/lib/libbsp/c4x/c4xsim/console/debugio.c @@ -1,9 +1,5 @@ /* - * This file contains the TTY driver for the serial ports on the erc32. - * - * This driver uses the termios pseudo driver. - * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2008. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -14,43 +10,9 @@ */ #include -#include -#include -#include - -#include - -/* - * console_outbyte_polled - * - * This routine transmits a character using polling. - */ - -void console_outbyte_polled( - int port, - char ch -) -{ - char out[2]; - out[0] = ch; - out[1] = 0; - sim_write(1, out, 1); -} - -C4X_BSP_output_char( int c ) -{ - console_outbyte_polled( 0, (char) c ); -} +#include -/* - * console_inbyte_nonblocking - * - * This routine polls for a character. - */ +extern void C4X_BSP_output_char(char c); -int console_inbyte_nonblocking( int port ) -{ - char c; - sim_read(1, &c, 1); - return c; -} +BSP_output_char_function_type BSP_output_char = C4X_BSP_output_char; +BSP_polling_getchar_function_type BSP_poll_char; diff --git a/c/src/lib/libbsp/c4x/c4xsim/startup/bsppretaskinghook.c b/c/src/lib/libbsp/c4x/c4xsim/startup/bsppretaskinghook.c new file mode 100644 index 0000000000..d7674222c7 --- /dev/null +++ b/c/src/lib/libbsp/c4x/c4xsim/startup/bsppretaskinghook.c @@ -0,0 +1,19 @@ +/* + * COPYRIGHT (c) 1989-2008. + * 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.rtems.com/license/LICENSE. + * + * $Id$ + */ + +#include + +extern void bsp_spurious_initialize(); + +void bsp_pretasking_hook(void) +{ + bsp_spurious_initialize(); +} diff --git a/c/src/lib/libbsp/c4x/c4xsim/startup/bspstart.c b/c/src/lib/libbsp/c4x/c4xsim/startup/bspstart.c deleted file mode 100644 index b5cd3e8a43..0000000000 --- a/c/src/lib/libbsp/c4x/c4xsim/startup/bspstart.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This set of routines starts the application. It includes application, - * board, and monitor specific initialization and configuration. - * The generic CPU dependent initialization has been performed - * before any of these are invoked. - * - * COPYRIGHT (c) 1989-1999. - * 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.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#include - -/* - * Use the shared implementations of the following routines - */ - -extern void bsp_spurious_initialize(); - -/* - * bsp_pretasking_hook - * - * BSP pretasking hook. Called just before drivers are initialized. - * Used to setup libc and install any BSP extensions. - */ - -void bsp_pretasking_hook(void) -{ - bsp_spurious_initialize(); -} - -/* - * bsp_start - * - * This routine does the bulk of the system initialization. - */ - -#include - -BSP_output_char_function_type BSP_output_char; -BSP_polling_getchar_function_type BSP_poll_char; -extern void C4X_BSP_output_char(char c); - -void bsp_start( void ) -{ - BSP_output_char = C4X_BSP_output_char; - BSP_poll_char = (BSP_polling_getchar_function_type) NULL; -} -- cgit v1.2.3