[ros-diffs] [tkreuzer] 45195: [HAL] Cleanup part 1/x - Rename each architectures default hal to "hal" and delete the stubbed "hal" module. - Delete halamd64 (will later reuse the x86 hal) - Rename "halmp" to "halmps" as it's called on windows - Set HalInitSystem as entry point - Move pcibus.c into hal_generic.rbuild - Use a common .pspec file - Use a directory.rbuild for halx86 as it was done for the other architectures already - Move some code from hal_generic to hal_generic_up - No code change

Author: tkreuzer
Date: Thu Jan 21 22:05:45 2010
New Revision: 45195

URL: http://svn.reactos.org/svn/reactos?rev=45195&view=rev
Log:
[HAL]
Cleanup part 1/x
- Rename each architectures default hal to "hal" and delete the stubbed
"hal" module.
- Delete halamd64 (will later reuse the x86 hal)
- Rename "halmp" to "halmps" as it's called on windows
- Set HalInitSystem as entry point
- Move pcibus.c into hal_generic.rbuild
- Use a common .pspec file
- Use a directory.rbuild for halx86 as it was done for the other architectures already
- Move some code from hal_generic to hal_generic_up
- No code change

Added:
    trunk/reactos/hal/hal.pspec
      - copied, changed from r45183, trunk/reactos/hal/hal/hal.pspec
    trunk/reactos/hal/halx86/directory.rbuild   (with props)
    trunk/reactos/hal/halx86/hal.rbuild
      - copied, changed from r45183, trunk/reactos/hal/halx86/halup.rbuild
    trunk/reactos/hal/halx86/hal_generic_mp.rbuild   (with props)
    trunk/reactos/hal/halx86/halamd64.rbuild   (with props)
    trunk/reactos/hal/halx86/halmps.rbuild
      - copied, changed from r45183, trunk/reactos/hal/halx86/halmp.rbuild
Removed:
    trunk/reactos/hal/hal/
    trunk/reactos/hal/halamd64/
    trunk/reactos/hal/halx86/hal_generic_amd64.rbuild
    trunk/reactos/hal/halx86/hal_generic_pc.rbuild
    trunk/reactos/hal/halx86/halmp.rbuild
    trunk/reactos/hal/halx86/halup.rbuild
Modified:
    trunk/reactos/hal/hal.rbuild
    trunk/reactos/hal/halarm/up/halup.rbuild
    trunk/reactos/hal/halppc/up/halup.rbuild
    trunk/reactos/hal/halx86/hal_generic.rbuild
    trunk/reactos/hal/halx86/halxbox.rbuild

Copied: trunk/reactos/hal/hal.pspec (from r45183, trunk/reactos/hal/hal/hal.pspec)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal.pspec?p2=trunk/rea…
==============================================================================
--- trunk/reactos/hal/hal/hal.pspec [iso-8859-1] (original)
+++ trunk/reactos/hal/hal.pspec [iso-8859-1] Thu Jan 21 22:05:45 2010
@@ -1,30 +1,30 @@
 #include "include/reactos/msvctarget.h"
+#undef i386
 
 #ifdef _M_ARM
 @ fastcall ExAcquireFastMutex(ptr)
 @ fastcall ExReleaseFastMutex(ptr)
 #else
-@ fastcall ExAcquireFastMutex(ptr) ExiAcquireFastMutex
-@ fastcall ExReleaseFastMutex(ptr) ExiReleaseFastMutex
+@ fastcall -arch=i386 ExAcquireFastMutex(ptr) ExiAcquireFastMutex
+@ fastcall -arch=i386 ExReleaseFastMutex(ptr) ExiReleaseFastMutex
 #endif
-@ fastcall ExTryToAcquireFastMutex(ptr) ExiTryToAcquireFastMutex
+@ fastcall -arch=i386,arm ExTryToAcquireFastMutex(ptr) ExiTryToAcquireFastMutex
 @ fastcall HalClearSoftwareInterrupt(long)
 @ fastcall HalRequestSoftwareInterrupt(long)
 @ fastcall HalSystemVectorDispatchEntry(long long long)
