diff options
Diffstat (limited to 'src')
78 files changed, 799 insertions, 750 deletions
diff --git a/src/devices/bus/a2bus/a2hsscsi.cpp b/src/devices/bus/a2bus/a2hsscsi.cpp index 258c63a1c73..ec4eea8080a 100644 --- a/src/devices/bus/a2bus/a2hsscsi.cpp +++ b/src/devices/bus/a2bus/a2hsscsi.cpp @@ -163,7 +163,7 @@ uint8_t a2bus_hsscsi_device::read_c0nx(uint8_t offset) case 6: case 7: // logerror("Read 5380 @ %x\n", offset); - return m_ncr5380->read(machine().dummy_space(), offset); + return m_ncr5380->read(offset); case 0xc: return 0x00; // indicate watchdog? @@ -200,7 +200,7 @@ void a2bus_hsscsi_device::write_c0nx(uint8_t offset, uint8_t data) case 6: case 7: // logerror("%02x to 5380 reg %x\n", data, offset); - m_ncr5380->write(machine().dummy_space(), offset, data); + m_ncr5380->write(offset, data); break; #if 0 case 8: // DMA address low diff --git a/src/devices/bus/a2bus/a2scsi.cpp b/src/devices/bus/a2bus/a2scsi.cpp index 6c857d558a0..014414e7e98 100644 --- a/src/devices/bus/a2bus/a2scsi.cpp +++ b/src/devices/bus/a2bus/a2scsi.cpp @@ -154,7 +154,7 @@ uint8_t a2bus_scsi_device::read_c0nx(uint8_t offset) case 6: case 7: // logerror("Read 5380 @ %x\n", offset); - return m_ncr5380->read(machine().dummy_space(), offset); + return m_ncr5380->read(offset); case 8: // read and DACK return m_ncr5380->dma_r(); @@ -194,7 +194,7 @@ void a2bus_scsi_device::write_c0nx(uint8_t offset, uint8_t data) case 6: case 7: // logerror("%02x to 5380 reg %x\n", data, offset); - m_ncr5380->write(machine().dummy_space(), offset, data); + m_ncr5380->write(offset, data); break; case 8: // write and DACK diff --git a/src/devices/bus/bbc/rom/rtc.cpp b/src/devices/bus/bbc/rom/rtc.cpp index ada8646cff1..c8e63c6b46b 100644 --- a/src/devices/bus/bbc/rom/rtc.cpp +++ b/src/devices/bus/bbc/rom/rtc.cpp @@ -82,20 +82,20 @@ READ8_MEMBER(bbc_stlrtc_device::read) switch (offset & 0x3fc0) { case 0x3e00: - data = m_rtc->read(space, 1); + data = m_rtc->read(1); break; case 0x3e40: - m_rtc->write(space, 0, data); + m_rtc->write(0, data); break; case 0x3e80: case 0x3ec0: - data = m_rtc->read(space, 0); + data = m_rtc->read(0); break; case 0x3f00: case 0x3f40: case 0x3f80: case 0x3fc0: - m_rtc->write(space, 1, data); + m_rtc->write(1, data); break; } return data; diff --git a/src/devices/bus/cpc/magicsound.cpp b/src/devices/bus/cpc/magicsound.cpp index f491f61894d..1a85915dca1 100644 --- a/src/devices/bus/cpc/magicsound.cpp +++ b/src/devices/bus/cpc/magicsound.cpp @@ -115,12 +115,12 @@ void al_magicsound_device::device_reset() READ8_MEMBER(al_magicsound_device::dmac_r) { - return m_dmac->read(space,offset); + return m_dmac->read(offset); } WRITE8_MEMBER(al_magicsound_device::dmac_w) { - m_dmac->write(space,offset,data); + m_dmac->write(offset,data); } WRITE8_MEMBER(al_magicsound_device::timer_w) diff --git a/src/devices/bus/cpc/symbfac2.cpp b/src/devices/bus/cpc/symbfac2.cpp index a68ecdbd900..fbdb67f5085 100644 --- a/src/devices/bus/cpc/symbfac2.cpp +++ b/src/devices/bus/cpc/symbfac2.cpp @@ -161,27 +161,12 @@ WRITE8_MEMBER(cpc_symbiface2_device::ide_cs1_w) // #FD14 (read/write) read from or write into selected register READ8_MEMBER(cpc_symbiface2_device::rtc_r) { - switch(offset & 0x01) - { - case 0x00: - return m_rtc->read(space,1); - case 0x01: - return m_rtc->read(space,0); - } - return 0; + return m_rtc->read(~offset & 0x01); } WRITE8_MEMBER(cpc_symbiface2_device::rtc_w) { - switch(offset & 0x01) - { - case 0x00: - m_rtc->write(space,1,data); - break; - case 0x01: - m_rtc->write(space,0,data); - break; - } + m_rtc->write(~offset & 0x01, data); } // PS/2 Mouse connector diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp index cb1f385aa86..fca4c189033 100644 --- a/src/devices/bus/econet/e01.cpp +++ b/src/devices/bus/econet/e01.cpp @@ -647,7 +647,7 @@ WRITE8_MEMBER( econet_e01_device::hdc_irq_enable_w ) READ8_MEMBER( econet_e01_device::rtc_address_r ) { - return m_rtc->read(space, 0); + return m_rtc->read(0); } @@ -657,7 +657,7 @@ READ8_MEMBER( econet_e01_device::rtc_address_r ) WRITE8_MEMBER( econet_e01_device::rtc_address_w ) { - m_rtc->write(space, 0, data); + m_rtc->write(0, data); } @@ -667,7 +667,7 @@ WRITE8_MEMBER( econet_e01_device::rtc_address_w ) READ8_MEMBER( econet_e01_device::rtc_data_r ) { - return m_rtc->read(space, 1); + return m_rtc->read(1); } @@ -677,7 +677,7 @@ READ8_MEMBER( econet_e01_device::rtc_data_r ) WRITE8_MEMBER( econet_e01_device::rtc_data_w ) { - m_rtc->write(space, 1, data); + m_rtc->write(1, data); } diff --git a/src/devices/bus/electron/cart/click.cpp b/src/devices/bus/electron/cart/click.cpp index 25df0aa611d..bdeebeba79b 100644 --- a/src/devices/bus/electron/cart/click.cpp +++ b/src/devices/bus/electron/cart/click.cpp @@ -98,7 +98,7 @@ uint8_t electron_click_device::read(offs_t offset, int infc, int infd, int romqa { case 0xf8: case 0xf9: - data = m_rtc->read(machine().dummy_space(), offset & 0x01); + data = m_rtc->read(offset & 0x01); break; case 0xfc: data = m_page_register; @@ -135,7 +135,7 @@ void electron_click_device::write(offs_t offset, uint8_t data, int infc, int inf { case 0xf8: case 0xf9: - m_rtc->write(machine().dummy_space(), offset & 0x01, data); + m_rtc->write(offset & 0x01, data); break; case 0xfc: m_page_register = data; diff --git a/src/devices/bus/electron/cart/cumana.cpp b/src/devices/bus/electron/cart/cumana.cpp index dc965f6cb1d..8792395b503 100644 --- a/src/devices/bus/electron/cart/cumana.cpp +++ b/src/devices/bus/electron/cart/cumana.cpp @@ -103,7 +103,7 @@ uint8_t electron_cumana_device::read(offs_t offset, int infc, int infd, int romq break; case 0x98: case 0x9c: - data = m_rtc->read(machine().dummy_space(), BIT(offset, 2)); + data = m_rtc->read(BIT(offset, 2)); break; } } @@ -151,7 +151,7 @@ void electron_cumana_device::write(offs_t offset, uint8_t data, int infc, int in break; case 0x98: case 0x9c: - m_rtc->write(machine().dummy_space(), BIT(offset, 2), data); + m_rtc->write(BIT(offset, 2), data); break; } } diff --git a/src/devices/bus/lpci/southbridge.cpp b/src/devices/bus/lpci/southbridge.cpp index 67fd4acaf34..c4ce2257ed1 100644 --- a/src/devices/bus/lpci/southbridge.cpp +++ b/src/devices/bus/lpci/southbridge.cpp @@ -219,7 +219,7 @@ void southbridge_device::device_start() { spaceio = &m_maincpu->space(AS_IO); - spaceio->install_readwrite_handler(0x0000, 0x001f, read8_delegate(FUNC(am9517a_device::read), &(*m_dma8237_1)), write8_delegate(FUNC(am9517a_device::write), &(*m_dma8237_1)), 0xffffffff); + spaceio->install_readwrite_handler(0x0000, 0x001f, read8sm_delegate(FUNC(am9517a_device::read), &(*m_dma8237_1)), write8sm_delegate(FUNC(am9517a_device::write), &(*m_dma8237_1)), 0xffffffff); spaceio->install_readwrite_handler(0x0020, 0x003f, read8sm_delegate(FUNC(pic8259_device::read), &(*m_pic8259_master)), write8sm_delegate(FUNC(pic8259_device::write), &(*m_pic8259_master)), 0xffffffff); spaceio->install_readwrite_handler(0x0040, 0x005f, read8sm_delegate(FUNC(pit8254_device::read), &(*m_pit8254)), write8sm_delegate(FUNC(pit8254_device::write), &(*m_pit8254)), 0xffffffff); spaceio->install_readwrite_handler(0x0060, 0x0063, read8_delegate(FUNC(southbridge_device::at_portb_r), this), write8_delegate(FUNC(southbridge_device::at_portb_w), this), 0x0000ff00); @@ -493,12 +493,12 @@ WRITE_LINE_MEMBER( southbridge_device::iochck_w ) READ8_MEMBER( southbridge_device::at_dma8237_2_r ) { - return m_dma8237_2->read( space, offset / 2); + return m_dma8237_2->read(offset / 2); } WRITE8_MEMBER( southbridge_device::at_dma8237_2_w ) { - m_dma8237_2->write( space, offset / 2, data); + m_dma8237_2->write(offset / 2, data); } /*************************************************************************** @@ -560,9 +560,9 @@ void southbridge_extended_device::device_start() southbridge_device::device_start(); - spaceio.install_readwrite_handler(0x0060, 0x0063, read8_delegate(FUNC(at_keyboard_controller_device::data_r), &(*m_keybc)), write8_delegate(FUNC(at_keyboard_controller_device::data_w), &(*m_keybc)), 0x000000ff); - spaceio.install_readwrite_handler(0x0064, 0x0067, read8_delegate(FUNC(at_keyboard_controller_device::status_r), &(*m_keybc)), write8_delegate(FUNC(at_keyboard_controller_device::command_w), &(*m_keybc)), 0xffffffff); - spaceio.install_readwrite_handler(0x0070, 0x007f, read8_delegate(FUNC(ds12885_device::read), &(*m_ds12885)), write8_delegate(FUNC(ds12885_device::write), &(*m_ds12885)), 0xffffffff); + spaceio.install_readwrite_handler(0x0060, 0x0063, read8smo_delegate(FUNC(at_keyboard_controller_device::data_r), &(*m_keybc)), write8smo_delegate(FUNC(at_keyboard_controller_device::data_w), &(*m_keybc)), 0x000000ff); + spaceio.install_readwrite_handler(0x0064, 0x0067, read8smo_delegate(FUNC(at_keyboard_controller_device::status_r), &(*m_keybc)), write8smo_delegate(FUNC(at_keyboard_controller_device::command_w), &(*m_keybc)), 0xffffffff); + spaceio.install_readwrite_handler(0x0070, 0x007f, read8sm_delegate(FUNC(ds12885_device::read), &(*m_ds12885)), write8sm_delegate(FUNC(ds12885_device::write), &(*m_ds12885)), 0xffffffff); } //------------------------------------------------- @@ -580,9 +580,9 @@ WRITE8_MEMBER( southbridge_extended_device::write_rtc ) m_nmi_enabled = BIT(data,7); if (!m_nmi_enabled) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); - m_ds12885->write(space,0,data); + m_ds12885->write(0,data); } else { - m_ds12885->write(space,offset,data); + m_ds12885->write(offset,data); } } diff --git a/src/devices/bus/vme/vme.cpp b/src/devices/bus/vme/vme.cpp index f6254e32366..757874abae2 100644 --- a/src/devices/bus/vme/vme.cpp +++ b/src/devices/bus/vme/vme.cpp @@ -329,6 +329,36 @@ void vme_device::install_device(vme_amod_t amod, offs_t start, offs_t end, read8 } } +void vme_device::install_device(vme_amod_t amod, offs_t start, offs_t end, read8sm_delegate rhandler, write8sm_delegate whandler, uint32_t mask) +{ + LOG("%s %s AM%d D%02x\n", tag(), FUNCNAME, amod, m_prgwidth); + + LOG(" - width:%d\n", m_prgwidth); + + // TODO: support address modifiers and buscycles other than single access cycles + switch(amod) + { + case A16_SC: break; + case A24_SC: break; + case A32_SC: break; + default: fatalerror("VME D8: Non supported Address modifier: AM%02x\n", amod); + } + + switch(m_prgwidth) + { + case 16: + m_prgspace->install_readwrite_handler(start, end, rhandler, whandler, (uint16_t)(mask & 0x0000ffff)); + break; + case 24: + m_prgspace->install_readwrite_handler(start, end, rhandler, whandler, (uint32_t)(mask & 0x00ffffff)); + break; + case 32: + m_prgspace->install_readwrite_handler(start, end, rhandler, whandler, mask); + break; + default: fatalerror("VME D8: Bus width %d not supported\n", m_prgwidth); + } +} + // D16 bit devices in A16, A24 and A32 void vme_device::install_device(vme_amod_t amod, offs_t start, offs_t end, read16_delegate rhandler, write16_delegate whandler, uint32_t mask) { diff --git a/src/devices/bus/vme/vme.h b/src/devices/bus/vme/vme.h index edce2cd1246..755330f7689 100644 --- a/src/devices/bus/vme/vme.h +++ b/src/devices/bus/vme/vme.h @@ -182,6 +182,7 @@ public: AMOD_STANDARD_SUPERVIS_BLK = 0x3F }; void install_device(vme_amod_t amod, offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler, uint32_t mask); + void install_device(vme_amod_t amod, offs_t start, offs_t end, read8sm_delegate rhandler, write8sm_delegate whandler, uint32_t mask); // void install_device(vme_amod_t amod, offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler); void install_device(vme_amod_t amod, offs_t start, offs_t end, read16_delegate rhandler, write16_delegate whandler, uint32_t mask); void install_device(vme_amod_t amod, offs_t start, offs_t end, read32_delegate rhandler, write32_delegate whandler, uint32_t mask); diff --git a/src/devices/bus/vme/vme_mzr8300.cpp b/src/devices/bus/vme/vme_mzr8300.cpp index ca00a00a674..362beef2546 100644 --- a/src/devices/bus/vme/vme_mzr8300.cpp +++ b/src/devices/bus/vme/vme_mzr8300.cpp @@ -187,8 +187,8 @@ void vme_mzr8300_card_device::device_start() read8_delegate(FUNC(z80sio_device::ca_r), subdevice<z80sio_device>("sio0")), write8_delegate(FUNC(z80sio_device::ca_w), subdevice<z80sio_device>("sio0")), 0x00ff); m_vme->install_device(vme_device::A16_SC, base + 0x10, base + 0x13, // Am9513 - read8_delegate(FUNC(am9513_device::read8), subdevice<am9513_device>("stc")), - write8_delegate(FUNC(am9513_device::write8), subdevice<am9513_device>("stc")), 0x00ff); + read8sm_delegate(FUNC(am9513_device::read8), subdevice<am9513_device>("stc")), + write8sm_delegate(FUNC(am9513_device::write8), subdevice<am9513_device>("stc")), 0x00ff); } void vme_mzr8300_card_device::device_reset() diff --git a/src/devices/cpu/nec/v5x.cpp b/src/devices/cpu/nec/v5x.cpp index 533a112a7a4..bed8b42bc73 100644 --- a/src/devices/cpu/nec/v5x.cpp +++ b/src/devices/cpu/nec/v5x.cpp @@ -199,8 +199,8 @@ void v53_device::install_peripheral_io() } else // uPD71071 mode space(AS_IO).install_readwrite_handler(base + 0x00, base + 0x0f, - read8_delegate(FUNC(v5x_dmau_device::read), m_dmau.target()), - write8_delegate(FUNC(v5x_dmau_device::write), m_dmau.target()), 0xffff); + read8sm_delegate(FUNC(v5x_dmau_device::read), m_dmau.target()), + write8sm_delegate(FUNC(v5x_dmau_device::write), m_dmau.target()), 0xffff); } if (m_OPSEL & OPSEL_IS) @@ -264,8 +264,8 @@ void v50_device::install_peripheral_io() u16 const base = ((m_OPHA << 8) | m_DULA) & 0xfffe; space(AS_IO).install_readwrite_handler(base + 0x00, base + 0x0f, - read8_delegate(FUNC(v5x_dmau_device::read), m_dmau.target()), - write8_delegate(FUNC(v5x_dmau_device::write), m_dmau.target()), 0xffff); + read8sm_delegate(FUNC(v5x_dmau_device::read), m_dmau.target()), + write8sm_delegate(FUNC(v5x_dmau_device::write), m_dmau.target()), 0xffff); } if (m_OPSEL & OPSEL_IS) diff --git a/src/devices/machine/am9513.cpp b/src/devices/machine/am9513.cpp index c17ae1f09fe..6506510369f 100644 --- a/src/devices/machine/am9513.cpp +++ b/src/devices/machine/am9513.cpp @@ -1382,7 +1382,7 @@ void am9513_device::data_write(u16 data) // read8 - 8-bit read access //------------------------------------------------- -READ8_MEMBER(am9513_device::read8) +u8 am9513_device::read8(offs_t offset) { if (BIT(offset, 0)) return status_read(); @@ -1395,7 +1395,7 @@ READ8_MEMBER(am9513_device::read8) // write8 - 8-bit write access //------------------------------------------------- -WRITE8_MEMBER(am9513_device::write8) +void am9513_device::write8(offs_t offset, u8 data) { if (BIT(offset, 0)) { @@ -1412,7 +1412,7 @@ WRITE8_MEMBER(am9513_device::write8) // read16 - 16-bit read access //------------------------------------------------- -READ16_MEMBER(am9513_device::read16) +u16 am9513_device::read16(offs_t offset) { if (BIT(offset, 0)) return status_read() | 0xff00; @@ -1429,7 +1429,7 @@ READ16_MEMBER(am9513_device::read16) // write16 - 16-bit write access //------------------------------------------------- -WRITE16_MEMBER(am9513_device::write16) +void am9513_device::write16(offs_t offset, u16 data) { if ((!bus_is_16_bit() || BIT(offset, 0)) && (data & 0xff00) != 0xff00) logerror("Errant write of %02X to upper byte of %s register in %d-bit bus mode\n", diff --git a/src/devices/machine/am9513.h b/src/devices/machine/am9513.h index b591294d9b7..ea3fcfe6443 100644 --- a/src/devices/machine/am9513.h +++ b/src/devices/machine/am9513.h @@ -55,12 +55,12 @@ public: auto fout_cb() { return m_fout_cb.bind(); } // 8-bit data bus interface - DECLARE_READ8_MEMBER(read8); - DECLARE_WRITE8_MEMBER(write8); + u8 read8(offs_t offset); + void write8(offs_t offset, u8 data); // 16-bit data bus interface - DECLARE_READ16_MEMBER(read16); - DECLARE_WRITE16_MEMBER(write16); + u16 read16(offs_t offset); + void write16(offs_t offset, u16 data); // Source N inputs DECLARE_WRITE_LINE_MEMBER(source1_w) { write_source(0, state); } diff --git a/src/devices/machine/am9517a.cpp b/src/devices/machine/am9517a.cpp index d2637b11aa4..5fda6ed486c 100644 --- a/src/devices/machine/am9517a.cpp +++ b/src/devices/machine/am9517a.cpp @@ -723,7 +723,7 @@ void am9517a_device::execute_run() // read - //------------------------------------------------- -READ8_MEMBER( am9517a_device::read ) +uint8_t am9517a_device::read(offs_t offset) { uint8_t data = 0; @@ -787,7 +787,7 @@ READ8_MEMBER( am9517a_device::read ) // write - //------------------------------------------------- -WRITE8_MEMBER( am9517a_device::write ) +void am9517a_device::write(offs_t offset, uint8_t data) { if (!BIT(offset, 3)) { @@ -1024,7 +1024,7 @@ void v5x_dmau_device::device_reset() } -READ8_MEMBER(v5x_dmau_device::read) +uint8_t v5x_dmau_device::read(offs_t offset) { uint8_t ret = 0; int channel = m_selected_channel; @@ -1108,7 +1108,7 @@ READ8_MEMBER(v5x_dmau_device::read) return ret; } -WRITE8_MEMBER(v5x_dmau_device::write) +void v5x_dmau_device::write(offs_t offset, uint8_t data) { int channel = m_selected_channel; diff --git a/src/devices/machine/am9517a.h b/src/devices/machine/am9517a.h index 33dfd0cdaa1..a1e9215d125 100644 --- a/src/devices/machine/am9517a.h +++ b/src/devices/machine/am9517a.h @@ -61,8 +61,8 @@ public: template <unsigned C> auto out_iow_callback() { return m_out_iow_cb[C].bind(); } template <unsigned C> auto out_dack_callback() { return m_out_dack_cb[C].bind(); } - virtual DECLARE_READ8_MEMBER( read ); - virtual DECLARE_WRITE8_MEMBER( write ); + virtual uint8_t read(offs_t offset); + virtual void write(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER( hack_w ); DECLARE_WRITE_LINE_MEMBER( ready_w ); @@ -149,8 +149,8 @@ public: template <unsigned C> auto in_io16r_callback() { return m_in_io16r_cb[C].bind(); } template <unsigned C> auto out_io16w_callback() { return m_out_io16w_cb[C].bind(); } - virtual DECLARE_READ8_MEMBER( read ) override; - virtual DECLARE_WRITE8_MEMBER( write ) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; protected: // device-level overrides diff --git a/src/devices/machine/am9519.cpp b/src/devices/machine/am9519.cpp index b1700b38492..be0b8c3da10 100644 --- a/src/devices/machine/am9519.cpp +++ b/src/devices/machine/am9519.cpp @@ -103,7 +103,7 @@ IRQ_CALLBACK_MEMBER(am9519_device::iack_cb) } -READ8_MEMBER( am9519_device::stat_r ) +u8 am9519_device::stat_r() { u8 stat = 0; for(int n = 0, irq = m_prio; n < 8; n++, irq = (irq + 1) & 7) @@ -121,7 +121,7 @@ READ8_MEMBER( am9519_device::stat_r ) return stat; } -READ8_MEMBER( am9519_device::data_r ) +u8 am9519_device::data_r() { switch((m_mode & 0x60) >> 5) { @@ -137,7 +137,7 @@ READ8_MEMBER( am9519_device::data_r ) return 0; } -WRITE8_MEMBER( am9519_device::cmd_w ) +void am9519_device::cmd_w(u8 data) { m_cmd = data; switch(data >> 3) @@ -222,7 +222,7 @@ WRITE8_MEMBER( am9519_device::cmd_w ) set_timer(); } -WRITE8_MEMBER( am9519_device::data_w ) +void am9519_device::data_w(u8 data) { if((m_cmd & 0xf0) >= 0xb0) { diff --git a/src/devices/machine/am9519.h b/src/devices/machine/am9519.h index ddd4925696b..315e0bd890d 100644 --- a/src/devices/machine/am9519.h +++ b/src/devices/machine/am9519.h @@ -36,10 +36,10 @@ public: auto out_int_callback() { return m_out_int_func.bind(); } - DECLARE_READ8_MEMBER( stat_r ); - DECLARE_READ8_MEMBER( data_r ); - DECLARE_WRITE8_MEMBER( cmd_w ); - DECLARE_WRITE8_MEMBER( data_w ); + u8 stat_r(); + u8 data_r(); + void cmd_w(u8 data); + void data_w(u8 data); u32 acknowledge(); DECLARE_WRITE_LINE_MEMBER( ireq0_w ) { set_irq_line(0, state); } diff --git a/src/devices/machine/at_keybc.cpp b/src/devices/machine/at_keybc.cpp index c37bdb6ee1f..5e6ac779569 100644 --- a/src/devices/machine/at_keybc.cpp +++ b/src/devices/machine/at_keybc.cpp @@ -110,22 +110,22 @@ DEFINE_DEVICE_TYPE(PS2_KEYBOARD_CONTROLLER, ps2_keyboard_controller_device, "ps2 // KEYBOARD CONTROLLER DEVICE BASE //************************************************************************** -READ8_MEMBER(at_kbc_device_base::data_r) +uint8_t at_kbc_device_base::data_r() { - return m_mcu->upi41_master_r(space, 0U); + return m_mcu->upi41_master_r(machine().dummy_space(), 0U); } -READ8_MEMBER(at_kbc_device_base::status_r) +uint8_t at_kbc_device_base::status_r() { - return m_mcu->upi41_master_r(space, 1U); + return m_mcu->upi41_master_r(machine().dummy_space(), 1U); } -WRITE8_MEMBER(at_kbc_device_base::data_w) +void at_kbc_device_base::data_w(uint8_t data) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(at_kbc_device_base::write_data), this), unsigned(data)); } -WRITE8_MEMBER(at_kbc_device_base::command_w) +void at_kbc_device_base::command_w(uint8_t data) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(at_kbc_device_base::write_command), this), unsigned(data)); } @@ -265,7 +265,7 @@ ioport_constructor at_keyboard_controller_device::device_input_ports() const return INPUT_PORTS_NAME(at_kbc); } -WRITE8_MEMBER(at_keyboard_controller_device::p2_w) +void at_keyboard_controller_device::p2_w(uint8_t data) { set_hot_res(BIT(~data, 0)); set_gate_a20(BIT(data, 1)); @@ -279,11 +279,11 @@ WRITE8_MEMBER(at_keyboard_controller_device::p2_w) // PS/2 KEYBOARD/MOUSE CONTROLLER DEVICE //************************************************************************** -READ8_MEMBER(ps2_keyboard_controller_device::data_r) +uint8_t ps2_keyboard_controller_device::data_r() { set_kbd_irq(0U); set_mouse_irq(0U); - return m_mcu->upi41_master_r(space, 0U); + return m_mcu->upi41_master_r(machine().dummy_space(), 0U); } WRITE_LINE_MEMBER(ps2_keyboard_controller_device::mouse_clk_w) @@ -385,12 +385,12 @@ TIMER_CALLBACK_MEMBER(ps2_keyboard_controller_device::set_mouse_data_in) m_mouse_data_in = param ? 1U : 0U; } -READ8_MEMBER(ps2_keyboard_controller_device::p1_r) +uint8_t ps2_keyboard_controller_device::p1_r() { return kbd_data_r() | (mouse_data_r() << 1) | 0xfcU; } -WRITE8_MEMBER(ps2_keyboard_controller_device::p2_w) +void ps2_keyboard_controller_device::p2_w(uint8_t data) { set_hot_res(BIT(~data, 0)); set_gate_a20(BIT(data, 1)); diff --git a/src/devices/machine/at_keybc.h b/src/devices/machine/at_keybc.h index 77bf039a7a1..5ff11aa6ba1 100644 --- a/src/devices/machine/at_keybc.h +++ b/src/devices/machine/at_keybc.h @@ -30,10 +30,10 @@ public: auto kbd_data() { return m_kbd_data_cb.bind(); } // open collector with 10kΩ pull-up // host interface - virtual DECLARE_READ8_MEMBER(data_r); - virtual DECLARE_READ8_MEMBER(status_r); - DECLARE_WRITE8_MEMBER(data_w); - DECLARE_WRITE8_MEMBER(command_w); + virtual uint8_t data_r(); + virtual uint8_t status_r(); + void data_w(uint8_t data); + void command_w(uint8_t data); // inputs from keyboard DECLARE_WRITE_LINE_MEMBER(kbd_clk_w); @@ -93,7 +93,7 @@ protected: private: // MCU I/O handlers - DECLARE_WRITE8_MEMBER(p2_w); + void p2_w(uint8_t data); }; @@ -112,7 +112,7 @@ public: auto mouse_data() { return m_mouse_data_cb.bind(); } // open collector with 10kΩ pull-up // host interface - virtual DECLARE_READ8_MEMBER(data_r) override; + virtual uint8_t data_r() override; // inputs from mouse DECLARE_WRITE_LINE_MEMBER(mouse_clk_w); @@ -143,8 +143,8 @@ private: TIMER_CALLBACK_MEMBER(set_mouse_data_in); // MCU I/O handlers - DECLARE_READ8_MEMBER(p1_r); - DECLARE_WRITE8_MEMBER(p2_w); + uint8_t p1_r(); + void p2_w(uint8_t data); devcb_write_line m_mouse_irq_cb; devcb_write_line m_mouse_clk_cb, m_mouse_data_cb; diff --git a/src/devices/machine/cs4031.cpp b/src/devices/machine/cs4031.cpp index 1cb9cf163ab..13ec9b90a6d 100644 --- a/src/devices/machine/cs4031.cpp +++ b/src/devices/machine/cs4031.cpp @@ -263,19 +263,19 @@ void cs4031_device::device_start() m_space->install_rom(0xffff0000, 0xffffffff, m_bios + 0xf0000); // install i/o accesses - m_space_io->install_readwrite_handler(0x0000, 0x000f, read8_delegate(FUNC(am9517a_device::read), &(*m_dma1)), write8_delegate(FUNC(am9517a_device::write), &(*m_dma1)), 0xffffffff); + m_space_io->install_readwrite_handler(0x0000, 0x000f, read8sm_delegate(FUNC(am9517a_device::read), &(*m_dma1)), write8sm_delegate(FUNC(am9517a_device::write), &(*m_dma1)), 0xffffffff); m_space_io->install_readwrite_handler(0x0020, 0x0023, read8sm_delegate(FUNC(pic8259_device::read), &(*m_intc1)), write8sm_delegate(FUNC(pic8259_device::write), &(*m_intc1)), 0x0000ffff); - m_space_io->install_write_handler(0x0020, 0x0023, write8_delegate(FUNC(cs4031_device::config_address_w), this), 0x00ff0000); - m_space_io->install_readwrite_handler(0x0020, 0x0023, read8_delegate(FUNC(cs4031_device::config_data_r), this), write8_delegate(FUNC(cs4031_device::config_data_w), this), 0xff000000); + m_space_io->install_write_handler(0x0020, 0x0023, write8smo_delegate(FUNC(cs4031_device::config_address_w), this), 0x00ff0000); + m_space_io->install_readwrite_handler(0x0020, 0x0023, read8smo_delegate(FUNC(cs4031_device::config_data_r), this), write8smo_delegate(FUNC(cs4031_device::config_data_w), this), 0xff000000); m_space_io->install_readwrite_handler(0x0040, 0x0043, read8sm_delegate(FUNC(pit8254_device::read), &(*m_ctc)), write8sm_delegate(FUNC(pit8254_device::write), &(*m_ctc)), 0xffffffff); - m_space_io->install_readwrite_handler(0x0060, 0x0063, read8_delegate(FUNC(cs4031_device::keyb_data_r), this), write8_delegate(FUNC(cs4031_device::keyb_data_w), this), 0x000000ff); - m_space_io->install_readwrite_handler(0x0060, 0x0063, read8_delegate(FUNC(cs4031_device::portb_r), this), write8_delegate(FUNC(cs4031_device::portb_w), this), 0x0000ff00); - m_space_io->install_readwrite_handler(0x0064, 0x0067, read8_delegate(FUNC(cs4031_device::keyb_status_r), this), write8_delegate(FUNC(cs4031_device::keyb_command_w), this), 0x000000ff); - m_space_io->install_readwrite_handler(0x0070, 0x0073, read8_delegate(FUNC(mc146818_device::read), &(*m_rtc)), write8_delegate(FUNC(cs4031_device::rtc_w), this), 0x0000ffff); - m_space_io->install_readwrite_handler(0x0080, 0x008f, read8_delegate(FUNC(cs4031_device::dma_page_r), this), write8_delegate(FUNC(cs4031_device::dma_page_w), this), 0xffffffff); - m_space_io->install_readwrite_handler(0x0090, 0x0093, read8_delegate(FUNC(cs4031_device::sysctrl_r), this), write8_delegate(FUNC(cs4031_device::sysctrl_w), this), 0x00ff0000); + m_space_io->install_readwrite_handler(0x0060, 0x0063, read8smo_delegate(FUNC(cs4031_device::keyb_data_r), this), write8smo_delegate(FUNC(cs4031_device::keyb_data_w), this), 0x000000ff); + m_space_io->install_readwrite_handler(0x0060, 0x0063, read8smo_delegate(FUNC(cs4031_device::portb_r), this), write8smo_delegate(FUNC(cs4031_device::portb_w), this), 0x0000ff00); + m_space_io->install_readwrite_handler(0x0064, 0x0067, read8smo_delegate(FUNC(cs4031_device::keyb_status_r), this), write8smo_delegate(FUNC(cs4031_device::keyb_command_w), this), 0x000000ff); + m_space_io->install_readwrite_handler(0x0070, 0x0073, read8sm_delegate(FUNC(mc146818_device::read), &(*m_rtc)), write8sm_delegate(FUNC(cs4031_device::rtc_w), this), 0x0000ffff); + m_space_io->install_readwrite_handler(0x0080, 0x008f, read8sm_delegate(FUNC(cs4031_device::dma_page_r), this), write8sm_delegate(FUNC(cs4031_device::dma_page_w), this), 0xffffffff); + m_space_io->install_readwrite_handler(0x0090, 0x0093, read8smo_delegate(FUNC(cs4031_device::sysctrl_r), this), write8smo_delegate(FUNC(cs4031_device::sysctrl_w), this), 0x00ff0000); m_space_io->install_readwrite_handler(0x00a0, 0x00a3, read8sm_delegate(FUNC(pic8259_device::read), &(*m_intc2)), write8sm_delegate(FUNC(pic8259_device::write), &(*m_intc2)), 0x0000ffff); - m_space_io->install_readwrite_handler(0x00c0, 0x00df, read8_delegate(FUNC(cs4031_device::dma2_r),this), write8_delegate(FUNC(cs4031_device::dma2_w),this), 0xffffffff); + m_space_io->install_readwrite_handler(0x00c0, 0x00df, read8sm_delegate(FUNC(cs4031_device::dma2_r),this), write8sm_delegate(FUNC(cs4031_device::dma2_w),this), 0xffffffff); } //------------------------------------------------- @@ -328,7 +328,7 @@ offs_t cs4031_device::page_offset() return 0xff0000; } -READ8_MEMBER( cs4031_device::dma_read_byte ) +uint8_t cs4031_device::dma_read_byte(offs_t offset) { if (m_dma_channel == -1) return 0xff; @@ -336,7 +336,7 @@ READ8_MEMBER( cs4031_device::dma_read_byte ) return m_space->read_byte(page_offset() + offset); } -WRITE8_MEMBER( cs4031_device::dma_write_byte ) +void cs4031_device::dma_write_byte(offs_t offset, uint8_t data) { if (m_dma_channel == -1) return; @@ -344,7 +344,7 @@ WRITE8_MEMBER( cs4031_device::dma_write_byte ) m_space->write_byte(page_offset() + offset, data); } -READ8_MEMBER( cs4031_device::dma_read_word ) +uint8_t cs4031_device::dma_read_word(offs_t offset) { if (m_dma_channel == -1) return 0xff; @@ -355,7 +355,7 @@ READ8_MEMBER( cs4031_device::dma_read_word ) return result; } -WRITE8_MEMBER( cs4031_device::dma_write_word ) +void cs4031_device::dma_write_word(offs_t offset, uint8_t data) { if (m_dma_channel == -1) return; @@ -431,7 +431,7 @@ void cs4031_device::trigger_nmi() } } -READ8_MEMBER( cs4031_device::intc1_slave_ack_r ) +uint8_t cs4031_device::intc1_slave_ack_r(offs_t offset) { if (offset == 2) // IRQ 2 return m_intc2->acknowledge(); @@ -478,13 +478,13 @@ WRITE_LINE_MEMBER( cs4031_device::ctc_out2_w ) // CHIPSET CONFIGURATION //************************************************************************** -WRITE8_MEMBER( cs4031_device::config_address_w ) +void cs4031_device::config_address_w(uint8_t data) { m_address = data; m_address_valid = (m_address < 0x20) ? true : false; } -READ8_MEMBER( cs4031_device::config_data_r ) +uint8_t cs4031_device::config_data_r() { uint8_t result = 0xff; @@ -501,7 +501,7 @@ READ8_MEMBER( cs4031_device::config_data_r ) return result; } -WRITE8_MEMBER( cs4031_device::config_data_w ) +void cs4031_device::config_data_w(uint8_t data) { if (m_address_valid) { @@ -694,21 +694,21 @@ void cs4031_device::keyboard_gatea20(int state) update_a20m(); } -READ8_MEMBER( cs4031_device::keyb_status_r ) +uint8_t cs4031_device::keyb_status_r() { LOGKEYBOARD("cs4031_device::keyb_status_r\n"); - return m_keybc->status_r(space, 0); + return m_keybc->status_r(); } -WRITE8_MEMBER( cs4031_device::keyb_command_blocked_w ) +void cs4031_device::keyb_command_blocked_w(uint8_t data) { // command is optionally blocked if (!BIT(m_registers[SOFT_RESET_AND_GATEA20], 7)) - m_keybc->command_w(space, 0, data); + m_keybc->command_w(data); } -WRITE8_MEMBER( cs4031_device::keyb_command_w ) +void cs4031_device::keyb_command_w(uint8_t data) { LOGKEYBOARD("cs4031_device::keyb_command_w: %02x\n", data); @@ -722,12 +722,12 @@ WRITE8_MEMBER( cs4031_device::keyb_command_w ) emulated_gatea20(1); // self-test is never blocked - m_keybc->command_w(space, 0, data); + m_keybc->command_w(data); break; case 0xd1: m_keybc_d1_written = true; - keyb_command_blocked_w(space, 0, data); + keyb_command_blocked_w(data); break; case 0xf0: @@ -756,7 +756,7 @@ WRITE8_MEMBER( cs4031_device::keyb_command_w ) emulated_gatea20(1); } - keyb_command_blocked_w(space, 0, data); + keyb_command_blocked_w(data); break; @@ -765,28 +765,28 @@ WRITE8_MEMBER( cs4031_device::keyb_command_w ) if (m_keybc_data_blocked) { m_keybc_data_blocked = false; - keyb_command_blocked_w(space, 0, data); + keyb_command_blocked_w(data); } else - m_keybc->command_w(space, 0, data); + m_keybc->command_w(data); break; // everything else goes directly to the keyboard controller default: - m_keybc->command_w(space, 0, data); + m_keybc->command_w(data); break; } } -READ8_MEMBER( cs4031_device::keyb_data_r ) +uint8_t cs4031_device::keyb_data_r() { LOGKEYBOARD("cs4031_device::keyb_data_r\n"); - return m_keybc->data_r(space, 0); + return m_keybc->data_r(); } -WRITE8_MEMBER( cs4031_device::keyb_data_w ) +void cs4031_device::keyb_data_w(uint8_t data) { LOGKEYBOARD("cs4031_device::keyb_data_w: %02x\n", data); @@ -800,7 +800,7 @@ WRITE8_MEMBER( cs4031_device::keyb_data_w ) else { m_keybc_data_blocked = false; - m_keybc->data_w(space, 0, data); + m_keybc->data_w(data); } } @@ -839,7 +839,7 @@ WRITE_LINE_MEMBER( cs4031_device::kbrst_w ) 1 - Fast Gate A20 */ -WRITE8_MEMBER( cs4031_device::sysctrl_w ) +void cs4031_device::sysctrl_w(uint8_t data) { LOGIO("cs4031_device::sysctrl_w: %u\n", data); @@ -855,7 +855,7 @@ WRITE8_MEMBER( cs4031_device::sysctrl_w ) m_cpureset = BIT(data, 0); } -READ8_MEMBER( cs4031_device::sysctrl_r ) +uint8_t cs4031_device::sysctrl_r() { uint8_t result = 0; // reserved bits read as 0? @@ -885,7 +885,7 @@ READ8_MEMBER( cs4031_device::sysctrl_r ) 7 - Parity check latch (r) [not emulated] */ -READ8_MEMBER( cs4031_device::portb_r ) +uint8_t cs4031_device::portb_r() { if (0) logerror("cs4031_device::portb_r: %02x\n", m_portb); @@ -893,7 +893,7 @@ READ8_MEMBER( cs4031_device::portb_r ) return m_portb; } -WRITE8_MEMBER( cs4031_device::portb_w ) +void cs4031_device::portb_w(uint8_t data) { if (0) logerror("cs4031_device::portb_w: %02x\n", data); @@ -919,7 +919,7 @@ WRITE8_MEMBER( cs4031_device::portb_w ) 7 - NMI mask 6:0 - RTC address */ -WRITE8_MEMBER( cs4031_device::rtc_w ) +void cs4031_device::rtc_w(offs_t offset, uint8_t data) { if (0) logerror("cs4031_device::rtc_w: %02x\n", data); @@ -930,5 +930,5 @@ WRITE8_MEMBER( cs4031_device::rtc_w ) data &= 0x7f; } - m_rtc->write(space, offset, data); + m_rtc->write(offset, data); } diff --git a/src/devices/machine/cs4031.h b/src/devices/machine/cs4031.h index e8b6e314f93..3e554e91904 100644 --- a/src/devices/machine/cs4031.h +++ b/src/devices/machine/cs4031.h @@ -59,23 +59,23 @@ public: auto spkr() { return m_write_spkr.bind(); } // internal io - DECLARE_WRITE8_MEMBER( config_address_w ); - DECLARE_READ8_MEMBER( config_data_r ); - DECLARE_WRITE8_MEMBER( config_data_w ); - DECLARE_READ8_MEMBER( portb_r ); - DECLARE_WRITE8_MEMBER( portb_w ); - DECLARE_WRITE8_MEMBER( rtc_w ); - DECLARE_WRITE8_MEMBER( sysctrl_w ); - DECLARE_READ8_MEMBER( sysctrl_r ); - DECLARE_READ8_MEMBER( dma_page_r ) { return m_dma_page[offset]; } - DECLARE_WRITE8_MEMBER( dma_page_w ) { m_dma_page[offset] = data; } - DECLARE_READ8_MEMBER( dma2_r ) { return m_dma2->read(space, offset / 2); } - DECLARE_WRITE8_MEMBER( dma2_w ) { m_dma2->write(space, offset / 2, data); } - DECLARE_READ8_MEMBER( keyb_data_r ); - DECLARE_WRITE8_MEMBER( keyb_data_w ); - DECLARE_READ8_MEMBER( keyb_status_r ); - DECLARE_WRITE8_MEMBER( keyb_command_w ); - DECLARE_WRITE8_MEMBER( keyb_command_blocked_w ); + void config_address_w(uint8_t data); + uint8_t config_data_r(); + void config_data_w(uint8_t data); + uint8_t portb_r(); + void portb_w(uint8_t data); + void rtc_w(offs_t offset, uint8_t data); + void sysctrl_w(uint8_t data); + uint8_t sysctrl_r(); + uint8_t dma_page_r(offs_t offset) { return m_dma_page[offset]; } + void dma_page_w(offs_t offset, uint8_t data) { m_dma_page[offset] = data; } + uint8_t dma2_r(offs_t offset) { return m_dma2->read(offset / 2); } + void dma2_w(offs_t offset, uint8_t data) { m_dma2->write(offset / 2, data); } + uint8_t keyb_data_r(); + void keyb_data_w(uint8_t data); + uint8_t keyb_status_r(); + void keyb_command_w(uint8_t data); + void keyb_command_blocked_w(uint8_t data); // input lines DECLARE_WRITE_LINE_MEMBER( irq01_w ) { m_intc1->ir1_w(state); } @@ -205,25 +205,25 @@ private: uint8_t m_registers[0x20]; - DECLARE_READ8_MEMBER( dma_read_byte ); - DECLARE_WRITE8_MEMBER( dma_write_byte ); - DECLARE_READ8_MEMBER( dma_read_word ); - DECLARE_WRITE8_MEMBER( dma_write_word ); + uint8_t dma_read_byte(offs_t offset); + 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); DECLARE_WRITE_LINE_MEMBER( dma1_eop_w ); - DECLARE_READ8_MEMBER( dma1_ior0_r ) { return m_read_ior(0); } - DECLARE_READ8_MEMBER( dma1_ior1_r ) { return m_read_ior(1); } - DECLARE_READ8_MEMBER( dma1_ior2_r ) { return m_read_ior(2); } - DECLARE_READ8_MEMBER( dma1_ior3_r ) { return m_read_ior(3); } - DECLARE_READ8_MEMBER( dma2_ior1_r ) { uint16_t const result = m_read_ior(5); m_dma_high_byte = result >> 8; return result; } - DECLARE_READ8_MEMBER( dma2_ior2_r ) { uint16_t const result = m_read_ior(6); m_dma_high_byte = result >> 8; return result; } - DECLARE_READ8_MEMBER( dma2_ior3_r ) { uint16_t const result = m_read_ior(7); m_dma_high_byte = result >> 8; return result; } - DECLARE_WRITE8_MEMBER( dma1_iow0_w ) { m_write_iow(0, data, 0xffff); } - DECLARE_WRITE8_MEMBER( dma1_iow1_w ) { m_write_iow(1, data, 0xffff); } - DECLARE_WRITE8_MEMBER( dma1_iow2_w ) { m_write_iow(2, data, 0xffff); } - DECLARE_WRITE8_MEMBER( dma1_iow3_w ) { m_write_iow(3, data, 0xffff); } - DECLARE_WRITE8_MEMBER( dma2_iow1_w ) { m_write_iow(5, (m_dma_high_byte << 8) | data, 0xffff); } - DECLARE_WRITE8_MEMBER( dma2_iow2_w ) { m_write_iow(6, (m_dma_high_byte << 8) | data, 0xffff); } - DECLARE_WRITE8_MEMBER( dma2_iow3_w ) { m_write_iow(7, (m_dma_high_byte << 8) | data, 0xffff); } + uint8_t dma1_ior0_r() { return m_read_ior(0); } + uint8_t dma1_ior1_r() { return m_read_ior(1); } + uint8_t dma1_ior2_r() { return m_read_ior(2); } + uint8_t dma1_ior3_r() { return m_read_ior(3); } + uint8_t dma2_ior1_r() { uint16_t const result = m_read_ior(5); m_dma_high_byte = result >> 8; return result; } + uint8_t dma2_ior2_r() { uint16_t const result = m_read_ior(6); m_dma_high_byte = result >> 8; return result; } + uint8_t dma2_ior3_r() { uint16_t const result = m_read_ior(7); m_dma_high_byte = result >> 8; return result; } + void dma1_iow0_w(uint8_t data) { m_write_iow(0, data, 0xffff); } + void dma1_iow1_w(uint8_t data) { m_write_iow(1, data, 0xffff); } + void dma1_iow2_w(uint8_t data) { m_write_iow(2, data, 0xffff); } + void dma1_iow3_w(uint8_t data) { m_write_iow(3, data, 0xffff); } + void dma2_iow1_w(uint8_t data) { m_write_iow(5, (m_dma_high_byte << 8) | data, 0xffff); } + void dma2_iow2_w(uint8_t data) { m_write_iow(6, (m_dma_high_byte << 8) | data, 0xffff); } + void dma2_iow3_w(uint8_t data) { m_write_iow(7, (m_dma_high_byte << 8) | data, 0xffff); } DECLARE_WRITE_LINE_MEMBER( dma1_dack0_w ) { set_dma_channel(0, state); } DECLARE_WRITE_LINE_MEMBER( dma1_dack1_w ) { set_dma_channel(1, state); } DECLARE_WRITE_LINE_MEMBER( dma1_dack2_w ) { set_dma_channel(2, state); } @@ -234,7 +234,7 @@ private: DECLARE_WRITE_LINE_MEMBER( dma2_dack3_w ) { set_dma_channel(7, state); } DECLARE_WRITE_LINE_MEMBER( dma2_hreq_w ) { m_write_hold(state); } DECLARE_WRITE_LINE_MEMBER( intc1_int_w ) { m_write_intr(state); } - DECLARE_READ8_MEMBER( intc1_slave_ack_r ); + uint8_t intc1_slave_ack_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER( ctc_out1_w ); DECLARE_WRITE_LINE_MEMBER( ctc_out2_w ); }; diff --git a/src/devices/machine/ds128x.cpp b/src/devices/machine/ds128x.cpp index a234e3abf82..91e022e07e7 100644 --- a/src/devices/machine/ds128x.cpp +++ b/src/devices/machine/ds128x.cpp @@ -44,38 +44,38 @@ ds12885ext_device::ds12885ext_device(const machine_config &mconfig, const char * // ds12885ext_device - handlers that allow acces to extended memory size //------------------------------------------------- -READ8_MEMBER(ds12885ext_device::read_extended) +uint8_t ds12885ext_device::read_extended(offs_t offset) { switch (offset) { case 0: case 1: - return read(space, offset, mem_mask); + return read(offset); break; case 2: case 3: - return read(space, offset - 2, mem_mask); + return read(offset - 2); break; default: return 0xff; } } -WRITE8_MEMBER(ds12885ext_device::write_extended) +void ds12885ext_device::write_extended(offs_t offset, uint8_t data) { switch (offset) { case 0: - write(space, offset, data & 127, mem_mask); + write(offset, data & 127); break; case 1: - write(space, offset, data, mem_mask); + write(offset, data); break; case 2: - write(space, offset - 2, data, mem_mask); + write(offset - 2, data); break; case 3: - write(space, offset - 2, data, mem_mask); + write(offset - 2, data); break; } } diff --git a/src/devices/machine/ds128x.h b/src/devices/machine/ds128x.h index 30199cf0738..7ade1bfa431 100644 --- a/src/devices/machine/ds128x.h +++ b/src/devices/machine/ds128x.h @@ -33,8 +33,8 @@ public: ds12885ext_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 32'768); // read/write access to extended ram - DECLARE_READ8_MEMBER(read_extended); - DECLARE_WRITE8_MEMBER(write_extended); + uint8_t read_extended(offs_t offset); + void write_extended(offs_t offset, uint8_t data); protected: virtual int data_size() override { return 256; } diff --git a/src/devices/machine/fdc37c93x.cpp b/src/devices/machine/fdc37c93x.cpp index 05c87fd38ef..8ff5afc76d4 100644 --- a/src/devices/machine/fdc37c93x.cpp +++ b/src/devices/machine/fdc37c93x.cpp @@ -639,12 +639,12 @@ void fdc37c93x_device::map_rtc(address_map &map) READ8_MEMBER(fdc37c93x_device::rtc_read) { - return ds12885_rtcdev->read(space, offset, mem_mask); + return ds12885_rtcdev->read(offset); } WRITE8_MEMBER(fdc37c93x_device::rtc_write) { - ds12885_rtcdev->write(space, offset, data, mem_mask); + ds12885_rtcdev->write(offset, data); } void fdc37c93x_device::map_rtc_addresses() diff --git a/src/devices/machine/i8155.cpp b/src/devices/machine/i8155.cpp index 779874a244d..b5027368633 100644 --- a/src/devices/machine/i8155.cpp +++ b/src/devices/machine/i8155.cpp @@ -406,7 +406,7 @@ void i8155_device::device_timer(emu_timer &timer, device_timer_id id, int param, // io_r - register read //------------------------------------------------- -READ8_MEMBER( i8155_device::io_r ) +uint8_t i8155_device::io_r(offs_t offset) { uint8_t data = 0; @@ -539,7 +539,7 @@ void i8155_device::register_w(int offset, uint8_t data) // io_w - register write //------------------------------------------------- -WRITE8_MEMBER( i8155_device::io_w ) +void i8155_device::io_w(offs_t offset, uint8_t data) { register_w(offset, data); } @@ -549,7 +549,7 @@ WRITE8_MEMBER( i8155_device::io_w ) // memory_r - internal RAM read //------------------------------------------------- -READ8_MEMBER( i8155_device::memory_r ) +uint8_t i8155_device::memory_r(offs_t offset) { return m_ram[offset & 0xff]; } @@ -559,7 +559,7 @@ READ8_MEMBER( i8155_device::memory_r ) // memory_w - internal RAM write //------------------------------------------------- -WRITE8_MEMBER( i8155_device::memory_w ) +void i8155_device::memory_w(offs_t offset, uint8_t data) { m_ram[offset & 0xff] = data; } @@ -569,7 +569,7 @@ WRITE8_MEMBER( i8155_device::memory_w ) // ale_w - address latch write //------------------------------------------------- -WRITE8_MEMBER( i8155_device::ale_w ) +void i8155_device::ale_w(offs_t offset, uint8_t data) { // I/O / memory select m_io_m = BIT(offset, 0); @@ -580,21 +580,21 @@ WRITE8_MEMBER( i8155_device::ale_w ) //------------------------------------------------- -// read - memory or I/O read +// data_r - memory or I/O read //------------------------------------------------- -READ8_MEMBER( i8155_device::read ) +uint8_t i8155_device::data_r() { uint8_t data = 0; switch (m_io_m) { case MEMORY: - data = memory_r(space, m_ad); + data = memory_r(m_ad); break; case IO: - data = io_r(space, m_ad); + data = io_r(m_ad); break; } @@ -603,19 +603,19 @@ READ8_MEMBER( i8155_device::read ) //------------------------------------------------- -// write - memory or I/O write +// data_w - memory or I/O write //------------------------------------------------- -WRITE8_MEMBER( i8155_device::write ) +void i8155_device::data_w(uint8_t data) { switch (m_io_m) { case MEMORY: - memory_w(space, m_ad, data); + memory_w(m_ad, data); break; case IO: - io_w(space, m_ad, data); + io_w(m_ad, data); break; } } diff --git a/src/devices/machine/i8155.h b/src/devices/machine/i8155.h index a17692211e6..2d6e49b2063 100644 --- a/src/devices/machine/i8155.h +++ b/src/devices/machine/i8155.h @@ -55,15 +55,15 @@ public: auto out_pc_callback() { return m_out_pc_cb.bind(); } auto out_to_callback() { return m_out_to_cb.bind(); } - DECLARE_READ8_MEMBER( io_r ); - DECLARE_WRITE8_MEMBER( io_w ); + uint8_t io_r(offs_t offset); + void io_w(offs_t offset, uint8_t data); - DECLARE_READ8_MEMBER( memory_r ); - DECLARE_WRITE8_MEMBER( memory_w ); + uint8_t memory_r(offs_t offset); + void memory_w(offs_t offset, uint8_t data); - DECLARE_WRITE8_MEMBER( ale_w ); - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); + void ale_w(offs_t offset, uint8_t data); + uint8_t data_r(); + void data_w(uint8_t data); protected: i8155_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/machine/i82371sb.cpp b/src/devices/machine/i82371sb.cpp index cec2c0d5555..b149d98a48f 100644 --- a/src/devices/machine/i82371sb.cpp +++ b/src/devices/machine/i82371sb.cpp @@ -834,12 +834,12 @@ WRITE_LINE_MEMBER( i82371sb_isa_device::iochck_w ) READ8_MEMBER( i82371sb_isa_device::at_dma8237_2_r ) { - return m_dma8237_2->read( space, offset / 2); + return m_dma8237_2->read(offset / 2); } WRITE8_MEMBER( i82371sb_isa_device::at_dma8237_2_w ) { - m_dma8237_2->write( space, offset / 2, data); + m_dma8237_2->write(offset / 2, data); } READ8_MEMBER(i82371sb_isa_device::eisa_irq_read) diff --git a/src/devices/machine/mc146818.cpp b/src/devices/machine/mc146818.cpp index 990d6f3ec35..1259e1502ca 100644 --- a/src/devices/machine/mc146818.cpp +++ b/src/devices/machine/mc146818.cpp @@ -510,7 +510,7 @@ void mc146818_device::update_irq() // read - I/O handler for reading //------------------------------------------------- -READ8_MEMBER( mc146818_device::read ) +uint8_t mc146818_device::read(offs_t offset) { uint8_t data = 0; switch (offset) @@ -520,14 +520,14 @@ READ8_MEMBER( mc146818_device::read ) break; case 1: - data = read_direct(space, m_index); + data = read_direct(m_index); break; } return data; } -READ8_MEMBER( mc146818_device::read_direct ) +uint8_t mc146818_device::read_direct(offs_t offset) { uint8_t data = 0; @@ -569,7 +569,7 @@ READ8_MEMBER( mc146818_device::read_direct ) // write - I/O handler for writing //------------------------------------------------- -WRITE8_MEMBER( mc146818_device::write ) +void mc146818_device::write(offs_t offset, uint8_t data) { switch (offset) { @@ -578,12 +578,12 @@ WRITE8_MEMBER( mc146818_device::write ) break; case 1: - write_direct(space, m_index, data); + write_direct(m_index, data); break; } } -WRITE8_MEMBER( mc146818_device::write_direct ) +void mc146818_device::write_direct(offs_t offset, uint8_t data) { LOG("mc146818_port_w(): offset=0x%02x data=0x%02x\n", offset, data); diff --git a/src/devices/machine/mc146818.h b/src/devices/machine/mc146818.h index 499698a84cd..b1431964dde 100644 --- a/src/devices/machine/mc146818.h +++ b/src/devices/machine/mc146818.h @@ -39,12 +39,12 @@ public: void set_binary_year(int bin) { m_binyear = bin; } // read/write access - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); // direct-mapped read/write access - DECLARE_READ8_MEMBER( read_direct ); - DECLARE_WRITE8_MEMBER( write_direct ); + uint8_t read_direct(offs_t offset); + void write_direct(offs_t offset, uint8_t data); protected: mc146818_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/machine/ncr5380n.cpp b/src/devices/machine/ncr5380n.cpp index 4d09a910e46..e5132603609 100644 --- a/src/devices/machine/ncr5380n.cpp +++ b/src/devices/machine/ncr5380n.cpp @@ -288,12 +288,12 @@ void ncr5380n_device::delay_cycles(int cycles) tm->adjust(clocks_to_attotime(cycles)); } -READ8_MEMBER(ncr5380n_device::scsidata_r) +uint8_t ncr5380n_device::scsidata_r() { return scsi_bus->data_r(); } -WRITE8_MEMBER(ncr5380n_device::outdata_w) +void ncr5380n_device::outdata_w(uint8_t data) { m_outdata = data; @@ -304,12 +304,12 @@ WRITE8_MEMBER(ncr5380n_device::outdata_w) } } -READ8_MEMBER(ncr5380n_device::icmd_r) +uint8_t ncr5380n_device::icmd_r() { return m_icommand; } -WRITE8_MEMBER(ncr5380n_device::icmd_w) +void ncr5380n_device::icmd_w(uint8_t data) { // asserting to drive the data bus? if ((data & IC_DBUS) && !(m_icommand & IC_DBUS)) @@ -340,12 +340,12 @@ WRITE8_MEMBER(ncr5380n_device::icmd_w) delay(2); } -READ8_MEMBER(ncr5380n_device::mode_r) +uint8_t ncr5380n_device::mode_r() { return m_mode; } -WRITE8_MEMBER(ncr5380n_device::mode_w) +void ncr5380n_device::mode_w(uint8_t data) { // logerror("%s: mode_w %02x (%s)\n", tag(), data, machine().describe_context()); // arbitration bit being set? @@ -373,13 +373,13 @@ WRITE8_MEMBER(ncr5380n_device::mode_w) m_mode = data; } -READ8_MEMBER(ncr5380n_device::command_r) +uint8_t ncr5380n_device::command_r() { // logerror("%s: command_r %02x (%s)\n", tag(), m_tcommand, machine().describe_context()); return m_tcommand; } -WRITE8_MEMBER(ncr5380n_device::command_w) +void ncr5380n_device::command_w(uint8_t data) { // logerror("%s: command_w %02x (%s)\n", tag(), data, machine().describe_context()); m_tcommand = data; @@ -413,7 +413,7 @@ void ncr5380n_device::check_irq() #endif } -READ8_MEMBER(ncr5380n_device::status_r) +uint8_t ncr5380n_device::status_r() { uint32_t ctrl = scsi_bus->ctrl_r(); uint8_t res = status | @@ -429,11 +429,11 @@ READ8_MEMBER(ncr5380n_device::status_r) return res; } -WRITE8_MEMBER(ncr5380n_device::selenable_w) +void ncr5380n_device::selenable_w(uint8_t data) { } -READ8_MEMBER(ncr5380n_device::busandstatus_r) +uint8_t ncr5380n_device::busandstatus_r() { uint32_t ctrl = scsi_bus->ctrl_r(); uint8_t res = m_busstatus | @@ -445,28 +445,28 @@ READ8_MEMBER(ncr5380n_device::busandstatus_r) return res; } -WRITE8_MEMBER(ncr5380n_device::startdmasend_w) +void ncr5380n_device::startdmasend_w(uint8_t data) { logerror("%02x to start dma send\n", data); drq_set(); } -READ8_MEMBER(ncr5380n_device::indata_r) +uint8_t ncr5380n_device::indata_r() { return dma_r(); } -WRITE8_MEMBER(ncr5380n_device::startdmatargetrx_w) +void ncr5380n_device::startdmatargetrx_w(uint8_t data) { logerror("%02x to start dma target Rx\n", data); } -READ8_MEMBER(ncr5380n_device::resetparityirq_r) +uint8_t ncr5380n_device::resetparityirq_r() { return 0; } -WRITE8_MEMBER(ncr5380n_device::startdmainitrx_w) +void ncr5380n_device::startdmainitrx_w(uint8_t data) { // logerror("%02x to start dma initiator Rx\n", data); recv_byte(); @@ -518,73 +518,73 @@ void ncr5380n_device::drq_clear() } } -READ8_MEMBER(ncr5380n_device::read) +uint8_t ncr5380n_device::read(offs_t offset) { switch (offset & 7) { - case 0: - return scsidata_r(space, offset); + case 0: + return scsidata_r(); - case 1: - return icmd_r(space, offset); + case 1: + return icmd_r(); - case 2: - return mode_r(space, offset); + case 2: + return mode_r(); - case 3: - return command_r(space, offset); + case 3: + return command_r(); - case 4: - return status_r(space, offset); + case 4: + return status_r(); - case 5: - return busandstatus_r(space, offset); + case 5: + return busandstatus_r(); - case 6: - return indata_r(space, offset); + case 6: + return indata_r(); - case 7: - return resetparityirq_r(space, offset); + case 7: + return resetparityirq_r(); } return 0xff; } -WRITE8_MEMBER(ncr5380n_device::write) +void ncr5380n_device::write(offs_t offset, uint8_t data) { // logerror("%x to 5380 @ %x\n", data, offset); switch (offset & 7) { - case 0: - outdata_w(space, offset, data); - break; + case 0: + outdata_w(data); + break; - case 1: - icmd_w(space, offset, data); - break; + case 1: + icmd_w(data); + break; - case 2: - mode_w(space, offset, data); - break; + case 2: + mode_w(data); + break; - case 3: - command_w(space, offset, data); - break; + case 3: + command_w(data); + break; - case 4: - selenable_w(space, offset, data); - break; + case 4: + selenable_w(data); + break; - case 5: - startdmasend_w(space, offset, data); - break; + case 5: + startdmasend_w(data); + break; - case 6: - startdmatargetrx_w(space, offset, data); - break; + case 6: + startdmatargetrx_w(data); + break; - case 7: - startdmainitrx_w(space, offset, data); - break; + case 7: + startdmainitrx_w(data); + break; } } diff --git a/src/devices/machine/ncr5380n.h b/src/devices/machine/ncr5380n.h index 8d3a6fd30c5..365df032419 100644 --- a/src/devices/machine/ncr5380n.h +++ b/src/devices/machine/ncr5380n.h @@ -25,8 +25,8 @@ public: auto irq_handler() { return m_irq_handler.bind(); } auto drq_handler() { return m_drq_handler.bind(); } - DECLARE_READ8_MEMBER(read); - DECLARE_WRITE8_MEMBER(write); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); uint8_t dma_r(); void dma_w(uint8_t val); @@ -198,22 +198,22 @@ private: void map(address_map &map); - DECLARE_READ8_MEMBER(scsidata_r); - DECLARE_WRITE8_MEMBER(outdata_w); - DECLARE_READ8_MEMBER(icmd_r); - DECLARE_WRITE8_MEMBER(icmd_w); - DECLARE_READ8_MEMBER(mode_r); - DECLARE_WRITE8_MEMBER(mode_w); - DECLARE_READ8_MEMBER(command_r); - DECLARE_WRITE8_MEMBER(command_w); - DECLARE_READ8_MEMBER(status_r); - DECLARE_WRITE8_MEMBER(selenable_w); - DECLARE_READ8_MEMBER(busandstatus_r); - DECLARE_WRITE8_MEMBER(startdmasend_w); - DECLARE_READ8_MEMBER(indata_r); - DECLARE_WRITE8_MEMBER(startdmatargetrx_w); - DECLARE_READ8_MEMBER(resetparityirq_r); - DECLARE_WRITE8_MEMBER(startdmainitrx_w); + uint8_t scsidata_r(); + void outdata_w(uint8_t data); + uint8_t icmd_r(); + void icmd_w(uint8_t data); + uint8_t mode_r(); + void mode_w(uint8_t data); + uint8_t command_r(); + void command_w(uint8_t data); + uint8_t status_r(); + void selenable_w(uint8_t data); + uint8_t busandstatus_r(); + void startdmasend_w(uint8_t data); + uint8_t indata_r(); + void startdmatargetrx_w(uint8_t data); + uint8_t resetparityirq_r(); + void startdmainitrx_w(uint8_t data); devcb_write_line m_irq_handler; devcb_write_line m_drq_handler; diff --git a/src/devices/machine/ncr5385.cpp b/src/devices/machine/ncr5385.cpp index d5cd98a4a5f..6c1f4a3bb4e 100644 --- a/src/devices/machine/ncr5385.cpp +++ b/src/devices/machine/ncr5385.cpp @@ -34,7 +34,7 @@ void ncr5385_device::device_reset() m_diag_status_reg = DIAG_COMPLETE; } -WRITE8_MEMBER(ncr5385_device::write) +void ncr5385_device::write(offs_t offset, uint8_t data) { switch (offset) { @@ -96,7 +96,7 @@ WRITE8_MEMBER(ncr5385_device::write) } } -READ8_MEMBER(ncr5385_device::read) +uint8_t ncr5385_device::read(offs_t offset) { switch (offset) { diff --git a/src/devices/machine/ncr5385.h b/src/devices/machine/ncr5385.h index 8bd9c407a52..a1dec052045 100644 --- a/src/devices/machine/ncr5385.h +++ b/src/devices/machine/ncr5385.h @@ -58,8 +58,8 @@ public: auto irq() { return m_int.bind(); } - DECLARE_WRITE8_MEMBER(write); - DECLARE_READ8_MEMBER(read); + void write(offs_t offset, uint8_t data); + uint8_t read(offs_t offset); protected: // device-level overrides diff --git a/src/devices/machine/ncr5390.cpp b/src/devices/machine/ncr5390.cpp index 7ee6e6e2bd2..571c42969f0 100644 --- a/src/devices/machine/ncr5390.cpp +++ b/src/devices/machine/ncr5390.cpp @@ -39,38 +39,38 @@ void ncr5390_device::map(address_map &map) map(0x9, 0x9).w(FUNC(ncr5390_device::clock_w)); } -READ8_MEMBER(ncr5390_device::read) +uint8_t ncr5390_device::read(offs_t offset) { switch (offset) { - case 0: return tcounter_lo_r(space, 0); - case 1: return tcounter_hi_r(space, 0); - case 2: return fifo_r(space, 0); - case 3: return command_r(space, 0); - case 4: return status_r(space, 0); - case 5: return istatus_r(space, 0); - case 6: return seq_step_r(space, 0); - case 7: return fifo_flags_r(space, 0); - case 8: return conf_r(space, 0); + case 0: return tcounter_lo_r(); + case 1: return tcounter_hi_r(); + case 2: return fifo_r(); + case 3: return command_r(); + case 4: return status_r(); + case 5: return istatus_r(); + case 6: return seq_step_r(); + case 7: return fifo_flags_r(); + case 8: return conf_r(); default: return 0xff; } } -WRITE8_MEMBER(ncr5390_device::write) +void ncr5390_device::write(offs_t offset, uint8_t data) { switch (offset) { - case 0: tcount_lo_w(space, 0, data); break; - case 1: tcount_hi_w(space, 0, data); break; - case 2: fifo_w(space, 0, data); break; - case 3: command_w(space, 0, data); break; - case 4: bus_id_w(space, 0, data); break; - case 5: timeout_w(space, 0, data); break; - case 6: sync_period_w(space, 0, data); break; - case 7: sync_offset_w(space, 0, data); break; - case 8: conf_w(space, 0, data); break; - case 9: clock_w(space, 0, data); break; - case 10: test_w(space, 0, data); break; + case 0: tcount_lo_w(data); break; + case 1: tcount_hi_w(data); break; + case 2: fifo_w(data); break; + case 3: command_w(data); break; + case 4: bus_id_w(data); break; + case 5: timeout_w(data); break; + case 6: sync_period_w(data); break; + case 7: sync_offset_w(data); break; + case 8: conf_w(data); break; + case 9: clock_w(data); break; + case 10: test_w(data); break; default: break; } } @@ -82,18 +82,18 @@ void ncr53c90a_device::map(address_map &map) map(0xb, 0xb).rw(FUNC(ncr53c90a_device::conf2_r), FUNC(ncr53c90a_device::conf2_w)); } -READ8_MEMBER(ncr53c90a_device::read) +uint8_t ncr53c90a_device::read(offs_t offset) { if (offset == 11) - return conf2_r(space, 0); - return ncr5390_device::read(space, offset); + return conf2_r(); + return ncr5390_device::read(offset); } -WRITE8_MEMBER(ncr53c90a_device::write) +void ncr53c90a_device::write(offs_t offset, uint8_t data) { if (offset == 11) - return conf2_w(space, 0, data); - ncr5390_device::write(space, offset, data); + return conf2_w(data); + ncr5390_device::write(offset, data); } void ncr53c94_device::map(address_map &map) @@ -104,21 +104,21 @@ void ncr53c94_device::map(address_map &map) map(0xf, 0xf).w(FUNC(ncr53c94_device::fifo_align_w)); } -READ8_MEMBER(ncr53c94_device::read) +uint8_t ncr53c94_device::read(offs_t offset) { if (offset == 12) - return conf3_r(space, 0); - return ncr53c90a_device::read(space, offset); + return conf3_r(); + return ncr53c90a_device::read(offset); } -WRITE8_MEMBER(ncr53c94_device::write) +void ncr53c94_device::write(offs_t offset, uint8_t data) { if (offset == 11) - conf3_w(space, 0, data); + conf3_w(data); else if (offset == 15) - fifo_align_w(space, 0, data); + fifo_align_w(data); else - ncr53c90a_device::write(space, offset, data); + ncr53c90a_device::write(offset, data); } ncr5390_device::ncr5390_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) @@ -733,25 +733,25 @@ void ncr5390_device::delay_cycles(int cycles) tm->adjust(clocks_to_attotime(cycles)); } -READ8_MEMBER(ncr5390_device::tcounter_lo_r) +uint8_t ncr5390_device::tcounter_lo_r() { LOG("tcounter_lo_r %02x (%s)\n", tcounter & 0xff, machine().describe_context()); return tcounter; } -WRITE8_MEMBER(ncr5390_device::tcount_lo_w) +void ncr5390_device::tcount_lo_w(uint8_t data) { tcount = (tcount & 0xff00) | data; LOG("tcount_lo_w %02x (%s)\n", data, machine().describe_context()); } -READ8_MEMBER(ncr5390_device::tcounter_hi_r) +uint8_t ncr5390_device::tcounter_hi_r() { LOG("tcounter_hi_r %02x (%s)\n", tcounter >> 8, machine().describe_context()); return tcounter >> 8; } -WRITE8_MEMBER(ncr5390_device::tcount_hi_w) +void ncr5390_device::tcount_hi_w(uint8_t data) { tcount = (tcount & 0x00ff) | (data << 8); LOG("tcount_hi_w %02x (%s)\n", data, machine().describe_context()); @@ -772,7 +772,7 @@ void ncr5390_device::fifo_push(uint8_t val) check_drq(); } -READ8_MEMBER(ncr5390_device::fifo_r) +uint8_t ncr5390_device::fifo_r() { uint8_t r; if(fifo_pos) { @@ -785,20 +785,20 @@ READ8_MEMBER(ncr5390_device::fifo_r) return r; } -WRITE8_MEMBER(ncr5390_device::fifo_w) +void ncr5390_device::fifo_w(uint8_t data) { LOGMASKED(LOG_FIFO, "fifo_w 0x%02x fifo_pos %d (%s)\n", data, fifo_pos, machine().describe_context()); if(fifo_pos != 16) fifo[fifo_pos++] = data; } -READ8_MEMBER(ncr5390_device::command_r) +uint8_t ncr5390_device::command_r() { LOG("command_r (%s)\n", machine().describe_context()); return command[0]; } -WRITE8_MEMBER(ncr5390_device::command_w) +void ncr5390_device::command_w(uint8_t data) { LOG("command_w %02x command_pos %d (%s)\n", data, command_pos, machine().describe_context()); if(command_pos == 2) { @@ -990,7 +990,7 @@ void ncr5390_device::check_irq() } -READ8_MEMBER(ncr5390_device::status_r) +uint8_t ncr5390_device::status_r() { uint32_t ctrl = scsi_bus->ctrl_r(); uint8_t res = status | (ctrl & S_MSG ? 4 : 0) | (ctrl & S_CTL ? 2 : 0) | (ctrl & S_INP ? 1 : 0); @@ -999,13 +999,13 @@ READ8_MEMBER(ncr5390_device::status_r) return res; } -WRITE8_MEMBER(ncr5390_device::bus_id_w) +void ncr5390_device::bus_id_w(uint8_t data) { bus_id = data & 7; LOG("bus_id=%d\n", bus_id); } -READ8_MEMBER(ncr5390_device::istatus_r) +uint8_t ncr5390_device::istatus_r() { uint8_t res = istatus; @@ -1023,39 +1023,39 @@ READ8_MEMBER(ncr5390_device::istatus_r) return res; } -WRITE8_MEMBER(ncr5390_device::timeout_w) +void ncr5390_device::timeout_w(uint8_t data) { LOG("timeout_w 0x%02x\n", data); select_timeout = data; } -READ8_MEMBER(ncr5390_device::seq_step_r) +uint8_t ncr5390_device::seq_step_r() { LOG("seq_step_r %d (%s)\n", seq, machine().describe_context()); return seq; } -WRITE8_MEMBER(ncr5390_device::sync_period_w) +void ncr5390_device::sync_period_w(uint8_t data) { sync_period = data & 0x1f; } -READ8_MEMBER(ncr5390_device::fifo_flags_r) +uint8_t ncr5390_device::fifo_flags_r() { return fifo_pos; } -WRITE8_MEMBER(ncr5390_device::sync_offset_w) +void ncr5390_device::sync_offset_w(uint8_t data) { sync_offset = data & 0x0f; } -READ8_MEMBER(ncr5390_device::conf_r) +uint8_t ncr5390_device::conf_r() { return config; } -WRITE8_MEMBER(ncr5390_device::conf_w) +void ncr5390_device::conf_w(uint8_t data) { config = data; scsi_id = data & 7; @@ -1065,13 +1065,13 @@ WRITE8_MEMBER(ncr5390_device::conf_w) test_mode = true; } -WRITE8_MEMBER(ncr5390_device::test_w) +void ncr5390_device::test_w(uint8_t data) { if (test_mode) logerror("test_w %d (%s) - test mode not implemented\n", data, machine().describe_context()); } -WRITE8_MEMBER(ncr5390_device::clock_w) +void ncr5390_device::clock_w(uint8_t data) { clock_conv = data & 0x07; } @@ -1171,7 +1171,7 @@ void ncr53c90a_device::device_reset() ncr5390_device::device_reset(); } -READ8_MEMBER(ncr53c90a_device::status_r) +uint8_t ncr53c90a_device::status_r() { uint32_t ctrl = scsi_bus->ctrl_r(); uint8_t res = (irq ? S_INTERRUPT : 0) | status | (ctrl & S_MSG ? 4 : 0) | (ctrl & S_CTL ? 2 : 0) | (ctrl & S_INP ? 1 : 0); diff --git a/src/devices/machine/ncr5390.h b/src/devices/machine/ncr5390.h index 1d52a712628..c5277d25ad1 100644 --- a/src/devices/machine/ncr5390.h +++ b/src/devices/machine/ncr5390.h @@ -18,29 +18,29 @@ public: virtual void map(address_map &map); - DECLARE_READ8_MEMBER(tcounter_lo_r); - DECLARE_WRITE8_MEMBER(tcount_lo_w); - DECLARE_READ8_MEMBER(tcounter_hi_r); - DECLARE_WRITE8_MEMBER(tcount_hi_w); - DECLARE_READ8_MEMBER(fifo_r); - DECLARE_WRITE8_MEMBER(fifo_w); - DECLARE_READ8_MEMBER(command_r); - DECLARE_WRITE8_MEMBER(command_w); - virtual DECLARE_READ8_MEMBER(status_r); - DECLARE_WRITE8_MEMBER(bus_id_w); - DECLARE_READ8_MEMBER(istatus_r); - DECLARE_WRITE8_MEMBER(timeout_w); - DECLARE_READ8_MEMBER(seq_step_r); - DECLARE_WRITE8_MEMBER(sync_period_w); - DECLARE_READ8_MEMBER(fifo_flags_r); - DECLARE_WRITE8_MEMBER(sync_offset_w); - DECLARE_READ8_MEMBER(conf_r); - DECLARE_WRITE8_MEMBER(conf_w); - DECLARE_WRITE8_MEMBER(test_w); - DECLARE_WRITE8_MEMBER(clock_w); - - virtual DECLARE_READ8_MEMBER(read); - virtual DECLARE_WRITE8_MEMBER(write); + uint8_t tcounter_lo_r(); + void tcount_lo_w(uint8_t data); + uint8_t tcounter_hi_r(); + void tcount_hi_w(uint8_t data); + uint8_t fifo_r(); + void fifo_w(uint8_t data); + uint8_t command_r(); + void command_w(uint8_t data); + virtual uint8_t status_r(); + void bus_id_w(uint8_t data); + uint8_t istatus_r(); + void timeout_w(uint8_t data); + uint8_t seq_step_r(); + void sync_period_w(uint8_t data); + uint8_t fifo_flags_r(); + void sync_offset_w(uint8_t data); + uint8_t conf_r(); + void conf_w(uint8_t data); + void test_w(uint8_t data); + void clock_w(uint8_t data); + + virtual uint8_t read(offs_t offset); + virtual void write(offs_t offset, uint8_t data); virtual void scsi_ctrl_changed() override; @@ -243,13 +243,13 @@ public: virtual void map(address_map &map) override; - virtual DECLARE_READ8_MEMBER(status_r) override; + virtual uint8_t status_r() override; - DECLARE_READ8_MEMBER(conf2_r) { return config2; }; - DECLARE_WRITE8_MEMBER(conf2_w) { config2 = data; }; + uint8_t conf2_r() { return config2; }; + void conf2_w(uint8_t data) { config2 = data; }; - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; protected: ncr53c90a_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -296,12 +296,12 @@ public: virtual void map(address_map &map) override; - DECLARE_READ8_MEMBER(conf3_r) { return config3; }; - DECLARE_WRITE8_MEMBER(conf3_w) { config3 = data; }; - DECLARE_WRITE8_MEMBER(fifo_align_w) { fifo_align = data; }; + uint8_t conf3_r() { return config3; }; + void conf3_w(uint8_t data) { config3 = data; }; + void fifo_align_w(uint8_t data) { fifo_align = data; }; - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; u16 dma16_r(); void dma16_w(u16 data); diff --git a/src/devices/machine/ncr539x.cpp b/src/devices/machine/ncr539x.cpp index 58c69a16ad1..09e0bee9f21 100644 --- a/src/devices/machine/ncr539x.cpp +++ b/src/devices/machine/ncr539x.cpp @@ -280,7 +280,7 @@ void ncr539x_device::device_timer(emu_timer &timer, device_timer_id tid, int par } } -READ8_MEMBER( ncr539x_device::read ) +uint8_t ncr539x_device::read(offs_t offset) { uint8_t rv = 0; @@ -412,7 +412,7 @@ READ8_MEMBER( ncr539x_device::read ) return rv; } -WRITE8_MEMBER( ncr539x_device::write ) +void ncr539x_device::write(offs_t offset, uint8_t data) { //if (offset != 2) LOG("539x: Write %02x @ %s (%02x) (%s)\n", data, wrregs[offset], offset, machine().describe_context()); diff --git a/src/devices/machine/ncr539x.h b/src/devices/machine/ncr539x.h index 3327ccc4904..8172f4ea5f2 100644 --- a/src/devices/machine/ncr539x.h +++ b/src/devices/machine/ncr539x.h @@ -25,8 +25,8 @@ public: auto drq_callback() { return m_out_drq_cb.bind(); } // our API - DECLARE_READ8_MEMBER(read); - DECLARE_WRITE8_MEMBER(write); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); void dma_read_data(int bytes, uint8_t *pData); void dma_write_data(int bytes, uint8_t *pData); diff --git a/src/devices/machine/nsc810.cpp b/src/devices/machine/nsc810.cpp index bf06c34d9dc..96a13e7b696 100644 --- a/src/devices/machine/nsc810.cpp +++ b/src/devices/machine/nsc810.cpp @@ -118,7 +118,7 @@ void nsc810_device::device_timer(emu_timer &timer, device_timer_id id, int param } } -READ8_MEMBER(nsc810_device::read) +uint8_t nsc810_device::read(offs_t offset) { uint8_t res = 0xff; @@ -191,7 +191,7 @@ READ8_MEMBER(nsc810_device::read) return res; } -WRITE8_MEMBER(nsc810_device::write) +void nsc810_device::write(offs_t offset, uint8_t data) { uint32_t rate; diff --git a/src/devices/machine/nsc810.h b/src/devices/machine/nsc810.h index 6eed2448ef1..520591208f7 100644 --- a/src/devices/machine/nsc810.h +++ b/src/devices/machine/nsc810.h @@ -46,8 +46,8 @@ public: void set_timer1_clock(uint32_t clk) { m_timer1_clock = clk; } void set_timer1_clock(const XTAL &clk) { set_timer1_clock(clk.value()); } - DECLARE_READ8_MEMBER(read); - DECLARE_WRITE8_MEMBER(write); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); protected: virtual void device_start() override; diff --git a/src/devices/machine/sis85c496.cpp b/src/devices/machine/sis85c496.cpp index 63288a5447e..87b01edf2e6 100644 --- a/src/devices/machine/sis85c496.cpp +++ b/src/devices/machine/sis85c496.cpp @@ -544,19 +544,19 @@ WRITE8_MEMBER( sis85c496_host_device::at_portb_w ) READ8_MEMBER( sis85c496_host_device::at_dma8237_2_r ) { - return m_dma8237_2->read( space, offset / 2); + return m_dma8237_2->read( offset / 2); } WRITE8_MEMBER( sis85c496_host_device::at_dma8237_2_w ) { - m_dma8237_2->write( space, offset / 2, data); + m_dma8237_2->write( offset / 2, data); } READ8_MEMBER( sis85c496_host_device::at_keybc_r ) { switch (offset) { - case 0: return m_keybc->data_r(space, 0); + case 0: return m_keybc->data_r(); case 1: return at_portb_r(space, 0); } @@ -567,7 +567,7 @@ WRITE8_MEMBER( sis85c496_host_device::at_keybc_w ) { switch (offset) { - case 0: m_keybc->data_w(space, 0, data); break; + case 0: m_keybc->data_w(data); break; case 1: at_portb_w(space, 0, data); break; } } @@ -578,10 +578,10 @@ WRITE8_MEMBER( sis85c496_host_device::write_rtc ) if (offset==0) { m_nmi_enabled = BIT(data,7); //m_isabus->set_nmi_state((m_nmi_enabled==0) && (m_channel_check==0)); - m_ds12885->write(space,0,data); + m_ds12885->write(0,data); } else { - m_ds12885->write(space,offset,data); + m_ds12885->write(offset,data); } } diff --git a/src/devices/machine/wd7600.cpp b/src/devices/machine/wd7600.cpp index 64eb4c33c42..373c371cb5f 100644 --- a/src/devices/machine/wd7600.cpp +++ b/src/devices/machine/wd7600.cpp @@ -159,46 +159,46 @@ void wd7600_device::device_start() if (m_space_io->data_width() == 16) { // FIXME: are all these address ranges correct? - m_space_io->install_readwrite_handler(0x0000, 0x000f, read8_delegate(FUNC(am9517a_device::read), &(*m_dma1)), write8_delegate(FUNC(am9517a_device::write), &(*m_dma1)), 0xffff); + m_space_io->install_readwrite_handler(0x0000, 0x000f, read8sm_delegate(FUNC(am9517a_device::read), &(*m_dma1)), write8sm_delegate(FUNC(am9517a_device::write), &(*m_dma1)), 0xffff); m_space_io->install_readwrite_handler(0x0020, 0x003f, read8sm_delegate(FUNC(pic8259_device::read), &(*m_pic1)), write8sm_delegate(FUNC(pic8259_device::write), &(*m_pic1)), 0xffff); m_space_io->install_readwrite_handler(0x0040, 0x0043, read8sm_delegate(FUNC(pit8254_device::read), &(*m_ctc)), write8sm_delegate(FUNC(pit8254_device::write), &(*m_ctc)), 0xffff); - m_space_io->install_readwrite_handler(0x0060, 0x0061, read8_delegate(FUNC(wd7600_device::keyb_data_r), this), write8_delegate(FUNC(wd7600_device::keyb_data_w), this), 0x00ff); - m_space_io->install_readwrite_handler(0x0060, 0x0061, read8_delegate(FUNC(wd7600_device::portb_r), this), write8_delegate(FUNC(wd7600_device::portb_w), this), 0xff00); - m_space_io->install_readwrite_handler(0x0064, 0x0065, read8_delegate(FUNC(wd7600_device::keyb_status_r), this), write8_delegate(FUNC(wd7600_device::keyb_cmd_w), this), 0x00ff); - m_space_io->install_readwrite_handler(0x0070, 0x007f, read8_delegate(FUNC(mc146818_device::read), &(*m_rtc)), write8_delegate(FUNC(wd7600_device::rtc_w), this), 0xffff); - m_space_io->install_readwrite_handler(0x0080, 0x008f, read8_delegate(FUNC(wd7600_device::dma_page_r), this), write8_delegate(FUNC(wd7600_device::dma_page_w), this), 0xffff); - m_space_io->install_readwrite_handler(0x0092, 0x0093, read8_delegate(FUNC(wd7600_device::a20_reset_r), this), write8_delegate(FUNC(wd7600_device::a20_reset_w), this), 0x00ff); + m_space_io->install_readwrite_handler(0x0060, 0x0061, read8smo_delegate(FUNC(wd7600_device::keyb_data_r), this), write8smo_delegate(FUNC(wd7600_device::keyb_data_w), this), 0x00ff); + m_space_io->install_readwrite_handler(0x0060, 0x0061, read8smo_delegate(FUNC(wd7600_device::portb_r), this), write8smo_delegate(FUNC(wd7600_device::portb_w), this), 0xff00); + m_space_io->install_readwrite_handler(0x0064, 0x0065, read8smo_delegate(FUNC(wd7600_device::keyb_status_r), this), write8smo_delegate(FUNC(wd7600_device::keyb_cmd_w), this), 0x00ff); + m_space_io->install_readwrite_handler(0x0070, 0x007f, read8sm_delegate(FUNC(mc146818_device::read), &(*m_rtc)), write8sm_delegate(FUNC(wd7600_device::rtc_w), this), 0xffff); + m_space_io->install_readwrite_handler(0x0080, 0x008f, read8sm_delegate(FUNC(wd7600_device::dma_page_r), this), write8sm_delegate(FUNC(wd7600_device::dma_page_w), this), 0xffff); + m_space_io->install_readwrite_handler(0x0092, 0x0093, read8smo_delegate(FUNC(wd7600_device::a20_reset_r), this), write8smo_delegate(FUNC(wd7600_device::a20_reset_w), this), 0x00ff); m_space_io->install_readwrite_handler(0x00a0, 0x00a3, read8sm_delegate(FUNC(pic8259_device::read), &(*m_pic2)), write8sm_delegate(FUNC(pic8259_device::write), &(*m_pic2)), 0xffff); - m_space_io->install_readwrite_handler(0x00c0, 0x00df, read8_delegate(FUNC(am9517a_device::read), &(*m_dma2)), write8_delegate(FUNC(am9517a_device::write), &(*m_dma2)), 0x00ff); - m_space_io->install_readwrite_handler(0x2072, 0x2073, read16_delegate(FUNC(wd7600_device::refresh_r), this), write16_delegate(FUNC(wd7600_device::refresh_w), this)); - m_space_io->install_readwrite_handler(0x2872, 0x2873, read16_delegate(FUNC(wd7600_device::chipsel_r), this), write16_delegate(FUNC(wd7600_device::chipsel_w), this)); - m_space_io->install_readwrite_handler(0x3872, 0x3873, read16_delegate(FUNC(wd7600_device::mem_ctrl_r), this), write16_delegate(FUNC(wd7600_device::mem_ctrl_w), this)); - m_space_io->install_readwrite_handler(0x4872, 0x4873, read16_delegate(FUNC(wd7600_device::bank_01_start_r), this), write16_delegate(FUNC(wd7600_device::bank_01_start_w), this)); - m_space_io->install_readwrite_handler(0x5072, 0x5073, read16_delegate(FUNC(wd7600_device::bank_23_start_r), this), write16_delegate(FUNC(wd7600_device::bank_23_start_w), this)); - m_space_io->install_readwrite_handler(0x5872, 0x5873, read16_delegate(FUNC(wd7600_device::split_addr_r), this), write16_delegate(FUNC(wd7600_device::split_addr_w), this)); - m_space_io->install_readwrite_handler(0x9872, 0x9873, read16_delegate(FUNC(wd7600_device::diag_r), this), write16_delegate(FUNC(wd7600_device::diag_w), this)); + m_space_io->install_readwrite_handler(0x00c0, 0x00df, read8sm_delegate(FUNC(am9517a_device::read), &(*m_dma2)), write8sm_delegate(FUNC(am9517a_device::write), &(*m_dma2)), 0x00ff); + m_space_io->install_readwrite_handler(0x2072, 0x2073, read16smo_delegate(FUNC(wd7600_device::refresh_r), this), write16smo_delegate(FUNC(wd7600_device::refresh_w), this)); + m_space_io->install_readwrite_handler(0x2872, 0x2873, read16smo_delegate(FUNC(wd7600_device::chipsel_r), this), write16smo_delegate(FUNC(wd7600_device::chipsel_w), this)); + m_space_io->install_readwrite_handler(0x3872, 0x3873, read16smo_delegate(FUNC(wd7600_device::mem_ctrl_r), this), write16smo_delegate(FUNC(wd7600_device::mem_ctrl_w), this)); + m_space_io->install_readwrite_handler(0x4872, 0x4873, read16s_delegate(FUNC(wd7600_device::bank_01_start_r), this), write16s_delegate(FUNC(wd7600_device::bank_01_start_w), this)); + m_space_io->install_readwrite_handler(0x5072, 0x5073, read16s_delegate(FUNC(wd7600_device::bank_23_start_r), this), write16s_delegate(FUNC(wd7600_device::bank_23_start_w), this)); + m_space_io->install_readwrite_handler(0x5872, 0x5873, read16smo_delegate(FUNC(wd7600_device::split_addr_r), this), write16smo_delegate(FUNC(wd7600_device::split_addr_w), this)); + m_space_io->install_readwrite_handler(0x9872, 0x9873, read16smo_delegate(FUNC(wd7600_device::diag_r), this), write16smo_delegate(FUNC(wd7600_device::diag_w), this)); } else { assert(m_space_io->data_width() == 32); - m_space_io->install_readwrite_handler(0x0000, 0x000f, read8_delegate(FUNC(am9517a_device::read), &(*m_dma1)), write8_delegate(FUNC(am9517a_device::write), &(*m_dma1)), 0xffffffff); + m_space_io->install_readwrite_handler(0x0000, 0x000f, read8sm_delegate(FUNC(am9517a_device::read), &(*m_dma1)), write8sm_delegate(FUNC(am9517a_device::write), &(*m_dma1)), 0xffffffff); m_space_io->install_readwrite_handler(0x0020, 0x003f, read8sm_delegate(FUNC(pic8259_device::read), &(*m_pic1)), write8sm_delegate(FUNC(pic8259_device::write), &(*m_pic1)), 0x0000ffff); m_space_io->install_readwrite_handler(0x0040, 0x0043, read8sm_delegate(FUNC(pit8254_device::read), &(*m_ctc)), write8sm_delegate(FUNC(pit8254_device::write), &(*m_ctc)), 0xffffffff); - m_space_io->install_readwrite_handler(0x0060, 0x0063, read8_delegate(FUNC(wd7600_device::keyb_data_r), this), write8_delegate(FUNC(wd7600_device::keyb_data_w), this), 0x000000ff); - m_space_io->install_readwrite_handler(0x0060, 0x0063, read8_delegate(FUNC(wd7600_device::portb_r), this), write8_delegate(FUNC(wd7600_device::portb_w), this), 0x0000ff00); - m_space_io->install_readwrite_handler(0x0064, 0x0067, read8_delegate(FUNC(wd7600_device::keyb_status_r), this), write8_delegate(FUNC(wd7600_device::keyb_cmd_w), this), 0x000000ff); - m_space_io->install_readwrite_handler(0x0070, 0x007f, read8_delegate(FUNC(mc146818_device::read), &(*m_rtc)), write8_delegate(FUNC(wd7600_device::rtc_w), this), 0x0000ffff); - m_space_io->install_readwrite_handler(0x0080, 0x008f, read8_delegate(FUNC(wd7600_device::dma_page_r), this), write8_delegate(FUNC(wd7600_device::dma_page_w), this), 0xffffffff); - m_space_io->install_readwrite_handler(0x0090, 0x0093, read8_delegate(FUNC(wd7600_device::a20_reset_r), this), write8_delegate(FUNC(wd7600_device::a20_reset_w), this), 0x00ff0000); + m_space_io->install_readwrite_handler(0x0060, 0x0063, read8smo_delegate(FUNC(wd7600_device::keyb_data_r), this), write8smo_delegate(FUNC(wd7600_device::keyb_data_w), this), 0x000000ff); + m_space_io->install_readwrite_handler(0x0060, 0x0063, read8smo_delegate(FUNC(wd7600_device::portb_r), this), write8smo_delegate(FUNC(wd7600_device::portb_w), this), 0x0000ff00); + m_space_io->install_readwrite_handler(0x0064, 0x0067, read8smo_delegate(FUNC(wd7600_device::keyb_status_r), this), write8smo_delegate(FUNC(wd7600_device::keyb_cmd_w), this), 0x000000ff); + m_space_io->install_readwrite_handler(0x0070, 0x007f, read8sm_delegate(FUNC(mc146818_device::read), &(*m_rtc)), write8sm_delegate(FUNC(wd7600_device::rtc_w), this), 0x0000ffff); + m_space_io->install_readwrite_handler(0x0080, 0x008f, read8sm_delegate(FUNC(wd7600_device::dma_page_r), this), write8sm_delegate(FUNC(wd7600_device::dma_page_w), this), 0xffffffff); + m_space_io->install_readwrite_handler(0x0090, 0x0093, read8smo_delegate(FUNC(wd7600_device::a20_reset_r), this), write8smo_delegate(FUNC(wd7600_device::a20_reset_w), this), 0x00ff0000); m_space_io->install_readwrite_handler(0x00a0, 0x00a3, read8sm_delegate(FUNC(pic8259_device::read), &(*m_pic2)), write8sm_delegate(FUNC(pic8259_device::write), &(*m_pic2)), 0x0000ffff); - m_space_io->install_readwrite_handler(0x00c0, 0x00df, read8_delegate(FUNC(am9517a_device::read), &(*m_dma2)), write8_delegate(FUNC(am9517a_device::write), &(*m_dma2)), 0x00ff00ff); - m_space_io->install_readwrite_handler(0x2070, 0x2073, read16_delegate(FUNC(wd7600_device::refresh_r), this), write16_delegate(FUNC(wd7600_device::refresh_w), this), 0xffff0000); - m_space_io->install_readwrite_handler(0x2870, 0x2873, read16_delegate(FUNC(wd7600_device::chipsel_r), this), write16_delegate(FUNC(wd7600_device::chipsel_w), this), 0xffff0000); - m_space_io->install_readwrite_handler(0x3870, 0x3873, read16_delegate(FUNC(wd7600_device::mem_ctrl_r), this), write16_delegate(FUNC(wd7600_device::mem_ctrl_w), this), 0xffff0000); - m_space_io->install_readwrite_handler(0x4870, 0x4873, read16_delegate(FUNC(wd7600_device::bank_01_start_r), this), write16_delegate(FUNC(wd7600_device::bank_01_start_w), this), 0xffff0000); - m_space_io->install_readwrite_handler(0x5070, 0x5073, read16_delegate(FUNC(wd7600_device::bank_23_start_r), this), write16_delegate(FUNC(wd7600_device::bank_23_start_w), this), 0xffff0000); - m_space_io->install_readwrite_handler(0x5870, 0x5873, read16_delegate(FUNC(wd7600_device::split_addr_r), this), write16_delegate(FUNC(wd7600_device::split_addr_w), this), 0xffff0000); - m_space_io->install_readwrite_handler(0x9870, 0x9873, read16_delegate(FUNC(wd7600_device::diag_r), this), write16_delegate(FUNC(wd7600_device::diag_w), this), 0xffff0000); + m_space_io->install_readwrite_handler(0x00c0, 0x00df, read8sm_delegate(FUNC(am9517a_device::read), &(*m_dma2)), write8sm_delegate(FUNC(am9517a_device::write), &(*m_dma2)), 0x00ff00ff); + m_space_io->install_readwrite_handler(0x2070, 0x2073, read16smo_delegate(FUNC(wd7600_device::refresh_r), this), write16smo_delegate(FUNC(wd7600_device::refresh_w), this), 0xffff0000); + m_space_io->install_readwrite_handler(0x2870, 0x2873, read16smo_delegate(FUNC(wd7600_device::chipsel_r), this), write16smo_delegate(FUNC(wd7600_device::chipsel_w), this), 0xffff0000); + m_space_io->install_readwrite_handler(0x3870, 0x3873, read16smo_delegate(FUNC(wd7600_device::mem_ctrl_r), this), write16smo_delegate(FUNC(wd7600_device::mem_ctrl_w), this), 0xffff0000); + m_space_io->install_readwrite_handler(0x4870, 0x4873, read16s_delegate(FUNC(wd7600_device::bank_01_start_r), this), write16s_delegate(FUNC(wd7600_device::bank_01_start_w), this), 0xffff0000); + m_space_io->install_readwrite_handler(0x5070, 0x5073, read16s_delegate(FUNC(wd7600_device::bank_23_start_r), this), write16s_delegate(FUNC(wd7600_device::bank_23_start_w), this), 0xffff0000); + m_space_io->install_readwrite_handler(0x5870, 0x5873, read16smo_delegate(FUNC(wd7600_device::split_addr_r), this), write16smo_delegate(FUNC(wd7600_device::split_addr_w), this), 0xffff0000); + m_space_io->install_readwrite_handler(0x9870, 0x9873, read16smo_delegate(FUNC(wd7600_device::diag_r), this), write16smo_delegate(FUNC(wd7600_device::diag_w), this), 0xffff0000); } } @@ -255,7 +255,7 @@ void wd7600_device::keyboard_gatea20(int state) a20m(); } -WRITE8_MEMBER( wd7600_device::rtc_w ) +void wd7600_device::rtc_w(offs_t offset, uint8_t data) { if (offset == 0) { @@ -263,10 +263,10 @@ WRITE8_MEMBER( wd7600_device::rtc_w ) data &= 0x7f; } - m_rtc->write(space, offset, data); + m_rtc->write(offset, data); } -READ8_MEMBER( wd7600_device::pic1_slave_ack_r ) +uint8_t wd7600_device::pic1_slave_ack_r(offs_t offset) { if (offset == 2) // IRQ 2 return m_pic2->acknowledge(); @@ -288,36 +288,36 @@ WRITE_LINE_MEMBER( wd7600_device::ctc_out2_w ) } // Keyboard -WRITE8_MEMBER( wd7600_device::keyb_data_w ) +void wd7600_device::keyb_data_w(uint8_t data) { // LOG("WD7600: keyboard data write %02x\n", data); - m_keybc->data_w(space,0,data); + m_keybc->data_w(data); } -READ8_MEMBER( wd7600_device::keyb_data_r ) +uint8_t wd7600_device::keyb_data_r() { - uint8_t ret = m_keybc->data_r(space,0); + uint8_t ret = m_keybc->data_r(); // LOG("WD7600: keyboard data read %02x\n", ret); return ret; } -WRITE8_MEMBER( wd7600_device::keyb_cmd_w ) +void wd7600_device::keyb_cmd_w(uint8_t data) { // LOG("WD7600: keyboard command %02x\n", data); - m_keybc->command_w(space,0,data); + m_keybc->command_w(data); } -READ8_MEMBER( wd7600_device::keyb_status_r ) +uint8_t wd7600_device::keyb_status_r() { - return m_keybc->status_r(space,0); + return m_keybc->status_r(); } -READ8_MEMBER( wd7600_device::portb_r ) +uint8_t wd7600_device::portb_r() { return m_portb; } -WRITE8_MEMBER( wd7600_device::portb_w ) +void wd7600_device::portb_w(uint8_t data) { m_portb = (m_portb & 0xf0) | (data & 0x0f); @@ -352,7 +352,7 @@ offs_t wd7600_device::page_offset() return 0xff0000; } -READ8_MEMBER( wd7600_device::dma_read_byte ) +uint8_t wd7600_device::dma_read_byte(offs_t offset) { if (m_dma_channel == -1) return 0xff; @@ -360,7 +360,7 @@ READ8_MEMBER( wd7600_device::dma_read_byte ) return m_space->read_byte(page_offset() + offset); } -WRITE8_MEMBER( wd7600_device::dma_write_byte ) +void wd7600_device::dma_write_byte(offs_t offset, uint8_t data) { if (m_dma_channel == -1) return; @@ -368,7 +368,7 @@ WRITE8_MEMBER( wd7600_device::dma_write_byte ) m_space->write_byte(page_offset() + offset, data); } -READ8_MEMBER( wd7600_device::dma_read_word ) +uint8_t wd7600_device::dma_read_word(offs_t offset) { if (m_dma_channel == -1) return 0xff; @@ -379,7 +379,7 @@ READ8_MEMBER( wd7600_device::dma_read_word ) return result; } -WRITE8_MEMBER( wd7600_device::dma_write_word ) +void wd7600_device::dma_write_word(offs_t offset, uint8_t data) { if (m_dma_channel == -1) return; @@ -440,7 +440,7 @@ WRITE_LINE_MEMBER( wd7600_device::kbrst_w ) m_kbrst = state; } -WRITE8_MEMBER( wd7600_device::a20_reset_w ) +void wd7600_device::a20_reset_w(uint8_t data) { m_alt_a20 = BIT(data,1); a20m(); @@ -453,7 +453,7 @@ WRITE8_MEMBER( wd7600_device::a20_reset_w ) } } -READ8_MEMBER( wd7600_device::a20_reset_r ) +uint8_t wd7600_device::a20_reset_r() { uint8_t ret = 0; if(m_alt_a20) @@ -462,12 +462,12 @@ READ8_MEMBER( wd7600_device::a20_reset_r ) } // port 0x2072 - Refresh Control, and serial/parallel port address select -READ16_MEMBER(wd7600_device::refresh_r) +uint16_t wd7600_device::refresh_r() { return m_refresh_ctrl; } -WRITE16_MEMBER(wd7600_device::refresh_w) +void wd7600_device::refresh_w(uint16_t data) { // TODO: select serial/parallel I/O port location m_refresh_ctrl = data; @@ -475,36 +475,36 @@ WRITE16_MEMBER(wd7600_device::refresh_w) } // port 0x2872 - chip select -READ16_MEMBER(wd7600_device::chipsel_r) +uint16_t wd7600_device::chipsel_r() { return m_chip_sel; } -WRITE16_MEMBER(wd7600_device::chipsel_w) +void wd7600_device::chipsel_w(uint16_t data) { m_chip_sel = data; LOG("WD7600: Chip Select write %04x\n", data); } // port 0x3872 - Memory Control -READ16_MEMBER(wd7600_device::mem_ctrl_r) +uint16_t wd7600_device::mem_ctrl_r() { return m_memory_ctrl; } -WRITE16_MEMBER(wd7600_device::mem_ctrl_w) +void wd7600_device::mem_ctrl_w(uint16_t data) { m_memory_ctrl = data; LOG("WD7600: Memory Control write %04x\n", data); } // port 0x4872 - Bank 0 and 1 start address -READ16_MEMBER(wd7600_device::bank_01_start_r) +uint16_t wd7600_device::bank_01_start_r(offs_t offset, uint16_t mem_mask) { return (m_bank_start[1] << 8) | m_bank_start[0]; } -WRITE16_MEMBER(wd7600_device::bank_01_start_w) +void wd7600_device::bank_01_start_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if(ACCESSING_BITS_0_7) { @@ -519,12 +519,12 @@ WRITE16_MEMBER(wd7600_device::bank_01_start_w) } // port 0x5072 - Bank 2 and 3 start address -READ16_MEMBER(wd7600_device::bank_23_start_r) +uint16_t wd7600_device::bank_23_start_r(offs_t offset, uint16_t mem_mask) { return (m_bank_start[3] << 8) | m_bank_start[2]; } -WRITE16_MEMBER(wd7600_device::bank_23_start_w) +void wd7600_device::bank_23_start_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if(ACCESSING_BITS_0_7) { @@ -539,24 +539,24 @@ WRITE16_MEMBER(wd7600_device::bank_23_start_w) } // port 0x5872 - split starting address (used for BIOS shadowing) -READ16_MEMBER(wd7600_device::split_addr_r) +uint16_t wd7600_device::split_addr_r() { return m_split_start; } -WRITE16_MEMBER(wd7600_device::split_addr_w) +void wd7600_device::split_addr_w(uint16_t data) { m_split_start = data; LOG("WD7600: Split start address write %04x\n", data); } // port 0x9872 - Diagnostic -READ16_MEMBER(wd7600_device::diag_r) +uint16_t wd7600_device::diag_r() { return m_diagnostic | 0xe080; } -WRITE16_MEMBER(wd7600_device::diag_w) +void wd7600_device::diag_w(uint16_t data) { m_diagnostic = data; LOG("WD7600: Diagnostic write %04x\n", data); diff --git a/src/devices/machine/wd7600.h b/src/devices/machine/wd7600.h index 8f40ed3116f..43ddb00b038 100644 --- a/src/devices/machine/wd7600.h +++ b/src/devices/machine/wd7600.h @@ -75,20 +75,20 @@ public: DECLARE_WRITE_LINE_MEMBER( gatea20_w ); DECLARE_WRITE_LINE_MEMBER( kbrst_w ); - DECLARE_READ16_MEMBER(refresh_r); - DECLARE_WRITE16_MEMBER(refresh_w); - DECLARE_READ16_MEMBER(chipsel_r); - DECLARE_WRITE16_MEMBER(chipsel_w); - DECLARE_READ16_MEMBER(mem_ctrl_r); - DECLARE_WRITE16_MEMBER(mem_ctrl_w); - DECLARE_READ16_MEMBER(bank_01_start_r); - DECLARE_WRITE16_MEMBER(bank_01_start_w); - DECLARE_READ16_MEMBER(bank_23_start_r); - DECLARE_WRITE16_MEMBER(bank_23_start_w); - DECLARE_READ16_MEMBER(split_addr_r); - DECLARE_WRITE16_MEMBER(split_addr_w); - DECLARE_READ16_MEMBER(diag_r); - DECLARE_WRITE16_MEMBER(diag_w); + uint16_t refresh_r(); + void refresh_w(uint16_t data); + uint16_t chipsel_r(); + void chipsel_w(uint16_t data); + uint16_t mem_ctrl_r(); + void mem_ctrl_w(uint16_t data); + uint16_t bank_01_start_r(offs_t offset, uint16_t mem_mask); + void bank_01_start_w(offs_t offset, uint16_t data, uint16_t mem_mask); + uint16_t bank_23_start_r(offs_t offset, uint16_t mem_mask); + void bank_23_start_w(offs_t offset, uint16_t data, uint16_t mem_mask); + uint16_t split_addr_r(); + void split_addr_w(uint16_t data); + uint16_t diag_r(); + void diag_w(uint16_t data); IRQ_CALLBACK_MEMBER(intack_cb) { return m_pic1->acknowledge(); } @@ -101,39 +101,39 @@ protected: private: DECLARE_WRITE_LINE_MEMBER( pic1_int_w ) { m_write_intr(state); } - DECLARE_READ8_MEMBER( pic1_slave_ack_r ); + uint8_t pic1_slave_ack_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER( ctc_out1_w ); DECLARE_WRITE_LINE_MEMBER( ctc_out2_w ); - DECLARE_WRITE8_MEMBER( rtc_w ); - DECLARE_WRITE8_MEMBER( keyb_cmd_w ); - DECLARE_WRITE8_MEMBER( keyb_data_w ); - DECLARE_READ8_MEMBER( keyb_data_r ); - DECLARE_READ8_MEMBER( keyb_status_r ); - DECLARE_WRITE8_MEMBER( a20_reset_w ); - DECLARE_READ8_MEMBER( a20_reset_r ); - DECLARE_READ8_MEMBER( portb_r ); - DECLARE_WRITE8_MEMBER( portb_w ); - DECLARE_WRITE8_MEMBER( dma_page_w ) { m_dma_page[offset & 0x0f] = data; } - DECLARE_READ8_MEMBER( dma_page_r ) { return m_dma_page[offset & 0x0f]; } - DECLARE_READ8_MEMBER( dma_read_byte ); - DECLARE_WRITE8_MEMBER( dma_write_byte ); - DECLARE_READ8_MEMBER( dma_read_word ); - DECLARE_WRITE8_MEMBER( dma_write_word ); + void rtc_w(offs_t offset, uint8_t data); + void keyb_cmd_w(uint8_t data); + void keyb_data_w(uint8_t data); + uint8_t keyb_data_r(); + uint8_t keyb_status_r(); + void a20_reset_w(uint8_t data); + uint8_t a20_reset_r(); + uint8_t portb_r(); + void portb_w(uint8_t data); + void dma_page_w(offs_t offset, uint8_t data) { m_dma_page[offset & 0x0f] = data; } + uint8_t dma_page_r(offs_t offset) { return m_dma_page[offset & 0x0f]; } + uint8_t dma_read_byte(offs_t offset); + 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); DECLARE_WRITE_LINE_MEMBER( dma1_eop_w ); - DECLARE_READ8_MEMBER( dma1_ior0_r ) { return m_read_ior(0); } - DECLARE_READ8_MEMBER( dma1_ior1_r ) { return m_read_ior(1); } - DECLARE_READ8_MEMBER( dma1_ior2_r ) { return m_read_ior(2); } - DECLARE_READ8_MEMBER( dma1_ior3_r ) { return m_read_ior(3); } - DECLARE_READ8_MEMBER( dma2_ior1_r ) { uint16_t result = m_read_ior(5); m_dma_high_byte = result >> 8; return result; } - DECLARE_READ8_MEMBER( dma2_ior2_r ) { uint16_t result = m_read_ior(6); m_dma_high_byte = result >> 8; return result; } - DECLARE_READ8_MEMBER( dma2_ior3_r ) { uint16_t result = m_read_ior(7); m_dma_high_byte = result >> 8; return result; } - DECLARE_WRITE8_MEMBER( dma1_iow0_w ) { m_write_iow(0, data, 0xffff); } - DECLARE_WRITE8_MEMBER( dma1_iow1_w ) { m_write_iow(1, data, 0xffff); } - DECLARE_WRITE8_MEMBER( dma1_iow2_w ) { m_write_iow(2, data, 0xffff); } - DECLARE_WRITE8_MEMBER( dma1_iow3_w ) { m_write_iow(3, data, 0xffff); } - DECLARE_WRITE8_MEMBER( dma2_iow1_w ) { m_write_iow(5, (m_dma_high_byte << 8) | data, 0xffff); } - DECLARE_WRITE8_MEMBER( dma2_iow2_w ) { m_write_iow(6, (m_dma_high_byte << 8) | data, 0xffff); } - DECLARE_WRITE8_MEMBER( dma2_iow3_w ) { m_write_iow(7, (m_dma_high_byte << 8) | data, 0xffff); } + uint8_t dma1_ior0_r() { return m_read_ior(0); } + uint8_t dma1_ior1_r() { return m_read_ior(1); } + uint8_t dma1_ior2_r() { return m_read_ior(2); } + uint8_t dma1_ior3_r() { return m_read_ior(3); } + uint8_t dma2_ior1_r() { uint16_t result = m_read_ior(5); m_dma_high_byte = result >> 8; return result; } + uint8_t dma2_ior2_r() { uint16_t result = m_read_ior(6); m_dma_high_byte = result >> 8; return result; } + uint8_t dma2_ior3_r() { uint16_t result = m_read_ior(7); m_dma_high_byte = result >> 8; return result; } + void dma1_iow0_w(uint8_t data) { m_write_iow(0, data, 0xffff); } + void dma1_iow1_w(uint8_t data) { m_write_iow(1, data, 0xffff); } + void dma1_iow2_w(uint8_t data) { m_write_iow(2, data, 0xffff); } + void dma1_iow3_w(uint8_t data) { m_write_iow(3, data, 0xffff); } + void dma2_iow1_w(uint8_t data) { m_write_iow(5, (m_dma_high_byte << 8) | data, 0xffff); } + void dma2_iow2_w(uint8_t data) { m_write_iow(6, (m_dma_high_byte << 8) | data, 0xffff); } + void dma2_iow3_w(uint8_t data) { m_write_iow(7, (m_dma_high_byte << 8) | data, 0xffff); } DECLARE_WRITE_LINE_MEMBER( dma1_dack0_w ) { set_dma_channel(0, state); } DECLARE_WRITE_LINE_MEMBER( dma1_dack1_w ) { set_dma_channel(1, state); } DECLARE_WRITE_LINE_MEMBER( dma1_dack2_w ) { set_dma_channel(2, state); } diff --git a/src/mame/drivers/apc.cpp b/src/mame/drivers/apc.cpp index 1e9a44801cf..e7d306c60c5 100644 --- a/src/mame/drivers/apc.cpp +++ b/src/mame/drivers/apc.cpp @@ -416,12 +416,12 @@ CH3_EXA == 0X3E ; CH-3 extended address (W) READ8_MEMBER(apc_state::apc_dma_r) { - return m_dmac->read(space, bitswap<8>(offset,7,6,5,4,2,1,0,3), 0xff); + return m_dmac->read(bitswap<4>(offset,2,1,0,3)); } WRITE8_MEMBER(apc_state::apc_dma_w) { - m_dmac->write(space, bitswap<8>(offset,7,6,5,4,2,1,0,3), data, 0xff); + m_dmac->write(bitswap<4>(offset,2,1,0,3), data); } WRITE8_MEMBER(apc_state::apc_irq_ack_w) diff --git a/src/mame/drivers/aristmk4.cpp b/src/mame/drivers/aristmk4.cpp index dd3b432b5eb..e1bf7fe0639 100644 --- a/src/mame/drivers/aristmk4.cpp +++ b/src/mame/drivers/aristmk4.cpp @@ -680,7 +680,7 @@ READ8_MEMBER(aristmk4_state::mkiv_pia_ina) { /* uncomment this code once RTC is fixed */ - //return m_rtc->read(space,1); + //return m_rtc->read(1); return 0; // OK for now, the aussie version has no RTC on the MB so this is valid. } @@ -689,12 +689,12 @@ WRITE8_MEMBER(aristmk4_state::mkiv_pia_outa) { if(m_rtc_data_strobe) { - m_rtc->write(space,1,data); + m_rtc->write(1,data); //logerror("rtc protocol write data: %02X\n",data); } else { - m_rtc->write(space,0,data); + m_rtc->write(0,data); //logerror("rtc protocol write address: %02X\n",data); } } diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp index 0e812fed4f5..71349b6ee7f 100644 --- a/src/mame/drivers/attache.cpp +++ b/src/mame/drivers/attache.cpp @@ -771,12 +771,12 @@ WRITE8_MEMBER(attache_state::memmap_w) READ8_MEMBER(attache_state::dma_mask_r) { - return m_dma->read(space,0x0f); + return m_dma->read(0x0f); } WRITE8_MEMBER(attache_state::dma_mask_w) { - m_dma->write(space,0x0f,data); + m_dma->write(0x0f,data); } READ8_MEMBER(attache_state::fdc_dma_r) diff --git a/src/mame/drivers/bebox.cpp b/src/mame/drivers/bebox.cpp index 6bf6609025e..c73482722b8 100644 --- a/src/mame/drivers/bebox.cpp +++ b/src/mame/drivers/bebox.cpp @@ -28,8 +28,8 @@ #include "formats/pc_dsk.h" #include "machine/8042kbdc.h" -READ8_MEMBER(bebox_state::at_dma8237_1_r) { return m_dma8237[1]->read(space, offset / 2); } -WRITE8_MEMBER(bebox_state::at_dma8237_1_w) { m_dma8237[1]->write(space, offset / 2, data); } +READ8_MEMBER(bebox_state::at_dma8237_1_r) { return m_dma8237[1]->read(offset / 2); } +WRITE8_MEMBER(bebox_state::at_dma8237_1_w) { m_dma8237[1]->write(offset / 2, data); } void bebox_state::main_mem(address_map &map) { diff --git a/src/mame/drivers/cc40.cpp b/src/mame/drivers/cc40.cpp index 7aad936c398..8736bed7f98 100644 --- a/src/mame/drivers/cc40.cpp +++ b/src/mame/drivers/cc40.cpp @@ -603,6 +603,7 @@ MACHINE_CONFIG_START(cc40_state::cc40) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(6*31+1, 9*1+1+1) MCFG_SCREEN_VISIBLE_AREA(0, 6*31, 0, 9*1+1) + //screen.set_visarea_full(); config.set_default_layout(layout_cc40); MCFG_SCREEN_UPDATE_DEVICE("hd44780", hd44780_device, screen_update) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/cp1.cpp b/src/mame/drivers/cp1.cpp index 49d31927f23..a329130a81e 100644 --- a/src/mame/drivers/cp1.cpp +++ b/src/mame/drivers/cp1.cpp @@ -122,14 +122,14 @@ READ8_MEMBER(cp1_state::i8155_read) if (!(m_port2 & 0x10)) { - m_i8155->ale_w(space, BIT(m_port2, 7), offset); - data |= m_i8155->read(space, offset); + m_i8155->ale_w(BIT(m_port2, 7), offset); + data |= m_i8155->data_r(); } if ((m_io_config->read() & 0x02) && !(m_port2 & 0x20)) { // CP3 RAM expansion - m_i8155_cp3->ale_w(space, BIT(m_port2, 7), offset); - data |= m_i8155_cp3->read(space, offset); + m_i8155_cp3->ale_w(BIT(m_port2, 7), offset); + data |= m_i8155_cp3->data_r(); } return data; @@ -139,14 +139,14 @@ WRITE8_MEMBER(cp1_state::i8155_write) { if (!(m_port2 & 0x10)) { - m_i8155->ale_w(space, BIT(m_port2, 7), offset); - m_i8155->write(space, offset, data); + m_i8155->ale_w(BIT(m_port2, 7), offset); + m_i8155->data_w(data); } if ((m_io_config->read() & 0x02) && !(m_port2 & 0x20)) { // CP3 RAM expansion - m_i8155_cp3->ale_w(space, BIT(m_port2, 7), offset); - m_i8155_cp3->write(space, offset, data); + m_i8155_cp3->ale_w(BIT(m_port2, 7), offset); + m_i8155_cp3->data_w(data); } } @@ -244,7 +244,6 @@ void cp1_state::machine_reset() QUICKLOAD_LOAD_MEMBER( cp1_state, quickload ) { - address_space &space = machine().dummy_space(); char line[0x10]; int addr = 0; while (image.fgets(line, 10) && addr < 0x100) @@ -252,8 +251,8 @@ QUICKLOAD_LOAD_MEMBER( cp1_state, quickload ) int op = 0, arg = 0; if (sscanf(line, "%d.%d", &op, &arg) == 2) { - m_i8155->memory_w(space, addr++, op); - m_i8155->memory_w(space, addr++, arg); + m_i8155->memory_w(addr++, op); + m_i8155->memory_w(addr++, arg); } else { diff --git a/src/mame/drivers/hh_cop400.cpp b/src/mame/drivers/hh_cop400.cpp index 12fc8699438..66f827f7fbd 100644 --- a/src/mame/drivers/hh_cop400.cpp +++ b/src/mame/drivers/hh_cop400.cpp @@ -620,7 +620,7 @@ void einvaderc_state::einvaderc(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(913, 1080); - screen.set_visarea(0, 913-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_cop400_state::display_decay_tick), attotime::from_msec(1)); config.set_default_layout(layout_einvaderc); diff --git a/src/mame/drivers/hh_hmcs40.cpp b/src/mame/drivers/hh_hmcs40.cpp index 0d5447469e2..82a05082a5c 100644 --- a/src/mame/drivers/hh_hmcs40.cpp +++ b/src/mame/drivers/hh_hmcs40.cpp @@ -446,7 +446,7 @@ void bambball_state::bambball(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 478); - screen.set_visarea(0, 1920-1, 0, 478-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); config.set_default_layout(layout_bambball); @@ -595,7 +595,8 @@ void bmboxing_state::bmboxing(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 529); - screen.set_visarea(0, 1920-1, 0, 529-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -724,7 +725,8 @@ void bfriskyt_state::bfriskyt(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 675); - screen.set_visarea(0, 1920-1, 0, 675-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -845,7 +847,7 @@ void packmon_state::packmon(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 680); - screen.set_visarea(0, 1920-1, 0, 680-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); config.set_default_layout(layout_packmon); @@ -986,7 +988,7 @@ void msthawk_state::msthawk(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 696); - screen.set_visarea(0, 1920-1, 0, 696-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); config.set_default_layout(layout_msthawk); @@ -1115,7 +1117,8 @@ void bzaxxon_state::bzaxxon(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(613, 1080); - screen.set_visarea(0, 613-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -1238,7 +1241,8 @@ void zackman_state::zackman(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(487, 1080); - screen.set_visarea(0, 487-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -1371,7 +1375,8 @@ void bpengo_state::bpengo(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 759); - screen.set_visarea(0, 1920-1, 0, 759-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -1500,7 +1505,8 @@ void bbtime_state::bbtime(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(379, 1080); - screen.set_visarea(0, 379-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -1609,7 +1615,8 @@ void bdoramon_state::bdoramon(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 668); - screen.set_visarea(0, 1920-1, 0, 668-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -1711,7 +1718,8 @@ void bultrman_state::bultrman(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 673); - screen.set_visarea(0, 1920-1, 0, 673-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -1811,7 +1819,8 @@ void machiman_state::machiman(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1534, 1080); - screen.set_visarea(0, 1534-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -2104,7 +2113,8 @@ void alnattck_state::alnattck(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 700); - screen.set_visarea(0, 1920-1, 0, 700-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -2248,7 +2258,8 @@ void cdkong_state::cdkong(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(605, 1080); - screen.set_visarea(0, 605-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -2393,7 +2404,8 @@ void cgalaxn_state::cgalaxn(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(526, 1080); - screen.set_visarea(0, 526-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -2525,7 +2537,8 @@ void cpacman_state::cpacman(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(484, 1080); - screen.set_visarea(0, 484-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -2661,7 +2674,8 @@ void cmspacmn_state::cmspacmn(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(481, 1080); - screen.set_visarea(0, 481-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -2952,7 +2966,8 @@ void egalaxn2_state::egalaxn2(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(505, 1080); - screen.set_visarea(0, 505-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -3037,7 +3052,7 @@ void epacman2_state::epacman2(machine_config &config) /* video hardware */ screen_device *screen = subdevice<screen_device>("screen"); screen->set_size(505, 1080); - screen->set_visarea(0, 505-1, 0, 1080-1); + screen->set_visarea_full(); } // roms @@ -3241,7 +3256,8 @@ void eturtles_state::eturtles(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(484, 1080); - screen.set_visarea(0, 484-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -3363,7 +3379,8 @@ void estargte_state::estargte(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 854); - screen.set_visarea(0, 1920-1, 0, 854-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -3492,7 +3509,8 @@ void ghalien_state::ghalien(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 699); - screen.set_visarea(0, 1920-1, 0, 699-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -3624,7 +3642,7 @@ void gckong_state::gckong(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(479, 1080); - screen.set_visarea(0, 479-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); config.set_default_layout(layout_gckong); @@ -3752,7 +3770,8 @@ void gdigdug_state::gdigdug(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(476, 1080); - screen.set_visarea(0, 476-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -3923,7 +3942,7 @@ void mwcbaseb_state::mwcbaseb(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 478); - screen.set_visarea(0, 1920-1, 0, 478-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); config.set_default_layout(layout_mwcbaseb); @@ -4025,7 +4044,8 @@ void pbqbert_state::pbqbert(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(603, 1080); - screen.set_visarea(0, 603-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -4151,7 +4171,8 @@ void kingman_state::kingman(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(374, 1080); - screen.set_visarea(0, 374-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -4277,7 +4298,8 @@ void tmtron_state::tmtron(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 662); - screen.set_visarea(0, 1920-1, 0, 662-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -4382,7 +4404,8 @@ void vinvader_state::vinvader(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(233, 1080); - screen.set_visarea(0, 233-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_hmcs40_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ diff --git a/src/mame/drivers/hh_melps4.cpp b/src/mame/drivers/hh_melps4.cpp index 13cd63f5b28..7d294433781 100644 --- a/src/mame/drivers/hh_melps4.cpp +++ b/src/mame/drivers/hh_melps4.cpp @@ -311,7 +311,8 @@ void cfrogger_state::cfrogger(machine_config &config) screen_device &screen(SCREEN(config, "screen", "svg")); screen.set_refresh_hz(50); screen.set_size(500, 1080); - screen.set_visarea(0, 500-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_melps4_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -436,7 +437,8 @@ void gjungler_state::gjungler(machine_config &config) screen_device &screen(SCREEN(config, "screen", "svg")); screen.set_refresh_hz(50); screen.set_size(481, 1080); - screen.set_visarea(0, 481-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_melps4_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ diff --git a/src/mame/drivers/hh_sm510.cpp b/src/mame/drivers/hh_sm510.cpp index d10aa809033..f70f02c5c51 100644 --- a/src/mame/drivers/hh_sm510.cpp +++ b/src/mame/drivers/hh_sm510.cpp @@ -309,7 +309,7 @@ void kdribble_state::kdribble(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1524, 1080); - screen.set_visarea(0, 1524-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -389,7 +389,7 @@ void ktopgun_state::ktopgun(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1515, 1080); - screen.set_visarea(0, 1515-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -471,7 +471,7 @@ void kcontra_state::kcontra(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1505, 1080); - screen.set_visarea(0, 1505-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -555,7 +555,7 @@ void ktmnt_state::ktmnt(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1505, 1080); - screen.set_visarea(0, 1505-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -636,7 +636,7 @@ void kgradius_state::kgradius(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1420, 1080); - screen.set_visarea(0, 1420-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -715,7 +715,7 @@ void kloneran_state::kloneran(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1497, 1080); - screen.set_visarea(0, 1497-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -798,7 +798,8 @@ void kblades_state::kblades(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1516, 1080); - screen.set_visarea(0, 1516-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -882,7 +883,8 @@ void knfl_state::knfl(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1449, 1080); - screen.set_visarea(0, 1449-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -965,7 +967,8 @@ void kbilly_state::kbilly(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1490, 1080); - screen.set_visarea(0, 1490-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -1042,7 +1045,8 @@ void kbucky_state::kbucky(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1490, 1080); - screen.set_visarea(0, 1490-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -1123,7 +1127,8 @@ void kgarfld_state::kgarfld(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1500, 1080); - screen.set_visarea(0, 1500-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -1214,7 +1219,7 @@ void gnw_octopus_state::gnw_octopus(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1586, 1080); - screen.set_visarea(0, 1586-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -1317,7 +1322,7 @@ void gnw_mmouse_state::gnw_mmouse(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1711, 1080); - screen.set_visarea(0, 1711-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -1334,7 +1339,7 @@ void gnw_mmouse_state::gnw_egg(machine_config &config) /* video hardware */ screen_device *screen = subdevice<screen_device>("screen"); screen->set_size(1694, 1080); - screen->set_visarea(0, 1694-1, 0, 1080-1); + screen->set_visarea_full(); } void gnw_mmouse_state::nupogodi(machine_config &config) @@ -1352,7 +1357,7 @@ void gnw_mmouse_state::nupogodi(machine_config &config) /* video hardware */ screen_device *screen = subdevice<screen_device>("screen"); screen->set_size(1715, 1080); - screen->set_visarea(0, 1715-1, 0, 1080-1); + screen->set_visarea_full(); } void gnw_mmouse_state::exospace(machine_config &config) @@ -1362,7 +1367,7 @@ void gnw_mmouse_state::exospace(machine_config &config) /* video hardware */ screen_device *screen = subdevice<screen_device>("screen"); screen->set_size(1756, 1080); - screen->set_visarea(0, 1756-1, 0, 1080-1); + screen->set_visarea_full(); } // roms @@ -1471,7 +1476,7 @@ void gnw_fire_state::gnw_fire(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1624, 1080); - screen.set_visarea(0, 1624-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -1560,7 +1565,7 @@ void gnw_tbridge_state::gnw_tbridge(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1587, 1080); - screen.set_visarea(0, 1587-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -1649,7 +1654,7 @@ void gnw_fireatk_state::gnw_fireatk(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1655, 1080); - screen.set_visarea(0, 1655-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -1738,7 +1743,7 @@ void gnw_stennis_state::gnw_stennis(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1581, 1080); - screen.set_visarea(0, 1581-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -1827,13 +1832,13 @@ void gnw_opanic_state::gnw_opanic(machine_config &config) screen_top.set_svg_region("svg_top"); screen_top.set_refresh_hz(50); screen_top.set_size(1920/2, 1292/2); - screen_top.set_visarea(0, 1920/2-1, 0, 1292/2-1); + screen_top.set_visarea_full(); screen_device &screen_bottom(SCREEN(config, "screen_bottom", SCREEN_TYPE_SVG)); screen_bottom.set_svg_region("svg_bottom"); screen_bottom.set_refresh_hz(50); screen_bottom.set_size(1920/2, 1230/2); - screen_bottom.set_visarea(0, 1920/2-1, 0, 1230/2-1); + screen_bottom.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); config.set_default_layout(layout_gnw_dualv); @@ -1924,13 +1929,13 @@ void gnw_dkong_state::gnw_dkong(machine_config &config) screen_top.set_svg_region("svg_top"); screen_top.set_refresh_hz(50); screen_top.set_size(1920/2, 1266/2); - screen_top.set_visarea(0, 1920/2-1, 0, 1266/2-1); + screen_top.set_visarea_full(); screen_device &screen_bottom(SCREEN(config, "screen_bottom", SCREEN_TYPE_SVG)); screen_bottom.set_svg_region("svg_bottom"); screen_bottom.set_refresh_hz(50); screen_bottom.set_size(1920/2, 1266/2); - screen_bottom.set_visarea(0, 1920/2-1, 0, 1266/2-1); + screen_bottom.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); config.set_default_layout(layout_gnw_dualv); @@ -2017,13 +2022,13 @@ void gnw_mickdon_state::gnw_mickdon(machine_config &config) screen_top.set_svg_region("svg_top"); screen_top.set_refresh_hz(50); screen_top.set_size(1920/2, 1281/2); - screen_top.set_visarea(0, 1920/2-1, 0, 1281/2-1); + screen_top.set_visarea_full(); screen_device &screen_bottom(SCREEN(config, "screen_bottom", SCREEN_TYPE_SVG)); screen_bottom.set_svg_region("svg_bottom"); screen_bottom.set_refresh_hz(50); screen_bottom.set_size(1920/2, 1236/2); - screen_bottom.set_visarea(0, 1920/2-1, 0, 1236/2-1); + screen_bottom.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); config.set_default_layout(layout_gnw_dualv); @@ -2120,13 +2125,13 @@ void gnw_ghouse_state::gnw_ghouse(machine_config &config) screen_top.set_svg_region("svg_top"); screen_top.set_refresh_hz(50); screen_top.set_size(1920/2, 1303/2); - screen_top.set_visarea(0, 1920/2-1, 0, 1303/2-1); + screen_top.set_visarea_full(); screen_device &screen_bottom(SCREEN(config, "screen_bottom", SCREEN_TYPE_SVG)); screen_bottom.set_svg_region("svg_bottom"); screen_bottom.set_refresh_hz(50); screen_bottom.set_size(1920/2, 1274/2); - screen_bottom.set_visarea(0, 1920/2-1, 0, 1274/2-1); + screen_bottom.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); config.set_default_layout(layout_gnw_dualv); @@ -2217,13 +2222,13 @@ void gnw_dkong2_state::gnw_dkong2(machine_config &config) screen_top.set_svg_region("svg_top"); screen_top.set_refresh_hz(50); screen_top.set_size(1920/2, 1241/2); - screen_top.set_visarea(0, 1920/2-1, 0, 1241/2-1); + screen_top.set_visarea_full(); screen_device &screen_bottom(SCREEN(config, "screen_bottom", SCREEN_TYPE_SVG)); screen_bottom.set_svg_region("svg_bottom"); screen_bottom.set_refresh_hz(50); screen_bottom.set_size(1920/2, 1237/2); - screen_bottom.set_visarea(0, 1920/2-1, 0, 1237/2-1); + screen_bottom.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); config.set_default_layout(layout_gnw_dualv); @@ -2316,13 +2321,13 @@ void gnw_mario_state::gnw_mario(machine_config &config) screen_left.set_svg_region("svg_left"); screen_left.set_refresh_hz(50); screen_left.set_size(2258/2, 1440/2); - screen_left.set_visarea(0, 2258/2-1, 0, 1440/2-1); + screen_left.set_visarea_full(); screen_device &screen_right(SCREEN(config, "screen_right", SCREEN_TYPE_SVG)); screen_right.set_svg_region("svg_right"); screen_right.set_refresh_hz(50); screen_right.set_size(2261/2, 1440/2); - screen_right.set_visarea(0, 2261/2-1, 0, 1440/2-1); + screen_right.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); config.set_default_layout(layout_gnw_dualh); @@ -2421,13 +2426,13 @@ void gnw_rshower_state::gnw_rshower(machine_config &config) screen_left.set_svg_region("svg_left"); screen_left.set_refresh_hz(50); screen_left.set_size(2126/2, 1440/2); - screen_left.set_visarea(0, 2126/2-1, 0, 1440/2-1); + screen_left.set_visarea_full(); screen_device &screen_right(SCREEN(config, "screen_right", SCREEN_TYPE_SVG)); screen_right.set_svg_region("svg_right"); screen_right.set_refresh_hz(50); screen_right.set_size(2146/2, 1440/2); - screen_right.set_visarea(0, 2146/2-1, 0, 1440/2-1); + screen_right.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); config.set_default_layout(layout_gnw_dualh); @@ -2520,13 +2525,13 @@ void gnw_lboat_state::gnw_lboat(machine_config &config) screen_left.set_svg_region("svg_left"); screen_left.set_refresh_hz(50); screen_left.set_size(2116/2, 1440/2); - screen_left.set_visarea(0, 2116/2-1, 0, 1440/2-1); + screen_left.set_visarea_full(); screen_device &screen_right(SCREEN(config, "screen_right", SCREEN_TYPE_SVG)); screen_right.set_svg_region("svg_right"); screen_right.set_refresh_hz(50); screen_right.set_size(2057/2, 1440/2); - screen_right.set_visarea(0, 2057/2-1, 0, 1440/2-1); + screen_right.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); config.set_default_layout(layout_gnw_dualh); @@ -2606,13 +2611,13 @@ void gnw_bjack_state::gnw_bjack(machine_config &config) screen_top.set_svg_region("svg_top"); screen_top.set_refresh_hz(50); screen_top.set_size(1920/2, 1290/2); - screen_top.set_visarea(0, 1920/2-1, 0, 1290/2-1); + screen_top.set_visarea_full(); screen_device &screen_bottom(SCREEN(config, "screen_bottom", SCREEN_TYPE_SVG)); screen_bottom.set_svg_region("svg_bottom"); screen_bottom.set_refresh_hz(50); screen_bottom.set_size(1920/2, 1297/2); - screen_bottom.set_visarea(0, 1920/2-1, 0, 1297/2-1); + screen_bottom.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); config.set_default_layout(layout_gnw_dualv); @@ -2708,13 +2713,13 @@ void gnw_squish_state::gnw_squish(machine_config &config) screen_top.set_svg_region("svg_top"); screen_top.set_refresh_hz(50); screen_top.set_size(1920/2, 1285/2); - screen_top.set_visarea(0, 1920/2-1, 0, 1285/2-1); + screen_top.set_visarea_full(); screen_device &screen_bottom(SCREEN(config, "screen_bottom", SCREEN_TYPE_SVG)); screen_bottom.set_svg_region("svg_bottom"); screen_bottom.set_refresh_hz(50); screen_bottom.set_size(1920/2, 1287/2); - screen_bottom.set_visarea(0, 1920/2-1, 0, 1287/2-1); + screen_bottom.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); config.set_default_layout(layout_gnw_dualv); @@ -2813,7 +2818,7 @@ void gnw_dkjr_state::gnw_dkjr(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1647, 1080); - screen.set_visarea(0, 1647-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -2903,7 +2908,7 @@ void gnw_mariocm_state::gnw_mariocm(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1647, 1080); - screen.set_visarea(0, 1647-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -2994,7 +2999,7 @@ void gnw_manhole_state::gnw_manhole(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1560, 1080); - screen.set_visarea(0, 1560-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -3077,7 +3082,7 @@ void gnw_tfish_state::gnw_tfish(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1572, 1080); - screen.set_visarea(0, 1572-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -3168,7 +3173,7 @@ void gnw_smb_state::gnw_smb(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1677, 1080); - screen.set_visarea(0, 1677-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -3262,7 +3267,7 @@ void gnw_climber_state::gnw_climber(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1677, 1080); - screen.set_visarea(0, 1677-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -3376,7 +3381,7 @@ void gnw_boxing_state::gnw_boxing(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 524); - screen.set_visarea(0, 1920-1, 0, 524-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -3499,7 +3504,7 @@ void tgaunt_state::tgaunt(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1425, 1080); - screen.set_visarea(0, 1425-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -3516,7 +3521,7 @@ void tgaunt_state::trobhood(machine_config &config) /* video hardware */ screen_device *screen = subdevice<screen_device>("screen"); screen->set_size(1468, 1080); - screen->set_visarea(0, 1468-1, 0, 1080-1); + screen->set_visarea_full(); } // roms @@ -3620,7 +3625,7 @@ void tddragon_state::tddragon(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1467, 1080); - screen.set_visarea(0, 1467-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -3724,7 +3729,7 @@ void tkarnov_state::tkarnov(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1477, 1080); - screen.set_visarea(0, 1477-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -3827,7 +3832,7 @@ void tvindictr_state::tvindictr(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1459, 1080); - screen.set_visarea(0, 1459-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -3953,7 +3958,7 @@ void tgaiden_state::tgaiden(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 1080); - screen.set_visarea(0, 1920-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -4052,7 +4057,7 @@ void tbatman_state::tbatman(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1442, 1080); - screen.set_visarea(0, 1442-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -4155,7 +4160,7 @@ void tsharr2_state::tsharr2(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1493, 1080); - screen.set_visarea(0, 1493-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -4255,7 +4260,7 @@ void tstrider_state::tstrider(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1479, 1080); - screen.set_visarea(0, 1479-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -4359,7 +4364,7 @@ void tgoldnaxe_state::tgoldnaxe(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1456, 1080); - screen.set_visarea(0, 1456-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -4480,7 +4485,7 @@ void trobocop2_state::trobocop2(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1487, 1080); - screen.set_visarea(0, 1487-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -4497,7 +4502,7 @@ void trobocop2_state::trockteer(machine_config &config) /* video hardware */ screen_device *screen = subdevice<screen_device>("screen"); screen->set_size(1463, 1080); - screen->set_visarea(0, 1463-1, 0, 1080-1); + screen->set_visarea_full(); } // roms @@ -4606,7 +4611,7 @@ void taltbeast_state::taltbeast(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1455, 1080); - screen.set_visarea(0, 1455-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -4710,7 +4715,7 @@ void tsf2010_state::tsf2010(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1465, 1080); - screen.set_visarea(0, 1465-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -4810,7 +4815,7 @@ void tswampt_state::tswampt(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1450, 1080); - screen.set_visarea(0, 1450-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -4914,7 +4919,7 @@ void tspidman_state::tspidman(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1440, 1080); - screen.set_visarea(0, 1440-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -5018,7 +5023,7 @@ void txmen_state::txmen(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1467, 1080); - screen.set_visarea(0, 1467-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -5122,7 +5127,7 @@ void tddragon3_state::tddragon3(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1514, 1080); - screen.set_visarea(0, 1514-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -5226,7 +5231,7 @@ void tflash_state::tflash(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1444, 1080); - screen.set_visarea(0, 1444-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -5330,7 +5335,7 @@ void tmchammer_state::tmchammer(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1471, 1080); - screen.set_visarea(0, 1471-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -5437,7 +5442,7 @@ void tbtoads_state::tbtoads(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1454, 1080); - screen.set_visarea(0, 1454-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -5541,7 +5546,7 @@ void thook_state::thook(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1489, 1080); - screen.set_visarea(0, 1489-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -5644,7 +5649,7 @@ void tbttf_state::tbttf(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1466, 1080); - screen.set_visarea(0, 1466-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -5750,7 +5755,7 @@ void taddams_state::taddams(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1464, 1080); - screen.set_visarea(0, 1464-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -5854,7 +5859,7 @@ void thalone_state::thalone(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1448, 1080); - screen.set_visarea(0, 1448-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -5954,7 +5959,7 @@ void txmenpx_state::txmenpx(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1464, 1080); - screen.set_visarea(0, 1464-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -6058,7 +6063,7 @@ void thalone2_state::thalone2(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1454, 1080); - screen.set_visarea(0, 1454-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -6156,7 +6161,8 @@ void tsonic_state::tsonic(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1517, 1080); - screen.set_visarea(0, 1517-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -6263,7 +6269,7 @@ void trobocop3_state::trobocop3(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1464, 1080); - screen.set_visarea(0, 1464-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -6363,7 +6369,7 @@ void tdummies_state::tdummies(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1441, 1080); - screen.set_visarea(0, 1441-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -6467,7 +6473,7 @@ void tsfight2_state::tsfight2(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1444, 1080); - screen.set_visarea(0, 1444-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -6571,7 +6577,7 @@ void twworld_state::twworld(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1429, 1080); - screen.set_visarea(0, 1429-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -6671,7 +6677,7 @@ void tjpark_state::tjpark(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1454, 1080); - screen.set_visarea(0, 1454-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -6769,7 +6775,8 @@ void tsonic2_state::tsonic2(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1475, 1080); - screen.set_visarea(0, 1475-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -6881,7 +6888,7 @@ void tsddragon_state::tsddragon(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1503, 1080); - screen.set_visarea(0, 1503-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -6986,7 +6993,7 @@ void tdennis_state::tdennis(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1467, 1080); - screen.set_visarea(0, 1467-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -7094,7 +7101,7 @@ void tnmarebc_state::tnmarebc(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1456, 1080); - screen.set_visarea(0, 1456-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -7198,7 +7205,7 @@ void ttransf2_state::ttransf2(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1476, 1080); - screen.set_visarea(0, 1476-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -7298,7 +7305,7 @@ void topaliens_state::topaliens(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1450, 1080); - screen.set_visarea(0, 1450-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -7403,7 +7410,7 @@ void tmkombat_state::tmkombat(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1468, 1080); - screen.set_visarea(0, 1468-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -7507,7 +7514,7 @@ void tshadow_state::tshadow(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1484, 1080); - screen.set_visarea(0, 1484-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -7611,7 +7618,7 @@ void tskelwarr_state::tskelwarr(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1444, 1080); - screen.set_visarea(0, 1444-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -7716,7 +7723,7 @@ void tbatfor_state::tbatfor(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1493, 1080); - screen.set_visarea(0, 1493-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -7821,7 +7828,7 @@ void tjdredd_state::tjdredd(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1444, 1080); - screen.set_visarea(0, 1444-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -7926,7 +7933,7 @@ void tapollo13_state::tapollo13(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1467, 1080); - screen.set_visarea(0, 1467-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -8031,7 +8038,7 @@ void tgoldeye_state::tgoldeye(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1461, 1080); - screen.set_visarea(0, 1461-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -8131,7 +8138,7 @@ void tsjam_state::tsjam(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1421, 1080); - screen.set_visarea(0, 1421-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -8231,7 +8238,7 @@ void tinday_state::tinday(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1463, 1080); - screen.set_visarea(0, 1463-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -8330,7 +8337,8 @@ void tbatmana_state::tbatmana(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1478, 1080); - screen.set_visarea(0, 1478-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -8444,7 +8452,7 @@ void tigarden_state::tigarden(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1515, 1080); - screen.set_visarea(0, 1515-1, 0, 1080-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); @@ -8552,7 +8560,7 @@ void nummunch_state::nummunch(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 875); - screen.set_visarea(0, 1920-1, 0, 875-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_sm510_state::display_decay_tick), attotime::from_msec(1)); diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp index 6a24ae76eb3..72800bb84fc 100644 --- a/src/mame/drivers/hh_tms1k.cpp +++ b/src/mame/drivers/hh_tms1k.cpp @@ -3844,6 +3844,7 @@ void einvader_state::einvader(machine_config &config) screen.set_refresh_hz(50); screen.set_size(939, 1080); screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_tms1k_state::display_decay_tick), attotime::from_msec(1)); config.set_default_layout(layout_einvader); @@ -4941,6 +4942,7 @@ void ginv1000_state::ginv1000(machine_config &config) screen.set_refresh_hz(50); screen.set_size(226, 1080); screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_tms1k_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -5092,6 +5094,7 @@ void ginv2000_state::ginv2000(machine_config &config) screen.set_refresh_hz(50); screen.set_size(364, 1080); screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_tms1k_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ diff --git a/src/mame/drivers/hh_ucom4.cpp b/src/mame/drivers/hh_ucom4.cpp index 89957e215f2..a0f4da1952e 100644 --- a/src/mame/drivers/hh_ucom4.cpp +++ b/src/mame/drivers/hh_ucom4.cpp @@ -354,7 +354,8 @@ void ufombs_state::ufombs(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(243, 1080); - screen.set_visarea(0, 243-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_ucom4_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -511,7 +512,8 @@ void ssfball_state::ssfball(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 482); - screen.set_visarea(0, 1920-1, 0, 482-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_ucom4_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -657,7 +659,8 @@ void bmsoccer_state::bmsoccer(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(271, 1080); - screen.set_visarea(0, 271-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_ucom4_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -774,7 +777,8 @@ void bmsafari_state::bmsafari(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(248, 1080); - screen.set_visarea(0, 248-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_ucom4_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -935,7 +939,8 @@ void splasfgt_state::splasfgt(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 476); - screen.set_visarea(0, 1920-1, 0, 476-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_ucom4_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -1049,7 +1054,8 @@ void bcclimbr_state::bcclimbr(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(310, 1080); - screen.set_visarea(0, 310-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_ucom4_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -1283,7 +1289,8 @@ void invspace_state::invspace(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(289, 1080); - screen.set_visarea(0, 289-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_ucom4_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -1516,7 +1523,8 @@ void galaxy2_state::galaxy2(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(304, 1080); - screen.set_visarea(0, 304-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_ucom4_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -1532,7 +1540,7 @@ void galaxy2_state::galaxy2b(machine_config &config) /* video hardware */ screen_device *screen = subdevice<screen_device>("screen"); screen->set_size(306, 1080); - screen->set_visarea(0, 306-1, 0, 1080-1); + screen->set_visarea_full(); } // roms @@ -1654,7 +1662,8 @@ void astrocmd_state::astrocmd(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 525); - screen.set_visarea(0, 1920-1, 0, 525-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_ucom4_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -1760,7 +1769,8 @@ void edracula_state::edracula(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 526); - screen.set_visarea(0, 1920-1, 0, 526-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_ucom4_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -2184,7 +2194,8 @@ void tccombat_state::tccombat(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(300, 1080); - screen.set_visarea(0, 300-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_ucom4_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -2347,7 +2358,7 @@ void tmtennis_state::tmtennis(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 417); - screen.set_visarea(0, 1920-1, 0, 417-1); + screen.set_visarea_full(); TIMER(config, "display_decay").configure_periodic(FUNC(hh_ucom4_state::display_decay_tick), attotime::from_msec(1)); config.set_default_layout(layout_tmtennis); @@ -2468,7 +2479,8 @@ void tmpacman_state::tmpacman(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 508); - screen.set_visarea(0, 1920-1, 0, 508-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_ucom4_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -2581,7 +2593,8 @@ void tmscramb_state::tmscramb(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 556); - screen.set_visarea(0, 1920-1, 0, 556-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_ucom4_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -2690,7 +2703,8 @@ void tcaveman_state::tcaveman(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(1920, 559); - screen.set_visarea(0, 1920-1, 0, 559-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_ucom4_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ @@ -2833,7 +2847,8 @@ void alnchase_state::alnchase(machine_config &config) screen.set_svg_region("svg"); screen.set_refresh_hz(50); screen.set_size(365, 1080); - screen.set_visarea(0, 365-1, 0, 1080-1); + screen.set_visarea_full(); + TIMER(config, "display_decay").configure_periodic(FUNC(hh_ucom4_state::display_decay_tick), attotime::from_msec(1)); /* sound hardware */ diff --git a/src/mame/drivers/hotstuff.cpp b/src/mame/drivers/hotstuff.cpp index e47e5c70e9c..2bcec1734c5 100644 --- a/src/mame/drivers/hotstuff.cpp +++ b/src/mame/drivers/hotstuff.cpp @@ -88,11 +88,11 @@ void hotstuff_state::hotstuff_map(address_map &map) map(0x600000, 0x600003).rw("scc1", FUNC(z80scc_device::ba_cd_inv_r), FUNC(z80scc_device::ba_cd_inv_w)); map(0x620000, 0x620003).rw("scc2", FUNC(z80scc_device::ba_cd_inv_r), FUNC(z80scc_device::ba_cd_inv_w)); map(0x680000, 0x680001).lrw8("rtc_rw", - [this](address_space &space, offs_t offset, u8 mem_mask) { - return m_rtc->read(space, offset^1, mem_mask); + [this](offs_t offset) { + return m_rtc->read(offset^1); }, - [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { - m_rtc->write(space, offset^1, data, mem_mask); + [this](offs_t offset, u8 data) { + m_rtc->write(offset^1, data); }); map(0x980000, 0x9bffff).ram().share("bitmapram"); diff --git a/src/mame/drivers/interpro.cpp b/src/mame/drivers/interpro.cpp index 136a839abc7..e373ec0c1c3 100644 --- a/src/mame/drivers/interpro.cpp +++ b/src/mame/drivers/interpro.cpp @@ -532,11 +532,11 @@ void interpro_state::interpro_common_map(address_map &map) map(0x7f000400, 0x7f00040f).rw(m_scc1, FUNC(z80scc_device::ba_cd_inv_r), FUNC(z80scc_device::ba_cd_inv_w)).umask32(0x000000ff); map(0x7f000410, 0x7f00041f).rw(m_scc2, FUNC(z80scc_device::ba_cd_inv_r), FUNC(z80scc_device::ba_cd_inv_w)).umask32(0x000000ff); map(0x7f000500, 0x7f000503).lrw8("rtc_rw", - [this](address_space &space, offs_t offset, u8 mem_mask) { - return m_rtc->read(space, offset^1, mem_mask); + [this](offs_t offset) { + return m_rtc->read(offset^1); }, - [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { - m_rtc->write(space, offset^1, data, mem_mask); + [this](offs_t offset, u8 data) { + m_rtc->write(offset^1, data); }).umask32(0x000000ff); map(0x7f000600, 0x7f000600).w(m_rtc, FUNC(mc146818_device::write)); diff --git a/src/mame/drivers/iris3130.cpp b/src/mame/drivers/iris3130.cpp index 32b1f0ab43a..f3ee4409123 100644 --- a/src/mame/drivers/iris3130.cpp +++ b/src/mame/drivers/iris3130.cpp @@ -186,7 +186,7 @@ READ16_MEMBER(sgi_ip2_state::sgi_ip2_swtch_r) READ8_MEMBER(sgi_ip2_state::sgi_ip2_clock_ctl_r) { - uint8_t ret = m_rtc->read(space, 1); + uint8_t ret = m_rtc->read(1); verboselog(1, "sgi_ip2_clock_ctl_r: %02x\n", ret); return ret; } @@ -194,12 +194,12 @@ READ8_MEMBER(sgi_ip2_state::sgi_ip2_clock_ctl_r) WRITE8_MEMBER(sgi_ip2_state::sgi_ip2_clock_ctl_w) { verboselog(1, "sgi_ip2_clock_ctl_w: %02x\n", data); - m_rtc->write(space, 1, data); + m_rtc->write(1, data); } READ8_MEMBER(sgi_ip2_state::sgi_ip2_clock_data_r) { - uint8_t ret = m_rtc->read(space, 0); + uint8_t ret = m_rtc->read(0); verboselog(1, "sgi_ip2_clock_data_r: %02x\n", ret); return ret; } @@ -207,7 +207,7 @@ READ8_MEMBER(sgi_ip2_state::sgi_ip2_clock_data_r) WRITE8_MEMBER(sgi_ip2_state::sgi_ip2_clock_data_w) { verboselog(1, "sgi_ip2_clock_data_w: %02x\n", data); - m_rtc->write(space, 0, data); + m_rtc->write(0, data); } diff --git a/src/mame/drivers/jazz.cpp b/src/mame/drivers/jazz.cpp index bfc3fb90a50..2aa45bb5ad9 100644 --- a/src/mame/drivers/jazz.cpp +++ b/src/mame/drivers/jazz.cpp @@ -134,8 +134,8 @@ void jazz_state::jazz_common_map(address_map &map) map(0x80002000, 0x8000200f).m(m_scsi, FUNC(ncr53c94_device::map)); map(0x80003000, 0x8000300f).m(m_fdc, FUNC(n82077aa_device::map)); map(0x80004000, 0x80004007).lrw8("rtc", - [this](address_space &space, offs_t offset) { return m_rtc->read(space, 1); }, - [this](address_space &space, offs_t offset, u8 data) { m_rtc->write(space, 1, data); }).umask64(0xff); + [this](offs_t offset) { return m_rtc->read(1); }, + [this](offs_t offset, u8 data) { m_rtc->write(1, data); }).umask64(0xff); map(0x80005000, 0x80005007).rw(m_kbdc, FUNC(at_keyboard_controller_device::data_r), FUNC(at_keyboard_controller_device::data_w)).umask64(0x00ff); map(0x80005000, 0x80005007).rw(m_kbdc, FUNC(at_keyboard_controller_device::status_r), FUNC(at_keyboard_controller_device::command_w)).umask64(0xff00); map(0x80006000, 0x80006007).rw(m_ace[0], FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w)); diff --git a/src/mame/drivers/mac.cpp b/src/mame/drivers/mac.cpp index 49394e1adac..7c086b41a79 100644 --- a/src/mame/drivers/mac.cpp +++ b/src/mame/drivers/mac.cpp @@ -546,11 +546,11 @@ READ8_MEMBER(mac_state::mac_5396_r) { if (offset < 0x100) { - return m_539x_1->read(space, offset>>4); + return m_539x_1->read(offset>>4); } else // pseudo-DMA: read from the FIFO { - return m_539x_1->read(space, 2); + return m_539x_1->read(2); } // never executed @@ -561,11 +561,11 @@ WRITE8_MEMBER(mac_state::mac_5396_w) { if (offset < 0x100) { - m_539x_1->write(space, offset>>4, data); + m_539x_1->write(offset>>4, data); } else // pseudo-DMA: write to the FIFO { - m_539x_1->write(space, 2, data); + m_539x_1->write(2, data); } } diff --git a/src/mame/drivers/micronic.cpp b/src/mame/drivers/micronic.cpp index 0b8c102747b..80789ee722a 100644 --- a/src/mame/drivers/micronic.cpp +++ b/src/mame/drivers/micronic.cpp @@ -200,17 +200,17 @@ WRITE8_MEMBER( micronic_state::port_2c_w ) WRITE8_MEMBER( micronic_state::rtc_address_w ) { - m_rtc->write(space, 0, data); + m_rtc->write(0, data); } READ8_MEMBER( micronic_state::rtc_data_r ) { - return m_rtc->read(space, 1); + return m_rtc->read(1); } WRITE8_MEMBER( micronic_state::rtc_data_w ) { - m_rtc->write(space, 1, data); + m_rtc->write(1, data); } /*************************************************************************** diff --git a/src/mame/drivers/mikromik.cpp b/src/mame/drivers/mikromik.cpp index 1ced344d7f5..19c57ad42c5 100644 --- a/src/mame/drivers/mikromik.cpp +++ b/src/mame/drivers/mikromik.cpp @@ -92,7 +92,7 @@ READ8_MEMBER( mm1_state::read ) switch ((offset >> 4) & 0x07) { case 0: - data = m_dmac->read(space, offset & 0x0f); + data = m_dmac->read(offset & 0x0f); break; case 1: @@ -161,7 +161,7 @@ WRITE8_MEMBER( mm1_state::write ) switch ((offset >> 4) & 0x07) { case 0: - m_dmac->write(space, offset & 0x0f, data); + m_dmac->write(offset & 0x0f, data); break; case 1: diff --git a/src/mame/drivers/mips.cpp b/src/mame/drivers/mips.cpp index 7b02b9161db..eeb409abad7 100644 --- a/src/mame/drivers/mips.cpp +++ b/src/mame/drivers/mips.cpp @@ -333,10 +333,10 @@ void rx2030_state::iop_io_map(address_map &map) map(0x0200, 0x0201).rw(m_fio, FUNC(z8038_device::fifo_r<1>), FUNC(z8038_device::fifo_w<1>)).umask16(0xff); map(0x0202, 0x0203).rw(m_fio, FUNC(z8038_device::reg_r<1>), FUNC(z8038_device::reg_w<1>)).umask16(0xff); - map(0x0240, 0x0241).lw8("rtc", [this](address_space &space, offs_t offset, u8 data) { m_rtc->write(space, 0, data); }).umask16(0xff00); + map(0x0240, 0x0241).lw8("rtc", [this](u8 data) { m_rtc->write(0, data); }).umask16(0xff00); map(0x0280, 0x0281).lrw8("rtc", - [this](address_space &space, offs_t offset) { return m_rtc->read(space, 1); }, - [this](address_space &space, offs_t offset, u8 data) { m_rtc->write(space, 1, data); }).umask16(0xff00); + [this]() { return m_rtc->read(1); }, + [this](u8 data) { m_rtc->write(1, data); }).umask16(0xff00); map(0x02c0, 0x2c1).lw8("cpu_interface", [this](u8 data) { diff --git a/src/mame/drivers/ngen.cpp b/src/mame/drivers/ngen.cpp index 07dae5737e0..c250242658d 100644 --- a/src/mame/drivers/ngen.cpp +++ b/src/mame/drivers/ngen.cpp @@ -307,7 +307,7 @@ WRITE16_MEMBER(ngen_state::peripheral_w) case 0x0e: case 0x0f: if(ACCESSING_BITS_0_7) - m_dmac->write(space,offset,data & 0xff); + m_dmac->write(offset,data & 0xff); break; case 0x80: // DMA page offset? case 0x81: @@ -381,7 +381,7 @@ READ16_MEMBER(ngen_state::peripheral_r) case 0x0e: case 0x0f: if(ACCESSING_BITS_0_7) - ret = m_dmac->read(space,offset); + ret = m_dmac->read(offset); logerror("DMA read offset %04x mask %04x returning %04x\n",offset,mem_mask,ret); break; case 0x80: // DMA page offset? diff --git a/src/mame/drivers/octopus.cpp b/src/mame/drivers/octopus.cpp index cee1859c38f..7b9f7686b27 100644 --- a/src/mame/drivers/octopus.cpp +++ b/src/mame/drivers/octopus.cpp @@ -524,9 +524,9 @@ READ8_MEMBER(octopus_state::rtc_r) uint8_t ret = 0xff; if(m_rtc_data) - ret = m_rtc->read(space,1); + ret = m_rtc->read(1); else if(m_rtc_address) - ret = m_rtc->read(space,0); + ret = m_rtc->read(0); return ret; } @@ -534,9 +534,9 @@ READ8_MEMBER(octopus_state::rtc_r) WRITE8_MEMBER(octopus_state::rtc_w) { if(m_rtc_data) - m_rtc->write(space,1,data); + m_rtc->write(1,data); else if(m_rtc_address) - m_rtc->write(space,0,data); + m_rtc->write(0,data); } // RTC/FDC control - PPI port B diff --git a/src/mame/drivers/pc1512.cpp b/src/mame/drivers/pc1512.cpp index 5fab9bdacf8..cb0e7e1db48 100644 --- a/src/mame/drivers/pc1512.cpp +++ b/src/mame/drivers/pc1512.cpp @@ -558,11 +558,11 @@ READ8_MEMBER( pc1640_state::io_r ) offs_t addr = offset & 0x3ff; bool decoded = false; - if ( addr <= 0x00f) { data = m_dmac->read(space, offset & 0x0f); decoded = true; } + if ( addr <= 0x00f) { data = m_dmac->read(offset & 0x0f); decoded = true; } else if (addr >= 0x020 && addr <= 0x021) { data = m_pic->read(offset & 0x01); decoded = true; } else if (addr >= 0x040 && addr <= 0x043) { data = m_pit->read(offset & 0x03); decoded = true; } else if (addr >= 0x060 && addr <= 0x06f) { data = system_r(space, offset & 0x0f); decoded = true; } - else if (addr >= 0x070 && addr <= 0x073) { data = m_rtc->read(space, offset & 0x01); decoded = true; } + else if (addr >= 0x070 && addr <= 0x073) { data = m_rtc->read(offset & 0x01); decoded = true; } else if (addr >= 0x078 && addr <= 0x07f) { data = mouse_r(space, offset & 0x07); decoded = true; } else if (addr >= 0x378 && addr <= 0x37b) { data = printer_r(space, offset & 0x03); decoded = true; } else if (addr >= 0x3b0 && addr <= 0x3df) { decoded = true; } diff --git a/src/mame/drivers/pcd.cpp b/src/mame/drivers/pcd.cpp index de8d1a991bf..dce3bd79b43 100644 --- a/src/mame/drivers/pcd.cpp +++ b/src/mame/drivers/pcd.cpp @@ -62,8 +62,6 @@ private: DECLARE_READ8_MEMBER( nmi_io_r ); DECLARE_WRITE8_MEMBER( nmi_io_w ); - DECLARE_READ8_MEMBER( rtc_r ); - DECLARE_WRITE8_MEMBER( rtc_w ); DECLARE_READ8_MEMBER( stat_r ); DECLARE_WRITE8_MEMBER( stat_w ); DECLARE_READ8_MEMBER( led_r ); @@ -178,18 +176,6 @@ WRITE8_MEMBER( pcd_state::nmi_io_w ) m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } -READ8_MEMBER( pcd_state::rtc_r ) -{ - m_rtc->write(space, 0, offset); - return m_rtc->read(space, 1); -} - -WRITE8_MEMBER( pcd_state::rtc_w ) -{ - m_rtc->write(space, 0, offset); - m_rtc->write(space, 1, data); -} - READ8_MEMBER( pcd_state::stat_r ) { return m_stat; @@ -443,7 +429,7 @@ void pcd_state::pcd_io(address_map &map) map(0xf820, 0xf821).rw(m_pic2, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0xf840, 0xf840).rw(FUNC(pcd_state::stat_r), FUNC(pcd_state::stat_w)); map(0xf841, 0xf841).rw(FUNC(pcd_state::led_r), FUNC(pcd_state::led_w)); - map(0xf880, 0xf8bf).rw(FUNC(pcd_state::rtc_r), FUNC(pcd_state::rtc_w)); + map(0xf880, 0xf8bf).rw(m_rtc, FUNC(mc146818_device::read_direct), FUNC(mc146818_device::write_direct)); map(0xf900, 0xf903).rw(m_fdc, FUNC(wd2793_device::read), FUNC(wd2793_device::write)); map(0xf904, 0xf905).rw(FUNC(pcd_state::dskctl_r), FUNC(pcd_state::dskctl_w)); map(0xf940, 0xf943).rw(FUNC(pcd_state::scsi_r), FUNC(pcd_state::scsi_w)); diff --git a/src/mame/drivers/qx10.cpp b/src/mame/drivers/qx10.cpp index 03df6686f96..7a90afdfec6 100644 --- a/src/mame/drivers/qx10.cpp +++ b/src/mame/drivers/qx10.cpp @@ -471,12 +471,12 @@ WRITE8_MEMBER(qx10_state::memory_write_byte) WRITE8_MEMBER(qx10_state::mc146818_w) { - m_rtc->write(space, !offset, data); + m_rtc->write(!offset, data); } READ8_MEMBER(qx10_state::mc146818_r) { - return m_rtc->read(space, !offset); + return m_rtc->read(!offset); } WRITE_LINE_MEMBER(qx10_state::keyboard_irq) diff --git a/src/mame/drivers/vixen.cpp b/src/mame/drivers/vixen.cpp index 2805320a2e3..8ef4f63ca30 100644 --- a/src/mame/drivers/vixen.cpp +++ b/src/mame/drivers/vixen.cpp @@ -259,12 +259,12 @@ void vixen_state::vixen_io(address_map &map) map.global_mask(0xff); map(0x00, 0x03).rw(m_fdc, FUNC(fd1797_device::read), FUNC(fd1797_device::write)); map(0x04, 0x04).mirror(0x03).rw(FUNC(vixen_state::status_r), FUNC(vixen_state::cmd_w)); - map(0x08, 0x08).mirror(0x01).rw(P8155H_TAG, FUNC(i8155_device::read), FUNC(i8155_device::write)); + map(0x08, 0x08).mirror(0x01).rw(P8155H_TAG, FUNC(i8155_device::data_r), FUNC(i8155_device::data_w)); map(0x0c, 0x0d).w(P8155H_TAG, FUNC(i8155_device::ale_w)); map(0x10, 0x10).mirror(0x07).r(m_ieee488, FUNC(ieee488_device::dio_r)); map(0x18, 0x18).mirror(0x07).r(FUNC(vixen_state::ieee488_r)); map(0x20, 0x21).mirror(0x04).w(m_io_i8155, FUNC(i8155_device::ale_w)); - map(0x28, 0x28).mirror(0x05).rw(m_io_i8155, FUNC(i8155_device::read), FUNC(i8155_device::write)); + map(0x28, 0x28).mirror(0x05).rw(m_io_i8155, FUNC(i8155_device::data_r), FUNC(i8155_device::data_w)); map(0x30, 0x31).mirror(0x06).rw(m_usart, FUNC(i8251_device::read), FUNC(i8251_device::write)); map(0x38, 0x38).mirror(0x07).r(FUNC(vixen_state::port3_r)); // AM_RANGE(0xf0, 0xff) Hard Disk? diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp index ea8cd57c964..6265293fa9a 100644 --- a/src/mame/drivers/wicat.cpp +++ b/src/mame/drivers/wicat.cpp @@ -584,13 +584,13 @@ WRITE8_MEMBER( wicat_state::vram_w ) READ8_MEMBER(wicat_state::video_dma_r) { - return m_videodma->read(space,offset/2); + return m_videodma->read(offset/2); } WRITE8_MEMBER(wicat_state::video_dma_w) { if(!(offset & 0x01)) - m_videodma->write(space,offset/2,data); + m_videodma->write(offset/2,data); } READ8_MEMBER(wicat_state::video_uart0_r) diff --git a/src/mame/machine/amstrad.cpp b/src/mame/machine/amstrad.cpp index 1cffc81f470..1a13cd9e4d2 100644 --- a/src/mame/machine/amstrad.cpp +++ b/src/mame/machine/amstrad.cpp @@ -2485,20 +2485,18 @@ BDIR BC1 | /* PSG function selected */ void amstrad_state::update_psg() { - address_space &space = m_maincpu->space(AS_PROGRAM); - if(m_aleste_mode & 0x20) // RTC selected { switch(m_aleste_rtc_function) { case 0x02: // AS - m_rtc->write(space, 0,m_ppi_port_outputs[amstrad_ppi_PortA]); + m_rtc->write(0, m_ppi_port_outputs[amstrad_ppi_PortA]); break; case 0x04: // DS write - m_rtc->write(space, 1,m_ppi_port_outputs[amstrad_ppi_PortA]); + m_rtc->write(1, m_ppi_port_outputs[amstrad_ppi_PortA]); break; case 0x05: // DS read - m_ppi_port_inputs[amstrad_ppi_PortA] = m_rtc->read(space, 1); + m_ppi_port_inputs[amstrad_ppi_PortA] = m_rtc->read(1); break; } return; diff --git a/src/mame/machine/apollo.cpp b/src/mame/machine/apollo.cpp index 466b5b6cb2c..a28cd843c4d 100644 --- a/src/mame/machine/apollo.cpp +++ b/src/mame/machine/apollo.cpp @@ -317,11 +317,11 @@ static uint8_t dn3000_dma_channel2 = 5; // 5 = memory dma channel WRITE8_MEMBER(apollo_state::apollo_dma_1_w){ SLOG1(("apollo_dma_1_w: writing DMA Controller 1 at offset %02x = %02x", offset, data)); - m_dma8237_1->write(space, offset, data); + m_dma8237_1->write(offset, data); } READ8_MEMBER(apollo_state::apollo_dma_1_r){ - uint8_t data = m_dma8237_1->read(space, offset); + uint8_t data = m_dma8237_1->read(offset); SLOG1(("apollo_dma_1_r: reading DMA Controller 1 at offset %02x = %02x", offset, data)); return data; } @@ -332,7 +332,7 @@ READ8_MEMBER(apollo_state::apollo_dma_1_r){ WRITE8_MEMBER(apollo_state::apollo_dma_2_w){ SLOG1(("apollo_dma_2_w: writing DMA Controller 2 at offset %02x = %02x", offset/2, data)); - m_dma8237_2->write(space, offset / 2, data); + m_dma8237_2->write(offset / 2, data); } READ8_MEMBER(apollo_state::apollo_dma_2_r){ @@ -351,7 +351,7 @@ READ8_MEMBER(apollo_state::apollo_dma_2_r){ break; } } - uint8_t data = m_dma8237_2->read(space, offset / 2); + uint8_t data = m_dma8237_2->read(offset / 2); SLOG1(("apollo_dma_2_r: reading DMA Controller 2 at offset %02x = %02x", offset/2, data)); return data; } @@ -672,8 +672,7 @@ WRITE_LINE_MEMBER(apollo_state::apollo_ptm_irq_function) WRITE8_MEMBER(apollo_state::apollo_rtc_w) { - m_rtc->write(space, 0, offset); - m_rtc->write(space, 1, data); + m_rtc->write_direct(offset, data); if (offset >= 0x0b && offset <= 0x0c) { SLOG2(("writing MC146818 at offset %02x = %02x", offset, data)); @@ -683,8 +682,7 @@ WRITE8_MEMBER(apollo_state::apollo_rtc_w) READ8_MEMBER(apollo_state::apollo_rtc_r) { uint8_t data; - m_rtc->write(space, 0, offset); - data = m_rtc->read(space, 1); + data = m_rtc->read_direct(offset); if (offset >= 0x0b && offset <= 0x0c) { SLOG2(("reading MC146818 at offset %02x = %02x", offset, data)); diff --git a/src/mame/machine/at.cpp b/src/mame/machine/at.cpp index faff3d4cdeb..9edac77f473 100644 --- a/src/mame/machine/at.cpp +++ b/src/mame/machine/at.cpp @@ -369,10 +369,10 @@ WRITE8_MEMBER( at_mb_device::write_rtc ) m_nmi_enabled = BIT(data,7); if (!m_nmi_enabled) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); - m_mc146818->write(space,0,data); + m_mc146818->write(0,data); } else { - m_mc146818->write(space,offset,data); + m_mc146818->write(offset,data); } } diff --git a/src/mame/machine/bbc.cpp b/src/mame/machine/bbc.cpp index 0b7ec54d884..43d694fb77e 100644 --- a/src/mame/machine/bbc.cpp +++ b/src/mame/machine/bbc.cpp @@ -623,18 +623,18 @@ void bbc_state::mc146818_set(address_space &space) { if (m_latch->q1_r()) // WR { - m_via_system_porta = m_rtc->read(space, 1); + m_via_system_porta = m_rtc->read(1); } else { - m_rtc->write(space, 1, m_via_system_porta); + m_rtc->write(1, m_via_system_porta); } } /* if address select is set then set the address in the 146818 */ if (m_mc146818_as) { - m_rtc->write(space, 0, m_via_system_porta); + m_rtc->write(0, m_via_system_porta); } } } diff --git a/src/mame/machine/macpci.cpp b/src/mame/machine/macpci.cpp index 08655f03dc0..4986892f6a7 100644 --- a/src/mame/machine/macpci.cpp +++ b/src/mame/machine/macpci.cpp @@ -186,11 +186,11 @@ READ8_MEMBER(macpci_state::mac_5396_r) { if (offset < 0x100) { - return m_539x_1->read(space, offset>>4); + return m_539x_1->read(offset>>4); } else // pseudo-DMA: read from the FIFO { - return m_539x_1->read(space, 2); + return m_539x_1->read(2); } // never executed @@ -201,11 +201,11 @@ WRITE8_MEMBER(macpci_state::mac_5396_w) { if (offset < 0x100) { - m_539x_1->write(space, offset>>4, data); + m_539x_1->write(offset>>4, data); } else // pseudo-DMA: write to the FIFO { - m_539x_1->write(space, 2, data); + m_539x_1->write(2, data); } } diff --git a/src/mame/machine/mbee.cpp b/src/mame/machine/mbee.cpp index fe8efb5d15d..774676ec75d 100644 --- a/src/mame/machine/mbee.cpp +++ b/src/mame/machine/mbee.cpp @@ -233,17 +233,17 @@ READ8_MEMBER( mbee_state::speed_high_r ) WRITE8_MEMBER( mbee_state::port04_w ) // address { - m_rtc->write(space, 0, data); + m_rtc->write(0, data); } WRITE8_MEMBER( mbee_state::port06_w ) // write { - m_rtc->write(space, 1, data); + m_rtc->write(1, data); } READ8_MEMBER( mbee_state::port07_r ) // read { - return m_rtc->read(space, 1); + return m_rtc->read(1); } // See it work: Run mbeett, choose RTC in the config switches, run the F3 test, press Esc. diff --git a/src/mame/machine/orion.cpp b/src/mame/machine/orion.cpp index fec6968c788..a61d6433cd0 100644 --- a/src/mame/machine/orion.cpp +++ b/src/mame/machine/orion.cpp @@ -198,7 +198,7 @@ READ8_MEMBER(orion_state::orionz80_floppy_rtc_r) { if ((offset >= 0x60) && (offset <= 0x6f)) { - return m_rtc->read(space,offset-0x60); + return m_rtc->read(offset-0x60); } else { @@ -210,7 +210,7 @@ WRITE8_MEMBER(orion_state::orionz80_floppy_rtc_w) { if ((offset >= 0x60) && (offset <= 0x6f)) { - m_rtc->write(space,offset-0x60,data); + m_rtc->write(offset-0x60,data); } else { |