[tkreuzer] 44834: [HAL] - rename halmp to halmps - remove hal_generic_pc - remove some stuff from halamd64
Author: tkreuzer Date: Thu Dec 31 21:46:45 2009 New Revision: 44834
URL: http://svn.reactos.org/svn/reactos?rev=44834&view=rev Log: [HAL] - rename halmp to halmps - remove hal_generic_pc - remove some stuff from halamd64
Added: branches/ros-amd64-bringup/reactos/hal/halx86/hal.rbuild - copied, changed from r44833, branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild (with props) branches/ros-amd64-bringup/reactos/hal/halx86/halmps.rbuild - copied, changed from r44833, branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild Removed: branches/ros-amd64-bringup/reactos/hal/halamd64/up/ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_pc.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/directory.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/directory.rbuild
Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/ha... ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/directory.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/directory.rbuild [iso-8859-1] Thu Dec 31 21:46:45 2009 @@ -4,7 +4,4 @@ <directory name="generic"> <xi:include href="generic/generic.rbuild" /> </directory> - <directory name="up"> - <xi:include href="up/halup.rbuild" /> - </directory> </group>
Modified: branches/ros-amd64-bringup/reactos/hal/halx86/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/ha... ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/directory.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/directory.rbuild [iso-8859-1] Thu Dec 31 21:46:45 2009 @@ -3,19 +3,18 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="hal_generic.rbuild" /> - <xi:include href="hal_generic_pc.rbuild" /> <xi:include href="hal_generic_up.rbuild" />
<if property="ARCH" value="i386"> - <xi:include href="halup.rbuild" /> + <xi:include href="hal.rbuild" /> <xi:include href="halxbox.rbuild" /> <if property="BUILD_MP" value="1"> - <xi:include href="halmp.rbuild" /> + <xi:include href="halmps.rbuild" /> </if> </if>
- <!-- if property="ARCH" value="amd64"> + <if property="ARCH" value="amd64"> <xi:include href="halamd64.rbuild" /> - </if --> + </if>
</group>
Copied: branches/ros-amd64-bringup/reactos/hal/halx86/hal.rbuild (from r44833, branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/ha... ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal.rbuild [iso-8859-1] Thu Dec 31 21:46:45 2009 @@ -9,7 +9,6 @@ <define name="_NTHAL_" /> <library>hal_generic</library> <library>hal_generic_up</library> - <library>hal_generic_pc</library> <library>ntoskrnl</library> <directory name="up"> <file>halinit_up.c</file>
Removed: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_pc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/ha... ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_pc.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_pc.rbuild (removed) @@ -1,14 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> -<group> - <module name="hal_generic_pc" type="objectlibrary"> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_NTHAL_" /> - <directory name="generic"> - <directory name="bus"> - <file>pcibus.c</file> - </directory> - </directory> - </module> -</group>
Added: branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/ha... ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild (added) +++ branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] Thu Dec 31 21:46:45 2009 @@ -1,0 +1,23 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="hal" type="kernelmodedll" entrypoint="HalInitSystem" installbase="system32" installname="hal.dll"> + <importlibrary base="hal" definition="../hal.pspec" /> + <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> + <include base="hal">include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <library>hal_generic_amd64</library> + <library>hal_generic</library> + <library>hal_generic_up</library> + <library>ntoskrnl</library> + + <directory name="up"> + <file>halinit_up.c</file> + <file>halup.rc</file> + </directory> + + <!--directory name="mp"> + <file>apic.c</file> + </directory --> +</module>
Propchange: branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild ------------------------------------------------------------------------------ svn:eol-style = native
Removed: branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/ha... ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild (removed) @@ -1,28 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> -<group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="halmp" type="kernelmodedll" entrypoint="HalInitSystem@8"> - <importlibrary base="hal" definition="../hal.pspec" /> - <bootstrap installbase="$(CDOUTPUT)" /> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="CONFIG_SMP" /> - <define name="_NTHAL_" /> - <library>hal_generic</library> - <library>hal_generic_pc</library> - <library>ntoskrnl</library> - <directory name="mp"> - <file>apic.c</file> - <file>halinit_mp.c</file> - <file>ioapic.c</file> - <file>ipi_mp.c</file> - <file>mpconfig.c</file> - <file>mps.S</file> - <file>mpsboot.asm</file> - <file>mpsirql.c</file> - <file>processor_mp.c</file> - <file>spinlock.c</file> - <file>halmp.rc</file> - </directory> - </module> -</group>
Copied: branches/ros-amd64-bringup/reactos/hal/halx86/halmps.rbuild (from r44833, branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/ha... ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/halmps.rbuild [iso-8859-1] Thu Dec 31 21:46:45 2009 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="halmp" type="kernelmodedll" entrypoint="HalInitSystem@8"> + <module name="halmps" type="kernelmodedll" entrypoint="HalInitSystem@8"> <importlibrary base="hal" definition="../hal.pspec" /> <bootstrap installbase="$(CDOUTPUT)" /> <include>include</include> @@ -9,7 +9,6 @@ <define name="CONFIG_SMP" /> <define name="_NTHAL_" /> <library>hal_generic</library> - <library>hal_generic_pc</library> <library>ntoskrnl</library> <directory name="mp"> <file>apic.c</file>
Removed: branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/ha... ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild (removed) @@ -1,19 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> -<group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="hal" type="kernelmodedll" entrypoint="HalInitSystem@8" installbase="system32" installname="hal.dll"> - <importlibrary base="hal" definition="../hal.pspec" /> - <bootstrap installbase="$(CDOUTPUT)" /> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_NTHAL_" /> - <library>hal_generic</library> - <library>hal_generic_up</library> - <library>hal_generic_pc</library> - <library>ntoskrnl</library> - <directory name="up"> - <file>halinit_up.c</file> - <file>halup.rc</file> - </directory> - </module> -</group>
-
tkreuzer＠svn.reactos.org