From 0473bf3eb906cab43ca850db6feaa32778bffc96 Mon Sep 17 00:00:00 2001 From: cracyc Date: Wed, 3 Jul 2024 14:32:35 -0500 Subject: genpc: use trampoline instead of tag --- src/devices/machine/at.cpp | 2 +- src/devices/machine/at.h | 1 + src/devices/machine/genpc.cpp | 2 +- src/devices/machine/genpc.h | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/devices/machine/at.cpp b/src/devices/machine/at.cpp index 19f80a85d3a..74aa836f09d 100644 --- a/src/devices/machine/at.cpp +++ b/src/devices/machine/at.cpp @@ -134,7 +134,7 @@ void at_mb_device::device_add_mconfig(machine_config &config) m_isabus->drq6_callback().set(m_dma8237_2, FUNC(am9517a_device::dreq2_w)); m_isabus->drq7_callback().set(m_dma8237_2, FUNC(am9517a_device::dreq3_w)); m_isabus->iochck_callback().set(FUNC(at_mb_device::iochck_w)); - m_isabus->iochrdy_callback().set_inputline(":maincpu", INPUT_LINE_HALT); + m_isabus->iochrdy_callback().set(FUNC(at_mb_device::iochrdy_w)); MC146818(config, m_mc146818, 32.768_kHz_XTAL); m_mc146818->irq().set(m_pic8259_slave, FUNC(pic8259_device::ir0_w)); diff --git a/src/devices/machine/at.h b/src/devices/machine/at.h index b6f98a06b45..08c2c6f8da7 100644 --- a/src/devices/machine/at.h +++ b/src/devices/machine/at.h @@ -99,6 +99,7 @@ private: void dma_write_byte(offs_t offset, uint8_t data); uint8_t dma_read_word(offs_t offset); void dma_write_word(offs_t offset, uint8_t data); + void iochrdy_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state); }; }; DECLARE_DEVICE_TYPE(AT_MB, at_mb_device) diff --git a/src/devices/machine/genpc.cpp b/src/devices/machine/genpc.cpp index 8b2f350d44a..ed2acab5ed8 100644 --- a/src/devices/machine/genpc.cpp +++ b/src/devices/machine/genpc.cpp @@ -468,7 +468,7 @@ void ibm5160_mb_device::device_add_mconfig(machine_config &config) m_isabus->drq2_callback().set(m_dma8237, FUNC(am9517a_device::dreq2_w)); m_isabus->drq3_callback().set(m_dma8237, FUNC(am9517a_device::dreq3_w)); m_isabus->iochck_callback().set(FUNC(ibm5160_mb_device::iochck_w)); - m_isabus->iochrdy_callback().set_inputline(":maincpu", INPUT_LINE_HALT); + m_isabus->iochrdy_callback().set(FUNC(ibm5160_mb_device::iochrdy_w)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/devices/machine/genpc.h b/src/devices/machine/genpc.h index 1fa96086c1f..98b9e9c4d3c 100644 --- a/src/devices/machine/genpc.h +++ b/src/devices/machine/genpc.h @@ -129,6 +129,7 @@ protected: void iochck_w(int state); void pc_select_dma_channel(int channel, bool state); + void iochrdy_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state); }; }; -- cgit v1.2.3