aboutsummaryrefslogtreecommitdiffstats
path: root/memdisk/mstructs.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-06-21 17:29:11 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-06-21 17:29:11 -0700
commit7556a891b2f28617f6c95aa271aeaf29883d0981 (patch)
tree703e50c4970c9e64f2e11f76e81001af8fb7d33e /memdisk/mstructs.h
parent3df42588472b07c54b9de11a7e118d6f3f4f6c41 (diff)
downloadsyslinux-7556a891b2f28617f6c95aa271aeaf29883d0981.tar.gz
syslinux-7556a891b2f28617f6c95aa271aeaf29883d0981.tar.xz
syslinux-7556a891b2f28617f6c95aa271aeaf29883d0981.zip
memdisk: make mstructs.h includable from Linux
Make mstructs.h includable from a Linux utility. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'memdisk/mstructs.h')
-rw-r--r--memdisk/mstructs.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/memdisk/mstructs.h b/memdisk/mstructs.h
index e060aceb..c2e6352b 100644
--- a/memdisk/mstructs.h
+++ b/memdisk/mstructs.h
@@ -16,6 +16,7 @@
/* These structures are common to MEMDISK and MDISKCHK.COM */
#include <stdint.h>
+#include "compiler.h"
struct seg_off {
uint16_t offset;
@@ -38,10 +39,7 @@ struct safe_hook {
real_addr_t old_hook; /* SEG:OFF for previous INT 13h hook */
uint32_t flags; /* "Safe hook" flags */
/* The next field is a MEMDISK extension to the "safe hook" structure */
- union {
- uint32_t offset; /* Offset from hook to the mBFT; refilled */
- struct mBFT *ptr; /* by setup() with the physical address */
- } mBFT;
+ uint32_t mbft;
} MEMDISK_PACKED_POSTFIX;
struct memdisk_header {
@@ -106,10 +104,7 @@ struct mdi {
MEMDISK_PACKED_PREFIX
struct mBFT {
struct acpi_description_header acpi;
- union {
- struct safe_hook *ptr;
- uint32_t phys_addr;
- } safe_hook; /* "Safe hook" physical address */
+ uint32_t safe_hook; /* "Safe hook" physical address */
struct mdi mdi;
} MEMDISK_PACKED_POSTFIX;