Merge lp:~lynxman/ubuntu/precise/ipxe/newsnapshot into lp:ubuntu/precise/ipxe

[Marc Cluet]

ipxe (1.0.0+git-2.55f6c88-0ubuntu1) precise; urgency=low

  * New snapshot from upstream git repository.
  * Added rules for automatic git branch refresh.
  * Changed rom target from allbaseroms to allroms.
  * Added patch to disable bad roms.

[James Page (james-page)]

Hi Mark

Thanks for proposing this merge; here's some feedback

1) I might be missing something but I can't see "Added rules for automatic git branch refresh." in the changes

2) You should really import the new orig.tar.gz into the branch using "bzr merge-upstream"; that way when a sponsor branches and then does bzr bd -S all of the required data including the orig.tar.gz is present in the branch.

3) Please can you apply all patches; at the moment the branch all of them apart from the new patch applied.

Ping me on IRC if you need help with any of the above.

Cheers

James

review: Needs Fixing

[Andres Rodriguez (andreserl)]

Hi Marc,

Could you please update the your branch to make it so it matches the new changes to the packaging please?

Other than that looks good. Would also be a good idea to add a debian/watch file.

Cheers.

review: Needs Fixing

[Marc Cluet (lynxman)]

Hi James

Fixed the branch with your suggestions, could you please review again?

Thanks

> Hi Mark
>
> Thanks for proposing this merge; here's some feedback
>
> 1) I might be missing something but I can't see "Added rules for automatic git
> branch refresh." in the changes
>
> 2) You should really import the new orig.tar.gz into the branch using "bzr
> merge-upstream"; that way when a sponsor branches and then does bzr bd -S all
> of the required data including the orig.tar.gz is present in the branch.
>
> 3) Please can you apply all patches; at the moment the branch all of them
> apart from the new patch applied.
>
> Ping me on IRC if you need help with any of the above.
>
> Cheers
>
> James

[Marc Cluet (lynxman)]

Hi Andres

Fixed the branch with your suggestions, could you please review again?

Thanks

> Hi Marc,
>
> Could you please update the your branch to make it so it matches the new
> changes to the packaging please?
>
> Other than that looks good. Would also be a good idea to add a debian/watch
> file.
>
> Cheers.

[James Page (james-page)]

Hi Mark

Thanks for updating the branch; sorry but more comments:

1) Please can you merge the two new changelog entries you have created - its all one change to the package really.

2) I tested the get-orig-source target and I got different results to the orig.tar.gz that is imported into the branch; and some error messages. The target tries to parse the version string into a date format which it then uses to generate the resulting tarball - however as the version string does not contain a valid date it fails.

It would be good to either align the versioning to what the rules are trying todo as this makes more sense.

3) This third point in really for clarity in the changelog:

* Changed rom target from allbaseroms to allroms.
* Added new target allqemu for qemu package.

Why? It would be nice to document in the changelog entry why we are building using different targets.

4) Lintian Warnings

W: ipxe source: brace-expansion-in-debhelper-config-file debian/ipxe.install
W: ipxe source: syntax-error-in-dep5-copyright paragraph 6 after the field license: THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
W: ipxe source: out-of-date-standards-version 3.9.1 (current is 3.9.2)

It would be nice to tidy these up as part of the new upstream release - specifically the first one which works by accident rather than by design and might not work in the future.

Any luck on contacting the upstream maintainer.

Cheers

James

review: Needs Fixing

[Marc Cluet (lynxman)]

Hi James,

No luck with the upstream maintainer, I contacted him but he wasn't open to collaboration unfortunately.

I've just refreshed the branch with all your suggestions, ready for review.

[lp:~lynxman/ubuntu/precise/ipxe/newsnapshot]

9. By Marc Cluet on 2012-02-10

New upstream snapshot.

10. By Marc Cluet on 2012-02-10

* Added rules for automatic git branch refresh.
* Changed rom target from allbaseroms to allroms.
  - recommended behaviour by upstream, building all full roms is neither
    recommended nor a desired user experience
* Added new target allqemu for qemu package.
  - created new build target to build full rom drivers just for qemu
    package purposes
* Cleaned lintian errors from debian package
  - Removed brace extension in ipxe.install
  - Updated standards to 3.9.2
  - Fixed copyright file not machine readable

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2011-07-31 20:57:02 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-baseroms-target.diff