-@ fastcall KeAcquireInStackQueuedSpinLock(ptr ptr)
-@ fastcall KeAcquireInStackQueuedSpinLockRaiseToSynch(ptr ptr)
-@ fastcall KeAcquireSpinLockRaiseToSynch(ptr)
-@ fastcall KeAcquireQueuedSpinLock(ptr)
-@ fastcall KeAcquireQueuedSpinLockRaiseToSynch(ptr)
-@ fastcall KeReleaseInStackQueuedSpinLock(ptr)
-@ fastcall KeReleaseQueuedSpinLock(ptr long)
-@ fastcall KeTryToAcquireQueuedSpinLock(long ptr)
-@ fastcall KeTryToAcquireQueuedSpinLockRaiseToSynch(long ptr)
-@ fastcall KfAcquireSpinLock(ptr)
-@ fastcall KfLowerIrql(long)
-@ fastcall KfRaiseIrql(long)
-@ fastcall KfReleaseSpinLock(ptr long)
-
+@ fastcall -arch=i386,arm KeAcquireInStackQueuedSpinLock(ptr ptr)
+@ fastcall -arch=i386,arm KeAcquireInStackQueuedSpinLockRaiseToSynch(ptr ptr)
+@ fastcall -arch=i386,arm KeAcquireSpinLockRaiseToSynch(ptr)
+@ fastcall -arch=i386,arm KeAcquireQueuedSpinLock(ptr)
+@ fastcall -arch=i386,arm KeAcquireQueuedSpinLockRaiseToSynch(ptr)
+@ fastcall -arch=i386,arm KeReleaseInStackQueuedSpinLock(ptr)
+@ fastcall -arch=i386,arm KeReleaseQueuedSpinLock(ptr long)
+@ fastcall -arch=i386,arm KeTryToAcquireQueuedSpinLock(long ptr)
+@ fastcall -arch=i386,arm KeTryToAcquireQueuedSpinLockRaiseToSynch(long ptr)
+@ fastcall -arch=i386,arm KfAcquireSpinLock(ptr)
+@ fastcall -arch=i386,arm KfLowerIrql(long)
+@ fastcall -arch=i386,arm KfRaiseIrql(long)
+@ fastcall -arch=i386,arm KfReleaseSpinLock(ptr long)
 @ stdcall HalAcquireDisplayOwnership(ptr)
 @ stdcall HalAdjustResourceList(ptr)
 @ stdcall HalAllProcessorsStarted()
@@ -44,9 +44,7 @@
 @ stdcall HalGetBusData(long long long ptr long)
 @ stdcall HalGetBusDataByOffset(long long long ptr long long)
 @ stdcall HalGetEnvironmentVariable(str long str)
-#ifdef _M_ARM
-@ fastcall HalGetInterruptSource()
-#endif
+@ fastcall -arch=arm HalGetInterruptSource()
 @ stdcall HalGetInterruptVector(long long long long ptr ptr)
 @ stdcall HalHandleNMI(ptr)
 @ stdcall HalInitSystem(long ptr)
@@ -69,41 +67,38 @@
 @ stdcall HalStartNextProcessor(ptr ptr)
 @ stdcall HalStartProfileInterrupt(long)
 @ stdcall HalStopProfileInterrupt(long)
-#ifdef _M_ARM
-@ fastcall HalSweepIcache()
-@ fastcall HalSweepDcache()
-#endif
+@ fastcall -arch=arm HalSweepIcache()
+@ fastcall -arch=arm HalSweepDcache()
 @ stdcall HalTranslateBusAddress(long long long long ptr ptr)
 @ stdcall IoFlushAdapterBuffers(ptr ptr ptr ptr long long)
 @ stdcall IoFreeAdapterChannel(ptr)
 @ stdcall IoFreeMapRegisters(ptr ptr long)
 @ stdcall IoMapTransfer(ptr ptr ptr ptr ptr long)
