Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[undi] Move PXE API caller back into UNDI driver
As of commit 10d19bd ("[pxe] Always retrieve cached DHCPACK and apply
to relevant network device"), the UNDI driver has been the only user
of pxeparent_call().  Remove the unnecessary layer of abstraction by
refactoring this code back into undinet.c, and fix the ability of
undiisr.S to fall back to chaining to the original handler if we were
unable to unhook our own ISR.

This effectively reverts commit 337e1ed ("[pxe] Separate parent PXE
API caller from UNDINET driver").

Signed-off-by: Michael Brown <mcb30@ipxe.org>
  • Loading branch information
mcb30 committed Mar 19, 2017
1 parent 6324227 commit 7692a8f
Show file tree
Hide file tree
Showing 5 changed files with 300 additions and 367 deletions.
1 change: 0 additions & 1 deletion src/arch/x86/Makefile
Expand Up @@ -13,7 +13,6 @@ SRCDIRS += arch/x86/core
SRCDIRS += arch/x86/image
SRCDIRS += arch/x86/interface/pcbios
SRCDIRS += arch/x86/interface/pxe
SRCDIRS += arch/x86/interface/pxeparent
SRCDIRS += arch/x86/interface/efi
SRCDIRS += arch/x86/interface/vmware
SRCDIRS += arch/x86/interface/syslinux
Expand Down
4 changes: 2 additions & 2 deletions src/arch/x86/drivers/net/undiisr.S
Expand Up @@ -31,7 +31,7 @@ undiisr:
movw %ax, %ds

/* Check that we have an UNDI entry point */
cmpw $0, pxeparent_entry_point
cmpw $0, undinet_entry_point
je chain

/* Issue UNDI API call */
Expand All @@ -42,7 +42,7 @@ undiisr:
pushw %es
pushw %di
pushw %bx
lcall *pxeparent_entry_point
lcall *undinet_entry_point
cli /* Just in case */
addw $6, %sp
cmpw $PXENV_UNDI_ISR_OUT_OURS, funcflag
Expand Down

0 comments on commit 7692a8f

Please sign in to comment.