use a directory.rbuild for halx86

svn path=/branches/ros-amd64-bringup/; revision=44833

diff --git a/reactos/hal/hal.rbuild b/reactos/hal/hal.rbuild
index 2e37cc8..6f873c8 100644 (file)
--- a/reactos/hal/hal.rbuild
+++ b/reactos/hal/hal.rbuild
@@ -1,18 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-       <if property="ARCH" value="i386">
-               <directory name="halx86">
-                       <xi:include href="halx86/hal_generic.rbuild" />
-                       <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>
+       <directory name="halx86">
+               <xi:include href="halx86/directory.rbuild" />
+       </directory>
+
        <if property="ARCH" value="powerpc">
                <directory name="halppc">
                        <xi:include href="halppc/directory.rbuild" />
@@ -24,9 +16,6 @@
                </directory>
        </if>
        <if property="ARCH" value="amd64">
-               <directory name="halx86">
-                       <xi:include href="halx86/hal_generic.rbuild" />
-               </directory>
                <directory name="halamd64">
                        <xi:include href="halamd64/directory.rbuild" />
                </directory>

diff --git a/reactos/hal/halx86/directory.rbuild b/reactos/hal/halx86/directory.rbuild
new file mode 100644 (file)
index 0000000..bc046e1
--- /dev/null
+++ b/reactos/hal/halx86/directory.rbuild
@@ -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>

diff --git a/reactos/hal/halx86/hal_generic_up.rbuild b/reactos/hal/halx86/hal_generic_up.rbuild
index 1823da2..81f8e7e 100644 (file)
--- a/reactos/hal/halx86/hal_generic_up.rbuild
+++ b/reactos/hal/halx86/hal_generic_up.rbuild
@@ -6,9 +6,11 @@
                <include base="ntoskrnl">include</include>
                <define name="_NTHAL_" />
                <directory name="up">
-                       <file>irq.S</file>
                        <file>processor.c</file>
-                       <file>spinlock.c</file>
+                       <if property="ARCH" value="i386">
+                               <file>irq.S</file>
+                               <file>spinlock.c</file>
+                       </if>
                </directory>
        </module>
 </group>

diff --git a/reactos/hal/halx86/up/processor.c b/reactos/hal/halx86/up/processor.c
index 662514b..aa8a5b2 100644 (file)
--- a/reactos/hal/halx86/up/processor.c
+++ b/reactos/hal/halx86/up/processor.c
@@ -37,7 +37,9 @@ HalInitializeProcessor(IN ULONG ProcessorNumber,
                        IN PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
     /* Set default IDR and stall count */
+#ifdef _M_IX86
     KeGetPcr()->IDR = 0xFFFFFFFB;
+#endif
     KeGetPcr()->StallScaleFactor = INITIAL_STALL_COUNT;
 
     /* Update the interrupt affinity and processor mask */