Move PirAddr definition from pirtable.c to biostables.c.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

diff --git a/src/fw/biostables.c b/src/fw/biostables.c
index 48325a439bf3042aeaf3d0d323ee5ff54ad276e6..b132734f1477bc4d45df9b0245b26e80fcca5a01 100644 (file)
--- 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 ee2659ddab396f607a6f91462264f3a5bc06df59..ded9143784b6f9e22a33a00dfe67575595d48248 100644 (file)
--- 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;

diff --git a/src/util.h b/src/util.h
index 088437bcfeb5f173c284f7242e0f8c749c571d0e..223d5c032259bb71b00adcdc52cff487cd0121b7 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -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