From: Sir Richard <sir_richard@svn.reactos.org>
Date: Mon, 29 Mar 2010 21:35:31 +0000 (+0000)
Subject: [HALACPI]: Add project, right now it just builds the normal HAL. The idea is to split... 
X-Git-Tag: backups/header-work@57446~68^2~67
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=d42e771516af3ede59617cb4e1bc84012c5b3828

[HALACPI]: Add project, right now it just builds the normal HAL. The idea is to split the generic HAL into legacy (x86 only) and ACPI (x86+ACPI, or x64). Bus handling, reboot/shutdown, PnP, power management (sleep/resume/hibernate), timer, environment variable, debugging, and initialization code is expected to differ between legacy and ACPI, if not more.

svn path=/trunk/; revision=46574
---

diff --git a/reactos/hal/halx86/directory.rbuild b/reactos/hal/halx86/directory.rbuild
index 81a989facea..abedef8ea1c 100644
--- a/reactos/hal/halx86/directory.rbuild
+++ b/reactos/hal/halx86/directory.rbuild
@@ -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
index 00000000000..e69de29bb2d
diff --git a/reactos/hal/halx86/generic/legacy/.gitignore b/reactos/hal/halx86/generic/legacy/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/reactos/hal/halx86/hal.rbuild b/reactos/hal/halx86/hal.rbuild
index 2c672c2f5f4..b551cc3308c 100644
--- a/reactos/hal/halx86/hal.rbuild
+++ b/reactos/hal/halx86/hal.rbuild
@@ -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>
diff --git a/reactos/hal/halx86/hal_generic.rbuild b/reactos/hal/halx86/hal_generic.rbuild
index 154379fa8a9..4fcb90bb3c0 100644
--- a/reactos/hal/halx86/hal_generic.rbuild
+++ b/reactos/hal/halx86/hal_generic.rbuild
@@ -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
index 00000000000..7d22a84b79f
--- /dev/null
+++ b/reactos/hal/halx86/halacpi.rbuild
@@ -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>
diff --git a/reactos/hal/halx86/halamd64.rbuild b/reactos/hal/halx86/halamd64.rbuild
index 4a09aa2c838..6b52fdef9e5 100644
--- a/reactos/hal/halx86/halamd64.rbuild
+++ b/reactos/hal/halx86/halamd64.rbuild
@@ -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 -->
diff --git a/reactos/hal/halx86/halmps.rbuild b/reactos/hal/halx86/halmps.rbuild
index ad17eac9002..2570cb84620 100644
--- a/reactos/hal/halx86/halmps.rbuild
+++ b/reactos/hal/halx86/halmps.rbuild
@@ -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>
diff --git a/reactos/hal/halx86/halxbox.rbuild b/reactos/hal/halx86/halxbox.rbuild
index cee7f614e90..54423ab9075 100644
--- a/reactos/hal/halx86/halxbox.rbuild
+++ b/reactos/hal/halx86/halxbox.rbuild
@@ -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>