From f96e66ec8815c9dde9e3f97ad103829607ef6a6a Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Wed, 3 Sep 2008 00:52:40 +0000 Subject: [PATCH] update the hal/hal svn path=/branches/ros-amd64-bringup/; revision=35904 --- reactos/hal/hal/hal.c | 10 +++++++-- reactos/hal/hal/hal.rbuild | 3 +-- reactos/hal/hal/hal_amd64.def | 39 +++++++++++++++++++++++++---------- 3 files changed, 37 insertions(+), 15 deletions(-) diff --git a/reactos/hal/hal/hal.c b/reactos/hal/hal/hal.c index d3c3aa26920..37c772f3958 100644 --- a/reactos/hal/hal/hal.c +++ b/reactos/hal/hal/hal.c @@ -74,7 +74,8 @@ HalSetProfileInterval(IN ULONG_PTR Interval) KEBUGCHECK(0); return Interval; } -#if 0 + +#ifndef _M_AMD64 VOID FASTCALL ExAcquireFastMutex( @@ -784,6 +785,7 @@ KeFlushWriteBuffer(VOID) UNIMPLEMENTED; } +#ifndef _M_AMD64 #undef KeGetCurrentIrql KIRQL NTAPI @@ -802,6 +804,7 @@ KeLowerIrql( { UNIMPLEMENTED; } +#endif LARGE_INTEGER @@ -818,6 +821,7 @@ KeQueryPerformanceCounter( return Value; } +#if 0 #undef KeRaiseIrql VOID NTAPI @@ -847,6 +851,7 @@ KeRaiseIrqlToSynchLevel(VOID) return (KIRQL)0; } +#endif #undef KeReleaseSpinLock VOID @@ -891,7 +896,7 @@ KeTryToAcquireQueuedSpinLockRaiseToSynch( return FALSE; } - +#if !defined(_M_AMD64) KIRQL FASTCALL KfAcquireSpinLock( @@ -931,6 +936,7 @@ KfReleaseSpinLock( { UNIMPLEMENTED; } +#endif #if !defined(_M_AMD64) VOID diff --git a/reactos/hal/hal/hal.rbuild b/reactos/hal/hal/hal.rbuild index df21161f11b..8d7628a69b6 100644 --- a/reactos/hal/hal/hal.rbuild +++ b/reactos/hal/hal/hal.rbuild @@ -36,11 +36,10 @@ include - halamd64_generic ntoskrnl + hal.c hal.rc - hal.spec diff --git a/reactos/hal/hal/hal_amd64.def b/reactos/hal/hal/hal_amd64.def index 9a749c9e7cf..1d8fa785c0e 100644 --- a/reactos/hal/hal/hal_amd64.def +++ b/reactos/hal/hal/hal_amd64.def @@ -10,29 +10,43 @@ HalAllocateAdapterChannel HalAllocateCommonBuffer HalAllocateCrashDumpRegisters HalAssignSlotResources +;HalBugCheckSystem HalCalibratePerformanceCounter -;HalCallBios HalClearSoftwareInterrupt -HalDisableSystemInterrupt +;HalConvertDeviceIdtToIrql +;HalDisableInterrupt HalDisplayString -HalEnableSystemInterrupt +;HalEnableInterrupt +;HalEnumerateEnvironmentVariablesEx +;HalEnumerateProcessors HalFlushCommonBuffer HalFreeCommonBuffer HalGetAdapter HalGetBusData HalGetBusDataByOffset HalGetEnvironmentVariable +;HalGetEnvironmentVariableEx +;HalGetInterruptTargetInformation HalGetInterruptVector +;HalGetMessageRoutingInfo +;HalGetProcessorIdByNtNumber +;HalGetVectorInput ;HalHandleMcheck HalHandleNMI HalInitSystem +;HalInitializeBios +;HalInitializeOnResume HalInitializeProcessor ;HalIsHyperThreadingEnabled HalMakeBeep HalProcessorIdle HalQueryDisplayParameters +;HalQueryEnvironmentVariableInfoEx +;HalQueryMaximumProcessorCount HalQueryRealTimeClock HalReadDmaCounter +;HalRegisterDynamicProcessor +;HalRegisterErrataCallbacks HalReportResourceUsage HalRequestIpi HalRequestSoftwareInterrupt @@ -43,27 +57,30 @@ HalSetBusData HalSetBusDataByOffset HalSetDisplayParameters HalSetEnvironmentVariable +;HalSetEnvironmentVariableEx HalSetProfileInterval HalSetRealTimeClock HalSetTimeIncrement +;HalStartDynamicProcessor HalStartNextProcessor HalStartProfileInterrupt HalStopProfileInterrupt HalSystemVectorDispatchEntry HalTranslateBusAddress -;IoAssignDriveLetters +IoAssignDriveLetters IoFlushAdapterBuffers IoFreeAdapterChannel IoFreeMapRegisters IoMapTransfer -;IoReadPartitionTable -;IoSetPartitionInformation -;IoWritePartitionTable +IoReadPartitionTable +IoSetPartitionInformation +IoWritePartitionTable KdComPortInUse=_KdComPortInUse DATA KeFlushWriteBuffer KeQueryPerformanceCounter KeStallExecutionProcessor -;x86BiosExecuteInterrupt -;x86BiosInitializeBiosEx -;x86BiosTranslateAddress -;DllEntryPoint +;x86BiosAllocateBuffer +;x86BiosCall +;x86BiosFreeBuffer +;x86BiosReadMemory +;x86BiosWriteMemory