build fixes: static fns; link acpi.c

- resolve "no previous prototype for function" errors - fix undefined symbols _acpi_init, _acpi_ops by adding acpi.c to Makefile - make diff cleaner by matching brace style for pci_write_dstd()
adaugherity · Jan 25, 2022 · 9147533 · 9147533
1 parent 7ca80a9
commit 9147533
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -32,6 +32,7 @@ VMM_SRC := \
 	src/vmm/io/vrtc.c
 
 XHYVE_SRC := \
+	src/acpi.c \
 	src/acpitbl.c \
 	src/atkbdc.c \
 	src/bhyvegc.c \

diff --git a/src/pci_emul.c b/src/pci_emul.c
@@ -1401,7 +1401,7 @@ pci_bus_write_dsdt(int bus)
 	}
 }
 
-void
+static void
 pci_write_dsdt_precompiled(void)
 {
 	int bus;
@@ -1410,7 +1410,7 @@ pci_write_dsdt_precompiled(void)
 		pci_bus_write_dsdt(bus);
 	}
 }
-void
+static void
 pci_write_dsdt_compile(void)
 {
 	int bus;
@@ -1431,7 +1431,8 @@ pci_write_dsdt_compile(void)
 }
 
 void
-pci_write_dsdt(void) {
+pci_write_dsdt(void)
+{
 	if (asl_compiler_path == NULL) {
 		pci_write_dsdt_precompiled();
 	} else {