[ros-diffs] [fireball] 48740: [HAL] - Add missing call to HalInitPnpDriver during I/O manager initialization. The HAL PnP driver was never getting initialized. - Add HAL callback for HalInitPnpDriver. It's goi...

Author: fireball
Date: Fri Sep 10 21:46:13 2010
New Revision: 48740
URL: http://svn.reactos.org/svn/reactos?rev=48740&view=rev
Log:
[HAL]
- Add missing call to HalInitPnpDriver during I/O manager initialization. The HAL PnP
driver was never getting initialized.
- Add HAL callback for HalInitPnpDriver. It's going to be needed in future for
eVb's PCI driver to fully work (interrupt translation, among other things).
Modified:
    trunk/reactos/hal/halx86/generic/halinit.c
    trunk/reactos/hal/halx86/generic/legacy/bussupp.c
    trunk/reactos/hal/halx86/generic/legacy/halpcat.c
    trunk/reactos/hal/halx86/include/halp.h
    trunk/reactos/ntoskrnl/io/iomgr/iomgr.c
Modified: trunk/reactos/hal/halx86/generic/halinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit…
==============================================================================
--- trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] Fri Sep 10 21:46:13 2010
@@ -111,7 +111,7 @@
         /* Fill out the dispatch tables */
         HalQuerySystemInformation = HaliQuerySystemInformation;
         HalSetSystemInformation = HaliSetSystemInformation;
-        HalInitPnpDriver = NULL; // FIXME: TODO
+        HalInitPnpDriver = HaliInitPnpDriver;
 #ifndef _MINIHAL_
         HalGetDmaAdapter = HalpGetDmaAdapter;
 #else
Modified: trunk/reactos/hal/halx86/generic/legacy/bussupp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/…
==============================================================================
--- trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] Fri Sep 10 21:46:13
2010
@@ -678,10 +678,10 @@
 VOID
 NTAPI
-HalpDebugPciBus(IN ULONG i,
-                IN ULONG j,
-                IN ULONG k,
-                IN PPCI_COMMON_CONFIG PciData)
+HalpDebugPciDumpBus(IN ULONG i,
+                    IN ULONG j,
+                    IN ULONG k,
+                    IN PPCI_COMMON_CONFIG PciData)
 {
     extern CHAR ClassTable[3922];
     extern CHAR VendorTable[642355];
@@ -933,7 +933,7 @@
                 if (PciData->VendorID == PCI_INVALID_VENDORID) continue;
                 /* Print out the entry */
-                HalpDebugPciBus(i, j, k, PciData);
+                HalpDebugPciDumpBus(i, j, k, PciData);
                 /* Check if this is a Cardbus bridge */
                 if (PCI_CONFIGURATION_TYPE(PciData) == PCI_CARDBUS_BRIDGE_TYPE)
Modified: trunk/reactos/hal/halx86/generic/legacy/halpcat.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/…
==============================================================================
--- trunk/reactos/hal/halx86/generic/legacy/halpcat.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/legacy/halpcat.c [iso-8859-1] Fri Sep 10 21:46:13
2010
@@ -56,6 +56,14 @@
     return (HalpBusType == MACHINE_TYPE_EISA) ? CM_RESOURCE_PORT_16_BIT_DECODE : 0;
 }
+NTSTATUS
+NTAPI
+HaliInitPnpDriver(VOID)
+{
+    /* On PC-AT, this will interface with the PCI driver */
+    return STATUS_SUCCESS;
+}
+
 /*
  * @implemented
  */
Modified: trunk/reactos/hal/halx86/include/halp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?…
==============================================================================
--- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Fri Sep 10 21:46:13 2010
@@ -795,6 +795,18 @@
     VOID
 );
+NTSTATUS
+NTAPI
+HaliInitPnpDriver(
+    VOID
+);
+
+VOID
+NTAPI
+HalpDebugPciDumpBus(
+    VOID
+);
+
 #ifdef _M_AMD64
 #define KfLowerIrql KeLowerIrql
 #ifndef CONFIG_SMP
Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?…
==============================================================================
--- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Fri Sep 10 21:46:13 2010
@@ -490,6 +490,9 @@
     /* Initialize PnP manager */
     IopInitializePlugPlayServices();
+    /* Initialize HAL Root Bus Driver */
+    HalInitPnpDriver();
+
     /* Load boot start drivers */
     IopInitializeBootDrivers();