Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-27 11:42:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix build by:

Browse source 
- 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.

svn path=/trunk/; revision=24763
This commit is contained in:
Aleksey Bragin 2006-11-15 10:42:46 +00:00
parent b649dd5293
commit 44eba681e0
4 changed files with 12 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/hal/halx86/generic/halinit.c
View file

@ -62,6 +62,9 @@ HalReportResourceUsage(VOID)
/* Initialize PCI bus. */ /* Initialize PCI bus. */
HalpInitPciBus(); HalpInitPciBus();
/* FIXME: This is done in ReactOS MP HAL only*/
//HaliReconfigurePciInterrupts();
/* FIXME: Report HAL Usage to kernel */ /* FIXME: Report HAL Usage to kernel */
} }

1
reactos/hal/halx86/mp/halmp.rbuild
View file

@ -19,7 +19,6 @@
<file>mpsboot.asm</file> <file>mpsboot.asm</file>
<file>mpsirql.c</file> <file>mpsirql.c</file>
<file>processor_mp.c</file> <file>processor_mp.c</file>
<file>resource_mp.c</file>
<file>spinlock.c</file> <file>spinlock.c</file>
<file>halmp.rc</file> <file>halmp.rc</file>
</module> </module>

13
reactos/hal/halx86/mp/processor_mp.c
View file

@ -88,13 +88,15 @@ HalAllProcessorsStarted (VOID)
return FALSE; return FALSE;
} }
BOOLEAN STDCALL BOOLEAN
HalStartNextProcessor(ULONG Unknown1, NTAPI
ULONG ProcessorStack) HalStartNextProcessor(
IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock,
IN PKPROCESSOR_STATE ProcessorState)
{ {
ULONG CPU; ULONG CPU;
DPRINT("HalStartNextProcessor(%x %x)\n", Unknown1, ProcessorStack); DPRINT("HalStartNextProcessor(%x %x)\n", LoaderBlock, ProcessorState);
for (CPU = 0; CPU < CPUCount; CPU++) for (CPU = 0; CPU < CPUCount; CPU++)
{ {
@ -111,7 +113,8 @@ HalStartNextProcessor(ULONG Unknown1,
DPRINT1("Attempting to boot CPU %d\n", CPU); DPRINT1("Attempting to boot CPU %d\n", CPU);
HaliStartApplicationProcessor(CPU, ProcessorStack); //FIXME: ProcessorStack?
//HaliStartApplicationProcessor(CPU, ProcessorStack);
return TRUE; return TRUE;
} }

36
reactos/hal/halx86/mp/resource_mp.c
View file

@ -1,36 +0,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 */