Signed-off-by: Kevin O'Connor kevin@koconnor.net --- src/fw/biostables.c | 2 +- src/fw/mptable.c | 2 +- src/fw/paravirt.c | 1 - src/{fw => std}/mptable.h | 3 --- src/util.h | 3 +++ 5 files changed, 5 insertions(+), 6 deletions(-) rename src/{fw => std}/mptable.h (96%)
diff --git a/src/fw/biostables.c b/src/fw/biostables.c index 5200e65..fea7511 100644 --- a/src/fw/biostables.c +++ b/src/fw/biostables.c @@ -7,8 +7,8 @@ #include "acpi.h" // struct rsdp_descriptor #include "config.h" // CONFIG_* #include "malloc.h" // malloc_fseg -#include "mptable.h" // MPTABLE_SIGNATURE #include "output.h" // dprintf +#include "std/mptable.h" // MPTABLE_SIGNATURE #include "std/pirtable.h" // struct pir_header #include "std/smbios.h" // struct smbios_entry_point #include "string.h" // memcpy diff --git a/src/fw/mptable.c b/src/fw/mptable.c index 9877bae..b453469 100644 --- a/src/fw/mptable.c +++ b/src/fw/mptable.c @@ -9,9 +9,9 @@ #include "hw/pci.h" #include "hw/pci_regs.h" #include "malloc.h" // free -#include "mptable.h" // MPTABLE_SIGNATURE #include "output.h" // dprintf #include "romfile.h" // romfile_loadint +#include "std/mptable.h" // MPTABLE_SIGNATURE #include "string.h" // memset #include "util.h" // MaxCountCPUs #include "x86.h" // cpuid diff --git a/src/fw/paravirt.c b/src/fw/paravirt.c index a49c80a..573511c 100644 --- a/src/fw/paravirt.c +++ b/src/fw/paravirt.c @@ -16,7 +16,6 @@ #include "ioport.h" // outw #include "malloc.h" // malloc_tmp #include "memmap.h" // add_e820 -#include "mptable.h" // mptable_setup #include "output.h" // dprintf #include "paravirt.h" // qemu_cfg_preinit #include "romfile.h" // romfile_loadint diff --git a/src/fw/mptable.h b/src/std/mptable.h similarity index 96% rename from src/fw/mptable.h rename to src/std/mptable.h index 6252854..fa6a229 100644 --- a/src/fw/mptable.h +++ b/src/std/mptable.h @@ -74,7 +74,4 @@ struct mpt_intsrc { u8 dstirq; } PACKED;
-// mptable.c -void mptable_setup(void); - #endif // mptable.h diff --git a/src/util.h b/src/util.h index 0b3a8e7..ab45ac6 100644 --- a/src/util.h +++ b/src/util.h @@ -61,6 +61,9 @@ int csm_bootprio_fdc(struct pci_device *pci, int port, int fdid); int csm_bootprio_ata(struct pci_device *pci, int chanid, int slave); int csm_bootprio_pci(struct pci_device *pci);
+// fw/mptable.c +void mptable_setup(void); + // fw/shadow.c void make_bios_writable(void); void make_bios_readonly(void);