-#ifndef _M_ARM
-@ stdcall IoAssignDriveLetters(ptr str ptr ptr) HalpAssignDriveLetters
-@ stdcall IoReadPartitionTable(ptr long long ptr) HalpReadPartitionTable
-@ stdcall IoSetPartitionInformation(ptr long long long) HalpSetPartitionInformation
-@ stdcall IoWritePartitionTable(ptr long long long ptr) HalpWritePartitionTable
-#endif
-@ stdcall KeAcquireSpinLock(ptr ptr)
+@ stdcall -arch=i386,x86_64 IoAssignDriveLetters(ptr str ptr ptr) HalpAssignDriveLetters
+@ stdcall -arch=i386,x86_64 IoReadPartitionTable(ptr long long ptr)
HalpReadPartitionTable
+@ stdcall -arch=i386,x86_64 IoSetPartitionInformation(ptr long long long)
HalpSetPartitionInformation
+@ stdcall -arch=i386,x86_64 IoWritePartitionTable(ptr long long long ptr)
HalpWritePartitionTable
+@ stdcall -arch=i386,arm KeAcquireSpinLock(ptr ptr)
 @ extern KdComPortInUse
 @ stdcall KeFlushWriteBuffer()
-@ stdcall KeGetCurrentIrql()
-@ stdcall KeLowerIrql(long)
+@ stdcall -arch=i386,arm KeGetCurrentIrql()
+@ stdcall -arch=i386,arm KeLowerIrql(long)
 @ stdcall KeQueryPerformanceCounter(ptr)
-@ stdcall KeRaiseIrql(long ptr)
-@ stdcall KeRaiseIrqlToDpcLevel()
-@ stdcall KeRaiseIrqlToSynchLevel()
-@ stdcall KeReleaseSpinLock(ptr long)
+@ stdcall -arch=i386,arm KeRaiseIrql(long ptr)
+@ stdcall -arch=i386,arm KeRaiseIrqlToDpcLevel()
+@ stdcall -arch=i386,arm KeRaiseIrqlToSynchLevel()
+@ stdcall -arch=i386,arm KeReleaseSpinLock(ptr long)
 @ stdcall KeStallExecutionProcessor(long)
-@ stdcall READ_PORT_BUFFER_UCHAR(ptr ptr long)
-@ stdcall READ_PORT_BUFFER_ULONG(ptr ptr long)
-@ stdcall READ_PORT_BUFFER_USHORT(ptr ptr long)
-@ stdcall READ_PORT_UCHAR(ptr)
-@ stdcall READ_PORT_ULONG(ptr)
-@ stdcall READ_PORT_USHORT(ptr)
-@ stdcall WRITE_PORT_BUFFER_UCHAR(ptr ptr long)
-@ stdcall WRITE_PORT_BUFFER_ULONG(ptr ptr long)
-@ stdcall WRITE_PORT_BUFFER_USHORT(ptr ptr long)
-@ stdcall WRITE_PORT_UCHAR(ptr long)
-@ stdcall WRITE_PORT_ULONG(ptr long)
-@ stdcall WRITE_PORT_USHORT(ptr long)
+@ stdcall -arch=i386,arm READ_PORT_BUFFER_UCHAR(ptr ptr long)
+@ stdcall -arch=i386,arm READ_PORT_BUFFER_ULONG(ptr ptr long)
+@ stdcall -arch=i386,arm READ_PORT_BUFFER_USHORT(ptr ptr long)
+@ stdcall -arch=i386,arm READ_PORT_UCHAR(ptr)
+@ stdcall -arch=i386,arm READ_PORT_ULONG(ptr)
+@ stdcall -arch=i386,arm READ_PORT_USHORT(ptr)
+@ stdcall -arch=i386,arm WRITE_PORT_BUFFER_UCHAR(ptr ptr long)
+@ stdcall -arch=i386,arm WRITE_PORT_BUFFER_ULONG(ptr ptr long)
+@ stdcall -arch=i386,arm WRITE_PORT_BUFFER_USHORT(ptr ptr long)
+@ stdcall -arch=i386,arm WRITE_PORT_UCHAR(ptr long)
+@ stdcall -arch=i386,arm WRITE_PORT_ULONG(ptr long)
+@ stdcall -arch=i386,arm WRITE_PORT_USHORT(ptr long)
+@ stdcall -arch=x86_64 HalInitializeBios(long ptr)

