Ticket #4152: acpi_dpc_loading.patch

acpi_module.c

@@ -13 +13 @@
 #include <dpc.h>
 #include <PCI.h>
 
-dpc_module_info* gDPC = NULL;
-void* gDPCHandle = NULL;
-
 //#define TRACE_ACPI_MODULE
 #ifdef TRACE_ACPI_MODULE
 #   define TRACE(x) dprintf x
@@ -23 +20 @@
 #   define TRACE(x) ;
 #endif
 
+dpc_module_info* gDPC = NULL;
+void* gDPCHandle = NULL;
+
 device_manager_info *gDeviceManager = NULL;
 pci_module_info *gPCIManager = NULL;
 
 module_dependency module_dependencies[] = {
     {B_DEVICE_MANAGER_MODULE_NAME, (module_info **)&gDeviceManager},
     {B_PCI_MODULE_NAME, (module_info **)&gPCIManager},
+    {B_DPC_MODULE_NAME, (module_info **)&gDPC},
     {}
 };
 
@@ -172 +173 @@
 static status_t
 acpi_module_init(device_node *node, void **_cookie)
 {
-    if (get_module(B_DPC_MODULE_NAME, (module_info **)&gDPC) != B_OK) {
-        dprintf("failed to get dpc module\n");
-        return B_ERROR;
-    }
-    if (gDPC->new_dpc_queue(&gDPCHandle, "acpi_task",
-        B_NORMAL_PRIORITY) != B_OK) {
-        dprintf("failed to create os execution queue\n");
-        return B_ERROR;
-    }
-            
     *_cookie = node;
     return B_OK;
 }
@@ -190 +181 @@
 static void
 acpi_module_uninit(void *cookie)
 {
-    gDPC->delete_dpc_queue(gDPCHandle);
-    gDPCHandle = NULL;
-    put_module(B_DPC_MODULE_NAME);
-    gDPC = NULL;
 }
 
 
@@ -204 +191 @@
         case B_MODULE_INIT:
         {
             module_info *module;
+
+            if (get_module(B_DPC_MODULE_NAME, (module_info **)&gDPC) != B_OK) {
+                dprintf("failed to get dpc module\n");
+                return B_ERROR;
+            }
+            if (gDPC->new_dpc_queue(&gDPCHandle, "acpi_task",
+                B_NORMAL_PRIORITY) != B_OK) {
+                dprintf("failed to create os execution queue\n");
+                return B_ERROR;
+            }
+
             return get_module(B_ACPI_MODULE_NAME, &module);
                 // this serializes our module initialization
         }
 
         case B_MODULE_UNINIT:
-            return put_module(B_ACPI_MODULE_NAME);
+        {
+            status_t result = put_module(B_ACPI_MODULE_NAME);
+            gDPC->delete_dpc_queue(gDPCHandle);
+            gDPCHandle = NULL;
+            put_module(B_DPC_MODULE_NAME);
+            gDPC = NULL;
+            return result;
+        }
     }
 
     return B_BAD_VALUE;
@@ -260 +265 @@
     evaluate_method,
 };
 
-_EXPORT module_info *modules[] = {
+module_info *modules[] = {
     (module_info *)&gACPIModule,
     (module_info *)&sACPIRootModule,
     (module_info *)&acpi_ns_dump_module,