The word "RTEMS" almost completely removed from the core.

Configuration Table Template file added and all tests
modified to use this.  All gvar.h and conftbl.h files
removed from test directories.

Configuration parameter maximum_devices added.

Core semaphore and mutex handlers added and RTEMS API Semaphore
Manager updated to reflect this.

Initialization sequence changed to invoke API specific initialization
routines.  Initialization tasks table now owned by RTEMS Tasks Manager.

Added user extension for post-switch.

Utilized user extensions to implement API specific functionality
like signal dispatching.

Added extensions to the System Initialization Thread so that an
API can register a function to be invoked while the system
is being initialized.  These are largely equivalent to the
pre-driver and post-driver hooks.

Added the Modules file oar-go32_p5, modified oar-go32, and modified
the file make/custom/go32.cfg to look at an environment varable which
determines what CPU model is being used.

All BSPs updated to reflect named devices and clock driver's IOCTL
used by the Shared Memory Driver.  Also merged clock isr into
main file and removed ckisr.c where possible.

Updated spsize to reflect new and moved variables.

Makefiles for the executive source and include files updated to show
break down of files into Core, RTEMS API, and Neither.

Header and inline files installed into subdirectory based on whether
logically in the Core or a part of the RTEMS API.

1 files changed, 119 insertions, 46 deletions

diff --git a/c/src/lib/libbsp/i386/go32/startup/bspstart.c b/c/src/lib/libbsp/i386/go32/startup/bspstart.c
index 21594766ad..940c04270a 100644
--- a/c/src/lib/libbsp/i386/go32/startup/bspstart.c
+++ b/c/src/lib/libbsp/i386/go32/startup/bspstart.c
@@ -20,11 +20,18 @@
  *  $Id$
  */
 
-#include <rtems.h>
 #include <bsp.h>
+#include <rtems/libio.h>
+ 
 #include <libcsupport.h>
-
+#include <z8036.h>
+ 
+#include <string.h>
+#include <fcntl.h>
+ 
+#ifdef STACK_CHECKER_ON
 #include <stackchk.h>
+#endif
 
 /*
  *  The original table from the application and our copy of it with
@@ -36,6 +43,8 @@ rtems_configuration_table  BSP_Configuration;
 
 rtems_cpu_table Cpu_table;
 
+char *rtems_progname;
+
 /*      Initialize whatever libc we are using
  *      called from postdriver hook
  */
@@ -57,6 +66,14 @@ void bsp_libc_init()
     RTEMS_Malloc_Initialize((void *) heap_start, 64 * 1024, 0);
 
     /*
+     *  Init the RTEMS libio facility to provide UNIX-like system
+     *  calls for use by newlib (ie: provide __open, __close, etc)
+     *  Uses malloc() to get area for the iops, so must be after malloc init
+     */
+
+    rtems_libio_init();
+
+    /*
      * Set up for the libc handling.
      */
 
@@ -74,60 +91,116 @@ void bsp_libc_init()
 #endif
 
 }
-
-void bsp_start()
+ 
+/*
+ * After drivers are setup, register some "filenames"
+ * and open stdin, stdout, stderr files
+ *
+ * Newlib will automatically associate the files with these
+ * (it hardcodes the numbers)
+ */
+ 
+void
+bsp_postdriver_hook(void)
 {
-    extern void * sbrk( int );
-
-    Cpu_table.pretasking_hook		= NULL;
-    Cpu_table.predriver_hook = bsp_libc_init;  /* RTEMS resources available */
-    Cpu_table.postdriver_hook = NULL;   /* Call our main() for constructors */
-    Cpu_table.idle_task	= NULL;  /* do not override system IDLE task */
-    Cpu_table.do_zero_of_workspace	= TRUE;
-    Cpu_table.interrupt_table_segment	= 0;/* get_ds(); */
-    Cpu_table.interrupt_table_offset	= (void *)0;
-    Cpu_table.interrupt_stack_size	= 4096;
-    Cpu_table.extra_system_initialization_stack = 0;
-
-    /*
-     *  Copy the table
-     */
-    BSP_Configuration = Configuration;
-
-    BSP_Configuration.work_space_start = sbrk( Configuration.work_space_size );
-    if ( BSP_Configuration.work_space_start == 0 )  {
-	/* Big trouble */
-	int	write( int, void *, int );
-	void	_exit( int );
-	char	msg[] = "bsp_start() couldn't sbrk() RTEMS work space\n";
-	write( 2, msg, sizeof msg - 1 );
-	_exit( 1 );
-    }
-
-    /*
-     * Add 1 region for Malloc in libc_low
-     */
+  int stdin_fd, stdout_fd, stderr_fd;
+ 
+  if ((stdin_fd = __open("/dev/console", O_RDONLY, 0)) == -1)
+    rtems_fatal_error_occurred('STD0');
+ 
+  if ((stdout_fd = __open("/dev/console", O_WRONLY, 0)) == -1)
+    rtems_fatal_error_occurred('STD1');
+ 
+  if ((stderr_fd = __open("/dev/console", O_WRONLY, 0)) == -1)
+    rtems_fatal_error_occurred('STD2');
+ 
+  if ((stdin_fd != 0) || (stdout_fd != 1) || (stderr_fd != 2))
+    rtems_fatal_error_occurred('STIO');
+}
 
