From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Thu, 31 Dec 2009 14:57:24 +0000 (+0000)
Subject: [HAL]
X-Git-Tag: backups/aicom-network-stable@46924^3~56^2~18
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=3d53481c234176a03cefd46e3b176cde3841142d

[HAL]
- Move i386 specific code into i386 folder
- Move up specific code into up folder

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

diff --git a/reactos/hal/halx86/generic/portio.c b/reactos/hal/halx86/generic/i386/portio.c
similarity index 100%
rename from reactos/hal/halx86/generic/portio.c
rename to reactos/hal/halx86/generic/i386/portio.c
diff --git a/reactos/hal/halx86/generic/systimer.S b/reactos/hal/halx86/generic/i386/systimer.S
similarity index 100%
rename from reactos/hal/halx86/generic/systimer.S
rename to reactos/hal/halx86/generic/i386/systimer.S
diff --git a/reactos/hal/halx86/generic/v86.s b/reactos/hal/halx86/generic/i386/v86.s
similarity index 100%
rename from reactos/hal/halx86/generic/v86.s
rename to reactos/hal/halx86/generic/i386/v86.s
diff --git a/reactos/hal/halx86/hal_generic.rbuild b/reactos/hal/halx86/hal_generic.rbuild
index 95b1b44c1da..294a11c13c6 100644
--- a/reactos/hal/halx86/hal_generic.rbuild
+++ b/reactos/hal/halx86/hal_generic.rbuild
@@ -21,14 +21,18 @@
 			<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>usage.c</file>
-			<file>v86.s</file>
+			<if property="ARCH" value="i386">
+				<directory name="i386">
+					<file>portio.c</file>
+					<file>systimer.S</file>
+					<file>v86.s</file>
+				</directory>
+			</if>
 		</directory>
 		<directory name="include">
 			<pch>hal.h</pch>
diff --git a/reactos/hal/halx86/hal_generic_up.rbuild b/reactos/hal/halx86/hal_generic_up.rbuild
index 11fb20e4a18..1823da20c25 100644
--- a/reactos/hal/halx86/hal_generic_up.rbuild
+++ b/reactos/hal/halx86/hal_generic_up.rbuild
@@ -5,7 +5,7 @@
 		<include>include</include>
 		<include base="ntoskrnl">include</include>
 		<define name="_NTHAL_" />
-		<directory name="generic">
+		<directory name="up">
 			<file>irq.S</file>
 			<file>processor.c</file>
 			<file>spinlock.c</file>
diff --git a/reactos/hal/halx86/generic/irq.S b/reactos/hal/halx86/up/irq.S
similarity index 100%
rename from reactos/hal/halx86/generic/irq.S
rename to reactos/hal/halx86/up/irq.S
diff --git a/reactos/hal/halx86/generic/processor.c b/reactos/hal/halx86/up/processor.c
similarity index 100%
rename from reactos/hal/halx86/generic/processor.c
rename to reactos/hal/halx86/up/processor.c
diff --git a/reactos/hal/halx86/generic/spinlock.c b/reactos/hal/halx86/up/spinlock.c
similarity index 100%
rename from reactos/hal/halx86/generic/spinlock.c
rename to reactos/hal/halx86/up/spinlock.c