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

Some SM(S)C fixes and the PC87306 now handles its own keyboard controller.

Browse Source
This commit is contained in:
OBattler
2025-08-03 18:26:20 +02:00
parent 9dd1e0936a
commit ead6a8f8d0
10 changed files with 99 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/sio/sio_fdc37c67x.c
View File

@@ -743,11 +743,11 @@ fdc37c67x_init(const device_t *info)
dev->lpt = device_add_inst(&lpt_port_device, 1);
dev->kbc_type = info->local & FDC37C93X_KBC;
dev->kbc_type = info->local & FDC37XXXX_KBC;
dev->is_compaq = (dev->kbc_type == FDC37C931);
dev->is_compaq = (dev->kbc_type == FDC37XXX1);
dev->port_370 = !!(info->local & FDC37C93X_370);
dev->port_370 = !!(info->local & FDC37XXXX_370);
dev->max_ld = 8;
@@ -759,20 +759,20 @@ fdc37c67x_init(const device_t *info)
}
switch (dev->kbc_type) {
case FDC37C931:
case FDC37XXX1:
dev->kbc = device_add(&kbc_ps2_compaq_device);
break;
case FDC37C932:
case FDC37XXX2:
dev->kbc = device_add(&kbc_ps2_intel_ami_pci_device);
break;
case FDC37C933:
case FDC37XXX3:
default:
dev->kbc = device_add(&kbc_ps2_pci_device);
break;
case FDC37C935:
case FDC37XXX5:
dev->kbc = device_add(&kbc_ps2_phoenix_device);
break;
case FDC37C937:
case FDC37XXX7:
dev->kbc = device_add(&kbc_ps2_phoenix_pci_device);
break;
}

16
src/sio/sio_fdc37c93x.c
View File

@@ -1877,13 +1877,13 @@ fdc37c93x_init(const device_t *info)
dev->lpt = device_add_inst(&lpt_port_device, 1);
dev->chip_id = info->local & FDC37C93X_CHIP_ID;
dev->kbc_type = info->local & FDC37C93X_KBC;
dev->kbc_type = info->local & FDC37XXXX_KBC;
dev->is_apm = (dev->chip_id == FDC37C93X_APM);
dev->is_compaq = (dev->kbc_type == FDC37C931);
dev->is_compaq = (dev->kbc_type == FDC37XXX1);
dev->has_nvr = !(info->local & FDC37C93X_NO_NVR);
dev->port_370 = !!(info->local & FDC37C93X_370);
dev->port_370 = !!(info->local & FDC37XXXX_370);
if (dev->has_nvr) {
dev->nvr = device_add(&amstrad_megapc_nvr_device);
@@ -1912,20 +1912,20 @@ fdc37c93x_init(const device_t *info)
}
switch (dev->kbc_type) {
case FDC37C931:
case FDC37XXX1:
dev->kbc = device_add(&kbc_ps2_compaq_device);
break;
case FDC37C932:
case FDC37XXX2:
dev->kbc = device_add(&kbc_ps2_intel_ami_pci_device);
break;
case FDC37C933:
case FDC37XXX3:
default:
dev->kbc = device_add(&kbc_ps2_pci_device);
break;
case FDC37C935:
case FDC37XXX5:
dev->kbc = device_add(&kbc_ps2_phoenix_device);
break;
case FDC37C937:
case FDC37XXX7:
dev->kbc = device_add(&kbc_ps2_phoenix_pci_device);
break;
}

16
src/sio/sio_fdc37m60x.c
View File

@@ -634,11 +634,11 @@ fdc37m60x_init(const device_t *info)
dev->lpt = device_add_inst(&lpt_port_device, 1);
dev->kbc_type = info->local & FDC37C93X_KBC;
dev->kbc_type = info->local & FDC37XXXX_KBC;
dev->is_compaq = (dev->kbc_type == FDC37C931);
dev->is_compaq = (dev->kbc_type == FDC37XXX1);
dev->port_370 = !!(info->local & FDC37C93X_370);
dev->port_370 = !!(info->local & FDC37XXXX_370);
dev->max_ld = 8;
@@ -650,20 +650,20 @@ fdc37m60x_init(const device_t *info)
}
switch (dev->kbc_type) {
case FDC37C931:
case FDC37XXX1:
dev->kbc = device_add(&kbc_ps2_compaq_device);
break;
case FDC37C932:
case FDC37XXX2:
dev->kbc = device_add(&kbc_ps2_intel_ami_pci_device);
break;
case FDC37C933:
case FDC37XXX3:
default:
dev->kbc = device_add(&kbc_ps2_pci_device);
break;
case FDC37C935:
case FDC37XXX5:
dev->kbc = device_add(&kbc_ps2_phoenix_device);
break;
case FDC37C937:
case FDC37XXX7:
dev->kbc = device_add(&kbc_ps2_phoenix_pci_device);
break;
}

29
src/sio/sio_pc87306.c
View File

@@ -23,6 +23,7 @@
#include <86box/io.h>
#include <86box/timer.h>
#include <86box/device.h>
#include <86box/keyboard.h>
#include <86box/lpt.h>
#include <86box/mem.h>
#include <86box/nvr.h>
@@ -42,8 +43,10 @@ typedef struct pc87306_t {
uint8_t regs[29];
uint8_t gpio[2];
uint16_t gpioba;
uint16_t kbc_type;
int cur_reg;
fdc_t *fdc;
void *kbc;
serial_t *uart[2];
lpt_t *lpt;
nvr_t *nvr;
@@ -245,6 +248,15 @@ serial_handler(pc87306_t *dev, int uart)
}
}
static void
kbc_handler(pc87306_t *dev)
{
kbc_at_handler(0, 0x0060, dev->kbc);
if (dev->regs[0x05] & 0x01)
kbc_at_handler(1, 0x0060, dev->kbc);
}
static void
pc87306_write(uint16_t port, uint8_t val, void *priv)
{
@@ -350,6 +362,8 @@ pc87306_write(uint16_t port, uint8_t val, void *priv)
nvr_lock_set(0x00, 256, !!(val & 0x80), dev->nvr);
break;
case 0x05:
if (valxor & 0x01)
kbc_handler(dev);
if (valxor & 0x08)
nvr_at_handler(!!(val & 0x08), 0x0070, dev->nvr);
if (valxor & 0x20)
@@ -495,6 +509,8 @@ pc87306_init(UNUSED(const device_t *info))
{
pc87306_t *dev = (pc87306_t *) calloc(1, sizeof(pc87306_t));
dev->kbc_type = info->local & PC8730X_KBC;
dev->fdc = device_add(&fdc_at_nsc_device);
dev->uart[0x00] = device_add_inst(&ns16550_device, 1);
@@ -504,6 +520,19 @@ pc87306_init(UNUSED(const device_t *info))
dev->nvr = device_add(&at_mb_nvr_device);
switch (dev->kbc_type) {
case PC8730X_AMI_MEGAKEY:
default:
dev->kbc = device_add(&kbc_ps2_intel_ami_pci_device);
break;
case PC8730X_PHOENIX_42:
dev->kbc = device_add(&kbc_ps2_phoenix_device);
break;
case PC8730X_PHOENIX_42I:
dev->kbc = device_add(&kbc_ps2_phoenix_pci_device);
break;
}
dev->gpio[0] = dev->gpio[1] = 0xff;
pc87306_reset_common(dev);