[HALACPI]: Add project, right now it just builds the normal HAL. The idea is to split...
authorSir Richard <sir_richard@svn.reactos.org>
Mon, 29 Mar 2010 21:35:31 +0000 (21:35 +0000)
committerSir Richard <sir_richard@svn.reactos.org>
Mon, 29 Mar 2010 21:35:31 +0000 (21:35 +0000)
svn path=/trunk/; revision=46574

reactos/hal/halx86/directory.rbuild
reactos/hal/halx86/generic/acpi/.gitignore [new file with mode: 0644]
reactos/hal/halx86/generic/legacy/.gitignore [new file with mode: 0644]
reactos/hal/halx86/hal.rbuild
reactos/hal/halx86/hal_generic.rbuild
reactos/hal/halx86/halacpi.rbuild [new file with mode: 0644]
reactos/hal/halx86/halamd64.rbuild
reactos/hal/halx86/halmps.rbuild
reactos/hal/halx86/halxbox.rbuild

index 81a989f..abedef8 100644 (file)
@@ -8,6 +8,7 @@
 
        <if property="ARCH" value="i386">
                <xi:include href="hal.rbuild" />
+       <xi:include href="halacpi.rbuild" />
                <xi:include href="halxbox.rbuild" />
                <if property="BUILD_MP" value="1">
                        <xi:include href="halmps.rbuild" />
diff --git a/reactos/hal/halx86/generic/acpi/.gitignore b/reactos/hal/halx86/generic/acpi/.gitignore
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/reactos/hal/halx86/generic/legacy/.gitignore b/reactos/hal/halx86/generic/legacy/.gitignore
new file mode 100644 (file)
index 0000000..e69de29
index 2c672c2..b551cc3 100644 (file)
@@ -8,7 +8,7 @@
                <include base="ntoskrnl">include</include>
                <define name="_NTHALDLL_" />
                <define name="_NTHAL_" />
-               <library>hal_generic</library>
+               <library>hal_generic_legacy</library>
                <library>hal_generic_up</library>
                <library>ntoskrnl</library>
                <library>libcntpr</library>
index 154379f..4fcb90b 100644 (file)
@@ -1,7 +1,53 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
-       <module name="hal_generic" type="objectlibrary">
+       <module name="hal_generic_legacy" type="objectlibrary">
+               <include>include</include>
+               <include base="ntoskrnl">include</include>
+               <define name="_NTHALDLL_" />
+               <define name="_NTHAL_" />
+               <directory name="generic">
+                       <directory name="bus">
+                               <file>bushndlr.c</file>
+                               <file>isabus.c</file>
+                               <file>halbus.c</file>
+                               <file>pcibus.c</file>
+                               <file>pcidata.c</file>
+                               <file>sysbus.c</file>
+                       </directory>
+                       <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>halinit.c</file>
+                       <file>misc.c</file>
+                       <file>profil.c</file>
+                       <file>reboot.c</file>
+                       <file>sysinfo.c</file>
+                       <file>timer.c</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="hal_generic_acpi" type="objectlibrary">
                <include>include</include>
                <include base="ntoskrnl">include</include>
                <define name="_NTHALDLL_" />
diff --git a/reactos/hal/halx86/halacpi.rbuild b/reactos/hal/halx86/halacpi.rbuild
new file mode 100644 (file)
index 0000000..7d22a84
--- /dev/null
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+       <module name="halacpi" type="kernelmodedll" entrypoint="HalInitSystem@8" installbase="system32" installname="halacpi.dll">
+               <importlibrary base="hal" definition="../hal.pspec" />
+               <bootstrap installbase="$(CDOUTPUT)" />
+               <include>include</include>
+               <include base="ntoskrnl">include</include>
+               <define name="_NTHALDLL_" />
+               <define name="_NTHAL_" />
+               <library>hal_generic_acpi</library>
+               <library>hal_generic_up</library>
+               <library>ntoskrnl</library>
+               <library>libcntpr</library>
+               <directory name="up">
+                       <file>halinit_up.c</file>
+                       <file>halup.rc</file>
+               </directory>
+       </module>
+</group>
index 4a09aa2..6b52fde 100644 (file)
@@ -10,7 +10,7 @@
        <define name="_DISABLE_TIDENTS" />
        <define name="_NTHAL_" />
        <define name="_X86BIOS_" />
-       <library>hal_generic</library>
+       <library>hal_generic_acpi</library>
        <library>hal_generic_up</library>
        <library>ntoskrnl</library>
        <!-- library>x86emu</library -->
index ad17eac..2570cb8 100644 (file)
@@ -9,7 +9,7 @@
                <define name="CONFIG_SMP" />
                <define name="_NTHALDLL_" />
                <define name="_NTHAL_" />
-               <library>hal_generic</library>
+               <library>hal_generic_legacy</library>
                <library>hal_generic_mp</library>
                <library>ntoskrnl</library>
                <library>libcntpr</library>
index cee7f61..54423ab 100644 (file)
@@ -8,7 +8,7 @@
                <define name="_NTHALDLL_" />
                <define name="_NTHAL_" />
                <define name="SARCH_XBOX" />
-               <library>hal_generic</library>
+               <library>hal_generic_legacy</library>
                <library>hal_generic_up</library>
                <library>ntoskrnl</library>
                <library>libcntpr</library>