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

Removed the last accidental left-over and the legacy #define's in lpt.h.

Browse Source
This commit is contained in:
OBattler
2025-08-03 10:53:18 +02:00
parent 9a8e0acace
commit 9842ef6346
5 changed files with 41 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/machine/m_ps2_isa.c
View File

@@ -39,6 +39,7 @@ typedef struct {
ps2_190;
serial_t *uart;
lpt_t *lpt;
} ps2_isa_t;
static void
@@ -53,7 +54,7 @@ ps2_write(uint16_t port, uint8_t val, void *priv)
case 0x0102:
if (!(ps2->ps2_94 & 0x80)) {
lpt1_remove();
lpt_port_remove(ps2->lpt);
serial_remove(ps2->uart);
if (val & 0x04) {
if (val & 0x08)
@@ -64,13 +65,13 @@ ps2_write(uint16_t port, uint8_t val, void *priv)
if (val & 0x10) {
switch ((val >> 5) & 3) {
case 0:
lpt1_setup(LPT_MDA_ADDR);
lpt_port_setup(ps2->lpt, LPT_MDA_ADDR);
break;
case 1:
lpt1_setup(LPT1_ADDR);
lpt_port_setup(ps2->lpt, LPT1_ADDR);
break;
case 2:
lpt1_setup(LPT2_ADDR);
lpt_port_setup(ps2->lpt, LPT2_ADDR);
break;
default:
@@ -166,8 +167,10 @@ ps2_isa_setup(int model, int cpu_type)
ps2->uart = device_add_inst(&ns16450_device, 1);
lpt1_remove();
lpt1_setup(LPT_MDA_ADDR);
ps2->lpt = device_add_inst(&lpt_port_device, 1);
lpt_port_remove(ps2->lpt);
lpt_port_setup(ps2->lpt, LPT_MDA_ADDR);
device_add(&port_92_device);

10
src/machine/m_xt_compaq.c
View File

@@ -58,8 +58,9 @@ machine_xt_compaq_deskpro_init(const machine_t *model)
nmi_init();
standalone_gameport_type = &gameport_200_device;
lpt1_remove();
lpt1_setup(LPT_MDA_ADDR);
lpt_t *lpt = device_add_inst(&lpt_port_device, 1);
lpt_port_setup(lpt, LPT_MDA_ADDR);
lpt_set_3bc_used(1);
return ret;
}
@@ -86,8 +87,9 @@ machine_xt_compaq_portable_init(const machine_t *model)
if (joystick_type)
device_add(&gameport_200_device);
lpt1_remove();
lpt1_setup(LPT_MDA_ADDR);
lpt_t *lpt = device_add_inst(&lpt_port_device, 1);
lpt_port_setup(lpt, LPT_MDA_ADDR);
lpt_set_3bc_used(1);
return ret;
}