- Raname each architecture's default hal (halup) to "hal" (Windows does that, too) and get rid of the duplicated stub hal.

svn path=/branches/ros-amd64-bringup/; revision=44827
This commit is contained in:
Timo Kreuzer 2009-12-31 15:19:17 +00:00
parent 7e2711ef2a
commit 216f7788eb
13 changed files with 11 additions and 1334 deletions

View file

@ -1,9 +1,6 @@
<?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>
<if property="ARCH" value="i386">
<directory name="halx86">
<xi:include href="halx86/hal_generic.rbuild" />

File diff suppressed because it is too large Load diff

View file

@ -1,44 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
<group>
<if property="ARCH" value="arm">
<module name="hal" type="kernelmodedll">
<importlibrary definition="hal.pspec" />
<include base="ntoskrnl">include</include>
<library>ntoskrnl</library>
<define name="_NTHAL_" />
<file>hal.c</file>
<file>hal.rc</file>
</module>
</if>
<if property="ARCH" value="i386">
<module name="hal" type="kernelmodedll">
<importlibrary definition="hal.pspec" />
<include base="ntoskrnl">include</include>
<library>ntoskrnl</library>
<define name="_NTHAL_" />
<file>hal.c</file>
<file>hal.rc</file>
</module>
</if>
<if property="ARCH" value="i386">
<module ifnot="false" name="halupalias" type="alias" aliasof="halup">
</module>
<module if="false" name="halmpalias" type="alias" aliasof="halmp">
</module>
</if>
<if property="ARCH" value="powerpc">
<module name="halupalias" type="alias" aliasof="halppc_up"/>
</if>
<if property="ARCH" value="amd64">
<module name="hal" type="kernelmodedll">
<importlibrary definition="hal_amd64.def" />
<include base="ntoskrnl">include</include>
<library>ntoskrnl</library>
<define name="_NTHAL_" />
<define name="_X86BIOS_" />
<file>hal.c</file>
<file>hal.rc</file>
</module>
</if>
</group>

View file

@ -1,5 +0,0 @@
#define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "Template Hardware Abstraction Layer\0"
#define REACTOS_STR_INTERNAL_NAME "hal\0"
#define REACTOS_STR_ORIGINAL_FILENAME "hal.dll\0"
#include <reactos/version.rc>

View file

