Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Used the time stamp counter from a pentium if it is available

Browse source 
(in KeStallExecutionProcessor/KeQueryPerformanceCounter).

svn path=/trunk/; revision=11655
This commit is contained in:
Hartmut Birr 2004-11-14 19:01:31 +00:00
parent b39c7349f9
commit 35636e998d
2 changed files with 84 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/hal/halx86/include/hal.h
View file

@ -5,6 +5,8 @@
#ifndef __INTERNAL_HAL_HAL_H
#define __INTERNAL_HAL_HAL_H
#define HAL_APC_REQUEST 0
#define HAL_DPC_REQUEST 1
/* display.c */
VOID FASTCALL HalInitializeDisplay (PLOADER_PARAMETER_BLOCK LoaderBlock);
@ -86,6 +88,20 @@ HalQueryDisplayOwnership();
#define Ki386DisableInterrupts() __asm__ __volatile__("cli\n\t")
#define Ki386EnableInterrupts() __asm__ __volatile__("sti\n\t")
#define Ki386HaltProcessor() __asm__ __volatile__("hlt\n\t")
#define Ki386RdTSC(x) __asm__ __volatile__("rdtsc\n\t" : "=A" (x.u.LowPart), "=d" (x.u.HighPart));
static inline BYTE Ki386ReadFsByte(ULONG offset)
{
BYTE b;
__asm__ __volatile__("movb %%fs:(%1),%0":"=g" (b):"0" (offset));
return b;
}
static inline VOID Ki386WriteFsByte(ULONG offset, BYTE value)
{
__asm__ __volatile__("movb %0,%%fs:(%1)"::"r" (value), "r" (offset));
}
#elif defined(_MSC_VER)
#define Ki386SaveFlags(x) __asm pushfd __asm pop x;
#define Ki386RestoreFlags(x) __asm push x __asm popfd;

60
reactos/hal/halx86/timer.c
View file

@ -20,7 +20,7 @@
* MA 02139, USA.
*
*/
/* $Id: timer.c,v 1.6 2004/08/02 15:09:22 navaraf Exp $
/* $Id: timer.c,v 1.7 2004/11/14 19:01:31 hbirr Exp $
*
* PROJECT: ReactOS kernel
* FILE: ntoskrnl/hal/x86/udelay.c
@ -32,7 +32,9 @@
/* INCLUDES ***************************************************************/
#include <roscfg.h>
#include <ddk/ntddk.h>
#include <internal/ps.h>
#include <hal.h>
#define NDEBUG
@ -127,7 +129,23 @@ ROSL1:
VOID STDCALL KeStallExecutionProcessor(ULONG Microseconds)
{
__KeStallExecutionProcessor((delay_count*Microseconds)/1000);
PKPCR Pcr = KeGetCurrentKPCR();
if (Pcr->PrcbData.FeatureBits & X86_FEATURE_TSC)
{
LARGE_INTEGER EndCount, CurrentCount;
Ki386RdTSC(EndCount);
EndCount.QuadPart += Microseconds * (ULONGLONG)Pcr->PrcbData.MHz;
do
{
Ki386RdTSC(CurrentCount);
}
while (CurrentCount.QuadPart < EndCount.QuadPart);
}
else
{
__KeStallExecutionProcessor((Pcr->StallScaleFactor*Microseconds)/1000);
}
}
static ULONG Read8254Timer(VOID)
@ -178,6 +196,8 @@ VOID HalpCalibrateStallExecution(VOID)
ULONG i;
ULONG calib_bit;
ULONG CurCount;
PKPCR Pcr;
LARGE_INTEGER StartCount, EndCount;
if (UdelayCalibrated)
{
@ -185,14 +205,30 @@ VOID HalpCalibrateStallExecution(VOID)
}
UdelayCalibrated = TRUE;
DbgPrint("Calibrating delay loop... [");
Pcr = KeGetCurrentKPCR();
/* Initialise timer interrupt with MILLISEC ms interval */
WRITE_PORT_UCHAR((PUCHAR) TMR_CTRL, TMR_SC0 | TMR_BOTH | TMR_MD2); /* binary, mode 2, LSB/MSB, ch 0 */
WRITE_PORT_UCHAR((PUCHAR) TMR_CNT0, LATCH & 0xff); /* LSB */
WRITE_PORT_UCHAR((PUCHAR) TMR_CNT0, LATCH >> 8); /* MSB */
if (Pcr->PrcbData.FeatureBits & X86_FEATURE_TSC)
{
WaitFor8254Wraparound();
Ki386RdTSC(StartCount);
WaitFor8254Wraparound();
Ki386RdTSC(EndCount);
Pcr->PrcbData.MHz = (ULONG)(EndCount.QuadPart - StartCount.QuadPart) / 10000;
DPRINT("%dMHz\n", Pcr->PrcbData.MHz);
return;
}
DbgPrint("Calibrating delay loop... [");
/* Stage 1: Coarse calibration */
WaitFor8254Wraparound();
@ -284,10 +320,22 @@ KeQueryPerformanceCounter(PLARGE_INTEGER PerformanceFreq)
* performance counter ticks per second here
* RETURNS: The number of performance counter ticks since boot
*/
{
PKPCR Pcr = KeGetCurrentKPCR();
LARGE_INTEGER Value;
if (Pcr->PrcbData.FeatureBits & X86_FEATURE_TSC)
{
if (NULL != PerformanceFreq)
{
PerformanceFreq->QuadPart = Pcr->PrcbData.MHz * (ULONGLONG)1000000;
}
Ki386RdTSC(Value);
}
else
{
LARGE_INTEGER TicksOld;
LARGE_INTEGER TicksNew;
LARGE_INTEGER Value;
ULONG CountsLeft;
if (NULL != PerformanceFreq)
@ -303,7 +351,7 @@ KeQueryPerformanceCounter(PLARGE_INTEGER PerformanceFreq)
KeQueryTickCount(&TicksNew);
}
while (TicksOld.QuadPart != TicksNew.QuadPart);
}
return Value;
}