PCI TRC hard resets now also reset the AT keyboard controller.

This commit is contained in:
OBattler
2019-10-30 18:08:35 +01:00
parent c06ff7f76c
commit 84adef4c25
3 changed files with 14 additions and 3 deletions

View File

@@ -8,7 +8,7 @@
*
* Definitions for the keyboard interface.
*
* Version: @(#)keyboard.h 1.0.18 2019/03/05
* Version: @(#)keyboard.h 1.0.19 2019/10/30
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -103,6 +103,7 @@ extern void keyboard_at_adddata_mouse(uint8_t val);
extern void keyboard_at_set_mouse(void (*mouse_write)(uint8_t val,void *), void *);
extern uint8_t keyboard_at_get_mouse_scan(void);
extern void keyboard_at_set_mouse_scan(uint8_t val);
extern void keyboard_at_reset(void);
#ifdef __cplusplus
}

View File

@@ -8,7 +8,7 @@
*
* Intel 8042 (AT keyboard controller) emulation.
*
* Version: @(#)keyboard_at.c 1.0.43 2019/03/05
* Version: @(#)keyboard_at.c 1.0.44 2019/10/30
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -2298,6 +2298,15 @@ kbd_reset(void *priv)
}
/* Reset the AT keyboard - this is needed for the PCI TRC and is done
until a better solution is found. */
void
keyboard_at_reset(void)
{
kbd_reset(SavedKbd);
}
static void
kbd_close(void *priv)
{

View File

@@ -8,7 +8,7 @@
*
* Implementation the PCI bus.
*
* Version: @(#)pci.c 1.0.2 2019/10/30
* Version: @(#)pci.c 1.0.3 2019/10/30
*
* Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com>
@@ -620,6 +620,7 @@ trc_reset(uint8_t val)
flushmmucache();
pci_reset();
keyboard_at_reset();
}
resetx86();