diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2014-04-07 15:55:23 -0400 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2014-04-07 15:55:23 -0400 |
commit | 19646a4b51d41e44df17db6807cb7206c70629e3 (patch) | |
tree | 9d8f3f59ed02ce21280554a936e9d38a279b55e2 | |
parent | d18c9f04e2725513a314446d4ddc18e10e19cdbe (diff) | |
download | seabios-19646a4b51d41e44df17db6807cb7206c70629e3.zip seabios-19646a4b51d41e44df17db6807cb7206c70629e3.tar.gz seabios-19646a4b51d41e44df17db6807cb7206c70629e3.tar.bz2 |
Move PirAddr definition from pirtable.c to biostables.c.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
-rw-r--r-- | src/fw/biostables.c | 2 | ||||
-rw-r--r-- | src/fw/pirtable.c | 3 | ||||
-rw-r--r-- | src/util.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/fw/biostables.c b/src/fw/biostables.c index 48325a4..b132734 100644 --- a/src/fw/biostables.c +++ b/src/fw/biostables.c @@ -17,6 +17,8 @@ #include "util.h" // copy_table #include "x86.h" // outb +struct pir_header *PirAddr VARFSEG; + static void copy_pir(void *pos) { diff --git a/src/fw/pirtable.c b/src/fw/pirtable.c index ee2659d..ded9143 100644 --- a/src/fw/pirtable.c +++ b/src/fw/pirtable.c @@ -9,8 +9,7 @@ #include "output.h" // dprintf #include "std/pirtable.h" // struct pir_header #include "string.h" // checksum - -struct pir_header *PirAddr VARFSEG; +#include "util.h" // PirAddr struct pir_table { struct pir_header pir; @@ -64,6 +64,7 @@ void handle_1586(struct bregs *regs); void acpi_setup(void); // fw/biostable.c +extern struct pir_header *PirAddr; extern struct rsdp_descriptor *RsdpAddr; extern u32 acpi_pm1a_cnt; void *find_acpi_rsdp(void); @@ -102,7 +103,6 @@ void pci_setup(void); void pci_resume(void); // fw/pirtable.c -extern struct pir_header *PirAddr; void pirtable_setup(void); // fw/shadow.c |