diff options
author | Ivan Vangelista <mesgnet@yahoo.it> | 2020-03-25 18:26:17 +0100 |
---|---|---|
committer | Ivan Vangelista <mesgnet@yahoo.it> | 2020-03-25 18:26:17 +0100 |
commit | dc83375dcaaecddc3302cc9eddb0e39b17cb3f04 (patch) | |
tree | 82dcab9a2efc60b449f3c5a53cc0bee5437b2d46 /src/mame | |
parent | 3a15530fa5afafd6fff1e226ffce9aabb0993b3c (diff) |
devices/machine: simplified more handlers (nw)
Diffstat (limited to 'src/mame')
43 files changed, 102 insertions, 102 deletions
diff --git a/src/mame/audio/csd.cpp b/src/mame/audio/csd.cpp index 9baf3792fed..5e35c2793d2 100644 --- a/src/mame/audio/csd.cpp +++ b/src/mame/audio/csd.cpp @@ -129,7 +129,7 @@ u8 midway_cheap_squeak_deluxe_device::stat_r() void midway_cheap_squeak_deluxe_device::sr_w(u8 data) { - m_pia->write_portb(data & 0x0f); + m_pia->portb_w(data & 0x0f); } //------------------------------------------------- diff --git a/src/mame/audio/dkong.cpp b/src/mame/audio/dkong.cpp index b34d12a090c..01f94b1b876 100644 --- a/src/mame/audio/dkong.cpp +++ b/src/mame/audio/dkong.cpp @@ -1229,11 +1229,11 @@ READ8_MEMBER(dkong_state::dkong_voice_status_r) READ8_MEMBER(dkong_state::dkong_tune_r) { - uint8_t page = m_dev_vp2->read(space, 0) & 0x47; + uint8_t page = m_dev_vp2->read(0) & 0x47; if ( page & 0x40 ) { - return (m_ls175_3d->read(space, 0) & 0x0F) | (dkong_voice_status_r(space, 0) << 4); + return (m_ls175_3d->read(0) & 0x0F) | (dkong_voice_status_r(space, 0) << 4); } else { diff --git a/src/mame/audio/exidy.cpp b/src/mame/audio/exidy.cpp index df55e898700..d3ce6870fe9 100644 --- a/src/mame/audio/exidy.cpp +++ b/src/mame/audio/exidy.cpp @@ -690,13 +690,13 @@ void exidy_sh8253_sound_device::device_reset() WRITE8_MEMBER(venture_sound_device::pa_w) { - m_pia->write_porta(data); + m_pia->porta_w(data); } WRITE8_MEMBER(venture_sound_device::pb_w) { - m_pia->write_portb(data); + m_pia->portb_w(data); } @@ -885,7 +885,7 @@ READ8_MEMBER(victory_sound_device::status_r) TIMER_CALLBACK_MEMBER(victory_sound_device::delayed_command_w) { - m_pia->write_porta(param); + m_pia->porta_w(param); m_pia_ca1 = 0; m_pia->ca1_w(m_pia_ca1); } @@ -960,7 +960,7 @@ void victory_sound_device::device_reset() /* these two lines shouldn't be needed, but it avoids the log entry as the sound CPU checks port A before the main CPU ever writes to it */ - m_pia->write_porta(0); + m_pia->porta_w(0); m_pia_ca1 = 1; m_pia->ca1_w(m_pia_ca1); } diff --git a/src/mame/audio/midway.cpp b/src/mame/audio/midway.cpp index dfa62f619af..169752b85d7 100644 --- a/src/mame/audio/midway.cpp +++ b/src/mame/audio/midway.cpp @@ -612,7 +612,7 @@ void midway_sounds_good_device::device_reset() void midway_sounds_good_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { - m_pia->write_portb((param >> 1) & 0x0f); + m_pia->portb_w((param >> 1) & 0x0f); m_pia->ca1_w(~param & 0x01); // oftentimes games will write one nibble at a time; the sync on this is very @@ -769,7 +769,7 @@ void midway_turbo_cheap_squeak_device::device_reset() void midway_turbo_cheap_squeak_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { - m_pia->write_portb((param >> 1) & 0x0f); + m_pia->portb_w((param >> 1) & 0x0f); m_pia->ca1_w(~param & 0x01); // oftentimes games will write one nibble at a time; the sync on this is very diff --git a/src/mame/audio/qix.cpp b/src/mame/audio/qix.cpp index 3bbca8ff066..1c1d369c145 100644 --- a/src/mame/audio/qix.cpp +++ b/src/mame/audio/qix.cpp @@ -104,7 +104,7 @@ WRITE8_MEMBER(qix_state::sndpia_2_warning_w) TIMER_CALLBACK_MEMBER(qix_state::deferred_sndpia1_porta_w) { - m_sndpia1->write_porta(param); + m_sndpia1->porta_w(param); } diff --git a/src/mame/audio/s11c_bg.cpp b/src/mame/audio/s11c_bg.cpp index 51f90b38074..a62c5a48d87 100644 --- a/src/mame/audio/s11c_bg.cpp +++ b/src/mame/audio/s11c_bg.cpp @@ -45,7 +45,7 @@ WRITE_LINE_MEMBER( s11c_bg_device::pia40_cb2_w) WRITE8_MEMBER( s11c_bg_device::pia40_pb_w ) { -// m_pia34->write_portb(data); +// m_pia34->portb_w(data); } void s11c_bg_device::ctrl_w(uint8_t data) @@ -55,7 +55,7 @@ void s11c_bg_device::ctrl_w(uint8_t data) void s11c_bg_device::data_w(uint8_t data) { - m_pia40->write_portb(data); + m_pia40->portb_w(data); } void s11c_bg_device::device_add_mconfig(machine_config &config) diff --git a/src/mame/audio/spiders.cpp b/src/mame/audio/spiders.cpp index c25c5872604..35c72ca60a0 100644 --- a/src/mame/audio/spiders.cpp +++ b/src/mame/audio/spiders.cpp @@ -178,7 +178,7 @@ DISCRETE_SOUND_END WRITE8_MEMBER(spiders_state::spiders_audio_command_w) { - m_pia[3]->write_porta(data & 0xf8); + m_pia[3]->porta_w(data & 0xf8); m_pia[3]->ca1_w(BIT(data, 7)); } diff --git a/src/mame/audio/williams.cpp b/src/mame/audio/williams.cpp index 1a515a44af7..c78684aa3dc 100644 --- a/src/mame/audio/williams.cpp +++ b/src/mame/audio/williams.cpp @@ -249,7 +249,7 @@ void williams_cvsd_sound_device::device_reset() void williams_cvsd_sound_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { // process incoming data write - m_pia->write_portb(param & 0xff); + m_pia->portb_w(param & 0xff); m_pia->cb1_w((param >> 8) & 1); m_pia->cb2_w((param >> 9) & 1); } diff --git a/src/mame/drivers/a2600.cpp b/src/mame/drivers/a2600.cpp index e4ef8eee5d5..f2b76e89b98 100644 --- a/src/mame/drivers/a2600.cpp +++ b/src/mame/drivers/a2600.cpp @@ -67,9 +67,9 @@ READ8_MEMBER(a2600_state::cart_over_all_r) else if (masked_offset < 0x2a0) { #if USE_NEW_RIOT - ret = m_riot->io_r(space, masked_offset); + ret = m_riot->io_r(masked_offset); #else - ret = m_riot->read(space, masked_offset); + ret = m_riot->read(masked_offset); #endif } else if (masked_offset < 0x300) @@ -103,9 +103,9 @@ WRITE8_MEMBER(a2600_state::cart_over_all_w) else if (masked_offset < 0x2a0) { #if USE_NEW_RIOT - m_riot->io_w(space, masked_offset, data); + m_riot->io_w(masked_offset, data); #else - m_riot->write(space, masked_offset, data); + m_riot->write(masked_offset, data); #endif } else if (masked_offset < 0x300) diff --git a/src/mame/drivers/abc1600.cpp b/src/mame/drivers/abc1600.cpp index f23045601ec..72cb46dfb53 100644 --- a/src/mame/drivers/abc1600.cpp +++ b/src/mame/drivers/abc1600.cpp @@ -619,12 +619,12 @@ WRITE8_MEMBER( abc1600_state::dart_w ) READ8_MEMBER( abc1600_state::scc_r ) { - return m_scc->reg_r(space, A1_A2); + return m_scc->reg_r(A1_A2); } WRITE8_MEMBER( abc1600_state::scc_w ) { - m_scc->reg_w(space, A1_A2, data); + m_scc->reg_w(A1_A2, data); } diff --git a/src/mame/drivers/amiga.cpp b/src/mame/drivers/amiga.cpp index 98e8c9276d4..7f8550dd95b 100644 --- a/src/mame/drivers/amiga.cpp +++ b/src/mame/drivers/amiga.cpp @@ -629,12 +629,12 @@ WRITE8_MEMBER( cdtv_state::dmac_scsi_data_write ) READ8_MEMBER( cdtv_state::dmac_io_read ) { - return m_cdrom->read(space, 0); + return m_cdrom->read(); } WRITE8_MEMBER( cdtv_state::dmac_io_write ) { - m_cdrom->write(space, 0, data); + m_cdrom->write(data); } WRITE_LINE_MEMBER( cdtv_state::dmac_int_w ) diff --git a/src/mame/drivers/apple1.cpp b/src/mame/drivers/apple1.cpp index 26fc47f880a..c6ecc243e96 100644 --- a/src/mame/drivers/apple1.cpp +++ b/src/mame/drivers/apple1.cpp @@ -494,7 +494,7 @@ WRITE8_MEMBER(apple1_state::pia_display_w) // and to the display hardware WRITE_LINE_MEMBER(apple1_state::pia_display_gate_w) { - m_pia->write_portb((state << 7) ^ 0x80); + m_pia->portb_w((state << 7) ^ 0x80); // falling edge means start the display timer if (state == CLEAR_LINE) diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp index 013c23a16be..c003c713e70 100644 --- a/src/mame/drivers/apple2e.cpp +++ b/src/mame/drivers/apple2e.cpp @@ -2917,7 +2917,7 @@ void apple2e_state::laser128_map(address_map &map) // map(0xc098, 0xc09b).rw(m_acia1, FUNC(mos6551_device::read), FUNC(mos6551_device::write)); // map(0xc0a8, 0xc0ab).rw(m_acia2, FUNC(mos6551_device::read), FUNC(mos6551_device::write)); map(0xc0d0, 0xc0d3).rw(FUNC(apple2e_state::memexp_r), FUNC(apple2e_state::memexp_w)); - map(0xc0e0, 0xc0ef).rw(m_laserudc, FUNC(applefdc_base_device::bus_r), FUNC(applefdc_base_device::bus_w)); + map(0xc0e0, 0xc0ef).rw(m_laserudc, FUNC(applefdc_base_device::read), FUNC(applefdc_base_device::write)); map(0xc100, 0xc2ff).m(m_c100bank, FUNC(address_map_bank_device::amap8)); map(0xc300, 0xc3ff).m(m_c300bank, FUNC(address_map_bank_device::amap8)); map(0xc400, 0xc7ff).m(m_c400bank, FUNC(address_map_bank_device::amap8)); diff --git a/src/mame/drivers/cbm2.cpp b/src/mame/drivers/cbm2.cpp index e8c1b6fb35d..d9eb765e244 100644 --- a/src/mame/drivers/cbm2.cpp +++ b/src/mame/drivers/cbm2.cpp @@ -1785,7 +1785,7 @@ READ8_MEMBER( cbm2_state::cia_pa_r ) uint8_t data = 0; // IEEE-488 - data |= m_ieee1->read(space, 0); + data |= m_ieee1->read(); // user port data &= m_user->d1_r(); @@ -1815,7 +1815,7 @@ WRITE8_MEMBER( cbm2_state::cia_pa_w ) */ // IEEE-488 - m_ieee1->write(space, 0, data); + m_ieee1->write(data); // user port m_user->d1_w(data); diff --git a/src/mame/drivers/comx35.cpp b/src/mame/drivers/comx35.cpp index 787e06cbcf2..e5a76dd6d9d 100644 --- a/src/mame/drivers/comx35.cpp +++ b/src/mame/drivers/comx35.cpp @@ -266,7 +266,7 @@ READ8_MEMBER( comx35_state::io_r ) if (offset == 3) { - data = m_kbe->read(space, 0); + data = m_kbe->read(); } return data; diff --git a/src/mame/drivers/hazeltin.cpp b/src/mame/drivers/hazeltin.cpp index 827ac527939..5494c9e3b48 100644 --- a/src/mame/drivers/hazeltin.cpp +++ b/src/mame/drivers/hazeltin.cpp @@ -346,12 +346,12 @@ WRITE8_MEMBER( hazl1500_state::status_reg_3_w ) READ8_MEMBER( hazl1500_state::uart_r ) { - return (m_uart->get_received_data() & 0x7f) | (m_uart->pe_r() << 7); + return (m_uart->receive() & 0x7f) | (m_uart->pe_r() << 7); } WRITE8_MEMBER( hazl1500_state::uart_w ) { - m_uart->set_transmit_data((data & 0x7f) | (BIT(m_misc_dips->read(), 3) ? 0x00 : 0x80)); + m_uart->transmit((data & 0x7f) | (BIT(m_misc_dips->read(), 3) ? 0x00 : 0x80)); } READ8_MEMBER( hazl1500_state::kbd_status_latch_r ) diff --git a/src/mame/drivers/micral.cpp b/src/mame/drivers/micral.cpp index 9db756816c7..5154a1609d5 100644 --- a/src/mame/drivers/micral.cpp +++ b/src/mame/drivers/micral.cpp @@ -121,7 +121,7 @@ READ8_MEMBER( micral_state::unk_r ) READ8_MEMBER( micral_state::keyin_r ) { m_uart->write_rdav(0); - u8 result = m_uart->get_received_data(); + u8 result = m_uart->receive(); m_uart->write_rdav(1); return result; } diff --git a/src/mame/drivers/microterm_f8.cpp b/src/mame/drivers/microterm_f8.cpp index 6591e7b3dc5..be9068af4e0 100644 --- a/src/mame/drivers/microterm_f8.cpp +++ b/src/mame/drivers/microterm_f8.cpp @@ -230,7 +230,7 @@ WRITE8_MEMBER(microterm_f8_state::vram_w) WRITE8_MEMBER(microterm_f8_state::uart_transmit_w) { - m_uart->set_transmit_data((data & 0x7f) | (m_dsw[2]->read() & 0x10) << 3); + m_uart->transmit((data & 0x7f) | (m_dsw[2]->read() & 0x10) << 3); } bool microterm_f8_state::poll_keyboard() diff --git a/src/mame/drivers/nascom1.cpp b/src/mame/drivers/nascom1.cpp index d3eb65fd42b..4c5ed87ee3d 100644 --- a/src/mame/drivers/nascom1.cpp +++ b/src/mame/drivers/nascom1.cpp @@ -205,12 +205,12 @@ WRITE8_MEMBER( nascom_state::nascom1_port_00_w ) READ8_MEMBER( nascom_state::nascom1_port_01_r ) { - return m_hd6402->get_received_data(); + return m_hd6402->receive(); } WRITE8_MEMBER( nascom_state::nascom1_port_01_w ) { - m_hd6402->set_transmit_data(data); + m_hd6402->transmit(data); } READ8_MEMBER( nascom_state::nascom1_port_02_r ) diff --git a/src/mame/drivers/nforcepc.cpp b/src/mame/drivers/nforcepc.cpp index 6ce0f49df21..afa0ff16c86 100644 --- a/src/mame/drivers/nforcepc.cpp +++ b/src/mame/drivers/nforcepc.cpp @@ -977,7 +977,7 @@ READ8_MEMBER(it8703f_device::at_keybc_r) switch (offset) //m_kbdc { case 0: - return m_kbdc->data_r(space, 0); + return m_kbdc->data_r(0); } return 0xff; @@ -988,18 +988,18 @@ WRITE8_MEMBER(it8703f_device::at_keybc_w) switch (offset) { case 0: - m_kbdc->data_w(space, 0, data); + m_kbdc->data_w(0, data); } } READ8_MEMBER(it8703f_device::keybc_status_r) { - return m_kbdc->data_r(space, 4); + return m_kbdc->data_r(4); } WRITE8_MEMBER(it8703f_device::keybc_command_w) { - m_kbdc->data_w(space, 4, data); + m_kbdc->data_w(4, data); } void it8703f_device::map_keyboard_addresses() diff --git a/src/mame/drivers/proteus3.cpp b/src/mame/drivers/proteus3.cpp index fd915b179cf..df390f444e0 100644 --- a/src/mame/drivers/proteus3.cpp +++ b/src/mame/drivers/proteus3.cpp @@ -173,7 +173,7 @@ void proteus3_state::kbd_put(u8 data) { if (data == 0x08) data = 0x0f; // take care of backspace (bios 1 and 2) - m_pia->write_portb(data); + m_pia->portb_w(data); m_pia->cb1_w(1); m_pia->cb1_w(0); } diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp index 2d8fa1b174b..9104616d519 100644 --- a/src/mame/drivers/rainbow.cpp +++ b/src/mame/drivers/rainbow.cpp @@ -1640,7 +1640,7 @@ READ8_MEMBER(rainbow_base_state::corvus_status_r) output().set_value("led2", 0); switch_off_timer->adjust(attotime::from_msec(500)); - uint8_t status = m_corvus_hdc->status_r(space, 0); + uint8_t status = m_corvus_hdc->status_r(); uint8_t data = BIT(status, 7); // 0x80 BUSY (Set = Busy, Clear = Ready) data |= BIT(status, 6) << 1; // 0x40 DIR. (Controller -> Host, or Host->Controller) return data; diff --git a/src/mame/drivers/s11.cpp b/src/mame/drivers/s11.cpp index 9eca1fc247d..e2e9036abe8 100644 --- a/src/mame/drivers/s11.cpp +++ b/src/mame/drivers/s11.cpp @@ -310,7 +310,7 @@ WRITE8_MEMBER( s11_state::pia34_pa_w ) WRITE8_MEMBER( s11_state::pia34_pb_w ) { if(m_pia40) - m_pia40->write_portb(data); + m_pia40->portb_w(data); else m_bg->data_w(data); } @@ -366,7 +366,7 @@ WRITE_LINE_MEMBER( s11_state::pia40_cb2_w ) WRITE8_MEMBER( s11_state::pia40_pb_w ) { - m_pia34->write_portb(data); + m_pia34->portb_w(data); } void s11_state::init_s11() diff --git a/src/mame/drivers/sapi1.cpp b/src/mame/drivers/sapi1.cpp index b1cd1733f1f..225d4f89224 100644 --- a/src/mame/drivers/sapi1.cpp +++ b/src/mame/drivers/sapi1.cpp @@ -611,7 +611,7 @@ WRITE8_MEMBER(sapi_state::port13_w) READ8_MEMBER( sapi_state::port40_r ) { - return ~m_uart->get_received_data(); + return ~m_uart->receive(); } READ8_MEMBER(sapi_state::port41_r) @@ -624,7 +624,7 @@ READ8_MEMBER(sapi_state::port41_r) WRITE8_MEMBER( sapi_state::port43_w ) { - m_uart->set_transmit_data(~data); + m_uart->transmit(~data); } READ_LINE_MEMBER( sapi_state::si ) diff --git a/src/mame/drivers/seibuspi.cpp b/src/mame/drivers/seibuspi.cpp index 07404fd7eba..f3986f6b473 100644 --- a/src/mame/drivers/seibuspi.cpp +++ b/src/mame/drivers/seibuspi.cpp @@ -1041,10 +1041,10 @@ void seibuspi_state::spi_map(address_map &map) map(0x00000688, 0x00000688).w(FUNC(seibuspi_state::z80_prg_transfer_w)); map(0x0000068c, 0x0000068c).w(FUNC(seibuspi_state::z80_enable_w)); map(0x0000068e, 0x0000068e).w(FUNC(seibuspi_state::rf2_layer_bank_w)); - map(0x000006d0, 0x000006d0).w("ds2404", FUNC(ds2404_device::ds2404_1w_reset_w)); - map(0x000006d4, 0x000006d4).w("ds2404", FUNC(ds2404_device::ds2404_data_w)); - map(0x000006d8, 0x000006d8).w("ds2404", FUNC(ds2404_device::ds2404_clk_w)); - map(0x000006dc, 0x000006dc).r("ds2404", FUNC(ds2404_device::ds2404_data_r)); + map(0x000006d0, 0x000006d0).w("ds2404", FUNC(ds2404_device::_1w_reset_w)); + map(0x000006d4, 0x000006d4).w("ds2404", FUNC(ds2404_device::data_w)); + map(0x000006d8, 0x000006d8).w("ds2404", FUNC(ds2404_device::clk_w)); + map(0x000006dc, 0x000006dc).r("ds2404", FUNC(ds2404_device::data_r)); map(0x000006dd, 0x000006dd).r(FUNC(seibuspi_state::spi_ds2404_unknown_r)); map(0x00a00000, 0x013fffff).rom().region("sound01", 0); } @@ -1060,10 +1060,10 @@ void seibuspi_state::rdft2_map(address_map &map) map(0x00000688, 0x00000688).w(FUNC(seibuspi_state::z80_prg_transfer_w)); map(0x0000068c, 0x0000068c).w(FUNC(seibuspi_state::z80_enable_w)); map(0x0000068e, 0x0000068e).w(FUNC(seibuspi_state::rf2_layer_bank_w)); - map(0x000006d0, 0x000006d0).w("ds2404", FUNC(ds2404_device::ds2404_1w_reset_w)); - map(0x000006d4, 0x000006d4).w("ds2404", FUNC(ds2404_device::ds2404_data_w)); - map(0x000006d8, 0x000006d8).w("ds2404", FUNC(ds2404_device::ds2404_clk_w)); - map(0x000006dc, 0x000006dc).r("ds2404", FUNC(ds2404_device::ds2404_data_r)); + map(0x000006d0, 0x000006d0).w("ds2404", FUNC(ds2404_device::_1w_reset_w)); + map(0x000006d4, 0x000006d4).w("ds2404", FUNC(ds2404_device::data_w)); + map(0x000006d8, 0x000006d8).w("ds2404", FUNC(ds2404_device::clk_w)); + map(0x000006dc, 0x000006dc).r("ds2404", FUNC(ds2404_device::data_r)); map(0x000006dd, 0x000006dd).r(FUNC(seibuspi_state::spi_ds2404_unknown_r)); map(0x00a00000, 0x013fffff).rom().region("sound01", 0); } @@ -1077,10 +1077,10 @@ void seibuspi_state::sxx2e_map(address_map &map) map(0x00000684, 0x00000684).r(FUNC(seibuspi_state::sound_fifo_status_r)); map(0x00000688, 0x0000068b).noprw(); // ? map(0x0000068c, 0x0000068f).nopw(); - map(0x000006d0, 0x000006d0).w("ds2404", FUNC(ds2404_device::ds2404_1w_reset_w)); - map(0x000006d4, 0x000006d4).w("ds2404", FUNC(ds2404_device::ds2404_data_w)); - map(0x000006d8, 0x000006d8).w("ds2404", FUNC(ds2404_device::ds2404_clk_w)); - map(0x000006dc, 0x000006dc).r("ds2404", FUNC(ds2404_device::ds2404_data_r)); + map(0x000006d0, 0x000006d0).w("ds2404", FUNC(ds2404_device::_1w_reset_w)); + map(0x000006d4, 0x000006d4).w("ds2404", FUNC(ds2404_device::data_w)); + map(0x000006d8, 0x000006d8).w("ds2404", FUNC(ds2404_device::clk_w)); + map(0x000006dc, 0x000006dc).r("ds2404", FUNC(ds2404_device::data_r)); map(0x000006dd, 0x000006dd).r(FUNC(seibuspi_state::spi_ds2404_unknown_r)); } diff --git a/src/mame/drivers/softbox.cpp b/src/mame/drivers/softbox.cpp index 1d9d7cb6ef2..f5c18764eff 100644 --- a/src/mame/drivers/softbox.cpp +++ b/src/mame/drivers/softbox.cpp @@ -257,7 +257,7 @@ READ8_MEMBER( softbox_state::ppi1_pc_r ) */ - uint8_t status = m_hdc->status_r(space, 0); + uint8_t status = m_hdc->status_r(); uint8_t data = 0; data |= (status & corvus_hdc_device::CONTROLLER_BUSY) ? 0 : 0x10; diff --git a/src/mame/drivers/starrider.cpp b/src/mame/drivers/starrider.cpp index a4e1f7ea68c..5b37d33585e 100644 --- a/src/mame/drivers/starrider.cpp +++ b/src/mame/drivers/starrider.cpp @@ -397,7 +397,7 @@ void sr_state::starrider(machine_config &config) m_main_pia1->readpa_handler().set_ioport("IN2"); // CA1 is the /END SCREEN signal // CA2 is the 4MS signal - m_main_pia1->writepb_handler().set(m_sound_pia1, FUNC(pia6821_device::write_portb)); + m_main_pia1->writepb_handler().set(m_sound_pia1, FUNC(pia6821_device::portb_w)); m_main_pia1->cb2_handler().set(m_sound_pia1, FUNC(pia6821_device::ca1_w)); m_main_pia1->irqa_handler().set("main.irq", FUNC(input_merger_device::in_w<0>)); m_main_pia1->irqb_handler().set("main.irq", FUNC(input_merger_device::in_w<1>)); @@ -755,7 +755,7 @@ void sr_state::sound_pia2_pa(u8 data) m_sound_pia2_pa_out = data; if (diff & ~m_sound_pia2_pb_in & 0x77U) { - m_sound_pia2->write_portb(m_sound_pia2_pb_in | (m_sound_pia2_pa_out & 0x77U)); + m_sound_pia2->portb_w(m_sound_pia2_pb_in | (m_sound_pia2_pa_out & 0x77U)); m_sound_pia2->ca1_w((0x07U == ((m_sound_pia2_pb_in | m_sound_pia2_pa_out) & 0x07U)) ? 1 : 0); m_sound_pia2->ca2_w((0x70U == ((m_sound_pia2_pb_in | m_sound_pia2_pa_out) & 0x70U)) ? 1 : 0); } @@ -767,7 +767,7 @@ DECLARE_WRITE_LINE_MEMBER(sr_state::sound_fifo0_ir) m_sound_pia2_pb_in |= 0x08U; else m_sound_pia2_pb_in &= 0xf7U; - m_sound_pia2->write_portb(m_sound_pia2_pb_in | (m_sound_pia2_pa_out & 0x77U)); + m_sound_pia2->portb_w(m_sound_pia2_pb_in | (m_sound_pia2_pa_out & 0x77U)); } DECLARE_WRITE_LINE_MEMBER(sr_state::sound_fifo1_ir) @@ -776,7 +776,7 @@ DECLARE_WRITE_LINE_MEMBER(sr_state::sound_fifo1_ir) m_sound_pia2_pb_in |= 0x80U; else m_sound_pia2_pb_in &= 0x7fU; - m_sound_pia2->write_portb(m_sound_pia2_pb_in | (m_sound_pia2_pa_out & 0x77U)); + m_sound_pia2->portb_w(m_sound_pia2_pb_in | (m_sound_pia2_pa_out & 0x77U)); } template <unsigned N> WRITE_LINE_MEMBER(sr_state::sound_fifo_or) @@ -787,7 +787,7 @@ template <unsigned N> WRITE_LINE_MEMBER(sr_state::sound_fifo_or) m_sound_pia2_pb_in &= ~(u8(1) << (N + 4)); if (!BIT(m_sound_pia2_pa_out, N + 4)) { - m_sound_pia2->write_portb(m_sound_pia2_pb_in | (m_sound_pia2_pa_out & 0x77U)); + m_sound_pia2->portb_w(m_sound_pia2_pb_in | (m_sound_pia2_pa_out & 0x77U)); m_sound_pia2->ca2_w((0x70U == ((m_sound_pia2_pb_in | m_sound_pia2_pa_out) & 0x70U)) ? 1 : 0); } } @@ -800,7 +800,7 @@ template <unsigned N> WRITE_LINE_MEMBER(sr_state::sound_fifo_flag) m_sound_pia2_pb_in &= ~(u8(1) << N); if (!BIT(m_sound_pia2_pa_out, N)) { - m_sound_pia2->write_portb(m_sound_pia2_pb_in | (m_sound_pia2_pa_out & 0x77U)); + m_sound_pia2->portb_w(m_sound_pia2_pb_in | (m_sound_pia2_pa_out & 0x77U)); m_sound_pia2->ca1_w((0x07U == ((m_sound_pia2_pb_in | m_sound_pia2_pa_out) & 0x07U)) ? 1 : 0); } } diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp index 4d09e517ca4..96c42eb4661 100644 --- a/src/mame/drivers/tandy1t.cpp +++ b/src/mame/drivers/tandy1t.cpp @@ -359,7 +359,7 @@ READ8_MEMBER(tandy1000_state::tandy1000_pio_r) WRITE8_MEMBER( tandy1000_state::nmi_vram_bank_w ) { - m_mb->nmi_enable_w(space, 0, data & 0x80); + m_mb->nmi_enable_w(data & 0x80); vram_bank_w(space, 0, data & 0x1e); m_video->disable_w((data & 1) ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/drivers/toratora.cpp b/src/mame/drivers/toratora.cpp index b53ba43f42c..8def7118f0d 100644 --- a/src/mame/drivers/toratora.cpp +++ b/src/mame/drivers/toratora.cpp @@ -201,7 +201,7 @@ INTERRUPT_GEN_MEMBER(toratora_state::toratora_timer) if (m_timer & 0x100) popmessage("watchdog!"); - m_pia_u1->write_porta(ioport("INPUT")->read() & 0x0f); + m_pia_u1->porta_w(ioport("INPUT")->read() & 0x0f); m_pia_u1->ca1_w(ioport("INPUT")->read() & 0x10); m_pia_u1->ca2_w(ioport("INPUT")->read() & 0x20); } diff --git a/src/mame/drivers/tv990.cpp b/src/mame/drivers/tv990.cpp index 6544df8851d..f0f85f6230c 100644 --- a/src/mame/drivers/tv990.cpp +++ b/src/mame/drivers/tv990.cpp @@ -303,17 +303,17 @@ uint32_t tv990_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, READ8_MEMBER(tv990_state::kbdc_r) { if(offset) - return m_kbdc->data_r(space, 4); + return m_kbdc->data_r(4); else - return m_kbdc->data_r(space, 0); + return m_kbdc->data_r(0); } WRITE8_MEMBER(tv990_state::kbdc_w) { if(offset) - m_kbdc->data_w(space, 4, data); + m_kbdc->data_w(4, data); else - m_kbdc->data_w(space, 0, data); + m_kbdc->data_w(0, data); } void tv990_state::tv990_mem(address_map &map) diff --git a/src/mame/drivers/vt52.cpp b/src/mame/drivers/vt52.cpp index 369de8b2afa..89af231c04b 100644 --- a/src/mame/drivers/vt52.cpp +++ b/src/mame/drivers/vt52.cpp @@ -190,9 +190,9 @@ void vt52_state::vert_count_w(u8 data) void vt52_state::uart_xd_w(u8 data) { if (BIT(m_data_sw->read(), 2)) - m_uart->set_transmit_data(data | 0x80); + m_uart->transmit(data | 0x80); else - m_uart->set_transmit_data(data & 0x7f); + m_uart->transmit(data & 0x7f); } void vt52_state::gated_serial_output(bool state) diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp index 4737c7fc512..15a33588b9b 100644 --- a/src/mame/drivers/x68k.cpp +++ b/src/mame/drivers/x68k.cpp @@ -249,13 +249,13 @@ READ16_MEMBER(x68k_state::scc_r ) switch(offset) { case 0: - return m_scc->reg_r(space, 0); + return m_scc->reg_r(0); case 1: return read_mouse(); case 2: - return m_scc->reg_r(space, 1); + return m_scc->reg_r(1); case 3: - return m_scc->reg_r(space, 3); + return m_scc->reg_r(3); default: return 0xff; } @@ -268,7 +268,7 @@ WRITE16_MEMBER(x68k_state::scc_w ) switch(offset) { case 0: - m_scc->reg_w(space, 0,(uint8_t)data); + m_scc->reg_w(0,(uint8_t)data); if((m_scc->get_reg_b(5) & 0x02) != m_scc_prev) { if(m_scc->get_reg_b(5) & 0x02) // Request to Send @@ -281,13 +281,13 @@ WRITE16_MEMBER(x68k_state::scc_w ) } break; case 1: - m_scc->reg_w(space, 2,(uint8_t)data); + m_scc->reg_w(2,(uint8_t)data); break; case 2: - m_scc->reg_w(space, 1,(uint8_t)data); + m_scc->reg_w(1,(uint8_t)data); break; case 3: - m_scc->reg_w(space, 3,(uint8_t)data); + m_scc->reg_w(3,(uint8_t)data); break; } m_scc_prev = m_scc->get_reg_b(5) & 0x02; diff --git a/src/mame/machine/archimds.cpp b/src/mame/machine/archimds.cpp index 031f27fb196..1d9d5e1e159 100644 --- a/src/mame/machine/archimds.cpp +++ b/src/mame/machine/archimds.cpp @@ -471,7 +471,7 @@ READ32_MEMBER( archimedes_state::ioc_ctrl_r ) } case KART: // keyboard read - return m_kart->read(space,0); + return m_kart->read(); case IRQ_STATUS_A: return (m_ioc_regs[IRQ_STATUS_A] & 0x7f) | 0x80; // Force IRQ is always '1' @@ -552,7 +552,7 @@ WRITE32_MEMBER( archimedes_state::ioc_ctrl_w ) break; case KART: - m_kart->write(space,0,data); + m_kart->write(data); break; case IRQ_MASK_A: diff --git a/src/mame/machine/asteroid.cpp b/src/mame/machine/asteroid.cpp index c22dd37822c..1c763aeacd2 100644 --- a/src/mame/machine/asteroid.cpp +++ b/src/mame/machine/asteroid.cpp @@ -2,7 +2,7 @@ // copyright-holders:Brad Oliver, Bernd Wiebelt, Allard van der Bas /*************************************************************************** - machine.c + machine/asteroid.cpp Functions to emulate general aspects of the machine (RAM, ROM, interrupts, I/O ports) @@ -106,7 +106,7 @@ READ8_MEMBER(asteroid_state::asteroid_DSW1_r) m_dsw_sel->i0a_w(BIT(val, 6)); m_dsw_sel->i0b_w(BIT(val, 7)); - m_dsw_sel->s_w(space, 0, offset & 0x03); + m_dsw_sel->s_w(offset & 0x03); return 0xfc | (m_dsw_sel->zb_r() << 1) | m_dsw_sel->za_r(); } diff --git a/src/mame/machine/dgnalpha.cpp b/src/mame/machine/dgnalpha.cpp index dc48b3fa712..5021549f9ba 100644 --- a/src/mame/machine/dgnalpha.cpp +++ b/src/mame/machine/dgnalpha.cpp @@ -242,7 +242,7 @@ WRITE8_MEMBER( dragon_alpha_state::pia2_pa_w ) m_ay8912->data_w(m_pia_2->b_output()); break; case 0x02: /* Read from selected port */ - m_pia_2->write_portb(m_ay8912->data_r()); + m_pia_2->portb_w(m_ay8912->data_r()); break; case 0x03: /* Select port to write to */ m_ay8912->address_w(m_pia_2->b_output()); diff --git a/src/mame/machine/lisa.cpp b/src/mame/machine/lisa.cpp index 305eacc1dc9..e4b1290c8a1 100644 --- a/src/mame/machine/lisa.cpp +++ b/src/mame/machine/lisa.cpp @@ -1704,7 +1704,7 @@ READ16_MEMBER(lisa_state::lisa_IO_r) switch ((offset & 0x0600) >> 9) { case 0: /* serial ports control */ - answer = m_scc->reg_r(space, offset&7); + answer = m_scc->reg_r(offset&7); break; case 2: /* parallel port */ @@ -1828,7 +1828,7 @@ WRITE16_MEMBER(lisa_state::lisa_IO_w) switch ((offset & 0x0600) >> 9) { case 0: /* serial ports control */ - m_scc->reg_w(space, offset&7, data); + m_scc->reg_w(offset&7, data); break; case 2: /* paralel port */ diff --git a/src/mame/machine/mac.cpp b/src/mame/machine/mac.cpp index 4f42dd272b5..ab59e67cccf 100644 --- a/src/mame/machine/mac.cpp +++ b/src/mame/machine/mac.cpp @@ -1169,7 +1169,7 @@ READ16_MEMBER ( mac_state::mac_scc_r ) { uint16_t result; - result = m_scc->reg_r(space, offset); + result = m_scc->reg_r(offset); return (result << 8) | result; } @@ -1177,12 +1177,12 @@ READ16_MEMBER ( mac_state::mac_scc_r ) WRITE16_MEMBER ( mac_state::mac_scc_w ) { - m_scc->reg_w(space, offset, data); + m_scc->reg_w(offset, data); } WRITE16_MEMBER ( mac_state::mac_scc_2_w ) { - m_scc->reg_w(space, offset, data >> 8); + m_scc->reg_w(offset, data >> 8); } /* ********************************** * diff --git a/src/mame/machine/macpci.cpp b/src/mame/machine/macpci.cpp index 4986892f6a7..cbc31a32dd2 100644 --- a/src/mame/machine/macpci.cpp +++ b/src/mame/machine/macpci.cpp @@ -168,18 +168,18 @@ READ32_MEMBER(macpci_state::mac_read_id) READ16_MEMBER ( macpci_state::mac_scc_r ) { - uint16_t result = m_scc->reg_r(space, offset); + uint16_t result = m_scc->reg_r(offset); return (result << 8) | result; } WRITE16_MEMBER ( macpci_state::mac_scc_w ) { - m_scc->reg_w(space, offset, data); + m_scc->reg_w(offset, data); } WRITE16_MEMBER ( macpci_state::mac_scc_2_w ) { - m_scc->reg_w(space, offset, data >> 8); + m_scc->reg_w(offset, data >> 8); } READ8_MEMBER(macpci_state::mac_5396_r) diff --git a/src/mame/machine/swim.cpp b/src/mame/machine/swim.cpp index df0ff3ec816..bc3a4277799 100644 --- a/src/mame/machine/swim.cpp +++ b/src/mame/machine/swim.cpp @@ -94,7 +94,7 @@ void swim_device::device_reset() // read - reads a byte from the FDC //------------------------------------------------- -uint8_t swim_device::read(uint8_t offset) +uint8_t swim_device::read(offs_t offset) { uint8_t result = 0; @@ -128,7 +128,7 @@ uint8_t swim_device::read(uint8_t offset) // write - write a byte to the FDC //------------------------------------------------- -void swim_device::write(uint8_t offset, uint8_t data) +void swim_device::write(offs_t offset, uint8_t data) { if (m_swim_mode == SWIM_MODE_IWM) { diff --git a/src/mame/machine/swim.h b/src/mame/machine/swim.h index e36c08f8c74..f7d86130ad1 100644 --- a/src/mame/machine/swim.h +++ b/src/mame/machine/swim.h @@ -33,8 +33,8 @@ public: swim_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // read/write - virtual uint8_t read(uint8_t offset) override; - virtual void write(uint8_t offset, uint8_t data) 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/mame/machine/swtpc09.cpp b/src/mame/machine/swtpc09.cpp index f394e7089dd..f35285f9973 100644 --- a/src/mame/machine/swtpc09.cpp +++ b/src/mame/machine/swtpc09.cpp @@ -967,7 +967,7 @@ void swtpc09_state::machine_reset() m_brg->rsa_w(baud_rate_high); m_brg->rsb_w(1); - m_pia->write_portb(0); + m_pia->portb_w(0); m_pia->cb1_w(0); m_pia->ca2_w(0); m_pia->cb2_w(0); diff --git a/src/mame/machine/vt100_kbd.cpp b/src/mame/machine/vt100_kbd.cpp index 591e0789cc4..6531b28a313 100644 --- a/src/mame/machine/vt100_kbd.cpp +++ b/src/mame/machine/vt100_kbd.cpp @@ -284,7 +284,7 @@ WRITE_LINE_MEMBER(vt100_keyboard_device::signal_line_w) if (dav) { - u8 data = m_uart->get_received_data(); + u8 data = m_uart->receive(); m_online_led = BIT(data, 5) ? 1 : 0; m_local_led = BIT(data, 5) ? 0 : 1; m_locked_led = BIT(data, 4) ? 0 : 1; @@ -331,7 +331,7 @@ WRITE8_MEMBER(vt100_keyboard_device::key_scan_w) { if (data != 0xff) LOG("Keycode pressed: %02X\n", (data >> 1) & 0x7f); - m_uart->set_transmit_data((data >> 1) & 0x7f); + m_uart->transmit((data >> 1) & 0x7f); } } diff --git a/src/mame/machine/williams.cpp b/src/mame/machine/williams.cpp index 5395fa363fd..fa29150dc37 100644 --- a/src/mame/machine/williams.cpp +++ b/src/mame/machine/williams.cpp @@ -155,7 +155,7 @@ void williams2_state::bank_select_w(u8 data) TIMER_CALLBACK_MEMBER(williams_state::deferred_snd_cmd_w) { - m_pia[2]->write_portb(param); + m_pia[2]->portb_w(param); m_pia[2]->cb1_w((param == 0xff) ? 0 : 1); } @@ -172,7 +172,7 @@ void playball_state::snd_cmd_w(u8 data) TIMER_CALLBACK_MEMBER(williams2_state::deferred_snd_cmd_w) { - m_pia[2]->write_porta(param); + m_pia[2]->porta_w(param); } void williams2_state::snd_cmd_w(u8 data) @@ -414,8 +414,8 @@ TIMER_CALLBACK_MEMBER(blaster_state::deferred_snd_cmd_w) uint8_t l_data = param | 0x80; uint8_t r_data = (param >> 1 & 0x40) | (param & 0x3f) | 0x80; - m_pia[2]->write_portb(l_data); m_pia[2]->cb1_w((l_data == 0xff) ? 0 : 1); - m_pia[3]->write_portb(r_data); m_pia[3]->cb1_w((r_data == 0xff) ? 0 : 1); + m_pia[2]->portb_w(l_data); m_pia[2]->cb1_w((l_data == 0xff) ? 0 : 1); + m_pia[3]->portb_w(r_data); m_pia[3]->cb1_w((r_data == 0xff) ? 0 : 1); } @@ -504,7 +504,7 @@ void joust2_state::machine_start() TIMER_CALLBACK_MEMBER(joust2_state::deferred_snd_cmd_w) { - m_pia[2]->write_porta(param & 0xff); + m_pia[2]->porta_w(param & 0xff); } |