[CMAKE]

[reactos.git] / hal / halx86 / generic / halinit.c

diff --git a/hal/halx86/generic/halinit.c b/hal/halx86/generic/halinit.c
index 498bf5c..f0011d7 100644 (file)
--- a/hal/halx86/generic/halinit.c
+++ b/hal/halx86/generic/halinit.c
@@ -20,6 +20,7 @@ BOOLEAN HalpPciLockSettings;
 
 VOID
 NTAPI
+INIT_FUNCTION
 HalpGetParameters(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
     PCHAR CommandLine;
@@ -45,6 +46,7 @@ HalpGetParameters(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
  */
 BOOLEAN
 NTAPI
+INIT_FUNCTION
 HalInitSystem(IN ULONG BootPhase,
               IN PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
@@ -92,6 +94,9 @@ HalInitSystem(IN ULONG BootPhase,
         }
 
 #ifndef _MINIHAL_
+        /* Initialize ACPI */
+        HalpSetupAcpiPhase0(LoaderBlock);
+
         /* Initialize the PICs */
         HalpInitializePICs(TRUE);
 #endif
@@ -108,7 +113,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
@@ -152,7 +157,7 @@ HalInitSystem(IN ULONG BootPhase,
     else if (BootPhase == 1)
     {
         /* Initialize bus handlers */
-        HalpInitBusHandler();
+        HalpInitBusHandlers();
 
 #ifndef _MINIHAL_
         /* Enable IRQ 0 */