fix lacpi build

Author: kpowkitty

stand/efi/Makefile

@@ -7,6 +7,7 @@ SUBDIR.${MK_LOADER_IA32}+=	libefi32
 SUBDIR.${MK_FDT}+=	fdt
 SUBDIR.yes+=	libacpi
 SUBDIR.${MK_LOADER_IA32}+=	libacpi32
+SUBDIR.yes+= ../liblua
 SUBDIR.yes+=	.WAIT
 
 SUBDIR.yes+=	boot1 gptboot
@@ -17,7 +18,9 @@ SUBDIR.${MK_LOADER_IA32}+= loader_ia32
 SUBDIR.yes+=	loader_simp
 
 .if !defined(MK_FORTH) && !defined(MK_LOADER_IA32) && defined(MK_LOADER_LUA)
-SUBDIR.yes+=	liblua
+CFLAGS+= -DLACPI=1
+.else
+CFLAGS+= -DLACPI=0
 .endif
 
 .include <bsd.subdir.mk>

stand/efi/loader/Makefile

@@ -128,6 +128,12 @@ LDFLAGS+=	-Wl,--threads=1
 
 CLEANFILES+=	${LOADER}.efi
 
+.if ${__arch} == "amd64" && ${DO32:U0} == 0
+LACPI_COMPILE_SET= -j set_lua_acpi_modules
+.else
+LACPI_COMPILE_SET=
+.endif
+
 ${LOADER}.efi: ${PROG}
 	@if ${NM} ${.ALLSRC} | grep ' U '; then \
 		echo "Undefined symbols in ${.ALLSRC}"; \
@@ -138,6 +144,7 @@ ${LOADER}.efi: ${PROG}
 		-j .dynamic -j .dynsym -j .rel.dyn \
 		-j .rela.dyn -j .reloc -j .eh_frame -j set_Xcommand_set \
 		-j set_X${LOADER_INTERP}_compile_set \
+		${LACPI_COMPILE_SET} \
 		--output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET}
 
 LIBEFI=		${BOOTOBJ}/efi/libefi/libefi.a
@@ -155,9 +162,4 @@ LDADD=		${LDR_INTERP} ${LIBEFI} ${LIBSAFDT} ${LIBEFI_FDT} ${LIBSA} \
 		${LIBACPI}
 .endif
 
-.if ${__arch} == "amd64" && ${DO32:U0} == 0
-DPADD+=		${LIBLUA}
-LDADD+=		${LIBLUA}
-.endif
-
 .include <bsd.prog.mk>

stand/efi/loader/main.c

@@ -68,7 +68,7 @@
 #define ACPI_SYSTEM_XFACE
 
 // If defined amd64 && loader_lua
-#if defined(__amd64__) && defined(MK_LOADER_LUA)
+#if defined(__amd64__) && LACPI 
 #include <init_acpi.h>
 #include <lacpi.h>
 #else
@@ -1237,7 +1237,7 @@ main(int argc, CHAR16 *argv[])
 
 	devinit();
 
-#if defined(__amd64__) && defined(MK_LOADER_LUA)
+#if defined(__amd64__) && LACPI 
 	/* Initialize ACPI Subsystem and Tables. */
 	if ((ret = init_acpi()) != 0) {
 		printf("Failed to initialize ACPI\n.");

stand/liblua/Makefile

@@ -32,10 +32,13 @@ SRCS+=	lhash.c
 # ACPI
 .if ${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 0
 .PATH: ${LIBLUASRC}/acpi
+
 SRCS+=  lacpi.c lacpi_object.c lacpi_utils.c lacpi_walk.c lacpi_data.c
+
 CFLAGS+= -I${SYSDIR}/contrib/dev/acpica/include \
 	 -I${EFISRC}/libacpi/acpi/include -I${EFISRC}/include \
 	 -I${EFISRC}/include/amd64 -I${LIBLUASRC}/acpi/include
+
 DPADD+=	${LIBACPI}
 LDADD+= ${LIBACPI}
 .endif

stand/liblua/acpi/lacpi.c

@@ -46,9 +46,6 @@ lua_acpi_bindings(lua_State *L)
 		(*mod)->init(L);
 		lua_setglobal(L, (*mod)->mod_name);
 	}
-
-	luaopen_lacpi(L);
-	lua_setglobal(L, "lacpi");
 }
 
 /*
@@ -57,9 +54,7 @@ lua_acpi_bindings(lua_State *L)
 void
 lua_acpi_register_hook(void)
 {
-	if (acpi_is_initialized()) {
-		lua_acpi_register = lua_acpi_bindings;
-	}
+	lua_acpi_register = lua_acpi_bindings;
 }
 
 LUA_ACPI_COMPILE_SET(lacpi, luaopen_lacpi);

stand/lua/walk.lua

@@ -1,17 +1,15 @@
-local lacpi = require("lacpi")
-
 local function test_walk_namespace()
-	local nodes = lacpi.walk.dump_namespace()  -- returns table of tables
+	local nodes = lacpi.walk.namespace()  -- returns table of tables
 
 	-- Print them in Lua
 	for _, node in ipairs(nodes) do
-	    print(node.level, node.path, node.HID or "", node.UID or "")
+	    print(node.level, node.path, node.HID, node.UID)
 	end
 
-	return "SUCCESS";
+	return "SUCCESS"
 end
 
-print("--- TEST BEGIN: WALK NS ---");
+print("--- TEST BEGIN: WALK NS ---")
 
 status = test_walk_namespace()