claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The Quadtel variant of the 8042 (used by the Amstrad MegaPC) is now correctly PS/2 type.

Browse Source
This commit is contained in:
OBattler
2018-01-04 07:56:37 +01:00
parent ea0b9c6b38
commit 519ab94945
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/keyboard.h
View File

@@ -8,15 +8,15 @@
* *
* Definitions for the keyboard interface. * Definitions for the keyboard interface.
* *
* Version: @(#)keyboard.h 1.0.7 2017/12/31 * Version: @(#)keyboard.h 1.0.8 2018/01/04
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com> * Fred N. van Kempen, <decwiz@yahoo.com>
* *
* Copyright 2008-2017 Sarah Walker. * Copyright 2008-2018 Sarah Walker.
* Copyright 2016,2017 Miran Grca. * Copyright 2016,2018 Miran Grca.
* Copyright 2017 Fred N. van Kempen. * Copyright 2018 Fred N. van Kempen.
*/ */
#ifndef EMU_KEYBOARD_H #ifndef EMU_KEYBOARD_H
# define EMU_KEYBOARD_H # define EMU_KEYBOARD_H
@@ -51,11 +51,11 @@ extern device_t keyboard_xt_device;
extern device_t keyboard_tandy_device; extern device_t keyboard_tandy_device;
extern device_t keyboard_at_device; extern device_t keyboard_at_device;
extern device_t keyboard_at_ami_device; extern device_t keyboard_at_ami_device;
extern device_t keyboard_at_quadtel_device;
extern device_t keyboard_at_toshiba_device; extern device_t keyboard_at_toshiba_device;
extern device_t keyboard_ps2_device; extern device_t keyboard_ps2_device;
extern device_t keyboard_ps2_ami_device; extern device_t keyboard_ps2_ami_device;
extern device_t keyboard_ps2_mca_device; extern device_t keyboard_ps2_mca_device;
extern device_t keyboard_ps2_quadtel_device;
#endif #endif
extern void keyboard_init(void); extern void keyboard_init(void);

22
src/keyboard_at.c
View File

@@ -8,7 +8,7 @@
* *
* Intel 8042 (AT keyboard controller) emulation. * Intel 8042 (AT keyboard controller) emulation.
* *
* Version: @(#)keyboard_at.c 1.0.15 2018/01/04 * Version: @(#)keyboard_at.c 1.0.16 2018/01/04
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -1556,16 +1556,6 @@ device_t keyboard_at_ami_device = {
NULL, NULL, NULL, NULL NULL, NULL, NULL, NULL
}; };
device_t keyboard_at_quadtel_device = {
"PC/AT Keyboard (Quadtel/MegaPC)",
0,
KBC_TYPE_ISA | KBC_VEN_QUADTEL,
kbd_init,
kbd_close,
kbd_reset,
NULL, NULL, NULL, NULL
};
device_t keyboard_at_toshiba_device = { device_t keyboard_at_toshiba_device = {
"PC/AT Keyboard (Toshiba)", "PC/AT Keyboard (Toshiba)",
0, 0,
@@ -1606,6 +1596,16 @@ device_t keyboard_ps2_mca_device = {
NULL, NULL, NULL, NULL NULL, NULL, NULL, NULL
}; };
device_t keyboard_ps2_quadtel_device = {
"PS/2 Keyboard (Quadtel/MegaPC)",
0,
KBC_TYPE_PS2_1 | KBC_VEN_QUADTEL,
kbd_init,
kbd_close,
kbd_reset,
NULL, NULL, NULL, NULL
};
void void
keyboard_at_reset(void) keyboard_at_reset(void)

2
src/machine/m_at_wd76c10.c
View File

@@ -142,7 +142,7 @@ void
machine_at_wd76c10_init(machine_t *model) machine_at_wd76c10_init(machine_t *model)
{ {
machine_at_common_ide_init(model); machine_at_common_ide_init(model);
device_add(&keyboard_at_quadtel_device); device_add(&keyboard_ps2_quadtel_device);
wd76c10_init(); wd76c10_init();