Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 23:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTVDM]: Partial revert to r67234: delays were in fact better than frequencies, in case one would like to define sub-frequency timers. Instead, always specify delays in nanoseconds, and add a macro to convert from frequency in hertz to duration in nanoseconds.

Browse source 
svn path=/trunk/; revision=67235
This commit is contained in:
Hermès Bélusca-Maïto 2015-04-18 00:29:14 +00:00
parent 6dc704ff48
commit b673932d12
7 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/subsystems/mvdm/ntvdm/clock.c
View file

@ -141,7 +141,7 @@ VOID ClockUpdate(VOID)
} }
} }
PHARDWARE_TIMER CreateHardwareTimer(ULONG Flags, ULONG Frequency, PHARDWARE_TIMER_PROC Callback) PHARDWARE_TIMER CreateHardwareTimer(ULONG Flags, ULONGLONG Delay, PHARDWARE_TIMER_PROC Callback)
{ {
PHARDWARE_TIMER Timer; PHARDWARE_TIMER Timer;
@ -151,7 +151,7 @@ PHARDWARE_TIMER CreateHardwareTimer(ULONG Flags, ULONG Frequency, PHARDWARE_TIME
Timer->Flags = Flags & ~HARDWARE_TIMER_ENABLED; Timer->Flags = Flags & ~HARDWARE_TIMER_ENABLED;
Timer->EnableCount = 0; Timer->EnableCount = 0;
Timer->Callback = Callback; Timer->Callback = Callback;
SetHardwareTimerDelay(Timer, 1000000000ULL / (ULONGLONG)Frequency); SetHardwareTimerDelay(Timer, Delay);
if (Flags & HARDWARE_TIMER_ENABLED) EnableHardwareTimer(Timer); if (Flags & HARDWARE_TIMER_ENABLED) EnableHardwareTimer(Timer);
return Timer; return Timer;
@ -234,7 +234,7 @@ BOOLEAN ClockInitialize(VOID)
#ifdef IPS_DISPLAY #ifdef IPS_DISPLAY
IpsTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 1, IpsDisplayCallback); IpsTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, HZ_TO_NS(1), IpsDisplayCallback);
if (IpsTimer == NULL) if (IpsTimer == NULL)
{ {
wprintf(L"FATAL: Cannot create IPS display timer.\n"); wprintf(L"FATAL: Cannot create IPS display timer.\n");

5
reactos/subsystems/mvdm/ntvdm/clock.h
View file

@ -18,6 +18,9 @@
#define HARDWARE_TIMER_ONESHOT (1 << 1) #define HARDWARE_TIMER_ONESHOT (1 << 1)
#define HARDWARE_TIMER_PRECISE (1 << 2) #define HARDWARE_TIMER_PRECISE (1 << 2)
/* Converts a frequency in Hertz into a duration in nanoseconds */
#define HZ_TO_NS(Freq) (ULONGLONG)(1000000000ULL / (ULONGLONG)(Freq))
typedef VOID (FASTCALL *PHARDWARE_TIMER_PROC)(ULONGLONG ElapsedTime); typedef VOID (FASTCALL *PHARDWARE_TIMER_PROC)(ULONGLONG ElapsedTime);
typedef struct _HARDWARE_TIMER typedef struct _HARDWARE_TIMER
@ -35,7 +38,7 @@ typedef struct _HARDWARE_TIMER
PHARDWARE_TIMER CreateHardwareTimer PHARDWARE_TIMER CreateHardwareTimer
( (
ULONG Flags, ULONG Flags,
ULONG Frequency, // in Hz ULONGLONG Delay, /* nanoseconds */
PHARDWARE_TIMER_PROC Callback PHARDWARE_TIMER_PROC Callback
); );
VOID EnableHardwareTimer(PHARDWARE_TIMER Timer); VOID EnableHardwareTimer(PHARDWARE_TIMER Timer);

8
reactos/subsystems/mvdm/ntvdm/hardware/cmos.c
View file

@ -44,7 +44,7 @@ static VOID RtcUpdatePeriodicTimer(VOID)
/* 1 and 2 act like 8 and 9 */ /* 1 and 2 act like 8 and 9 */
if (RateSelect <= 2) RateSelect += 7; if (RateSelect <= 2) RateSelect += 7;
SetHardwareTimerDelay(PeriodicTimer, 1000000000ULL / (ULONGLONG)(1 << (16 - RateSelect))); SetHardwareTimerDelay(PeriodicTimer, HZ_TO_NS(1 << (16 - RateSelect)));
EnableHardwareTimer(PeriodicTimer); EnableHardwareTimer(PeriodicTimer);
} }
@ -501,9 +501,11 @@ VOID CmosInitialize(VOID)
RegisterIoPort(CMOS_ADDRESS_PORT, NULL , CmosWritePort); RegisterIoPort(CMOS_ADDRESS_PORT, NULL , CmosWritePort);
RegisterIoPort(CMOS_DATA_PORT , CmosReadPort, CmosWritePort); RegisterIoPort(CMOS_DATA_PORT , CmosReadPort, CmosWritePort);
ClockTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 1, RtcTimeUpdate); ClockTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED,
HZ_TO_NS(1),
RtcTimeUpdate);
PeriodicTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED | HARDWARE_TIMER_PRECISE, PeriodicTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED | HARDWARE_TIMER_PRECISE,
1000, HZ_TO_NS(1000),
RtcPeriodicTick); RtcPeriodicTick);
} }

