diff options
author | R. Belmont <rb6502@users.noreply.github.com> | 2018-10-10 14:49:24 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-10 14:49:24 -0400 |
commit | 6bf0934a2dc31d048921ef99276202ebdeca4f26 (patch) | |
tree | 2c8e0a491135a926355699f1d6a99d446d3c26fb | |
parent | bf4b7f5f77b6ca1c4b3f1202e2a7c27edb84a9eb (diff) | |
parent | 30639a32a428aa2546e386116c1776dc53ce6ee8 (diff) |
Merge pull request #4108 from hp9k/98644_irq_settings
hp98644: allow to configure interrupt level (nw)
-rw-r--r-- | src/devices/bus/hp_dio/hp98644.cpp | 5 | ||||
-rw-r--r-- | src/mame/drivers/hp9k_3xx.cpp | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/bus/hp_dio/hp98644.cpp b/src/devices/bus/hp_dio/hp98644.cpp index 09d70616ae7..efc93c3e834 100644 --- a/src/devices/bus/hp_dio/hp98644.cpp +++ b/src/devices/bus/hp_dio/hp98644.cpp @@ -87,7 +87,7 @@ static INPUT_PORTS_START(hp98644_port) PORT_DIPSETTING(0x00, DEF_STR(Off)) PORT_DIPSETTING(REG_SWITCHES_MODEM_EN, DEF_STR(On)) - PORT_DIPNAME(REG_SWITCHES_INT_LEVEL_MASK << REG_SWITCHES_INT_LEVEL_SHIFT, 0x00, "Interrupt level") + PORT_DIPNAME(REG_SWITCHES_INT_LEVEL_MASK << REG_SWITCHES_INT_LEVEL_SHIFT, 0x02, "Interrupt level") PORT_DIPSETTING(0 << REG_SWITCHES_INT_LEVEL_SHIFT, "3") PORT_DIPSETTING(1 << REG_SWITCHES_INT_LEVEL_SHIFT, "4") PORT_DIPSETTING(2 << REG_SWITCHES_INT_LEVEL_SHIFT, "5") @@ -176,7 +176,8 @@ READ16_MEMBER(dio16_98644_device::io_r) break; case 1: - ret = m_control | m_control << 8; + ret = m_control | m_control << 8 | \ + (((m_switches->read() >> REG_SWITCHES_INT_LEVEL_SHIFT) & REG_SWITCHES_INT_LEVEL_MASK) << 4); break; case 0x08: diff --git a/src/mame/drivers/hp9k_3xx.cpp b/src/mame/drivers/hp9k_3xx.cpp index 95d8540908a..652d9ea8300 100644 --- a/src/mame/drivers/hp9k_3xx.cpp +++ b/src/mame/drivers/hp9k_3xx.cpp @@ -284,7 +284,6 @@ void hp9k3xx_state::machine_reset() void hp9k3xx_state::machine_start() { m_bus_error_timer = timer_alloc(0); - m_maincpu->set_reset_callback(write_line_delegate(FUNC(hp9k3xx_state::cpu_reset), this)); } void hp9k3xx_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) |