Modified: trunk/reactos/hal/hal.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal.rbuild?rev=45195&a…
==============================================================================
--- trunk/reactos/hal/hal.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/hal.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010
@@ -1,21 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-	<directory name="hal">
-		<xi:include href="hal/hal.rbuild" />
+	<directory name="halx86">
+		<xi:include href="halx86/directory.rbuild" />
 	</directory>
-	<if property="ARCH" value="i386">
-		<directory name="halx86">
-			<xi:include href="halx86/hal_generic.rbuild" />
-			<xi:include href="halx86/hal_generic_up.rbuild" />
-			<xi:include href="halx86/hal_generic_pc.rbuild" />
-			<xi:include href="halx86/halup.rbuild" />
-			<if property="BUILD_MP" value="1">
-				<xi:include href="halx86/halmp.rbuild" />
-			</if>
-			<xi:include href="halx86/halxbox.rbuild" />
-		</directory>
-	</if>
+
 	<if property="ARCH" value="powerpc">
 		<directory name="halppc">
 			<xi:include href="halppc/directory.rbuild" />
@@ -26,12 +15,4 @@
 			<xi:include href="halarm/directory.rbuild" />
 		</directory>
 	</if>
-	<if property="ARCH" value="amd64">
-		<directory name="halx86">
-			<xi:include href="halx86/hal_generic_amd64.rbuild" />
-		</directory>
-		<directory name="halamd64">
-			<xi:include href="halamd64/directory.rbuild" />
-		</directory>
-	</if>
 </group>

Modified: trunk/reactos/hal/halarm/up/halup.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/up/halup.rbuild…
==============================================================================
--- trunk/reactos/hal/halarm/up/halup.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halarm/up/halup.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="halarm_up" type="kernelmodedll"
installbase="system32" installname="hal.dll">
-	<importlibrary base="hal" definition="hal.pspec" />
+<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="halarm_generic">../include</include>
 	<include base="ntoskrnl">include</include>

Modified: trunk/reactos/hal/halppc/up/halup.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/up/halup.rbuild…
==============================================================================
--- trunk/reactos/hal/halppc/up/halup.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halppc/up/halup.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="halppc_up" type="kernelmodedll">
-	<importlibrary definition="../../hal/hal.def" />
+<module name="hal" type="kernelmodedll"
entrypoint="HalInitSystem">
+	<importlibrary definition="../../hal/hal.pspec" />
 	<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
 	<include base="halppc_generic">../include</include>
 	<include base="ntoskrnl">include</include>

Added: 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 (added)
+++ trunk/reactos/hal/halx86/directory.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010
@@ -1,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+
+	<xi:include href="hal_generic.rbuild" />
+	<xi:include href="hal_generic_up.rbuild" />
+	<xi:include href="hal_generic_mp.rbuild" />
+
+	<if property="ARCH" value="i386">
+		<xi:include href="hal.rbuild" />
+		<xi:include href="halxbox.rbuild" />
+		<if property="BUILD_MP" value="1">
+			<xi:include href="halmps.rbuild" />
+		</if>
+	</if>
+
+	<if property="ARCH" value="amd64">
+		<xi:include href="halamd64.rbuild" />
+	</if>
+
+</group>

Propchange: trunk/reactos/hal/halx86/directory.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: trunk/reactos/hal/halx86/hal.rbuild (from r45183,
trunk/reactos/hal/halx86/halup.rbuild)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal.rbuild?p2=t…
==============================================================================
--- trunk/reactos/hal/halx86/halup.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/hal.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010
@@ -1,15 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-	<module name="halup" type="kernelmodedll"
entrypoint="0" installname="hal.dll">
-		<importlibrary base="hal" definition="hal.pspec" />
+	<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>

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] Thu Jan 21 22:05:45 2010
@@ -10,6 +10,7 @@
 				<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>