@ -1,98 +0,0 @@
; Hardware Abstraction Layer - ReactOS Operating System
LIBRARY hal.dll
EXPORTS
@ExAcquireFastMutex@4=@ExiAcquireFastMutex@4
@ExReleaseFastMutex@4=@ExiReleaseFastMutex@4
@ExTryToAcquireFastMutex@4=@ExiTryToAcquireFastMutex@4
@HalClearSoftwareInterrupt@4
@HalRequestSoftwareInterrupt@4
@HalSystemVectorDispatchEntry@12
@KeAcquireInStackQueuedSpinLock@8
@KeAcquireInStackQueuedSpinLockRaiseToSynch@8
@KeAcquireSpinLockRaiseToSynch@4
@KeAcquireQueuedSpinLock@4
@KeAcquireQueuedSpinLockRaiseToSynch@4
@KeReleaseInStackQueuedSpinLock@4
@KeReleaseQueuedSpinLock@8
@KeTryToAcquireQueuedSpinLock@8
@KeTryToAcquireQueuedSpinLockRaiseToSynch@8
@KfAcquireSpinLock@4
@KfLowerIrql@4
@KfRaiseIrql@4
@KfReleaseSpinLock@8
HalAcquireDisplayOwnership@4
HalAdjustResourceList@4
HalAllProcessorsStarted@0
HalAllocateAdapterChannel@16
HalAllocateCommonBuffer@16
HalAllocateCrashDumpRegisters@8
HalAssignSlotResources@32
HalBeginSystemInterrupt@12
HalCalibratePerformanceCounter@12
HalDisableSystemInterrupt@8
HalDisplayString@4
HalEnableSystemInterrupt@12
HalEndSystemInterrupt@8
HalFlushCommonBuffer@20
HalFreeCommonBuffer@24
HalGetAdapter@8
HalGetBusData@20
HalGetBusDataByOffset@24
HalGetEnvironmentVariable@12
HalGetInterruptVector@24
HalHandleNMI@4
HalInitSystem@8
HalInitializeProcessor@8
HalMakeBeep@4
HalProcessorIdle@0
HalQueryDisplayParameters@16
HalQueryRealTimeClock@4
HalReadDmaCounter@4
HalReportResourceUsage@0
HalRequestIpi@4
HalReturnToFirmware@4
HalSetBusData@20
HalSetBusDataByOffset@24
HalSetDisplayParameters@8
HalSetEnvironmentVariable@8
HalSetProfileInterval@4
HalSetRealTimeClock@4
HalSetTimeIncrement@4
HalStartNextProcessor@8
HalStartProfileInterrupt@4
HalStopProfileInterrupt@4
HalTranslateBusAddress@24
IoAssignDriveLetters@16=HalpAssignDriveLetters@16
IoFlushAdapterBuffers@24
IoFreeAdapterChannel@4
IoFreeMapRegisters@12
IoMapTransfer@24
IoReadPartitionTable@16=HalpReadPartitionTable@16
IoSetPartitionInformation@16=HalpSetPartitionInformation@16
IoWritePartitionTable@20=HalpWritePartitionTable@20
KeAcquireSpinLock@8
KdComPortInUse=_KdComPortInUse DATA
KeFlushWriteBuffer@0
KeGetCurrentIrql@0
KeLowerIrql@4
KeQueryPerformanceCounter@4
KeRaiseIrql@8
KeRaiseIrqlToDpcLevel@0
KeRaiseIrqlToSynchLevel@0
KeReleaseSpinLock@8
KeStallExecutionProcessor@4
READ_PORT_BUFFER_UCHAR@12
READ_PORT_BUFFER_ULONG@12
READ_PORT_BUFFER_USHORT@12
READ_PORT_UCHAR@4
READ_PORT_ULONG@4
READ_PORT_USHORT@4
WRITE_PORT_BUFFER_UCHAR@12
WRITE_PORT_BUFFER_ULONG@12
WRITE_PORT_BUFFER_USHORT@12
WRITE_PORT_UCHAR@8
WRITE_PORT_ULONG@8
WRITE_PORT_USHORT@8

View file

@ -1,9 +1,9 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="halup" type="kernelmodedll" installbase="system32" installname="hal.dll">
<importlibrary base="hal" definition="hal_amd64.def" />
<module name="hal" type="kernelmodedll" installbase="system32" installname="hal.dll">
<importlibrary base="hal" definition="../hal_amd64.def" />
<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
<include base="halup">../include</include>
<include base="hal">../include</include>
<include base="ntoskrnl">include</include>
<define name="_DISABLE_TIDENTS" />
<define name="_NTHAL_" />

View file

@ -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" 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>

View file

@ -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">
<importlibrary definition="../../hal/hal.pspec" />
<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
<include base="halppc_generic">../include</include>
<include base="ntoskrnl">include</include>

View file

@ -2,7 +2,7 @@
<!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" />
<importlibrary base="hal" definition="../hal.pspec" />
<bootstrap installbase="$(CDOUTPUT)" />
<include>include</include>
<include base="ntoskrnl">include</include>

View file

@ -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="halup" type="kernelmodedll" entrypoint="0" installbase="system32" installname="hal.dll">
<importlibrary base="hal" definition="hal.pspec" />
<module name="hal" type="kernelmodedll" entrypoint="0" installbase="system32" installname="hal.dll">
<importlibrary base="hal" definition="../hal.pspec" />
<bootstrap installbase="$(CDOUTPUT)" />
<include>include</include>
<include base="ntoskrnl">include</include>

View file

@ -2,7 +2,7 @@
<!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" />
<importlibrary base="hal" definition="../hal.pspec" />
<include>include</include>
<include base="ntoskrnl">include</include>
<define name="_NTHAL_" />