Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-06 06:20:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTVDM]

Browse source 
Fix the VGA refresh rate.
Serialize access to the PS/2 keyboard queue.


svn path=/branches/ntvdm/; revision=61214
This commit is contained in:
Aleksandar Andrejevic 2013-12-04 00:38:52 +00:00
parent a2bd742ecd
commit 73186a64bd
2 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subsystems/ntvdm/ntvdm.c
View file

@ -221,7 +221,7 @@ INT wmain(INT argc, WCHAR *argv[])
} }
/* Check for vertical retrace */ /* Check for vertical retrace */
if ((CurrentTickCount - LastVerticalRefresh) >= 16) if ((CurrentTickCount - LastVerticalRefresh) >= 15)
{ {
VgaRefreshDisplay(); VgaRefreshDisplay();
LastVerticalRefresh = CurrentTickCount; LastVerticalRefresh = CurrentTickCount;

31
subsystems/ntvdm/ps2.c
View file

@ -24,6 +24,7 @@ static UINT KeyboardQueueEnd = 0;
static BYTE KeyboardData = 0, KeyboardResponse = 0; static BYTE KeyboardData = 0, KeyboardResponse = 0;
static BOOLEAN KeyboardReadResponse = FALSE, KeyboardWriteResponse = FALSE; static BOOLEAN KeyboardReadResponse = FALSE, KeyboardWriteResponse = FALSE;
static BYTE KeyboardConfig = PS2_DEFAULT_CONFIG; static BYTE KeyboardConfig = PS2_DEFAULT_CONFIG;
static HANDLE QueueMutex = NULL;
static HANDLE InputThread = NULL; static HANDLE InputThread = NULL;
@ -31,10 +32,15 @@ static HANDLE InputThread = NULL;
static BOOLEAN KeyboardQueuePush(BYTE ScanCode) static BOOLEAN KeyboardQueuePush(BYTE ScanCode)
{ {
BOOLEAN Result = TRUE;
WaitForSingleObject(QueueMutex, INFINITE);
/* Check if the keyboard queue is full */ /* Check if the keyboard queue is full */
if (!KeyboardQueueEmpty && (KeyboardQueueStart == KeyboardQueueEnd)) if (!KeyboardQueueEmpty && (KeyboardQueueStart == KeyboardQueueEnd))
{ {
return FALSE; Result = FALSE;
goto Done;
} }
/* Insert the value in the queue */ /* Insert the value in the queue */
@ -45,13 +51,23 @@ static BOOLEAN KeyboardQueuePush(BYTE ScanCode)
/* Since we inserted a value, it's not empty anymore */ /* Since we inserted a value, it's not empty anymore */
KeyboardQueueEmpty = FALSE; KeyboardQueueEmpty = FALSE;
return TRUE; Done:
ReleaseMutex(QueueMutex);
return Result;
} }
static BOOLEAN KeyboardQueuePop(BYTE *ScanCode) static BOOLEAN KeyboardQueuePop(BYTE *ScanCode)
{ {
BOOLEAN Result = TRUE;
WaitForSingleObject(QueueMutex, INFINITE);
/* Make sure the keyboard queue is not empty */ /* Make sure the keyboard queue is not empty */
if (KeyboardQueueEmpty) return FALSE; if (KeyboardQueueEmpty)
{
Result = FALSE;
goto Done;
}
/* Get the scan code */ /* Get the scan code */
*ScanCode = KeyboardQueue[KeyboardQueueStart]; *ScanCode = KeyboardQueue[KeyboardQueueStart];
@ -66,7 +82,9 @@ static BOOLEAN KeyboardQueuePop(BYTE *ScanCode)
KeyboardQueueEmpty = TRUE; KeyboardQueueEmpty = TRUE;
} }
return TRUE; Done:
ReleaseMutex(QueueMutex);
return Result;
} }
/* PUBLIC FUNCTIONS ***********************************************************/ /* PUBLIC FUNCTIONS ***********************************************************/
@ -338,6 +356,9 @@ DWORD WINAPI InputThreadProc(LPVOID Parameter)
BOOLEAN PS2Initialize(HANDLE ConsoleInput) BOOLEAN PS2Initialize(HANDLE ConsoleInput)
{ {
/* Create the mutex */
QueueMutex = CreateMutex(NULL, FALSE, NULL);
/* Start the input thread */ /* Start the input thread */
InputThread = CreateThread(NULL, 0, &InputThreadProc, ConsoleInput, 0, NULL); InputThread = CreateThread(NULL, 0, &InputThreadProc, ConsoleInput, 0, NULL);
@ -355,6 +376,8 @@ VOID PS2Cleanup(VOID)
/* Close the input thread handle */ /* Close the input thread handle */
if (InputThread != NULL) CloseHandle(InputThread); if (InputThread != NULL) CloseHandle(InputThread);
InputThread = NULL; InputThread = NULL;
CloseHandle(QueueMutex);
} }
/* EOF */ /* EOF */