Removed: trunk/reactos/hal/halx86/hal_generic_amd64.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_amd…
==============================================================================
--- trunk/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/hal_generic_amd64.rbuild (removed)
@@ -1,34 +1,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
-	<module name="hal_generic_amd64" type="objectlibrary">
-		<include>include</include>
-		<include base="ntoskrnl">include</include>
-		<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>cmos.c</file>
-			<file>dma.c</file>
-			<file>drive.c</file>
-			<file>display.c</file>
-			<file>profil.c</file>
-			<file>reboot.c</file>
-			<file>sysinfo.c</file>
-			<file>timer.c</file>
-		</directory>
-		<directory name="mp">
-			<file>apic.c</file>
-		</directory>
-		<directory name="include">
-			<pch>hal.h</pch>
-		</directory>
-	</module>
-</group>

Added: trunk/reactos/hal/halx86/hal_generic_mp.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_mp.…
==============================================================================
--- trunk/reactos/hal/halx86/hal_generic_mp.rbuild (added)
+++ trunk/reactos/hal/halx86/hal_generic_mp.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010
@@ -1,0 +1,20 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
+	<module name="hal_generic_mp" type="objectlibrary">
+		<include>include</include>
+		<include base="ntoskrnl">include</include>
+		<define name="_NTHAL_" />
+		<define name="CONFIG_SMP" />
+		<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>processor_mp.c</file>
+			<file>spinlock.c</file>
+			<file>halmp.rc</file>
+		</directory>
+	</module>
+</group>

Propchange: trunk/reactos/hal/halx86/hal_generic_mp.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Removed: trunk/reactos/hal/halx86/hal_generic_pc.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_pc.…
==============================================================================
--- trunk/reactos/hal/halx86/hal_generic_pc.rbuild [iso-8859-1] (original)
+++ trunk/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: 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 (added)
+++ trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010
@@ -1,0 +1,1 @@
+

Propchange: trunk/reactos/hal/halx86/halamd64.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Removed: trunk/reactos/hal/halx86/halmp.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmp.rbuild?re…
==============================================================================
--- trunk/reactos/hal/halx86/halmp.rbuild [iso-8859-1] (original)
+++ trunk/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="0">
-		<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: trunk/reactos/hal/halx86/halmps.rbuild (from r45183,
trunk/reactos/hal/halx86/halmp.rbuild)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmps.rbuild?p…
==============================================================================
--- trunk/reactos/hal/halx86/halmp.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/halmps.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010
@@ -1,28 +1,21 @@
 <?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="0">
-		<importlibrary base="hal" definition="hal.pspec" />
+	<module name="halmps" 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>hal_generic_mp</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>

Removed: trunk/reactos/hal/halx86/halup.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halup.rbuild?re…
==============================================================================
--- trunk/reactos/hal/halx86/halup.rbuild [iso-8859-1] (original)
+++ trunk/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="halup" type="kernelmodedll"
entrypoint="0" 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>

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] Thu Jan 21 22:05:45 2010
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-	<module name="halxbox" type="kernelmodedll"
entrypoint="0">
-		<importlibrary base="hal" definition="hal.pspec" />
+	<module name="halxbox" type="kernelmodedll"
entrypoint="HalInitSystem@8">
+		<importlibrary base="hal" definition="../hal.pspec" />
 		<include>include</include>
 		<include base="ntoskrnl">include</include>
 		<define name="_NTHAL_" />
@@ -10,11 +10,6 @@
 		<library>hal_generic</library>
 		<library>hal_generic_up</library>
 		<library>ntoskrnl</library>
-		<directory name="generic">
-			<directory name="bus">
-				<file>pcibus.c</file>
-			</directory>
-		</directory>
 		<directory name="xbox">
 			<file>halinit_xbox.c</file>
 			<file>part_xbox.c</file>