[HAL]

- Move architecture specific files into appropriate folders
- Move UP specific files into up folder

svn path=/trunk/; revision=46447

reactos/hal/hal.rbuild

@@ -2,10 +2,16 @@
 <!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/directory.rbuild" />
-	    </directory>
+	<if property="ARCH" value="i386">
+		<directory name="halx86">
+			<xi:include href="halx86/directory.rbuild" />
+		</directory>
+	</if>
+
+	<if property="ARCH" value="amd64">
+		<directory name="halx86">
+			<xi:include href="halx86/directory.rbuild" />
+		</directory>
 	</if>
 
 	<if property="ARCH" value="powerpc">

reactos/hal/halx86/hal_generic.rbuild

@@ -18,24 +18,35 @@
 			<file>beep.c</file>
 			<file>bios.c</file>
 			<file>cmos.c</file>
+			<file>display.c</file>
 			<file>dma.c</file>
 			<file>drive.c</file>
-			<file>display.c</file>
 			<file>halinit.c</file>
 			<file>misc.c</file>
-			<file>portio.c</file>
 			<file>profil.c</file>
 			<file>reboot.c</file>
 			<file>sysinfo.c</file>
-			<file>systimer.S</file>
 			<file>timer.c</file>
-			<file>trap.S</file>
 			<file>usage.c</file>
+			<if property="ARCH" value="i386">
+				<directory name="i386">
+					<file>portio.c</file>
+					<file>systimer.S</file>
+					<file>trap.S</file>
+				</directory>
+			</if>
+			<if property="ARCH" value="amd64">
+				<directory name="amd64">
+					<file>x86bios.c</file>
+					<file>systimer.S</file>
+				</directory>
+			</if>
 		</directory>
 		<directory name="include">
 			<pch>hal.h</pch>
 		</directory>
 	</module>
+
 	<module name="mini_hal" type="objectlibrary">
 		<include>include</include>
 		<include base="ntoskrnl">include</include>

reactos/hal/halx86/hal_generic_up.rbuild

@@ -9,7 +9,7 @@
 		<directory name="generic">
 			<file>spinlock.c</file>
 		</directory>
-		<directory name="generic">
+		<directory name="up">
 			<file>pic.c</file>
 			<file>processor.c</file>
 		</directory>

reactos/hal/halx86/halmps.rbuild

@@ -14,10 +14,13 @@
 		<library>ntoskrnl</library>
 		<library>libcntpr</library>
 		<directory name="mp">
-			<file>mps.S</file>
-			<file>mpsboot.asm</file>
-			<file>mpsirql.c</file>
-
+			<if property="ARCH" value="i386">
+				<directory name="i386">
+					<file>mps.S</file>
+					<file>mpsboot.asm</file>
+					<file>mpsirql.c</file>
+				</directory>
+			</if>
 		</directory>
 	</module>
 </group>