From 89a2f96de451d2dd4ea887b41c5425b051c93f8b Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Mon, 18 Feb 2013 23:36:03 -0500 Subject: Convert VAR16VISIBLE, VAR16EXPORT, and VAR32VISIBLE to VARFSEG. Convert all users of the alternative variable exports to VARFSEG. There isn't a significant distinction between the existing types of exports, so it's simpler to just use one type going forward. The new VARFSEG declaration is only emitting when in 32bit mode, so update and move some variables as needed. Signed-off-by: Kevin O'Connor --- src/pnpbios.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/pnpbios.c') diff --git a/src/pnpbios.c b/src/pnpbios.c index c8bc8f44..fddcc816 100644 --- a/src/pnpbios.c +++ b/src/pnpbios.c @@ -28,7 +28,7 @@ extern struct pnpheader PNPHEADER; extern char pnp_string[]; #if CONFIG_PNPBIOS -struct pnpheader PNPHEADER __aligned(16) VAR16EXPORT = { +struct pnpheader PNPHEADER __aligned(16) VARFSEG = { .signature = PNP_SIGNATURE, .version = 0x10, .length = sizeof(PNPHEADER), @@ -41,7 +41,7 @@ struct pnpheader PNPHEADER __aligned(16) VAR16EXPORT = { // We need a copy of this string in the 0xf000 segment, but we are not // actually a PnP BIOS, so make sure it is *not* aligned, so OSes will // not see it if they scan. -char pnp_string[] __aligned(2) VAR16VISIBLE = " $PnP"; +char pnp_string[] __aligned(2) VARFSEG = " $PnP"; #endif #define FUNCTION_NOT_SUPPORTED 0x82 -- cgit