diff --git a/src/chipset/stpc.c b/src/chipset/stpc.c index 13dbd97e9..f3075323a 100644 --- a/src/chipset/stpc.c +++ b/src/chipset/stpc.c @@ -80,10 +80,12 @@ typedef struct stpc_serial_t { } stpc_serial_t; typedef struct stpc_lpt_t { - uint8_t unlocked; - uint8_t offset; - uint8_t reg1; - uint8_t reg4; + uint8_t unlocked; + uint8_t offset; + uint8_t reg1; + uint8_t reg4; + + lpt_t *lpt; } stpc_lpt_t; #ifdef ENABLE_STPC_LOG @@ -977,22 +979,22 @@ stpc_lpt_handlers(stpc_lpt_t *dev, uint8_t val) { const uint8_t new_addr = (val & 0x03); - lpt1_remove(); + lpt_port_remove(dev->lpt); switch (new_addr) { case 0x1: stpc_log("STPC: Remapping parallel port to LPT3\n"); - lpt1_setup(LPT_MDA_ADDR); + lpt_port_setup(dev->lpt, LPT_MDA_ADDR); break; case 0x2: stpc_log("STPC: Remapping parallel port to LPT1\n"); - lpt1_setup(LPT1_ADDR); + lpt_port_setup(dev->lpt, LPT1_ADDR); break; case 0x3: stpc_log("STPC: Remapping parallel port to LPT2\n"); - lpt1_setup(LPT2_ADDR); + lpt_port_setup(dev->lpt, LPT2_ADDR); break; default: @@ -1063,6 +1065,8 @@ stpc_lpt_init(UNUSED(const device_t *info)) stpc_lpt_t *dev = (stpc_lpt_t *) calloc(1, sizeof(stpc_lpt_t)); + dev->lpt = device_add_inst(&lpt_port_device, 1); + stpc_lpt_reset(dev); io_sethandler(0x3f0, 2, diff --git a/src/chipset/wd76c10.c b/src/chipset/wd76c10.c index bc3b4324c..d11330c85 100644 --- a/src/chipset/wd76c10.c +++ b/src/chipset/wd76c10.c @@ -113,9 +113,9 @@ typedef struct mem_mapping_t ram_mapping; nvr_t *nvr; - - fdc_t *fdc; - serial_t *uart[2]; + fdc_t *fdc; + serial_t *uart[2]; + lpt_t *lpt; } wd76c10_t; static uint32_t bank_sizes[4] = { 0x00020000, /* 64 Kbit X 16 = 1024 Kbit = 128 kB, 8x 8 */ @@ -911,19 +911,19 @@ wd76c10_ser_par_cs_recalc(wd76c10_t *dev) } /* LPT */ - lpt1_remove(); + lpt_port_remove(dev->lpt); switch ((dev->ser_par_cs >> 9) & 0x03) { case 1: - lpt1_setup(LPT_MDA_ADDR); - lpt1_irq(LPT1_IRQ); + lpt_port_setup(dev->lpt, LPT_MDA_ADDR); + lpt_port_irq(dev->lpt, LPT1_IRQ); break; case 2: - lpt1_setup(LPT1_ADDR); - lpt1_irq(LPT1_IRQ); + lpt_port_setup(dev->lpt, LPT1_ADDR); + lpt_port_irq(dev->lpt, LPT1_IRQ); break; case 3: - lpt1_setup(LPT2_ADDR); - lpt1_irq(LPT1_IRQ); + lpt_port_setup(dev->lpt, LPT2_ADDR); + lpt_port_irq(dev->lpt, LPT1_IRQ); break; } } @@ -1173,8 +1173,8 @@ wd76c10_inw(uint16_t port, void *priv) case 0xd072: ret = (serial_read(0x0002, dev->uart[0]) & 0xc0) << 8; ret |= (serial_read(0x0002, dev->uart[1]) & 0xc0) << 6; - ret |= (lpt_read_port(0, 0x0002) & 0x0f) << 8; - ret |= lpt_read_port(0, 0x0000); + ret |= (lpt_read_port(dev->lpt, 0x0002) & 0x0f) << 8; + ret |= lpt_read_port(dev->lpt, 0x0000); break; case 0xe072: @@ -1188,7 +1188,7 @@ wd76c10_inw(uint16_t port, void *priv) break; case 0xfc72: - ret = ((lpt_read_status(0) & 0x20) >> 2); + ret = ((lpt_read_status(dev->lpt) & 0x20) >> 2); ret |= (((uint16_t) dma_m) << 4); ret |= dev->toggle; dev->toggle ^= 0x8000; @@ -1303,6 +1303,7 @@ wd76c10_init(UNUSED(const device_t *info)) dev->nvr = device_add(&amstrad_megapc_nvr_device); dev->uart[0] = device_add_inst(&ns16450_device, 1); dev->uart[1] = device_add_inst(&ns16450_device, 2); + dev->lpt = device_add_inst(&lpt_port_device, 1); dev->fdc = device_add(&fdc_at_device); device_add(&ide_isa_device); diff --git a/src/include/86box/lpt.h b/src/include/86box/lpt.h index a80f8638c..609e792b7 100644 --- a/src/include/86box/lpt.h +++ b/src/include/86box/lpt.h @@ -120,22 +120,6 @@ extern void lpt_port_dma(lpt_t *dev, uint8_t dma); extern void lpt_port_remove(lpt_t *dev); extern void lpt1_remove_ams(lpt_t *dev); -#define lpt1_setup(a) lpt_port_setup(0, a) -#define lpt1_irq(a) lpt_port_irq(0, a) -#define lpt1_remove() lpt_port_remove(0) - -#define lpt2_setup(a) lpt_port_setup(1, a) -#define lpt2_irq(a) lpt_port_irq(1, a) -#define lpt2_remove() lpt_port_remove(1) - -#define lpt3_setup(a) lpt_port_setup(2, a) -#define lpt3_irq(a) lpt_port_irq(2, a) -#define lpt3_remove() lpt_port_remove(2) - -#define lpt4_setup(a) lpt_port_setup(3, a) -#define lpt4_irq(a) lpt_port_irq(3, a) -#define lpt4_remove() lpt_port_remove(3) - extern void lpt_devices_init(void); extern void lpt_devices_close(void); diff --git a/src/machine/m_ps2_isa.c b/src/machine/m_ps2_isa.c index f4439da84..d7fd2d753 100644 --- a/src/machine/m_ps2_isa.c +++ b/src/machine/m_ps2_isa.c @@ -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); diff --git a/src/machine/m_xt_compaq.c b/src/machine/m_xt_compaq.c index d17f43ba4..a6f8164f2 100644 --- a/src/machine/m_xt_compaq.c +++ b/src/machine/m_xt_compaq.c @@ -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; }