From e2a2ec6016c9bb3f3146c701bbe950af212c097c Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
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/m68k/efi332/start/start.c       |  6 +++---
 c/src/lib/libbsp/m68k/efi332/start332/start332.c |  6 +++---
 c/src/lib/libbsp/m68k/efi332/startup/Makefile.in |  2 +-
 c/src/lib/libbsp/m68k/efi332/startup/bspstart.c  | 15 +--------------
 4 files changed, 8 insertions(+), 21 deletions(-)

(limited to 'c/src/lib/libbsp/m68k/efi332')

diff --git a/c/src/lib/libbsp/m68k/efi332/start/start.c b/c/src/lib/libbsp/m68k/efi332/start/start.c
index bd3a6cce06..914b3f5802 100644
--- a/c/src/lib/libbsp/m68k/efi332/start/start.c
+++ b/c/src/lib/libbsp/m68k/efi332/start/start.c
@@ -12,8 +12,6 @@ m68k_isr_entry vectors[256];
 char * const __argv[]= {"main", ""};
 char * const __env[]= {""};
 
-int main(const int argc, char * const argv[], char * const env[]);
-
 /*
  *  This prototype really should have the noreturn attribute but
  *  that causes a warning since it appears that the routine does
@@ -182,7 +180,9 @@ void  dumby_start() {
   /*
    * Execute main with arguments argv and environment env
    */
-  main(1, __argv, __env);
+  /* main(1, __argv, __env); */
+
+  boot_card();
 
   reboot();
 }
diff --git a/c/src/lib/libbsp/m68k/efi332/start332/start332.c b/c/src/lib/libbsp/m68k/efi332/start332/start332.c
index bd3a6cce06..914b3f5802 100644
--- a/c/src/lib/libbsp/m68k/efi332/start332/start332.c
+++ b/c/src/lib/libbsp/m68k/efi332/start332/start332.c
@@ -12,8 +12,6 @@ m68k_isr_entry vectors[256];
 char * const __argv[]= {"main", ""};
 char * const __env[]= {""};
 
-int main(const int argc, char * const argv[], char * const env[]);
-
 /*
  *  This prototype really should have the noreturn attribute but
  *  that causes a warning since it appears that the routine does
@@ -182,7 +180,9 @@ void  dumby_start() {
   /*
    * Execute main with arguments argv and environment env
    */
-  main(1, __argv, __env);
+  /* main(1, __argv, __env); */
+
+  boot_card();
 
   reboot();
 }
diff --git a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.in b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.in
index f1d3bbcec9..6dd881b30c 100644
--- a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.in
@@ -11,7 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 PGM=${ARCH}/startup.rel
 
 # C source names, if any, go here -- minus the .c
-C_PIECES=bspstart bspclean sbrk setvec
+C_PIECES=bspstart bspclean main sbrk setvec
 C_FILES=$(C_PIECES:%=%.c)
 C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
 
diff --git a/c/src/lib/libbsp/m68k/efi332/startup/bspstart.c b/c/src/lib/libbsp/m68k/efi332/startup/bspstart.c
index d3e29a7ef7..b20bdd5ff1 100644
--- a/c/src/lib/libbsp/m68k/efi332/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/efi332/startup/bspstart.c
@@ -147,11 +147,7 @@ bsp_postdriver_hook(void)
     rtems_fatal_error_occurred( error_code | 'I' << 8 | 'O' );
 }
  
-int main(
-  int argc,
-  char **argv,
-  char **environp
-)
+void bsp_start( void )
 {
   void           *vbr;
 
@@ -213,15 +209,6 @@ int main(
 
   rtems_libio_config(&BSP_Configuration, BSP_LIBIO_MAX_FDS);
 
-  rtems_initialize_executive( &BSP_Configuration, &Cpu_table );
-  /* does not return */
-
   /* Clock_exit is done as an atexit() function */
-
-  /* configure peripherals for safe exit */
-  bsp_cleanup();
-
-  /* return like a "normal" subroutine to the monitor */
-  return 0;
 }
 
-- 
cgit v1.2.3