[ros-diffs] [arty] 39808: Pull from git, part 10.
arty at svn.reactos.org
arty at svn.reactos.org
Sat Feb 28 08:56:26 CET 2009
Author: arty
Date: Sat Feb 28 10:56:24 2009
New Revision: 39808
URL: http://svn.reactos.org/svn/reactos?rev=39808&view=rev
Log:
Pull from git, part 10.
Added:
branches/arty-newcc/hal/hal/hal.pspec
Removed:
branches/arty-newcc/hal/hal/hal.spec
Modified:
branches/arty-newcc/hal/hal.rbuild (contents, props changed)
branches/arty-newcc/hal/hal/hal.c (contents, props changed)
branches/arty-newcc/hal/hal/hal.rbuild (contents, props changed)
branches/arty-newcc/hal/hal/hal.rc (props changed)
branches/arty-newcc/hal/halarm/generic/hal.c
branches/arty-newcc/hal/halarm/include/hal.h
branches/arty-newcc/hal/halarm/include/halp.h
branches/arty-newcc/hal/halarm/up/halup.rbuild
branches/arty-newcc/hal/halppc/directory.rbuild (props changed)
branches/arty-newcc/hal/halppc/generic/beep.c (contents, props changed)
branches/arty-newcc/hal/halppc/generic/bus.c (props changed)
branches/arty-newcc/hal/halppc/generic/cmos.c (props changed)
branches/arty-newcc/hal/halppc/generic/display.c (contents, props changed)
branches/arty-newcc/hal/halppc/generic/dma.c (contents, props changed)
branches/arty-newcc/hal/halppc/generic/drive.c (props changed)
branches/arty-newcc/hal/halppc/generic/enum.c (props changed)
branches/arty-newcc/hal/halppc/generic/fmutex.c (props changed)
branches/arty-newcc/hal/halppc/generic/font.c (props changed)
branches/arty-newcc/hal/halppc/generic/generic.rbuild (props changed)
branches/arty-newcc/hal/halppc/generic/halinit.c (props changed)
branches/arty-newcc/hal/halppc/generic/irql.c (contents, props changed)
branches/arty-newcc/hal/halppc/generic/isa.c (contents, props changed)
branches/arty-newcc/hal/halppc/generic/misc.c (props changed)
branches/arty-newcc/hal/halppc/generic/pci.c (props changed)
branches/arty-newcc/hal/halppc/generic/portio.c (contents, props changed)
branches/arty-newcc/hal/halppc/generic/processor.c (contents, props changed)
branches/arty-newcc/hal/halppc/generic/profil.c (props changed)
branches/arty-newcc/hal/halppc/generic/reboot.c (contents, props changed)
branches/arty-newcc/hal/halppc/generic/spinlock.c (props changed)
branches/arty-newcc/hal/halppc/generic/sysinfo.c (contents, props changed)
branches/arty-newcc/hal/halppc/generic/timer.c (props changed)
branches/arty-newcc/hal/halppc/include/apic.h (props changed)
branches/arty-newcc/hal/halppc/include/bus.h (props changed)
branches/arty-newcc/hal/halppc/include/hal.h (contents, props changed)
branches/arty-newcc/hal/halppc/include/haldma.h (contents, props changed)
branches/arty-newcc/hal/halppc/include/halirq.h (props changed)
branches/arty-newcc/hal/halppc/include/halp.h (contents, props changed)
branches/arty-newcc/hal/halppc/include/ioapic.h (props changed)
branches/arty-newcc/hal/halppc/include/mps.h (props changed)
branches/arty-newcc/hal/halppc/up/halinit_up.c (props changed)
branches/arty-newcc/hal/halppc/up/halup.rbuild (props changed)
branches/arty-newcc/hal/halppc/up/halup.rc (props changed)
branches/arty-newcc/hal/halx86/generic/beep.c (props changed)
branches/arty-newcc/hal/halx86/generic/bios.c (props changed)
branches/arty-newcc/hal/halx86/generic/bus.c (props changed)
branches/arty-newcc/hal/halx86/generic/cmos.c (contents, props changed)
branches/arty-newcc/hal/halx86/generic/display.c (props changed)
branches/arty-newcc/hal/halx86/generic/dma.c (contents, props changed)
branches/arty-newcc/hal/halx86/generic/drive.c (props changed)
branches/arty-newcc/hal/halx86/generic/generic.rbuild (props changed)
branches/arty-newcc/hal/halx86/generic/halinit.c (props changed)
branches/arty-newcc/hal/halx86/generic/irq.S
branches/arty-newcc/hal/halx86/generic/misc.c (props changed)
branches/arty-newcc/hal/halx86/generic/pci.c (contents, props changed)
branches/arty-newcc/hal/halx86/generic/portio.c (props changed)
branches/arty-newcc/hal/halx86/generic/processor.c (contents, props changed)
branches/arty-newcc/hal/halx86/generic/profil.c (contents, props changed)
branches/arty-newcc/hal/halx86/generic/reboot.c (contents, props changed)
branches/arty-newcc/hal/halx86/generic/spinlock.c (props changed)
branches/arty-newcc/hal/halx86/generic/sysinfo.c (contents, props changed)
branches/arty-newcc/hal/halx86/generic/timer.c (props changed)
branches/arty-newcc/hal/halx86/hal_generic.rbuild (props changed)
branches/arty-newcc/hal/halx86/hal_generic_pc.rbuild (props changed)
branches/arty-newcc/hal/halx86/hal_generic_up.rbuild (props changed)
branches/arty-newcc/hal/halx86/halmp.rbuild (contents, props changed)
branches/arty-newcc/hal/halx86/halup.rbuild (contents, props changed)
branches/arty-newcc/hal/halx86/halxbox.rbuild (contents, props changed)
branches/arty-newcc/hal/halx86/include/apic.h (contents, props changed)
branches/arty-newcc/hal/halx86/include/bus.h (props changed)
branches/arty-newcc/hal/halx86/include/hal.h (contents, props changed)
branches/arty-newcc/hal/halx86/include/haldma.h (contents, props changed)
branches/arty-newcc/hal/halx86/include/halirq.h (props changed)
branches/arty-newcc/hal/halx86/include/halp.h (contents, props changed)
branches/arty-newcc/hal/halx86/include/ioapic.h (props changed)
branches/arty-newcc/hal/halx86/include/mps.h (props changed)
branches/arty-newcc/hal/halx86/mp/apic.c (contents, props changed)
branches/arty-newcc/hal/halx86/mp/halinit_mp.c (props changed)
branches/arty-newcc/hal/halx86/mp/halmp.rc (props changed)
branches/arty-newcc/hal/halx86/mp/ioapic.c (props changed)
branches/arty-newcc/hal/halx86/mp/ipi_mp.c (contents, props changed)
branches/arty-newcc/hal/halx86/mp/mpconfig.c (props changed)
branches/arty-newcc/hal/halx86/mp/mpsirql.c (contents, props changed)
branches/arty-newcc/hal/halx86/mp/processor_mp.c (contents, props changed)
branches/arty-newcc/hal/halx86/mp/spinlock.c (contents, props changed)
branches/arty-newcc/hal/halx86/up/halinit_up.c (props changed)
branches/arty-newcc/hal/halx86/up/halup.rc (props changed)
branches/arty-newcc/hal/halx86/xbox/halinit_xbox.c (props changed)
branches/arty-newcc/hal/halx86/xbox/halxbox.h (props changed)
branches/arty-newcc/hal/halx86/xbox/halxbox.rc (props changed)
branches/arty-newcc/hal/halx86/xbox/part_xbox.c (contents, props changed)
Modified: branches/arty-newcc/hal/hal.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/hal.rbuild?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/hal.rbuild [iso-8859-1] (original)
+++ branches/arty-newcc/hal/hal.rbuild [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -10,7 +10,9 @@
<xi:include href="halx86/hal_generic_up.rbuild" />
<xi:include href="halx86/hal_generic_pc.rbuild" />
<xi:include href="halx86/halup.rbuild" />
- <xi:include href="halx86/halmp.rbuild" />
+ <if property="BUILD_MP" value="1">
+ <xi:include href="halx86/halmp.rbuild" />
+ </if>
<xi:include href="halx86/halxbox.rbuild" />
</directory>
</if>
Propchange: branches/arty-newcc/hal/hal.rbuild
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/hal/hal.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/hal/hal.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/hal/hal.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/hal/hal.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -27,7 +27,7 @@
/* DATA **********************************************************************/
-ULONG _KdComPortInUse = 0;
+PUCHAR KdComPortInUse;
/* FUNCTIONS *****************************************************************/
Propchange: branches/arty-newcc/hal/hal/hal.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: branches/arty-newcc/hal/hal/hal.pspec
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/hal/hal.pspec?rev=39808&view=auto
==============================================================================
--- branches/arty-newcc/hal/hal/hal.pspec (added)
+++ branches/arty-newcc/hal/hal/hal.pspec [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -1,0 +1,102 @@
+#include "include/reactos/msvctarget.h"
+
+@ fastcall ExAcquireFastMutex(ptr) ExiAcquireFastMutex
+@ fastcall ExReleaseFastMutex(ptr) ExiReleaseFastMutex
+@ fastcall 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)
+
+@ stdcall HalAcquireDisplayOwnership(ptr)
+@ stdcall HalAdjustResourceList(ptr)
+@ stdcall HalAllProcessorsStarted()
+@ stdcall HalAllocateAdapterChannel(ptr ptr long ptr)
+@ stdcall HalAllocateCommonBuffer(ptr long ptr long)
+@ stdcall HalAllocateCrashDumpRegisters(ptr ptr)
+@ stdcall HalAssignSlotResources(ptr ptr ptr ptr long long long ptr)
+@ stdcall HalBeginSystemInterrupt(long long ptr)
+@ stdcall HalCalibratePerformanceCounter(ptr long long)
+@ stdcall HalDisableSystemInterrupt(long long)
+@ stdcall HalDisplayString(str)
+@ stdcall HalEnableSystemInterrupt(long long long)
+@ stdcall HalEndSystemInterrupt(long long)
+@ stdcall HalFlushCommonBuffer(long long long long long)
+@ stdcall HalFreeCommonBuffer(ptr long long long ptr long)
+@ stdcall HalGetAdapter(ptr ptr)
+@ 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
+@ stdcall HalGetInterruptVector(long long long long ptr ptr)
+@ stdcall HalHandleNMI(ptr)
+@ stdcall HalInitSystem(long ptr)
+@ stdcall HalInitializeProcessor(long ptr)
+@ stdcall HalMakeBeep(long)
+@ stdcall HalProcessorIdle()
+@ stdcall HalQueryDisplayParameters(ptr ptr ptr ptr)
+@ stdcall HalQueryRealTimeClock(ptr)
+@ stdcall HalReadDmaCounter(ptr)
+@ stdcall HalReportResourceUsage()
+@ stdcall HalRequestIpi(long)
+@ stdcall HalReturnToFirmware(long)
+@ stdcall HalSetBusData(long long long ptr long)
+@ stdcall HalSetBusDataByOffset(long long long ptr long long)
+@ stdcall HalSetDisplayParameters(long long)
+@ stdcall HalSetEnvironmentVariable(str str)
+@ stdcall HalSetProfileInterval(long)
+@ stdcall HalSetRealTimeClock(ptr)
+@ stdcall HalSetTimeIncrement(long)
+@ stdcall HalStartNextProcessor(ptr ptr)
+@ stdcall HalStartProfileInterrupt(long)
+@ stdcall HalStopProfileInterrupt(long)
+#ifdef _M_ARM
+@ fastcall HalSweepIcache()
+@ fastcall HalSweepDcache()
+#endif
+@ stdcall HalTranslateBusAddress(long long long long ptr ptr)
+@ stdcall IoAssignDriveLetters(ptr str ptr ptr) HalpAssignDriveLetters
+@ stdcall IoFlushAdapterBuffers(ptr ptr ptr ptr long long)
+@ stdcall IoFreeAdapterChannel(ptr)
+@ stdcall IoFreeMapRegisters(ptr ptr long)
+@ stdcall IoMapTransfer(ptr ptr ptr ptr ptr long)
+@ stdcall IoReadPartitionTable(ptr long long ptr) HalpReadPartitionTable
+@ stdcall IoSetPartitionInformation(ptr long long long) HalpSetPartitionInformation
+@ stdcall IoWritePartitionTable(ptr long long long ptr) HalpWritePartitionTable
+@ stdcall KeAcquireSpinLock(ptr ptr)
+@ extern KdComPortInUse
+@ stdcall KeFlushWriteBuffer()
+@ stdcall KeGetCurrentIrql()
+@ stdcall KeLowerIrql(long)
+@ stdcall KeQueryPerformanceCounter(ptr)
+@ stdcall KeRaiseIrql(long ptr)
+@ stdcall KeRaiseIrqlToDpcLevel()
+@ stdcall KeRaiseIrqlToSynchLevel()
+@ stdcall 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)
Modified: branches/arty-newcc/hal/hal/hal.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/hal/hal.rbuild?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/hal/hal.rbuild [iso-8859-1] (original)
+++ branches/arty-newcc/hal/hal/hal.rbuild [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -9,18 +9,16 @@
<define name="_NTHAL_" />
<file>hal.c</file>
<file>hal.rc</file>
- <file>hal.spec</file>
</module>
</if>
<if property="ARCH" value="i386">
<module name="hal" type="kernelmodedll">
- <importlibrary definition="hal.spec.def" />
+ <importlibrary definition="hal.pspec" />
<include base="ntoskrnl">include</include>
<library>ntoskrnl</library>
<define name="_NTHAL_" />
<file>hal.c</file>
<file>hal.rc</file>
- <file>hal.spec</file>
</module>
</if>
<if property="ARCH" value="i386">
Propchange: branches/arty-newcc/hal/hal/hal.rbuild
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/hal/hal.rc
------------------------------------------------------------------------------
svn:mime-type = text/plain
Removed: branches/arty-newcc/hal/hal/hal.spec
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/hal/hal.spec?rev=39807&view=auto
==============================================================================
--- branches/arty-newcc/hal/hal/hal.spec [iso-8859-1] (original)
+++ branches/arty-newcc/hal/hal/hal.spec (removed)
@@ -1,102 +1,0 @@
-#include "include/reactos/msvctarget.h"
-
-@ fastcall ExAcquireFastMutex(ptr) ExiAcquireFastMutex
-@ fastcall ExReleaseFastMutex(ptr) ExiReleaseFastMutex
-@ fastcall 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)
-
-@ stdcall HalAcquireDisplayOwnership(ptr)
-@ stdcall HalAdjustResourceList(ptr)
-@ stdcall HalAllProcessorsStarted()
-@ stdcall HalAllocateAdapterChannel(ptr ptr long ptr)
-@ stdcall HalAllocateCommonBuffer(ptr long ptr long)
-@ stdcall HalAllocateCrashDumpRegisters(ptr ptr)
-@ stdcall HalAssignSlotResources(ptr ptr ptr ptr long long long ptr)
-@ stdcall HalBeginSystemInterrupt(long long ptr)
-@ stdcall HalCalibratePerformanceCounter(ptr long long)
-@ stdcall HalDisableSystemInterrupt(long long)
-@ stdcall HalDisplayString(str)
-@ stdcall HalEnableSystemInterrupt(long long long)
-@ stdcall HalEndSystemInterrupt(long long)
-@ stdcall HalFlushCommonBuffer(long long long long long)
-@ stdcall HalFreeCommonBuffer(ptr long long long ptr long)
-@ stdcall HalGetAdapter(ptr ptr)
-@ 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
-@ stdcall HalGetInterruptVector(long long long long ptr ptr)
-@ stdcall HalHandleNMI(ptr)
-@ stdcall HalInitSystem(long ptr)
-@ stdcall HalInitializeProcessor(long ptr)
-@ stdcall HalMakeBeep(long)
-@ stdcall HalProcessorIdle()
-@ stdcall HalQueryDisplayParameters(ptr ptr ptr ptr)
-@ stdcall HalQueryRealTimeClock(ptr)
-@ stdcall HalReadDmaCounter(ptr)
-@ stdcall HalReportResourceUsage()
-@ stdcall HalRequestIpi(long)
-@ stdcall HalReturnToFirmware(long)
-@ stdcall HalSetBusData(long long long ptr long)
-@ stdcall HalSetBusDataByOffset(long long long ptr long long)
-@ stdcall HalSetDisplayParameters(long long)
-@ stdcall HalSetEnvironmentVariable(str str)
-@ stdcall HalSetProfileInterval(long)
-@ stdcall HalSetRealTimeClock(ptr)
-@ stdcall HalSetTimeIncrement(long)
-@ stdcall HalStartNextProcessor(ptr ptr)
-@ stdcall HalStartProfileInterrupt(long)
-@ stdcall HalStopProfileInterrupt(long)
-#ifdef _M_ARM
-@ fastcall HalSweepIcache()
-@ fastcall HalSweepDcache()
-#endif
-@ stdcall HalTranslateBusAddress(long long long long ptr ptr)
-@ stdcall IoAssignDriveLetters(ptr str ptr ptr) HalpAssignDriveLetters
-@ stdcall IoFlushAdapterBuffers(ptr ptr ptr ptr long long)
-@ stdcall IoFreeAdapterChannel(ptr)
-@ stdcall IoFreeMapRegisters(ptr ptr long)
-@ stdcall IoMapTransfer(ptr ptr ptr ptr ptr long)
-@ stdcall IoReadPartitionTable(ptr long long ptr) HalpReadPartitionTable
-@ stdcall IoSetPartitionInformation(ptr long long long) HalpSetPartitionInformation
-@ stdcall IoWritePartitionTable(ptr long long long ptr) HalpWritePartitionTable
-@ stdcall KeAcquireSpinLock(ptr ptr)
-@ extern KdComPortInUse _KdComPortInUse
-@ stdcall KeFlushWriteBuffer()
-@ stdcall KeGetCurrentIrql()
-@ stdcall KeLowerIrql(long)
-@ stdcall KeQueryPerformanceCounter(ptr)
-@ stdcall KeRaiseIrql(long ptr)
-@ stdcall KeRaiseIrqlToDpcLevel()
-@ stdcall KeRaiseIrqlToSynchLevel()
-@ stdcall 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)
Modified: branches/arty-newcc/hal/halarm/generic/hal.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halarm/generic/hal.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halarm/generic/hal.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halarm/generic/hal.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -27,7 +27,7 @@
/* DATA **********************************************************************/
ULONG HalpCurrentTimeIncrement, HalpNextTimeIncrement, HalpNextIntervalCount;
-ULONG _KdComPortInUse = 0;
+PUCHAR KdComPortInUse;
ULONG HalpIrqlTable[HIGH_LEVEL + 1] =
{
Modified: branches/arty-newcc/hal/halarm/include/hal.h
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halarm/include/hal.h?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halarm/include/hal.h [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halarm/include/hal.h [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -37,7 +37,4 @@
/* Internal HAL Headers */
#include "halp.h"
-/* Helper Header */
-#include <reactos/helper.h>
-
/* EOF */
Modified: branches/arty-newcc/hal/halarm/include/halp.h
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halarm/include/halp.h?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halarm/include/halp.h [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halarm/include/halp.h [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -14,9 +14,4 @@
#include <peripherals/pl190.h>
#include <peripherals/sp804.h>
-//
-// WDK Hack
-//
-#define KdComPortInUse _KdComPortInUse
-
#endif /* __INTERNAL_HAL_HAL_H */
Modified: branches/arty-newcc/hal/halarm/up/halup.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halarm/up/halup.rbuild?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halarm/up/halup.rbuild [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halarm/up/halup.rbuild [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -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.spec.def" />
+ <importlibrary base="hal" definition="hal.pspec" />
<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
<include base="halarm_generic">../include</include>
<include base="ntoskrnl">include</include>
Propchange: branches/arty-newcc/hal/halppc/directory.rbuild
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halppc/generic/beep.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halppc/generic/beep.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halppc/generic/beep.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halppc/generic/beep.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -32,7 +32,7 @@
*/
BOOLEAN
-STDCALL
+NTAPI
HalMakeBeep (
ULONG Frequency
)
Propchange: branches/arty-newcc/hal/halppc/generic/beep.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/generic/bus.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/generic/cmos.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halppc/generic/display.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halppc/generic/display.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halppc/generic/display.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halppc/generic/display.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -250,7 +250,7 @@
/* PUBLIC FUNCTIONS *********************************************************/
-VOID STDCALL
+VOID NTAPI
HalReleaseDisplayOwnership(VOID)
/*
* FUNCTION: Release ownership of display back to HAL
@@ -267,7 +267,7 @@
}
-VOID STDCALL
+VOID NTAPI
HalAcquireDisplayOwnership(IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters)
/*
* FUNCTION:
@@ -280,7 +280,7 @@
HalResetDisplayParameters = ResetDisplayParameters;
}
-VOID STDCALL
+VOID NTAPI
HalDisplayString(IN PCH String)
/*
* FUNCTION: Switches the screen to HAL console mode (BSOD) if not there
@@ -350,7 +350,7 @@
KeLowerIrql(OldIrql);
}
-VOID STDCALL
+VOID NTAPI
HalQueryDisplayParameters(OUT PULONG DispSizeX,
OUT PULONG DispSizeY,
OUT PULONG CursorPosX,
@@ -367,7 +367,7 @@
}
-VOID STDCALL
+VOID NTAPI
HalSetDisplayParameters(IN ULONG CursorPosX,
IN ULONG CursorPosY)
{
@@ -376,7 +376,7 @@
}
-BOOLEAN STDCALL
+BOOLEAN NTAPI
HalQueryDisplayOwnership(VOID)
{
return !HalOwnsDisplay;
Propchange: branches/arty-newcc/hal/halppc/generic/display.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halppc/generic/dma.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halppc/generic/dma.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halppc/generic/dma.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halppc/generic/dma.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -164,7 +164,7 @@
* by the passed DMA adapter.
*/
-PHYSICAL_ADDRESS STDCALL
+PHYSICAL_ADDRESS NTAPI
HalpGetAdapterMaximumPhysicalAddress(
IN PADAPTER_OBJECT AdapterObject)
{
@@ -200,7 +200,7 @@
* already allocated).
*/
-BOOLEAN STDCALL
+BOOLEAN NTAPI
HalpGrowMapBuffers(
IN PADAPTER_OBJECT AdapterObject,
IN ULONG SizeOfMapBuffers)
@@ -329,7 +329,7 @@
* @see HalpInitDma
*/
-PADAPTER_OBJECT STDCALL
+PADAPTER_OBJECT NTAPI
HalpDmaAllocateMasterAdapter(VOID)
{
PADAPTER_OBJECT MasterAdapter;
@@ -388,7 +388,7 @@
* @see HalGetAdapter
*/
-PADAPTER_OBJECT STDCALL
+PADAPTER_OBJECT NTAPI
HalpDmaAllocateChildAdapter(
ULONG NumberOfMapRegisters,
PDEVICE_DESCRIPTION DeviceDescription)
@@ -458,7 +458,7 @@
* Setup DMA modes and extended modes for (E)ISA DMA adapter object.
*/
-BOOLEAN STDCALL
+BOOLEAN NTAPI
HalpDmaInitializeEisaAdapter(
PADAPTER_OBJECT AdapterObject,
PDEVICE_DESCRIPTION DeviceDescription)
@@ -588,7 +588,7 @@
* @implemented
*/
-PADAPTER_OBJECT STDCALL
+PADAPTER_OBJECT NTAPI
HalGetAdapter(
PDEVICE_DESCRIPTION DeviceDescription,
PULONG NumberOfMapRegisters)
@@ -787,7 +787,7 @@
* @see HalGetAdapter
*/
-PDMA_ADAPTER STDCALL
+PDMA_ADAPTER NTAPI
HalpGetDmaAdapter(
IN PVOID Context,
IN PDEVICE_DESCRIPTION DeviceDescription,
@@ -805,7 +805,7 @@
* @see HalGetAdapter
*/
-VOID STDCALL
+VOID NTAPI
HalPutDmaAdapter(
PADAPTER_OBJECT AdapterObject)
{
@@ -846,7 +846,7 @@
* @implemented
*/
-PVOID STDCALL
+PVOID NTAPI
HalAllocateCommonBuffer(
PADAPTER_OBJECT AdapterObject,
ULONG Length,
@@ -895,7 +895,7 @@
* @implemented
*/
-VOID STDCALL
+VOID NTAPI
HalFreeCommonBuffer(
PADAPTER_OBJECT AdapterObject,
ULONG Length,
@@ -915,7 +915,7 @@
* @see HalGetAdapter
*/
-ULONG STDCALL
+ULONG NTAPI
HalpDmaGetDmaAlignment(
PADAPTER_OBJECT AdapterObject)
{
@@ -930,7 +930,7 @@
* @implemented
*/
-ULONG STDCALL
+ULONG NTAPI
HalReadDmaCounter(
PADAPTER_OBJECT AdapterObject)
{
@@ -1002,7 +1002,7 @@
* at PASSIVE_LEVEL in work item.
*/
-VOID STDCALL
+VOID NTAPI
HalpGrowMapBufferWorker(PVOID DeferredContext)
{
PGROW_WORK_ITEM WorkItem = (PGROW_WORK_ITEM)DeferredContext;
@@ -1064,7 +1064,7 @@
* @implemented
*/
-NTSTATUS STDCALL
+NTSTATUS NTAPI
HalAllocateAdapterChannel(
PADAPTER_OBJECT AdapterObject,
PWAIT_CONTEXT_BLOCK WaitContextBlock,
@@ -1235,7 +1235,7 @@
* @implemented
*/
-VOID STDCALL
+VOID NTAPI
IoFreeAdapterChannel(
PADAPTER_OBJECT AdapterObject)
{
@@ -1359,7 +1359,7 @@
* @implemented
*/
-VOID STDCALL
+VOID NTAPI
IoFreeMapRegisters(
IN PADAPTER_OBJECT AdapterObject,
IN PVOID MapRegisterBase,
@@ -1465,7 +1465,7 @@
* @see IoFlushAdapterBuffers, IoMapTransfer
*/
-VOID STDCALL
+VOID NTAPI
HalpCopyBufferMap(
PMDL Mdl,
PROS_MAP_REGISTER_ENTRY MapRegisterBase,
@@ -1554,7 +1554,7 @@
* @unimplemented.
*/
-BOOLEAN STDCALL
+BOOLEAN NTAPI
IoFlushAdapterBuffers(
PADAPTER_OBJECT AdapterObject,
PMDL Mdl,
@@ -1661,7 +1661,7 @@
* @implemented
*/
-PHYSICAL_ADDRESS STDCALL
+PHYSICAL_ADDRESS NTAPI
IoMapTransfer(
IN PADAPTER_OBJECT AdapterObject,
IN PMDL Mdl,
Propchange: branches/arty-newcc/hal/halppc/generic/dma.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/generic/drive.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/generic/enum.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/generic/fmutex.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/generic/font.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/generic/generic.rbuild
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/generic/halinit.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halppc/generic/irql.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halppc/generic/irql.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halppc/generic/irql.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halppc/generic/irql.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -61,7 +61,7 @@
#else
-VOID STDCALL
+VOID NTAPI
KiInterruptDispatch2 (ULONG Irq, KIRQL old_level);
#endif
@@ -69,7 +69,7 @@
/* FUNCTIONS ****************************************************************/
#undef KeGetCurrentIrql
-KIRQL STDCALL KeGetCurrentIrql (VOID)
+KIRQL NTAPI KeGetCurrentIrql (VOID)
/*
* PURPOSE: Returns the current irq level
* RETURNS: The current irq level
@@ -277,7 +277,7 @@
* Calls KfRaiseIrql
*/
-KIRQL STDCALL
+KIRQL NTAPI
KeRaiseIrqlToDpcLevel (VOID)
{
return KfRaiseIrql (DISPATCH_LEVEL);
@@ -301,14 +301,14 @@
* Calls KfRaiseIrql
*/
-KIRQL STDCALL
+KIRQL NTAPI
KeRaiseIrqlToSynchLevel (VOID)
{
return KfRaiseIrql (DISPATCH_LEVEL);
}
-BOOLEAN STDCALL
+BOOLEAN NTAPI
HalBeginSystemInterrupt (KIRQL Irql,
ULONG Vector,
PKIRQL OldIrql)
@@ -347,7 +347,7 @@
}
-VOID STDCALL HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2)
+VOID NTAPI HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2)
/*
* FUNCTION: Finish a system interrupt and restore the specified irq level.
*/
@@ -357,7 +357,7 @@
}
BOOLEAN
-STDCALL
+NTAPI
HalDisableSystemInterrupt(
ULONG Vector,
KIRQL Irql)
@@ -383,7 +383,7 @@
BOOLEAN
-STDCALL
+NTAPI
HalEnableSystemInterrupt(
ULONG Vector,
KIRQL Irql,
Propchange: branches/arty-newcc/hal/halppc/generic/irql.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halppc/generic/isa.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halppc/generic/isa.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halppc/generic/isa.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halppc/generic/isa.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -34,7 +34,7 @@
}
-BOOLEAN STDCALL
+BOOLEAN NTAPI
HalpTranslateIsaBusAddress(PBUS_HANDLER BusHandler,
ULONG BusNumber,
PHYSICAL_ADDRESS BusAddress,
@@ -59,7 +59,7 @@
return Result;
}
-ULONG STDCALL
+ULONG NTAPI
HalpGetIsaInterruptVector(PVOID BusHandler,
ULONG BusNumber,
ULONG BusInterruptLevel,
Propchange: branches/arty-newcc/hal/halppc/generic/isa.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/generic/misc.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/generic/pci.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halppc/generic/portio.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halppc/generic/portio.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halppc/generic/portio.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halppc/generic/portio.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -193,7 +193,7 @@
"blr"
);
-VOID STDCALL
+VOID NTAPI
READ_PORT_BUFFER_UCHAR (PUCHAR Port,
PUCHAR Buffer,
ULONG Count)
@@ -201,7 +201,7 @@
while(Count--) { *Buffer++ = GetPhysByte((ULONG)Port); }
}
-VOID STDCALL
+VOID NTAPI
READ_PORT_BUFFER_USHORT (PUSHORT Port,
PUSHORT Buffer,
ULONG Count)
@@ -209,7 +209,7 @@
while(Count--) { *Buffer++ = GetPhysWord((ULONG)Port); }
}
-VOID STDCALL
+VOID NTAPI
READ_PORT_BUFFER_ULONG (PULONG Port,
PULONG Buffer,
ULONG Count)
@@ -217,25 +217,25 @@
while(Count--) { *Buffer++ = GetPhys((ULONG)Port); }
}
-UCHAR STDCALL
+UCHAR NTAPI
READ_PORT_UCHAR (PUCHAR Port)
{
return GetPhys((ULONG)Port);
}
-USHORT STDCALL
+USHORT NTAPI
READ_PORT_USHORT (PUSHORT Port)
{
return GetPhysWord((ULONG)Port);
}
-ULONG STDCALL
+ULONG NTAPI
READ_PORT_ULONG (PULONG Port)
{
return GetPhys((ULONG)Port);
}
-VOID STDCALL
+VOID NTAPI
WRITE_PORT_BUFFER_UCHAR (PUCHAR Port,
PUCHAR Buffer,
ULONG Count)
@@ -243,7 +243,7 @@
while(Count--) { SetPhysByte((ULONG)Port, *Buffer++); }
}
-VOID STDCALL
+VOID NTAPI
WRITE_PORT_BUFFER_USHORT (PUSHORT Port,
PUSHORT Buffer,
ULONG Count)
@@ -251,7 +251,7 @@
while(Count--) { SetPhysWord((ULONG)Port, *Buffer++); }
}
-VOID STDCALL
+VOID NTAPI
WRITE_PORT_BUFFER_ULONG (PULONG Port,
PULONG Buffer,
ULONG Count)
@@ -259,21 +259,21 @@
while(Count--) { SetPhys((ULONG)Port, *Buffer++); }
}
-VOID STDCALL
+VOID NTAPI
WRITE_PORT_UCHAR (PUCHAR Port,
UCHAR Value)
{
SetPhysByte((ULONG)Port, Value);
}
-VOID STDCALL
+VOID NTAPI
WRITE_PORT_USHORT (PUSHORT Port,
USHORT Value)
{
SetPhysWord((ULONG)Port, Value);
}
-VOID STDCALL
+VOID NTAPI
WRITE_PORT_ULONG (PULONG Port,
ULONG Value)
{
Propchange: branches/arty-newcc/hal/halppc/generic/portio.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halppc/generic/processor.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halppc/generic/processor.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halppc/generic/processor.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halppc/generic/processor.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -22,7 +22,7 @@
#define INITIAL_STALL_COUNT 0x10000
-VOID STDCALL
+VOID NTAPI
HalInitializeProcessor(ULONG ProcessorNumber,
PLOADER_PARAMETER_BLOCK LoaderBlock)
{
@@ -30,7 +30,7 @@
KeGetPcr()->StallScaleFactor = INITIAL_STALL_COUNT;
}
-BOOLEAN STDCALL
+BOOLEAN NTAPI
HalAllProcessorsStarted (VOID)
{
DPRINT("HalAllProcessorsStarted()\n");
Propchange: branches/arty-newcc/hal/halppc/generic/processor.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/generic/profil.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halppc/generic/reboot.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halppc/generic/reboot.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halppc/generic/reboot.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halppc/generic/reboot.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -22,7 +22,7 @@
}
-VOID STDCALL
+VOID NTAPI
HalReturnToFirmware (
FIRMWARE_REENTRY Action
)
Propchange: branches/arty-newcc/hal/halppc/generic/reboot.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/generic/spinlock.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halppc/generic/sysinfo.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halppc/generic/sysinfo.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halppc/generic/sysinfo.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halppc/generic/sysinfo.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -12,8 +12,7 @@
#define NDEBUG
#include <debug.h>
-#define KdComPortInUse _KdComPortInUse
-ULONG KdComPortInUse = 0;
+PUCHAR KdComPortInUse;
/* FUNCTIONS *****************************************************************/
Propchange: branches/arty-newcc/hal/halppc/generic/sysinfo.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/generic/timer.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/include/apic.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/include/bus.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halppc/include/hal.h
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halppc/include/hal.h?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halppc/include/hal.h [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halppc/include/hal.h [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -47,7 +47,4 @@
#include "mps.h"
#include "ioapic.h"
-/* Helper Header */
-#include <reactos/helper.h>
-
/* EOF */
Propchange: branches/arty-newcc/hal/halppc/include/hal.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halppc/include/haldma.h
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halppc/include/haldma.h?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halppc/include/haldma.h [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halppc/include/haldma.h [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -367,16 +367,16 @@
#define MAP_BASE_SW_SG 1
-PADAPTER_OBJECT STDCALL
+PADAPTER_OBJECT NTAPI
HalpDmaAllocateMasterAdapter(VOID);
-PDMA_ADAPTER STDCALL
+PDMA_ADAPTER NTAPI
HalpGetDmaAdapter(
IN PVOID Context,
IN PDEVICE_DESCRIPTION DeviceDescription,
OUT PULONG NumberOfMapRegisters);
-ULONG STDCALL
+ULONG NTAPI
HalpDmaGetDmaAlignment(
PADAPTER_OBJECT AdapterObject);
Propchange: branches/arty-newcc/hal/halppc/include/haldma.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/include/halirq.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halppc/include/halp.h
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halppc/include/halp.h?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halppc/include/halp.h [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halppc/include/halp.h [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -7,9 +7,6 @@
/* Temporary hack */
#define KPCR_BASE 0xFF000000
-
-/* WDK Hack */
-#define KdComPortInUse _KdComPortInUse
#define HAL_APC_REQUEST 0
#define HAL_DPC_REQUEST 1
@@ -36,7 +33,7 @@
(UCHAR)(((int / 10) << 4) + (int % 10))
/* adapter.c */
-PADAPTER_OBJECT STDCALL HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN IsMaster, BOOLEAN Dma32BitAddresses);
+PADAPTER_OBJECT NTAPI HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN IsMaster, BOOLEAN Dma32BitAddresses);
/* bus.c */
VOID NTAPI HalpInitNonBusHandler (VOID);
Propchange: branches/arty-newcc/hal/halppc/include/halp.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/include/ioapic.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/include/mps.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/up/halinit_up.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/up/halup.rbuild
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halppc/up/halup.rc
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/generic/beep.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/generic/bios.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/generic/bus.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/generic/cmos.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/generic/cmos.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/generic/cmos.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/generic/cmos.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -1,291 +1,291 @@
-/*
- * PROJECT: ReactOS HAL
- * LICENSE: GPL - See COPYING in the top level directory
- * FILE: hal/halx86/generic/cmos.c
- * PURPOSE: CMOS Access Routines (Real Time Clock and LastKnownGood)
- * PROGRAMMERS: Alex Ionescu (alex.ionescu at reactos.org)
- * Eric Kohl (ekohl at abo.rhein-zeitung.de)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <hal.h>
-#define NDEBUG
-#include <debug.h>
-
-/* GLOBALS *******************************************************************/
-
-KSPIN_LOCK HalpSystemHardwareLock;
-
-/* PRIVATE FUNCTIONS *********************************************************/
-
-UCHAR
-FORCEINLINE
-HalpReadCmos(IN UCHAR Reg)
-{
- /* Select the register */
- WRITE_PORT_UCHAR(CMOS_CONTROL_PORT, Reg);
-
- /* Query the value */
- return READ_PORT_UCHAR(CMOS_DATA_PORT);
-}
-
-VOID
-FORCEINLINE
-HalpWriteCmos(IN UCHAR Reg,
- IN UCHAR Value)
-{
- /* Select the register */
- WRITE_PORT_UCHAR(CMOS_CONTROL_PORT, Reg);
-
- /* Write the value */
- WRITE_PORT_UCHAR(CMOS_DATA_PORT, Value);
-}
-
-ULONG
-NTAPI
-HalpGetCmosData(IN ULONG BusNumber,
- IN ULONG SlotNumber,
- IN PVOID Buffer,
- IN ULONG Length)
-{
- PUCHAR Ptr = (PUCHAR)Buffer;
- ULONG Address = SlotNumber;
- ULONG Len = Length;
-
- /* FIXME: Acquire CMOS Lock */
-
- /* Do nothing if we don't have a length */
- if (!Length) return 0;
-
- /* Check if this is simple CMOS */
- if (!BusNumber)
- {
- /* Loop the buffer up to 0xFF */
- while ((Len > 0) && (Address < 0x100))
- {
- /* Read the data */
- *Ptr = HalpReadCmos((UCHAR)Address);
-
- /* Update position and length */
- Ptr++;
- Address++;
- Len--;
- }
- }
- else if (BusNumber == 1)
- {
- /* Loop the buffer up to 0xFFFF */
- while ((Len > 0) && (Address < 0x10000))
- {
- /* Write the data */
- *Ptr = HalpReadCmos((UCHAR)Address);
-
- /* Update position and length */
- Ptr++;
- Address++;
- Len--;
- }
- }
-
- /* FIXME: Release the CMOS Lock */
-
- /* Return length read */
- return Length - Len;
-}
-
-ULONG
-NTAPI
-HalpSetCmosData(IN ULONG BusNumber,
- IN ULONG SlotNumber,
- IN PVOID Buffer,
- IN ULONG Length)
-{
- PUCHAR Ptr = (PUCHAR)Buffer;
- ULONG Address = SlotNumber;
- ULONG Len = Length;
-
- /* FIXME: Acquire CMOS Lock */
-
- /* Do nothing if we don't have a length */
- if (!Length) return 0;
-
- /* Check if this is simple CMOS */
- if (!BusNumber)
- {
- /* Loop the buffer up to 0xFF */
- while ((Len > 0) && (Address < 0x100))
- {
- /* Write the data */
- HalpWriteCmos((UCHAR)Address, *Ptr);
-
- /* Update position and length */
- Ptr++;
- Address++;
- Len--;
- }
- }
- else if (BusNumber == 1)
- {
- /* Loop the buffer up to 0xFFFF */
- while ((Len > 0) && (Address < 0x10000))
- {
- /* Write the data */
- HalpWriteCmos((UCHAR)Address, *Ptr);
-
- /* Update position and length */
- Ptr++;
- Address++;
- Len--;
- }
- }
-
- /* FIXME: Release the CMOS Lock */
-
- /* Return length read */
- return Length - Len;
-}
-
-/* PUBLIC FUNCTIONS **********************************************************/
-
-/*
- * @implemented
- */
-ARC_STATUS
-NTAPI
-HalGetEnvironmentVariable(IN PCH Name,
- IN USHORT ValueLength,
- IN PCH Value)
-{
- UCHAR Val;
-
- /* Only variable supported on x86 */
- if (_stricmp(Name, "LastKnownGood")) return ENOENT;
-
- /* FIXME: Acquire CMOS Lock */
-
- /* Query the current value */
- Val = HalpReadCmos(RTC_REGISTER_B) & 0x01;
-
- /* FIXME: Release CMOS lock */
-
- /* Check the flag */
- if (Val)
- {
- /* Return false */
- strncpy(Value, "FALSE", ValueLength);
- }
- else
- {
- /* Return true */
- strncpy(Value, "TRUE", ValueLength);
- }
-
- /* Return success */
- return ESUCCESS;
-}
-
-/*
- * @implemented
- */
-ARC_STATUS
-NTAPI
-HalSetEnvironmentVariable(IN PCH Name,
- IN PCH Value)
-{
- UCHAR Val;
-
- /* Only variable supported on x86 */
- if (_stricmp(Name, "LastKnownGood")) return ENOMEM;
-
- /* Check if this is true or false */
- if (!_stricmp(Value, "TRUE"))
- {
- /* It's true, acquire CMOS lock (FIXME) */
-
- /* Read the current value and add the flag */
- Val = HalpReadCmos(RTC_REGISTER_B) | 1;
- }
- else if (!_stricmp(Value, "FALSE"))
- {
- /* It's false, acquire CMOS lock (FIXME) */
-
- /* Read the current value and mask out the flag */
- Val = HalpReadCmos(RTC_REGISTER_B) & ~1;
- }
- else
- {
- /* Fail */
- return ENOMEM;
- }
-
- /* Write new value */
- HalpWriteCmos(RTC_REGISTER_B, Val);
-
- /* Release the lock and return success */
- return ESUCCESS;
-}
-
-/*
- * @implemented
- */
-BOOLEAN
-NTAPI
-HalQueryRealTimeClock(OUT PTIME_FIELDS Time)
-{
- /* FIXME: Acquire CMOS Lock */
-
- /* Loop while update is in progress */
- while ((HalpReadCmos(RTC_REGISTER_A)) & RTC_REG_A_UIP);
-
- /* Set the time data */
- Time->Second = BCD_INT(HalpReadCmos(0));
- Time->Minute = BCD_INT(HalpReadCmos(2));
- Time->Hour = BCD_INT(HalpReadCmos(4));
- Time->Weekday = BCD_INT(HalpReadCmos(6));
- Time->Day = BCD_INT(HalpReadCmos(7));
- Time->Month = BCD_INT(HalpReadCmos(8));
- Time->Year = BCD_INT(HalpReadCmos(9));
- Time->Milliseconds = 0;
-
- /* FIXME: Check century byte */
-
- /* Compensate for the century field */
- Time->Year += (Time->Year > 80) ? 1900: 2000;
-
- /* FIXME: Release CMOS Lock */
-
- /* Always return TRUE */
- return TRUE;
-}
-
-/*
- * @implemented
- */
-BOOLEAN
-NTAPI
-HalSetRealTimeClock(IN PTIME_FIELDS Time)
-{
- /* FIXME: Acquire CMOS Lock */
-
- /* Loop while update is in progress */
- while ((HalpReadCmos(RTC_REGISTER_A)) & RTC_REG_A_UIP);
-
- /* Write time fields to CMOS RTC */
- HalpWriteCmos(0, INT_BCD(Time->Second));
- HalpWriteCmos(2, INT_BCD(Time->Minute));
- HalpWriteCmos(4, INT_BCD(Time->Hour));
- HalpWriteCmos(6, INT_BCD(Time->Weekday));
- HalpWriteCmos(7, INT_BCD(Time->Day));
- HalpWriteCmos(8, INT_BCD(Time->Month));
- HalpWriteCmos(9, INT_BCD(Time->Year % 100));
-
- /* FIXME: Set the century byte */
-
- /* FIXME: Release the CMOS Lock */
-
- /* Always return TRUE */
- return TRUE;
-}
-
-/* EOF */
+/*
+ * PROJECT: ReactOS HAL
+ * LICENSE: GPL - See COPYING in the top level directory
+ * FILE: hal/halx86/generic/cmos.c
+ * PURPOSE: CMOS Access Routines (Real Time Clock and LastKnownGood)
+ * PROGRAMMERS: Alex Ionescu (alex.ionescu at reactos.org)
+ * Eric Kohl (ekohl at abo.rhein-zeitung.de)
+ */
+
+/* INCLUDES ******************************************************************/
+
+#include <hal.h>
+#define NDEBUG
+#include <debug.h>
+
+/* GLOBALS *******************************************************************/
+
+KSPIN_LOCK HalpSystemHardwareLock;
+
+/* PRIVATE FUNCTIONS *********************************************************/
+
+FORCEINLINE
+UCHAR
+HalpReadCmos(IN UCHAR Reg)
+{
+ /* Select the register */
+ WRITE_PORT_UCHAR(CMOS_CONTROL_PORT, Reg);
+
+ /* Query the value */
+ return READ_PORT_UCHAR(CMOS_DATA_PORT);
+}
+
+FORCEINLINE
+VOID
+HalpWriteCmos(IN UCHAR Reg,
+ IN UCHAR Value)
+{
+ /* Select the register */
+ WRITE_PORT_UCHAR(CMOS_CONTROL_PORT, Reg);
+
+ /* Write the value */
+ WRITE_PORT_UCHAR(CMOS_DATA_PORT, Value);
+}
+
+ULONG
+NTAPI
+HalpGetCmosData(IN ULONG BusNumber,
+ IN ULONG SlotNumber,
+ IN PVOID Buffer,
+ IN ULONG Length)
+{
+ PUCHAR Ptr = (PUCHAR)Buffer;
+ ULONG Address = SlotNumber;
+ ULONG Len = Length;
+
+ /* FIXME: Acquire CMOS Lock */
+
+ /* Do nothing if we don't have a length */
+ if (!Length) return 0;
+
+ /* Check if this is simple CMOS */
+ if (!BusNumber)
+ {
+ /* Loop the buffer up to 0xFF */
+ while ((Len > 0) && (Address < 0x100))
+ {
+ /* Read the data */
+ *Ptr = HalpReadCmos((UCHAR)Address);
+
+ /* Update position and length */
+ Ptr++;
+ Address++;
+ Len--;
+ }
+ }
+ else if (BusNumber == 1)
+ {
+ /* Loop the buffer up to 0xFFFF */
+ while ((Len > 0) && (Address < 0x10000))
+ {
+ /* Write the data */
+ *Ptr = HalpReadCmos((UCHAR)Address);
+
+ /* Update position and length */
+ Ptr++;
+ Address++;
+ Len--;
+ }
+ }
+
+ /* FIXME: Release the CMOS Lock */
+
+ /* Return length read */
+ return Length - Len;
+}
+
+ULONG
+NTAPI
+HalpSetCmosData(IN ULONG BusNumber,
+ IN ULONG SlotNumber,
+ IN PVOID Buffer,
+ IN ULONG Length)
+{
+ PUCHAR Ptr = (PUCHAR)Buffer;
+ ULONG Address = SlotNumber;
+ ULONG Len = Length;
+
+ /* FIXME: Acquire CMOS Lock */
+
+ /* Do nothing if we don't have a length */
+ if (!Length) return 0;
+
+ /* Check if this is simple CMOS */
+ if (!BusNumber)
+ {
+ /* Loop the buffer up to 0xFF */
+ while ((Len > 0) && (Address < 0x100))
+ {
+ /* Write the data */
+ HalpWriteCmos((UCHAR)Address, *Ptr);
+
+ /* Update position and length */
+ Ptr++;
+ Address++;
+ Len--;
+ }
+ }
+ else if (BusNumber == 1)
+ {
+ /* Loop the buffer up to 0xFFFF */
+ while ((Len > 0) && (Address < 0x10000))
+ {
+ /* Write the data */
+ HalpWriteCmos((UCHAR)Address, *Ptr);
+
+ /* Update position and length */
+ Ptr++;
+ Address++;
+ Len--;
+ }
+ }
+
+ /* FIXME: Release the CMOS Lock */
+
+ /* Return length read */
+ return Length - Len;
+}
+
+/* PUBLIC FUNCTIONS **********************************************************/
+
+/*
+ * @implemented
+ */
+ARC_STATUS
+NTAPI
+HalGetEnvironmentVariable(IN PCH Name,
+ IN USHORT ValueLength,
+ IN PCH Value)
+{
+ UCHAR Val;
+
+ /* Only variable supported on x86 */
+ if (_stricmp(Name, "LastKnownGood")) return ENOENT;
+
+ /* FIXME: Acquire CMOS Lock */
+
+ /* Query the current value */
+ Val = HalpReadCmos(RTC_REGISTER_B) & 0x01;
+
+ /* FIXME: Release CMOS lock */
+
+ /* Check the flag */
+ if (Val)
+ {
+ /* Return false */
+ strncpy(Value, "FALSE", ValueLength);
+ }
+ else
+ {
+ /* Return true */
+ strncpy(Value, "TRUE", ValueLength);
+ }
+
+ /* Return success */
+ return ESUCCESS;
+}
+
+/*
+ * @implemented
+ */
+ARC_STATUS
+NTAPI
+HalSetEnvironmentVariable(IN PCH Name,
+ IN PCH Value)
+{
+ UCHAR Val;
+
+ /* Only variable supported on x86 */
+ if (_stricmp(Name, "LastKnownGood")) return ENOMEM;
+
+ /* Check if this is true or false */
+ if (!_stricmp(Value, "TRUE"))
+ {
+ /* It's true, acquire CMOS lock (FIXME) */
+
+ /* Read the current value and add the flag */
+ Val = HalpReadCmos(RTC_REGISTER_B) | 1;
+ }
+ else if (!_stricmp(Value, "FALSE"))
+ {
+ /* It's false, acquire CMOS lock (FIXME) */
+
+ /* Read the current value and mask out the flag */
+ Val = HalpReadCmos(RTC_REGISTER_B) & ~1;
+ }
+ else
+ {
+ /* Fail */
+ return ENOMEM;
+ }
+
+ /* Write new value */
+ HalpWriteCmos(RTC_REGISTER_B, Val);
+
+ /* Release the lock and return success */
+ return ESUCCESS;
+}
+
+/*
+ * @implemented
+ */
+BOOLEAN
+NTAPI
+HalQueryRealTimeClock(OUT PTIME_FIELDS Time)
+{
+ /* FIXME: Acquire CMOS Lock */
+
+ /* Loop while update is in progress */
+ while ((HalpReadCmos(RTC_REGISTER_A)) & RTC_REG_A_UIP);
+
+ /* Set the time data */
+ Time->Second = BCD_INT(HalpReadCmos(0));
+ Time->Minute = BCD_INT(HalpReadCmos(2));
+ Time->Hour = BCD_INT(HalpReadCmos(4));
+ Time->Weekday = BCD_INT(HalpReadCmos(6));
+ Time->Day = BCD_INT(HalpReadCmos(7));
+ Time->Month = BCD_INT(HalpReadCmos(8));
+ Time->Year = BCD_INT(HalpReadCmos(9));
+ Time->Milliseconds = 0;
+
+ /* FIXME: Check century byte */
+
+ /* Compensate for the century field */
+ Time->Year += (Time->Year > 80) ? 1900: 2000;
+
+ /* FIXME: Release CMOS Lock */
+
+ /* Always return TRUE */
+ return TRUE;
+}
+
+/*
+ * @implemented
+ */
+BOOLEAN
+NTAPI
+HalSetRealTimeClock(IN PTIME_FIELDS Time)
+{
+ /* FIXME: Acquire CMOS Lock */
+
+ /* Loop while update is in progress */
+ while ((HalpReadCmos(RTC_REGISTER_A)) & RTC_REG_A_UIP);
+
+ /* Write time fields to CMOS RTC */
+ HalpWriteCmos(0, INT_BCD(Time->Second));
+ HalpWriteCmos(2, INT_BCD(Time->Minute));
+ HalpWriteCmos(4, INT_BCD(Time->Hour));
+ HalpWriteCmos(6, INT_BCD(Time->Weekday));
+ HalpWriteCmos(7, INT_BCD(Time->Day));
+ HalpWriteCmos(8, INT_BCD(Time->Month));
+ HalpWriteCmos(9, INT_BCD(Time->Year % 100));
+
+ /* FIXME: Set the century byte */
+
+ /* FIXME: Release the CMOS Lock */
+
+ /* Always return TRUE */
+ return TRUE;
+}
+
+/* EOF */
Propchange: branches/arty-newcc/hal/halx86/generic/cmos.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/arty-newcc/hal/halx86/generic/cmos.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/generic/display.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/generic/dma.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/generic/dma.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/generic/dma.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/generic/dma.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -164,7 +164,7 @@
* by the passed DMA adapter.
*/
-PHYSICAL_ADDRESS STDCALL
+PHYSICAL_ADDRESS NTAPI
HalpGetAdapterMaximumPhysicalAddress(
IN PADAPTER_OBJECT AdapterObject)
{
@@ -200,7 +200,7 @@
* already allocated).
*/
-BOOLEAN STDCALL
+BOOLEAN NTAPI
HalpGrowMapBuffers(
IN PADAPTER_OBJECT AdapterObject,
IN ULONG SizeOfMapBuffers)
@@ -329,7 +329,7 @@
* @see HalpInitDma
*/
-PADAPTER_OBJECT STDCALL
+PADAPTER_OBJECT NTAPI
HalpDmaAllocateMasterAdapter(VOID)
{
PADAPTER_OBJECT MasterAdapter;
@@ -388,7 +388,7 @@
* @see HalGetAdapter
*/
-PADAPTER_OBJECT STDCALL
+PADAPTER_OBJECT NTAPI
HalpDmaAllocateChildAdapter(
ULONG NumberOfMapRegisters,
PDEVICE_DESCRIPTION DeviceDescription)
@@ -458,7 +458,7 @@
* Setup DMA modes and extended modes for (E)ISA DMA adapter object.
*/
-BOOLEAN STDCALL
+BOOLEAN NTAPI
HalpDmaInitializeEisaAdapter(
PADAPTER_OBJECT AdapterObject,
PDEVICE_DESCRIPTION DeviceDescription)
@@ -588,7 +588,7 @@
* @implemented
*/
-PADAPTER_OBJECT STDCALL
+PADAPTER_OBJECT NTAPI
HalGetAdapter(
PDEVICE_DESCRIPTION DeviceDescription,
PULONG NumberOfMapRegisters)
@@ -787,7 +787,7 @@
* @see HalGetAdapter
*/
-PDMA_ADAPTER STDCALL
+PDMA_ADAPTER NTAPI
HalpGetDmaAdapter(
IN PVOID Context,
IN PDEVICE_DESCRIPTION DeviceDescription,
@@ -805,7 +805,7 @@
* @see HalGetAdapter
*/
-VOID STDCALL
+VOID NTAPI
HalPutDmaAdapter(
PADAPTER_OBJECT AdapterObject)
{
@@ -846,7 +846,7 @@
* @implemented
*/
-PVOID STDCALL
+PVOID NTAPI
HalAllocateCommonBuffer(
PADAPTER_OBJECT AdapterObject,
ULONG Length,
@@ -895,7 +895,7 @@
* @implemented
*/
-VOID STDCALL
+VOID NTAPI
HalFreeCommonBuffer(
PADAPTER_OBJECT AdapterObject,
ULONG Length,
@@ -915,7 +915,7 @@
* @see HalGetAdapter
*/
-ULONG STDCALL
+ULONG NTAPI
HalpDmaGetDmaAlignment(
PADAPTER_OBJECT AdapterObject)
{
@@ -930,7 +930,7 @@
* @implemented
*/
-ULONG STDCALL
+ULONG NTAPI
HalReadDmaCounter(
PADAPTER_OBJECT AdapterObject)
{
@@ -1002,7 +1002,7 @@
* at PASSIVE_LEVEL in work item.
*/
-VOID STDCALL
+VOID NTAPI
HalpGrowMapBufferWorker(PVOID DeferredContext)
{
PGROW_WORK_ITEM WorkItem = (PGROW_WORK_ITEM)DeferredContext;
@@ -1064,7 +1064,7 @@
* @implemented
*/
-NTSTATUS STDCALL
+NTSTATUS NTAPI
HalAllocateAdapterChannel(
PADAPTER_OBJECT AdapterObject,
PWAIT_CONTEXT_BLOCK WaitContextBlock,
@@ -1073,7 +1073,7 @@
{
PADAPTER_OBJECT MasterAdapter;
PGROW_WORK_ITEM WorkItem;
- ULONG Index = ~0;
+ ULONG Index = ~0U;
ULONG Result;
KIRQL OldIrql;
@@ -1129,7 +1129,7 @@
{
Index = RtlFindClearBitsAndSet(
MasterAdapter->MapRegisters, NumberOfMapRegisters, 0);
- if (Index != ~0)
+ if (Index != ~0U)
{
AdapterObject->MapRegisterBase =
MasterAdapter->MapRegisterBase + Index;
@@ -1143,7 +1143,7 @@
}
}
- if (Index == ~0)
+ if (Index == ~0U)
{
WorkItem = ExAllocatePoolWithTag(
NonPagedPool, sizeof(GROW_WORK_ITEM), TAG_DMA);
@@ -1235,7 +1235,7 @@
* @implemented
*/
-VOID STDCALL
+VOID NTAPI
IoFreeAdapterChannel(
PADAPTER_OBJECT AdapterObject)
{
@@ -1287,7 +1287,7 @@
Index = RtlFindClearBitsAndSet(
MasterAdapter->MapRegisters,
WaitContextBlock->NumberOfMapRegisters, 0);
- if (Index != ~0)
+ if (Index != ~0U)
{
AdapterObject->MapRegisterBase =
MasterAdapter->MapRegisterBase + Index;
@@ -1301,7 +1301,7 @@
}
}
- if (Index == ~0)
+ if (Index == ~0U)
{
InsertTailList(&MasterAdapter->AdapterQueue, &AdapterObject->AdapterQueue);
KfReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql);
@@ -1359,7 +1359,7 @@
* @implemented
*/
-VOID STDCALL
+VOID NTAPI
IoFreeMapRegisters(
IN PADAPTER_OBJECT AdapterObject,
IN PVOID MapRegisterBase,
@@ -1404,7 +1404,7 @@
MasterAdapter->MapRegisters,
AdapterObject->NumberOfMapRegisters,
MasterAdapter->NumberOfMapRegisters);
- if (Index == ~0)
+ if (Index == ~0U)
{
InsertHeadList(&MasterAdapter->AdapterQueue, ListEntry);
break;
@@ -1465,7 +1465,7 @@
* @see IoFlushAdapterBuffers, IoMapTransfer
*/
-VOID STDCALL
+VOID NTAPI
HalpCopyBufferMap(
PMDL Mdl,
PROS_MAP_REGISTER_ENTRY MapRegisterBase,
@@ -1487,7 +1487,7 @@
*/
/* FIXME: The correct bug check code isn't defined. */
/* KEBUGCHECKEX(HAL_MEMORY_ALLOCATION, PAGE_SIZE, 0, (ULONG_PTR)__FILE__, 0); */
- ASSERT(FALSE);;
+ ASSERT(FALSE);
}
CurrentAddress = (ULONG_PTR)VirtualAddress +
@@ -1554,7 +1554,7 @@
* @unimplemented.
*/
-BOOLEAN STDCALL
+BOOLEAN NTAPI
IoFlushAdapterBuffers(
PADAPTER_OBJECT AdapterObject,
PMDL Mdl,
@@ -1569,9 +1569,11 @@
PHYSICAL_ADDRESS PhysicalAddress;
PPFN_NUMBER MdlPagesPtr;
+ /* Sanity checks */
ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL);
-
- if (AdapterObject != NULL && !AdapterObject->MasterDevice)
+ ASSERT(AdapterObject);
+
+ if (!AdapterObject->MasterDevice)
{
/* Mask out (disable) the DMA channel. */
if (AdapterObject->AdapterNumber == 1)
@@ -1600,12 +1602,12 @@
{
if ((ULONG_PTR)MapRegisterBase & MAP_BASE_SW_SG)
{
- if (RealMapRegisterBase->Counter != ~0)
+ if (RealMapRegisterBase->Counter != ~0U)
{
if (SlaveDma && !AdapterObject->IgnoreCount)
Length -= HalReadDmaCounter(AdapterObject);
+ }
HalpCopyBufferMap(Mdl, RealMapRegisterBase, CurrentVa, Length, FALSE);
- }
}
else
{
@@ -1661,7 +1663,7 @@
* @implemented
*/
-PHYSICAL_ADDRESS STDCALL
+PHYSICAL_ADDRESS NTAPI
IoMapTransfer(
IN PADAPTER_OBJECT AdapterObject,
IN PMDL Mdl,
@@ -1982,13 +1984,12 @@
}
/* Try to find free map registers */
- MapRegisterNumber = -1;
MapRegisterNumber = RtlFindClearBitsAndSet(MasterAdapter->MapRegisters,
*NumberOfMapRegisters,
0);
/* Check if nothing was found */
- if (MapRegisterNumber == -1)
+ if (MapRegisterNumber == -1U)
{
/* No free registers found, so use the base registers */
RtlSetBits(MasterAdapter->MapRegisters,
Propchange: branches/arty-newcc/hal/halx86/generic/dma.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/generic/drive.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/generic/generic.rbuild
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/generic/halinit.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/generic/irq.S
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/generic/irq.S?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/generic/irq.S [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/generic/irq.S [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -81,8 +81,8 @@
#if DBG
.rept 172
.long InvalidIRQ /* IRQ 36-207 */
-#endif
.endr
+#endif
SoftIntByteTable:
.byte PASSIVE_LEVEL /* IRR 0 */
Propchange: branches/arty-newcc/hal/halx86/generic/misc.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/generic/pci.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/generic/pci.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/generic/pci.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/generic/pci.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -81,10 +81,10 @@
HalpWritePCIConfig,
NULL,
NULL,
- {{{0}}},
+ {{{0, 0, 0}}},
{0, 0, 0, 0}
},
- {{0}},
+ {{0, 0}},
32,
};
@@ -520,7 +520,7 @@
return STATUS_NOT_IMPLEMENTED;
}
-static ULONG STDCALL
+static ULONG NTAPI
PciSize(ULONG Base, ULONG Mask)
{
ULONG Size = Mask & Base; /* Find the significant bits */
Propchange: branches/arty-newcc/hal/halx86/generic/pci.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/generic/portio.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/generic/processor.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/generic/processor.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/generic/processor.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/generic/processor.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -78,9 +78,9 @@
*/
VOID
NTAPI
-HalRequestIpi(ULONG Reserved)
+HalRequestIpi(KAFFINITY TargetProcessors)
{
- /* Not implemented on NT */
+ /* Not implemented on UP */
__debugbreak();
}
Propchange: branches/arty-newcc/hal/halx86/generic/processor.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/generic/profil.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/generic/profil.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/generic/profil.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/generic/profil.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -1,48 +1,48 @@
-/*
- * PROJECT: ReactOS HAL
- * LICENSE: GPL - See COPYING in the top level directory
- * FILE: hal/halx86/generic/profil.c
- * PURPOSE: System Profiling
- * PROGRAMMERS: Alex Ionescu (alex.ionescu at reactos.org)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <hal.h>
-#define NDEBUG
-#include <debug.h>
-
-/* FUNCTIONS *****************************************************************/
-
-/*
- * @unimplemented
- */
-VOID
-NTAPI
-HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource)
-{
- ASSERT(FALSE);
- return;
-}
-
-/*
- * @unimplemented
- */
-VOID
-NTAPI
-HalStartProfileInterrupt(IN KPROFILE_SOURCE ProfileSource)
-{
- ASSERT(FALSE);
- return;
-}
-
-/*
- * @unimplemented
- */
-ULONG_PTR
-NTAPI
-HalSetProfileInterval(IN ULONG_PTR Interval)
-{
- ASSERT(FALSE);
- return Interval;
-}
+/*
+ * PROJECT: ReactOS HAL
+ * LICENSE: GPL - See COPYING in the top level directory
+ * FILE: hal/halx86/generic/profil.c
+ * PURPOSE: System Profiling
+ * PROGRAMMERS: Alex Ionescu (alex.ionescu at reactos.org)
+ */
+
+/* INCLUDES ******************************************************************/
+
+#include <hal.h>
+#define NDEBUG
+#include <debug.h>
+
+/* FUNCTIONS *****************************************************************/
+
+/*
+ * @unimplemented
+ */
+VOID
+NTAPI
+HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource)
+{
+ ASSERT(FALSE);
+ return;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+NTAPI
+HalStartProfileInterrupt(IN KPROFILE_SOURCE ProfileSource)
+{
+ ASSERT(FALSE);
+ return;
+}
+
+/*
+ * @unimplemented
+ */
+ULONG_PTR
+NTAPI
+HalSetProfileInterval(IN ULONG_PTR Interval)
+{
+ ASSERT(FALSE);
+ return Interval;
+}
Propchange: branches/arty-newcc/hal/halx86/generic/profil.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/arty-newcc/hal/halx86/generic/profil.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/generic/reboot.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/generic/reboot.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/generic/reboot.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/generic/reboot.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -29,7 +29,7 @@
{
UCHAR Data;
PVOID HalpZeroPageMapping;
- PHYSICAL_ADDRESS Null = {{0}};
+ PHYSICAL_ADDRESS Null = {{0, 0}};
/* Enable warm reboot */
HalpZeroPageMapping = MmMapIoSpace(Null, PAGE_SIZE, MmNonCached);
Propchange: branches/arty-newcc/hal/halx86/generic/reboot.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/generic/spinlock.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/generic/sysinfo.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/generic/sysinfo.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/generic/sysinfo.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/generic/sysinfo.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -12,12 +12,7 @@
#define NDEBUG
#include <debug.h>
-#ifdef __GNUC__
-static PUCHAR realKdComPortInUse = 0;
-PUCHAR *_KdComPortInUse = &realKdComPortInUse;
-#else
-PUCHAR _KdComPortInUse = 0;
-#endif
+PUCHAR KdComPortInUse;
/* FUNCTIONS *****************************************************************/
@@ -40,20 +35,10 @@
REPORT_THIS_CASE(HalMapRegisterInformation);
REPORT_THIS_CASE(HalMcaLogInformation);
case HalFrameBufferCachingInformation:
- if (BufferSize >= 1)
{
- // The only caller that has been seen calling this function told
- // us it expected a single byte back. We therefore guess it expects
- // a BOOLEAN, and we dream up the value TRUE to (we think) tell it
- // "Sure, the framebuffer is cached".
- BOOLEAN ToReturn = TRUE;
- DPRINT("%s: caller expects %u bytes (should be 1)\n", "HalFrameBufferCachingInformation", BufferSize);
- ASSERT(sizeof(BOOLEAN) == 1);
- *ReturnedLength = sizeof(BOOLEAN);
- RtlCopyMemory(Buffer, &ToReturn, sizeof(BOOLEAN));
- return STATUS_SUCCESS;
+ /* FIXME: TODO */
+ return STATUS_NOT_IMPLEMENTED;
}
- break;
REPORT_THIS_CASE(HalDisplayBiosInformation);
REPORT_THIS_CASE(HalProcessorFeatureInformation);
REPORT_THIS_CASE(HalNumaTopologyInterface);
Propchange: branches/arty-newcc/hal/halx86/generic/sysinfo.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/generic/timer.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/hal_generic.rbuild
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/hal_generic_pc.rbuild
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/hal_generic_up.rbuild
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/halmp.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/halmp.rbuild?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/halmp.rbuild [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/halmp.rbuild [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -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.spec.def" />
+ <importlibrary base="hal" definition="hal.pspec" />
<bootstrap installbase="$(CDOUTPUT)" />
<include>include</include>
<include base="ntoskrnl">include</include>
Propchange: branches/arty-newcc/hal/halx86/halmp.rbuild
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/halup.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/halup.rbuild?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/halup.rbuild [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/halup.rbuild [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -2,7 +2,7 @@
<!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.spec.def" />
+ <importlibrary base="hal" definition="hal.pspec" />
<bootstrap installbase="$(CDOUTPUT)" />
<include>include</include>
<include base="ntoskrnl">include</include>
Propchange: branches/arty-newcc/hal/halx86/halup.rbuild
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/halxbox.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/halxbox.rbuild?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/halxbox.rbuild [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/halxbox.rbuild [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -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" allowwarnings="true">
- <importlibrary base="hal" definition="hal.spec.def" />
+ <module name="halxbox" type="kernelmodedll" entrypoint="0">
+ <importlibrary base="hal" definition="hal.pspec" />
<include>include</include>
<include base="ntoskrnl">include</include>
<define name="_DISABLE_TIDENTS" />
Propchange: branches/arty-newcc/hal/halx86/halxbox.rbuild
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/include/apic.h
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/include/apic.h?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/include/apic.h [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/include/apic.h [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -93,10 +93,10 @@
#define APIC_LVT_VECTOR (0xFF << 0) /* Vector */
#define APIC_LVT_DS (0x1 << 12) /* Delivery Status */
-#define APIC_LVT_REMOTE_IRR (0x1 << 14) /* Remote IRR */
-#define APIC_LVT_LEVEL_TRIGGER (0x1 << 15) /* Lvel Triggered */
-#define APIC_LVT_MASKED (0x1 << 16) /* Mask */
-#define APIC_LVT_PERIODIC (0x1 << 17) /* Timer Mode */
+#define APIC_LVT_REMOTE_IRR (0x1 << 14) /* Remote IRR */
+#define APIC_LVT_LEVEL_TRIGGER (0x1 << 15) /* Lvel Triggered */
+#define APIC_LVT_MASKED (0x1 << 16) /* Mask */
+#define APIC_LVT_PERIODIC (0x1 << 17) /* Timer Mode */
#define APIC_LVT3_DM (0x7 << 8)
#define APIC_LVT3_IIPP (0x1 << 13)
@@ -117,10 +117,10 @@
#define APIC_LVT_VECTOR (0xFF << 0) /* Vector */
#define APIC_LVT_DS (0x1 << 12) /* Delivery Status */
-#define APIC_LVT_REMOTE_IRR (0x1 << 14) /* Remote IRR */
-#define APIC_LVT_LEVEL_TRIGGER (0x1 << 15) /* Lvel Triggered */
-#define APIC_LVT_MASKED (0x1 << 16) /* Mask */
-#define APIC_LVT_PERIODIC (0x1 << 17) /* Timer Mode */
+#define APIC_LVT_REMOTE_IRR (0x1 << 14) /* Remote IRR */
+#define APIC_LVT_LEVEL_TRIGGER (0x1 << 15) /* Lvel Triggered */
+#define APIC_LVT_MASKED (0x1 << 16) /* Mask */
+#define APIC_LVT_PERIODIC (0x1 << 17) /* Timer Mode */
#define APIC_LVT3_DM (0x7 << 8)
#define APIC_LVT3_IIPP (0x1 << 13)
@@ -185,30 +185,92 @@
} CPU_INFO, *PCPU_INFO;
extern ULONG CPUCount; /* Total number of CPUs */
-extern ULONG BootCPU; /* Bootstrap processor */
+extern ULONG BootCPU; /* Bootstrap processor */
extern ULONG OnlineCPUs; /* Bitmask of online CPUs */
extern CPU_INFO CPUMap[MAX_CPU]; /* Map of all CPUs in the system */
+extern PULONG APICBase; /* Virtual address of local APIC */
+extern ULONG lastregr[MAX_CPU]; /* For debugging */
+extern ULONG lastvalr[MAX_CPU];
+extern ULONG lastregw[MAX_CPU];
+extern ULONG lastvalw[MAX_CPU];
/* Prototypes */
-
-__inline VOID APICWrite(ULONG Offset, ULONG Value);
-__inline ULONG APICRead(ULONG Offset);
VOID APICSendIPI(ULONG Target, ULONG Mode);
VOID APICSetup(VOID);
VOID HaliInitBSP(VOID);
VOID APICSyncArbIDs(VOID);
-__inline VOID APICSendEOI(VOID);
VOID APICCalibrateTimer(ULONG CPU);
VOID HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack);
+static __inline ULONG _APICRead(ULONG Offset)
+{
+ PULONG p;
+
+ p = (PULONG)((ULONG)APICBase + Offset);
+ return *p;
+}
+
+#if 0
+static __inline VOID APICWrite(ULONG Offset,
+ ULONG Value)
+{
+ PULONG p;
+
+ p = (PULONG)((ULONG)APICBase + Offset);
+
+ *p = Value;
+}
+#else
+static __inline VOID APICWrite(ULONG Offset,
+ ULONG Value)
+{
+ PULONG p;
+ ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24;
+
+ lastregw[CPU] = Offset;
+ lastvalw[CPU] = Value;
+
+ p = (PULONG)((ULONG)APICBase + Offset);
+
+ *p = Value;
+}
+#endif
+
+#if 0
+static __inline ULONG APICRead(ULONG Offset)
+{
+ PULONG p;
+
+ p = (PULONG)((ULONG)APICBase + Offset);
+ return *p;
+}
+#else
+static __inline ULONG APICRead(ULONG Offset)
+{
+ PULONG p;
+ ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24;
+
+ lastregr[CPU] = Offset;
+ lastvalr[CPU] = 0;
+
+ p = (PULONG)((ULONG)APICBase + Offset);
+
+ lastvalr[CPU] = *p;
+ return lastvalr[CPU];
+}
+#endif
+
static __inline ULONG ThisCPU(VOID)
{
return (APICRead(APIC_ID) & APIC_ID_MASK) >> 24;
}
-
-#endif
-
+static __inline VOID APICSendEOI(VOID)
+{
+ // Send the EOI
+ APICWrite(APIC_EOI, 0);
+}
+
+#endif /* __INTERNAL_HAL_APIC_H */
/* EOF */
-
Propchange: branches/arty-newcc/hal/halx86/include/apic.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/include/bus.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/include/hal.h
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/include/hal.h?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/include/hal.h [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/include/hal.h [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -46,7 +46,4 @@
#include "mps.h"
#include "ioapic.h"
-/* Helper Header */
-#include <reactos/helper.h>
-
/* EOF */
Propchange: branches/arty-newcc/hal/halx86/include/hal.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/include/haldma.h
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/include/haldma.h?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/include/haldma.h [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/include/haldma.h [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -367,16 +367,16 @@
#define MAP_BASE_SW_SG 1
-PADAPTER_OBJECT STDCALL
+PADAPTER_OBJECT NTAPI
HalpDmaAllocateMasterAdapter(VOID);
-PDMA_ADAPTER STDCALL
+PDMA_ADAPTER NTAPI
HalpGetDmaAdapter(
IN PVOID Context,
IN PDEVICE_DESCRIPTION DeviceDescription,
OUT PULONG NumberOfMapRegisters);
-ULONG STDCALL
+ULONG NTAPI
HalpDmaGetDmaAlignment(
PADAPTER_OBJECT AdapterObject);
Propchange: branches/arty-newcc/hal/halx86/include/haldma.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/include/halirq.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/include/halp.h
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/include/halp.h?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/include/halp.h [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/include/halp.h [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -30,7 +30,7 @@
(UCHAR)(((int / 10) << 4) + (int % 10))
/* adapter.c */
-PADAPTER_OBJECT STDCALL HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN IsMaster, BOOLEAN Dma32BitAddresses);
+PADAPTER_OBJECT NTAPI HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN IsMaster, BOOLEAN Dma32BitAddresses);
/* bus.c */
VOID NTAPI HalpInitNonBusHandler (VOID);
Propchange: branches/arty-newcc/hal/halx86/include/halp.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/include/ioapic.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/include/mps.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/mp/apic.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/mp/apic.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/mp/apic.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/mp/apic.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -223,72 +223,6 @@
APICWrite(APIC_SIVR, tmp);
}
-
-__inline ULONG _APICRead(ULONG Offset)
-{
- PULONG p;
-
- p = (PULONG)((ULONG)APICBase + Offset);
- return *p;
-}
-
-#if 0
-__inline VOID APICWrite(ULONG Offset,
- ULONG Value)
-{
- PULONG p;
-
- p = (PULONG)((ULONG)APICBase + Offset);
-
- *p = Value;
-}
-#else
-__inline VOID APICWrite(ULONG Offset,
- ULONG Value)
-{
- PULONG p;
- ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24;
-
- lastregw[CPU] = Offset;
- lastvalw[CPU] = Value;
-
- p = (PULONG)((ULONG)APICBase + Offset);
-
- *p = Value;
-}
-#endif
-
-
-#if 0
-__inline ULONG APICRead(ULONG Offset)
-{
- PULONG p;
-
- p = (PULONG)((ULONG)APICBase + Offset);
- return *p;
-}
-#else
-__inline ULONG APICRead(ULONG Offset)
-{
- PULONG p;
- ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24;
-
- lastregr[CPU] = Offset;
- lastvalr[CPU] = 0;
-
- p = (PULONG)((ULONG)APICBase + Offset);
-
- lastvalr[CPU] = *p;
- return lastvalr[CPU];
-}
-#endif
-
-__inline VOID APICSendEOI(VOID)
-{
- // Send the EOI
- APICWrite(APIC_EOI, 0);
-}
-
static VOID APICDumpBit(ULONG base)
{
ULONG v, i, j;
@@ -316,8 +250,7 @@
{
ULONG v, ver, maxlvt;
ULONG r1, r2, w1, w2;
- ULONG CPU = ThisCPU();;
-
+ ULONG CPU = ThisCPU();
r1 = lastregr[CPU];
@@ -837,12 +770,12 @@
tmp = GET_APIC_VERSION(APICRead(APIC_VER));
if (!APIC_INTEGRATED(tmp))
{
- tmp = SET_APIC_TIMER_BASE(APIC_TIMER_BASE_DIV) | APIC_LVT_PERIODIC | LOCAL_TIMER_VECTOR;;
+ tmp = SET_APIC_TIMER_BASE(APIC_TIMER_BASE_DIV) | APIC_LVT_PERIODIC | LOCAL_TIMER_VECTOR;
}
else
{
/* Periodic timer */
- tmp = APIC_LVT_PERIODIC | LOCAL_TIMER_VECTOR;;
+ tmp = APIC_LVT_PERIODIC | LOCAL_TIMER_VECTOR;
}
APICWrite(APIC_LVTT, tmp);
Propchange: branches/arty-newcc/hal/halx86/mp/apic.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/mp/halinit_mp.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/mp/halmp.rc
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/mp/ioapic.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/mp/ipi_mp.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/mp/ipi_mp.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/mp/ipi_mp.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/mp/ipi_mp.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -15,11 +15,12 @@
/* FUNCTIONS ****************************************************************/
-VOID STDCALL
-HalRequestIpi(ULONG ProcessorNo)
+VOID NTAPI
+HalRequestIpi(KAFFINITY TargetProcessors)
{
- DPRINT("HalRequestIpi(ProcessorNo %d)\n", ProcessorNo);
- APICSendIPI(1 << ProcessorNo,
+ /* FIXME: SMP HAL is...very broken */
+ DPRINT("HalRequestIpi(TargetProcessors %d)\n", TargetProcessors);
+ APICSendIPI(1 << TargetProcessors,
IPI_VECTOR|APIC_ICR0_LEVEL_DEASSERT|APIC_ICR0_DESTM);
}
Propchange: branches/arty-newcc/hal/halx86/mp/ipi_mp.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/mp/mpconfig.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/mp/mpsirql.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/mp/mpsirql.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/mp/mpsirql.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/mp/mpsirql.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -21,7 +21,7 @@
/* FUNCTIONS ****************************************************************/
#undef KeGetCurrentIrql
-KIRQL STDCALL KeGetCurrentIrql (VOID)
+KIRQL NTAPI KeGetCurrentIrql (VOID)
/*
* PURPOSE: Returns the current irq level
* RETURNS: The current irq level
@@ -160,7 +160,7 @@
* NOTES
*/
#undef KeLowerIrql
-VOID STDCALL
+VOID NTAPI
KeLowerIrql (KIRQL NewIrql)
{
KfLowerIrql (NewIrql);
@@ -234,7 +234,7 @@
* Calls KfRaiseIrql
*/
#undef KeRaiseIrql
-VOID STDCALL
+VOID NTAPI
KeRaiseIrql (KIRQL NewIrql,
PKIRQL OldIrql)
{
@@ -259,7 +259,7 @@
* Calls KfRaiseIrql
*/
-KIRQL STDCALL
+KIRQL NTAPI
KeRaiseIrqlToDpcLevel (VOID)
{
return KfRaiseIrql (DISPATCH_LEVEL);
@@ -283,14 +283,14 @@
* Calls KfRaiseIrql
*/
-KIRQL STDCALL
+KIRQL NTAPI
KeRaiseIrqlToSynchLevel (VOID)
{
return KfRaiseIrql (CLOCK2_LEVEL);
}
-BOOLEAN STDCALL
+BOOLEAN NTAPI
HalBeginSystemInterrupt (KIRQL Irql,
ULONG Vector,
PKIRQL OldIrql)
@@ -317,7 +317,7 @@
}
-VOID STDCALL
+VOID NTAPI
HalEndSystemInterrupt (KIRQL Irql,
ULONG Unknown2)
/*
@@ -336,7 +336,7 @@
HalpLowerIrql (Irql, TRUE);
}
-BOOLEAN STDCALL
+BOOLEAN NTAPI
HalDisableSystemInterrupt (ULONG Vector,
KIRQL Irql)
{
@@ -358,7 +358,7 @@
}
-BOOLEAN STDCALL
+BOOLEAN NTAPI
HalEnableSystemInterrupt (ULONG Vector,
KIRQL Irql,
KINTERRUPT_MODE InterruptMode)
Propchange: branches/arty-newcc/hal/halx86/mp/mpsirql.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/mp/processor_mp.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/mp/processor_mp.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/mp/processor_mp.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/mp/processor_mp.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -20,7 +20,7 @@
/* FUNCTIONS *****************************************************************/
-VOID STDCALL
+VOID NTAPI
HalInitializeProcessor(ULONG ProcessorNumber,
PLOADER_PARAMETER_BLOCK LoaderBlock)
{
@@ -55,7 +55,7 @@
//HalpCalibrateStallExecution();
}
-BOOLEAN STDCALL
+BOOLEAN NTAPI
HalAllProcessorsStarted (VOID)
{
ULONG CPUs = 0, i;
Propchange: branches/arty-newcc/hal/halx86/mp/processor_mp.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/mp/spinlock.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/mp/spinlock.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/mp/spinlock.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/mp/spinlock.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -26,7 +26,7 @@
/* FUNCTIONS ***************************************************************/
#undef KeAcquireSpinLock
-VOID STDCALL
+VOID NTAPI
KeAcquireSpinLock (
PKSPIN_LOCK SpinLock,
PKIRQL OldIrql
@@ -55,7 +55,7 @@
}
#undef KeReleaseSpinLock
-VOID STDCALL
+VOID NTAPI
KeReleaseSpinLock (
PKSPIN_LOCK SpinLock,
KIRQL NewIrql
Propchange: branches/arty-newcc/hal/halx86/mp/spinlock.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/up/halinit_up.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/up/halup.rc
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/xbox/halinit_xbox.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/xbox/halxbox.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/arty-newcc/hal/halx86/xbox/halxbox.rc
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: branches/arty-newcc/hal/halx86/xbox/part_xbox.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/xbox/part_xbox.c?rev=39808&r1=39807&r2=39808&view=diff
==============================================================================
--- branches/arty-newcc/hal/halx86/xbox/part_xbox.c [iso-8859-1] (original)
+++ branches/arty-newcc/hal/halx86/xbox/part_xbox.c [iso-8859-1] Sat Feb 28 10:56:24 2009
@@ -76,6 +76,7 @@
SectorOffset,
&Event,
&StatusBlock);
+ if (!Irp) return STATUS_INSUFFICIENT_RESOURCES;
Status = IoCallDriver(DeviceObject,
Irp);
Propchange: branches/arty-newcc/hal/halx86/xbox/part_xbox.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
More information about the Ros-diffs
mailing list