Signed-off-by: Kevin O'Connor kevin@koconnor.net --- src/bootsplash.c | 1 - src/fw/biostables.c | 2 +- src/fw/coreboot.c | 1 - src/fw/csm.c | 1 - src/fw/paravirt.c | 1 - src/fw/smbios.c | 2 +- src/{fw => std}/smbios.h | 6 +----- src/util.h | 5 +++++ 8 files changed, 8 insertions(+), 11 deletions(-) rename src/{fw => std}/smbios.h (97%)
diff --git a/src/bootsplash.c b/src/bootsplash.c index 3c08f5d..aac7ebe 100644 --- a/src/bootsplash.c +++ b/src/bootsplash.c @@ -9,7 +9,6 @@ #include "bregs.h" // struct bregs #include "config.h" // CONFIG_* #include "farptr.h" // FLATPTR_TO_SEG -#include "fw/smbios.h" // display_uuid #include "jpeg.h" // jpeg_alloc #include "malloc.h" // free #include "output.h" // dprintf diff --git a/src/fw/biostables.c b/src/fw/biostables.c index a51e8ee..5200e65 100644 --- a/src/fw/biostables.c +++ b/src/fw/biostables.c @@ -9,8 +9,8 @@ #include "malloc.h" // malloc_fseg #include "mptable.h" // MPTABLE_SIGNATURE #include "output.h" // dprintf -#include "smbios.h" // struct smbios_entry_point #include "std/pirtable.h" // struct pir_header +#include "std/smbios.h" // struct smbios_entry_point #include "string.h" // memcpy #include "util.h" // copy_table
diff --git a/src/fw/coreboot.c b/src/fw/coreboot.c index c82dd4e..5daed86 100644 --- a/src/fw/coreboot.c +++ b/src/fw/coreboot.c @@ -16,7 +16,6 @@ #include "output.h" // dprintf #include "paravirt.h" // PlatformRunningOn #include "romfile.h" // romfile_findprefix -#include "smbios.h" // smbios_init #include "stacks.h" // yield #include "string.h" // memset #include "util.h" // coreboot_preinit diff --git a/src/fw/csm.c b/src/fw/csm.c index 7829c1e..eca97a7 100644 --- a/src/fw/csm.c +++ b/src/fw/csm.c @@ -15,7 +15,6 @@ #include "memmap.h" #include "output.h" // dprintf #include "post.h" -#include "smbios.h" #include "stacks.h" // wait_threads #include "std/optionrom.h" // struct rom_header #include "util.h" // copy_smbios diff --git a/src/fw/paravirt.c b/src/fw/paravirt.c index b76c1db..a49c80a 100644 --- a/src/fw/paravirt.c +++ b/src/fw/paravirt.c @@ -20,7 +20,6 @@ #include "output.h" // dprintf #include "paravirt.h" // qemu_cfg_preinit #include "romfile.h" // romfile_loadint -#include "smbios.h" // smbios_setup #include "string.h" // memset #include "util.h" // pci_setup #include "x86.h" // cpuid diff --git a/src/fw/smbios.c b/src/fw/smbios.c index a8969da..affb9be 100644 --- a/src/fw/smbios.c +++ b/src/fw/smbios.c @@ -10,7 +10,7 @@ #include "output.h" // dprintf #include "paravirt.h" // RamSize #include "romfile.h" // romfile_findprefix -#include "smbios.h" // struct smbios_entry_point +#include "std/smbios.h" // struct smbios_entry_point #include "string.h" // memset #include "util.h" // MaxCountCPUs #include "x86.h" // cpuid diff --git a/src/fw/smbios.h b/src/std/smbios.h similarity index 97% rename from src/fw/smbios.h rename to src/std/smbios.h index a4c1444..0513716 100644 --- a/src/fw/smbios.h +++ b/src/std/smbios.h @@ -1,8 +1,7 @@ #ifndef __SMBIOS_H #define __SMBIOS_H
-// smbios.c -void smbios_setup(void); +#include "types.h" // u32
/* SMBIOS entry point -- must be written to a 16-bit aligned address between 0xf0000 and 0xfffff. @@ -24,8 +23,6 @@ struct smbios_entry_point { u8 smbios_bcd_revision; } PACKED;
-extern struct smbios_entry_point *SMBiosAddr; - /* This goes at the beginning of every SMBIOS structure. */ struct smbios_structure_header { u8 type; @@ -165,5 +162,4 @@ struct smbios_type_127 { struct smbios_structure_header header; } PACKED;
-void display_uuid(void); #endif // smbios.h diff --git a/src/util.h b/src/util.h index dfd6faf..0b3a8e7 100644 --- a/src/util.h +++ b/src/util.h @@ -66,6 +66,11 @@ void make_bios_writable(void); void make_bios_readonly(void); void qemu_prep_reset(void);
+// fw/smbios.c +extern struct smbios_entry_point *SMBiosAddr; +void smbios_setup(void); +void display_uuid(void); + // fw/pciinit.c extern const u8 pci_irqs[4]; void pci_setup(void);