Separated out initialisation functions from startup/shutdown functions.

1 files changed, 2 insertions, 32 deletions

diff --git a/src/core/main.c b/src/core/main.c
index 5b01df9c..09dccc76 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1,5 +1,5 @@
 /**************************************************************************
-Etherboot -  Network Bootstrap Program
+gPXE -  Network Bootstrap Program
 
 Literature dealing with the network protocols:
 	ARP - RFC826
@@ -14,49 +14,19 @@ Literature dealing with the network protocols:
 
 **************************************************************************/
 
-#include <gpxe/heap.h>
 #include <gpxe/init.h>
-#include <gpxe/process.h>
-#include <gpxe/device.h>
 #include <gpxe/shell.h>
 #include <gpxe/shell_banner.h>
-#include <gpxe/shutdown.h>
-#include <gpxe/hidemem.h>
 #include <usr/autoboot.h>
 
 /**
- * Start up Etherboot
- *
- * Call this function only once, before doing (almost) anything else.
- */
-static void startup ( void ) {
-	init_heap();
-	init_processes();
-
-	hide_etherboot();
-	call_init_fns();
-	probe_devices();
-}
-
-/**
- * Shut down Etherboot
- *
- * Call this function only once, before either exiting main() or
- * starting up a non-returnable image.
- */
-void shutdown ( void ) {
-	remove_devices();
-	call_exit_fns();
-	unhide_etherboot();
-}
-
-/**
  * Main entry point
  *
  * @ret rc		Return status code
  */
 int main ( void ) {
 
+	initialise();
 	startup();
 
 	/* Try autobooting if we're not going straight to the shell */