From e58bd1bae6a489a91d5f87155aea06fa6a04b933 Mon Sep 17 00:00:00 2001
From: Ove Kaaven <ovek@arcticnet.no>
Date: Tue, 25 Jul 2000 12:24:53 +0000
Subject: [PATCH] Make int16 read from the BIOS keyboard buffer, not directly
 from the console driver.

---
 msdos/int16.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/msdos/int16.c b/msdos/int16.c
index 8b7a3406551..e98a7fdc934 100644
--- a/msdos/int16.c
+++ b/msdos/int16.c
@@ -8,7 +8,7 @@
 
 #include "config.h"
 #include "module.h"
-#include "console.h"
+#include "dosexe.h"
 #include "wincon.h"
 #include "debugtools.h"
 #include "windef.h"
@@ -37,7 +37,7 @@ void WINAPI INT_Int16Handler( CONTEXT86 *context )
       /* Returns: AH = Scan code
                   AL = ASCII character */   
       TRACE("Get Keystroke\n");
-      CONSOLE_GetKeystroke(&AH_reg(context), &AL_reg(context));
+      INT_Int16ReadChar(&AL_reg(context), &AH_reg(context), FALSE);
       break;
 
    case 0x01: /* Check for Keystroke */
@@ -45,7 +45,7 @@ void WINAPI INT_Int16Handler( CONTEXT86 *context )
       /*          AH = Scan code */
       /*          AL = ASCII character */
       TRACE("Check for Keystroke\n");
-      if (!CONSOLE_CheckForKeystroke(&AH_reg(context), &AL_reg(context)))
+      if (!INT_Int16ReadChar(&AL_reg(context), &AH_reg(context), TRUE))
       {
           SET_ZFLAG(context);
       }
@@ -95,7 +95,7 @@ void WINAPI INT_Int16Handler( CONTEXT86 *context )
       TRACE("Get Enhanced Keystroke - Partially supported\n");
       /* Returns: AH = Scan code
                   AL = ASCII character */   
-      CONSOLE_GetKeystroke(&AH_reg(context), &AL_reg(context));
+      INT_Int16ReadChar(&AL_reg(context), &AH_reg(context), FALSE);
       break;
   
 
@@ -104,7 +104,7 @@ void WINAPI INT_Int16Handler( CONTEXT86 *context )
       /*          AH = Scan code */
       /*          AL = ASCII character */
       TRACE("Check for Enhanced Keystroke - Partially supported\n");
-      if (!CONSOLE_CheckForKeystroke(&AH_reg(context), &AL_reg(context)))
+      if (!INT_Int16ReadChar(&AL_reg(context), &AH_reg(context), TRUE))
       {
           SET_ZFLAG(context);
       }
-- 
GitLab