Author: fireball Date: Wed Nov 15 13:42:46 2006 New Revision: 24763
URL: http://svn.reactos.org/svn/reactos?rev=24763&view=rev Log: Fix build by: - Matching HAL MP HalStartNextProcessor() and commenting out a call to HaliStartApplicationProcessor() (because it needs ProcessorContext). Proper fix should be done. - Removing HalReportResourceUsage from MP version, and marking what it did differently as FIXME in the generic version.
Removed: trunk/reactos/hal/halx86/mp/resource_mp.c Modified: trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/mp/halmp.rbuild trunk/reactos/hal/halx86/mp/processor_mp.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 (original) +++ trunk/reactos/hal/halx86/generic/halinit.c Wed Nov 15 13:42:46 2006 @@ -62,6 +62,9 @@ /* Initialize PCI bus. */ HalpInitPciBus();
+ /* FIXME: This is done in ReactOS MP HAL only*/ + //HaliReconfigurePciInterrupts(); + /* FIXME: Report HAL Usage to kernel */ }
Modified: trunk/reactos/hal/halx86/mp/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/halmp.rbuild?... ============================================================================== --- trunk/reactos/hal/halx86/mp/halmp.rbuild (original) +++ trunk/reactos/hal/halx86/mp/halmp.rbuild Wed Nov 15 13:42:46 2006 @@ -19,7 +19,6 @@ <file>mpsboot.asm</file> <file>mpsirql.c</file> <file>processor_mp.c</file> - <file>resource_mp.c</file> <file>spinlock.c</file> <file>halmp.rc</file> </module>
Modified: trunk/reactos/hal/halx86/mp/processor_mp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/processor_mp.... ============================================================================== --- trunk/reactos/hal/halx86/mp/processor_mp.c (original) +++ trunk/reactos/hal/halx86/mp/processor_mp.c Wed Nov 15 13:42:46 2006 @@ -88,19 +88,21 @@ 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<<CPU))) { - break; + break; } }
@@ -111,7 +113,8 @@
DPRINT1("Attempting to boot CPU %d\n", CPU);
- HaliStartApplicationProcessor(CPU, ProcessorStack); + //FIXME: ProcessorStack? + //HaliStartApplicationProcessor(CPU, ProcessorStack);
return TRUE; }
Removed: trunk/reactos/hal/halx86/mp/resource_mp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/resource_mp.c... ============================================================================== --- trunk/reactos/hal/halx86/mp/resource_mp.c (original) +++ trunk/reactos/hal/halx86/mp/resource_mp.c (removed) @@ -1,36 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/halx86/mp/resource_mp.c - * PURPOSE: Miscellaneous resource functions for MP - * PROGRAMMER: Eric Kohl (ekohl@rz-online.de) - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -VOID -HaliReconfigurePciInterrupts(VOID); - - -VOID STDCALL -HalReportResourceUsage(VOID) -{ - /* - * FIXME: Report all resources used by hal. - * Calls IoReportHalResourceUsage() - */ - - /* Initialize PCI bus. */ - HalpInitPciBus (); - - HaliReconfigurePciInterrupts(); -} - -/* EOF */