aboutsummaryrefslogtreecommitdiffstats
path: root/src/pnpbios.c
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2008-12-29 20:42:40 -0500
committerKevin O'Connor <kevin@koconnor.net>2008-12-29 20:42:40 -0500
commit92f95b0fecca029a0c4dd81203e6b42f60c4a382 (patch)
tree63a9bb2ff504decebbfd73d3a41d22d7c7aaf4be /src/pnpbios.c
parentc659fdedadce1566308675d0c44537ade0eb12a2 (diff)
downloadseabios-92f95b0fecca029a0c4dd81203e6b42f60c4a382.tar.gz
Add more linker protections around variables accessed from 16bit mode.
Rename VAR16 to VAR16_32 -- that macro supports accesses from both 16bit and 32bit mode. Introduce a new macro VAR16 that must be present on all global variables accessed from 16bit mode.
Diffstat (limited to 'src/pnpbios.c')
-rw-r--r--src/pnpbios.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pnpbios.c b/src/pnpbios.c
index 21d140a7..8bf71dcb 100644
--- a/src/pnpbios.c
+++ b/src/pnpbios.c
@@ -28,7 +28,7 @@ extern struct pnpheader PNPHEADER;
extern const char pnp_string[];
#if CONFIG_PNPBIOS
-struct pnpheader PNPHEADER __aligned(16) VAR16 = {
+struct pnpheader PNPHEADER __aligned(16) VAR16_32 = {
.signature = PNP_SIGNATURE,
.version = 0x10,
.length = sizeof(PNPHEADER),
@@ -41,7 +41,7 @@ struct pnpheader PNPHEADER __aligned(16) VAR16 = {
// 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) VAR16 = " $PnP";
+const char pnp_string[] __aligned(2) VAR16_32 = " $PnP";
#endif
#define FUNCTION_NOT_SUPPORTED 0x82