From 2d246e918e001d74e90d24a942dd1620e13b0bd2 Mon Sep 17 00:00:00 2001
From: Aleksey Bragin <aleksey@reactos.org>
Date: Fri, 10 Sep 2010 21:46:13 +0000
Subject: [PATCH] [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).

svn path=/trunk/; revision=48740
---
 reactos/hal/halx86/generic/halinit.c        |  2 +-
 reactos/hal/halx86/generic/legacy/bussupp.c | 10 +++++-----
 reactos/hal/halx86/generic/legacy/halpcat.c |  8 ++++++++
 reactos/hal/halx86/include/halp.h           | 12 ++++++++++++
 reactos/ntoskrnl/io/iomgr/iomgr.c           |  3 +++
 5 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/reactos/hal/halx86/generic/halinit.c b/reactos/hal/halx86/generic/halinit.c
index f0ebd33d4ca..9615891c045 100644
--- a/reactos/hal/halx86/generic/halinit.c
+++ b/reactos/hal/halx86/generic/halinit.c
@@ -111,7 +111,7 @@ HalInitSystem(IN ULONG BootPhase,
         /* Fill out the dispatch tables */
         HalQuerySystemInformation = HaliQuerySystemInformation;
         HalSetSystemInformation = HaliSetSystemInformation;
-        HalInitPnpDriver = NULL; // FIXME: TODO
+        HalInitPnpDriver = HaliInitPnpDriver;
 #ifndef _MINIHAL_
         HalGetDmaAdapter = HalpGetDmaAdapter;
 #else
diff --git a/reactos/hal/halx86/generic/legacy/bussupp.c b/reactos/hal/halx86/generic/legacy/bussupp.c
index 6faa60fb765..1758f85dab6 100644
--- a/reactos/hal/halx86/generic/legacy/bussupp.c
+++ b/reactos/hal/halx86/generic/legacy/bussupp.c
@@ -678,10 +678,10 @@ ShowSize(ULONG x)
 
 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 @@ HalpInitializePciBus(VOID)
                 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)
diff --git a/reactos/hal/halx86/generic/legacy/halpcat.c b/reactos/hal/halx86/generic/legacy/halpcat.c
index 0b85acd54ae..28913f9fc16 100644
--- a/reactos/hal/halx86/generic/legacy/halpcat.c
+++ b/reactos/hal/halx86/generic/legacy/halpcat.c
@@ -56,6 +56,14 @@ HalpIs16BitPortDecodeSupported(VOID)
     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
  */
diff --git a/reactos/hal/halx86/include/halp.h b/reactos/hal/halx86/include/halp.h
index 7a5155decc0..5c0db26b9bc 100644
--- a/reactos/hal/halx86/include/halp.h
+++ b/reactos/hal/halx86/include/halp.h
@@ -795,6 +795,18 @@ HalpInitBusHandlers(
     VOID
 );
 
+NTSTATUS
+NTAPI
+HaliInitPnpDriver(
+    VOID
+);
+
+VOID
+NTAPI
+HalpDebugPciDumpBus(
+    VOID
+);
+
 #ifdef _M_AMD64
 #define KfLowerIrql KeLowerIrql
 #ifndef CONFIG_SMP
diff --git a/reactos/ntoskrnl/io/iomgr/iomgr.c b/reactos/ntoskrnl/io/iomgr/iomgr.c
index a0f16bb15a4..0cccebdf3b3 100644
--- a/reactos/ntoskrnl/io/iomgr/iomgr.c
+++ b/reactos/ntoskrnl/io/iomgr/iomgr.c
@@ -490,6 +490,9 @@ IoInitSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
     /* Initialize PnP manager */
     IopInitializePlugPlayServices();
 
+    /* Initialize HAL Root Bus Driver */
+    HalInitPnpDriver();
+
     /* Load boot start drivers */
     IopInitializeBootDrivers();