=== removed directory '.pc/baseroms-target.diff'
=== removed directory '.pc/baseroms-target.diff/src'
=== removed file '.pc/baseroms-target.diff/src/Makefile.housekeeping'
--- .pc/baseroms-target.diff/src/Makefile.housekeeping	2011-07-31 20:57:02 +0000
+++ .pc/baseroms-target.diff/src/Makefile.housekeeping	1970-01-01 00:00:00 +0000
@@ -1,1153 +0,0 @@
-# -*- makefile -*- : Force emacs to use Makefile mode
-#
-# This file contains various boring housekeeping functions that would
-# otherwise seriously clutter up the main Makefile.
-
-###############################################################################
-#
-# Find a usable "echo -e" substitute.
-#
-TAB 			:= $(shell $(PRINTF) '\t')
-ECHO_E_ECHO		:= $(ECHO)
-ECHO_E_ECHO_E		:= $(ECHO) -e
-ECHO_E_BIN_ECHO 	:= /bin/echo
-ECHO_E_BIN_ECHO_E 	:= /bin/echo -e
-ECHO_E_ECHO_TAB		:= $(shell $(ECHO_E_ECHO) '\t' | cat)
-ECHO_E_ECHO_E_TAB	:= $(shell $(ECHO_E_ECHO_E) '\t' | cat)
-ECHO_E_BIN_ECHO_TAB 	:= $(shell $(ECHO_E_BIN_ECHO) '\t')
-ECHO_E_BIN_ECHO_E_TAB 	:= $(shell $(ECHO_E_BIN_ECHO_E) '\t')
-
-ifeq ($(ECHO_E_ECHO_TAB),$(TAB))
-ECHO_E		:= $(ECHO_E_ECHO)
-endif
-ifeq ($(ECHO_E_ECHO_E_TAB),$(TAB))
-ECHO_E		:= $(ECHO_E_ECHO_E)
-endif
-ifeq ($(ECHO_E_BIN_ECHO_TAB),$(TAB))
-ECHO_E		:= $(ECHO_E_BIN_ECHO)
-endif
-ifeq ($(ECHO_E_BIN_ECHO_E_TAB),$(TAB))
-ECHO_E		:= $(ECHO_E_BIN_ECHO_E)
-endif
-
-.echocheck :
-ifdef ECHO_E
-	@$(TOUCH) $@
-else
-	@$(PRINTF) '%24s : x%sx\n' 'tab' '$(TAB)'
-	@$(PRINTF) '%24s : x%sx\n' '"$(ECHO_E_ECHO) \t"' \
-				    '$(ECHO_E_ECHO_TAB)'
-	@$(PRINTF) '%24s : x%sx\n' '"$(ECHO_E_ECHO_E) \t"' \
-				    '$(ECHO_E_ECHO_E_TAB)'
-	@$(PRINTF) '%24s : x%sx\n' '"$(ECHO_E_BIN_ECHO) \t"' \
-				    '$(ECHO_E_BIN_ECHO_TAB)'
-	@$(PRINTF) '%24s : x%sx\n' '"$(ECHO_E_BIN_ECHO_E) \t"' \
-				    '$(ECHO_E_BIN_ECHO_E_TAB)'
-	@$(ECHO) "No usable \"echo -e\" substitute found"
-	@exit 1
-endif
-MAKEDEPS	+= .echocheck
-VERYCLEANUP	+= .echocheck
-
-echo :
-	@$(ECHO) "Using \"$(ECHO_E)\" for \"echo -e\""
-
-###############################################################################
-#
-# Generate a usable "seq" substitute
-#
-define seq
-	$(shell awk 'BEGIN { for ( i = $(1) ; i <= $(2) ; i++ ) print i }')
-endef
-
-###############################################################################
-#
-# Determine host OS
-#
-HOST_OS		:= $(shell uname -s)
-hostos :
-	@$(ECHO) $(HOST_OS)
-
-###############################################################################
-#
-# Determine compiler
-
-CCDEFS		:= $(shell $(CC) -E -x c -c /dev/null -dM | cut -d" " -f2)
-ccdefs:
-	@$(ECHO) $(CCDEFS)
-
-ifeq ($(filter __ICC,$(CCDEFS)),__ICC)
-CCTYPE		:= icc
-else
-CCTYPE		:= gcc
-endif
-cctype:
-	@$(ECHO) $(CCTYPE)
-
-###############################################################################
-#
-# Check for tools that can cause failed builds
-#
-
-ifeq ($(CCTYPE),gcc)
-GCC_2_96_BANNER := $(shell $(CC) -v 2>&1 | grep -is 'gcc version 2\.96')
-ifneq ($(GCC_2_96_BANNER),)
-$(warning gcc 2.96 is unsuitable for compiling iPXE)
-$(warning Use gcc 2.95 or a newer version instead)
-$(error Unsuitable build environment found)
-endif
-endif
-
-PERL_UNICODE_CHECK := $(shell $(PERL) -e 'use bytes; print chr(255)' | wc -c)
-ifeq ($(PERL_UNICODE_CHECK),2)
-$(warning Your Perl version has a Unicode handling bug)
-$(warning Execute this command before building iPXE:)
-$(warning export LANG=$${LANG%.UTF-8})
-$(error Unsuitable build environment found)
-endif
-
-LD_GOLD_BANNER := $(shell $(LD) -v 2>&1 | grep 'GNU gold')
-ifneq ($(LD_GOLD_BANNER),)
-$(warning GNU gold is unsuitable for building iPXE)
-$(warning Use GNU ld instead)
-$(error Unsuitable build environment found)
-endif
-
-###############################################################################
-#
-# Check for various tool workarounds
-#
-
-WORKAROUND_CFLAGS :=
-WORKAROUND_ASFLAGS :=
-WORKAROUND_LDFLAGS :=
-
-# Make syntax does not allow use of comma or space in certain places.
-# This ugly workaround is suggested in the manual.
-#
-COMMA	:= ,
-EMPTY	:=
-SPACE	:= $(EMPTY) $(EMPTY)
-
-# Check for an old version of gas (binutils 2.9.1)
-#
-OLDGAS	:= $(shell $(AS) --version | grep -q '2\.9\.1' && $(ECHO) -DGAS291)
-WORKAROUND_CFLAGS += $(OLDGAS)
-oldgas :
-	@$(ECHO) $(oldgas)
-
-# Some widespread patched versions of gcc include -fstack-protector by
-# default, even when -ffreestanding is specified.  We therefore need
-# to disable -fstack-protector if the compiler supports it.
-#
-ifeq ($(CCTYPE),gcc)
-SP_TEST = $(CC) -fno-stack-protector -x c -c /dev/null \
-		-o /dev/null >/dev/null 2>&1
-SP_FLAGS := $(shell $(SP_TEST) && $(ECHO) '-fno-stack-protector')
-WORKAROUND_CFLAGS += $(SP_FLAGS)
-endif
-
-# Some widespread patched versions of gcc include -fPIE -Wl,-pie by
-# default.  Note that gcc will exit *successfully* if it fails to
-# recognise an option that starts with "no", so we have to test for
-# output on stderr instead of checking the exit status.
-#
-ifeq ($(CCTYPE),gcc)
-PIE_TEST = [ -z "`$(CC) -fno-PIE -nopie -x c -c /dev/null -o /dev/null 2>&1`" ]
-PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -nopie')
-WORKAROUND_CFLAGS += $(PIE_FLAGS)
-endif
-
-# gcc 4.4 generates .eh_frame sections by default, which distort the
-# output of "size".  Inhibit this.
-#
-ifeq ($(CCTYPE),gcc)
-CFI_TEST = $(CC) -fno-dwarf2-cfi-asm -x c -c /dev/null \
-		 -o /dev/null >/dev/null 2>&1
-CFI_FLAGS := $(shell $(CFI_TEST) && $(ECHO) '-fno-dwarf2-cfi-asm')
-WORKAROUND_CFLAGS += $(CFI_FLAGS)
-endif
-
-# gcc 4.6 generates spurious warnings if -Waddress is in force.
-# Inhibit this.
-#
-ifeq ($(CCTYPE),gcc)
-WNA_TEST = $(CC) -Wno-address -x c -c /dev/null -o /dev/null >/dev/null 2>&1
-WNA_FLAGS := $(shell $(WNA_TEST) && $(ECHO) '-Wno-address')
-WORKAROUND_CFLAGS += $(WNA_FLAGS)
-endif
-
-# Some versions of gas choke on division operators, treating them as
-# comment markers.  Specifying --divide will work around this problem,
-# but isn't available on older gas versions.
-#
-DIVIDE_TEST = $(AS) --divide /dev/null -o /dev/null 2>/dev/null
-DIVIDE_FLAGS := $(shell $(DIVIDE_TEST) && $(ECHO) '--divide')
-WORKAROUND_ASFLAGS += $(DIVIDE_FLAGS)
-
-###############################################################################
-#
-# Build verbosity
-#
-ifeq ($(V),1)
-Q :=
-QM := @\#
-else
-Q := @
-QM := @
-endif
-
-###############################################################################
-#
-# Set BIN according to whatever was specified on the command line as
-# the build target.
-#
-
-# Determine how many different BIN directories are mentioned in the
-# make goals.
-#
-BIN_GOALS	:= $(filter bin/% bin-%,$(MAKECMDGOALS))
-BIN_GOALS_BINS	:= $(sort $(foreach BG,$(BIN_GOALS),\
-				    $(firstword $(subst /, ,$(BG)))))
-NUM_BINS	:= $(words $(BIN_GOALS_BINS))
-
-ifeq ($(NUM_BINS),0)
-
-# No BIN directory was specified.  Set BIN to "bin" as a sensible
-# default.
-
-BIN		:= bin
-
-else # NUM_BINS == 0
-
-ifeq ($(NUM_BINS),1)
-
-# If exactly one BIN directory was specified, set BIN to match this
-# directory.
-#
-BIN		:= $(firstword $(BIN_GOALS_BINS))
-
-else # NUM_BINS == 1
-
-# More than one BIN directory was specified.  We cannot handle the
-# latter case within a single make invocation, so set up recursive
-# targets for each BIN directory.  Use exactly one target for each BIN
-# directory since running multiple make invocations within the same
-# BIN directory is likely to cause problems.
-#
-# Leave $(BIN) undefined.  This has implications for any target that
-# depends on $(BIN); such targets should be made conditional upon the
-# existence of $(BIN).
-#
-BIN_GOALS_FIRST	:= $(foreach BGB,$(BIN_GOALS_BINS),\
-			     $(firstword $(filter $(BGB)/%,$(BIN_GOALS))))
-BIN_GOALS_OTHER	:= $(filter-out $(BIN_GOALS_FIRST),$(BIN_GOALS))
-
-$(BIN_GOALS_FIRST) : % : BIN_RECURSE
-	$(Q)$(MAKE) --no-print-directory BIN=$(firstword $(subst /, ,$@)) \
-	    $(filter $(firstword $(subst /, ,$@))/%, $(BIN_GOALS))
-$(BIN_GOALS_OTHER) : % : BIN_RECURSE
-	$(Q)$(TRUE)
-.PHONY : BIN_RECURSE
-
-endif # NUM_BINS == 1
-endif # NUM_BINS == 0
-
-ifdef BIN
-
-# Create $(BIN) directory if it doesn't exist yet
-#
-ifeq ($(wildcard $(BIN)),)
-$(shell $(MKDIR) -p $(BIN))
-endif
-
-# Target to allow e.g. "make bin-efi arch"
-#
-$(BIN) :
-	@# Do nothing, silently
-.PHONY : $(BIN)
-
-# Remove everything in $(BIN) for a "make clean"
-#
-CLEANUP	+= $(BIN)/*.* # Avoid picking up directories
-
-endif # defined(BIN)
-
-# Determine whether or not we need to include the dependency files
-#
-NO_DEP_TARGETS	:= $(BIN) clean veryclean
-ifeq ($(MAKECMDGOALS),)
-NEED_DEPS	:= 1
-endif
-ifneq ($(strip $(filter-out $(NO_DEP_TARGETS),$(MAKECMDGOALS))),)
-NEED_DEPS	:= 1
-endif
-
-###############################################################################
-#
-# Select build architecture and platform based on $(BIN)
-#
-# BIN has the form bin[-[arch-]platform]
-
-ARCHS		:= $(patsubst arch/%,%,$(wildcard arch/*))
-PLATFORMS	:= $(patsubst config/defaults/%.h,%,\
-		     $(wildcard config/defaults/*.h))
-archs :
-	@$(ECHO) $(ARCHS)
-
-platforms :
-	@$(ECHO) $(PLATFORMS)
-
-ifdef BIN
-
-# Determine architecture portion of $(BIN), if present
-BIN_ARCH	:= $(strip $(foreach A,$(ARCHS),\
-			     $(patsubst bin-$(A)-%,$(A),\
-			       $(filter bin-$(A)-%,$(BIN)))))
-
-# Determine platform portion of $(BIN), if present
-ifeq ($(BIN_ARCH),)
-BIN_PLATFORM	:= $(patsubst bin-%,%,$(filter bin-%,$(BIN)))
-else
-BIN_PLATFORM	:= $(patsubst bin-$(BIN_ARCH)-%,%,$(BIN))
-endif
-
-# Determine build architecture
-DEFAULT_ARCH	:= i386
-ARCH		:= $(firstword $(BIN_ARCH) $(DEFAULT_ARCH))
-CFLAGS		+= -DARCH=$(ARCH)
-arch :
-	@$(ECHO) $(ARCH)
-.PHONY : arch
-
-# Determine build platform
-DEFAULT_PLATFORM := pcbios
-PLATFORM	:= $(firstword $(BIN_PLATFORM) $(DEFAULT_PLATFORM))
-CFLAGS		+= -DPLATFORM=$(PLATFORM)
-platform :
-	@$(ECHO) $(PLATFORM)
-
-endif # defined(BIN)
-
-# Include architecture-specific Makefile
-ifdef ARCH
-MAKEDEPS	+= arch/$(ARCH)/Makefile
-include arch/$(ARCH)/Makefile
-endif
-
-# Include architecture-specific include path
-ifdef ARCH
-INCDIRS		+= arch/$(ARCH)/include
-INCDIRS		+= arch/$(ARCH)/include/$(PLATFORM)
-endif
-
-###############################################################################
-#
-# Source file handling
-
-# SRCDIRS lists all directories containing source files.
-srcdirs :
-	@$(ECHO) $(SRCDIRS)
-
-# SRCS lists all .c or .S files found in any SRCDIR
-#
-SRCS	+= $(wildcard $(patsubst %,%/*.c,$(SRCDIRS)))
-SRCS	+= $(wildcard $(patsubst %,%/*.S,$(SRCDIRS)))
-srcs :
-	@$(ECHO) $(SRCS)
-
-# AUTO_SRCS lists all files in SRCS that are not mentioned in
-# NON_AUTO_SRCS.  Files should be added to NON_AUTO_SRCS if they
-# cannot be built using the standard build template.
-#
-AUTO_SRCS = $(filter-out $(NON_AUTO_SRCS),$(SRCS))
-autosrcs :
-	@$(ECHO) $(AUTO_SRCS)
-
-# Just about everything else in this section depends upon having
-# $(BIN) set
-
-ifdef BIN
-
-# INCDIRS lists the include path
-incdirs :
-	@$(ECHO) $(INCDIRS)
-
-# Common flags
-#
-CFLAGS		+= $(foreach INC,$(INCDIRS),-I$(INC))
-CFLAGS		+= -Os
-CFLAGS		+= -g
-ifeq ($(CCTYPE),gcc)
-CFLAGS		+= -ffreestanding
-CFLAGS		+= -Wall -W -Wformat-nonliteral
-endif
-ifeq ($(CCTYPE),icc)
-CFLAGS		+= -fno-builtin
-CFLAGS		+= -no-ip
-CFLAGS		+= -no-gcc
-CFLAGS		+= -diag-disable 111 # Unreachable code
-CFLAGS		+= -diag-disable 128 # Unreachable loop
-CFLAGS		+= -diag-disable 170 # Array boundary checks
-CFLAGS		+= -diag-disable 177 # Unused functions
-CFLAGS		+= -diag-disable 181 # printf() format checks
-CFLAGS		+= -diag-disable 188 # enum strictness
-CFLAGS		+= -diag-disable 193 # Undefined preprocessor identifiers
-CFLAGS		+= -diag-disable 280 # switch ( constant )
-CFLAGS		+= -diag-disable 310 # K&R parameter lists
-CFLAGS		+= -diag-disable 424 # Extra semicolon
-CFLAGS		+= -diag-disable 589 # Declarations mid-code
-CFLAGS		+= -diag-disable 593 # Unused variables
-CFLAGS		+= -diag-disable 810 # Casting ints to smaller ints
-CFLAGS		+= -diag-disable 981 # Sequence point violations
-CFLAGS		+= -diag-disable 1292 # Ignored attributes
-CFLAGS		+= -diag-disable 1338 # void pointer arithmetic
-CFLAGS		+= -diag-disable 1361 # Variable-length arrays
-CFLAGS		+= -diag-disable 1418 # Missing prototypes
-CFLAGS		+= -diag-disable 1419 # Missing prototypes
-CFLAGS		+= -diag-disable 1599 # Hidden variables
-CFLAGS		+= -Wall -Wmissing-declarations
-endif
-CFLAGS		+= $(WORKAROUND_CFLAGS) $(EXTRA_CFLAGS)
-ASFLAGS		+= $(WORKAROUND_ASFLAGS) $(EXTRA_ASFLAGS)
-LDFLAGS		+= $(WORKAROUND_LDFLAGS) $(EXTRA_LDFLAGS)
-
-# Inhibit -Werror if NO_WERROR is specified on make command line
-#
-ifneq ($(NO_WERROR),1)
-CFLAGS		+= -Werror
-ASFLAGS		+= --fatal-warnings
-endif
-
-# Function trace recorder state in the last build.  This is needed
-# in order to correctly rebuild whenever the function recorder is
-# enabled/disabled.
-#
-FNREC_STATE	:= $(BIN)/.fnrec.state
-ifeq ($(wildcard $(FNREC_STATE)),)
-FNREC_OLD	:= <invalid>
-else
-FNREC_OLD	:= $(shell cat $(FNREC_STATE))
-endif
-ifeq ($(FNREC_OLD),$(FNREC))
-$(FNREC_STATE) :
-else
-$(FNREC_STATE) : clean
-$(shell $(ECHO) "$(FNREC)" > $(FNREC_STATE))
-endif
-
-VERYCLEANUP	+= $(FNREC_STATE)
-MAKEDEPS	+= $(FNREC_STATE)
-
-ifeq ($(FNREC),1)
-# Enabling -finstrument-functions affects gcc's analysis and leads to spurious
-# warnings about use of uninitialised variables.
-#
-CFLAGS		+= -Wno-uninitialized
-CFLAGS		+= -finstrument-functions
-CFLAGS		+= -finstrument-functions-exclude-file-list=core/fnrec.c
-endif
-
-# Enable per-item sections and section garbage collection.  Note that
-# some older versions of gcc support -fdata-sections but treat it as
-# implying -fno-common, which would break our build.  Some other older
-# versions issue a spurious and uninhibitable warning if
-# -ffunction-sections is used with -g, which would also break our
-# build since we use -Werror.
-#
-ifeq ($(CCTYPE),gcc)
-DS_TEST		= $(ECHO) 'char x;' | \
-		  $(CC) -fdata-sections -S -x c - -o - 2>/dev/null | \
-		  grep -E '\.comm' > /dev/null
-DS_FLAGS	:= $(shell $(DS_TEST) && $(ECHO) '-fdata-sections')
-FS_TEST		= $(CC) -ffunction-sections -g -c -x c /dev/null \
-		  -o /dev/null 2>/dev/null
-FS_FLAGS	:= $(shell $(FS_TEST) && $(ECHO) '-ffunction-sections')
-CFLAGS		+= $(FS_FLAGS) $(DS_FLAGS)
-endif
-LDFLAGS		+= --gc-sections
-
-# compiler.h is needed for our linking and debugging system
-#
-CFLAGS		+= -include compiler.h
-
-# CFLAGS for specific object types
-#
-CFLAGS_c	+=
-CFLAGS_S 	+= -DASSEMBLY
-
-# Base object name of the current target
-#
-OBJECT		= $(firstword $(subst ., ,$(@F)))
-
-# CFLAGS for specific object files.  You can define
-# e.g. CFLAGS_rtl8139, and have those flags automatically used when
-# compiling bin/rtl8139.o.
-#
-OBJ_CFLAGS	= $(CFLAGS_$(OBJECT)) -DOBJECT=$(subst -,_,$(OBJECT))
-$(BIN)/%.flags :
-	@$(ECHO) $(OBJ_CFLAGS)
-
-# ICC requires postprocessing objects to fix up table alignments
-#
-ifeq ($(CCTYPE),icc)
-POST_O		= && $(ICCFIX) $@
-POST_O_DEPS	:= $(ICCFIX)
-else
-POST_O		:=
-POST_O_DEPS	:=
-endif
-
-# Rules for specific object types.
-#
-COMPILE_c	= $(CC) $(CFLAGS) $(CFLAGS_c) $(OBJ_CFLAGS)
-RULE_c		= $(Q)$(COMPILE_c) -c $< -o $@ $(POST_O)
-RULE_c_to_dbg%.o = $(Q)$(COMPILE_c) -Ddebug_$(subst -,_,$(OBJECT))=$* -c $< -o $@ $(POST_O)
-RULE_c_to_c	= $(Q)$(COMPILE_c) -E -c $< > $@
-RULE_c_to_s	= $(Q)$(COMPILE_c) -S -g0 -c $< -o $@
-
-PREPROCESS_S	= $(CPP) $(CFLAGS) $(CFLAGS_S) $(OBJ_CFLAGS)
-ASSEMBLE_S	= $(AS) $(ASFLAGS)
-RULE_S		= $(Q)$(PREPROCESS_S) $< | $(ASSEMBLE_S) -o $@
-RULE_S_to_dbg%.o = $(Q)$(PREPROCESS_S) -Ddebug_$(subst -,_,$(OBJECT))=$* $< | $(ASSEMBLE_S) -o $@
-RULE_S_to_s	= $(Q)$(PREPROCESS_S) $< > $@
-
-DEBUG_TARGETS	+= dbg%.o c s
-
-# We automatically generate rules for any file mentioned in AUTO_SRCS
-# using the following set of templates.  It would be cleaner to use
-# $(eval ...), but this function exists only in GNU make >= 3.80.
-
-# deps_template : generate dependency list for a given source file
-#
-# $(1) is the full path to the source file (e.g. "drivers/net/rtl8139.c")
-# $(2) is the source type (e.g. "c")
-# $(3) is the source base name (e.g. "rtl8139")
-#
-define deps_template
-	@$(ECHO) "  [DEPS] $(1)"
-	@$(MKDIR) -p $(BIN)/deps/$(dir $(1))
-	@$(CPP) $(CFLAGS) $(CFLAGS_$(2)) $(CFLAGS_$(3)) -DOBJECT=$(3) \
-		-Wno-error -M $(1) -MG -MP | \
-		sed 's/\.o\s*:/_DEPS =/' > $(BIN)/deps/$(1).d
-endef
-
-# rules_template : generate rules for a given source file
-#
-# $(1) is the full path to the source file (e.g. "drivers/net/rtl8139.c")
-# $(2) is the source type (e.g. "c")
-# $(3) is the source base name (e.g. "rtl8139")
-#
-define rules_template
-	@$(ECHO) "  [RULES] $(1)"
-	@$(MKDIR) -p $(BIN)/rules/$(dir $(1))
-	@$(ECHO_E) '\n$$(BIN)/$(3).o :' \
-		 '$(1) $$(MAKEDEPS) $$(POST_O_DEPS) $$($(3)_DEPS)' \
-		 '\n\t$$(QM)$(ECHO) "  [BUILD] $$@"' \
-		 '\n\t$$(RULE_$(2))\n' \
-		 '\nBOBJS += $$(BIN)/$(3).o\n' \
-		 $(foreach TGT,$(DEBUG_TARGETS), \
-		    $(if $(RULE_$(2)_to_$(TGT)), \
-		    '\n$$(BIN)/$(3).$(TGT) :' \
-		    '$(1) $$(MAKEDEPS) $$(POST_O_DEPS) $$($(3)_DEPS)' \
-		    '\n\t$$(QM)$(ECHO) "  [BUILD] $$@"' \
-		    '\n\t$$(RULE_$(2)_to_$(TGT))\n' \
-		    '\n$(TGT)_OBJS += $$(BIN)/$(3).$(TGT)\n' ) ) \
-		 '\n$(BIN)/deps/$(1).d : $$($(3)_DEPS)\n' \
-		 '\nTAGS : $$($(3)_DEPS)\n' > $(BIN)/rules/$(1).r
-	@$(if $(findstring drivers/,$(1)),\
-	   $(PERL) $(PARSEROM) $(1) >> $(BIN)/rules/$(1).r)
-endef
-
-# Rule to generate the dependency list file
-#
-$(BIN)/deps/%.d : % $(MAKEDEPS)
-	$(call deps_template,$<,$(subst .,,$(suffix $<)),$(basename $(notdir $<)))
-
-# Calculate and include the list of dependency list files
-#
-AUTO_DEPS	= $(patsubst %,$(BIN)/deps/%.d,$(AUTO_SRCS))
-ifdef NEED_DEPS
-ifneq ($(AUTO_DEPS),)
--include $(AUTO_DEPS)
-endif
-endif
-autodeps :
-	@$(ECHO) $(AUTO_DEPS)
-VERYCLEANUP	+= $(BIN)/deps
-
-# Rule to generate the rules file
-#
-$(BIN)/rules/%.r : % $(MAKEDEPS) $(PARSEROM)
-	$(call rules_template,$<,$(subst .,,$(suffix $<)),$(basename $(notdir $<)))
-
-# Calculate and include the list of rules files
-#
-AUTO_RULES	= $(patsubst %,$(BIN)/rules/%.r,$(AUTO_SRCS))
-ifdef NEED_DEPS
-ifneq ($(AUTO_RULES),)
--include $(AUTO_RULES)
-endif
-endif
-autorules :
-	@$(ECHO) $(AUTO_RULES)
-VERYCLEANUP	+= $(BIN)/rules
-
-# The following variables are created by the rules files
-#
-bobjs :
-	@$(ECHO) $(BOBJS)
-drivers :
-	@$(ECHO) $(DRIVERS)
-.PHONY : drivers
-roms :
-	@$(ECHO) $(ROMS)
-
-# List of embedded images included in the last build of embedded.o.
-# This is needed in order to correctly rebuild embedded.o whenever the
-# list of objects changes.
-#
-EMBED		:= $(EMBEDDED_IMAGE) # Maintain backwards compatibility
-EMBEDDED_LIST	:= $(BIN)/.embedded.list
-ifeq ($(wildcard $(EMBEDDED_LIST)),)
-EMBED_OLD := <invalid>
-else
-EMBED_OLD := $(shell cat $(EMBEDDED_LIST))
-endif
-ifneq ($(EMBED_OLD),$(EMBED))
-$(shell $(ECHO) "$(EMBED)" > $(EMBEDDED_LIST))
-endif
-
-$(EMBEDDED_LIST) :
-
-VERYCLEANUP	+= $(EMBEDDED_LIST)
-
-EMBEDDED_FILES	:= $(subst $(COMMA), ,$(EMBED))
-EMBED_ALL	:= $(foreach i,$(call seq,1,$(words $(EMBEDDED_FILES))),\
-		     EMBED ( $(i), \"$(word $(i), $(EMBEDDED_FILES))\",\
-			     \"$(notdir $(word $(i),$(EMBEDDED_FILES)))\" ))
-
-$(BIN)/embedded.o : $(EMBEDDED_FILES) $(EMBEDDED_LIST)
-
-# This file uses .incbin inline assembly to include a binary file.
-# Unfortunately ccache does not detect this dependency and caches builds even
-# when the binary file has changed.
-#
-$(BIN)/embedded.o : override CC := env CCACHE_DISABLE=1 $(CC)
-
-CFLAGS_embedded = -DEMBED_ALL="$(EMBED_ALL)"
-
-# Generate error usage information
-#
-$(BIN)/%.einfo : $(BIN)/%.o
-	$(QM)$(ECHO) "  [EINFO] $@"
-	$(Q)$(OBJCOPY) -O binary -j .einfo --set-section-flags .einfo=alloc \
-		$< $@
-
-EINFOS		:= $(patsubst $(BIN)/%.o,$(BIN)/%.einfo,$(BOBJS))
-$(BIN)/errors : $(EINFOS) $(EINFO)
-	$(QM)$(ECHO) "  [EINFO] $@"
-	$(Q)$(EINFO) $(EINFOS) | sort > $@
-CLEANUP		+= $(BIN)/errors	# Doesn't match the $(BIN)/*.* pattern
-
-# Generate the NIC file from the parsed source files.  The NIC file is
-# only for rom-o-matic.
-#
-$(BIN)/NIC : $(AUTO_DEPS)
-	@$(ECHO) '# This is an automatically generated file, do not edit' > $@
-	@$(ECHO) '# It does not affect anything in the build, ' \
-	     'it is only for rom-o-matic' >> $@
-	@$(ECHO) >> $@
-	@perl -ne 'chomp; print "$$1\n" if /\# NIC\t(.*)$$/' $^ >> $@
-CLEANUP		+= $(BIN)/NIC	# Doesn't match the $(BIN)/*.* pattern
-
-# Analyse a target name (e.g. "bin/dfe538--prism2_pci.zrom.tmp") and
-# derive the variables:
-# 
-# TGT_ELEMENTS : the elements of the target (e.g. "dfe538 prism2_pci")
-# TGT_PREFIX   : the prefix type (e.g. "zrom")
-# TGT_DRIVERS  : the driver for each element (e.g. "rtl8139 prism2_pci")
-# TGT_ROM_NAME : the ROM name (e.g. "dfe538")
-# TGT_MEDIA    : the media type (e.g. "rom")
-#
-DRIVERS_ipxe	= $(DRIVERS)
-CARD_DRIVER	= $(firstword $(DRIVER_$(1)) $(1))
-TGT_ELEMENTS	= $(subst --, ,$(firstword $(subst ., ,$(notdir $@))))
-TGT_PREFIX	= $(word 2,$(subst ., ,$(notdir $@)))
-TGT_ROM_NAME	= $(firstword $(TGT_ELEMENTS))
-TGT_DRIVERS	= $(strip $(if $(DRIVERS_$(TGT_ROM_NAME)), \
-			       $(DRIVERS_$(TGT_ROM_NAME)), \
-			       $(foreach TGT_ELEMENT,$(TGT_ELEMENTS), \
-			         $(call CARD_DRIVER,$(TGT_ELEMENT))) ))
-TGT_MEDIA	= $(subst z,,$(TGT_PREFIX))
-
-# Look up ROM IDs for the current target
-# (e.g. "bin/dfe538--prism2_pci.zrom.tmp") and derive the variables:
-#
-# TGT_PCI_VENDOR : the PCI vendor ID (e.g. "0x1186")
-# TGT_PCI_DEVICE : the PCI device ID (e.g. "0x1300")
-#
-TGT_PCI_VENDOR	= $(PCI_VENDOR_$(TGT_ROM_NAME))
-TGT_PCI_DEVICE	= $(PCI_DEVICE_$(TGT_ROM_NAME))
-
-# Calculate link-time options for the current target
-# (e.g. "bin/dfe538--prism2_pci.zrom.tmp") and derive the variables:
-#
-# TGT_LD_DRIVERS : symbols to require in order to drag in the relevant drivers
-#		   (e.g. "obj_rtl8139 obj_prism2_pci")
-# TGT_LD_IDS :     symbols to define in order to fill in ID structures in the
-#		   ROM header (e.g."pci_vendor_id=0x1186 pci_device_id=0x1300")
-#
-TGT_LD_DRIVERS	= $(subst -,_,$(patsubst %,obj_%,$(TGT_DRIVERS)))
-TGT_LD_IDS	= pci_vendor_id=$(firstword $(TGT_PCI_VENDOR) 0) \
-		  pci_device_id=$(firstword $(TGT_PCI_DEVICE) 0)
-TGT_LD_ENTRY	= _$(TGT_PREFIX)_start
-
-# Calculate linker flags based on link-time options for the current
-# target type (e.g. "bin/dfe538--prism2_pci.zrom.tmp") and derive the
-# variables:
-#
-# TGT_LD_FLAGS : target-specific flags to pass to linker (e.g.
-#		 "-u obj_zpciprefix -u obj_rtl8139 -u obj_prism2_pci
-#		  --defsym pci_vendor=0x1186 --defsym pci_device=0x1300")
-#
-TGT_LD_FLAGS	= $(foreach SYM,$(TGT_LD_ENTRY) $(TGT_LD_DRIVERS) obj_config,\
-		    -u $(SYM) --defsym check_$(SYM)=$(SYM) ) \
-		  $(patsubst %,--defsym %,$(TGT_LD_IDS)) \
-		  -e $(TGT_LD_ENTRY)
-
-# Calculate list of debugging versions of objects to be included in
-# the target.
-#
-DEBUG_LIST	= $(subst $(COMMA), ,$(DEBUG))
-DEBUG_OBJ_LEVEL	= $(firstword $(word 2,$(subst :, ,$(1))) 1)
-DEBUG_OBJ_BASE	= $(word 1,$(subst :, ,$(1))).dbg$(call DEBUG_OBJ_LEVEL,$(1))
-DEBUG_OBJ	= $(BIN)/$(call DEBUG_OBJ_BASE,$(1)).o
-DEBUG_ORIG_OBJ	= $(BIN)/$(word 1,$(subst :, ,$(1))).o
-DEBUG_OBJS	= $(foreach D,$(DEBUG_LIST),$(call DEBUG_OBJ,$(D)))
-DEBUG_ORIG_OBJS	= $(foreach D,$(DEBUG_LIST),$(call DEBUG_ORIG_OBJ,$(D)))
-BLIB_OBJS	= $(DEBUG_OBJS) $(filter-out $(DEBUG_ORIG_OBJS),$(BOBJS))
-
-# Print out all derived information for a given target.
-#
-$(BIN)/%.info :
-	@$(ECHO) 'Elements             : $(TGT_ELEMENTS)'
-	@$(ECHO) 'Prefix               : $(TGT_PREFIX)'
-	@$(ECHO) 'Drivers              : $(TGT_DRIVERS)'
-	@$(ECHO) 'ROM name             : $(TGT_ROM_NAME)'
-	@$(ECHO) 'Media                : $(TGT_MEDIA)'
-	@$(ECHO)
-	@$(ECHO) 'PCI vendor           : $(TGT_PCI_VENDOR)'
-	@$(ECHO) 'PCI device           : $(TGT_PCI_DEVICE)'
-	@$(ECHO)
-	@$(ECHO) 'LD driver symbols    : $(TGT_LD_DRIVERS)'
-	@$(ECHO) 'LD ID symbols        : $(TGT_LD_IDS)'
-	@$(ECHO) 'LD entry point       : $(TGT_LD_ENTRY)'
-	@$(ECHO)
-	@$(ECHO) 'LD target flags      : $(TGT_LD_FLAGS)'
-	@$(ECHO)
-	@$(ECHO) 'Debugging objects    : $(DEBUG_OBJS)'
-	@$(ECHO) 'Replaced objects     : $(DEBUG_ORIG_OBJS)'
-
-# List of objects included in the last build of blib.  This is needed
-# in order to correctly rebuild blib whenever the list of objects
-# changes.
-#
-BLIB_LIST	:= $(BIN)/.blib.list
-ifeq ($(wildcard $(BLIB_LIST)),)
-BLIB_OBJS_OLD	:= <invalid>
-else
-BLIB_OBJS_OLD	:= $(shell cat $(BLIB_LIST))
-endif
-ifneq ($(BLIB_OBJS_OLD),$(BLIB_OBJS))
-$(shell $(ECHO) "$(BLIB_OBJS)" > $(BLIB_LIST))
-endif
-
-$(BLIB_LIST) :
-
-VERYCLEANUP	+= $(BLIB_LIST)
-
-# Library of all objects
-#
-BLIB		= $(BIN)/blib.a
-$(BLIB) : $(BLIB_OBJS) $(BLIB_LIST) $(MAKEDEPS)
-	$(Q)$(RM) $(BLIB)
-	$(QM)$(ECHO) "  [AR] $@"
-	$(Q)$(AR) r $@ $(BLIB_OBJS)
-	$(Q)$(RANLIB) $@
-blib : $(BLIB)
-
-# Command to generate build ID.  Must be unique for each $(BIN)/%.tmp,
-# even within the same build run.
-#
-BUILD_ID_CMD	:= perl -e 'printf "0x%08x", int ( rand ( 0xffffffff ) );'
-
-# Build an intermediate object file from the objects required for the
-# specified target.
-#
-$(BIN)/%.tmp : $(BLIB) $(MAKEDEPS) $(LDSCRIPT)
-	$(QM)$(ECHO) "  [LD] $@"
-	$(Q)$(LD) $(LDFLAGS) -T $(LDSCRIPT) $(TGT_LD_FLAGS) $(BLIB) -o $@ \
-		--defsym _build_id=`$(BUILD_ID_CMD)` -Map $(BIN)/$*.tmp.map
-	$(Q)$(OBJDUMP) -ht $@ | $(PERL) $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map
-
-# Keep intermediate object file (useful for debugging)
-.PRECIOUS : $(BIN)/%.tmp
-
-# Show a linker map for the specified target
-#
-$(BIN)/%.map : $(BIN)/%.tmp
-	@less $(BIN)/$*.tmp.map
-
-# Get objects list for the specified target
-#
-define objs_list
-	$(sort $(foreach OBJ_SYMBOL,\
-		 $(filter obj_%,$(shell $(NM) $(1) | cut -d" " -f3)),\
-		 $(patsubst obj_%,%,$(OBJ_SYMBOL))))
-endef
-$(BIN)/%.objs : $(BIN)/%.tmp
-	$(Q)$(ECHO) $(call objs_list,$<)
-$(BIN)/%.sizes : $(BIN)/%.tmp
-	$(Q)$(SIZE) -t $(foreach OBJ,$(call objs_list,$<),$(wildcard $(BIN)/$(subst _,?,$(OBJ)).o)) | \
-		sort -g
-
-# Get dependency list for the specified target
-#
-define deps_list
-	$(sort $(foreach OBJ,$(call objs_list,$(1)),$($(OBJ)_DEPS)))
-endef
-$(BIN)/%.deps : $(BIN)/%.tmp
-	$(Q)$(ECHO) $(call deps_list,$<)
-
-# Get unneeded source files for the specified target
-#
-define nodeps_list
-	$(sort $(filter-out $(call deps_list,$(1)),\
-		 $(foreach BOBJ,$(BOBJS),\
-		   $($(basename $(notdir $(BOBJ)))_DEPS))))
-endef
-$(BIN)/%.nodeps : $(BIN)/%.tmp
-	$(Q)$(ECHO) $(call nodeps_list,$<)
-
-# Get licensing verdict for the specified target
-#
-define licensable_deps_list
-	$(filter-out config/local/%.h,$(call deps_list,$(1)))
-endef
-define unlicensed_deps_list
-	$(shell grep -L FILE_LICENCE $(call licensable_deps_list,$(1)))
-endef
-define licence_list
-	$(patsubst __licence_%,%,\
-	  $(filter __licence_%,$(shell $(NM) $(1) | cut -d" " -f3)))
-endef
-$(BIN)/%.licence : $(BIN)/%.tmp
-	$(QM)$(ECHO) "  [LICENCE] $@"
-	$(Q)$(if $(strip $(call unlicensed_deps_list,$<)),\
-		echo -n "Unable to determine licence because the following " ;\
-		echo "files are missing a licence declaration:" ;\
-		echo $(call unlicensed_deps_list,$<);\
-		exit 1,\
-		$(PERL) $(LICENCE) $(call licence_list,$<))
-
-# Extract compression information from intermediate object file
-#
-$(BIN)/%.zinfo : $(BIN)/%.tmp
-	$(QM)$(ECHO) "  [ZINFO] $@"
-	$(Q)$(OBJCOPY) -O binary -j .zinfo $< $@
-
-# Build raw binary file from intermediate object file
-#
-$(BIN)/%.bin : $(BIN)/%.tmp
-	$(QM)$(ECHO) "  [BIN] $@"
-	$(Q)$(OBJCOPY) -O binary -R .zinfo $< $@
-
-# Compress raw binary file
-#
-$(BIN)/%.zbin : $(BIN)/%.bin $(BIN)/%.zinfo $(ZBIN)
-	$(QM)$(ECHO) "  [ZBIN] $@"
-	$(Q)$(ZBIN) $(BIN)/$*.bin $(BIN)/$*.zinfo > $@
-
-# Rules for each media format.  These are generated and placed in an
-# external Makefile fragment.  We could do this via $(eval ...), but
-# that would require make >= 3.80.
-# 
-# Note that there's an alternative way to generate most .rom images:
-# they can be copied from their 'master' ROM image using cp and
-# reprocessed with makerom to add the PCI IDs and ident string.  The
-# relevant rule would look something like:
-#
-#   $(BIN)/dfe538%rom : $(BIN)/rtl8139%rom
-#	cat $< $@
-#	$(FINALISE_rom)
-# 
-# You can derive the ROM/driver relationships using the variables
-# DRIVER_<rom> and/or ROMS_<driver>.
-# 
-# We don't currently do this, because (a) it would require generating
-# yet more Makefile fragments (since you need a rule for each ROM in
-# ROMS), and (b) the linker is so fast that it probably wouldn't make
-# much difference to the overall build time.
-
-# Add NON_AUTO_MEDIA to the media list, so that they show up in the
-# output of "make"
-#
-MEDIA		+= $(NON_AUTO_MEDIA)
-
-media :
-	@$(ECHO) $(MEDIA)
-
-AUTO_MEDIA	= $(filter-out $(NON_AUTO_MEDIA),$(MEDIA))
-automedia :
-	@$(ECHO) $(AUTO_MEDIA)
-
-# media_template : create Makefile rules for specified media
-#
-# $(1) is the media name (e.g. "rom")
-#
-define media_template
-	@$(ECHO) "  [MEDIARULES] $(1)"
-	@$(MKDIR) -p $(BIN)/rules/$(dir $(1))
-	@$(ECHO_E) '$$(BIN)/%.$(1) : $$(BIN)/%.$(1).zbin' \
-		  '\n\t$$(QM)$(ECHO) "  [FINISH] $$@"' \
-		  '\n\t$$(Q)$$(CP) $$< $$@' \
-		  '\n\t$$(Q)$$(PAD_$(1))' \
-		  '\n\t$$(Q)$$(FINALISE_$(1))' \
-		> $(BIN)/rules/$(1).media.r
-endef
-
-# Rule to generate the Makefile rules to be included
-#
-$(BIN)/rules/%.media.r : $(MAKEDEPS)
-	$(call media_template,$*)
-
-# Calculate and include the list of Makefile rules files
-#
-MEDIA_RULES		= $(patsubst %,$(BIN)/rules/%.media.r,$(AUTO_MEDIA))
-mediarules :
-	@$(ECHO) $(MEDIA_RULES)
-ifdef NEED_DEPS
-ifneq ($(MEDIA_RULES),)
--include $(MEDIA_RULES)
-endif
-endif
-
-# Wrap up binary blobs (for embedded images)
-#
-$(BIN)/%.o : payload/%.img
-	$(QM)echo "  [WRAP] $@"
-	$(Q)$(LD) -b binary -r -o $@ $< --undefined obj_payload \
-		--defsym obj_$*=0
-
-BOBJS += $(patsubst payload/%.img,$(BIN)/%.o,$(wildcard payload/*.img))
-
-# The "allXXXs" targets for each suffix
-#
-allall: allroms allmroms allpxes allisos alldsks
-allroms allmroms : all%s : $(foreach ROM,$(ROMS),$(BIN)/$(ROM).%)
-allpxes allisos alldsks : all%s : $(foreach DRIVER,$(DRIVERS),$(BIN)/$(DRIVER).%)
-
-# Alias for ipxe.%
-#
-$(BIN)/etherboot.% : $(BIN)/ipxe.%
-	ln -sf $(notdir $<) $@
-
-endif # defined(BIN)
-
-###############################################################################
-#
-# The compression utilities
-#
-$(NRV2B) : util/nrv2b.c $(MAKEDEPS)
-	$(QM)$(ECHO) "  [HOSTCC] $@"
-	$(Q)$(HOST_CC) -O2 -DENCODE -DDECODE -DMAIN -DVERBOSE -DNDEBUG \
-		       -DBITSIZE=32 -DENDIAN=0 -o $@ $<
-CLEANUP	+= $(NRV2B)
-
-$(ZBIN) : util/zbin.c util/nrv2b.c $(MAKEDEPS)
-	$(QM)$(ECHO) "  [HOSTCC] $@"
-	$(Q)$(HOST_CC) -O2 -o $@ $<
-CLEANUP += $(ZBIN)
-
-###############################################################################
-#
-# The EFI image converter
-#
-ELF2EFI_CFLAGS	:= -I$(BINUTILS_DIR)/include -I$(BFD_DIR)/include \
-		   -I$(ZLIB_DIR)/include -idirafter include \
-		   -L$(BINUTILS_DIR)/lib -L$(BFD_DIR)/lib -L$(ZLIB_DIR)/lib \
-		   -lbfd -ldl -liberty -lz -Wl,--no-warn-search-mismatch
-
-$(ELF2EFI32) : util/elf2efi.c $(MAKEDEPS)
-	$(QM)$(ECHO) "  [HOSTCC] $@"
-	$(Q)$(HOST_CC) $< $(ELF2EFI_CFLAGS) -DEFI_TARGET_IA32 -O2 -o $@
-CLEANUP += $(ELF2EFI32)
-
-$(ELF2EFI64) : util/elf2efi.c $(MAKEDEPS)
-	$(QM)$(ECHO) "  [HOSTCC] $@"
-	$(Q)$(HOST_CC) $< $(ELF2EFI_CFLAGS) -DEFI_TARGET_X64 -O2 -o $@
-CLEANUP += $(ELF2EFI64)
-
-$(EFIROM) : util/efirom.c $(MAKEDEPS)
-	$(QM)$(ECHO) "  [HOSTCC] $@"
-	$(Q)$(HOST_CC) -idirafter include -O2 -o $@ $<
-CLEANUP += $(EFIROM)
-
-###############################################################################
-#
-# The ICC fixup utility
-#
-$(ICCFIX) : util/iccfix.c $(MAKEDEPS)
-	$(QM)$(ECHO) "  [HOSTCC] $@"
-	$(Q)$(HOST_CC) -idirafter include -O2 -o $@ $<
-CLEANUP += $(ICCFIX)
-
-###############################################################################
-#
-# The error usage information utility
-#
-$(EINFO) : util/einfo.c $(MAKEDEPS)
-	$(QM)$(ECHO) "  [HOSTCC] $@"
-	$(Q)$(HOST_CC) -idirafter include -O2 -o $@ $<
-CLEANUP += $(EINFO)
-
-###############################################################################
-#
-# Local configs
-#
-config/local/%.h :
-	$(Q)touch $@
-
-###############################################################################
-#
-# Auto-incrementing build serial number.  Append "bs" to your list of
-# build targets to get a serial number printed at the end of the
-# build.  Enable -DBUILD_SERIAL in order to see it when the code runs.
-#
-BUILDSERIAL_H		= config/.buildserial.h
-BUILDSERIAL_NOW		= config/.buildserial.now
-BUILDSERIAL_NEXT	= config/.buildserial.next
-
-$(BUILDSERIAL_NOW) $(BUILDSERIAL_NEXT) :
-	$(ECHO) 1 > $@
-
-$(BUILDSERIAL_H) : $(BUILDSERIAL_NOW) $(BUILDSERIAL_NEXT)
-	$(ECHO) '#define BUILD_SERIAL_NUM $(shell cat $<)' > $@
-
-ifeq ($(filter bs,$(MAKECMDGOALS)),bs)
-$(shell diff -q $(BUILDSERIAL_NOW) $(BUILDSERIAL_NEXT) > /dev/null || \
-	cp -f $(BUILDSERIAL_NEXT) $(BUILDSERIAL_NOW))
-endif
-
-bs : $(BUILDSERIAL_NOW)
-	@$(ECHO) $$(( $(shell cat $<) + 1 )) > $(BUILDSERIAL_NEXT)
-	@$(ECHO) "Build serial number is $(shell cat $<)"
-
-###############################################################################
-#
-# Build the TAGS file(s) for emacs
-#
-TAGS :
-	ctags -e -R -f $@ --exclude=bin
-
-CLEANUP	+= TAGS
-
-###############################################################################
-#
-# Force rebuild for any given target
-#
-%.rebuild :
-	rm -f $*
-	$(Q)$(MAKE) $*
-
-###############################################################################
-#
-# Symbol table checks
-#
-
-ifdef BIN
-
-SYMTAB	= $(BIN)/symtab
-$(SYMTAB) : $(BLIB)
-	$(OBJDUMP) -w -t $< > $@
-
-CLEANUP	+= $(BIN)/symtab
-
-symcheck : $(SYMTAB)
-	$(PERL) $(SYMCHECK) $<
-
-endif # defined(BIN)
-
-###############################################################################
-#
-# Build bochs symbol table
-#
-
-ifdef BIN
-
-$(BIN)/%.bxs : $(BIN)/%.tmp
-	$(NM) $< | cut -d" " -f1,3 > $@
-
-endif # defined(BIN)
-
-###############################################################################
-#
-# Documentation
-#
-
-ifdef BIN
-
-$(BIN)/doxygen.cfg : doxygen.cfg $(MAKEDEPS)
-	$(Q)$(PERL) -pe 's{\@SRCDIRS\@}{$(SRCDIRS)}; ' \
-		-e  's{\@INCDIRS\@}{$(filter-out .,$(INCDIRS))}; ' \
-		-e  's{\@BIN\@}{$(BIN)}; ' \
-		-e  's{\@ARCH\@}{$(ARCH)}; ' \
-		$< > $@
-
-$(BIN)/doc : $(BIN)/doxygen.cfg
-	$(Q)$(DOXYGEN) $<
-
-.PHONY : $(BIN)/doc
-
-doc : $(BIN)/doc
-
-doc-clean :
-	$(Q)$(RM) -r $(BIN)/doc
-
-VERYCLEANUP	+= $(BIN)/doc
-
-docview :
-	@[ -f $(BIN)/doc/html/index.html ] || $(MAKE) $(BIN)/doc
-	@if [ -n "$$BROWSER" ] ; then \
-		( $$BROWSER $(BIN)/doc/html/index.html & ) ; \
-	else \
-		$(ECHO) "Documentation index in $(BIN)/doc/html/index.html" ; \
-	fi
-
-endif # defined(BIN)
-
-###############################################################################
-#
-# Keyboard maps
-#
-
-hci/keymap/keymap_%.c :
-	$(Q)$(PERL) $(GENKEYMAP) $* > $@
-
-###############################################################################
-#
-# Force deletion of incomplete targets
-#
-
-.DELETE_ON_ERROR :
-
-###############################################################################
-#
-# Clean-up
-#
-clean :
-	$(RM) $(CLEANUP)
-
-veryclean : clean
-	$(RM) -r $(VERYCLEANUP)

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-16 10:43:54 +0000
+++ debian/changelog	2012-02-10 16:40:50 +0000
@@ -1,3 +1,20 @@
+ipxe (1.0.0+git-3.55f6c88-0ubuntu1) precise; urgency=low
+
+  * New upstream snapshot.
+  * Added rules for automatic git branch refresh.
+  * Changed rom target from allbaseroms to allroms.
+    - recommended behaviour by upstream, building all full roms is neither
+      recommended nor a desired user experience
+  * Added new target allqemu for qemu package.
+    - created new build target to build full rom drivers just for qemu
+      package purposes
+  * Cleaned lintian errors from debian package
+    - Removed brace extension in ipxe.install
+    - Updated standards to 3.9.2
+    - Fixed copyright file not machine readable
+
+ -- Marc Cluet <[e-mail]>  Fri, 10 Feb 2012 16:21:23 +0000
+
 ipxe (1.0.0+git-2.149b50-1ubuntu4) precise; urgency=low
 
   * Add missing Breaks/Replaces for kvm-ipxe split in

=== modified file 'debian/control'
--- debian/control	2011-12-16 10:43:54 +0000
+++ debian/control	2012-02-10 16:40:50 +0000
@@ -5,7 +5,7 @@
 XSBC-Original-Maintainer: Bastian Blank <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50~),
  genisoimage, syslinux
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://ipxe.org/
 #Vcs-Git: git://git.debian.org/collab-maint/ipxe.git
 #Vcs-Browser: http://git.debian.org/?p=collab-maint/ipxe.git;a=summary

=== modified file 'debian/copyright'
--- debian/copyright	2011-04-11 19:35:36 +0000
+++ debian/copyright	2012-02-10 16:40:50 +0000
@@ -65,7 +65,7 @@
  Permission to use, copy, modify, and distribute this software for any
  purpose with or without fee is hereby granted, provided that the above
  copyright notice and this permission notice appear in all copies.
- 
+ .
  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

=== modified file 'debian/ipxe.install'
--- debian/ipxe.install	2011-04-11 19:35:36 +0000
+++ debian/ipxe.install	2012-02-10 16:40:50 +0000
@@ -1,3 +1,5 @@
 src/bin/*.rom usr/lib/ipxe
-src/bin/ipxe.{iso,lkrn,pxe} usr/lib/ipxe
+src/bin/ipxe.iso usr/lib/ipxe
+src/bin/ipxe.lkrn usr/lib/ipxe
+src/bin/ipxe.pxe usr/lib/ipxe
 src/bin/undionly.kpxe usr/lib/ipxe

=== added file 'debian/patches/disable-baddrivers.diff'
--- debian/patches/disable-baddrivers.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/disable-baddrivers.diff	2012-02-10 16:40:50 +0000
@@ -0,0 +1,34 @@
+--- a/src/Makefile	2012-01-06 15:49:04.000000000 -0800
++++ b/src/Makefile	2012-01-10 14:10:28.120834619 -0800
+@@ -92,6 +92,31 @@
+ #
+ NON_AUTO_SRCS	:=
+ NON_AUTO_SRCS	+= drivers/net/prism2.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_ani.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_ar5008_phy.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_ar9002_calib.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_ar9002_hw.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_ar9002_mac.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_ar9002_phy.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_ar9003_calib.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_ar9003_eeprom.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_ar9003_hw.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_ar9003_mac.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_ar9003_phy.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_calib.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_common.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_eeprom_4k.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_eeprom_9287.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_eeprom.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_eeprom_def.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_hw.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_init.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_mac.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_main.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_recv.c
++NON_AUTO_SRCS	+= drivers/net/ath/ath9k/ath9k_xmit.c
++
+ 
+ # INCDIRS lists the include path
+ #

=== added file 'debian/patches/qemu-target.diff'
--- debian/patches/qemu-target.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/qemu-target.diff	2012-02-10 16:40:50 +0000
@@ -0,0 +1,13 @@
+--- a/src/Makefile.housekeeping
++++ b/src/Makefile.housekeeping
+@@ -950,5 +950,10 @@
+ allpxes allisos alldsks : all%s : $(foreach DRIVER,$(DRIVERS),$(BIN)/$(DRIVER).%)
+ 
++# Create qemu target for qemu package
++#
++QEMUS = e1000_82540 ne2k_isa pcnet32 rtl8139 virtio-net
++allqemu : $(foreach ROM,$(QEMUS),$(BIN)/$(ROM).rom)
++
+ # Alias for ipxe.%
+ #
+ $(BIN)/etherboot.% : $(BIN)/ipxe.%

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-07-31 20:57:02 +0000
+++ debian/patches/series	2012-02-10 16:40:50 +0000
@@ -1,1 +1,3 @@
 baseroms-target.diff
+disable-baddrivers.diff
+qemu-target.diff

=== modified file 'debian/rules'
--- debian/rules	2011-11-25 12:58:48 +0000
+++ debian/rules	2012-02-10 16:40:50 +0000
@@ -8,7 +8,7 @@
 	dh $@ 
 
 override_dh_auto_build:
-	make -C src V=1 NO_WERROR=1 all allbaseroms bin/ipxe.pxe bin/ipxe.lkrn
+	make -C src V=1 NO_WERROR=1 all allroms allqemu bin/ipxe.pxe bin/ipxe.lkrn
 
 override_dh_auto_clean:
 	make -C src veryclean
@@ -21,3 +21,32 @@
 	mv src/bin/pcnet32.rom       $(CURDIR)/debian/kvm-ipxe/usr/share/qemu/pxe-pcnet32.rom
 	mv src/bin/rtl8139.rom       $(CURDIR)/debian/kvm-ipxe/usr/share/qemu/pxe-rtl8139.rom
 	mv src/bin/virtio-net.rom    $(CURDIR)/debian/kvm-ipxe/usr/share/qemu/pxe-virtio.rom
+
+# Stuff for get-orig-source.
+upstream_version := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
+isodate := $(shell dpkg-parsechangelog | sed -ne 's/^Version.*git\(.*\)-.*/\1/p')
+unixdate := $(shell date -d $(isodate) +%s)
+# Add 24 hours to the Unix time.
+unixdate := $(shell expr $(unixdate) + 86400 )
+
+get-orig-source:
+	# Cleaning
+	rm -rf ipxe-$(upstream_version)
+	rm -f ../ipxe_$(upstream_version).orig.tar.gz
+
+	# Download the latest GIT version and downgrade it to $(isodate).
+        git clone git://git.ipxe.org/ipxe.git ipxe-$(upstream_version)
+
+#       cd ipxe-$(upstream_version) && git reset --hard $(shell cd ipxe-$(upstream_version) && git rev-list --all -n 1 --before=$(unixdate))
+#unixdate = 1231196400
+#hash of GIT commit = 1d3f869e61dc5139d16596075a9e2c4e9a2f503f
+# Ugly hack with "xargs" that works.
+        cd ipxe-$(upstream_version) && echo `git rev-list --all -n 1 --before=$(unixdate)` | xargs git reset --hard
+
+        # Make a pristine package.
+# --no-name/-n is important because it won't save the timestamp in the
+# 5th to 8th byte of the gzip.
+        cd ipxe-$(upstream_version) && git archive --format=tar --prefix=ipxe-$(upstream_version)/ master | gzip -9 --no-name > ../ipxe_$(upstream_version).orig.tar.gz
+
+        # Clean again, because we use svn-buildpackage afterwards.
+        rm -rf ipxe-$(upstream_version)

