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

And applied the same change to the Vendex (and all other XT clones) by separating the XT clone keyboard/PPI from the IBM XT 1986 one, and giving the clone one the PC-style port D read out on port 60h when keyboard is disabled, fixes #2213.

Browse Source
This commit is contained in:
OBattler
2022-10-28 02:23:08 +02:00
parent 52e47bde27
commit e6f208ef33
3 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/device/keyboard_xt.c
View File

@@ -66,6 +66,7 @@
#define KBD_TYPE_OLIVETTI 8 #define KBD_TYPE_OLIVETTI 8
#define KBD_TYPE_ZENITH 9 #define KBD_TYPE_ZENITH 9
#define KBD_TYPE_PRAVETZ 10 #define KBD_TYPE_PRAVETZ 10
#define KBD_TYPE_XTCLONE 11
typedef struct { typedef struct {
int want_irq; int want_irq;
@@ -584,8 +585,9 @@ kbd_read(uint16_t port, void *priv)
switch (port) { switch (port) {
case 0x60: /* Keyboard Data Register (aka Port A) */ case 0x60: /* Keyboard Data Register (aka Port A) */
if ((kbd->pb & 0x80) && ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) || (kbd->type == KBD_TYPE_PRAVETZ) || (kbd->type == KBD_TYPE_XT82) || (kbd->type == KBD_TYPE_XT86) || (kbd->type == KBD_TYPE_COMPAQ) || (kbd->type == KBD_TYPE_ZENITH))) { if ((kbd->pb & 0x80) && ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) || (kbd->type == KBD_TYPE_PRAVETZ) || (kbd->type == KBD_TYPE_XT82) ||
if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) || (kbd->type == KBD_TYPE_COMPAQ) || (kbd->type == KBD_TYPE_PRAVETZ)) (kbd->type == KBD_TYPE_XT86) || (kbd->type == KBD_TYPE_XTCLONE) || (kbd->type == KBD_TYPE_COMPAQ) || (kbd->type == KBD_TYPE_ZENITH))) {
if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) || (kbd->type == KBD_TYPE_XTCLONE) || (kbd->type == KBD_TYPE_COMPAQ) || (kbd->type == KBD_TYPE_PRAVETZ))
ret = (kbd->pd & ~0x02) | (hasfpu ? 0x02 : 0x00); ret = (kbd->pd & ~0x02) | (hasfpu ? 0x02 : 0x00);
else if ((kbd->type == KBD_TYPE_XT82) || (kbd->type == KBD_TYPE_XT86)) else if ((kbd->type == KBD_TYPE_XT82) || (kbd->type == KBD_TYPE_XT86))
ret = 0xff; /* According to Ruud on the PCem forum, this is supposed to return 0xFF on the XT. */ ret = 0xff; /* According to Ruud on the PCem forum, this is supposed to return 0xFF on the XT. */
@@ -669,9 +671,9 @@ kbd_read(uint16_t port, void *priv)
break; break;
case 0x63: /* Keyboard Configuration Register (aka Port D) */ case 0x63: /* Keyboard Configuration Register (aka Port D) */
if ((kbd->type == KBD_TYPE_XT82) || (kbd->type == KBD_TYPE_XT86) if ((kbd->type == KBD_TYPE_XT82) || (kbd->type == KBD_TYPE_XT86) ||
|| (kbd->type == KBD_TYPE_COMPAQ) (kbd->type == KBD_TYPE_XTCLONE) || (kbd->type == KBD_TYPE_COMPAQ) ||
|| (kbd->type == KBD_TYPE_TOSHIBA)) (kbd->type == KBD_TYPE_TOSHIBA))
ret = kbd->pd; ret = kbd->pd;
break; break;
@@ -732,8 +734,9 @@ kbd_init(const device_t *info)
if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) || if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) ||
(kbd->type == KBD_TYPE_PRAVETZ) || (kbd->type == KBD_TYPE_XT82) || (kbd->type == KBD_TYPE_PRAVETZ) || (kbd->type == KBD_TYPE_XT82) ||
(kbd->type <= KBD_TYPE_XT86) || (kbd->type == KBD_TYPE_COMPAQ) || (kbd->type <= KBD_TYPE_XT86) || (kbd->type == KBD_TYPE_XTCLONE) ||
(kbd->type == KBD_TYPE_TOSHIBA) || (kbd->type == KBD_TYPE_OLIVETTI)) { (kbd->type == KBD_TYPE_COMPAQ) || (kbd->type == KBD_TYPE_TOSHIBA) ||
(kbd->type == KBD_TYPE_OLIVETTI)) {
/* DIP switch readout: bit set = OFF, clear = ON. */ /* DIP switch readout: bit set = OFF, clear = ON. */
if (kbd->type == KBD_TYPE_OLIVETTI) if (kbd->type == KBD_TYPE_OLIVETTI)
@@ -752,9 +755,8 @@ kbd_init(const device_t *info)
kbd->pd |= get_videomode_switch_settings(); kbd->pd |= get_videomode_switch_settings();
/* Switches 3, 4 - memory size. */ /* Switches 3, 4 - memory size. */
if ((kbd->type == KBD_TYPE_XT86) if ((kbd->type == KBD_TYPE_XT86) || (kbd->type == KBD_TYPE_XTCLONE) ||
|| (kbd->type == KBD_TYPE_COMPAQ) (kbd->type == KBD_TYPE_COMPAQ) || (kbd->type == KBD_TYPE_TOSHIBA)) {
|| (kbd->type == KBD_TYPE_TOSHIBA)) {
switch (mem_size) { switch (mem_size) {
case 256: case 256:
kbd->pd |= 0x00; kbd->pd |= 0x00;
@@ -1048,3 +1050,17 @@ const device_t keyboard_xt_zenith_device = {
.force_redraw = NULL, .force_redraw = NULL,
.config = NULL .config = NULL
}; };
const device_t keyboard_xtclone_device = {
.name = "XT (Clone) Keyboard",
.internal_name = "keyboard_xtclone",
.flags = 0,
.local = KBD_TYPE_XTCLONE,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};

1
src/include/86box/keyboard.h
View File

@@ -156,6 +156,7 @@ extern const device_t keyboard_xt_lxt3_device;
# endif # endif
extern const device_t keyboard_xt_olivetti_device; extern const device_t keyboard_xt_olivetti_device;
extern const device_t keyboard_xt_zenith_device; extern const device_t keyboard_xt_zenith_device;
extern const device_t keyboard_xtclone_device;
extern const device_t keyboard_at_device; extern const device_t keyboard_at_device;
extern const device_t keyboard_at_ami_device; extern const device_t keyboard_at_ami_device;
extern const device_t keyboard_at_samsung_device; extern const device_t keyboard_at_samsung_device;

2
src/machine/m_xt.c
View File

@@ -175,7 +175,7 @@ machine_xt86_init(const machine_t *model)
static void static void
machine_xt_clone_init(const machine_t *model) machine_xt_clone_init(const machine_t *model)
{ {
device_add(&keyboard_xt86_device); device_add(&keyboard_xtclone_device);
machine_xt_common_init(model); machine_xt_common_init(model);
} }