use a directory.rbuild for halx86

svn path=/branches/ros-amd64-bringup/; revision=44833
This commit is contained in:
Timo Kreuzer 2009-12-31 19:46:47 +00:00
parent bda3767dfb
commit b40509f919
4 changed files with 31 additions and 17 deletions

View file

@ -1,18 +1,10 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
<group xmlns:xi="http://www.w3.org/2001/XInclude"> <group xmlns:xi="http://www.w3.org/2001/XInclude">
<if property="ARCH" value="i386"> <directory name="halx86">
<directory name="halx86"> <xi:include href="halx86/directory.rbuild" />
<xi:include href="halx86/hal_generic.rbuild" /> </directory>
<xi:include href="halx86/hal_generic_up.rbuild" />
<xi:include href="halx86/hal_generic_pc.rbuild" />
<xi:include href="halx86/halup.rbuild" />
<if property="BUILD_MP" value="1">
<xi:include href="halx86/halmp.rbuild" />
</if>
<xi:include href="halx86/halxbox.rbuild" />
</directory>
</if>
<if property="ARCH" value="powerpc"> <if property="ARCH" value="powerpc">
<directory name="halppc"> <directory name="halppc">
<xi:include href="halppc/directory.rbuild" /> <xi:include href="halppc/directory.rbuild" />
@ -24,9 +16,6 @@
</directory> </directory>
</if> </if>
<if property="ARCH" value="amd64"> <if property="ARCH" value="amd64">
<directory name="halx86">
<xi:include href="halx86/hal_generic.rbuild" />
</directory>
<directory name="halamd64"> <directory name="halamd64">
<xi:include href="halamd64/directory.rbuild" /> <xi:include href="halamd64/directory.rbuild" />
</directory> </directory>

View file

@ -0,0 +1,21 @@
<?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="hal_generic.rbuild" />
<xi:include href="hal_generic_pc.rbuild" />
<xi:include href="hal_generic_up.rbuild" />
<if property="ARCH" value="i386">
<xi:include href="halup.rbuild" />
<xi:include href="halxbox.rbuild" />
<if property="BUILD_MP" value="1">
<xi:include href="halmp.rbuild" />
</if>
</if>
<!-- if property="ARCH" value="amd64">
<xi:include href="halamd64.rbuild" />
</if -->
</group>

View file

@ -6,9 +6,11 @@
<include base="ntoskrnl">include</include> <include base="ntoskrnl">include</include>
<define name="_NTHAL_" /> <define name="_NTHAL_" />
<directory name="up"> <directory name="up">
<file>irq.S</file>
<file>processor.c</file> <file>processor.c</file>
<file>spinlock.c</file> <if property="ARCH" value="i386">
<file>irq.S</file>
<file>spinlock.c</file>
</if>
</directory> </directory>
</module> </module>
</group> </group>

View file

@ -37,7 +37,9 @@ HalInitializeProcessor(IN ULONG ProcessorNumber,
IN PLOADER_PARAMETER_BLOCK LoaderBlock) IN PLOADER_PARAMETER_BLOCK LoaderBlock)
{ {
/* Set default IDR and stall count */ /* Set default IDR and stall count */
#ifdef _M_IX86
KeGetPcr()->IDR = 0xFFFFFFFB; KeGetPcr()->IDR = 0xFFFFFFFB;
#endif
KeGetPcr()->StallScaleFactor = INITIAL_STALL_COUNT; KeGetPcr()->StallScaleFactor = INITIAL_STALL_COUNT;
/* Update the interrupt affinity and processor mask */ /* Update the interrupt affinity and processor mask */