summaryrefslogtreecommitdiff
path: root/src/pmm.c
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2013-02-18 23:36:03 -0500
committerKevin O'Connor <kevin@koconnor.net>2013-02-18 23:36:03 -0500
commit89a2f96de451d2dd4ea887b41c5425b051c93f8b (patch)
treeb89b327f7ee8d301d9ad0954e5f2520d64bd4ad7 /src/pmm.c
parent4195349d78a215253e4ac1a0e1395dd4c8a7318c (diff)
downloadqemu-seabios-89a2f96de451d2dd4ea887b41c5425b051c93f8b.tar.gz
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 <kevin@koconnor.net>
Diffstat (limited to 'src/pmm.c')
-rw-r--r--src/pmm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/pmm.c b/src/pmm.c
index 790177e..8944bae 100644
--- a/src/pmm.c
+++ b/src/pmm.c
@@ -216,6 +216,9 @@ rom_confirm(u32 size)
* Setup
****************************************************************/
+// Space for bios tables built an run-time.
+char BiosTableSpace[CONFIG_MAX_BIOSTABLE] __aligned(MALLOC_MIN_ALIGN) VARFSEG;
+
void
malloc_preinit(void)
{
@@ -457,7 +460,7 @@ extern struct pmmheader PMMHEADER;
#define PMM_SIGNATURE 0x4d4d5024 // $PMM
#if CONFIG_PMM
-struct pmmheader PMMHEADER __aligned(16) VAR16EXPORT = {
+struct pmmheader PMMHEADER __aligned(16) VARFSEG = {
.signature = PMM_SIGNATURE,
.version = 0x01,
.length = sizeof(PMMHEADER),