WIP: lAcpiAttach/Detach/GetData

Allows a user to post ACPI_OBJECTs onto namespace nodes.
See actypes.h for all possible ACPI_OBJECTs.

Currently being tested.

Author: kpowkitty

stand/liblua/Makefile

@@ -32,7 +32,7 @@ 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
+SRCS+=  lacpi.c lacpi_object.c lacpi_utils.c lacpi_walk.c lacp_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

stand/liblua/acpi/include/lacpi_data.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#include <lua.h>
+#include <lauxlib.h>
+
+void lacpi_data_interp_ref(void);
+int luaopen_lacpi_data(lua_State *L);

stand/liblua/acpi/lacpi.c

@@ -4,6 +4,7 @@
 #include "lacpi.h"
 #include "lacpi_object.h"
 #include "lacpi_walk.h"
+#include "lacpi_data.h"
 
 /*
  * Reference set for all lacpi modules.
@@ -13,6 +14,7 @@ lacpi_interp_ref(void)
 {
 	lacpi_object_interp_ref();
 	lacpi_walk_interp_ref();
+	lacpi_data_interp_ref();
 }
 
 int
@@ -25,6 +27,9 @@ luaopen_lacpi(lua_State *L)
 
 	luaopen_lacpi_walk(L);
 	lua_setfield(L, -2, "walk");
+	
+	luaopen_lacpi_data(L);
+	lua_setfield(L, -2, "data");
 
 	return 1;
 }

stand/liblua/acpi/lacpi_data.c

@@ -0,0 +1,163 @@
+#include <efi.h>
+#include <efilib.h>
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include "lacpi.h"
+#include "lacpi_data.h"
+#include "lacpi_utils.h"
+
+/*
+ * Dynamic dispatcher for destructor based on ACPI_OBJECT_TYPE.
+ * Do nothing in the case of integer-based ACPI_OBJECT_TYPES.
+ */
+acpi_destructor_t
+get_object_destructor(UINT32 type)
+{
+	switch (type) {
+		case ACPI_TYPE_INTEGER:
+		case ACPI_TYPE_LOCAL_REFERENCE:
+		case ACPI_TYPE_PROCESSOR:
+		case ACPI_TYPE_POWER:
+			return free_fake;
+		case ACPI_TYPE_STRING:
+			return free_str;
+		case ACPI_TYPE_BUFFER:
+			return free_buff;
+		case ACPI_TYPE_PACKAGE:
+			return free_pkg;
+		default:
+			return NULL;
+	}
+}
+
+/*
+ * Attaching data requires providing a handler method.
+ */
+void
+acpi_object_handler(ACPI_HANDLE handle, void *data)
+{
+	if (data != NULL) {
+		ACPI_OBJECT *obj = (ACPI_OBJECT *)data;
+
+		acpi_destructor_t dtor = get_object_destructor(obj->Type);
+		if (dtor) {
+			dtor(obj);
+		} else {
+			free(obj);
+			obj == NULL;
+		}
+	}
+}
+
+/*
+ * Create an ACPI_OBJECT to attach to a namespace node.
+ * Uses ACPI_OBJECT as an interface for building the data
+ * object so we can re-use it rather than re-invent the wheel.
+ *
+ * Lua stack expectations:
+ * 1 = ACPI_HANDLE - the handle of the node to attach data onto
+ * 2 = ACPI_OBJECT_TYPE - the type of the object
+ * 
+ * The rest of the stack should match 1:1 to the ACPI_OBJECTs.
+ * Example: if attaching ACPI_TYPE_PACKAGE, Count should be next
+ * on the stack, and then *Elements.
+ */
+static int
+lAcpiAttachData(lua_State *L)
+{
+	ACPI_STATUS status;	
+	ACPI_HANDLE handle = (ACPI_HANDLE) lua_touserdata(L, 1);
+	UINT32 type = lua_int_to_uint32(L, 2, "Object type must be 32 bit");
+	ACPI_OBJECT *obj;
+
+	if (handle == NULL) {
+		return luaL_error(L, "lAcpiAttachData: Handle is NULL");
+	}
+
+	obj = malloc(sizeof(ACPI_OBJECT));
+	if (obj == NULL) {
+		return luaL_error(L, 
+		    "lAcpiAttachData: Failed to malloc ACPI_OBJECT");
+	}
+	
+	build_acpi_obj(L, obj, type);
+
+	if (ACPI_FAILURE(status = AcpiAttachData(handle, acpi_object_handler, (void *)obj))) {
+		free_acpi_obj(obj);
+		return luaL_error(L,
+		    "lAcpiAttachData: AcpiAttachData failed with status: 0x%x",
+		    status);
+	}
+
+	lua_pushinteger(L, (lua_Integer)status);
+	return 1;
+}
+
+/*
+ * Removes data from an ACPI node.
+ */
+static int
+lAcpiDetachData(lua_State *L)
+{
+	ACPI_STATUS status;
+	ACPI_HANDLE handle = (ACPI_HANDLE) lua_touserdata(L, 1);
+	
+	if (handle == NULL) {
+		return luaL_error(L, "lAcpiDetachData: NULL Argument(s)");
+	}
+
+	if (ACPI_FAILURE(status = AcpiDetachData(handle, acpi_object_handler))) {
+		return luaL_error(L,
+		    "lAcpiDetachData: AcpiDetachData failed with status: 0x%x",
+		    status);
+	}
+
+	lua_pushinteger(L, (lua_Integer)status);
+	return 1;
+}
+
+/*
+ * Retrieves data from an ACPI node.
+ */
+static int
+lAcpiGetData(lua_State *L)
+{
+	ACPI_STATUS status;
+	ACPI_HANDLE handle = (ACPI_HANDLE) lua_touserdata(L, 1);
+	void *data = NULL;
+
+	if (handle == NULL) {
+		return luaL_error(L, "lAcpiGetData: NULL Argument(s)");
+	}
+	
+	if (ACPI_FAILURE(status = AcpiGetData(handle, acpi_object_handler, &data))) {
+		return luaL_error(L,
+		    "lAcpiGetData: AcpiGetData failed with status: 0x%x",
+		    status);
+	}
+	
+	push_acpi_obj(L, (ACPI_OBJECT *)data);
+	return 1; 
+}
+
+static const
+luaL_Reg lacpi_data_funcs[] = {
+        { "attach", lAcpiAttachData },
+        { "detach", lAcpiDetachData },
+        { "get", lAcpiGetData },
+        { NULL, NULL }
+};
+
+int
+luaopen_lacpi_data(lua_State *L)
+{
+	luaL_newlib(L, lacpi_data_funcs);
+	return 1;
+}
+
+void
+lacpi_data_interp_ref(void)
+{
+}

stand/liblua/acpi/lacpi_utils.c

@@ -365,7 +365,6 @@ free_acpi_obj(ACPI_OBJECT *obj)
 			case ACPI_TYPE_PACKAGE:
 				free_pkg(obj);
 				break;
-
 			default:
 				assert(obj == NULL);
 				break;