1 files changed, 24 insertions, 49 deletions
diff --git a/c/src/lib/libbsp/i386/go32/startup/bspstart.c b/c/src/lib/libbsp/i386/go32/startup/bspstart.c
index f84d871a35..eeef55eed9 100644
--- a/c/src/lib/libbsp/i386/go32/startup/bspstart.c
+++ b/c/src/lib/libbsp/i386/go32/startup/bspstart.c
@@ -1,14 +1,9 @@
-/*  bsp_start()
- *
+/*
  *  This routine starts the application.  It includes application,
  *  board, and monitor specific initialization and configuration.
  *  The generic CPU dependent initialization has been performed
  *  before this routine is invoked.
  * 
- *  INPUT:  NONE
- * 
- *  OUTPUT: NONE
- *
  *  COPYRIGHT (c) 1989-1998.
  *  On-Line Applications Research Corporation (OAR).
  *  Copyright assigned to U.S. Government, 1994.
@@ -40,44 +35,13 @@ rtems_cpu_table Cpu_table;
 
 char *rtems_progname;
 
-/*      Initialize whatever libc we are using
- *      called from postdriver hook
+/*
+ *  Use the shared implementations of the following routines
  */
-
-void bsp_libc_init()
-{
-    rtems_unsigned32        heap_start;
-
-#if 0
-    extern int end;
-    heap_start = (rtems_unsigned32) &end;
-#else
-    void * sbrk( int );
-    heap_start = (rtems_unsigned32) sbrk( 64 * 1024 + CPU_ALIGNMENT );
-#endif
-    if (heap_start & (CPU_ALIGNMENT-1))
-        heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
-
-    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 __rtems_open, __rtems_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.
-     */
-
-    if (BSP_Configuration.ticks_per_timeslice > 0)
-        libc_init(1);                /* reentrant if possible */
-    else
-        libc_init(0);                /* non-reentrant */
-}
  
+void bsp_postdriver_hook(void);
+void bsp_libc_init( void *, unsigned32, int );
+
 /*
  *  Function:   bsp_pretasking_hook
  *  Created:    95/03/10
@@ -92,22 +56,33 @@ void bsp_libc_init()
  *
  */
  
-void
-bsp_pretasking_hook(void)
+void bsp_pretasking_hook(void)
 {
-    bsp_libc_init();
+    rtems_unsigned32        heap_start;
+
+#if 0
+    extern int end;
+    heap_start = (rtems_unsigned32) &end;
+#else
+    void * sbrk( int );
+    heap_start = (rtems_unsigned32) sbrk( 64 * 1024 + CPU_ALIGNMENT );
+#endif
+    if (heap_start & (CPU_ALIGNMENT-1))
+        heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
+
+    bsp_libc_init((void *) heap_start, 64 * 1024, 0);
+
  
 #ifdef RTEMS_DEBUG
     rtems_debug_enable( RTEMS_DEBUG_ALL_MASK );
 #endif
 }
  
-
 /*
- *  Use the shared bsp_postdriver_hook() implementation 
+ *  main/bsp_start
+ *
+ *  This routine does the bulk of the system initialization.
  */
- 
-void bsp_postdriver_hook(void);
 
 /* This is the original command line passed from DOS */
 char **	Go32_Argv;