[FREELDR]: Move the (private) HAL Pci bus initialization calls to where they are needed: for SCSI initialization (see r46017).

svn path=/trunk/; revision=70684

reactos/boot/freeldr/freeldr/disk/scsiport.c

@@ -48,6 +48,11 @@
 
 DBG_DEFAULT_CHANNEL(SCSIPORT);
 
+#ifdef _M_IX86
+VOID NTAPI HalpInitializePciStubs(VOID);
+VOID NTAPI HalpInitBusHandler(VOID);
+#endif
+
 typedef struct
 {
     PVOID NonCachedExtension;
@@ -93,6 +98,7 @@ ntohl(
     return Dest.AsULong;
 }
 
+static
 BOOLEAN
 SpiSendSynchronousSrb(
     IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
@@ -366,6 +372,7 @@ static const DEVVTBL DiskVtbl = {
     DiskSeek,
 };
 
+static
 NTSTATUS
 SpiCreatePortConfig(
     IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
@@ -608,6 +615,7 @@ ScsiPortGetSrb(
     return NULL;
 }
 
+static
 NTSTATUS
 SpiAllocateCommonBuffer(
     IN OUT PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
@@ -767,6 +775,7 @@ ScsiPortGetVirtualAddress(
     return NULL;
 }
 
+static
 VOID
 SpiScanDevice(
     IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
@@ -807,6 +816,7 @@ SpiScanDevice(
     }
 }
 
+static
 VOID
 SpiScanAdapter(
     IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
@@ -881,6 +891,7 @@ SpiScanAdapter(
     }
 }
 
+static
 VOID
 SpiResourceToConfig(
     IN PHW_INITIALIZATION_DATA HwInitializationData,
@@ -961,9 +972,10 @@ SpiResourceToConfig(
     }
 }
 
+static
 BOOLEAN
 SpiGetPciConfigData(
-    IN struct _HW_INITIALIZATION_DATA *HwInitializationData,
+    IN PHW_INITIALIZATION_DATA HwInitializationData,
     IN OUT PPORT_CONFIGURATION_INFORMATION PortConfig,
     IN ULONG BusNumber,
     IN OUT PPCI_SLOT_NUMBER NextSlotNumber)
@@ -1065,7 +1077,7 @@ NTAPI
 ScsiPortInitialize(
     IN PVOID Argument1,
     IN PVOID Argument2,
-    IN struct _HW_INITIALIZATION_DATA *HwInitializationData,
+    IN PHW_INITIALIZATION_DATA HwInitializationData,
     IN PVOID HwContext OPTIONAL)
 {
     PSCSI_PORT_DEVICE_EXTENSION DeviceExtension;
@@ -1576,6 +1588,12 @@ LoadBootDeviceDriver(VOID)
     ULONG (NTAPI *EntryPoint)(IN PVOID DriverObject, IN PVOID RegistryPath);
     BOOLEAN Success;
 
+    // FIXME: Must be done *INSIDE* the HAL!
+#ifdef _M_IX86
+    HalpInitializePciStubs();
+    HalpInitBusHandler();
+#endif
+
     /* Initialize the loaded module list */
     InitializeListHead(&ModuleListHead);
 

reactos/boot/freeldr/freeldr/freeldr.c

@@ -53,11 +53,6 @@ VOID __cdecl BootMain(IN PCCH CmdLine)
         goto Quit;
     }
 
-#ifdef _M_IX86
-    HalpInitializePciStubs();
-    HalpInitBusHandler();
-#endif
-
     RunLoader();
 
 Quit:

reactos/boot/freeldr/freeldr/include/freeldr.h

@@ -63,7 +63,6 @@
 #include <comm.h>
 #include <disk.h>
 #include <fs.h>
-#include <hal.h>
 #include <inffile.h>
 #include <inifile.h>
 #include <keycodes.h>

reactos/boot/freeldr/freeldr/include/hal.h

@@ -1,9 +0,0 @@
-
-#pragma once
-
-#ifdef _M_IX86
-
-VOID NTAPI HalpInitializePciStubs(VOID);
-VOID NTAPI HalpInitBusHandler(VOID);
-
-#endif