From e2a2ec6016c9bb3f3146c701bbe950af212c097c Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sat, 21 Mar 1998 15:37:18 +0000 Subject: Switch to using a shared main() for all of the embedded BSPs based on the GNU tools. This usually involved correcting the type of bsp_start(), bsp_cleanup(), adjusting the start code to call the right start routine (the shared boot_card()), and then removing code from bsp_start() which was performed in the new boot_card()/main() path. --- c/src/lib/libbsp/sh/gensh1/include/bsp.h | 2 -- c/src/lib/libbsp/sh/gensh1/startup/bspclean.c | 1 + c/src/lib/libbsp/sh/gensh1/startup/bspstart.c | 21 +-------------------- 3 files changed, 2 insertions(+), 22 deletions(-) (limited to 'c/src/lib/libbsp/sh') diff --git a/c/src/lib/libbsp/sh/gensh1/include/bsp.h b/c/src/lib/libbsp/sh/gensh1/include/bsp.h index 3bca4d7da1..1ba0b07576 100644 --- a/c/src/lib/libbsp/sh/gensh1/include/bsp.h +++ b/c/src/lib/libbsp/sh/gensh1/include/bsp.h @@ -84,8 +84,6 @@ extern void *CPU_Interrupt_stack_high ; extern rtems_configuration_table BSP_Configuration; -extern int bsp_start( int argc, char **argv, char **env ); - extern void bsp_cleanup( void ); /* diff --git a/c/src/lib/libbsp/sh/gensh1/startup/bspclean.c b/c/src/lib/libbsp/sh/gensh1/startup/bspclean.c index 27b767f373..23b5bee4ac 100644 --- a/c/src/lib/libbsp/sh/gensh1/startup/bspclean.c +++ b/c/src/lib/libbsp/sh/gensh1/startup/bspclean.c @@ -37,4 +37,5 @@ void bsp_cleanup( void ) { + rtems_fatal_error_occurred(0); } diff --git a/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c b/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c index 1a3cc2737f..93bb88855e 100644 --- a/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c +++ b/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c @@ -151,11 +151,7 @@ bsp_postdriver_hook(void) rtems_fatal_error_occurred( error_code | 'I' << 8 | 'O' ); } -int bsp_start( - int argc, - char **argv, - char **environp -) +void bsp_start(void) { /* For real boards you need to setup the hardware @@ -165,11 +161,6 @@ int bsp_start( startup code, rtems startup code or here. */ - if ((argc > 0) && argv && argv[0]) - rtems_progname = argv[0]; - else - rtems_progname = "RTEMS"; - /* * Allocate the memory for the RTEMS Work Space. This can come from * a variety of places: hard coded address, malloc'ed from outside @@ -265,14 +256,4 @@ int bsp_start( */ rtems_libio_config(&BSP_Configuration, BSP_LIBIO_MAX_FDS); - - /* - * Start RTEMS - */ - - rtems_initialize_executive( &BSP_Configuration, &Cpu_table ); - - bsp_cleanup(); - - return 0; } -- cgit v1.2.3