[HAL]

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

svn path=/trunk/; revision=46447

diff --git a/reactos/hal/hal.rbuild b/reactos/hal/hal.rbuild
index b846b04..c81a61d 100644 (file)
--- a/reactos/hal/hal.rbuild
+++ b/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">

diff --git a/reactos/hal/halx86/generic/amd64/.gitignore b/reactos/hal/halx86/generic/amd64/.gitignore
new file mode 100644 (file)
index 0000000..e69de29

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/trap.S b/reactos/hal/halx86/generic/i386/trap.S
similarity index 100%
rename from reactos/hal/halx86/generic/trap.S
rename to reactos/hal/halx86/generic/i386/trap.S

diff --git a/reactos/hal/halx86/hal_generic.rbuild b/reactos/hal/halx86/hal_generic.rbuild
index 99528c9..737cf77 100644 (file)
--- a/reactos/hal/halx86/hal_generic.rbuild
+++ b/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>

diff --git a/reactos/hal/halx86/hal_generic_up.rbuild b/reactos/hal/halx86/hal_generic_up.rbuild
index b49d755..732a374 100644 (file)
--- a/reactos/hal/halx86/hal_generic_up.rbuild
+++ b/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>

diff --git a/reactos/hal/halx86/halmps.rbuild b/reactos/hal/halx86/halmps.rbuild
index 05bab41..ad17eac 100644 (file)
--- a/reactos/hal/halx86/halmps.rbuild
+++ b/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>

diff --git a/reactos/hal/halx86/mp/amd64/.gitignore b/reactos/hal/halx86/mp/amd64/.gitignore
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/reactos/hal/halx86/mp/mps.S b/reactos/hal/halx86/mp/i386/mps.S
similarity index 100%
rename from reactos/hal/halx86/mp/mps.S
rename to reactos/hal/halx86/mp/i386/mps.S

diff --git a/reactos/hal/halx86/mp/mpsboot.asm b/reactos/hal/halx86/mp/i386/mpsboot.asm
similarity index 100%
rename from reactos/hal/halx86/mp/mpsboot.asm
rename to reactos/hal/halx86/mp/i386/mpsboot.asm

diff --git a/reactos/hal/halx86/mp/mpsirql.c b/reactos/hal/halx86/mp/i386/mpsirql.c
similarity index 100%
rename from reactos/hal/halx86/mp/mpsirql.c
rename to reactos/hal/halx86/mp/i386/mpsirql.c

diff --git a/reactos/hal/halx86/generic/pic.c b/reactos/hal/halx86/up/pic.c
similarity index 100%
rename from reactos/hal/halx86/generic/pic.c
rename to reactos/hal/halx86/up/pic.c

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