[ros-diffs] [tkreuzer] 44829: [HAL] - fix pspec - entrypoint should be HalInitSystem

Author: tkreuzer
Date: Thu Dec 31 16:38:34 2009
New Revision: 44829

URL: http://svn.reactos.org/svn/reactos?rev=44829&view=rev
Log:
[HAL]
- fix pspec
- entrypoint should be HalInitSystem

Modified:
    branches/ros-amd64-bringup/reactos/hal/hal.pspec
    branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rbuild
    branches/ros-amd64-bringup/reactos/hal/halarm/up/halup.rbuild
    branches/ros-amd64-bringup/reactos/hal/halppc/up/halup.rbuild
    branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild
    branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild
    branches/ros-amd64-bringup/reactos/hal/halx86/halxbox.rbuild

Modified: branches/ros-amd64-bringup/reactos/hal/hal.pspec
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/hal.pspec [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/hal.pspec [iso-8859-1] Thu Dec 31 16:38:34
2009
@@ -4,27 +4,26 @@
 @ 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 +43,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 +66,37 @@
 @ 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)

Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rbuild [iso-8859-1] Thu Dec
31 16:38:34 2009
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="hal" type="kernelmodedll"
installbase="system32" installname="hal.dll">
+<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>

Modified: branches/ros-amd64-bringup/reactos/hal/halarm/up/halup.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halarm/up/halup.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halarm/up/halup.rbuild [iso-8859-1] Thu Dec 31
16:38:34 2009
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="hal" type="kernelmodedll"
installbase="system32" installname="hal.dll">
+<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>

Modified: branches/ros-amd64-bringup/reactos/hal/halppc/up/halup.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halppc/up/halup.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halppc/up/halup.rbuild [iso-8859-1] Thu Dec 31
16:38:34 2009
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="hal" type="kernelmodedll">
+<module name="hal" type="kernelmodedll"
entrypoint="HalInitSystem">
 	<importlibrary definition="../../hal/hal.pspec" />
 	<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
 	<include base="halppc_generic">../include</include>

Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild [iso-8859-1] Thu Dec 31
16:38:34 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="0">
+	<module name="halmp" type="kernelmodedll"
entrypoint="HalInitSystem@8">
 		<importlibrary base="hal" definition="../hal.pspec" />
 		<bootstrap installbase="$(CDOUTPUT)" />
 		<include>include</include>

Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild [iso-8859-1] Thu Dec 31
16:38:34 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="hal" type="kernelmodedll" entrypoint="0"
installbase="system32" installname="hal.dll">
+	<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>

Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halxbox.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] Thu Dec 31
16:38:34 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="halxbox" type="kernelmodedll"
entrypoint="0">
+	<module name="halxbox" type="kernelmodedll"
entrypoint="HalInitSystem@8">
 		<importlibrary base="hal" definition="../hal.pspec" />
 		<include>include</include>
 		<include base="ntoskrnl">include</include>