diff --git a/reactos/hal/halx86/generic/halinit.c b/reactos/hal/halx86/generic/halinit.c index f772d5cf0bd..f3e510d2426 100644 --- a/reactos/hal/halx86/generic/halinit.c +++ b/reactos/hal/halx86/generic/halinit.c @@ -62,6 +62,9 @@ HalReportResourceUsage(VOID) /* Initialize PCI bus. */ HalpInitPciBus(); + /* FIXME: This is done in ReactOS MP HAL only*/ + //HaliReconfigurePciInterrupts(); + /* FIXME: Report HAL Usage to kernel */ } diff --git a/reactos/hal/halx86/mp/halmp.rbuild b/reactos/hal/halx86/mp/halmp.rbuild index 96329497363..1cd533591f7 100644 --- a/reactos/hal/halx86/mp/halmp.rbuild +++ b/reactos/hal/halx86/mp/halmp.rbuild @@ -19,7 +19,6 @@ mpsboot.asm mpsirql.c processor_mp.c - resource_mp.c spinlock.c halmp.rc diff --git a/reactos/hal/halx86/mp/processor_mp.c b/reactos/hal/halx86/mp/processor_mp.c index 07bb6ad1066..df5192ace18 100644 --- a/reactos/hal/halx86/mp/processor_mp.c +++ b/reactos/hal/halx86/mp/processor_mp.c @@ -88,19 +88,21 @@ HalAllProcessorsStarted (VOID) return FALSE; } -BOOLEAN STDCALL -HalStartNextProcessor(ULONG Unknown1, - ULONG ProcessorStack) +BOOLEAN +NTAPI +HalStartNextProcessor( + IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock, + IN PKPROCESSOR_STATE ProcessorState) { ULONG CPU; - DPRINT("HalStartNextProcessor(%x %x)\n", Unknown1, ProcessorStack); + DPRINT("HalStartNextProcessor(%x %x)\n", LoaderBlock, ProcessorState); for (CPU = 0; CPU < CPUCount; CPU++) { if (!(OnlineCPUs & (1< -#define NDEBUG -#include - -/* FUNCTIONS ****************************************************************/ - -VOID -HaliReconfigurePciInterrupts(VOID); - - -VOID STDCALL -HalReportResourceUsage(VOID) -{ - /* - * FIXME: Report all resources used by hal. - * Calls IoReportHalResourceUsage() - */ - - /* Initialize PCI bus. */ - HalpInitPciBus (); - - HaliReconfigurePciInterrupts(); -} - -/* EOF */