[ros-diffs] [cgutman] 56242: [TXTSETUP] - Add *PNP0A08 [ACPI] - Handle the PNP0A08 in a couple of missed cases - Finally, PCI should work on systems that use the new PNP0A08 ID for identifying a PCI Express ro...

[cgutman at svn.reactos.org]

Author: cgutman
Date: Tue Mar 27 06:26:38 2012
New Revision: 56242

URL: http://svn.reactos.org/svn/reactos?rev=56242&view=rev
Log:
[TXTSETUP]
- Add *PNP0A08
[ACPI]
- Handle the PNP0A08 in a couple of missed cases
- Finally, PCI should work on systems that use the new PNP0A08 ID for identifying a PCI Express root bus

Modified:
    trunk/reactos/boot/bootdata/txtsetup.sif
    trunk/reactos/drivers/bus/acpi/buspdo.c

Modified: trunk/reactos/boot/bootdata/txtsetup.sif
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif?rev=56242&r1=56241&r2=56242&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Tue Mar 27 06:26:38 2012
@@ -62,6 +62,7 @@
 [HardwareIdsDatabase]
 ;*PNP0A00 = isapnp
 *PNP0A03 = pci
+*PNP0A08 = pci
 *PNP0C08 = acpi
 ;PCI\CC_0601 = isapnp
 PCI\CC_0604 = pci

Modified: trunk/reactos/drivers/bus/acpi/buspdo.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?rev=56242&r1=56241&r2=56242&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Tue Mar 27 06:26:38 2012
@@ -594,7 +594,8 @@
             Temp = L"ACPI Embedded Controller";
            else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0B") != 0)
             Temp = L"ACPI Fan";
-           else if (wcsstr(DeviceData->HardwareIDs, L"PNP0A03") != 0)
+           else if (wcsstr(DeviceData->HardwareIDs, L"PNP0A03") != 0 ||
+                    wcsstr(DeviceData->HardwareIDs, L"PNP0A08") != 0 )
             Temp = L"PCI Root Bridge";
            else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0A") != 0)
             Temp = L"ACPI Battery";
@@ -666,7 +667,8 @@
     /* A bus number resource is not included in the list of current resources
      * for the root PCI bus so we manually query one here and if we find it
      * we create a resource list and add a bus number descriptor to it */
-    if (wcsstr(DeviceData->HardwareIDs, L"PNP0A03") != 0)
+    if (wcsstr(DeviceData->HardwareIDs, L"PNP0A03") != 0 ||
+        wcsstr(DeviceData->HardwareIDs, L"PNP0A08") != 0)
     {
         acpi_bus_get_device(DeviceData->AcpiHandle, &device);
 
@@ -1169,7 +1171,8 @@
     }
 
     /* Handle the PCI root manually */
-    if (wcsstr(DeviceData->HardwareIDs, L"PNP0A03") != 0)
+    if (wcsstr(DeviceData->HardwareIDs, L"PNP0A03") != 0 ||
+        wcsstr(DeviceData->HardwareIDs, L"PNP0A08") != 0)
     {
         return Irp->IoStatus.Status;
     }