[ros-diffs] [aandrejevic] 59276: [NTVDM] Implement the keyboard IRQ.

Author: aandrejevic
Date: Fri Jun 21 21:25:01 2013
New Revision: 59276

URL: http://svn.reactos.org/svn/reactos?rev=59276&view=rev
Log:
[NTVDM]
Implement the keyboard IRQ.


Modified:
    branches/ntvdm/subsystems/ntvdm/hardware.c
    branches/ntvdm/subsystems/ntvdm/ntvdm.c
    branches/ntvdm/subsystems/ntvdm/ntvdm.h

Modified: branches/ntvdm/subsystems/ntvdm/hardware.c
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware…
==============================================================================
--- branches/ntvdm/subsystems/ntvdm/hardware.c	[iso-8859-1] (original)
+++ branches/ntvdm/subsystems/ntvdm/hardware.c	[iso-8859-1] Fri Jun 21 21:25:01 2013
@@ -49,6 +49,52 @@
 
 static PIC MasterPic, SlavePic;
 static PIT_CHANNEL PitChannels[PIT_CHANNELS];
+static BYTE KeyboardQueue[KEYBOARD_BUFFER_SIZE];
+static BOOLEAN KeyboardQueueEmpty = TRUE;
+static UINT KeyboardQueueStart = 0;
+static UINT KeyboardQueueEnd = 0;
+
+static BOOLEAN KeyboardQueuePush(BYTE ScanCode)
+{
+    /* Check if the keyboard queue is full */
+    if (!KeyboardQueueEmpty && (KeyboardQueueStart == KeyboardQueueEnd))
+    {
+        return FALSE;
+    }
+    
+    /* Insert the value in the queue */
+    KeyboardQueue[KeyboardQueueEnd] = ScanCode;
+    KeyboardQueueEnd++;
+    KeyboardQueueEnd %= KEYBOARD_BUFFER_SIZE;
+    
+    /* Since we inserted a value, it's not empty anymore */
+    KeyboardQueueEmpty = FALSE;
+    
+    return TRUE;
+}
+
+#if 0
+static BOOLEAN KeyboardQueuePop(BYTE *ScanCode)
+{
+    /* Make sure the keyboard queue is not empty */
+    if (KeyboardQueueEmpty) return FALSE;
+    
+    /* Get the scan code */
+    *ScanCode = KeyboardQueue[KeyboardQueueStart];
+    
+    /* Remove the value from the queue */
+    KeyboardQueueStart++;
+    KeyboardQueueStart %= KEYBOARD_BUFFER_SIZE;
+    
+    /* Check if the queue is now empty */
+    if (KeyboardQueueStart == KeyboardQueueEnd)
+    {
+        KeyboardQueueEmpty = TRUE;
+    }
+    
+    return TRUE;
+}
+#endif
 
 /* PUBLIC FUNCTIONS ***********************************************************/
 
@@ -451,3 +497,48 @@
     }
 }
 
+VOID CheckForInputEvents()
+{
+    PINPUT_RECORD Buffer;
+    HANDLE ConsoleInput = GetStdHandle(STD_INPUT_HANDLE);
+    DWORD i, j, Count, TotalEvents;
+    BYTE ScanCode;
+    
+    /* Get the number of input events */
+    if (!GetNumberOfConsoleInputEvents(ConsoleInput, &Count)) return;
+    if (Count == 0) return;
+        
+    /* Allocate the buffer */
+    Buffer = (PINPUT_RECORD)HeapAlloc(GetProcessHeap(), 0, Count *
sizeof(INPUT_RECORD));
+    if (Buffer == NULL) return;
+    
+    /* Peek the input events */
+    if (!ReadConsoleInput(ConsoleInput, Buffer, Count, &TotalEvents)) goto Cleanup;
+    
+    for (i = 0; i < TotalEvents; i++)
+    {
+        /* Check if this is a key event */
+        if (Buffer[i].EventType != KEY_EVENT) continue;
+        
+        /* Get the scan code */
+        ScanCode = Buffer[i].Event.KeyEvent.wVirtualScanCode;
+        
+        /* If this is a key release, set the highest bit in the scan code */
+        if (!Buffer[i].Event.KeyEvent.bKeyDown) ScanCode |= 0x80;
+          
+        /* Push the scan code onto the keyboard queue */
+        for (j = 0; j < Buffer[i].Event.KeyEvent.wRepeatCount; j++)
+        {
+            KeyboardQueuePush(ScanCode);
+        }
+            
+        /* Yes, IRQ 1 */
+        PicInterruptRequest(1);
+            
+        /* Stop the loop */
+        break;
+    }
+    
+Cleanup:
+    HeapFree(GetProcessHeap(), 0, Buffer);
+}

Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?…
==============================================================================
--- branches/ntvdm/subsystems/ntvdm/ntvdm.c	[iso-8859-1] (original)
+++ branches/ntvdm/subsystems/ntvdm/ntvdm.c	[iso-8859-1] Fri Jun 21 21:25:01 2013
@@ -144,6 +144,9 @@
         for (i = 0; i < TimerTicks; i++) PitDecrementCount();
         LastTimerTick = Counter;
         
+        /* Check for console input events */
+        CheckForInputEvents();
+        
         /* Continue CPU emulation */
         EmulatorStep();
     }

Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?…
==============================================================================
--- branches/ntvdm/subsystems/ntvdm/ntvdm.h	[iso-8859-1] (original)
+++ branches/ntvdm/subsystems/ntvdm/ntvdm.h	[iso-8859-1] Fri Jun 21 21:25:01 2013
@@ -66,6 +66,11 @@
 #define PIC_OCW2_SL (1 << 6)
 #define PIC_OCW3 (1 << 3)
 #define PIC_OCW3_READ_ISR 0x0B
+
+/* 8042 PS/2 controller */
+#define KEYBOARD_BUFFER_SIZE 32
+#define PS2_DATA_PORT 0x60
+#define PS2_CONTROL_PORT 0x64
 
 #define EMULATOR_FLAG_CF (1 << 0)
 #define EMULATOR_FLAG_PF (1 << 2)
@@ -219,6 +224,7 @@
 BYTE PitReadData(BYTE Channel);
 VOID PitWriteData(BYTE Channel, BYTE Value);
 VOID PitDecrementCount();
+VOID CheckForInputEvents();
 VOID EmulatorSetStack(WORD Segment, WORD Offset);
 VOID EmulatorExecute(WORD Segment, WORD Offset);
 VOID EmulatorInterrupt(BYTE Number);