4
reactos/subsystems/mvdm/ntvdm/hardware/mouse.c
View file

@ -454,7 +454,9 @@ BOOLEAN MouseInit(BYTE PS2Connector)
MouseMutex = CreateMutex(NULL, FALSE, NULL); MouseMutex = CreateMutex(NULL, FALSE, NULL);
if (MouseMutex == NULL) return FALSE; if (MouseMutex == NULL) return FALSE;
StreamTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 100, MouseStreamingCallback); StreamTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED,
HZ_TO_NS(100),
MouseStreamingCallback);
MouseReset(); MouseReset();
return TRUE; return TRUE;

2
reactos/subsystems/mvdm/ntvdm/hardware/pit.c
View file

@ -511,7 +511,7 @@ VOID PitInitialize(VOID)
/* Register the hardware timer */ /* Register the hardware timer */
MasterClock = CreateHardwareTimer(HARDWARE_TIMER_ENABLED | HARDWARE_TIMER_PRECISE, MasterClock = CreateHardwareTimer(HARDWARE_TIMER_ENABLED | HARDWARE_TIMER_PRECISE,
PIT_BASE_FREQUENCY, HZ_TO_NS(PIT_BASE_FREQUENCY),
PitClock); PitClock);
} }

4
reactos/subsystems/mvdm/ntvdm/hardware/ps2.c
View file

@ -405,7 +405,9 @@ BOOLEAN PS2Initialize(VOID)
RegisterIoPort(PS2_CONTROL_PORT, PS2ReadPort, PS2WritePort); RegisterIoPort(PS2_CONTROL_PORT, PS2ReadPort, PS2WritePort);
RegisterIoPort(PS2_DATA_PORT , PS2ReadPort, PS2WritePort); RegisterIoPort(PS2_DATA_PORT , PS2ReadPort, PS2WritePort);
IrqTimer = CreateHardwareTimer(HARDWARE_TIMER_ONESHOT, 100, GeneratePS2Irq); IrqTimer = CreateHardwareTimer(HARDWARE_TIMER_ONESHOT,
HZ_TO_NS(100),
GeneratePS2Irq);
return TRUE; return TRUE;
} }

4
reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c
View file

@ -2127,8 +2127,8 @@ BOOLEAN VgaInitialize(HANDLE TextHandle)
RegisterIoPort(0x3D8, VgaReadPort, VgaWritePort); // CGA_MODE_CTRL_REG RegisterIoPort(0x3D8, VgaReadPort, VgaWritePort); // CGA_MODE_CTRL_REG
RegisterIoPort(0x3D9, VgaReadPort, VgaWritePort); // CGA_PAL_CTRL_REG RegisterIoPort(0x3D9, VgaReadPort, VgaWritePort); // CGA_PAL_CTRL_REG
HSyncTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 31469, VgaHorizontalRetrace); HSyncTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, HZ_TO_NS(31469), VgaHorizontalRetrace);
VSyncTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 60, VgaVerticalRetrace); VSyncTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, HZ_TO_NS(60), VgaVerticalRetrace);
/* Return success */ /* Return success */
return TRUE; return TRUE;