diff options
-rw-r--r-- | src/devices/bus/hp80_io/82937.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/mcs48/mcs48.cpp | 11 | ||||
-rw-r--r-- | src/devices/cpu/mcs48/mcs48.h | 4 | ||||
-rw-r--r-- | src/devices/machine/ins8250.cpp | 5 | ||||
-rw-r--r-- | src/devices/machine/ins8250.h | 16 | ||||
-rw-r--r-- | src/mame/drivers/atetris.cpp | 4 |
6 files changed, 20 insertions, 24 deletions
diff --git a/src/devices/bus/hp80_io/82937.cpp b/src/devices/bus/hp80_io/82937.cpp index 6f36b5991fc..c0412610cb0 100644 --- a/src/devices/bus/hp80_io/82937.cpp +++ b/src/devices/bus/hp80_io/82937.cpp @@ -253,7 +253,7 @@ void hp82937_io_card_device::device_reset() void hp82937_io_card_device::update_data_out() { - m_ieee488->write_dio(m_dio_out ? m_cpu->p2_r(machine().dummy_space() , 0) : 0xff); + m_ieee488->write_dio(m_dio_out ? m_cpu->p2_r() : 0xff); } void hp82937_io_card_device::update_signals() @@ -264,7 +264,7 @@ void hp82937_io_card_device::update_signals() } m_updating = true; bool ctrl_active = BIT(m_latch , LATCH_CA_BIT); - uint8_t p1 = m_cpu->p1_r(machine().dummy_space() , 0); + uint8_t p1 = m_cpu->p1_r(); m_iatn = BIT(p1 , P1_ATN_BIT); if (ctrl_active) { m_ieee488->host_atn_w(m_iatn); diff --git a/src/devices/cpu/mcs48/mcs48.cpp b/src/devices/cpu/mcs48/mcs48.cpp index f80cfbc9381..c720507205b 100644 --- a/src/devices/cpu/mcs48/mcs48.cpp +++ b/src/devices/cpu/mcs48/mcs48.cpp @@ -1375,17 +1375,6 @@ WRITE8_MEMBER( upi41_cpu_device::upi41_master_w ) } -READ8_MEMBER(mcs48_cpu_device::p1_r) -{ - return m_p1; -} - -READ8_MEMBER(mcs48_cpu_device::p2_r) -{ - return m_p2; -} - - /*************************************************************************** GENERAL CONTEXT ACCESS ***************************************************************************/ diff --git a/src/devices/cpu/mcs48/mcs48.h b/src/devices/cpu/mcs48/mcs48.h index fe8affa2387..ede81b5e87f 100644 --- a/src/devices/cpu/mcs48/mcs48.h +++ b/src/devices/cpu/mcs48/mcs48.h @@ -159,8 +159,8 @@ public: auto t1_in_cb() { return m_test_in_cb[1].bind(); } auto prog_out_cb() { return m_prog_out_cb.bind(); } - DECLARE_READ8_MEMBER(p1_r); - DECLARE_READ8_MEMBER(p2_r); + uint8_t p1_r() { return m_p1; } + uint8_t p2_r() { return m_p2; } void data_6bit(address_map &map); void data_7bit(address_map &map); diff --git a/src/devices/machine/ins8250.cpp b/src/devices/machine/ins8250.cpp index 8ef13d8c105..07259c60a43 100644 --- a/src/devices/machine/ins8250.cpp +++ b/src/devices/machine/ins8250.cpp @@ -235,6 +235,11 @@ void ins8250_uart_device::clear_int(int flag) update_interrupt(); } +READ_LINE_MEMBER(ins8250_uart_device::intrpt_r) +{ + return !BIT(m_regs.iir, 0); +} + // Baud rate generator is reset after writing to either byte of divisor latch void ins8250_uart_device::update_baud_rate() { diff --git a/src/devices/machine/ins8250.h b/src/devices/machine/ins8250.h index 0db2e4598cf..454f3ecd9a1 100644 --- a/src/devices/machine/ins8250.h +++ b/src/devices/machine/ins8250.h @@ -33,13 +33,15 @@ public: auto out_out1_callback() { return m_out_out1_cb.bind(); } auto out_out2_callback() { return m_out_out2_cb.bind(); } - DECLARE_WRITE8_MEMBER( ins8250_w ); - DECLARE_READ8_MEMBER( ins8250_r ); - DECLARE_WRITE_LINE_MEMBER( dcd_w ); - DECLARE_WRITE_LINE_MEMBER( dsr_w ); - DECLARE_WRITE_LINE_MEMBER( ri_w ); - DECLARE_WRITE_LINE_MEMBER( cts_w ); - DECLARE_WRITE_LINE_MEMBER( rx_w ); + DECLARE_WRITE8_MEMBER(ins8250_w); + DECLARE_READ8_MEMBER(ins8250_r); + + DECLARE_WRITE_LINE_MEMBER(dcd_w); + DECLARE_WRITE_LINE_MEMBER(dsr_w); + DECLARE_WRITE_LINE_MEMBER(ri_w); + DECLARE_WRITE_LINE_MEMBER(cts_w); + DECLARE_WRITE_LINE_MEMBER(rx_w); + DECLARE_READ_LINE_MEMBER(intrpt_r); protected: enum class dev_type { diff --git a/src/mame/drivers/atetris.cpp b/src/mame/drivers/atetris.cpp index 3640ee05bdf..df815c4295e 100644 --- a/src/mame/drivers/atetris.cpp +++ b/src/mame/drivers/atetris.cpp @@ -239,7 +239,7 @@ void atetris_mcu_state::atetrisb3_map(address_map &map) READ8_MEMBER(atetris_mcu_state::mcu_bus_r) { - switch (m_mcu->p2_r(space, 0) & 0xf0) + switch (m_mcu->p2_r() & 0xf0) { case 0x40: return m_soundlatch[1]->read(space, 0); @@ -255,7 +255,7 @@ READ8_MEMBER(atetris_mcu_state::mcu_bus_r) WRITE8_MEMBER(atetris_mcu_state::mcu_p2_w) { if ((data & 0xc0) == 0x80) - m_sn[(data >> 4) & 3]->write(m_mcu->p1_r(space, 0)); + m_sn[(data >> 4) & 3]->write(m_mcu->p1_r()); } WRITE8_MEMBER(atetris_mcu_state::mcu_reg_w) |