diff options
author | Michael Brown | 2008-07-01 03:52:13 +0200 |
---|---|---|
committer | Michael Brown | 2008-07-01 03:52:13 +0200 |
commit | 4fbbf651d7cb91983801904f5ed2b07d15566c1d (patch) | |
tree | 36e8d2ecd24b17a0fd4cbe9dfd7c0143bb0d578f /src/interface/pxe/pxe_loader.c | |
parent | [pxe] Fix a typo in PXENV_GET_CACHED_INFO that broke Altiris (diff) | |
download | ipxe-4fbbf651d7cb91983801904f5ed2b07d15566c1d.tar.gz ipxe-4fbbf651d7cb91983801904f5ed2b07d15566c1d.tar.xz ipxe-4fbbf651d7cb91983801904f5ed2b07d15566c1d.zip |
[i386] Change semantics of __from_data16 and __from_text16
__from_data16 and __from_text16 now take a pointer to a
.data16/.text16 variable, and return the real-mode offset within the
appropriate segment. This matches the use case for every occurrence
of these macros, and prevents potential future bugs such as that fixed
in commit d51d80f. (The bug arose essentially because "&pointer" is
still syntactically valid.)
Diffstat (limited to 'src/interface/pxe/pxe_loader.c')
-rw-r--r-- | src/interface/pxe/pxe_loader.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/interface/pxe/pxe_loader.c b/src/interface/pxe/pxe_loader.c index 708d203a..f815bc25 100644 --- a/src/interface/pxe/pxe_loader.c +++ b/src/interface/pxe/pxe_loader.c @@ -42,11 +42,9 @@ PXENV_EXIT_t undi_loader ( struct s_UNDI_LOADER *undi_loader ) { /* Fill in UNDI loader structure */ undi_loader->PXEptr.segment = rm_cs; - undi_loader->PXEptr.offset = - ( ( unsigned ) & __from_text16 ( ppxe ) ); + undi_loader->PXEptr.offset = __from_text16 ( &ppxe ); undi_loader->PXENVptr.segment = rm_cs; - undi_loader->PXENVptr.offset = - ( ( unsigned ) & __from_text16 ( pxenv ) ); + undi_loader->PXENVptr.offset = __from_text16 ( &pxenv ); undi_loader->Status = PXENV_STATUS_SUCCESS; return PXENV_EXIT_SUCCESS; |