mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed two SF bugs in the Bochs BIOS code.

Browse Source 
- MS-DOS 4.01 caused a stack overflow in the int15_function(). Now handle all
  functions that simply return success in the ASM code. Fixes SF bug #1439.
- Added two delay loops in keyboard_init(). Fixes SF bug #1438.
This commit is contained in:
Volker Ruppert 2021-07-14 16:10:19 +00:00
parent bf8dda4e06
commit 7ed5d6447a
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
bochs/bios/rombios.c
View File

@ -1882,7 +1882,15 @@ keyboard_init()
/* Enable Keyboard clock */ /* Enable Keyboard clock */
outb(PORT_PS2_STATUS,0xae); outb(PORT_PS2_STATUS,0xae);
/* Wait until buffer is empty */
max=0xffff;
while ((inb(PORT_PS2_STATUS) & 0x02) && (--max>0)) outb(PORT_DIAG, 0x10);
if (max==0x0) keyboard_panic(10);
outb(PORT_PS2_STATUS,0xa8); outb(PORT_PS2_STATUS,0xa8);
/* Wait until buffer is empty */
max=0xffff;
while ((inb(PORT_PS2_STATUS) & 0x02) && (--max>0)) outb(PORT_DIAG, 0x10);
if (max==0x0) keyboard_panic(10);
/* ------------------- keyboard side ------------------------*/ /* ------------------- keyboard side ------------------------*/
/* reset keyboard and self test (keyboard side) */ /* reset keyboard and self test (keyboard side) */
@ -3933,20 +3941,6 @@ BX_DEBUG_INT15("int15 AX=%04x\n",regs.u.r16.ax);
regs.u.r8.ah = 0; // "ok ejection may proceed" regs.u.r8.ah = 0; // "ok ejection may proceed"
break; break;
case 0x80:
/* Device open */
case 0x81:
/* Device close */
case 0x82:
/* Program termination */
case 0x90:
/* Device busy interrupt. Called by Int 16h when no key available */
case 0x91:
/* Interrupt complete. Called by IRQ handlers */
CLEAR_CF();
regs.u.r8.ah = 0; // "operation success"
break;
case 0x83: { case 0x83: {
// Set DS to 0x40 // Set DS to 0x40
set_DS(0x40); set_DS(0x40);
@ -11573,6 +11567,16 @@ int11_handler:
;---------- ;----------
.org 0xf859 ; INT 15h System Services Entry Point .org 0xf859 ; INT 15h System Services Entry Point
int15_handler: int15_handler:
cmp ah, #0x80 ; Device open
je int15_stub
cmp ah, #0x81 ; Device close
je int15_stub
cmp ah, #0x82 ; Program termination
je int15_stub
cmp ah, #0x90 ; Device busy interrupt. Called by Int 16h when no key available
je int15_stub
cmp ah, #0x91 ; Interrupt complete. Called by IRQ handlers
je int15_stub
pushf pushf
#if BX_APM #if BX_APM
cmp ah, #0x53 cmp ah, #0x53
@ -11601,6 +11605,10 @@ int15_handler32_ret:
apm_call: apm_call:
jmp _apmreal_entry jmp _apmreal_entry
#endif #endif
int15_stub:
xor ah, ah ; "operation success"
clc
jmp iret_modify_cf
#if BX_USE_PS2_MOUSE #if BX_USE_PS2_MOUSE
int15_handler_mouse: int15_handler_mouse: