[cgutman] 53325: [HAL] - Simplify device extension setup - Allocate memory for existing PDOs in the device relations struct

Author: cgutman
Date: Fri Aug 19 20:56:39 2011
New Revision: 53325

URL: http://svn.reactos.org/svn/reactos?rev=53325&view=rev
Log:
[HAL]
- Simplify device extension setup
- Allocate memory for existing PDOs in the device relations struct

Modified:
    trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c

Modified: trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/acpi/hal...
==============================================================================
--- trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c [iso-8859-1] Fri Aug 19 20:56:39 2011
@@ -82,6 +82,7 @@
     FdoExtension->ExtensionType = FdoExtensionType;
     FdoExtension->PhysicalDeviceObject = TargetDevice;
     FdoExtension->FunctionalDeviceObject = DeviceObject;
+    FdoExtension->ChildPdoList = NULL;

/* FDO is done initializing */
     DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING;
@@ -115,26 +116,24 @@

/* Setup the PDO device extension */
     PdoExtension = PdoDeviceObject->DeviceExtension;
-    PdoExtension->Next = NULL;
     PdoExtension->ExtensionType = PdoExtensionType;
     PdoExtension->PhysicalDeviceObject = PdoDeviceObject;
     PdoExtension->ParentFdoExtension = FdoExtension;
     PdoExtension->PdoType = AcpiPdo;
+    
+    /* Add the PDO to the head of the list */
+    PdoExtension->Next = FdoExtension->ChildPdoList;
+    FdoExtension->ChildPdoList = PdoExtension;
+    
+    /* Initialization is finished */
+    PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING;

/* Find the ACPI watchdog table */
     Wdrt = HalAcpiGetTable(0, 'TRDW');
-    if (!Wdrt)
-    {
-        /* None exists, there is nothing to do more */
-        PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING;
-        FdoExtension->ChildPdoList = PdoExtension;
-    }
-    else
+    if (Wdrt)
     {
         /* FIXME: TODO */
         DPRINT1("You have an ACPI Watchdog. That's great! You should be proud ;-)\n");
-        PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING;
-        FdoExtension->ChildPdoList = PdoExtension;
     }

/* Invalidate device relations since we added a new device */
@@ -191,7 +190,13 @@
                 PdoExtension = PdoExtension->Next;
                 PdoCount++;
             }
-            
+
+            /* Add the PDOs that already exist in the device relations */
+            if (*DeviceRelations)
+            {
+                PdoCount += (*DeviceRelations)->Count;
+            }
+
             /* Allocate our structure */
             FdoRelations = ExAllocatePoolWithTag(PagedPool,
                                                  FIELD_OFFSET(DEVICE_RELATIONS,