-    BSP_Configuration.maximum_regions++;
+/* This is the original command line passed from DOS */
+char **	Go32_Argv;
 
-    /*
-     * Add 1 extension for newlib libc
-     */
+int main(
+  int argc,
+  char **argv,
+  char **environp
+)
+{
+  extern void * sbrk( int );
+  extern volatile void _exit( int );
+
+  /* Set up arguments that we can access later */
+  Go32_Argv = argv;
+
+  if ((argc > 0) && argv && argv[0])
+    rtems_progname = argv[0];
+  else
+    rtems_progname = "RTEMS";
+
+  Cpu_table.pretasking_hook	= NULL;
+  Cpu_table.predriver_hook = bsp_libc_init;  /* RTEMS resources available */
+  Cpu_table.postdriver_hook = bsp_postdriver_hook;
+  Cpu_table.idle_task = NULL;  /* do not override system IDLE task */
+  Cpu_table.do_zero_of_workspace = TRUE;
+  Cpu_table.interrupt_table_segment = 0;/* get_ds(); */
+  Cpu_table.interrupt_table_offset = (void *)0;
+  Cpu_table.interrupt_stack_size = 4096;
+  Cpu_table.extra_system_initialization_stack = 0;
+
+  /*
+   *  Copy the table
+   */
+  BSP_Configuration = Configuration;
+
+  BSP_Configuration.work_space_start = sbrk( Configuration.work_space_size );
+  if ( BSP_Configuration.work_space_start == 0 )  {
+    /* Big trouble */
+    int write( int, void *, int );
+    char msg[] = "bsp_start() couldn't sbrk() RTEMS work space\n";
+    write( 2, msg, sizeof msg - 1 );
+    _exit( 1 );
+  }
+
+  /*
+   * Add 1 region for Malloc in libc_low
+   */
+
+  BSP_Configuration.maximum_regions++;
+
+  /*
+   * Add 1 extension for newlib libc
+   */
 
 #ifdef RTEMS_NEWLIB
-    BSP_Configuration.maximum_extensions++;
+  BSP_Configuration.maximum_extensions++;
 #endif
 
-    /*
-     * Add another extension if using the stack checker
-     */
+  /*
+   * Add another extension if using the stack checker
+   */
 
 #ifdef STACK_CHECKER_ON
-    BSP_Configuration.maximum_extensions++;
+  BSP_Configuration.maximum_extensions++;
 #endif
 
-    rtems_initialize_executive( &BSP_Configuration, &Cpu_table );
-    /* does not return */
+  /*
+   * Tell libio how many fd's we want and allow it to tweak config
+   */
+
+  rtems_libio_config(&BSP_Configuration, BSP_LIBIO_MAX_FDS);
+
+  rtems_initialize_executive( &BSP_Configuration, &Cpu_table );
+  /* does not return */
+
+  /* We only return here if the executive has finished.  This happens	*/
+  /* when the task has called exit().					*/
+  /* At this point we call _exit() which resides in djgcc.		*/
+    
+  for (;;)
+	  _exit( 0 );
+
+  /* no cleanup necessary for GO32 */
 
-    /* no cleanup necessary for GO32 */
+  return 0;
 }