Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Separated out initialisation functions from startup/shutdown functions.
  • Loading branch information
Michael Brown committed Jul 3, 2007
1 parent a5f33ea commit 89349d7
Show file tree
Hide file tree
Showing 23 changed files with 239 additions and 194 deletions.
2 changes: 0 additions & 2 deletions src/arch/i386/core/cpu.c
Expand Up @@ -85,6 +85,4 @@ void cpu_setup(void)
identify_cpu(&cpu_info);
}

INIT_FN ( INIT_CPU, cpu_setup, NULL );

#endif /* CONFIG_X86_64 */
4 changes: 3 additions & 1 deletion src/arch/i386/core/gdbsym.c
Expand Up @@ -28,4 +28,6 @@ static void gdb_symbol_line ( void ) {
getkey();
}

INIT_FN ( INIT_GDBSYM, gdb_symbol_line, NULL );
struct startup_fn gdb_startup_fn __startup_fn ( STARTUP_NORMAL ) = {
.startup = gdb_symbol_line,
};
4 changes: 3 additions & 1 deletion src/arch/i386/core/i386_timer.c
Expand Up @@ -191,4 +191,6 @@ int timer2_running(void)

#endif /* RTC_CURRTICKS */

INIT_FN ( INIT_TIMERS, setup_timers, NULL );
struct init_fn timer_init_fn __init_fn ( INIT_NORMAL ) = {
.initialise = setup_timers,
};
4 changes: 3 additions & 1 deletion src/arch/i386/core/video_subr.c
Expand Up @@ -99,4 +99,6 @@ struct console_driver vga_console __console_driver = {
.disabled = 1,
};

INIT_FN ( INIT_CONSOLE, video_init, NULL );
struct init_fn video_init_fn __init_fn ( INIT_EARLY ) = {
.initialise = video_init,
};
11 changes: 9 additions & 2 deletions src/arch/i386/firmware/pcbios/hidemem.c
Expand Up @@ -18,6 +18,7 @@
#include <realmode.h>
#include <biosint.h>
#include <basemem.h>
#include <gpxe/init.h>
#include <gpxe/hidemem.h>