=== modified file 'src/Makefile'
--- src/Makefile	2011-04-11 19:35:36 +0000
+++ src/Makefile	2012-02-10 16:40:50 +0000
@@ -68,7 +68,9 @@
 SRCDIRS		+= drivers/net/igbvf
 SRCDIRS		+= drivers/net/phantom
 SRCDIRS		+= drivers/net/rtl818x
-SRCDIRS		+= drivers/net/ath5k
+SRCDIRS		+= drivers/net/ath
+SRCDIRS		+= drivers/net/ath/ath5k
+SRCDIRS		+= drivers/net/ath/ath9k
 SRCDIRS		+= drivers/net/vxge
 SRCDIRS		+= drivers/net/efi
 SRCDIRS		+= drivers/block

=== modified file 'src/Makefile.housekeeping'
--- src/Makefile.housekeeping	2011-07-31 20:57:02 +0000
+++ src/Makefile.housekeeping	2012-02-10 16:40:50 +0000
@@ -946,7 +946,6 @@
 #
 allall: allroms allmroms allpxes allisos alldsks
 allroms allmroms : all%s : $(foreach ROM,$(ROMS),$(BIN)/$(ROM).%)
-allbaseroms allbasemroms : allbase%s : $(foreach ROM,$(DRIVERS),$(BIN)/$(ROM).%)
 allpxes allisos alldsks : all%s : $(foreach DRIVER,$(DRIVERS),$(BIN)/$(DRIVER).%)
 
 # Alias for ipxe.%

=== modified file 'src/arch/i386/Makefile.pcbios'
--- src/arch/i386/Makefile.pcbios	2011-04-11 19:35:36 +0000
+++ src/arch/i386/Makefile.pcbios	2012-02-10 16:40:50 +0000
@@ -19,6 +19,7 @@
 MEDIA		+= pxe
 MEDIA		+= kpxe
 MEDIA		+= kkpxe
+MEDIA		+= kkkpxe
 MEDIA		+= lkrn
 MEDIA		+= dsk
 MEDIA		+= nbi

=== removed file 'src/arch/i386/core/cmdline.c'
--- src/arch/i386/core/cmdline.c	2011-07-31 20:57:02 +0000
+++ src/arch/i386/core/cmdline.c	1970-01-01 00:00:00 +0000
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2011 Michael Brown <[e-mail]>.
- *
- * 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.
- */
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-/** @file
- *
- * Command line passed to iPXE
- *
- */
-
-#include <stddef.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <ipxe/init.h>
-#include <ipxe/image.h>
-#include <ipxe/script.h>
-#include <realmode.h>
-
-/** Command line physical address
- *
- * This can be set by the prefix.
- */
-uint32_t __bss16 ( cmdline_phys );
-#define cmdline_phys __use_data16 ( cmdline_phys )
-
-/** Internal copy of the command line */
-static char *cmdline_copy;
-
-/** Free command line image */
-static void cmdline_image_free ( struct refcnt *refcnt ) {
-	struct image *image = container_of ( refcnt, struct image, refcnt );
-
-	DBGC ( image, "CMDLINE freeing command line\n" );
-	free ( cmdline_copy );
-}
-
-/** Embedded script representing the command line */
-static struct image cmdline_image = {
-	.refcnt = REF_INIT ( cmdline_image_free ),
-	.name = "<CMDLINE>",
-	.type = &script_image_type,
-};
-
-/**
- * Initialise command line
- *
- */
-static void cmdline_init ( void ) {
-	struct image *image = &cmdline_image;
-	userptr_t cmdline_user;
-	char *cmdline;
-	char *boot_image;
-	char *boot_image_end;
-	size_t len;
-
-	/* Do nothing if no command line was specified */
-	if ( ! cmdline_phys ) {
-		DBGC ( image, "CMDLINE found no command line\n" );
-		return;
-	}
-	cmdline_user = phys_to_user ( cmdline_phys );
-	len = ( strlen_user ( cmdline_user, 0 ) + 1 /* NUL */ );
-
-	/* Allocate and copy command line */
-	cmdline_copy = malloc ( len );
-	if ( ! cmdline_copy ) {
-		DBGC ( image, "CMDLINE could not allocate %zd bytes\n", len );
-		/* No way to indicate failure */
-		return;
-	}
-	cmdline = cmdline_copy;
-	copy_from_user ( cmdline, cmdline_user, 0, len );
-	DBGC ( image, "CMDLINE found \"%s\"\n", cmdline );
-
-	/* Check for unwanted cruft in the command line */
-	while ( isspace ( *cmdline ) )
-		cmdline++;
-	if ( ( boot_image = strstr ( cmdline, "BOOT_IMAGE=" ) ) != NULL ) {
-		boot_image_end = strchr ( boot_image, ' ' );
-		if ( boot_image_end ) {
-			*boot_image_end = '\0';
-			DBGC ( image, "CMDLINE stripping \"%s\"\n",
-			       boot_image );
-			strcpy ( boot_image, ( boot_image_end + 1 ) );
-		} else {
-			DBGC ( image, "CMDLINE stripping \"%s\"\n",
-			       boot_image );
-			*boot_image = '\0';
-		}
-	}
-	DBGC ( image, "CMDLINE using \"%s\"\n", cmdline );
-
-	/* Prepare and register image */
-	cmdline_image.data = virt_to_user ( cmdline );
-	cmdline_image.len = strlen ( cmdline );
-	if ( cmdline_image.len )
-		register_image ( &cmdline_image );
-
-	/* Drop our reference to the image */
-	image_put ( &cmdline_image );
-}
-
-/** Command line initialisation function */
-struct init_fn cmdline_init_fn __init_fn ( INIT_NORMAL ) = {
-	.initialise = cmdline_init,
-};

=== modified file 'src/arch/i386/core/relocate.c'
--- src/arch/i386/core/relocate.c	2011-04-11 19:35:36 +0000
+++ src/arch/i386/core/relocate.c	2012-02-10 16:40:50 +0000
@@ -42,7 +42,7 @@
  */
 __asmcall void relocate ( struct i386_all_regs *ix86 ) {
 	struct memory_map memmap;
-	unsigned long start, end, size, padded_size;
+	unsigned long start, end, size, padded_size, max;
 	unsigned long new_start, new_end;
 	unsigned i;
 
@@ -57,6 +57,13 @@
 	      "...need %lx bytes for %d-byte alignment\n",
 	      start, end, padded_size, max_align );
 
+	/* Determine maximum usable address */
+	max = MAX_ADDR;
+	if ( ix86->regs.ebp && ( ix86->regs.ebp < max ) ) {
+		max = ix86->regs.ebp;
+		DBG ( "Limiting relocation to [0,%lx)\n", max );
+	}
+
 	/* Walk through the memory map and find the highest address
 	 * below 4GB that iPXE will fit into.
 	 */
@@ -67,18 +74,18 @@
 
 		DBG ( "Considering [%llx,%llx)\n", region->start, region->end);
 		
-		/* Truncate block to MAX_ADDR.  This will be less than
-		 * 4GB, which means that we can get away with using
-		 * just 32-bit arithmetic after this stage.
+		/* Truncate block to maximum address.  This will be
+		 * less than 4GB, which means that we can get away
+		 * with using just 32-bit arithmetic after this stage.
 		 */
-		if ( region->start > MAX_ADDR ) {
-			DBG ( "...starts after MAX_ADDR=%lx\n", MAX_ADDR );
+		if ( region->start > max ) {
+			DBG ( "...starts after max=%lx\n", max );
 			continue;
 		}
 		r_start = region->start;
-		if ( region->end > MAX_ADDR ) {
-			DBG ( "...end truncated to MAX_ADDR=%lx\n", MAX_ADDR );
-			r_end = MAX_ADDR;
+		if ( region->end > max ) {
+			DBG ( "...end truncated to max=%lx\n", max );
+			r_end = max;
 		} else {
 			r_end = region->end;
 		}

=== added file 'src/arch/i386/core/runtime.c'
--- src/arch/i386/core/runtime.c	1970-01-01 00:00:00 +0000
+++ src/arch/i386/core/runtime.c	2012-02-10 16:40:50 +0000
@@ -0,0 +1,249 @@
+/*
+ * Copyright (C) 2011 Michael Brown <[e-mail]>.
+ *
+ * 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.
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER );
+
+/** @file
+ *
+ * Command line and initrd passed to iPXE at runtime
+ *
+ */
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <assert.h>
+#include <ipxe/init.h>
+#include <ipxe/image.h>
+#include <ipxe/script.h>
+#include <ipxe/umalloc.h>
+#include <realmode.h>
+
+/** Command line physical address
+ *
+ * This can be set by the prefix.
+ */
+uint32_t __bss16 ( cmdline_phys );
+#define cmdline_phys __use_data16 ( cmdline_phys )
+
+/** initrd physical address
+ *
+ * This can be set by the prefix.
+ */
+uint32_t __bss16 ( initrd_phys );
+#define initrd_phys __use_data16 ( initrd_phys )
+
+/** initrd length
+ *
+ * This can be set by the prefix.
+ */
+uint32_t __bss16 ( initrd_len );
+#define initrd_len __use_data16 ( initrd_len )
+
+/** Internal copy of the command line */
+static char *cmdline_copy;
+
+/** Free command line image */
+static void cmdline_image_free ( struct refcnt *refcnt ) {
+	struct image *image = container_of ( refcnt, struct image, refcnt );
+
+	DBGC ( image, "RUNTIME freeing command line\n" );
+	free ( cmdline_copy );
+}
+
+/** Embedded script representing the command line */
+static struct image cmdline_image = {
+	.refcnt = REF_INIT ( cmdline_image_free ),
+	.name = "<CMDLINE>",
+	.type = &script_image_type,
+};
+
+/** Colour for debug messages */
+#define colour &cmdline_image
+
+/**
+ * Strip unwanted cruft from command line
+ *
+ * @v cmdline		Command line
+ * @v cruft		Initial substring of cruft to strip
+ */
+static void cmdline_strip ( char *cmdline, const char *cruft ) {
+	char *strip;
+	char *strip_end;
+
+	/* Find unwanted cruft, if present */
+	if ( ! ( strip = strstr ( cmdline, cruft ) ) )
+		return;
+
+	/* Strip unwanted cruft */
+	strip_end = strchr ( strip, ' ' );
+	if ( strip_end ) {
+		*strip_end = '\0';
+		DBGC ( colour, "RUNTIME stripping \"%s\"\n", strip );
+		strcpy ( strip, ( strip_end + 1 ) );
+	} else {
+		DBGC ( colour, "RUNTIME stripping \"%s\"\n", strip );
+		*strip = '\0';
+	}
+}
+
+/**
+ * Initialise command line
+ *
+ * @ret rc		Return status code
+ */
+static int cmdline_init ( void ) {
+	userptr_t cmdline_user;
+	char *cmdline;
+	size_t len;
+	int rc;
+
+	/* Do nothing if no command line was specified */
+	if ( ! cmdline_phys ) {
+		DBGC ( colour, "RUNTIME found no command line\n" );
+		return 0;
+	}
+	cmdline_user = phys_to_user ( cmdline_phys );
+	len = ( strlen_user ( cmdline_user, 0 ) + 1 /* NUL */ );
+
+	/* Allocate and copy command line */
+	cmdline_copy = malloc ( len );
+	if ( ! cmdline_copy ) {
+		DBGC ( colour, "RUNTIME could not allocate %zd bytes for "
+		       "command line\n", len );
+		rc = -ENOMEM;
+		goto err_alloc_cmdline_copy;
+	}
+	cmdline = cmdline_copy;
+	copy_from_user ( cmdline, cmdline_user, 0, len );
+	DBGC ( colour, "RUNTIME found command line \"%s\"\n", cmdline );
+
+	/* Strip unwanted cruft from the command line */
+	cmdline_strip ( cmdline, "BOOT_IMAGE=" );
+	cmdline_strip ( cmdline, "initrd=" );
+	while ( isspace ( *cmdline ) )
+		cmdline++;
+	DBGC ( colour, "RUNTIME using command line \"%s\"\n", cmdline );
+
+	/* Prepare and register image */
+	cmdline_image.data = virt_to_user ( cmdline );
+	cmdline_image.len = strlen ( cmdline );
+	if ( cmdline_image.len ) {
+		if ( ( rc = register_image ( &cmdline_image ) ) != 0 ) {
+			DBGC ( colour, "RUNTIME could not register command "
+			       "line: %s\n", strerror ( rc ) );
+			goto err_register_image;
+		}
+	}
+
+	/* Drop our reference to the image */
+	image_put ( &cmdline_image );
+
+	return 0;
+
+ err_register_image:
+	image_put ( &cmdline_image );
+ err_alloc_cmdline_copy:
+	return rc;
+}
+
+/**
+ * Initialise initrd
+ *
+ * @ret rc		Return status code
+ */
+static int initrd_init ( void ) {
+	struct image *image;
+	int rc;
+
+	/* Do nothing if no initrd was specified */
+	if ( ! initrd_phys ) {
+		DBGC ( colour, "RUNTIME found no initrd\n" );
+		return 0;
+	}
+	if ( ! initrd_len ) {
+		DBGC ( colour, "RUNTIME found empty initrd\n" );
+		return 0;
+	}
+	DBGC ( colour, "RUNTIME found initrd at [%x,%x)\n",
+	       initrd_phys, ( initrd_phys + initrd_len ) );
+
+	/* Allocate image */
+	image = alloc_image();
+	if ( ! image ) {
+		DBGC ( colour, "RUNTIME could not allocate image for "
+		       "initrd\n" );
+		goto err_alloc_image;
+	}
+	image_set_name ( image, "<INITRD>" );
+
+	/* Allocate and copy initrd content */
+	image->data = umalloc ( initrd_len );
+	if ( ! image->data ) {
+		DBGC ( colour, "RUNTIME could not allocate %zd bytes for "
+		       "initrd\n", initrd_len );
+		goto err_umalloc;
+	}
+	image->len = initrd_len;
+	memcpy_user ( image->data, 0, phys_to_user ( initrd_phys ), 0,
+		      initrd_len );
+
+	/* Register image */
+	if ( ( rc = register_image ( image ) ) != 0 ) {
+		DBGC ( colour, "RUNTIME could not register initrd: %s\n",
+		       strerror ( rc ) );
+		goto err_register_image;
+	}
+
+	/* Drop our reference to the image */
+	image_put ( image );
+
+	return 0;
+
+ err_register_image:
+ err_umalloc:
+	image_put ( image );
+ err_alloc_image:
+	return rc;
+}
+
+/**
+ * Initialise command line and initrd
+ *
+ */
+static void runtime_init ( void ) {
+	int rc;
+
+	/* Initialise command line */
+	if ( ( rc = cmdline_init() ) != 0 ) {
+		/* No way to report failure */
+		return;
+	}
+
+	/* Initialise initrd */
+	if ( ( rc = initrd_init() ) != 0 ) {
+		/* No way to report failure */
+		return;
+	}
+}
+
+/** Command line and initrd initialisation function */
+struct init_fn runtime_init_fn __init_fn ( INIT_NORMAL ) = {
+	.initialise = runtime_init,
+};

=== modified file 'src/arch/i386/drivers/net/undi.c'
--- src/arch/i386/drivers/net/undi.c	2011-04-11 19:35:36 +0000
+++ src/arch/i386/drivers/net/undi.c	2012-02-10 16:40:50 +0000
@@ -140,7 +140,7 @@
 PCI_ROM ( 0xffff, 0xffff, "undipci", "UNDI (PCI)", 0 ),
 };
 
-struct pci_driver undipci_driver __pci_driver = {
+struct pci_driver undipci_driver __pci_driver_fallback = {
 	.ids = undipci_nics,
 	.id_count = ( sizeof ( undipci_nics ) / sizeof ( undipci_nics[0] ) ),
 	.probe = undipci_probe,

=== modified file 'src/arch/i386/drivers/net/undinet.c'
--- src/arch/i386/drivers/net/undinet.c	2011-07-31 20:57:02 +0000
+++ src/arch/i386/drivers/net/undinet.c	2012-02-10 16:40:50 +0000
@@ -19,6 +19,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <string.h>
+#include <unistd.h>
 #include <pxe.h>
 #include <realmode.h>
 #include <pic8259.h>
@@ -34,7 +35,6 @@
 #include <undinet.h>
 #include <pxeparent.h>
 
-
 /** @file
  *
  * UNDI network device driver
@@ -63,6 +63,12 @@
 
 /** @} */
 
+/** Maximum number of times to retry PXENV_UNDI_INITIALIZE */
+#define UNDI_INITIALIZE_RETRY_MAX 10
+
+/** Delay between retries of PXENV_UNDI_INITIALIZE */
+#define UNDI_INITIALIZE_RETRY_DELAY_MS 200
+
 static void undinet_close ( struct net_device *netdev );
 
 /** Address of UNDI entry point */
@@ -482,12 +488,13 @@
 	struct undi_nic *undinic;
 	struct s_PXENV_START_UNDI start_undi;
 	struct s_PXENV_UNDI_STARTUP undi_startup;
-	struct s_PXENV_UNDI_INITIALIZE undi_initialize;
+	struct s_PXENV_UNDI_INITIALIZE undi_init;
 	struct s_PXENV_UNDI_GET_INFORMATION undi_info;
 	struct s_PXENV_UNDI_GET_IFACE_INFO undi_iface;
 	struct s_PXENV_UNDI_SHUTDOWN undi_shutdown;
 	struct s_PXENV_UNDI_CLEANUP undi_cleanup;
 	struct s_PXENV_STOP_UNDI stop_undi;
+	unsigned int retry;
 	int rc;
 
 	/* Allocate net device */
@@ -524,12 +531,27 @@
 					     &undi_startup,
 					     sizeof ( undi_startup ) ) ) != 0 )
 			goto err_undi_startup;
-		memset ( &undi_initialize, 0, sizeof ( undi_initialize ) );
-		if ( ( rc = pxeparent_call ( undinet_entry,
-					     PXENV_UNDI_INITIALIZE,
-					     &undi_initialize,
-					     sizeof ( undi_initialize ))) != 0 )
-			goto err_undi_initialize;
+		/* On some PXE stacks, PXENV_UNDI_INITIALIZE may fail
+		 * due to a transient condition (e.g. media test
+		 * failing because the link has only just come out of
+		 * reset).  We may therefore need to retry this call
+		 * several times.
+		 */
+		for ( retry = 0 ; ; ) {
+			memset ( &undi_init, 0, sizeof ( undi_init ) );
+			if ( ( rc = pxeparent_call ( undinet_entry,
+						     PXENV_UNDI_INITIALIZE,
+						     &undi_init,
+						     sizeof ( undi_init ))) ==0)
+				break;
+			if ( ++retry > UNDI_INITIALIZE_RETRY_MAX )
+				goto err_undi_initialize;
+			DBGC ( undinic, "UNDINIC %p retrying "
+			       "PXENV_UNDI_INITIALIZE (retry %d)\n",
+			       undinic, retry );
+			/* Delay to allow link to settle if necessary */
+			mdelay ( UNDI_INITIALIZE_RETRY_DELAY_MS );
+		}
 	}
 	undi->flags |= UNDI_FL_INITIALIZED;
 
@@ -539,6 +561,7 @@
 				     &undi_info, sizeof ( undi_info ) ) ) != 0 )
 		goto err_undi_get_information;
 	memcpy ( netdev->hw_addr, undi_info.PermNodeAddress, ETH_ALEN );
