Add linker magic to ensure 16bit variables aren't repeated in 32bit code.

[seabios.git] / src / pnpbios.c

diff --git a/src/pnpbios.c b/src/pnpbios.c
index 6f36a4a7345b2365ef1b7a8512f33c06e02cb2d9..21d140a7eff2bdd9ee760cc68944030ff3d2a0f0 100644 (file)
--- a/src/pnpbios.c
+++ b/src/pnpbios.c
@@ -27,9 +27,8 @@ struct pnpheader {
 extern struct pnpheader PNPHEADER;
 extern const char pnp_string[];
 
-#if MODE16
-# if CONFIG_PNPBIOS
-struct pnpheader PNPHEADER __aligned(16) VISIBLE16 = {
+#if CONFIG_PNPBIOS
+struct pnpheader PNPHEADER __aligned(16) VAR16 = {
     .signature = PNP_SIGNATURE,
     .version = 0x10,
     .length = sizeof(PNPHEADER),
@@ -38,12 +37,11 @@ struct pnpheader PNPHEADER __aligned(16) VISIBLE16 = {
     .real_ds = SEG_BIOS,
     .prot_database = BUILD_BIOS_ADDR,
 };
-# else
+#else
 // 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.
-const char pnp_string[] __aligned(2) VISIBLE16 = " $PnP";
-# endif
+const char pnp_string[] __aligned(2) VAR16 = " $PnP";
 #endif
 
 #define FUNCTION_NOT_SUPPORTED 0x82