/** Alignment for hidden memory regions */
Expand Down Expand Up @@ -110,7 +111,7 @@ void hide_basemem ( void ) {
* Installs an INT 15 handler to edit Etherboot out of the memory map
* returned by the BIOS.
*/
void hide_etherboot ( void ) {
static void hide_etherboot ( void ) {

/* Initialise the hidden regions */
hide_text();
Expand All @@ -127,7 +128,7 @@ void hide_etherboot ( void ) {
* Uninstalls the INT 15 handler installed by hide_etherboot(), if
* possible.
*/
void unhide_etherboot ( void ) {
static void unhide_etherboot ( void ) {

/* If we have more than one hooked interrupt at this point, it
* means that some other vector is still hooked, in which case
Expand All @@ -147,3 +148,9 @@ void unhide_etherboot ( void ) {
unhook_bios_interrupt ( 0x15, ( unsigned int ) int15,
&int15_vector );
}

/** Hide Etherboot startup function */
struct startup_fn hide_etherboot_startup_fn __startup_fn ( EARLY_STARTUP ) = {
.startup = hide_etherboot,
.shutdown = unhide_etherboot,
};
2 changes: 1 addition & 1 deletion src/arch/i386/image/bzimage.c
Expand Up @@ -34,7 +34,7 @@
#include <gpxe/image.h>
#include <gpxe/segment.h>
#include <gpxe/memmap.h>
#include <gpxe/shutdown.h>
#include <gpxe/init.h>
#include <gpxe/initrd.h>

struct image_type bzimage_image_type __image_type ( PROBE_NORMAL );
Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/image/eltorito.c
Expand Up @@ -33,7 +33,7 @@
#include <gpxe/image.h>
#include <gpxe/segment.h>
#include <gpxe/ramdisk.h>
#include <gpxe/shutdown.h>
#include <gpxe/init.h>

#define ISO9660_BLKSIZE 2048
#define ELTORITO_VOL_DESC_OFFSET ( 17 * ISO9660_BLKSIZE )
Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/image/multiboot.c
Expand Up @@ -32,7 +32,7 @@
#include <gpxe/segment.h>
#include <gpxe/memmap.h>
#include <gpxe/elf.h>
#include <gpxe/shutdown.h>
#include <gpxe/init.h>

struct image_type multiboot_image_type __image_type ( PROBE_MULTIBOOT );

Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/image/nbi.c
Expand Up @@ -6,7 +6,7 @@
#include <basemem_packet.h>
#include <gpxe/uaccess.h>
#include <gpxe/segment.h>
#include <gpxe/shutdown.h>
#include <gpxe/init.h>
#include <gpxe/netdevice.h>
#include <gpxe/dhcp.h>
#include <gpxe/image.h>
Expand Down
27 changes: 0 additions & 27 deletions src/core/heap.c

This file was deleted.

122 changes: 101 additions & 21 deletions src/core/init.c
@@ -1,37 +1,117 @@
/**************************************************************************
* call_{init,reset,exit}_fns ()
*
* Call the various initialisation and exit functions. We use a
* function table so that we don't end up dragging in an object just
* because we call its initialisation function.
**************************************************************************
/*
* Copyright (C) 2007 Michael Brown <mbrown@fensystems.co.uk>.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/

#include <gpxe/device.h>
#include <gpxe/init.h>

/** @file
*
* Initialisation, startup and shutdown routines
*
*/

/** Registered initialisation functions */
static struct init_fn init_fns[0]
__table_start ( struct init_fn, init_fn );
__table_start ( struct init_fn, init_fns );
static struct init_fn init_fns_end[0]
__table_end ( struct init_fn, init_fn );
__table_end ( struct init_fn, init_fns );

/** Registered startup/shutdown functions */
static struct startup_fn startup_fns[0]
__table_start ( struct startup_fn, startup_fns );
static struct startup_fn startup_fns_end[0]
__table_end ( struct startup_fn, startup_fns );

void call_init_fns ( void ) {
/** "startup() has been called" flag */
static int started = 0;

/**
* Initialise gPXE
*
* This function performs the one-time-only and irreversible
* initialisation steps, such as initialising the heap. It must be
* called before (almost) any other function.
*
* There is, by definition, no counterpart to this function on the
* shutdown path.
*/
void initialise ( void ) {
struct init_fn *init_fn;

for ( init_fn = init_fns; init_fn < init_fns_end ; init_fn++ ) {
if ( init_fn->init )
init_fn->init ();
/* Call registered initialisation functions */
for ( init_fn = init_fns ; init_fn < init_fns_end ; init_fn++ ) {
init_fn->initialise ();
}
}

void call_exit_fns ( void ) {
struct init_fn *init_fn;
/**
* Start up gPXE
*
* This function performs the repeatable initialisation steps, such as
* probing devices. You may call startup() and shutdown() multiple
* times (as is done via the PXE API when PXENV_START_UNDI is used).
*/
void startup ( void ) {
struct startup_fn *startup_fn;

if ( started )
return;

/* Call registered startup functions */
for ( startup_fn = startup_fns ; startup_fn < startup_fns_end ;
startup_fn++ ) {
if ( startup_fn->startup )
startup_fn->startup();
}

/*
* Exit functions are called in reverse order to
* initialisation functions.
/* Probe for all devices. Treated separately because nothing
* else will drag in device.o
*/
for ( init_fn = init_fns_end - 1; init_fn >= init_fns ; init_fn-- ) {
if ( init_fn->exit )
init_fn->exit ();
probe_devices();

started = 1;
}

/**
* Shut down gPXE
*
* This function reverses the actions of startup(), and leaves gPXE in
* a state ready to be removed from memory. You may call startup()
* again after calling shutdown().
* Call this function only once, before either exiting main() or
* starting up a non-returnable image.
*/
void shutdown ( void ) {
struct startup_fn *startup_fn;

if ( ! started )
return;

/* Remove all devices */
remove_devices();

/* Call registered shutdown functions (in reverse order) */
for ( startup_fn = startup_fns_end - 1 ; startup_fn >= startup_fns ;
startup_fn-- ) {
if ( startup_fn->shutdown )
startup_fn->shutdown();
}

started = 0;
}
34 changes: 2 additions & 32 deletions src/core/main.c
@@ -1,5 +1,5 @@
/**************************************************************************
Etherboot - Network Bootstrap Program
gPXE - Network Bootstrap Program
Literature dealing with the network protocols:
ARP - RFC826
Expand All @@ -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 */
Expand Down
24 changes: 24 additions & 0 deletions src/core/malloc.c
Expand Up @@ -22,6 +22,7 @@
#include <strings.h>
#include <io.h>
#include <gpxe/list.h>
#include <gpxe/init.h>
#include <gpxe/malloc.h>

/** @file
Expand Down Expand Up @@ -72,6 +73,16 @@ static LIST_HEAD ( free_blocks );
/** Total amount of free memory */
size_t freemem;

/**
* Heap size
*
* Currently fixed at 128kB.
*/
#define HEAP_SIZE ( 128 * 1024 )

/** The heap itself */
static char heap[HEAP_SIZE] __attribute__ (( aligned ( __alignof__(void *) )));

/**
* Allocate a memory block
*
Expand Down Expand Up @@ -342,6 +353,19 @@ void mpopulate ( void *start, size_t len ) {
free_memblock ( start, ( len & ~( MIN_MEMBLOCK_SIZE - 1 ) ) );
}

/**
* Initialise the heap
*
*/
static void init_heap ( void ) {
mpopulate ( heap, sizeof ( heap ) );
}

/** Memory allocator initialisation function */
struct init_fn heap_init_fn __init_fn ( INIT_EARLY ) = {
.initialise = init_heap,
};

#if 0
#include <stdio.h>
/**
Expand Down
8 changes: 7 additions & 1 deletion src/core/process.c
Expand Up @@ -17,6 +17,7 @@
*/

#include <gpxe/list.h>
#include <gpxe/init.h>
#include <gpxe/process.h>

/** @file
Expand Down Expand Up @@ -83,10 +84,15 @@ void step ( void ) {
* Initialise processes
*
*/
void init_processes ( void ) {
static void init_processes ( void ) {
struct process *process;

for ( process = processes ; process < processes_end ; process++ ) {
process_add ( process );
}
}

/** Process initialiser */
struct init_fn process_init_fn __init_fn ( INIT_NORMAL ) = {
.initialise = init_processes,
};

0 comments on commit 89349d7

Please sign in to comment.