+	memcpy ( netdev->ll_addr, undi_info.CurrentNodeAddress, ETH_ALEN );
 	undinic->irq = undi_info.IntNumber;
 	if ( undinic->irq > IRQ_MAX ) {
 		DBGC ( undinic, "UNDINIC %p has invalid IRQ %d\n",

=== modified file 'src/arch/i386/drivers/net/undionly.c'
--- src/arch/i386/drivers/net/undionly.c	2011-04-11 19:35:36 +0000
+++ src/arch/i386/drivers/net/undionly.c	2012-02-10 16:40:50 +0000
@@ -20,9 +20,11 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <ipxe/device.h>
 #include <ipxe/init.h>
+#include <ipxe/pci.h>
 #include <undi.h>
 #include <undinet.h>
 #include <undipreload.h>
@@ -62,15 +64,21 @@
 	}
 
 	/* Add to device hierarchy */
-	strncpy ( undi->dev.name, "UNDI",
-		  ( sizeof ( undi->dev.name ) - 1 ) );
+	undi->dev.driver_name = "undionly";
 	if ( undi->pci_busdevfn != UNDI_NO_PCI_BUSDEVFN ) {
 		undi->dev.desc.bus_type = BUS_TYPE_PCI;
 		undi->dev.desc.location = undi->pci_busdevfn;
 		undi->dev.desc.vendor = undi->pci_vendor;
 		undi->dev.desc.device = undi->pci_device;
+		snprintf ( undi->dev.name, sizeof ( undi->dev.name ),
+			   "UNDI-PCI%02x:%02x.%x",
+			   PCI_BUS ( undi->pci_busdevfn ),
+			   PCI_SLOT ( undi->pci_busdevfn ),
+			   PCI_FUNC ( undi->pci_busdevfn ) );
 	} else if ( undi->isapnp_csn != UNDI_NO_ISAPNP_CSN ) {
 		undi->dev.desc.bus_type = BUS_TYPE_ISAPNP;
+		snprintf ( undi->dev.name, sizeof ( undi->dev.name ),
+			   "UNDI-ISAPNP" );
 	}
 	undi->dev.parent = &rootdev->dev;
 	list_add ( &undi->dev.siblings, &rootdev->dev.children);

=== modified file 'src/arch/i386/include/bits/errfile.h'
--- src/arch/i386/include/bits/errfile.h	2011-04-11 19:35:36 +0000
+++ src/arch/i386/include/bits/errfile.h	2012-02-10 16:40:50 +0000
@@ -15,6 +15,7 @@
 #define ERRFILE_biosint		( ERRFILE_ARCH | ERRFILE_CORE | 0x00040000 )
 #define ERRFILE_int13		( ERRFILE_ARCH | ERRFILE_CORE | 0x00050000 )
 #define ERRFILE_pxeparent	( ERRFILE_ARCH | ERRFILE_CORE | 0x00060000 )
+#define ERRFILE_runtime		( ERRFILE_ARCH | ERRFILE_CORE | 0x00070000 )
 
 #define ERRFILE_bootsector     ( ERRFILE_ARCH | ERRFILE_IMAGE | 0x00000000 )
 #define ERRFILE_bzimage	       ( ERRFILE_ARCH | ERRFILE_IMAGE | 0x00010000 )

=== modified file 'src/arch/i386/include/pxe.h'
--- src/arch/i386/include/pxe.h	2011-04-11 19:35:36 +0000
+++ src/arch/i386/include/pxe.h	2012-02-10 16:40:50 +0000
@@ -6,8 +6,12 @@
 #include "pxe_types.h"
 #include "pxe_api.h"
 #include <ipxe/device.h>
-
-/* Parameter block for pxenv_unknown() */
+#include <ipxe/tables.h>
+
+/** PXE API invalid function code */
+#define PXENV_UNKNOWN 0xffff
+
+/** Parameter block for pxenv_unknown() */
 struct s_PXENV_UNKNOWN {
 	PXENV_STATUS_t Status;			/**< PXE status code */
 } __attribute__ (( packed ));
@@ -72,6 +76,45 @@
 
 typedef union u_PXENV_ANY PXENV_ANY_t;
 
+/** A PXE API call */
+struct pxe_api_call {
+	/** Entry point
+	 *
+	 * @v params		PXE API call parameters
+	 * @ret exit		PXE API call exit code
+	 */
+	PXENV_EXIT_t ( * entry ) ( union u_PXENV_ANY *params );
+	/** Length of parameters */
+	uint16_t params_len;
+	/** Opcode */
+	uint16_t opcode;
+};
+
+/** PXE API call table */
+#define PXE_API_CALLS __table ( struct pxe_api_call, "pxe_api_calls" )
+
+/** Declare a PXE API call */
+#define __pxe_api_call __table_entry ( PXE_API_CALLS, 01 )
+
+/**
+ * Define a PXE API call
+ *
+ * @v _opcode		Opcode
+ * @v _entry		Entry point
+ * @v _params_type	Type of parameter structure
+ * @ret call		PXE API call
+ */
+#define PXE_API_CALL( _opcode, _entry, _params_type ) {			      \
+	.entry = ( ( ( ( PXENV_EXIT_t ( * ) ( _params_type *params ) ) NULL ) \
+		    == ( ( typeof ( _entry ) * ) NULL ) )		      \
+		   ? ( ( PXENV_EXIT_t ( * )				      \
+			 ( union u_PXENV_ANY *params ) ) _entry )	      \
+		   : ( ( PXENV_EXIT_t ( * )				      \
+			 ( union u_PXENV_ANY *params ) ) _entry ) ),	      \
+	.params_len = sizeof ( _params_type ),				      \
+	.opcode = _opcode,						      \
+	}
+
 /** An UNDI expansion ROM header */
 struct undi_rom_header {
 	/** Signature
@@ -144,9 +187,11 @@
 #define PCIR_SIGNATURE \
 	( ( 'P' << 0 ) + ( 'C' << 8 ) + ( 'I' << 16 ) + ( 'R' << 24 ) )
 
-
 extern struct net_device *pxe_netdev;
 
 extern void pxe_set_netdev ( struct net_device *netdev );
+extern PXENV_EXIT_t pxenv_tftp_read_file ( struct s_PXENV_TFTP_READ_FILE
+					   *tftp_read_file );
+extern PXENV_EXIT_t undi_loader ( struct s_UNDI_LOADER *undi_loader );
 
 #endif /* PXE_H */

=== modified file 'src/arch/i386/include/pxe_api.h'
--- src/arch/i386/include/pxe_api.h	2011-04-11 19:35:36 +0000
+++ src/arch/i386/include/pxe_api.h	2012-02-10 16:40:50 +0000
@@ -252,9 +252,6 @@
 
 typedef struct s_PXENV_UNLOAD_STACK PXENV_UNLOAD_STACK_t;
 
-extern PXENV_EXIT_t pxenv_unload_stack ( struct s_PXENV_UNLOAD_STACK
-					 *unload_stack );
-
 /** @} */ /* pxenv_unload_stack */
 
 /** @defgroup pxenv_get_cached_info PXENV_GET_CACHED_INFO
@@ -403,9 +400,6 @@
 
 typedef struct bootph BOOTPLAYER_t;
 
-extern PXENV_EXIT_t pxenv_get_cached_info ( struct s_PXENV_GET_CACHED_INFO
-					    *get_cached_info );
-
 /** @} */ /* pxenv_get_cached_info */
 
 /** @defgroup pxenv_restart_tftp PXENV_RESTART_TFTP
@@ -423,9 +417,6 @@
 
 typedef struct s_PXENV_RESTART_TFTP PXENV_RESTART_TFTP_t;
 
-extern PXENV_EXIT_t pxenv_restart_tftp ( struct s_PXENV_TFTP_READ_FILE
-					 *restart_tftp );
-
 /** @} */ /* pxenv_restart_tftp */
 
 /** @defgroup pxenv_start_undi PXENV_START_UNDI
@@ -496,8 +487,6 @@
 
 typedef struct s_PXENV_START_UNDI PXENV_START_UNDI_t;
 
-extern PXENV_EXIT_t pxenv_start_undi ( struct s_PXENV_START_UNDI *start_undi );
-
 /** @} */ /* pxenv_start_undi */
 
 /** @defgroup pxenv_stop_undi PXENV_STOP_UNDI
@@ -517,8 +506,6 @@
 
 typedef struct s_PXENV_STOP_UNDI PXENV_STOP_UNDI_t;
 
-extern PXENV_EXIT_t pxenv_stop_undi ( struct s_PXENV_STOP_UNDI *stop_undi );
-
 /** @} */ /* pxenv_stop_undi */
 
 /** @defgroup pxenv_start_base PXENV_START_BASE
@@ -538,8 +525,6 @@
 
 typedef struct s_PXENV_START_BASE PXENV_START_BASE_t;
 
-extern PXENV_EXIT_t pxenv_start_base ( struct s_PXENV_START_BASE *start_base );
-
 /** @} */ /* pxenv_start_base */
 
 /** @defgroup pxenv_stop_base PXENV_STOP_BASE
@@ -559,8 +544,6 @@
 
 typedef struct s_PXENV_STOP_BASE PXENV_STOP_BASE_t;
 
-extern PXENV_EXIT_t pxenv_stop_base ( struct s_PXENV_STOP_BASE *stop_base );
-
 /** @} */ /* pxenv_stop_base */
 
 /** @} */ /* pxe_preboot_api */
@@ -600,8 +583,6 @@
 
 typedef struct s_PXENV_TFTP_OPEN PXENV_TFTP_OPEN_t;
 
-extern PXENV_EXIT_t pxenv_tftp_open ( struct s_PXENV_TFTP_OPEN *tftp_open );
-
 /** @} */ /* pxenv_tftp_open */
 
 /** @defgroup pxenv_tftp_close PXENV_TFTP_CLOSE
@@ -621,8 +602,6 @@
 
 typedef struct s_PXENV_TFTP_CLOSE PXENV_TFTP_CLOSE_t;
 
-extern PXENV_EXIT_t pxenv_tftp_close ( struct s_PXENV_TFTP_CLOSE *tftp_close );
-
 /** @} */ /* pxenv_tftp_close */
 
 /** @defgroup pxenv_tftp_read PXENV_TFTP_READ
@@ -645,8 +624,6 @@
 
 typedef struct s_PXENV_TFTP_READ PXENV_TFTP_READ_t;
 
-extern PXENV_EXIT_t pxenv_tftp_read ( struct s_PXENV_TFTP_READ *tftp_read );
-
 /** @} */ /* pxenv_tftp_read */
 
 /** @defgroup pxenv_tftp_read_file PXENV_TFTP_READ_FILE
@@ -690,9 +667,6 @@
 
 typedef struct s_PXENV_TFTP_READ_FILE PXENV_TFTP_READ_FILE_t;
 
-extern PXENV_EXIT_t pxenv_tftp_read_file ( struct s_PXENV_TFTP_READ_FILE
-					   *tftp_read_file );
-
 /** @} */ /* pxenv_tftp_read_file */
 
 /** @defgroup pxenv_tftp_get_fsize PXENV_TFTP_GET_FSIZE
@@ -716,9 +690,6 @@
 
 typedef struct s_PXENV_TFTP_GET_FSIZE PXENV_TFTP_GET_FSIZE_t;
 
-extern PXENV_EXIT_t pxenv_tftp_get_fsize ( struct s_PXENV_TFTP_GET_FSIZE
-					   *get_fsize );
-
 /** @} */ /* pxenv_tftp_get_fsize */
 
 /** @} */ /* pxe_tftp_api */
@@ -748,8 +719,6 @@
 
 typedef struct s_PXENV_UDP_OPEN PXENV_UDP_OPEN_t;
 
-extern PXENV_EXIT_t pxenv_udp_open ( struct s_PXENV_UDP_OPEN *udp_open );
-
 /** @} */ /* pxenv_udp_open */
 
 /** @defgroup pxenv_udp_close PXENV_UDP_CLOSE
@@ -769,8 +738,6 @@
 
 typedef struct s_PXENV_UDP_CLOSE PXENV_UDP_CLOSE_t;
 
-extern PXENV_EXIT_t pxenv_udp_close ( struct s_PXENV_UDP_CLOSE *udp_close );
-
 /** @} */ /* pxenv_udp_close */
 
 /** @defgroup pxenv_udp_write PXENV_UDP_WRITE
@@ -796,8 +763,6 @@
 
 typedef struct s_PXENV_UDP_WRITE PXENV_UDP_WRITE_t;
 
-extern PXENV_EXIT_t pxenv_udp_write ( struct s_PXENV_UDP_WRITE *udp_write );
-
 /** @} */ /* pxenv_udp_write */
 
 /** @defgroup pxenv_udp_read PXENV_UDP_READ
@@ -823,8 +788,6 @@
 
 typedef struct s_PXENV_UDP_READ PXENV_UDP_READ_t;
 
-extern PXENV_EXIT_t pxenv_udp_read ( struct s_PXENV_UDP_READ *udp_read );
-
 /** @} */ /* pxenv_udp_read */
 
 /** @} */ /* pxe_udp_api */
@@ -860,9 +823,6 @@
 
 typedef struct s_PXENV_UNDI_STARTUP PXENV_UNDI_STARTUP_t;
 
-extern PXENV_EXIT_t pxenv_undi_startup ( struct s_PXENV_UNDI_STARTUP
-					 *undi_startup );
-
 /** @} */ /* pxenv_undi_startup */
 
 /** @defgroup pxenv_undi_cleanup PXENV_UNDI_CLEANUP
@@ -882,9 +842,6 @@
 
 typedef struct s_PXENV_UNDI_CLEANUP PXENV_UNDI_CLEANUP_t;
 
-extern PXENV_EXIT_t pxenv_undi_cleanup ( struct s_PXENV_UNDI_CLEANUP
-					 *undi_cleanup );
-
 /** @} */ /* pxenv_undi_cleanup */
 
 /** @defgroup pxenv_undi_initialize PXENV_UNDI_INITIALIZE
@@ -913,9 +870,6 @@
 
 typedef struct s_PXENV_UNDI_INITIALIZE PXENV_UNDI_INITIALIZE_t;
 
-extern PXENV_EXIT_t pxenv_undi_initialize ( struct s_PXENV_UNDI_INITIALIZE
-					    *undi_initialize );
-
 /** @} */ /* pxenv_undi_initialize */
 
 /** @defgroup pxenv_undi_reset_adapter PXENV_UNDI_RESET_ADAPTER
@@ -950,9 +904,6 @@
 
 typedef struct s_PXENV_UNDI_RESET PXENV_UNDI_RESET_t;
 
-extern PXENV_EXIT_t pxenv_undi_reset_adapter ( struct s_PXENV_UNDI_RESET
-					       *undi_reset_adapter );
-
 /** @} */ /* pxenv_undi_reset_adapter */
 
 /** @defgroup pxenv_undi_shutdown PXENV_UNDI_SHUTDOWN
@@ -972,9 +923,6 @@
 
 typedef struct s_PXENV_UNDI_SHUTDOWN PXENV_UNDI_SHUTDOWN_t;
 
-extern PXENV_EXIT_t pxenv_undi_shutdown ( struct s_PXENV_UNDI_SHUTDOWN
-					  *undi_shutdown );
-
 /** @} */ /* pxenv_undi_shutdown */
 
 /** @defgroup pxenv_undi_open PXENV_UNDI_OPEN
@@ -1024,8 +972,6 @@
 
 typedef struct s_PXENV_UNDI_OPEN PXENV_UNDI_OPEN_t;
 
-extern PXENV_EXIT_t pxenv_undi_open ( struct s_PXENV_UNDI_OPEN *undi_open );
-
 /** @} */ /* pxenv_undi_open */
 
 /** @defgroup pxenv_undi_close PXENV_UNDI_CLOSE
@@ -1045,8 +991,6 @@
 
 typedef struct s_PXENV_UNDI_CLOSE PXENV_UNDI_CLOSE_t;
 
-extern PXENV_EXIT_t pxenv_undi_close ( struct s_PXENV_UNDI_CLOSE *undi_close );
-
 /** @} */ /* pxenv_undi_close */
 
 /** @defgroup pxenv_undi_transmit PXENV_UNDI_TRANSMIT
@@ -1122,9 +1066,6 @@
 
 typedef struct s_PXENV_UNDI_TRANSMIT PXENV_UNDI_TRANSMIT_t;
 
-extern PXENV_EXIT_t pxenv_undi_transmit ( struct s_PXENV_UNDI_TRANSMIT
-					  *undi_transmit );
-
 /** @} */ /* pxenv_undi_transmit */
 
 /** @defgroup pxenv_undi_set_mcast_address PXENV_UNDI_SET_MCAST_ADDRESS
@@ -1146,9 +1087,6 @@
 
 typedef struct s_PXENV_UNDI_SET_MCAST_ADDRESS PXENV_UNDI_SET_MCAST_ADDRESS_t;
 
-extern PXENV_EXIT_t pxenv_undi_set_mcast_address (
-	       struct s_PXENV_UNDI_SET_MCAST_ADDRESS *undi_set_mcast_address );
-
 /** @} */ /* pxenv_undi_set_mcast_address */
 
 /** @defgroup pxenv_undi_set_station_address PXENV_UNDI_SET_STATION_ADDRESS
@@ -1169,9 +1107,6 @@
 
 typedef struct s_PXENV_UNDI_SET_STATION_ADDRESS PXENV_UNDI_SET_STATION_ADDRESS_t;
 
-extern PXENV_EXIT_t pxenv_undi_set_station_address (
-	   struct s_PXENV_UNDI_SET_STATION_ADDRESS *undi_set_station_address );
-
 /** @} */ /* pxenv_undi_set_station_address */
 
 /** @defgroup pxenv_undi_set_packet_filter PXENV_UNDI_SET_PACKET_FILTER
@@ -1202,9 +1137,6 @@
 
 typedef struct s_PXENV_UNDI_SET_PACKET_FILTER PXENV_UNDI_SET_PACKET_FILTER_t;
 
-extern PXENV_EXIT_t pxenv_undi_set_packet_filter (
-	       struct s_PXENV_UNDI_SET_PACKET_FILTER *undi_set_packet_filter );
-
 /** @} */ /* pxenv_undi_set_packet_filter */
 
 /** @defgroup pxenv_undi_get_information PXENV_UNDI_GET_INFORMATION
@@ -1248,9 +1180,6 @@
 
 typedef struct s_PXENV_UNDI_GET_INFORMATION PXENV_UNDI_GET_INFORMATION_t;
 
-extern PXENV_EXIT_t pxenv_undi_get_information (
-		   struct s_PXENV_UNDI_GET_INFORMATION *undi_get_information );
-
 /** @} */ /* pxenv_undi_get_information */
 
 /** @defgroup pxenv_undi_get_statistics PXENV_UNDI_GET_STATISTICS
@@ -1274,9 +1203,6 @@
 
 typedef struct s_PXENV_UNDI_GET_STATISTICS PXENV_UNDI_GET_STATISTICS_t;
 
-extern PXENV_EXIT_t pxenv_undi_get_statistics (
-		     struct s_PXENV_UNDI_GET_STATISTICS *undi_get_statistics );
-
 /** @} */ /* pxenv_undi_get_statistics */
 
 /** @defgroup pxenv_undi_clear_statistics PXENV_UNDI_CLEAR_STATISTICS
@@ -1296,9 +1222,6 @@
 
 typedef struct s_PXENV_UNDI_CLEAR_STATISTICS PXENV_UNDI_CLEAR_STATISTICS_t;
 
-extern PXENV_EXIT_t pxenv_undi_clear_statistics (
-		 struct s_PXENV_UNDI_CLEAR_STATISTICS *undi_clear_statistics );
-
 /** @} */ /* pxenv_undi_clear_statistics */
 
 /** @defgroup pxenv_undi_initiate_diags PXENV_UNDI_INITIATE_DIAGS
@@ -1318,9 +1241,6 @@
 
 typedef struct s_PXENV_UNDI_INITIATE_DIAGS PXENV_UNDI_INITIATE_DIAGS_t;
 
-extern PXENV_EXIT_t pxenv_undi_initiate_diags (
-		     struct s_PXENV_UNDI_INITIATE_DIAGS *undi_initiate_diags );
-
 /** @} */ /* pxenv_undi_initiate_diags */
 
 /** @defgroup pxenv_undi_force_interrupt PXENV_UNDI_FORCE_INTERRUPT
@@ -1340,9 +1260,6 @@
 
 typedef struct s_PXENV_UNDI_FORCE_INTERRUPT PXENV_UNDI_FORCE_INTERRUPT_t;
 
-extern PXENV_EXIT_t pxenv_undi_force_interrupt (
-		   struct s_PXENV_UNDI_FORCE_INTERRUPT *undi_force_interrupt );
-
 /** @} */ /* pxenv_undi_force_interrupt */
 
 /** @defgroup pxenv_undi_get_mcast_address PXENV_UNDI_GET_MCAST_ADDRESS
@@ -1364,9 +1281,6 @@
 
 typedef struct s_PXENV_UNDI_GET_MCAST_ADDRESS PXENV_UNDI_GET_MCAST_ADDRESS_t;
 
-extern PXENV_EXIT_t pxenv_undi_get_mcast_address (
-	       struct s_PXENV_UNDI_GET_MCAST_ADDRESS *undi_get_mcast_address );
-
 /** @} */ /* pxenv_undi_get_mcast_address */
 
 /** @defgroup pxenv_undi_get_nic_type PXENV_UNDI_GET_NIC_TYPE
@@ -1427,9 +1341,6 @@
 
 typedef struct s_PXENV_UNDI_GET_NIC_TYPE PXENV_UNDI_GET_NIC_TYPE_t;
 
-extern PXENV_EXIT_t pxenv_undi_get_nic_type ( 
-			 struct s_PXENV_UNDI_GET_NIC_TYPE *undi_get_nic_type );
-
 /** @} */ /* pxenv_undi_get_nic_type */
 
 /** @defgroup pxenv_undi_get_iface_info PXENV_UNDI_GET_IFACE_INFO
@@ -1488,9 +1399,6 @@
 
 typedef struct s_PXENV_UNDI_GET_IFACE_INFO PXENV_UNDI_GET_IFACE_INFO_t;
 
-extern PXENV_EXIT_t pxenv_undi_get_iface_info (
-		     struct s_PXENV_UNDI_GET_IFACE_INFO *undi_get_iface_info );
-
 /** @} */ /* pxenv_undi_get_iface_info */
 
 /** @defgroup pxenv_undi_get_state PXENV_UNDI_GET_STATE
@@ -1524,9 +1432,6 @@
 
 typedef struct s_PXENV_UNDI_GET_STATE PXENV_UNDI_GET_STATE_t;
 
-extern PXENV_EXIT_t pxenv_undi_get_state ( struct s_PXENV_UNDI_GET_STATE
-					   *undi_get_state );
-
 /** @} */ /* pxenv_undi_get_state */
 
 /** @defgroup pxenv_undi_isr PXENV_UNDI_ISR
@@ -1595,8 +1500,6 @@
 
 typedef struct s_PXENV_UNDI_ISR PXENV_UNDI_ISR_t;
 
-extern PXENV_EXIT_t pxenv_undi_isr ( struct s_PXENV_UNDI_ISR *undi_isr );
-
 /** @} */ /* pxenv_undi_isr */
 
 /** @} */ /* pxe_undi_api */
@@ -1608,6 +1511,12 @@
  * @{
  */
 
+/** Minimum possible opcode used within PXE FILE API */
+#define PXENV_FILE_MIN 0x00e0
+
+/** Minimum possible opcode used within PXE FILE API */
+#define PXENV_FILE_MAX 0x00ef
+
 /** @defgroup pxenv_file_open PXENV_FILE_OPEN
  *
  * FILE OPEN
@@ -1628,8 +1537,6 @@
 
 typedef struct s_PXENV_FILE_OPEN PXENV_FILE_OPEN_t;
 
-extern PXENV_EXIT_t pxenv_file_open ( struct s_PXENV_FILE_OPEN *file_open );
-
 /** @} */ /* pxenv_file_open */
 
 /** @defgroup pxenv_file_close PXENV_FILE_CLOSE
@@ -1650,9 +1557,6 @@
 
 typedef struct s_PXENV_FILE_CLOSE PXENV_FILE_CLOSE_t;
 
-extern PXENV_EXIT_t pxenv_file_close ( struct s_PXENV_FILE_CLOSE
-				       *file_close );
-
 /** @} */ /* pxenv_file_close */
 
 /** @defgroup pxenv_file_select PXENV_FILE_SELECT
@@ -1677,9 +1581,6 @@
 
 typedef struct s_PXENV_FILE_SELECT PXENV_FILE_SELECT_t;
 
-extern PXENV_EXIT_t pxenv_file_select ( struct s_PXENV_FILE_SELECT
-					*file_select );
-
 /** @} */ /* pxenv_file_select */
 
 /** @defgroup pxenv_file_read PXENV_FILE_READ
@@ -1702,8 +1603,6 @@
 
 typedef struct s_PXENV_FILE_READ PXENV_FILE_READ_t;
 
-extern PXENV_EXIT_t pxenv_file_read ( struct s_PXENV_FILE_READ *file_read );
-
 /** @} */ /* pxenv_file_read */
 
 /** @defgroup pxenv_get_file_size PXENV_GET_FILE_SIZE
@@ -1725,9 +1624,6 @@
 
 typedef struct s_PXENV_GET_FILE_SIZE PXENV_GET_FILE_SIZE_t;
 
-extern PXENV_EXIT_t pxenv_get_file_size ( struct s_PXENV_GET_FILE_SIZE
-					  *get_file_size );
-
 /** @} */ /* pxenv_get_file_size */
 
 /** @defgroup pxenv_file_exec PXENV_FILE_EXEC
@@ -1748,8 +1644,6 @@
 
 typedef struct s_PXENV_FILE_EXEC PXENV_FILE_EXEC_t;
 
-extern PXENV_EXIT_t pxenv_file_exec ( struct s_PXENV_FILE_EXEC *file_exec );
-
 /** @} */ /* pxenv_file_exec */
 
 /** @defgroup pxenv_file_api_check PXENV_FILE_API_CHECK
@@ -1774,8 +1668,6 @@
 
 typedef struct s_PXENV_FILE_API_CHECK PXENV_FILE_API_CHECK_t;
 
-extern PXENV_EXIT_t pxenv_file_api_check ( struct s_PXENV_FILE_API_CHECK *file_api_check );
-
 /** @} */ /* pxenv_file_api_check */
 
 /** @defgroup pxenv_file_exit_hook PXENV_FILE_EXIT_HOOK
@@ -1796,8 +1688,6 @@
 
 typedef struct s_PXENV_FILE_EXIT_HOOK PXENV_FILE_EXIT_HOOK_t;
 
-extern PXENV_EXIT_t pxenv_file_exit_hook ( struct s_PXENV_FILE_EXIT_HOOK *file_exit_hook );
-
 /** @} */ /* pxenv_file_exit_hook */
 
 /** @} */ /* pxe_file_api */
@@ -1847,8 +1737,6 @@
 
 typedef struct s_UNDI_LOADER UNDI_LOADER_t;
 
-extern PXENV_EXIT_t undi_loader ( struct s_UNDI_LOADER *undi_loader );
-
 /** @} */ /* pxe_loader_api */
 
 /** @} */ /* pxe */

=== modified file 'src/arch/i386/interface/pxe/pxe_call.c'
--- src/arch/i386/interface/pxe/pxe_call.c	2011-04-11 19:35:36 +0000
+++ src/arch/i386/interface/pxe/pxe_call.c	2012-02-10 16:40:50 +0000
@@ -41,73 +41,6 @@
 /** INT 1A hooked flag */
 static int int_1a_hooked = 0;
 
-/** A function pointer to hold any PXE API call
- *
- * Used by pxe_api_call() to avoid large swathes of duplicated code.
- */
-union pxenv_call {
-	PXENV_EXIT_t ( * any ) ( union u_PXENV_ANY * );
-	PXENV_EXIT_t ( * unknown ) ( struct s_PXENV_UNKNOWN * );
-	PXENV_EXIT_t ( * unload_stack ) ( struct s_PXENV_UNLOAD_STACK * );
-	PXENV_EXIT_t ( * get_cached_info )
-			( struct s_PXENV_GET_CACHED_INFO * );
-	PXENV_EXIT_t ( * restart_tftp ) ( struct s_PXENV_TFTP_READ_FILE * );
-	PXENV_EXIT_t ( * start_undi ) ( struct s_PXENV_START_UNDI * );
-	PXENV_EXIT_t ( * stop_undi ) ( struct s_PXENV_STOP_UNDI * );
-	PXENV_EXIT_t ( * start_base ) ( struct s_PXENV_START_BASE * );
-	PXENV_EXIT_t ( * stop_base ) ( struct s_PXENV_STOP_BASE * );
-	PXENV_EXIT_t ( * tftp_open ) ( struct s_PXENV_TFTP_OPEN * );
-	PXENV_EXIT_t ( * tftp_close ) ( struct s_PXENV_TFTP_CLOSE * );
-	PXENV_EXIT_t ( * tftp_read ) ( struct s_PXENV_TFTP_READ * );
-	PXENV_EXIT_t ( * tftp_read_file ) ( struct s_PXENV_TFTP_READ_FILE * );
-	PXENV_EXIT_t ( * tftp_get_fsize ) ( struct s_PXENV_TFTP_GET_FSIZE * );
-	PXENV_EXIT_t ( * udp_open ) ( struct s_PXENV_UDP_OPEN * );
-	PXENV_EXIT_t ( * udp_close ) ( struct s_PXENV_UDP_CLOSE * );
-	PXENV_EXIT_t ( * udp_write ) ( struct s_PXENV_UDP_WRITE * );
-	PXENV_EXIT_t ( * udp_read ) ( struct s_PXENV_UDP_READ * );
-	PXENV_EXIT_t ( * undi_startup ) ( struct s_PXENV_UNDI_STARTUP * );
-	PXENV_EXIT_t ( * undi_cleanup ) ( struct s_PXENV_UNDI_CLEANUP * );
-	PXENV_EXIT_t ( * undi_initialize )
-			( struct s_PXENV_UNDI_INITIALIZE * );
-	PXENV_EXIT_t ( * undi_reset_adapter ) ( struct s_PXENV_UNDI_RESET * );
-	PXENV_EXIT_t ( * undi_shutdown ) ( struct s_PXENV_UNDI_SHUTDOWN * );
-	PXENV_EXIT_t ( * undi_open ) ( struct s_PXENV_UNDI_OPEN * );
-	PXENV_EXIT_t ( * undi_close ) ( struct s_PXENV_UNDI_CLOSE * );
-	PXENV_EXIT_t ( * undi_transmit ) ( struct s_PXENV_UNDI_TRANSMIT * );
-	PXENV_EXIT_t ( * undi_set_mcast_address )
-			( struct s_PXENV_UNDI_SET_MCAST_ADDRESS * );
-	PXENV_EXIT_t ( * undi_set_station_address )
-			( struct s_PXENV_UNDI_SET_STATION_ADDRESS * );
-	PXENV_EXIT_t ( * undi_set_packet_filter )
-			( struct s_PXENV_UNDI_SET_PACKET_FILTER * );
-	PXENV_EXIT_t ( * undi_get_information )
-			( struct s_PXENV_UNDI_GET_INFORMATION * );
-	PXENV_EXIT_t ( * undi_get_statistics )
-			( struct s_PXENV_UNDI_GET_STATISTICS * );
-	PXENV_EXIT_t ( * undi_clear_statistics )
-			( struct s_PXENV_UNDI_CLEAR_STATISTICS * );
-	PXENV_EXIT_t ( * undi_initiate_diags )
-			( struct s_PXENV_UNDI_INITIATE_DIAGS * );
-	PXENV_EXIT_t ( * undi_force_interrupt )
-			( struct s_PXENV_UNDI_FORCE_INTERRUPT * );
-	PXENV_EXIT_t ( * undi_get_mcast_address )
-			( struct s_PXENV_UNDI_GET_MCAST_ADDRESS * );
-	PXENV_EXIT_t ( * undi_get_nic_type )
-			( struct s_PXENV_UNDI_GET_NIC_TYPE * );
-	PXENV_EXIT_t ( * undi_get_iface_info )
-			( struct s_PXENV_UNDI_GET_IFACE_INFO * );
-	PXENV_EXIT_t ( * undi_get_state ) ( struct s_PXENV_UNDI_GET_STATE * );
-	PXENV_EXIT_t ( * undi_isr ) ( struct s_PXENV_UNDI_ISR * );
-	PXENV_EXIT_t ( * file_open ) ( struct s_PXENV_FILE_OPEN * );
-	PXENV_EXIT_t ( * file_close ) ( struct s_PXENV_FILE_CLOSE * );
-	PXENV_EXIT_t ( * file_select ) ( struct s_PXENV_FILE_SELECT * );
-	PXENV_EXIT_t ( * file_read ) ( struct s_PXENV_FILE_READ * );
-	PXENV_EXIT_t ( * get_file_size ) ( struct s_PXENV_GET_FILE_SIZE * );
-	PXENV_EXIT_t ( * file_exec ) ( struct s_PXENV_FILE_EXEC * );
-	PXENV_EXIT_t ( * file_api_check ) ( struct s_PXENV_FILE_API_CHECK * );
-	PXENV_EXIT_t ( * file_exit_hook ) ( struct s_PXENV_FILE_EXIT_HOOK * );
-};
-
 /**
  * Handle an unknown PXE API call
  *
@@ -120,6 +53,26 @@
 	return PXENV_EXIT_FAILURE;
 }
 
+/** Unknown PXE API call list */
+struct pxe_api_call pxenv_unknown_api __pxe_api_call =
+	PXE_API_CALL ( PXENV_UNKNOWN, pxenv_unknown, struct s_PXENV_UNKNOWN );
+
+/**
+ * Locate PXE API call
+ *
+ * @v opcode		Opcode
+ * @ret call		PXE API call, or NULL
+ */
+static struct pxe_api_call * find_pxe_api_call ( uint16_t opcode ) {
+	struct pxe_api_call *call;
+
+	for_each_table_entry ( call, PXE_API_CALLS ) {
+		if ( call->opcode == opcode )
+			return call;
+	}
+	return NULL;
+}
+
 /**
  * Dispatch PXE API call
  *
@@ -128,220 +81,30 @@
  * @ret ax		PXE exit code
  */
 __asmcall void pxe_api_call ( struct i386_all_regs *ix86 ) {
-	int opcode = ix86->regs.bx;
-	userptr_t parameters = real_to_user ( ix86->segs.es, ix86->regs.di );
-	size_t param_len;
-	union u_PXENV_ANY pxenv_any;
-	union pxenv_call pxenv_call;
+	uint16_t opcode = ix86->regs.bx;
+	userptr_t uparams = real_to_user ( ix86->segs.es, ix86->regs.di );
+	struct pxe_api_call *call;
+	union u_PXENV_ANY params;
 	PXENV_EXIT_t ret;
 
-	switch ( opcode ) {
-	case PXENV_UNLOAD_STACK:
-		pxenv_call.unload_stack = pxenv_unload_stack;
-		param_len = sizeof ( pxenv_any.unload_stack );
-		break;
-	case PXENV_GET_CACHED_INFO:
-		pxenv_call.get_cached_info = pxenv_get_cached_info;
-		param_len = sizeof ( pxenv_any.get_cached_info );
-		break;
-	case PXENV_RESTART_TFTP:
-		pxenv_call.restart_tftp = pxenv_restart_tftp;
-		param_len = sizeof ( pxenv_any.restart_tftp );
-		break;
-	case PXENV_START_UNDI:
-		pxenv_call.start_undi = pxenv_start_undi;
-		param_len = sizeof ( pxenv_any.start_undi );
-		break;
-	case PXENV_STOP_UNDI:
-		pxenv_call.stop_undi = pxenv_stop_undi;
-		param_len = sizeof ( pxenv_any.stop_undi );
-		break;
-	case PXENV_START_BASE:
-		pxenv_call.start_base = pxenv_start_base;
-		param_len = sizeof ( pxenv_any.start_base );
-		break;
-	case PXENV_STOP_BASE:
-		pxenv_call.stop_base = pxenv_stop_base;
-		param_len = sizeof ( pxenv_any.stop_base );
-		break;
-	case PXENV_TFTP_OPEN:
-		pxenv_call.tftp_open = pxenv_tftp_open;
-		param_len = sizeof ( pxenv_any.tftp_open );
-		break;
-	case PXENV_TFTP_CLOSE:
-		pxenv_call.tftp_close = pxenv_tftp_close;
-		param_len = sizeof ( pxenv_any.tftp_close );
-		break;
-	case PXENV_TFTP_READ:
-		pxenv_call.tftp_read = pxenv_tftp_read;
-		param_len = sizeof ( pxenv_any.tftp_read );
-		break;
-	case PXENV_TFTP_READ_FILE:
-		pxenv_call.tftp_read_file = pxenv_tftp_read_file;
-		param_len = sizeof ( pxenv_any.tftp_read_file );
-		break;
-	case PXENV_TFTP_GET_FSIZE:
-		pxenv_call.tftp_get_fsize = pxenv_tftp_get_fsize;
-		param_len = sizeof ( pxenv_any.tftp_get_fsize );
-		break;
-	case PXENV_UDP_OPEN:
-		pxenv_call.udp_open = pxenv_udp_open;
-		param_len = sizeof ( pxenv_any.udp_open );
-		break;
-	case PXENV_UDP_CLOSE:
-		pxenv_call.udp_close = pxenv_udp_close;
-		param_len = sizeof ( pxenv_any.udp_close );
-		break;
-	case PXENV_UDP_WRITE:
-		pxenv_call.udp_write = pxenv_udp_write;
-		param_len = sizeof ( pxenv_any.udp_write );
-		break;
-	case PXENV_UDP_READ:
-		pxenv_call.udp_read = pxenv_udp_read;
-		param_len = sizeof ( pxenv_any.udp_read );
-		break;
-	case PXENV_UNDI_STARTUP:
-		pxenv_call.undi_startup = pxenv_undi_startup;
-		param_len = sizeof ( pxenv_any.undi_startup );
-		break;
-	case PXENV_UNDI_CLEANUP:
-		pxenv_call.undi_cleanup = pxenv_undi_cleanup;
-		param_len = sizeof ( pxenv_any.undi_cleanup );
-		break;
-	case PXENV_UNDI_INITIALIZE:
-		pxenv_call.undi_initialize = pxenv_undi_initialize;
-		param_len = sizeof ( pxenv_any.undi_initialize );
-		break;
-	case PXENV_UNDI_RESET_ADAPTER:
-		pxenv_call.undi_reset_adapter = pxenv_undi_reset_adapter;
-		param_len = sizeof ( pxenv_any.undi_reset_adapter );
-		break;
-	case PXENV_UNDI_SHUTDOWN:
-		pxenv_call.undi_shutdown = pxenv_undi_shutdown;
-		param_len = sizeof ( pxenv_any.undi_shutdown );
-		break;
-	case PXENV_UNDI_OPEN:
-		pxenv_call.undi_open = pxenv_undi_open;
-		param_len = sizeof ( pxenv_any.undi_open );
-		break;
-	case PXENV_UNDI_CLOSE:
-		pxenv_call.undi_close = pxenv_undi_close;
-		param_len = sizeof ( pxenv_any.undi_close );
-		break;
-	case PXENV_UNDI_TRANSMIT:
-		pxenv_call.undi_transmit = pxenv_undi_transmit;
-		param_len = sizeof ( pxenv_any.undi_transmit );
-		break;
-	case PXENV_UNDI_SET_MCAST_ADDRESS:
-		pxenv_call.undi_set_mcast_address =
-			pxenv_undi_set_mcast_address;
-		param_len = sizeof ( pxenv_any.undi_set_mcast_address );
-		break;
-	case PXENV_UNDI_SET_STATION_ADDRESS:
-		pxenv_call.undi_set_station_address =
-			pxenv_undi_set_station_address;
-		param_len = sizeof ( pxenv_any.undi_set_station_address );
-		break;
-	case PXENV_UNDI_SET_PACKET_FILTER:
-		pxenv_call.undi_set_packet_filter =
-			pxenv_undi_set_packet_filter;
-		param_len = sizeof ( pxenv_any.undi_set_packet_filter );
-		break;
-	case PXENV_UNDI_GET_INFORMATION:
-		pxenv_call.undi_get_information = pxenv_undi_get_information;
-		param_len = sizeof ( pxenv_any.undi_get_information );
-		break;
-	case PXENV_UNDI_GET_STATISTICS:
-		pxenv_call.undi_get_statistics = pxenv_undi_get_statistics;
-		param_len = sizeof ( pxenv_any.undi_get_statistics );
-		break;
-	case PXENV_UNDI_CLEAR_STATISTICS:
-		pxenv_call.undi_clear_statistics = pxenv_undi_clear_statistics;
-		param_len = sizeof ( pxenv_any.undi_clear_statistics );
-		break;
-	case PXENV_UNDI_INITIATE_DIAGS:
-		pxenv_call.undi_initiate_diags = pxenv_undi_initiate_diags;
-		param_len = sizeof ( pxenv_any.undi_initiate_diags );
-		break;
-	case PXENV_UNDI_FORCE_INTERRUPT:
-		pxenv_call.undi_force_interrupt = pxenv_undi_force_interrupt;
-		param_len = sizeof ( pxenv_any.undi_force_interrupt );
-		break;
-	case PXENV_UNDI_GET_MCAST_ADDRESS:
-		pxenv_call.undi_get_mcast_address =
-			pxenv_undi_get_mcast_address;
-		param_len = sizeof ( pxenv_any.undi_get_mcast_address );
-		break;
-	case PXENV_UNDI_GET_NIC_TYPE:
-		pxenv_call.undi_get_nic_type = pxenv_undi_get_nic_type;
-		param_len = sizeof ( pxenv_any.undi_get_nic_type );
-		break;
-	case PXENV_UNDI_GET_IFACE_INFO:
-		pxenv_call.undi_get_iface_info = pxenv_undi_get_iface_info;
-		param_len = sizeof ( pxenv_any.undi_get_iface_info );
-		break;
-	case PXENV_UNDI_ISR:
-		pxenv_call.undi_isr = pxenv_undi_isr;
-		param_len = sizeof ( pxenv_any.undi_isr );
-		break;
-	case PXENV_FILE_OPEN:
-		pxenv_call.file_open = pxenv_file_open;
-		param_len = sizeof ( pxenv_any.file_open );
-		break;
-	case PXENV_FILE_CLOSE:
-		pxenv_call.file_close = pxenv_file_close;
-		param_len = sizeof ( pxenv_any.file_close );
-		break;
-	case PXENV_FILE_SELECT:
-		pxenv_call.file_select = pxenv_file_select;
-		param_len = sizeof ( pxenv_any.file_select );
-		break;
-	case PXENV_FILE_READ:
-		pxenv_call.file_read = pxenv_file_read;
-		param_len = sizeof ( pxenv_any.file_read );
-		break;
-	case PXENV_GET_FILE_SIZE:
-		pxenv_call.get_file_size = pxenv_get_file_size;
-		param_len = sizeof ( pxenv_any.get_file_size );
-		break;
-	case PXENV_FILE_EXEC:
-		pxenv_call.file_exec = pxenv_file_exec;
-		param_len = sizeof ( pxenv_any.file_exec );
-		break;
-	case PXENV_FILE_API_CHECK:
-		pxenv_call.file_api_check = pxenv_file_api_check;
-		param_len = sizeof ( pxenv_any.file_api_check );
-		break;
-	case PXENV_FILE_EXIT_HOOK:
-		pxenv_call.file_exit_hook = pxenv_file_exit_hook;
-		param_len = sizeof ( pxenv_any.file_exit_hook );
-		break;
-	default:
-		DBG ( "PXENV_UNKNOWN_%hx", opcode );
-		pxenv_call.unknown = pxenv_unknown;
-		param_len = sizeof ( pxenv_any.unknown );
-		break;
+	/* Locate API call */
+	call = find_pxe_api_call ( opcode );
+	if ( ! call ) {
+		DBGC ( &pxe_netdev, "PXENV_UNKNOWN_%04x\n", opcode );
+		call = &pxenv_unknown_api;
 	}
 
 	/* Copy parameter block from caller */
-	copy_from_user ( &pxenv_any, parameters, 0, param_len );
+	copy_from_user ( &params, uparams, 0, call->params_len );
 
 	/* Set default status in case child routine fails to do so */
-	pxenv_any.Status = PXENV_STATUS_FAILURE;
+	params.Status = PXENV_STATUS_FAILURE;
 
 	/* Hand off to relevant API routine */
-	DBG ( "[" );
-	ret = pxenv_call.any ( &pxenv_any );
-	if ( pxenv_any.Status != PXENV_STATUS_SUCCESS ) {
-		DBG ( " %02x", pxenv_any.Status );
-	}
-	if ( ret != PXENV_EXIT_SUCCESS ) {
-		DBG ( ret == PXENV_EXIT_FAILURE ? " err" : " ??" );
-	}
-	DBG ( "]" );
-	
+	ret = call->entry ( &params );
+
 	/* Copy modified parameter block back to caller and return */
-	copy_to_user ( parameters, 0, &pxenv_any, param_len );
+	copy_to_user ( uparams, 0, &params, call->params_len );
 	ix86->regs.ax = ret;
 }
 
@@ -351,8 +114,7 @@
  * @v ix86		Registers for PXE call
  * @ret present		Zero (PXE stack present)
  */
-int pxe_api_call_weak ( struct i386_all_regs *ix86 )
-{
+int pxe_api_call_weak ( struct i386_all_regs *ix86 ) {
 	pxe_api_call ( ix86 );
 	return 0;
 }
@@ -519,3 +281,9 @@
 
 	return rc;
 }
+
+REQUIRE_OBJECT ( pxe_preboot );
+REQUIRE_OBJECT ( pxe_undi );
+REQUIRE_OBJECT ( pxe_udp );
+REQUIRE_OBJECT ( pxe_tftp );
+REQUIRE_OBJECT ( pxe_file );

=== added file 'src/arch/i386/interface/pxe/pxe_exit_hook.c'
--- src/arch/i386/interface/pxe/pxe_exit_hook.c	1970-01-01 00:00:00 +0000
+++ src/arch/i386/interface/pxe/pxe_exit_hook.c	2012-02-10 16:40:50 +0000
@@ -0,0 +1,60 @@
+/** @file
+ *
+ * PXE exit hook
+ *
+ */
+
+/*
+ * Copyright (C) 2010 Shao Miller <[e-mail]>.
+ *
+ * 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.
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER );
+
+#include <stdint.h>
+#include <realmode.h>
+#include <pxe.h>
+
+/** PXE exit hook */
+extern segoff_t __data16 ( pxe_exit_hook );
+#define pxe_exit_hook __use_data16 ( pxe_exit_hook )
+
+/**
+ * FILE EXIT HOOK
+ *
+ * @v file_exit_hook			Pointer to a struct
+ *					s_PXENV_FILE_EXIT_HOOK
+ * @v s_PXENV_FILE_EXIT_HOOK::Hook	SEG16:OFF16 to jump to
+ * @ret #PXENV_EXIT_SUCCESS		Successfully set hook
+ * @ret #PXENV_EXIT_FAILURE		We're not an NBP build
+ * @ret s_PXENV_FILE_EXIT_HOOK::Status	PXE status code
+ *
+ */
+static PXENV_EXIT_t
+pxenv_file_exit_hook ( struct s_PXENV_FILE_EXIT_HOOK *file_exit_hook ) {
+	DBG ( "PXENV_FILE_EXIT_HOOK" );
+
+	/* We'll jump to the specified SEG16:OFF16 during exit */
+	pxe_exit_hook.segment = file_exit_hook->Hook.segment;
+	pxe_exit_hook.offset = file_exit_hook->Hook.offset;
+	file_exit_hook->Status = PXENV_STATUS_SUCCESS;
+	return PXENV_EXIT_SUCCESS;
+}
+
+/** PXE file API */
+struct pxe_api_call pxe_file_api_exit_hook __pxe_api_call =
+	PXE_API_CALL ( PXENV_FILE_EXIT_HOOK, pxenv_file_exit_hook,
+		       struct s_PXENV_FILE_EXIT_HOOK );

=== modified file 'src/arch/i386/interface/pxe/pxe_file.c'
--- src/arch/i386/interface/pxe/pxe_file.c	2011-04-11 19:35:36 +0000
+++ src/arch/i386/interface/pxe/pxe_file.c	2012-02-10 16:40:50 +0000
@@ -16,8 +16,6 @@
 
 /*
  * Copyright (C) 2007 Michael Brown <[e-mail]>.
- * Portions (C) 2010 Shao Miller <[e-mail]>.
- *              [PXE exit hook logic]
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -49,7 +47,7 @@
  * @ret s_PXENV_FILE_OPEN::FileHandle	Handle of opened file
  *
  */
-PXENV_EXIT_t pxenv_file_open ( struct s_PXENV_FILE_OPEN *file_open ) {
+static PXENV_EXIT_t pxenv_file_open ( struct s_PXENV_FILE_OPEN *file_open ) {
 	userptr_t filename;
 	size_t filename_len;
 	int fd;
@@ -91,7 +89,7 @@
  * @ret s_PXENV_FILE_CLOSE::Status	PXE status code
  *
  */
-PXENV_EXIT_t pxenv_file_close ( struct s_PXENV_FILE_CLOSE *file_close ) {
+static PXENV_EXIT_t pxenv_file_close ( struct s_PXENV_FILE_CLOSE *file_close ) {
 
 	DBG ( "PXENV_FILE_CLOSE %d", file_close->FileHandle );
 
@@ -111,7 +109,8 @@
  * @ret s_PXENV_FILE_SELECT::Ready	Indication of readiness
  *
  */
-PXENV_EXIT_t pxenv_file_select ( struct s_PXENV_FILE_SELECT *file_select ) {
+static PXENV_EXIT_t
+pxenv_file_select ( struct s_PXENV_FILE_SELECT *file_select ) {
 	fd_set fdset;
 	int ready;
 
@@ -143,7 +142,7 @@
  * @ret s_PXENV_FILE_READ::BufferSize	Length of data read
  *
  */
-PXENV_EXIT_t pxenv_file_read ( struct s_PXENV_FILE_READ *file_read ) {
+static PXENV_EXIT_t pxenv_file_read ( struct s_PXENV_FILE_READ *file_read ) {
 	userptr_t buffer;
 	ssize_t len;
 
@@ -176,8 +175,8 @@
  * @ret s_PXENV_GET_FILE_SIZE::Status	PXE status code
  * @ret s_PXENV_GET_FILE_SIZE::FileSize	Size of file
  */
-PXENV_EXIT_t pxenv_get_file_size ( struct s_PXENV_GET_FILE_SIZE
-				   *get_file_size ) {
+static PXENV_EXIT_t
+pxenv_get_file_size ( struct s_PXENV_GET_FILE_SIZE *get_file_size ) {
 	ssize_t filesize;
 
 	DBG ( "PXENV_GET_FILE_SIZE %d", get_file_size->FileHandle );
@@ -205,7 +204,7 @@
  * @ret s_PXENV_FILE_EXEC::Status	PXE status code
  *
  */
-PXENV_EXIT_t pxenv_file_exec ( struct s_PXENV_FILE_EXEC *file_exec ) {
+static PXENV_EXIT_t pxenv_file_exec ( struct s_PXENV_FILE_EXEC *file_exec ) {
 	userptr_t command;
 	size_t command_len;
 	int rc;
@@ -233,9 +232,6 @@
 	return PXENV_EXIT_SUCCESS;
 }
 
-segoff_t __data16 ( pxe_exit_hook ) = { 0, 0 };
-#define pxe_exit_hook __use_data16 ( pxe_exit_hook )
-
 /**
  * FILE API CHECK
  *
@@ -250,57 +246,58 @@
  * @ret s_PXENV_FILE_API_CHECK::Flags	Reserved
  *
  */
-PXENV_EXIT_t pxenv_file_api_check ( struct s_PXENV_FILE_API_CHECK *file_api_check ) {
+static PXENV_EXIT_t
+pxenv_file_api_check ( struct s_PXENV_FILE_API_CHECK *file_api_check ) {
+	struct pxe_api_call *call;
+	unsigned int mask = 0;
+	unsigned int offset;
+
 	DBG ( "PXENV_FILE_API_CHECK" );
 
+	/* Check for magic value */
 	if ( file_api_check->Magic != 0x91d447b2 ) {
 		file_api_check->Status = PXENV_STATUS_BAD_FUNC;
 		return PXENV_EXIT_FAILURE;
-	} else if ( file_api_check->Size <
-		    sizeof(struct s_PXENV_FILE_API_CHECK) ) {
+	}
+
+	/* Check for required parameter size */
+	if ( file_api_check->Size < sizeof ( *file_api_check ) ) {
 		file_api_check->Status = PXENV_STATUS_OUT_OF_RESOURCES;
 		return PXENV_EXIT_FAILURE;
-	} else {
-		file_api_check->Status   = PXENV_STATUS_SUCCESS;
-		file_api_check->Size     = sizeof(struct s_PXENV_FILE_API_CHECK);
-		file_api_check->Magic    = 0xe9c17b20;
-		file_api_check->Provider = 0x45585067; /* "iPXE" */
-		file_api_check->APIMask  = 0x0000007f; /* Functions e0-e6 */
-		/* Check to see if we have a PXE exit hook */
-		if ( pxe_exit_hook.segment | pxe_exit_hook.offset )
-			/* Function e7, also */
-			file_api_check->APIMask |= 0x00000080;
-		file_api_check->Flags    = 0;	       /* None defined */
-		return PXENV_EXIT_SUCCESS;
-	}
-}
-
-/**
- * FILE EXIT HOOK
- *
- * @v file_exit_hook			Pointer to a struct
- *					s_PXENV_FILE_EXIT_HOOK
- * @v s_PXENV_FILE_EXIT_HOOK::Hook	SEG16:OFF16 to jump to
- * @ret #PXENV_EXIT_SUCCESS		Successfully set hook
- * @ret #PXENV_EXIT_FAILURE		We're not an NBP build
- * @ret s_PXENV_FILE_EXIT_HOOK::Status	PXE status code
- *
- */
-PXENV_EXIT_t pxenv_file_exit_hook ( struct s_PXENV_FILE_EXIT_HOOK
-					*file_exit_hook ) {
-	DBG ( "PXENV_FILE_EXIT_HOOK" );
-
-	/* Check to see if we have a PXE exit hook */
-	if ( pxe_exit_hook.segment | pxe_exit_hook.offset ) {
-		/* We'll jump to the specified SEG16:OFF16 during exit */
-		pxe_exit_hook.segment = file_exit_hook->Hook.segment;
-		pxe_exit_hook.offset = file_exit_hook->Hook.offset;
-		file_exit_hook->Status = PXENV_STATUS_SUCCESS;
-		return PXENV_EXIT_SUCCESS;
-	}
-
-	DBG ( " not NBP" );
-	file_exit_hook->Status = PXENV_STATUS_UNSUPPORTED;
-	return PXENV_EXIT_FAILURE;
-}
-
+	}
+
+	/* Determine supported calls */
+	for_each_table_entry ( call, PXE_API_CALLS ) {
+		offset = ( call->opcode - PXENV_FILE_MIN );
+		if ( offset <= ( PXENV_FILE_MAX - PXENV_FILE_MIN ) )
+			mask |= ( 1 << offset );
+	}
+
+	/* Fill in parameters */
+	file_api_check->Size = sizeof ( *file_api_check );
+	file_api_check->Magic = 0xe9c17b20;
+	file_api_check->Provider = 0x45585067; /* "iPXE" */
+	file_api_check->APIMask = mask;
+	file_api_check->Flags = 0; /* None defined */
+
+	file_api_check->Status = PXENV_STATUS_SUCCESS;
+	return PXENV_EXIT_SUCCESS;
+}
+
+/** PXE file API */
+struct pxe_api_call pxe_file_api[] __pxe_api_call = {
+	PXE_API_CALL ( PXENV_FILE_OPEN, pxenv_file_open,
+		       struct s_PXENV_FILE_OPEN ),
+	PXE_API_CALL ( PXENV_FILE_CLOSE, pxenv_file_close,
+		       struct s_PXENV_FILE_CLOSE ),
+	PXE_API_CALL ( PXENV_FILE_SELECT, pxenv_file_select,
+		       struct s_PXENV_FILE_SELECT ),
+	PXE_API_CALL ( PXENV_FILE_READ, pxenv_file_read,
+		       struct s_PXENV_FILE_READ ),
+	PXE_API_CALL ( PXENV_GET_FILE_SIZE, pxenv_get_file_size,
+		       struct s_PXENV_GET_FILE_SIZE ),
+	PXE_API_CALL ( PXENV_FILE_EXEC, pxenv_file_exec,
+		       struct s_PXENV_FILE_EXEC ),
+	PXE_API_CALL ( PXENV_FILE_API_CHECK, pxenv_file_api_check,
+		       struct s_PXENV_FILE_API_CHECK ),
+};

=== modified file 'src/arch/i386/interface/pxe/pxe_preboot.c'
--- src/arch/i386/interface/pxe/pxe_preboot.c	2011-04-11 19:35:36 +0000
+++ src/arch/i386/interface/pxe/pxe_preboot.c	2012-02-10 16:40:50 +0000
@@ -89,6 +89,26 @@
 	[CACHED_INFO_BINL] = { create_fakepxebsack },
 };
 
+/**
+ * Name PXENV_GET_CACHED_INFO packet type
+ *
+ * @v packet_type	Packet type
+ * @ret name		Name of packet type
+ */
+static inline __attribute__ (( always_inline )) const char *
+pxenv_get_cached_info_name ( int packet_type ) {
+	switch ( packet_type ) {
+	case PXENV_PACKET_TYPE_DHCP_DISCOVER:
+		return "DHCPDISCOVER";
+	case PXENV_PACKET_TYPE_DHCP_ACK:
+		return "DHCPACK";
+	case PXENV_PACKET_TYPE_CACHED_REPLY:
+		return "BINL";
+	default:
+		return "<INVALID>";
+	}
+}
+
 /* The case in which the caller doesn't supply a buffer is really
  * awkward to support given that we have multiple sources of options,
  * and that we don't actually store the DHCP packets.  (We may not
@@ -110,8 +130,9 @@
  * @ret ...
  *
  */
-PXENV_EXIT_t pxenv_unload_stack ( struct s_PXENV_UNLOAD_STACK *unload_stack ) {
-	DBG ( "PXENV_UNLOAD_STACK" );
+static PXENV_EXIT_t
+pxenv_unload_stack ( struct s_PXENV_UNLOAD_STACK *unload_stack ) {
+	DBGC ( &pxe_netdev, "PXENV_UNLOAD_STACK\n" );
 
 	unload_stack->Status = PXENV_STATUS_SUCCESS;
 	return PXENV_EXIT_SUCCESS;
@@ -121,8 +142,8 @@
  *
  * Status: working
  */
-PXENV_EXIT_t pxenv_get_cached_info ( struct s_PXENV_GET_CACHED_INFO
-				     *get_cached_info ) {
+static PXENV_EXIT_t
+pxenv_get_cached_info ( struct s_PXENV_GET_CACHED_INFO *get_cached_info ) {
 	struct pxe_dhcp_packet_creator *creator;
 	union pxe_cached_info *info;
 	unsigned int idx;
@@ -130,15 +151,24 @@
 	userptr_t buffer;
 	int rc;
 
-	DBG ( "PXENV_GET_CACHED_INFO %d", get_cached_info->PacketType );
+	DBGC ( &pxe_netdev, "PXENV_GET_CACHED_INFO %s to %04x:%04x+%x",
+	       pxenv_get_cached_info_name ( get_cached_info->PacketType ),
+	       get_cached_info->Buffer.segment,
+	       get_cached_info->Buffer.offset, get_cached_info->BufferSize );
 
-	DBG ( " to %04x:%04x+%x", get_cached_info->Buffer.segment,
-	      get_cached_info->Buffer.offset, get_cached_info->BufferSize );
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxe_netdev, "PXENV_GET_CACHED_INFO called with no "
+		       "network device\n" );
+		get_cached_info->Status = PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
 
 	/* Sanity check */
         idx = ( get_cached_info->PacketType - 1 );
 	if ( idx >= NUM_CACHED_INFOS ) {
-		DBG ( " bad PacketType" );
+		DBGC ( &pxe_netdev, " bad PacketType %d\n",
+		       get_cached_info->PacketType );
 		goto err;
 	}
 	info = &cached_info[idx];
@@ -149,7 +179,8 @@
 		creator = &pxe_dhcp_packet_creators[idx];
 		if ( ( rc = creator->create ( pxe_netdev, info,
 					      sizeof ( *info ) ) ) != 0 ) {
-			DBG ( " failed to build packet" );
+			DBGC ( &pxe_netdev, " failed to build packet: %s\n",
+			       strerror ( rc ) );
 			goto err;
 		}
 	}
@@ -184,23 +215,24 @@
 		get_cached_info->Buffer.segment = rm_ds;
 		get_cached_info->Buffer.offset = __from_data16 ( info );
 		get_cached_info->BufferSize = sizeof ( *info );
-		DBG ( " returning %04x:%04x+%04x['%x']",
-		      get_cached_info->Buffer.segment,
-		      get_cached_info->Buffer.offset,
-		      get_cached_info->BufferSize,
-		      get_cached_info->BufferLimit );
+		DBGC ( &pxe_netdev, " using %04x:%04x+%04x['%x']",
+		       get_cached_info->Buffer.segment,
+		       get_cached_info->Buffer.offset,
+		       get_cached_info->BufferSize,
+		       get_cached_info->BufferLimit );
 	} else {
 		/* Copy packet to client buffer */
 		if ( len > sizeof ( *info ) )
 			len = sizeof ( *info );
 		if ( len < sizeof ( *info ) )
-			DBG ( " buffer may be too short" );
+			DBGC ( &pxe_netdev, " buffer may be too short" );
 		buffer = real_to_user ( get_cached_info->Buffer.segment,
 					get_cached_info->Buffer.offset );
 		copy_to_user ( buffer, 0, info, len );
 		get_cached_info->BufferSize = len;
 	}
 
+	DBGC ( &pxe_netdev, "\n" );
 	get_cached_info->Status = PXENV_STATUS_SUCCESS;
 	return PXENV_EXIT_SUCCESS;
 
@@ -213,11 +245,11 @@
  *
  * Status: working
  */
-PXENV_EXIT_t pxenv_restart_tftp ( struct s_PXENV_TFTP_READ_FILE
-				  *restart_tftp ) {
+static PXENV_EXIT_t
+pxenv_restart_tftp ( struct s_PXENV_TFTP_READ_FILE *restart_tftp ) {
 	PXENV_EXIT_t tftp_exit;
 
-	DBG ( "PXENV_RESTART_TFTP " );
+	DBGC ( &pxe_netdev, "PXENV_RESTART_TFTP\n" );
 
 	/* Words cannot describe the complete mismatch between the PXE
 	 * specification and any possible version of reality...
@@ -236,13 +268,13 @@
  *
  * Status: working
  */
-PXENV_EXIT_t pxenv_start_undi ( struct s_PXENV_START_UNDI *start_undi ) {
+static PXENV_EXIT_t pxenv_start_undi ( struct s_PXENV_START_UNDI *start_undi ) {
 	unsigned int bus_type;
 	unsigned int location;
 	struct net_device *netdev;
 
-	DBG ( "PXENV_START_UNDI %04x:%04x:%04x",
-	      start_undi->AX, start_undi->BX, start_undi->DX );
+	DBGC ( &pxe_netdev, "PXENV_START_UNDI %04x:%04x:%04x\n",
+	       start_undi->AX, start_undi->BX, start_undi->DX );
 
 	/* Determine bus type and location.  Use a heuristic to decide
 	 * whether we are PCI or ISAPnP
@@ -266,11 +298,13 @@
 	/* Look for a matching net device */
 	netdev = find_netdev_by_location ( bus_type, location );
 	if ( ! netdev ) {
-		DBG ( " no net device found" );
+		DBGC ( &pxe_netdev, "PXENV_START_UNDI could not find matching "
+		       "net device\n" );
 		start_undi->Status = PXENV_STATUS_UNDI_CANNOT_INITIALIZE_NIC;
 		return PXENV_EXIT_FAILURE;
 	}
-	DBG ( " using netdev %s", netdev->name );
+	DBGC ( &pxe_netdev, "PXENV_START_UNDI found net device %s\n",
+	       netdev->name );
 
 	/* Activate PXE */
 	pxe_activate ( netdev );
@@ -283,8 +317,8 @@
  *
  * Status: working
  */
-PXENV_EXIT_t pxenv_stop_undi ( struct s_PXENV_STOP_UNDI *stop_undi ) {
-	DBG ( "PXENV_STOP_UNDI" );
+static PXENV_EXIT_t pxenv_stop_undi ( struct s_PXENV_STOP_UNDI *stop_undi ) {
+	DBGC ( &pxe_netdev, "PXENV_STOP_UNDI\n" );
 
 	/* Deactivate PXE */
 	pxe_deactivate();
@@ -294,8 +328,8 @@
 
 	/* Check to see if we still have any hooked interrupts */
 	if ( hooked_bios_interrupts != 0 ) {
-		DBG ( "PXENV_STOP_UNDI failed: %d interrupts still hooked\n",
-		      hooked_bios_interrupts );
+		DBGC ( &pxe_netdev, "PXENV_STOP_UNDI failed: %d interrupts "
+		       "still hooked\n", hooked_bios_interrupts );
 		stop_undi->Status = PXENV_STATUS_KEEP_UNDI;
 		return PXENV_EXIT_FAILURE;
 	}
@@ -308,8 +342,8 @@
  *
  * Status: won't implement (requires major structural changes)
  */
-PXENV_EXIT_t pxenv_start_base ( struct s_PXENV_START_BASE *start_base ) {
-	DBG ( "PXENV_START_BASE" );
+static PXENV_EXIT_t pxenv_start_base ( struct s_PXENV_START_BASE *start_base ) {
+	DBGC ( &pxe_netdev, "PXENV_START_BASE\n" );
 
 	start_base->Status = PXENV_STATUS_UNSUPPORTED;
 	return PXENV_EXIT_FAILURE;
@@ -319,8 +353,8 @@
  *
  * Status: working
  */
-PXENV_EXIT_t pxenv_stop_base ( struct s_PXENV_STOP_BASE *stop_base ) {
-	DBG ( "PXENV_STOP_BASE" );
+static PXENV_EXIT_t pxenv_stop_base ( struct s_PXENV_STOP_BASE *stop_base ) {
+	DBGC ( &pxe_netdev, "PXENV_STOP_BASE\n" );
 
 	/* The only time we will be called is when the NBP is trying
 	 * to shut down the PXE stack.  There's nothing we need to do
@@ -330,3 +364,21 @@
 	stop_base->Status = PXENV_STATUS_SUCCESS;
 	return PXENV_EXIT_SUCCESS;
 }
+
+/** PXE preboot API */
+struct pxe_api_call pxe_preboot_api[] __pxe_api_call = {
+	PXE_API_CALL ( PXENV_UNLOAD_STACK, pxenv_unload_stack,
+		       struct s_PXENV_UNLOAD_STACK ),
+	PXE_API_CALL ( PXENV_GET_CACHED_INFO, pxenv_get_cached_info,
+		       struct s_PXENV_GET_CACHED_INFO ),
+	PXE_API_CALL ( PXENV_RESTART_TFTP, pxenv_restart_tftp,
+		       struct s_PXENV_TFTP_READ_FILE ),
+	PXE_API_CALL ( PXENV_START_UNDI, pxenv_start_undi,
+		       struct s_PXENV_START_UNDI ),
+	PXE_API_CALL ( PXENV_STOP_UNDI, pxenv_stop_undi,
+		       struct s_PXENV_STOP_UNDI ),
+	PXE_API_CALL ( PXENV_START_BASE, pxenv_start_base,
+		       struct s_PXENV_START_BASE ),
+	PXE_API_CALL ( PXENV_STOP_BASE, pxenv_stop_base,
+		       struct s_PXENV_STOP_BASE ),
+};

=== modified file 'src/arch/i386/interface/pxe/pxe_tftp.c'
--- src/arch/i386/interface/pxe/pxe_tftp.c	2011-04-11 19:35:36 +0000
+++ src/arch/i386/interface/pxe/pxe_tftp.c	2012-02-10 16:40:50 +0000
@@ -233,7 +233,7 @@
  * view of the PXE API, it is conceptually impossible to issue any
  * other PXE API call "if an MTFTP connection is active".
  */
-PXENV_EXIT_t pxenv_tftp_open ( struct s_PXENV_TFTP_OPEN *tftp_open ) {
+static PXENV_EXIT_t pxenv_tftp_open ( struct s_PXENV_TFTP_OPEN *tftp_open ) {
 	int rc;
 
 	DBG ( "PXENV_TFTP_OPEN" );
@@ -285,7 +285,7 @@
  * call this function with a 32-bit stack segment.  (See the relevant
  * @ref pxe_x86_pmode16 "implementation note" for more details.)
  */
-PXENV_EXIT_t pxenv_tftp_close ( struct s_PXENV_TFTP_CLOSE *tftp_close ) {
+static PXENV_EXIT_t pxenv_tftp_close ( struct s_PXENV_TFTP_CLOSE *tftp_close ) {
 	DBG ( "PXENV_TFTP_CLOSE" );
 
 	pxe_tftp_close ( &pxe_tftp, 0 );
@@ -354,7 +354,7 @@
  * call this function with a 32-bit stack segment.  (See the relevant
  * @ref pxe_x86_pmode16 "implementation note" for more details.)
  */
-PXENV_EXIT_t pxenv_tftp_read ( struct s_PXENV_TFTP_READ *tftp_read ) {
+static PXENV_EXIT_t pxenv_tftp_read ( struct s_PXENV_TFTP_READ *tftp_read ) {
 	int rc;
 
 	DBG ( "PXENV_TFTP_READ to %04x:%04x",
@@ -531,8 +531,8 @@
  * a file from a TFTP server listening on the standard TFTP port.
  * "Consistency" is not a word in Intel's vocabulary.
  */
-PXENV_EXIT_t pxenv_tftp_get_fsize ( struct s_PXENV_TFTP_GET_FSIZE
-				    *tftp_get_fsize ) {
+static PXENV_EXIT_t pxenv_tftp_get_fsize ( struct s_PXENV_TFTP_GET_FSIZE
+					   *tftp_get_fsize ) {
 	int rc;
 
 	DBG ( "PXENV_TFTP_GET_FSIZE" );
@@ -562,3 +562,17 @@
 	tftp_get_fsize->Status = PXENV_STATUS ( rc );
 	return ( rc ? PXENV_EXIT_FAILURE : PXENV_EXIT_SUCCESS );
 }
+
+/** PXE TFTP API */
+struct pxe_api_call pxe_tftp_api[] __pxe_api_call = {
+	PXE_API_CALL ( PXENV_TFTP_OPEN, pxenv_tftp_open,
+		       struct s_PXENV_TFTP_OPEN ),
+	PXE_API_CALL ( PXENV_TFTP_CLOSE, pxenv_tftp_close,
+		       struct s_PXENV_TFTP_CLOSE ),
+	PXE_API_CALL ( PXENV_TFTP_READ, pxenv_tftp_read,
+		       struct s_PXENV_TFTP_READ ),
+	PXE_API_CALL ( PXENV_TFTP_READ_FILE, pxenv_tftp_read_file,
+		       struct s_PXENV_TFTP_READ_FILE ),
+	PXE_API_CALL ( PXENV_TFTP_GET_FSIZE, pxenv_tftp_get_fsize,
+		       struct s_PXENV_TFTP_GET_FSIZE ),
+};

=== modified file 'src/arch/i386/interface/pxe/pxe_udp.c'
--- src/arch/i386/interface/pxe/pxe_udp.c	2011-04-11 19:35:36 +0000
+++ src/arch/i386/interface/pxe/pxe_udp.c	2012-02-10 16:40:50 +0000
@@ -159,7 +159,7 @@
  * parameter.
  *
  */
-PXENV_EXIT_t pxenv_udp_open ( struct s_PXENV_UDP_OPEN *pxenv_udp_open ) {
+static PXENV_EXIT_t pxenv_udp_open ( struct s_PXENV_UDP_OPEN *pxenv_udp_open ) {
 	int rc;
 
 	DBG ( "PXENV_UDP_OPEN" );
@@ -202,7 +202,8 @@
  * @ref pxe_x86_pmode16 "implementation note" for more details.)
  *
  */
-PXENV_EXIT_t pxenv_udp_close ( struct s_PXENV_UDP_CLOSE *pxenv_udp_close ) {
+static PXENV_EXIT_t
+pxenv_udp_close ( struct s_PXENV_UDP_CLOSE *pxenv_udp_close ) {
 	DBG ( "PXENV_UDP_CLOSE\n" );
 
 	/* Close UDP connection */
@@ -253,7 +254,8 @@
  * parameter.
  *
  */
-PXENV_EXIT_t pxenv_udp_write ( struct s_PXENV_UDP_WRITE *pxenv_udp_write ) {
+static PXENV_EXIT_t
+pxenv_udp_write ( struct s_PXENV_UDP_WRITE *pxenv_udp_write ) {
 	struct sockaddr_in dest;
 	struct xfer_metadata meta = {
 		.src = ( struct sockaddr * ) &pxe_udp.local,
@@ -359,7 +361,7 @@
  * expects us to do so, and will fail if we don't.
  *
  */
-PXENV_EXIT_t pxenv_udp_read ( struct s_PXENV_UDP_READ *pxenv_udp_read ) {
+static PXENV_EXIT_t pxenv_udp_read ( struct s_PXENV_UDP_READ *pxenv_udp_read ) {
 	struct in_addr dest_ip_wanted = { .s_addr = pxenv_udp_read->dest_ip };
 	struct in_addr dest_ip;
 	uint16_t d_port_wanted = pxenv_udp_read->d_port;
@@ -405,3 +407,15 @@
 	pxenv_udp_read->Status = PXENV_STATUS_FAILURE;
 	return PXENV_EXIT_FAILURE;
 }
+
+/** PXE UDP API */
+struct pxe_api_call pxe_udp_api[] __pxe_api_call = {
+	PXE_API_CALL ( PXENV_UDP_OPEN, pxenv_udp_open,
+		       struct s_PXENV_UDP_OPEN ),
+	PXE_API_CALL ( PXENV_UDP_CLOSE, pxenv_udp_close,
+		       struct s_PXENV_UDP_CLOSE ),
+	PXE_API_CALL ( PXENV_UDP_WRITE, pxenv_udp_write,
+		       struct s_PXENV_UDP_WRITE ),
+	PXE_API_CALL ( PXENV_UDP_READ, pxenv_udp_read,
+		       struct s_PXENV_UDP_READ ),
+};

=== modified file 'src/arch/i386/interface/pxe/pxe_undi.c'
--- src/arch/i386/interface/pxe/pxe_undi.c	2011-07-31 20:57:02 +0000
+++ src/arch/i386/interface/pxe/pxe_undi.c	2012-02-10 16:40:50 +0000
@@ -58,11 +58,14 @@
  * @v netdev		Network device, or NULL
  */
 void pxe_set_netdev ( struct net_device *netdev ) {
+
 	if ( pxe_netdev ) {
 		netdev_rx_unfreeze ( pxe_netdev );
 		netdev_put ( pxe_netdev );
 	}
+
 	pxe_netdev = NULL;
+
 	if ( netdev )
 		pxe_netdev = netdev_get ( netdev );
 }
@@ -75,11 +78,14 @@
 static int pxe_netdev_open ( void ) {
 	int rc;
 
+	assert ( pxe_netdev != NULL );
+
 	if ( ( rc = netdev_open ( pxe_netdev ) ) != 0 )
 		return rc;
 
 	netdev_rx_freeze ( pxe_netdev );
 	netdev_irq ( pxe_netdev, 1 );
+
 	return 0;
 }
 
@@ -88,6 +94,8 @@
  *
  */
 static void pxe_netdev_close ( void ) {
+
+	assert ( pxe_netdev != NULL );
 	netdev_rx_unfreeze ( pxe_netdev );
 	netdev_irq ( pxe_netdev, 0 );
 	netdev_close ( pxe_netdev );
@@ -104,7 +112,8 @@
 	unsigned int i;
 
 	for ( i = 0 ; i < mcast->MCastAddrCount ; i++ ) {
-		DBG ( " %s", ll_protocol->ntoa ( mcast->McastAddr[i] ) );
+		DBGC ( &pxe_netdev, " %s",
+		       ll_protocol->ntoa ( mcast->McastAddr[i] ) );
 	}
 }
 
@@ -112,8 +121,17 @@
  *
  * Status: working
  */
-PXENV_EXIT_t pxenv_undi_startup ( struct s_PXENV_UNDI_STARTUP *undi_startup ) {
-	DBG ( "PXENV_UNDI_STARTUP\n" );
+static PXENV_EXIT_t
+pxenv_undi_startup ( struct s_PXENV_UNDI_STARTUP *undi_startup ) {
+	DBGC ( &pxe_netdev, "PXENV_UNDI_STARTUP\n" );
+
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxe_netdev, "PXENV_UNDI_STARTUP called with no "
+		       "network device\n" );
+		undi_startup->Status = PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
 
 	undi_startup->Status = PXENV_STATUS_SUCCESS;
 	return PXENV_EXIT_SUCCESS;
@@ -123,9 +141,19 @@
  *
  * Status: working
  */
-PXENV_EXIT_t pxenv_undi_cleanup ( struct s_PXENV_UNDI_CLEANUP *undi_cleanup ) {
-	DBG ( "PXENV_UNDI_CLEANUP\n" );
-
+static PXENV_EXIT_t
+pxenv_undi_cleanup ( struct s_PXENV_UNDI_CLEANUP *undi_cleanup ) {
+	DBGC ( &pxe_netdev, "PXENV_UNDI_CLEANUP\n" );
+
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxe_netdev, "PXENV_UNDI_CLEANUP called with no "
+		       "network device\n" );
+		undi_cleanup->Status = PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
+
+	/* Close network device */
 	pxe_netdev_close();
 
 	undi_cleanup->Status = PXENV_STATUS_SUCCESS;
@@ -136,10 +164,18 @@
  *
  * Status: working
  */
-PXENV_EXIT_t pxenv_undi_initialize ( struct s_PXENV_UNDI_INITIALIZE
-				     *undi_initialize ) {
-	DBG ( "PXENV_UNDI_INITIALIZE protocolini %08x\n",
-	      undi_initialize->ProtocolIni );
+static PXENV_EXIT_t
+pxenv_undi_initialize ( struct s_PXENV_UNDI_INITIALIZE *undi_initialize ) {
+	DBGC ( &pxe_netdev, "PXENV_UNDI_INITIALIZE protocolini %08x\n",
+	       undi_initialize->ProtocolIni );
+
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxe_netdev, "PXENV_UNDI_INITIALIZE called with no "
+		       "network device\n" );
+		undi_initialize->Status = PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
 
 	undi_initialize->Status = PXENV_STATUS_SUCCESS;
 	return PXENV_EXIT_SUCCESS;
@@ -149,18 +185,27 @@
  *
  * Status: working
  */
-PXENV_EXIT_t pxenv_undi_reset_adapter ( struct s_PXENV_UNDI_RESET
-					*undi_reset_adapter ) {
+static PXENV_EXIT_t
+pxenv_undi_reset_adapter ( struct s_PXENV_UNDI_RESET *undi_reset_adapter ) {
 	int rc;
 
-	DBG ( "PXENV_UNDI_RESET_ADAPTER" );
+	DBGC ( &pxe_netdev, "PXENV_UNDI_RESET_ADAPTER" );
 	pxe_dump_mcast_list ( &undi_reset_adapter->R_Mcast_Buf );
-	DBG ( "\n" );
-
+	DBGC ( &pxe_netdev, "\n" );
+
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxe_netdev, "PXENV_UNDI_RESET_ADAPTER called with no "
+		       "network device\n" );
+		undi_reset_adapter->Status = PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
+
+	/* Close and reopen network device */
 	pxe_netdev_close();
 	if ( ( rc = pxe_netdev_open() ) != 0 ) {
-		DBG ( "PXENV_UNDI_RESET_ADAPTER could not reopen %s: %s\n",
-		      pxe_netdev->name, strerror ( rc ) );
+		DBGC ( &pxe_netdev, "PXENV_UNDI_RESET_ADAPTER could not "
+		       "reopen %s: %s\n", pxe_netdev->name, strerror ( rc ) );
 		undi_reset_adapter->Status = PXENV_STATUS ( rc );
 		return PXENV_EXIT_FAILURE;
 	}
@@ -173,10 +218,19 @@
  *
  * Status: working
  */
-PXENV_EXIT_t pxenv_undi_shutdown ( struct s_PXENV_UNDI_SHUTDOWN
-				   *undi_shutdown ) {
-	DBG ( "PXENV_UNDI_SHUTDOWN\n" );
-
+static PXENV_EXIT_t
+pxenv_undi_shutdown ( struct s_PXENV_UNDI_SHUTDOWN *undi_shutdown ) {
+	DBGC ( &pxe_netdev, "PXENV_UNDI_SHUTDOWN\n" );
+
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxe_netdev, "PXENV_UNDI_SHUTDOWN called with no "
+		       "network device\n" );
+		undi_shutdown->Status = PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
+
+	/* Close network device */
 	pxe_netdev_close();
 
 	undi_shutdown->Status = PXENV_STATUS_SUCCESS;
@@ -187,17 +241,26 @@
  *
  * Status: working
  */
-PXENV_EXIT_t pxenv_undi_open ( struct s_PXENV_UNDI_OPEN *undi_open ) {
+static PXENV_EXIT_t pxenv_undi_open ( struct s_PXENV_UNDI_OPEN *undi_open ) {
 	int rc;
 
-	DBG ( "PXENV_UNDI_OPEN flag %04x filter %04x",
-	      undi_open->OpenFlag, undi_open->PktFilter );
+	DBGC ( &pxe_netdev, "PXENV_UNDI_OPEN flag %04x filter %04x",
+	       undi_open->OpenFlag, undi_open->PktFilter );
 	pxe_dump_mcast_list ( &undi_open->R_Mcast_Buf );
-	DBG ( "\n" );
-
+	DBGC ( &pxe_netdev, "\n" );
+
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxe_netdev, "PXENV_UNDI_OPEN called with no "
+		       "network device\n" );
+		undi_open->Status = PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
+
+	/* Open network device */
 	if ( ( rc = pxe_netdev_open() ) != 0 ) {
-		DBG ( "PXENV_UNDI_OPEN could not open %s: %s\n",
-		      pxe_netdev->name, strerror ( rc ) );
+		DBGC ( &pxe_netdev, "PXENV_UNDI_OPEN could not open %s: %s\n",
+		       pxe_netdev->name, strerror ( rc ) );
 		undi_open->Status = PXENV_STATUS ( rc );
 		return PXENV_EXIT_FAILURE;
 	}
@@ -210,9 +273,18 @@
  *
  * Status: working
  */
-PXENV_EXIT_t pxenv_undi_close ( struct s_PXENV_UNDI_CLOSE *undi_close ) {
-	DBG ( "PXENV_UNDI_CLOSE\n" );
-
+static PXENV_EXIT_t pxenv_undi_close ( struct s_PXENV_UNDI_CLOSE *undi_close ) {
+	DBGC ( &pxe_netdev, "PXENV_UNDI_CLOSE\n" );
+
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxe_netdev, "PXENV_UNDI_CLOSE called with no "
+		       "network device\n" );
+		undi_close->Status = PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
+
+	/* Close network device */
 	pxe_netdev_close();
 
 	undi_close->Status = PXENV_STATUS_SUCCESS;
@@ -223,20 +295,28 @@
  *
  * Status: working
  */
-PXENV_EXIT_t pxenv_undi_transmit ( struct s_PXENV_UNDI_TRANSMIT
-				   *undi_transmit ) {
+static PXENV_EXIT_t
+pxenv_undi_transmit ( struct s_PXENV_UNDI_TRANSMIT *undi_transmit ) {
 	struct s_PXENV_UNDI_TBD tbd;
 	struct DataBlk *datablk;
 	struct io_buffer *iobuf;
 	struct net_protocol *net_protocol;
-	struct ll_protocol *ll_protocol = pxe_netdev->ll_protocol;
+	struct ll_protocol *ll_protocol;
 	char destaddr[MAX_LL_ADDR_LEN];
 	const void *ll_dest;
 	size_t len;
 	unsigned int i;
 	int rc;
 
-	DBG2 ( "PXENV_UNDI_TRANSMIT" );
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxe_netdev, "PXENV_UNDI_TRANSMIT called with no "
+		       "network device\n" );
+		undi_transmit->Status = PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
+
+	DBGC2 ( &pxe_netdev, "PXENV_UNDI_TRANSMIT" );
 
 	/* Forcibly enable interrupts and freeze receive queue
 	 * processing at this point, to work around callers that never
@@ -254,29 +334,32 @@
 		net_protocol = NULL;
 		break;
 	default:
-		DBG2 ( " %02x invalid protocol\n", undi_transmit->Protocol );
+		DBGC2 ( &pxe_netdev, " %02x invalid protocol\n",
+			undi_transmit->Protocol );
 		undi_transmit->Status = PXENV_STATUS_UNDI_INVALID_PARAMETER;
 		return PXENV_EXIT_FAILURE;
 	}
-	DBG2 ( " %s", ( net_protocol ? net_protocol->name : "RAW" ) );
+	DBGC2 ( &pxe_netdev, " %s",
+		( net_protocol ? net_protocol->name : "RAW" ) );
 
 	/* Calculate total packet length */
 	copy_from_real ( &tbd, undi_transmit->TBD.segment,
 			 undi_transmit->TBD.offset, sizeof ( tbd ) );
 	len = tbd.ImmedLength;
-	DBG2 ( " %04x:%04x+%x", tbd.Xmit.segment, tbd.Xmit.offset,
-	       tbd.ImmedLength );
+	DBGC2 ( &pxe_netdev, " %04x:%04x+%x", tbd.Xmit.segment, tbd.Xmit.offset,
+		tbd.ImmedLength );
 	for ( i = 0 ; i < tbd.DataBlkCount ; i++ ) {
 		datablk = &tbd.DataBlock[i];
 		len += datablk->TDDataLen;
-		DBG2 ( " %04x:%04x+%x", datablk->TDDataPtr.segment,
-		       datablk->TDDataPtr.offset, datablk->TDDataLen );
+		DBGC2 ( &pxe_netdev, " %04x:%04x+%x",
+			datablk->TDDataPtr.segment, datablk->TDDataPtr.offset,
+			datablk->TDDataLen );
 	}
 
 	/* Allocate and fill I/O buffer */
 	iobuf = alloc_iob ( MAX_LL_HEADER_LEN + len );
 	if ( ! iobuf ) {
-		DBG2 ( " could not allocate iobuf\n" );
+		DBGC2 ( &pxe_netdev, " could not allocate iobuf\n" );
 		undi_transmit->Status = PXENV_STATUS_OUT_OF_RESOURCES;
 		return PXENV_EXIT_FAILURE;
 	}
@@ -295,24 +378,26 @@
 	if ( net_protocol != NULL ) {
 
 		/* Calculate destination address */
+		ll_protocol = pxe_netdev->ll_protocol;
 		if ( undi_transmit->XmitFlag == XMT_DESTADDR ) {
 			copy_from_real ( destaddr,
 					 undi_transmit->DestAddr.segment,
 					 undi_transmit->DestAddr.offset,
 					 ll_protocol->ll_addr_len );
 			ll_dest = destaddr;
-			DBG2 ( " DEST %s", ll_protocol->ntoa ( ll_dest ) );
+			DBGC2 ( &pxe_netdev, " DEST %s",
+				ll_protocol->ntoa ( ll_dest ) );
 		} else {
 			ll_dest = pxe_netdev->ll_broadcast;
-			DBG2 ( " BCAST" );
+			DBGC2 ( &pxe_netdev, " BCAST" );
 		}
 
 		/* Add link-layer header */
 		if ( ( rc = ll_protocol->push ( pxe_netdev, iobuf, ll_dest,
 						pxe_netdev->ll_addr,
 						net_protocol->net_proto ))!=0){
-			DBG2 ( " could not add link-layer header: %s\n",
-			       strerror ( rc ) );
+			DBGC2 ( &pxe_netdev, " could not add link-layer "
+				"header: %s\n", strerror ( rc ) );
 			free_iob ( iobuf );
 			undi_transmit->Status = PXENV_STATUS ( rc );
 			return PXENV_EXIT_FAILURE;
@@ -326,10 +411,10 @@
 	undi_tx_count++;
 
 	/* Transmit packet */
-	DBG2 ( "\n" );
+	DBGC2 ( &pxe_netdev, "\n" );
 	if ( ( rc = netdev_tx ( pxe_netdev, iobuf ) ) != 0 ) {
-		DBG2 ( "PXENV_UNDI_TRANSMIT could not transmit: %s\n",
-		       strerror ( rc ) );
+		DBGC2 ( &pxe_netdev, "PXENV_UNDI_TRANSMIT could not transmit: "
+			"%s\n", strerror ( rc ) );
 		undi_tx_count--;
 		undi_transmit->Status = PXENV_STATUS ( rc );
 		return PXENV_EXIT_FAILURE;
@@ -343,12 +428,21 @@
  *
  * Status: working (for NICs that support receive-all-multicast)
  */
-PXENV_EXIT_t
+static PXENV_EXIT_t
 pxenv_undi_set_mcast_address ( struct s_PXENV_UNDI_SET_MCAST_ADDRESS
 			       *undi_set_mcast_address ) {
-	DBG ( "PXENV_UNDI_SET_MCAST_ADDRESS" );
+	DBGC ( &pxe_netdev, "PXENV_UNDI_SET_MCAST_ADDRESS" );
 	pxe_dump_mcast_list ( &undi_set_mcast_address->R_Mcast_Buf );
-	DBG ( "\n" );
+	DBGC ( &pxe_netdev, "\n" );
+
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxe_netdev, "PXENV_UNDI_SET_MCAST_ADDRESS called with "
+		       "no network device\n" );
+		undi_set_mcast_address->Status =
+			PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
 
 	undi_set_mcast_address->Status = PXENV_STATUS_SUCCESS;
 	return PXENV_EXIT_SUCCESS;
@@ -358,19 +452,29 @@
  *
  * Status: working
  */
-PXENV_EXIT_t 
+static PXENV_EXIT_t
 pxenv_undi_set_station_address ( struct s_PXENV_UNDI_SET_STATION_ADDRESS
 				 *undi_set_station_address ) {
-	struct ll_protocol *ll_protocol = pxe_netdev->ll_protocol;
-
-	DBG ( "PXENV_UNDI_SET_STATION_ADDRESS %s",
-	      ll_protocol->ntoa ( undi_set_station_address->StationAddress ) );
+	struct ll_protocol *ll_protocol;
+
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxe_netdev, "PXENV_UNDI_SET_STATION_ADDRESS called "
+		       "with no network device\n" );
+		undi_set_station_address->Status =
+			PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
+
+	ll_protocol = pxe_netdev->ll_protocol;
+	DBGC ( &pxe_netdev, "PXENV_UNDI_SET_STATION_ADDRESS %s",
+	       ll_protocol->ntoa ( undi_set_station_address->StationAddress ) );
 
 	/* If adapter is open, the change will have no effect; return
 	 * an error
 	 */
 	if ( netdev_is_open ( pxe_netdev ) ) {
-		DBG ( " failed: netdev is open\n" );
+		DBGC ( &pxe_netdev, " failed: netdev is open\n" );
 		undi_set_station_address->Status =
 			PXENV_STATUS_UNDI_INVALID_STATE;
 		return PXENV_EXIT_FAILURE;
@@ -381,7 +485,7 @@
 		 &undi_set_station_address->StationAddress,
 		 ll_protocol->ll_addr_len );
 
-	DBG ( "\n" );
+	DBGC ( &pxe_netdev, "\n" );
 	undi_set_station_address->Status = PXENV_STATUS_SUCCESS;
 	return PXENV_EXIT_SUCCESS;
 }
@@ -391,12 +495,21 @@
  * Status: won't implement (would require driver API changes for no
  * real benefit)
  */
-PXENV_EXIT_t
+static PXENV_EXIT_t
 pxenv_undi_set_packet_filter ( struct s_PXENV_UNDI_SET_PACKET_FILTER
 			       *undi_set_packet_filter ) {
 
-	DBG ( "PXENV_UNDI_SET_PACKET_FILTER %02x\n",
-	      undi_set_packet_filter->filter );
+	DBGC ( &pxe_netdev, "PXENV_UNDI_SET_PACKET_FILTER %02x\n",
+	       undi_set_packet_filter->filter );
+
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxe_netdev, "PXENV_UNDI_SET_PACKET_FILTER called with "
+		       "no network device\n" );
+		undi_set_packet_filter->Status =
+			PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
 
 	/* Pretend that we succeeded, otherwise the 3Com DOS UNDI
 	 * driver refuses to load.  (We ignore the filter value in the
@@ -411,22 +524,33 @@
  *
  * Status: working
  */
-PXENV_EXIT_t pxenv_undi_get_information ( struct s_PXENV_UNDI_GET_INFORMATION
-					  *undi_get_information ) {
-	struct device *dev = pxe_netdev->dev;
-	struct ll_protocol *ll_protocol = pxe_netdev->ll_protocol;
-	size_t ll_addr_len = ll_protocol->ll_addr_len;
-
-	DBG ( "PXENV_UNDI_GET_INFORMATION" );
-
+static PXENV_EXIT_t
+pxenv_undi_get_information ( struct s_PXENV_UNDI_GET_INFORMATION
+			     *undi_get_information ) {
+	struct device *dev;
+	struct ll_protocol *ll_protocol;
+
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxe_netdev, "PXENV_UNDI_GET_INFORMATION called with no "
+		       "network device\n" );
+		undi_get_information->Status = PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
+
+	DBGC ( &pxe_netdev, "PXENV_UNDI_GET_INFORMATION" );
+
+	/* Fill in information */
+	dev = pxe_netdev->dev;
+	ll_protocol = pxe_netdev->ll_protocol;
 	undi_get_information->BaseIo = dev->desc.ioaddr;
 	undi_get_information->IntNumber =
 		( netdev_irq_supported ( pxe_netdev ) ? dev->desc.irq : 0 );
 	/* Cheat: assume all cards can cope with this */
 	undi_get_information->MaxTranUnit = ETH_MAX_MTU;
 	undi_get_information->HwType = ntohs ( ll_protocol->ll_proto );
-	undi_get_information->HwAddrLen = ll_addr_len;
-	assert ( ll_addr_len <=
+	undi_get_information->HwAddrLen = ll_protocol->ll_addr_len;
+	assert ( ll_protocol->ll_addr_len <=
 		 sizeof ( undi_get_information->CurrentNodeAddress ) );
 	memcpy ( &undi_get_information->CurrentNodeAddress,
 		 pxe_netdev->ll_addr,
@@ -441,10 +565,10 @@
 	undi_get_information->RxBufCt = 1;
 	undi_get_information->TxBufCt = 1;
 
-	DBG ( " io %04x irq %d mtu %d %s %s\n",
-	      undi_get_information->BaseIo, undi_get_information->IntNumber,
-	      undi_get_information->MaxTranUnit, ll_protocol->name,
-	      ll_protocol->ntoa ( &undi_get_information->CurrentNodeAddress ));
+	DBGC ( &pxe_netdev, " io %04x irq %d mtu %d %s %s\n",
+	       undi_get_information->BaseIo, undi_get_information->IntNumber,
+	       undi_get_information->MaxTranUnit, ll_protocol->name,
+	       ll_protocol->ntoa ( &undi_get_information->CurrentNodeAddress ));
 	undi_get_information->Status = PXENV_STATUS_SUCCESS;
 	return PXENV_EXIT_SUCCESS;
 }
@@ -453,20 +577,31 @@
  *
  * Status: working
  */
-PXENV_EXIT_t pxenv_undi_get_statistics ( struct s_PXENV_UNDI_GET_STATISTICS
-					 *undi_get_statistics ) {
-	DBG ( "PXENV_UNDI_GET_STATISTICS" );
-
+static PXENV_EXIT_t
+pxenv_undi_get_statistics ( struct s_PXENV_UNDI_GET_STATISTICS
+			    *undi_get_statistics ) {
+
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxe_netdev, "PXENV_UNDI_GET_STATISTICS called with no "
+		       "network device\n" );
+		undi_get_statistics->Status = PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
+
+	DBGC ( &pxe_netdev, "PXENV_UNDI_GET_STATISTICS" );
+
+	/* Report statistics */
 	undi_get_statistics->XmtGoodFrames = pxe_netdev->tx_stats.good;
 	undi_get_statistics->RcvGoodFrames = pxe_netdev->rx_stats.good;
 	undi_get_statistics->RcvCRCErrors = pxe_netdev->rx_stats.bad;
 	undi_get_statistics->RcvResourceErrors = pxe_netdev->rx_stats.bad;
+	DBGC ( &pxe_netdev, " txok %d rxok %d rxcrc %d rxrsrc %d\n",
+	       undi_get_statistics->XmtGoodFrames,
+	       undi_get_statistics->RcvGoodFrames,
+	       undi_get_statistics->RcvCRCErrors,
+	       undi_get_statistics->RcvResourceErrors );
 
-	DBG ( " txok %d rxok %d rxcrc %d rxrsrc %d\n",
-	      undi_get_statistics->XmtGoodFrames,
-	      undi_get_statistics->RcvGoodFrames,
-	      undi_get_statistics->RcvCRCErrors,
-	      undi_get_statistics->RcvResourceErrors );
 	undi_get_statistics->Status = PXENV_STATUS_SUCCESS;
 	return PXENV_EXIT_SUCCESS;
 }
@@ -475,10 +610,20 @@
  *
  * Status: working
  */
-PXENV_EXIT_t pxenv_undi_clear_statistics ( struct s_PXENV_UNDI_CLEAR_STATISTICS
-					   *undi_clear_statistics ) {
-	DBG ( "PXENV_UNDI_CLEAR_STATISTICS\n" );
-
+static PXENV_EXIT_t
+pxenv_undi_clear_statistics ( struct s_PXENV_UNDI_CLEAR_STATISTICS
+			      *undi_clear_statistics ) {
+	DBGC ( &pxe_netdev, "PXENV_UNDI_CLEAR_STATISTICS\n" );
+
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxe_netdev, "PXENV_UNDI_CLEAR_STATISTICS called with "
+		       "no network device\n" );
+		undi_clear_statistics->Status = PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
+
+	/* Clear statistics */
 	memset ( &pxe_netdev->tx_stats, 0, sizeof ( pxe_netdev->tx_stats ) );
 	memset ( &pxe_netdev->rx_stats, 0, sizeof ( pxe_netdev->rx_stats ) );
 
@@ -491,9 +636,18 @@
  * Status: won't implement (would require driver API changes for no
  * real benefit)
  */
-PXENV_EXIT_t pxenv_undi_initiate_diags ( struct s_PXENV_UNDI_INITIATE_DIAGS
-					 *undi_initiate_diags ) {
-	DBG ( "PXENV_UNDI_INITIATE_DIAGS failed: unsupported\n" );
+static PXENV_EXIT_t
+pxenv_undi_initiate_diags ( struct s_PXENV_UNDI_INITIATE_DIAGS
+			    *undi_initiate_diags ) {
+	DBGC ( &pxe_netdev, "PXENV_UNDI_INITIATE_DIAGS failed: unsupported\n" );
+
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxe_netdev, "PXENV_UNDI_INITIATE_DIAGS called with no "
+		       "network device\n" );
+		undi_initiate_diags->Status = PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
 
 	undi_initiate_diags->Status = PXENV_STATUS_UNSUPPORTED;
 	return PXENV_EXIT_FAILURE;
@@ -504,9 +658,19 @@
  * Status: won't implement (would require driver API changes for no
  * perceptible benefit)
  */
-PXENV_EXIT_t pxenv_undi_force_interrupt ( struct s_PXENV_UNDI_FORCE_INTERRUPT
-					  *undi_force_interrupt ) {
-	DBG ( "PXENV_UNDI_FORCE_INTERRUPT failed: unsupported\n" );
+static PXENV_EXIT_t
+pxenv_undi_force_interrupt ( struct s_PXENV_UNDI_FORCE_INTERRUPT
+			     *undi_force_interrupt ) {
+	DBGC ( &pxe_netdev,
+	       "PXENV_UNDI_FORCE_INTERRUPT failed: unsupported\n" );
+
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxe_netdev, "PXENV_UNDI_FORCE_INTERRUPT called with no "
+		       "network device\n" );
+		undi_force_interrupt->Status = PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
 
 	undi_force_interrupt->Status = PXENV_STATUS_UNSUPPORTED;
 	return PXENV_EXIT_FAILURE;
@@ -516,23 +680,35 @@
  *
  * Status: working
  */
-PXENV_EXIT_t
+static PXENV_EXIT_t
 pxenv_undi_get_mcast_address ( struct s_PXENV_UNDI_GET_MCAST_ADDRESS
 			       *undi_get_mcast_address ) {
-	struct ll_protocol *ll_protocol = pxe_netdev->ll_protocol;
+	struct ll_protocol *ll_protocol;
 	struct in_addr ip = { .s_addr = undi_get_mcast_address->InetAddr };
 	int rc;
 
-	DBG ( "PXENV_UNDI_GET_MCAST_ADDRESS %s", inet_ntoa ( ip ) );
-
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxe_netdev, "PXENV_UNDI_GET_MCAST_ADDRESS called with "
+		       "no network device\n" );
+		undi_get_mcast_address->Status =
+			PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
+
+	DBGC ( &pxe_netdev, "PXENV_UNDI_GET_MCAST_ADDRESS %s",
+	       inet_ntoa ( ip ) );
+
+	/* Hash address using the network device's link-layer protocol */
+	ll_protocol = pxe_netdev->ll_protocol;
 	if ( ( rc = ll_protocol->mc_hash ( AF_INET, &ip,
 				      undi_get_mcast_address->MediaAddr ))!=0){
-		DBG ( " failed: %s\n", strerror ( rc ) );
+		DBGC ( &pxe_netdev, " failed: %s\n", strerror ( rc ) );
 		undi_get_mcast_address->Status = PXENV_STATUS ( rc );
 		return PXENV_EXIT_FAILURE;
 	}
-	DBG ( "=>%s\n",
-	      ll_protocol->ntoa ( undi_get_mcast_address->MediaAddr ) );
+	DBGC ( &pxe_netdev, "=>%s\n",
+	       ll_protocol->ntoa ( undi_get_mcast_address->MediaAddr ) );
 
 	undi_get_mcast_address->Status = PXENV_STATUS_SUCCESS;
 	return PXENV_EXIT_SUCCESS;
@@ -542,15 +718,24 @@
  *
  * Status: working
  */
-PXENV_EXIT_t pxenv_undi_get_nic_type ( struct s_PXENV_UNDI_GET_NIC_TYPE
-				       *undi_get_nic_type ) {
-	struct device *dev = pxe_netdev->dev;
-
-	DBG ( "PXENV_UNDI_GET_NIC_TYPE" );
-
+static PXENV_EXIT_t pxenv_undi_get_nic_type ( struct s_PXENV_UNDI_GET_NIC_TYPE
+					      *undi_get_nic_type ) {
+	struct device *dev;
+
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxe_netdev, "PXENV_UNDI_GET_NIC_TYPE called with "
+		       "no network device\n" );
+		undi_get_nic_type->Status = PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
+
+	DBGC ( &pxe_netdev, "PXENV_UNDI_GET_NIC_TYPE" );
+
+	/* Fill in information */
 	memset ( &undi_get_nic_type->info, 0,
 		 sizeof ( undi_get_nic_type->info ) );
-
+	dev = pxe_netdev->dev;
 	switch ( dev->desc.bus_type ) {
 	case BUS_TYPE_PCI: {
 		struct pci_nic_info *info = &undi_get_nic_type->info.pci;
@@ -567,13 +752,14 @@
 		 * is possible that some NBPs will not provide space
 		 * for them, and so we must not fill them in.
 		 */
-		DBG ( " PCI %02x:%02x.%x %04x:%04x ('%04x:%04x') %02x%02x%02x "
-		      "rev %02x\n", PCI_BUS ( info->BusDevFunc ),
-		      PCI_SLOT ( info->BusDevFunc ),
-		      PCI_FUNC ( info->BusDevFunc ), info->Vendor_ID,
-		      info->Dev_ID, info->SubVendor_ID, info->SubDevice_ID,
-		      info->Base_Class, info->Sub_Class, info->Prog_Intf,
-		      info->Rev );
+		DBGC ( &pxe_netdev, " PCI %02x:%02x.%x %04x:%04x "
+		       "('%04x:%04x') %02x%02x%02x rev %02x\n",
+		       PCI_BUS ( info->BusDevFunc ),
+		       PCI_SLOT ( info->BusDevFunc ),
+		       PCI_FUNC ( info->BusDevFunc ), info->Vendor_ID,
+		       info->Dev_ID, info->SubVendor_ID, info->SubDevice_ID,
+		       info->Base_Class, info->Sub_Class, info->Prog_Intf,
+		       info->Rev );
 		break; }
 	case BUS_TYPE_ISAPNP: {
 		struct pnp_nic_info *info = &undi_get_nic_type->info.pnp;
@@ -585,12 +771,12 @@
 		/* Cheat: remaining fields are probably unnecessary,
 		 * and would require adding extra code to isapnp.c.
 		 */
-		DBG ( " ISAPnP CSN %04x %08x %02x%02x%02x\n",
-		      info->CardSelNum, info->EISA_Dev_ID,
-		      info->Base_Class, info->Sub_Class, info->Prog_Intf );
+		DBGC ( &pxe_netdev, " ISAPnP CSN %04x %08x %02x%02x%02x\n",
+		       info->CardSelNum, info->EISA_Dev_ID,
+		       info->Base_Class, info->Sub_Class, info->Prog_Intf );
 		break; }
 	default:
-		DBG ( " failed: unknown bus type\n" );
+		DBGC ( &pxe_netdev, " failed: unknown bus type\n" );
 		undi_get_nic_type->Status = PXENV_STATUS_FAILURE;
 		return PXENV_EXIT_FAILURE;
 	}
@@ -603,9 +789,19 @@
  *
  * Status: working
  */
-PXENV_EXIT_t pxenv_undi_get_iface_info ( struct s_PXENV_UNDI_GET_IFACE_INFO
-					 *undi_get_iface_info ) {
-	DBG ( "PXENV_UNDI_GET_IFACE_INFO" );
+static PXENV_EXIT_t
+pxenv_undi_get_iface_info ( struct s_PXENV_UNDI_GET_IFACE_INFO
+			    *undi_get_iface_info ) {
+
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxe_netdev, "PXENV_UNDI_GET_IFACE_INFO called with "
+		       "no network device\n" );
+		undi_get_iface_info->Status = PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
+
+	DBGC ( &pxe_netdev, "PXENV_UNDI_GET_IFACE_INFO" );
 
 	/* Just hand back some info, doesn't really matter what it is.
 	 * Most PXE stacks seem to take this approach.
@@ -622,30 +818,23 @@
 	memset ( undi_get_iface_info->Reserved, 0,
 		 sizeof(undi_get_iface_info->Reserved) );
 
-	DBG ( " %s %dbps flags %08x\n", undi_get_iface_info->IfaceType,
-	      undi_get_iface_info->LinkSpeed,
-	      undi_get_iface_info->ServiceFlags );
+	DBGC ( &pxe_netdev, " %s %dbps flags %08x\n",
+	       undi_get_iface_info->IfaceType, undi_get_iface_info->LinkSpeed,
+	       undi_get_iface_info->ServiceFlags );
 	undi_get_iface_info->Status = PXENV_STATUS_SUCCESS;
 	return PXENV_EXIT_SUCCESS;
 }
 
 /* PXENV_UNDI_GET_STATE
  *
- * Status: impossible
+ * Status: impossible due to opcode collision
  */
-PXENV_EXIT_t pxenv_undi_get_state ( struct s_PXENV_UNDI_GET_STATE
-				    *undi_get_state ) {
-	DBG ( "PXENV_UNDI_GET_STATE failed: unsupported\n" );
-
-	undi_get_state->Status = PXENV_STATUS_UNSUPPORTED;
-	return PXENV_EXIT_FAILURE;
-};
 
 /* PXENV_UNDI_ISR
  *
  * Status: working
  */
-PXENV_EXIT_t pxenv_undi_isr ( struct s_PXENV_UNDI_ISR *undi_isr ) {
+static PXENV_EXIT_t pxenv_undi_isr ( struct s_PXENV_UNDI_ISR *undi_isr ) {
 	struct io_buffer *iobuf;
 	size_t len;
 	struct ll_protocol *ll_protocol;
@@ -658,9 +847,18 @@
 	unsigned int prottype;
 	int rc;
 
-	/* Use coloured debug, since UNDI ISR messages are likely to
-	 * be interspersed amongst other UNDI messages.
+	/* Use a different debug colour, since UNDI ISR messages are
+	 * likely to be interspersed amongst other UNDI messages.
 	 */
+
+	/* Sanity check */
+	if ( ! pxe_netdev ) {
+		DBGC ( &pxenv_undi_isr, "PXENV_UNDI_ISR called with "
+		       "no network device\n" );
+		undi_isr->Status = PXENV_STATUS_UNDI_INVALID_STATE;
+		return PXENV_EXIT_FAILURE;
+	}
+
 	DBGC2 ( &pxenv_undi_isr, "PXENV_UNDI_ISR" );
 
 	/* Just in case some idiot actually looks at these fields when
@@ -820,3 +1018,51 @@
 	undi_isr->Status = PXENV_STATUS_SUCCESS;
 	return PXENV_EXIT_SUCCESS;
 }
+
+/** PXE UNDI API */
+struct pxe_api_call pxe_undi_api[] __pxe_api_call = {
+	PXE_API_CALL ( PXENV_UNDI_STARTUP, pxenv_undi_startup,
+		       struct s_PXENV_UNDI_STARTUP ),
+	PXE_API_CALL ( PXENV_UNDI_CLEANUP, pxenv_undi_cleanup,
+		       struct s_PXENV_UNDI_CLEANUP ),
+	PXE_API_CALL ( PXENV_UNDI_INITIALIZE, pxenv_undi_initialize,
+		       struct s_PXENV_UNDI_INITIALIZE ),
+	PXE_API_CALL ( PXENV_UNDI_RESET_ADAPTER, pxenv_undi_reset_adapter,
+		       struct s_PXENV_UNDI_RESET ),
+	PXE_API_CALL ( PXENV_UNDI_SHUTDOWN, pxenv_undi_shutdown,
+		       struct s_PXENV_UNDI_SHUTDOWN ),
+	PXE_API_CALL ( PXENV_UNDI_OPEN, pxenv_undi_open,
+		       struct s_PXENV_UNDI_OPEN ),
+	PXE_API_CALL ( PXENV_UNDI_CLOSE, pxenv_undi_close,
+		       struct s_PXENV_UNDI_CLOSE ),
+	PXE_API_CALL ( PXENV_UNDI_TRANSMIT, pxenv_undi_transmit,
+		       struct s_PXENV_UNDI_TRANSMIT ),
+	PXE_API_CALL ( PXENV_UNDI_SET_MCAST_ADDRESS,
+		       pxenv_undi_set_mcast_address,
+		       struct s_PXENV_UNDI_SET_MCAST_ADDRESS ),
+	PXE_API_CALL ( PXENV_UNDI_SET_STATION_ADDRESS,
+		       pxenv_undi_set_station_address,
+		       struct s_PXENV_UNDI_SET_STATION_ADDRESS ),
+	PXE_API_CALL ( PXENV_UNDI_SET_PACKET_FILTER,
+		       pxenv_undi_set_packet_filter,
+		       struct s_PXENV_UNDI_SET_PACKET_FILTER ),
+	PXE_API_CALL ( PXENV_UNDI_GET_INFORMATION, pxenv_undi_get_information,
+		       struct s_PXENV_UNDI_GET_INFORMATION ),
+	PXE_API_CALL ( PXENV_UNDI_GET_STATISTICS, pxenv_undi_get_statistics,
+		       struct s_PXENV_UNDI_GET_STATISTICS ),
+	PXE_API_CALL ( PXENV_UNDI_CLEAR_STATISTICS, pxenv_undi_clear_statistics,
+		       struct s_PXENV_UNDI_CLEAR_STATISTICS ),
+	PXE_API_CALL ( PXENV_UNDI_INITIATE_DIAGS, pxenv_undi_initiate_diags,
+		       struct s_PXENV_UNDI_INITIATE_DIAGS ),
+	PXE_API_CALL ( PXENV_UNDI_FORCE_INTERRUPT, pxenv_undi_force_interrupt,
+		       struct s_PXENV_UNDI_FORCE_INTERRUPT ),
+	PXE_API_CALL ( PXENV_UNDI_GET_MCAST_ADDRESS,
+		       pxenv_undi_get_mcast_address,
+		       struct s_PXENV_UNDI_GET_MCAST_ADDRESS ),
+	PXE_API_CALL ( PXENV_UNDI_GET_NIC_TYPE, pxenv_undi_get_nic_type,
+		       struct s_PXENV_UNDI_GET_NIC_TYPE ),
+	PXE_API_CALL ( PXENV_UNDI_GET_IFACE_INFO, pxenv_undi_get_iface_info,
+		       struct s_PXENV_UNDI_GET_IFACE_INFO ),
+	PXE_API_CALL ( PXENV_UNDI_ISR, pxenv_undi_isr,
+		       struct s_PXENV_UNDI_ISR ),
+};

=== modified file 'src/arch/i386/interface/syslinux/comboot_call.c'
--- src/arch/i386/interface/syslinux/comboot_call.c	2011-04-11 19:35:36 +0000
+++ src/arch/i386/interface/syslinux/comboot_call.c	2012-02-10 16:40:50 +0000
@@ -185,7 +185,7 @@
 
 		/* Fetch initrd */
 		if ( ( rc = imgdownload_string ( initrd_file, NULL, NULL,
-						 register_and_put_image ))!=0){
+						 NULL ) ) != 0 ) {
 			DBG ( "COMBOOT: could not fetch initrd: %s\n",
 			      strerror ( rc ) );
 			return rc;
@@ -200,7 +200,7 @@
 
 	/* Allocate and fetch kernel */
 	if ( ( rc = imgdownload_string ( kernel_file, NULL, cmdline,
-					 register_and_replace_image ) ) != 0 ) {
+					 image_replace ) ) != 0 ) {
 		DBG ( "COMBOOT: could not fetch kernel: %s\n",
 		      strerror ( rc ) );
 		return rc;

=== modified file 'src/arch/i386/prefix/exeprefix.S'
--- src/arch/i386/prefix/exeprefix.S	2011-04-11 19:35:36 +0000
+++ src/arch/i386/prefix/exeprefix.S	2012-02-10 16:40:50 +0000
@@ -113,7 +113,7 @@
 	call	alloc_basemem
 	xorl	%esi, %esi
 	movl	$EXE_DECOMPRESS_ADDRESS, %edi
-	clc
+	xorl	%ebp, %ebp
 	call	install_prealloc
 
 	/* Set up real-mode stack */

=== added file 'src/arch/i386/prefix/kkkpxeprefix.S'
--- src/arch/i386/prefix/kkkpxeprefix.S	1970-01-01 00:00:00 +0000
+++ src/arch/i386/prefix/kkkpxeprefix.S	2012-02-10 16:40:50 +0000
@@ -0,0 +1,19 @@
+/*****************************************************************************
+ * PXE prefix that keeps the whole PXE stack present and provides an exit hook
+ *
+ * This prefix is essentially intended solely for the case of ipxelinux.0
+ *****************************************************************************
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER )
+
+/* Since we have the whole stack, we can use cached DHCP information */
+REQUIRE_OBJECT ( pxeparent_dhcp )
+
+/* Provide the PXENV_FILE_EXIT_HOOK API call */
+REQUIRE_OBJECT ( pxe_exit_hook )
+
+#define PXELOADER_KEEP_UNDI
+#define PXELOADER_KEEP_PXE
+#define _pxe_start _kkkpxe_start
+#include "pxeprefix.S"

=== modified file 'src/arch/i386/prefix/libprefix.S'
--- src/arch/i386/prefix/libprefix.S	2011-04-11 19:35:36 +0000
+++ src/arch/i386/prefix/libprefix.S	2012-02-10 16:40:50 +0000
@@ -326,7 +326,6 @@
 #ifndef KEEP_IT_REAL
 
 	/* Preserve registers */
-	pushfw
 	pushl	%eax
 	pushl	%ebp
 
@@ -397,7 +396,6 @@
 	/* Restore registers and return */
 	popl	%ebp
 	popl	%eax
-	popfw
 	ret
 
 #else /* KEEP_IT_REAL */
@@ -614,17 +612,19 @@
 	/* Preserve registers */
 	pushl	%esi
 	pushl	%edi
+	pushl	%ebp
 	/* Allocate space for .text16 and .data16 */
 	call	alloc_basemem
 	/* Image source = %cs:0000 */
 	xorl	%esi, %esi
 	/* Image destination = default */
 	xorl	%edi, %edi
-	/* Allow relocation */
-	clc
+	/* Allow arbitrary relocation */
+	xorl	%ebp, %ebp
 	/* Install text and data segments */
 	call	install_prealloc
 	/* Restore registers and return */
+	popl	%ebp
 	popl	%edi
 	popl	%esi
 	ret
@@ -640,7 +640,7 @@
  *   %bx  : .data16 segment address
  *   %esi : Image source physical address (or zero for %cs:0000)
  *   %edi : Decompression temporary area physical address (or zero for default)
- *   CF set : Avoid relocating to top of memory
+ *   %ebp : Maximum end address for relocation (or zero for no maximum)
  * Corrupts:
  *   none
  ****************************************************************************
@@ -655,14 +655,13 @@
 	pushw	%ds
 	pushw	%es
 	cld			/* Sanity: clear the direction flag asap */
-	pushfw
 
 	/* Set up %ds for (read-only) access to .prefix */
 	pushw	%cs
 	popw	%ds
 
-	/* Copy decompression temporary area physical address to %ebp */
-	movl	%edi, %ebp
+	/* Save decompression temporary area physical address */
+	pushl	%edi
 
 	/* Install .text16.early */
 	progress "  .text16.early\n"
@@ -747,6 +746,9 @@
 	/* Set up %ds for access to .data16 */
 	movw	%bx, %ds
 
+	/* Restore decompression temporary area physical address */
+	popl	%edi
+
 #ifdef KEEP_IT_REAL
 	/* Initialise libkir */
 	movw	%ax, (init_libkir_vector+2)
@@ -754,7 +756,7 @@
 #else
 	/* Find a suitable decompression temporary area, if none specified */
 	pushl	%eax
-	testl	%ebp, %ebp
+	testl	%edi, %edi
 	jnz	1f
 	/* Use INT 15,88 to find the highest available address via INT
 	 * 15,88.  This limits us to around 64MB, which should avoid
@@ -762,14 +764,14 @@
 	 */
 	movb	$0x88, %ah
 	int	$0x15
-	movw	%ax, %bp
-	addl	$0x400, %ebp
-	subl	$_textdata_memsz_kb, %ebp
-	shll	$10, %ebp
+	movw	%ax, %di
+	addl	$0x400, %edi
+	subl	$_textdata_memsz_kb, %edi
+	shll	$10, %edi
 	/* Sanity check: if we have ended up below 1MB, use 1MB */
-	cmpl	$0x100000, %ebp
+	cmpl	$0x100000, %edi
 	jae	1f
-	movl	$0x100000, %ebp
+	movl	$0x100000, %edi
 1:	popl	%eax
 
 	/* Install .text and .data to temporary area in high memory,
@@ -777,22 +779,17 @@
 	 * properly.
 	 */
 	progress "  .textdata\n"
-	movl	%ebp, %edi
+	pushl	%edi
 	movl	$_textdata_filesz, %ecx
 	movl	$_textdata_memsz, %edx
 	call	install_block
+	popl	%edi
 
 	/* Initialise librm at current location */
 	progress "  init_librm\n"
 	movw	%ax, (init_librm_vector+2)
-	movl	%ebp, %edi
 	lcall	*init_librm_vector
 
-	/* Skip relocation if CF was set on entry */
-	popfw
-	pushfw
-	jc	skip_relocate
-
 	/* Call relocate() to determine target address for relocation.
 	 * relocate() will return with %esi, %edi and %ecx set up
 	 * ready for the copy to the new location.
@@ -815,7 +812,6 @@
 	/* Initialise librm at new location */
 	progress "  init_librm\n"
 	lcall	*init_librm_vector
-skip_relocate:
 #endif
 
 	/* Close access to payload */
@@ -824,7 +820,6 @@
 	lcall	*close_payload_vector
 
 	/* Restore registers */
-	popfw
 	popw	%es
 	popw	%ds
 	popal

=== modified file 'src/arch/i386/prefix/lkrnprefix.S'
--- src/arch/i386/prefix/lkrnprefix.S	2011-04-11 19:35:36 +0000
+++ src/arch/i386/prefix/lkrnprefix.S	2012-02-10 16:40:50 +0000
@@ -160,7 +160,7 @@
 pad2:
 	.byte	0, 0, 0
 cmdline_size:
-	.long	0
+	.long	0x7ff
 hardware_subarch:
 	.long	0
 hardware_subarch_data:
@@ -196,8 +196,15 @@
 	/* Retrieve command-line pointer */
 	movl	%es:cmd_line_ptr, %edx
 
+	/* Retrieve initrd pointer and size */
+	movl	%es:ramdisk_image, %ebp
+	movl	%es:ramdisk_size, %ecx
+
 	/* Install iPXE */
-	call	install
+	call	alloc_basemem
+	xorl	%esi, %esi
+	xorl	%edi, %edi
+	call	install_prealloc
 
 	/* Set up real-mode stack */
 	movw	%bx, %ss
@@ -215,6 +222,10 @@
 	/* Store command-line pointer */
 	movl	%edx, cmdline_phys
 
+	/* Store initrd pointer and size */
+	movl	%ebp, initrd_phys
+	movl	%ecx, initrd_len
+
 	/* Run iPXE */
 	pushl	$main
 	pushw	%cs

=== modified file 'src/arch/i386/prefix/pxeprefix.S'
--- src/arch/i386/prefix/pxeprefix.S	2011-04-11 19:35:36 +0000
+++ src/arch/i386/prefix/pxeprefix.S	2012-02-10 16:40:50 +0000
@@ -721,11 +721,7 @@
 	.section ".text16", "ax", @progbits
 1:
 	/* Update the exit hook */
-	movw	%cs,pxe_exit_hook+2
-	push	%ax
-	mov	$2f,%ax
-	mov	%ax,pxe_exit_hook
-	pop	%ax
+	movw	%cs, ( pxe_exit_hook + 2 )
 
 	/* Run main program */
 	pushl	$main
@@ -743,7 +739,14 @@
 	/* Jump to hook if applicable */
 	ljmpw	*pxe_exit_hook
 
-2:	/* Check PXE stack magic */
+	.section ".data16", "aw", @progbits
+	.globl	pxe_exit_hook
+pxe_exit_hook:
+	.word	exit_ipxe, 0
+	.previous
+
+exit_ipxe:
+	/* Check PXE stack magic */
 	popl	%eax
 	cmpl	$STACK_MAGIC, %eax
 	jne	1f

=== modified file 'src/arch/i386/prefix/romprefix.S'
--- src/arch/i386/prefix/romprefix.S	2011-07-31 20:57:02 +0000
+++ src/arch/i386/prefix/romprefix.S	2012-02-10 16:40:50 +0000
@@ -414,7 +414,7 @@
 	 * picked up by the initial shell prompt, and we will drop
 	 * into a shell.
 	 */
-	stc			/* Inhibit relocation */
+	movl	$0xa0000, %ebp	/* Inhibit relocation during POST */
 	pushw	%cs
 	call	exec
 2:
@@ -445,7 +445,7 @@
 	/* Preserve registers */
 	pushl	%eax
 	pushw	%di
-	movw	$' ', %di
+	movw	$( ' ' ), %di
 get_pmm_find:
 	/* Try to find existing block */
 	pushl	%ebx		/* PMM handle */
@@ -474,7 +474,7 @@
 	pushw	%dx
 	pushw	%ax
 	popl	%esi
-	movw	$'+', %di	/* Indicate allocation attempt */
+	movw	$( '+' ), %di	/* Indicate allocation attempt */
 	testl	%esi, %esi
 	jnz	get_pmm_done
 	stc
@@ -614,7 +614,7 @@
  * Called by the PnP BIOS when it wants to boot us.
  */
 bev_entry:
-	clc			/* Allow relocation */
+	xorl	%ebp, %ebp	/* Allow relocation */
 	pushw	%cs
 	call	exec
 	lret
@@ -649,7 +649,7 @@
 	/* Leave keypress in buffer and start iPXE.  The keypress will
 	 * cause the usual initial Ctrl-B prompt to be skipped.
 	 */
-	clc			/* Allow relocation */
+	xorl	%ebp, %ebp	/* Allow relocation */
 	pushw	%cs
 	call	exec
 1:	/* Try to call original INT 19 vector */
@@ -681,9 +681,6 @@
 	pushw	%cs
 	popw	%ds
 
-	/* Preserve state of CF */
-	lahf
-
 	/* Print message as soon as possible */
 	movw	$prodstr, %si
 	xorw	%di, %di
@@ -693,8 +690,8 @@
 
 	/* Store magic word on BIOS stack and remember BIOS %ss:sp */
 	pushl	$STACK_MAGIC
-	movw	%ss, %dx
-	movw	%sp, %bp
+	movw	%ss, %cx
+	movw	%sp, %dx
 
 	/* Obtain a reasonably-sized temporary stack */
 	xorw	%bx, %bx
@@ -702,10 +699,7 @@
 	movw	$0x7c00, %sp
 
 	/* Install iPXE */
-	sahf
-	pushfw
 	call	alloc_basemem
-	popfw
 	movl	image_source, %esi
 	movl	decompress_to, %edi
 	call	install_prealloc
@@ -728,14 +722,14 @@
 	pushl	$main
 	pushw	%cs
 	call	prot_call
-	popl	%ecx /* discard */
+	popl	%eax /* discard */
 
 	/* Uninstall iPXE */
 	call	uninstall
 
 	/* Restore BIOS stack */
-	movw	%dx, %ss
-	movw	%bp, %sp
+	movw	%cx, %ss
+	movw	%dx, %sp
 
 	/* Check magic word on BIOS stack */
 	popl	%eax

=== modified file 'src/arch/i386/prefix/undiloader.S'
--- src/arch/i386/prefix/undiloader.S	2011-04-11 19:35:36 +0000
+++ src/arch/i386/prefix/undiloader.S	2012-02-10 16:40:50 +0000
@@ -14,6 +14,7 @@
 	/* Save registers */
 	pushl	%esi
 	pushl	%edi
+	pushl	%ebp
 	pushw	%ds
 	pushw	%es
 	pushw	%bx
@@ -30,7 +31,7 @@
 	movw	%es:14(%di), %ax
 	movl	image_source, %esi
 	movl	decompress_to, %edi
-	clc			/* Allow relocation */
+	xorl	%ebp, %ebp		/* Allow relocation */
 	call	install_prealloc
 	popw	%di
 	/* Call UNDI loader C code */
@@ -46,6 +47,7 @@
 	popw	%bx
 	popw	%es
 	popw	%ds
+	popl	%ebp
 	popl	%edi
 	popl	%esi
 	lret

=== modified file 'src/arch/i386/transitions/liba20.S'
--- src/arch/i386/transitions/liba20.S	2011-04-11 19:35:36 +0000
+++ src/arch/i386/transitions/liba20.S	2012-02-10 16:40:50 +0000
@@ -96,8 +96,11 @@
 	.section ".text16.early", "awx", @progbits
 	.code16
 enable_a20_bios:
-	/* Preserve registers */
-	pushw	%ax
+
+	/* Preserve registers.  Be very paranoid, since some BIOSes
+	 * are reported to clobber %ebx
+	 */
+	pushal
 
 	/* Attempt INT 15,2401 */
 	movw	$0x2401, %ax
@@ -108,7 +111,7 @@
 	call	test_a20_short
 
 99:	/* Restore registers and return */
-	popw	%ax
+	popal
 	ret
 	.size	enable_a20_bios, . - enable_a20_bios
 

=== modified file 'src/arch/i386/transitions/librm.S'
--- src/arch/i386/transitions/librm.S	2011-04-11 19:35:36 +0000
+++ src/arch/i386/transitions/librm.S	2012-02-10 16:40:50 +0000
@@ -97,18 +97,18 @@
 	pushl	%eax
 	pushl	%ebx
 
-	/* Store _virt_offset and set up virtual_cs and virtual_ds segments */
+	/* Store virt_offset and set up virtual_cs and virtual_ds segments */
 	movl	%edi, %eax
 	movw	$virtual_cs, %bx
 	call	set_seg_base
 	movw	$virtual_ds, %bx
 	call	set_seg_base	
-	movl	%edi, _virt_offset
+	movl	%edi, rm_virt_offset
 
 	/* Negate virt_offset */
 	negl	%edi
 		
-	/* Store rm_cs and _text16, set up real_cs segment */
+	/* Store rm_cs and text16, set up real_cs segment */
 	xorl	%eax, %eax
 	movw	%cs, %ax
 	movw	%ax, rm_cs
@@ -116,9 +116,9 @@
 	movw	$real_cs, %bx
 	call	set_seg_base
 	addr32 leal	(%eax, %edi), %ebx
-	movl	%ebx, _text16
+	movl	%ebx, rm_text16
 
-	/* Store rm_ds and _data16, set up real_ds segment */
+	/* Store rm_ds and data16, set up real_ds segment */
 	xorl	%eax, %eax
 	movw	%ds, %ax
 	movw	%ax, %cs:rm_ds
@@ -126,7 +126,7 @@
 	movw	$real_ds, %bx
 	call	set_seg_base
 	addr32 leal	(%eax, %edi), %ebx
-	movl	%ebx, _data16
+	movl	%ebx, rm_data16
 
 	/* Set GDT and IDT base */
 	movl	%eax, gdt_base
@@ -182,12 +182,12 @@
 	movw	%cs:rm_ds, %ax
 	movw	%ax, %ds
 
-	/* Add _virt_offset, _text16 and _data16 to stack to be
+	/* Add virt_offset, text16 and data16 to stack to be
 	 * copied, and also copy the return address.
 	 */
-	pushl	_virt_offset
-	pushl	_text16
-	pushl	_data16
+	pushl	rm_virt_offset
+	pushl	rm_text16
+	pushl	rm_data16
 	addw	$16, %cx /* %ecx must be less than 64kB anyway */
 
 	/* Real-mode %ss:%sp => %ebp:%edx and virtual address => %esi */
@@ -197,7 +197,7 @@
 	movl	%ebp, %eax
 	shll	$4, %eax
 	addr32 leal (%eax,%edx), %esi
-	subl	_virt_offset, %esi
+	subl	rm_virt_offset, %esi
 
 	/* Switch to protected mode */
 	cli
@@ -557,9 +557,9 @@
  */
 	/* Internal copies, created by init_librm (which runs in real mode) */
 	.section ".data16", "aw", @progbits
-_virt_offset:	.long 0
-_text16:	.long 0
-_data16:	.long 0
+rm_virt_offset:	.long 0
+rm_text16:	.long 0
+rm_data16:	.long 0
 
 	/* Externally-visible copies, created by real_to_prot */
 	.section ".data", "aw", @progbits

=== modified file 'src/config/defaults/pcbios.h'
--- src/config/defaults/pcbios.h	2011-04-11 19:35:36 +0000
+++ src/config/defaults/pcbios.h	2012-02-10 16:40:50 +0000
@@ -34,4 +34,6 @@
 #define	SANBOOT_PROTO_IB_SRP	/* Infiniband SCSI RDMA protocol */
 #define	SANBOOT_PROTO_FCP	/* Fibre Channel protocol */
 
+#define	REBOOT_CMD		/* Reboot command */
+
 #endif /* CONFIG_DEFAULTS_PCBIOS_H */

=== modified file 'src/config/general.h'
--- src/config/general.h	2011-07-31 20:57:02 +0000
+++ src/config/general.h	2012-02-10 16:40:50 +0000
@@ -120,12 +120,12 @@
 #define DHCP_CMD		/* DHCP management commands */
 #define SANBOOT_CMD		/* SAN boot commands */
 #define LOGIN_CMD		/* Login command */
-#undef	TIME_CMD		/* Time commands */
-#undef	DIGEST_CMD		/* Image crypto digest commands */
-#undef	LOTEST_CMD		/* Loopback testing commands */
-#undef	VLAN_CMD		/* VLAN commands */
-#undef	PXE_CMD			/* PXE commands */
-#undef	REBOOT_CMD		/* Reboot command */
+//#define TIME_CMD		/* Time commands */
+//#define DIGEST_CMD		/* Image crypto digest commands */
+//#define LOTEST_CMD		/* Loopback testing commands */
+//#define VLAN_CMD		/* VLAN commands */
+//#define PXE_CMD		/* PXE commands */
+//#define REBOOT_CMD		/* Reboot command */
 
 /*
  * ROM-specific options

=== added file 'src/core/assert.c'
--- src/core/assert.c	1970-01-01 00:00:00 +0000
+++ src/core/assert.c	2012-02-10 16:40:50 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2011 Michael Brown <[e-mail]>.
+ *
+ * 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.
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER );
+
+/** @file
+ *
+ * Assertions
+ *
+ */
+
+#include <assert.h>
+
+/** Number of assertion failures triggered */
+unsigned int assertion_failures = 0;

=== modified file 'src/core/exec.c'
--- src/core/exec.c	2011-07-31 20:57:02 +0000
+++ src/core/exec.c	2012-02-10 16:40:50 +0000
@@ -31,6 +31,10 @@
 #include <ipxe/command.h>
 #include <ipxe/parseopt.h>
 #include <ipxe/settings.h>
+#include <ipxe/console.h>
+#include <ipxe/keys.h>
+#include <ipxe/process.h>
+#include <ipxe/nap.h>
 #include <ipxe/shell.h>
 
 /** @file
@@ -527,3 +531,54 @@
 	.name = "iseq",
 	.exec = iseq_exec,
 };
+
+/** "sleep" options */
+struct sleep_options {};
+
+/** "sleep" option list */
+static struct option_descriptor sleep_opts[] = {};
+
+/** "sleep" command descriptor */
+static struct command_descriptor sleep_cmd =
+	COMMAND_DESC ( struct sleep_options, sleep_opts, 1, 1, "<seconds>" );
+
+/**
+ * "sleep" command
+ *
+ * @v argc		Argument count
+ * @v argv		Argument list
+ * @ret rc		Return status code
+ */
+static int sleep_exec ( int argc, char **argv ) {
+	struct sleep_options opts;
+	unsigned int seconds;
+	unsigned long start;
+	unsigned long delay;
+	int rc;
+
+	/* Parse options */
+	if ( ( rc = parse_options ( argc, argv, &sleep_cmd, &opts ) ) != 0 )
+		return rc;
+
+	/* Parse number of seconds */
+	if ( ( rc = parse_integer ( argv[optind], &seconds ) ) != 0 )
+		return rc;
+
+	/* Delay for specified number of seconds */
+	start = currticks();
+	delay = ( seconds * TICKS_PER_SEC );
+	while ( ( currticks() - start ) <= delay ) {
+		step();
+		if ( iskey() && ( getchar() == CTRL_C ) )
+			return -ECANCELED;
+		cpu_nap();
+	}
+
+	return 0;
+}
+
+/** "sleep" command */
+struct command sleep_command __command = {
+	.name = "sleep",
+	.exec = sleep_exec,
+};

=== modified file 'src/core/getopt.c'
--- src/core/getopt.c	2011-04-11 19:35:36 +0000
+++ src/core/getopt.c	2012-02-10 16:40:50 +0000
@@ -239,6 +239,11 @@