[ros-diffs] [tkreuzer] 44833: use a directory.rbuild for halx86

Author: tkreuzer
Date: Thu Dec 31 20:46:47 2009
New Revision: 44833

URL: http://svn.reactos.org/svn/reactos?rev=44833&view=rev
Log:
use a directory.rbuild for halx86

Added:
    branches/ros-amd64-bringup/reactos/hal/halx86/directory.rbuild   (with props)
Modified:
    branches/ros-amd64-bringup/reactos/hal/hal.rbuild
    branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild
    branches/ros-amd64-bringup/reactos/hal/halx86/up/processor.c

Modified: branches/ros-amd64-bringup/reactos/hal/hal.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/hal.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/hal.rbuild [iso-8859-1] Thu Dec 31 20:46:47
2009
@@ -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>

Added: branches/ros-amd64-bringup/reactos/hal/halx86/directory.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/directory.rbuild (added)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/directory.rbuild [iso-8859-1] Thu Dec 31
20:46:47 2009
@@ -1,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>

Propchange: branches/ros-amd64-bringup/reactos/hal/halx86/directory.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] Thu
Dec 31 20:46:47 2009
@@ -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>

Modified: branches/ros-amd64-bringup/reactos/hal/halx86/up/processor.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/up/processor.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/up/processor.c [iso-8859-1] Thu Dec 31
20:46:47 2009
@@ -37,7 +37,9 @@
                        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 */