[sir_richard] 46574: [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.
29 Mar
2010
29 Mar
'10
9:35 p.m.
Author: sir_richard
Date: Mon Mar 29 23:35:31 2010
New Revision: 46574
URL: http://svn.reactos.org/svn/reactos?rev=46574&view=rev
Log:
[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.
Added:
trunk/reactos/hal/halx86/generic/acpi/
trunk/reactos/hal/halx86/generic/legacy/
trunk/reactos/hal/halx86/halacpi.rbuild (with props)
Modified:
trunk/reactos/hal/halx86/directory.rbuild
trunk/reactos/hal/halx86/hal.rbuild
trunk/reactos/hal/halx86/hal_generic.rbuild
trunk/reactos/hal/halx86/halamd64.rbuild
trunk/reactos/hal/halx86/halmps.rbuild
trunk/reactos/hal/halx86/halxbox.rbuild
Modified: trunk/reactos/hal/halx86/directory.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/directory.rbuil…
==============================================================================
--- trunk/reactos/hal/halx86/directory.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/directory.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010
@@ -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" />
Modified: trunk/reactos/hal/halx86/hal.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal.rbuild?rev=…
==============================================================================
--- trunk/reactos/hal/halx86/hal.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/hal.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010
@@ -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>
Modified: trunk/reactos/hal/halx86/hal_generic.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu…
==============================================================================
--- trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010
@@ -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_" />
Added: trunk/reactos/hal/halx86/halacpi.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halacpi.rbuild?…
==============================================================================
--- trunk/reactos/hal/halx86/halacpi.rbuild (added)
+++ trunk/reactos/hal/halx86/halacpi.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010
@@ -1,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>
Propchange: trunk/reactos/hal/halx86/halacpi.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/hal/halx86/halamd64.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halamd64.rbuild…
==============================================================================
--- trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010
@@ -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 -->
Modified: trunk/reactos/hal/halx86/halmps.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmps.rbuild?r…
==============================================================================
--- trunk/reactos/hal/halx86/halmps.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/halmps.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010
@@ -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>
Modified: trunk/reactos/hal/halx86/halxbox.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halxbox.rbuild?…
==============================================================================
--- trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010
@@ -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>
5347
days inactive
5347
days old
0 comments
1 participants
participants (1)
-
sir_richard＠svn.reactos.org