diff options
author | Ivan Vangelista <mesgnet@yahoo.it> | 2020-03-12 18:10:30 +0100 |
---|---|---|
committer | Ivan Vangelista <mesgnet@yahoo.it> | 2020-03-12 18:10:30 +0100 |
commit | 6525dc0cbfcfde2d123a4f7beaf42570010238b1 (patch) | |
tree | a2d8da881880636f54661591ed08193989e5f085 /src/mame/drivers | |
parent | 037d9d1b7059d276dca507bd8776efa7329fec95 (diff) |
devices/sound: more handler simplification (nw)
Diffstat (limited to 'src/mame/drivers')
92 files changed, 148 insertions, 148 deletions
diff --git a/src/mame/drivers/a7800.cpp b/src/mame/drivers/a7800.cpp index aa35459d5a5..179b521e6ef 100644 --- a/src/mame/drivers/a7800.cpp +++ b/src/mame/drivers/a7800.cpp @@ -267,7 +267,7 @@ WRITE8_MEMBER(a7800_state::tia_w) m_ctrl_reg = data; } } - m_tia->tia_sound_w(space, offset, data); + m_tia->tia_sound_w(offset, data); } diff --git a/src/mame/drivers/appoooh.cpp b/src/mame/drivers/appoooh.cpp index d2c4b59e298..839da3daa58 100644 --- a/src/mame/drivers/appoooh.cpp +++ b/src/mame/drivers/appoooh.cpp @@ -182,7 +182,7 @@ WRITE_LINE_MEMBER(appoooh_state::adpcm_int) uint8_t *RAM = memregion("adpcm")->base(); m_adpcm_data = RAM[m_adpcm_address++]; - m_msm->write_data(m_adpcm_data >> 4); + m_msm->data_w(m_adpcm_data >> 4); if (m_adpcm_data == 0x70) { @@ -192,7 +192,7 @@ WRITE_LINE_MEMBER(appoooh_state::adpcm_int) } else { - m_msm->write_data(m_adpcm_data & 0x0f); + m_msm->data_w(m_adpcm_data & 0x0f); m_adpcm_data = -1; } } diff --git a/src/mame/drivers/ashnojoe.cpp b/src/mame/drivers/ashnojoe.cpp index b0f86449e6f..0d3ad27babf 100644 --- a/src/mame/drivers/ashnojoe.cpp +++ b/src/mame/drivers/ashnojoe.cpp @@ -273,11 +273,11 @@ WRITE_LINE_MEMBER(ashnojoe_state::ashnojoe_vclk_cb) { if (m_msm5205_vclk_toggle == 0) { - m_msm->write_data(m_adpcm_byte >> 4); + m_msm->data_w(m_adpcm_byte >> 4); } else { - m_msm->write_data(m_adpcm_byte & 0xf); + m_msm->data_w(m_adpcm_byte & 0xf); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/bagman.cpp b/src/mame/drivers/bagman.cpp index 2b3c339dc60..c54be51c780 100644 --- a/src/mame/drivers/bagman.cpp +++ b/src/mame/drivers/bagman.cpp @@ -99,12 +99,12 @@ WRITE8_MEMBER(bagman_state::ls259_w) WRITE_LINE_MEMBER(bagman_state::tmsprom_bit_w) { - m_tmsprom->bit_w(machine().dummy_space(), 0, 7 - ((m_tmslatch->q0_r()<<2) | (m_tmslatch->q1_r()<<1) | (m_tmslatch->q2_r()<<0))); + m_tmsprom->bit_w(7 - ((m_tmslatch->q0_r()<<2) | (m_tmslatch->q1_r()<<1) | (m_tmslatch->q2_r()<<0))); } WRITE_LINE_MEMBER(bagman_state::tmsprom_csq0_w) { - m_tmsprom->rom_csq_w(machine().dummy_space(), 0, state); + m_tmsprom->rom_csq_w(0, state); } WRITE_LINE_MEMBER(bagman_state::tmsprom_csq1_w) @@ -113,7 +113,7 @@ WRITE_LINE_MEMBER(bagman_state::tmsprom_csq1_w) // reset signal, which would pull /OE active low on both 2732s at once. How // does that situation manage not to overload the circuitry? if (state || m_tmslatch->q4_r()) - m_tmsprom->rom_csq_w(machine().dummy_space(), 1, state); + m_tmsprom->rom_csq_w(1, state); } WRITE_LINE_MEMBER(bagman_state::coin_counter_w) diff --git a/src/mame/drivers/battlera.cpp b/src/mame/drivers/battlera.cpp index 66bf74e0a6e..5f4defc2fc1 100644 --- a/src/mame/drivers/battlera.cpp +++ b/src/mame/drivers/battlera.cpp @@ -154,7 +154,7 @@ void battlera_state::battlera_portmap(address_map &map) WRITE_LINE_MEMBER(battlera_state::adpcm_int) { - m_msm->write_data(m_msm5205next >> 4); + m_msm->data_w(m_msm5205next >> 4); m_msm5205next <<= 4; m_toggle = 1 - m_toggle; diff --git a/src/mame/drivers/berzerk.cpp b/src/mame/drivers/berzerk.cpp index 72aaccbc594..e30f3901846 100644 --- a/src/mame/drivers/berzerk.cpp +++ b/src/mame/drivers/berzerk.cpp @@ -540,7 +540,7 @@ WRITE8_MEMBER(berzerk_state::audio_w) { /* write data to the S14001 */ case 0: - m_s14001a->data_w(space, 0, data & 0x3f); + m_s14001a->data_w(data & 0x3f); /* clock the chip -- via a 555 timer */ m_s14001a->start_w(1); diff --git a/src/mame/drivers/cabal.cpp b/src/mame/drivers/cabal.cpp index 07d91102288..bf1c95b8594 100644 --- a/src/mame/drivers/cabal.cpp +++ b/src/mame/drivers/cabal.cpp @@ -249,7 +249,7 @@ WRITE8_MEMBER(cabal_state::cabalbl_1_adpcm_w) { m_msm1->reset_w(BIT(data, 7)); /* ?? bit 6?? */ - m_msm1->write_data(data); + m_msm1->data_w(data); m_msm1->vclk_w(1); m_msm1->vclk_w(0); } @@ -257,7 +257,7 @@ WRITE8_MEMBER(cabal_state::cabalbl_2_adpcm_w) { m_msm2->reset_w(BIT(data, 7)); /* ?? bit 6?? */ - m_msm2->write_data(data); + m_msm2->data_w(data); m_msm2->vclk_w(1); m_msm2->vclk_w(0); } diff --git a/src/mame/drivers/chexx.cpp b/src/mame/drivers/chexx.cpp index 549e1d83afb..4974e9ac41c 100644 --- a/src/mame/drivers/chexx.cpp +++ b/src/mame/drivers/chexx.cpp @@ -143,7 +143,7 @@ READ8_MEMBER(chexx_state::via_b_in) WRITE8_MEMBER(chexx_state::via_a_out) { m_port_a = data; // multiplexer - m_digitalker->digitalker_data_w(space, 0, data, 0); + m_digitalker->digitalker_data_w(data); // logerror("%s: VIA write A = %02X\n", machine().describe_context(), data); } diff --git a/src/mame/drivers/chinagat.cpp b/src/mame/drivers/chinagat.cpp index 6b9b2080801..b27f6ddf41a 100644 --- a/src/mame/drivers/chinagat.cpp +++ b/src/mame/drivers/chinagat.cpp @@ -476,7 +476,7 @@ WRITE8_MEMBER(chinagat_state::saiyugoub1_adpcm_control_w ) if (((m_i8748_P2 & 0xc) >= 8) && ((data & 0xc) == 4)) { - m_adpcm->write_data(m_pcm_nibble); + m_adpcm->data_w(m_pcm_nibble); logerror("Writing %02x to m5205\n", m_pcm_nibble); } logerror("$ROM=%08x P1=%02x P2=%02x Prev_P2=%02x Nibble=%1x PCM_data=%02x\n", m_adpcm_addr, m_i8748_P1, data, m_i8748_P2, m_pcm_shift, m_pcm_nibble); diff --git a/src/mame/drivers/chinsan.cpp b/src/mame/drivers/chinsan.cpp index 9bfb918125e..9f58603f07a 100644 --- a/src/mame/drivers/chinsan.cpp +++ b/src/mame/drivers/chinsan.cpp @@ -420,7 +420,7 @@ WRITE_LINE_MEMBER( chinsan_state::adpcm_int_w ) uint8_t *ROM = memregion("adpcm")->base(); m_adpcm_data = ((m_trigger ? (ROM[m_adpcm_pos] & 0x0f) : (ROM[m_adpcm_pos] & 0xf0) >> 4)); - m_adpcm->write_data(m_adpcm_data & 0xf); + m_adpcm->data_w(m_adpcm_data & 0xf); m_trigger ^= 1; if (m_trigger == 0) { diff --git a/src/mame/drivers/combatsc.cpp b/src/mame/drivers/combatsc.cpp index 6a8ba7d7c92..86ecbabcfd3 100644 --- a/src/mame/drivers/combatsc.cpp +++ b/src/mame/drivers/combatsc.cpp @@ -405,7 +405,7 @@ WRITE8_MEMBER(combatsc_state::combatscb_msm_w) membank("bl_abank")->set_entry(BIT(data, 7)); m_msm->reset_w(BIT(data, 4)); - m_msm->write_data(data & 0x0f); + m_msm->data_w(data & 0x0f); } WRITE8_MEMBER(combatsc_state::combatscb_sound_irq_ack) diff --git a/src/mame/drivers/comx35.cpp b/src/mame/drivers/comx35.cpp index 5c600bd0c6e..787e06cbcf2 100644 --- a/src/mame/drivers/comx35.cpp +++ b/src/mame/drivers/comx35.cpp @@ -226,7 +226,7 @@ READ8_MEMBER( comx35_state::mem_r ) } else if (offset >= 0xf400 && offset < 0xf800) { - data = m_vis->char_ram_r(space, offset & 0x3ff); + data = m_vis->char_ram_r(offset & 0x3ff); } return data; @@ -247,11 +247,11 @@ WRITE8_MEMBER( comx35_state::mem_w ) } else if (offset >= 0xf400 && offset < 0xf800) { - m_vis->char_ram_w(space, offset & 0x3ff, data); + m_vis->char_ram_w(offset & 0x3ff, data); } else if (offset >= 0xf800) { - m_vis->page_ram_w(space, offset & 0x3ff, data); + m_vis->page_ram_w(offset & 0x3ff, data); } } diff --git a/src/mame/drivers/crgolf.cpp b/src/mame/drivers/crgolf.cpp index 1ebe1e8298e..15f2a8730ec 100644 --- a/src/mame/drivers/crgolf.cpp +++ b/src/mame/drivers/crgolf.cpp @@ -196,7 +196,7 @@ WRITE_LINE_MEMBER(crgolf_state::vck_callback) uint8_t data = memregion("adpcm")->base()[m_sample_offset >> 1]; /* write the next nibble and advance */ - m_msm->write_data((data >> (4 * (~m_sample_offset & 1))) & 0x0f); + m_msm->data_w((data >> (4 * (~m_sample_offset & 1))) & 0x0f); m_sample_offset++; /* every 256 clocks, we decrement the length */ diff --git a/src/mame/drivers/cvs.cpp b/src/mame/drivers/cvs.cpp index 11879abd318..1b9a274067c 100644 --- a/src/mame/drivers/cvs.cpp +++ b/src/mame/drivers/cvs.cpp @@ -376,7 +376,7 @@ READ8_MEMBER(cvs_state::cvs_speech_command_r) { /* FIXME: this was by observation on board ??? * -bit 7 is TMS status (active LO) */ - return ((m_tms5110->ctl_r(space, 0) ^ 1) << 7) | (m_soundlatch->read() & 0x7f); + return ((m_tms5110->ctl_r() ^ 1) << 7) | (m_soundlatch->read() & 0x7f); } @@ -394,7 +394,7 @@ WRITE8_MEMBER(cvs_state::cvs_tms5110_ctl_w) (m_tms5110_ctl_data[1] << 3); /* CTL8 */ LOG(("CVS: Speech CTL = %04x %02x %02x\n", ctl, offset, data)); - m_tms5110->ctl_w(space, 0, ctl); + m_tms5110->ctl_w(ctl); } diff --git a/src/mame/drivers/dacholer.cpp b/src/mame/drivers/dacholer.cpp index dff1188f134..28332260f6e 100644 --- a/src/mame/drivers/dacholer.cpp +++ b/src/mame/drivers/dacholer.cpp @@ -594,7 +594,7 @@ WRITE_LINE_MEMBER(dacholer_state::adpcm_int) { if (m_snd_interrupt_enable == 1 || (m_snd_interrupt_enable == 0 && m_msm_toggle == 1)) { - m_msm->write_data(m_msm_data >> 4); + m_msm->data_w(m_msm_data >> 4); m_msm_data <<= 4; m_msm_toggle ^= 1; if (m_msm_toggle == 0) diff --git a/src/mame/drivers/darius.cpp b/src/mame/drivers/darius.cpp index 89067a67306..71ed723f5cf 100644 --- a/src/mame/drivers/darius.cpp +++ b/src/mame/drivers/darius.cpp @@ -481,7 +481,7 @@ void darius_state::adpcm_nmi_enable(u8 data) void darius_state::adpcm_data_w(u8 data) { - m_msm->write_data(data); + m_msm->data_w(data); m_msm->reset_w(!(data & 0x20)); /* my best guess, but it could be output enable as well */ } diff --git a/src/mame/drivers/ddragon.cpp b/src/mame/drivers/ddragon.cpp index fb45982fc3b..e2a5fcba217 100644 --- a/src/mame/drivers/ddragon.cpp +++ b/src/mame/drivers/ddragon.cpp @@ -440,13 +440,13 @@ void ddragon_state::dd_adpcm_int( int chip ) } else if (m_adpcm_data[chip] != -1) { - m_adpcm[chip]->write_data(m_adpcm_data[chip] & 0x0f); + m_adpcm[chip]->data_w(m_adpcm_data[chip] & 0x0f); m_adpcm_data[chip] = -1; } else { m_adpcm_data[chip] = m_adpcm_rom[chip][m_adpcm_pos[chip]++]; - m_adpcm[chip]->write_data(m_adpcm_data[chip] >> 4); + m_adpcm[chip]->data_w(m_adpcm_data[chip] >> 4); } } diff --git a/src/mame/drivers/de_2.cpp b/src/mame/drivers/de_2.cpp index f9e4da4f1e7..dea875c8963 100644 --- a/src/mame/drivers/de_2.cpp +++ b/src/mame/drivers/de_2.cpp @@ -244,7 +244,7 @@ WRITE_LINE_MEMBER(de_2_state::ym2151_irq_w) WRITE_LINE_MEMBER(de_2_state::msm5205_irq_w) { - m_msm5205->write_data(m_sample_data >> 4); + m_msm5205->data_w(m_sample_data >> 4); if(m_more_data) { if(m_nmi_enable) diff --git a/src/mame/drivers/dec8.cpp b/src/mame/drivers/dec8.cpp index e88fa21e322..a909e74d073 100644 --- a/src/mame/drivers/dec8.cpp +++ b/src/mame/drivers/dec8.cpp @@ -303,7 +303,7 @@ WRITE_LINE_MEMBER(dec8_state::csilver_adpcm_int) if (m_toggle) m_audiocpu->set_input_line(m6502_device::IRQ_LINE, HOLD_LINE); - m_msm->write_data(m_msm5205next >> 4); + m_msm->data_w(m_msm5205next >> 4); m_msm5205next <<= 4; } diff --git a/src/mame/drivers/docastle.cpp b/src/mame/drivers/docastle.cpp index 7c4a12a2728..d67cadd8e60 100644 --- a/src/mame/drivers/docastle.cpp +++ b/src/mame/drivers/docastle.cpp @@ -189,13 +189,13 @@ WRITE_LINE_MEMBER(docastle_state::idsoccer_adpcm_int) } else if (m_adpcm_data != -1) { - m_msm->write_data(m_adpcm_data & 0x0f); + m_msm->data_w(m_adpcm_data & 0x0f); m_adpcm_data = -1; } else { m_adpcm_data = memregion("adpcm")->base()[m_adpcm_pos++]; - m_msm->write_data(m_adpcm_data >> 4); + m_msm->data_w(m_adpcm_data >> 4); } } diff --git a/src/mame/drivers/drmicro.cpp b/src/mame/drivers/drmicro.cpp index 0ce6a473e28..032f099d9ec 100644 --- a/src/mame/drivers/drmicro.cpp +++ b/src/mame/drivers/drmicro.cpp @@ -55,7 +55,7 @@ WRITE_LINE_MEMBER(drmicro_state::pcm_w) if (~m_pcm_adr & 1) data >>= 4; - m_msm->write_data(data & 0x0f); + m_msm->data_w(data & 0x0f); m_msm->reset_w(0); m_pcm_adr = (m_pcm_adr + 1) & 0x7fff; diff --git a/src/mame/drivers/dynax.cpp b/src/mame/drivers/dynax.cpp index f026998efb1..de6a7c383d2 100644 --- a/src/mame/drivers/dynax.cpp +++ b/src/mame/drivers/dynax.cpp @@ -315,7 +315,7 @@ void dynax_state::nanajign_palette_update(offs_t offset) WRITE_LINE_MEMBER(dynax_state::adpcm_int) { - m_msm->write_data(m_msm5205next >> 4); + m_msm->data_w(m_msm5205next >> 4); m_msm5205next <<= 4; m_toggle = 1 - m_toggle; @@ -329,7 +329,7 @@ WRITE_LINE_MEMBER(dynax_state::adpcm_int) WRITE_LINE_MEMBER(dynax_state::adpcm_int_cpu1) { - m_msm->write_data(m_msm5205next >> 4); + m_msm->data_w(m_msm5205next >> 4); m_msm5205next <<= 4; m_toggle_cpu1 = 1 - m_toggle_cpu1; diff --git a/src/mame/drivers/eva.cpp b/src/mame/drivers/eva.cpp index a99ead0ff8c..65bcf3c3241 100644 --- a/src/mame/drivers/eva.cpp +++ b/src/mame/drivers/eva.cpp @@ -122,7 +122,7 @@ READ8_MEMBER(eva24_state::read_g) WRITE8_MEMBER(eva24_state::write_d) { // D3210: TMS5100 CTL8421 - m_tms5100->ctl_w(space, 0, data & 0xf); + m_tms5100->ctl_w(data & 0xf); } @@ -137,13 +137,13 @@ WRITE16_MEMBER(eva11_state::write_r) WRITE16_MEMBER(eva11_state::write_o) { // O3210: TMS5100 CTL8421 - m_tms5100->ctl_w(space, 0, data & 0xf); + m_tms5100->ctl_w(data & 0xf); } READ8_MEMBER(eva11_state::read_k) { // K84: TMS5100 CTL81(O30) - u8 ctl = m_tms5100->ctl_r(space, 0); + u8 ctl = m_tms5100->ctl_r(); ctl = bitswap<2>(ctl, 3,0) << 2; // TODO: sensors diff --git a/src/mame/drivers/fantland.cpp b/src/mame/drivers/fantland.cpp index 4d1dba4c150..bd92745a9af 100644 --- a/src/mame/drivers/fantland.cpp +++ b/src/mame/drivers/fantland.cpp @@ -361,7 +361,7 @@ WRITE_LINE_MEMBER(borntofi_state::adpcm_int) } else { - m_msm[Voice]->write_data(m_adpcm_rom[start / 2] >> ((start & 1) * 4)); + m_msm[Voice]->data_w(m_adpcm_rom[start / 2] >> ((start & 1) * 4)); m_adpcm_nibble[Voice]++; } } diff --git a/src/mame/drivers/fastlane.cpp b/src/mame/drivers/fastlane.cpp index de480868d0d..3e51800ee27 100644 --- a/src/mame/drivers/fastlane.cpp +++ b/src/mame/drivers/fastlane.cpp @@ -60,22 +60,22 @@ WRITE8_MEMBER(fastlane_state::fastlane_bankswitch_w) READ8_MEMBER(fastlane_state::fastlane_k1_k007232_r) { - return m_k007232_1->read(space, offset ^ 1); + return m_k007232_1->read(offset ^ 1); } WRITE8_MEMBER(fastlane_state::fastlane_k1_k007232_w) { - m_k007232_1->write(space, offset ^ 1, data); + m_k007232_1->write(offset ^ 1, data); } READ8_MEMBER(fastlane_state::fastlane_k2_k007232_r) { - return m_k007232_2->read(space, offset ^ 1); + return m_k007232_2->read(offset ^ 1); } WRITE8_MEMBER(fastlane_state::fastlane_k2_k007232_w) { - m_k007232_2->write(space, offset ^ 1, data); + m_k007232_2->write(offset ^ 1, data); } void fastlane_state::fastlane_map(address_map &map) { diff --git a/src/mame/drivers/fcrash.cpp b/src/mame/drivers/fcrash.cpp index 8c3c1ab09e0..3c588ee2bb7 100644 --- a/src/mame/drivers/fcrash.cpp +++ b/src/mame/drivers/fcrash.cpp @@ -121,7 +121,7 @@ WRITE8_MEMBER( fcrash_state::fcrash_snd_bankswitch_w ) WRITE_LINE_MEMBER(fcrash_state::m5205_int1) { - m_msm_1->write_data(m_sample_buffer1 & 0x0f); + m_msm_1->data_w(m_sample_buffer1 & 0x0f); m_sample_buffer1 >>= 4; m_sample_select1 ^= 1; if (m_sample_select1 == 0) @@ -130,7 +130,7 @@ WRITE_LINE_MEMBER(fcrash_state::m5205_int1) WRITE_LINE_MEMBER(fcrash_state::m5205_int2) { - m_msm_2->write_data(m_sample_buffer2 & 0x0f); + m_msm_2->data_w(m_sample_buffer2 & 0x0f); m_sample_buffer2 >>= 4; m_sample_select2 ^= 1; } diff --git a/src/mame/drivers/fidel_card.cpp b/src/mame/drivers/fidel_card.cpp index 82bb019fae5..809cc1041d4 100644 --- a/src/mame/drivers/fidel_card.cpp +++ b/src/mame/drivers/fidel_card.cpp @@ -267,7 +267,7 @@ WRITE8_MEMBER(card_state::speech_w) if (m_speech == nullptr) return; - m_speech->data_w(space, 0, data & 0x3f); + m_speech->data_w(data & 0x3f); m_speech->start_w(1); m_speech->start_w(0); } diff --git a/src/mame/drivers/fidel_csc.cpp b/src/mame/drivers/fidel_csc.cpp index dfda2902321..dac78420430 100644 --- a/src/mame/drivers/fidel_csc.cpp +++ b/src/mame/drivers/fidel_csc.cpp @@ -461,7 +461,7 @@ WRITE_LINE_MEMBER(csc_state::pia0_ca2_w) WRITE8_MEMBER(csc_state::pia1_pa_w) { // d0-d5: TSI C0-C5 - m_speech->data_w(space, 0, data & 0x3f); + m_speech->data_w(data & 0x3f); // d0-d7: data for the 4 7seg leds, bits are ABFGHCDE (H is extra led) m_7seg_data = bitswap<8>(data,0,1,5,6,7,2,3,4); diff --git a/src/mame/drivers/fidel_elite.cpp b/src/mame/drivers/fidel_elite.cpp index 84441a0c457..070021dde02 100644 --- a/src/mame/drivers/fidel_elite.cpp +++ b/src/mame/drivers/fidel_elite.cpp @@ -266,7 +266,7 @@ WRITE8_MEMBER(elite_state::ppi_porta_w) { // d0-d5: TSI C0-C5 // d6: TSI START line - m_speech->data_w(space, 0, data & 0x3f); + m_speech->data_w(data & 0x3f); m_speech->start_w(data >> 6 & 1); // d7: printer? (black wire to LED pcb) diff --git a/src/mame/drivers/fidel_excel.cpp b/src/mame/drivers/fidel_excel.cpp index 5d15aa74f45..6a5db5bc199 100644 --- a/src/mame/drivers/fidel_excel.cpp +++ b/src/mame/drivers/fidel_excel.cpp @@ -289,7 +289,7 @@ WRITE8_MEMBER(excel_state::ttl_w) // Q0-Q5: TSI C0-C5 // Q7: TSI START line - m_speech->data_w(space, 0, m_speech_data & 0x3f); + m_speech->data_w(m_speech_data & 0x3f); m_speech->start_w(m_speech_data >> 7 & 1); } } diff --git a/src/mame/drivers/fidel_vcc.cpp b/src/mame/drivers/fidel_vcc.cpp index f8705db4f11..ffaededb2fe 100644 --- a/src/mame/drivers/fidel_vcc.cpp +++ b/src/mame/drivers/fidel_vcc.cpp @@ -215,7 +215,7 @@ WRITE8_MEMBER(vcc_state::ppi_porta_w) // d0-d5: TSI C0-C5 // d7: TSI START line - m_speech->data_w(space, 0, data & 0x3f); + m_speech->data_w(data & 0x3f); m_speech->start_w(data >> 7 & 1); // d6: language latch data diff --git a/src/mame/drivers/fidel_vsc.cpp b/src/mame/drivers/fidel_vsc.cpp index f2038f1cec0..7542d07aa62 100644 --- a/src/mame/drivers/fidel_vsc.cpp +++ b/src/mame/drivers/fidel_vsc.cpp @@ -271,7 +271,7 @@ READ8_MEMBER(vsc_state::speech_r) WRITE8_MEMBER(vsc_state::ppi_porta_w) { // d0-d5: TSI C0-C5 - m_speech->data_w(space, 0, data & 0x3f); + m_speech->data_w(data & 0x3f); // d0-d7: data for the 4 7seg leds, bits are HGCBAFED (H is extra led) m_7seg_data = bitswap<8>(data,7,6,2,1,0,5,4,3); diff --git a/src/mame/drivers/fromance.cpp b/src/mame/drivers/fromance.cpp index ecc2238291b..0383562aafc 100644 --- a/src/mame/drivers/fromance.cpp +++ b/src/mame/drivers/fromance.cpp @@ -162,7 +162,7 @@ WRITE_LINE_MEMBER(fromance_state::fromance_adpcm_int) /* clock the data through */ if (m_vclk_left) { - m_msm->write_data(m_adpcm_data >> 4); + m_msm->data_w(m_adpcm_data >> 4); m_adpcm_data <<= 4; m_vclk_left--; } diff --git a/src/mame/drivers/gladiatr.cpp b/src/mame/drivers/gladiatr.cpp index 48b0e3ae56e..450e3c16fa5 100644 --- a/src/mame/drivers/gladiatr.cpp +++ b/src/mame/drivers/gladiatr.cpp @@ -232,7 +232,7 @@ WRITE8_MEMBER(gladiatr_state::gladiator_adpcm_w) // bit 6 = bank offset membank("bank2")->set_entry((data & 0x40) ? 1 : 0); - m_msm->write_data(data); // bit 0..3 + m_msm->data_w(data); // bit 0..3 m_msm->reset_w(BIT(data, 5)); // bit 5 m_msm->vclk_w (BIT(data, 4)); // bit 4 } @@ -242,7 +242,7 @@ WRITE8_MEMBER(ppking_state::ppking_adpcm_w) // bit 6 = bank offset //membank("bank2")->set_entry((data & 0x40) ? 1 : 0); - m_msm->write_data(data); // bit 0..3 + m_msm->data_w(data); // bit 0..3 m_msm->reset_w(BIT(data, 5)); // bit 5 m_msm->vclk_w (BIT(data, 4)); // bit 4 } diff --git a/src/mame/drivers/goal92.cpp b/src/mame/drivers/goal92.cpp index d9a83a4058a..7d80ec6c61d 100644 --- a/src/mame/drivers/goal92.cpp +++ b/src/mame/drivers/goal92.cpp @@ -223,7 +223,7 @@ WRITE_LINE_MEMBER(goal92_state::irqhandler) WRITE_LINE_MEMBER(goal92_state::goal92_adpcm_int) { - m_msm->write_data(m_msm5205next); + m_msm->data_w(m_msm5205next); m_msm5205next >>= 4; m_adpcm_toggle^= 1; diff --git a/src/mame/drivers/gsword.cpp b/src/mame/drivers/gsword.cpp index 8ec1b6c680c..66a85ca6dc9 100644 --- a/src/mame/drivers/gsword.cpp +++ b/src/mame/drivers/gsword.cpp @@ -401,7 +401,7 @@ WRITE8_MEMBER(gsword_state::sound_command_w) WRITE8_MEMBER(gsword_state::adpcm_data_w) { - m_msm->write_data(data & 0x0f); // bit 0..3 + m_msm->data_w(data & 0x0f); // bit 0..3 m_msm->reset_w(BIT(data, 5)); // bit 5 m_msm->vclk_w(BIT(data, 4)); // bit 4 } diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp index 0463f4ac7cb..1416e052eb0 100644 --- a/src/mame/drivers/hh_tms1k.cpp +++ b/src/mame/drivers/hh_tms1k.cpp @@ -9300,7 +9300,7 @@ void speechp_state::update_display() WRITE16_MEMBER(speechp_state::write_r) { // R5-R9: TSI C0-C5 - m_speech->data_w(space, 0, data >> 5 & 0x3f); + m_speech->data_w(data >> 5 & 0x3f); // R10: TSI START line m_speech->start_w(data >> 10 & 1); diff --git a/src/mame/drivers/hnayayoi.cpp b/src/mame/drivers/hnayayoi.cpp index 85c644b3e48..4be57c296e9 100644 --- a/src/mame/drivers/hnayayoi.cpp +++ b/src/mame/drivers/hnayayoi.cpp @@ -80,7 +80,7 @@ WRITE8_MEMBER(hnayayoi_state::keyboard_w) WRITE8_MEMBER(hnayayoi_state::adpcm_data_w) { - m_msm->write_data(data); + m_msm->data_w(data); } diff --git a/src/mame/drivers/jangou.cpp b/src/mame/drivers/jangou.cpp index 43a79870a07..1a803c9f318 100644 --- a/src/mame/drivers/jangou.cpp +++ b/src/mame/drivers/jangou.cpp @@ -300,10 +300,10 @@ WRITE8_MEMBER(jangou_state::adpcm_w) WRITE_LINE_MEMBER(jangou_state::jngolady_vclk_cb) { if (m_msm5205_vclk_toggle == 0) - m_msm->write_data(m_adpcm_byte >> 4); + m_msm->data_w(m_adpcm_byte >> 4); else { - m_msm->write_data(m_adpcm_byte & 0xf); + m_msm->data_w(m_adpcm_byte & 0xf); m_cpu_1->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/jantotsu.cpp b/src/mame/drivers/jantotsu.cpp index 92bf725bbad..cc1f8806afb 100644 --- a/src/mame/drivers/jantotsu.cpp +++ b/src/mame/drivers/jantotsu.cpp @@ -320,7 +320,7 @@ WRITE_LINE_MEMBER(jantotsu_state::jan_adpcm_int) uint8_t *ROM = memregion("adpcm")->base(); m_adpcm_data = ((m_adpcm_trigger ? (ROM[m_adpcm_pos] & 0x0f) : (ROM[m_adpcm_pos] & 0xf0) >> 4)); - m_adpcm->write_data(m_adpcm_data & 0xf); + m_adpcm->data_w(m_adpcm_data & 0xf); m_adpcm_trigger ^= 1; if (m_adpcm_trigger == 0) { diff --git a/src/mame/drivers/jeutel.cpp b/src/mame/drivers/jeutel.cpp index 37877d8feb3..06c7068d43c 100644 --- a/src/mame/drivers/jeutel.cpp +++ b/src/mame/drivers/jeutel.cpp @@ -119,13 +119,13 @@ WRITE8_MEMBER( jeutel_state::porta_w ) { if ((data & 0xf0) == 0xf0) { - m_tms->ctl_w(space, offset, tms5110_device::CMD_RESET); + m_tms->ctl_w(tms5110_device::CMD_RESET); m_tms->pdc_w(1); m_tms->pdc_w(0); } else if ((data & 0xf0) == 0xd0) { - m_tms->ctl_w(space, offset, tms5110_device::CMD_SPEAK); + m_tms->ctl_w(tms5110_device::CMD_SPEAK); m_tms->pdc_w(1); m_tms->pdc_w(0); } diff --git a/src/mame/drivers/kungfur.cpp b/src/mame/drivers/kungfur.cpp index d747812eb9f..03c31a17116 100644 --- a/src/mame/drivers/kungfur.cpp +++ b/src/mame/drivers/kungfur.cpp @@ -215,7 +215,7 @@ WRITE_LINE_MEMBER(kungfur_state::adpcm_int) u8 *ROM = m_adpcm_region[N]->base(); u8 data = ROM[m_adpcm_pos[N] & (m_adpcm_region[N]->bytes() - 1)]; - m_adpcm[N]->write_data(m_adpcm_sel[N] ? data & 0xf : data >> 4 & 0xf); + m_adpcm[N]->data_w(m_adpcm_sel[N] ? data & 0xf : data >> 4 & 0xf); m_adpcm_pos[N] += m_adpcm_sel[N]; m_adpcm_sel[N] ^= 1; } diff --git a/src/mame/drivers/kurukuru.cpp b/src/mame/drivers/kurukuru.cpp index 3475d3f650a..23ec6b8cb41 100644 --- a/src/mame/drivers/kurukuru.cpp +++ b/src/mame/drivers/kurukuru.cpp @@ -460,7 +460,7 @@ private: WRITE_LINE_MEMBER(kurukuru_state::kurukuru_msm5205_vck) { m_soundirq->rst30_w(1); - m_adpcm->write_data(m_adpcm_data); + m_adpcm->data_w(m_adpcm_data); } diff --git a/src/mame/drivers/lucky74.cpp b/src/mame/drivers/lucky74.cpp index 2cade54aa04..54aac5e16db 100644 --- a/src/mame/drivers/lucky74.cpp +++ b/src/mame/drivers/lucky74.cpp @@ -1438,7 +1438,7 @@ WRITE_LINE_MEMBER(lucky74_state::lucky74_adpcm_int) /* transferring 1st nibble */ m_adpcm_data = memregion("adpcm")->base()[m_adpcm_pos]; m_adpcm_pos = (m_adpcm_pos + 1) & 0xffff; - m_msm->write_data(m_adpcm_data >> 4); + m_msm->data_w(m_adpcm_data >> 4); if (m_adpcm_pos == m_adpcm_end) { @@ -1451,7 +1451,7 @@ WRITE_LINE_MEMBER(lucky74_state::lucky74_adpcm_int) else { /* transferring 2nd nibble */ - m_msm->write_data(m_adpcm_data & 0x0f); + m_msm->data_w(m_adpcm_data & 0x0f); m_adpcm_data = -1; } } diff --git a/src/mame/drivers/lwings.cpp b/src/mame/drivers/lwings.cpp index 149429aa548..b36e02fca54 100644 --- a/src/mame/drivers/lwings.cpp +++ b/src/mame/drivers/lwings.cpp @@ -285,7 +285,7 @@ READ8_MEMBER(lwings_state::avengers_soundlatch2_r) WRITE8_MEMBER(lwings_state::msm5205_w) { m_msm->reset_w(BIT(data, 7)); - m_msm->write_data(data); + m_msm->data_w(data); m_msm->vclk_w(1); m_msm->vclk_w(0); } diff --git a/src/mame/drivers/m107.cpp b/src/mame/drivers/m107.cpp index 7456e2c3fd3..1a6996820fc 100644 --- a/src/mame/drivers/m107.cpp +++ b/src/mame/drivers/m107.cpp @@ -176,7 +176,7 @@ void m107_state::sound_map(address_map &map) { map(0x00000, 0x1ffff).rom(); map(0xa0000, 0xa3fff).ram(); - map(0xa8000, 0xa803f).rw("irem", FUNC(iremga20_device::irem_ga20_r), FUNC(iremga20_device::irem_ga20_w)).umask16(0x00ff); + map(0xa8000, 0xa803f).rw("irem", FUNC(iremga20_device::read), FUNC(iremga20_device::write)).umask16(0x00ff); map(0xa8040, 0xa8043).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)).umask16(0x00ff); map(0xa8044, 0xa8044).rw("soundlatch", FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::acknowledge_w)); map(0xa8046, 0xa8046).w("soundlatch2", FUNC(generic_latch_8_device::write)); diff --git a/src/mame/drivers/m92.cpp b/src/mame/drivers/m92.cpp index 3ca58475f05..d1cf3259ea8 100644 --- a/src/mame/drivers/m92.cpp +++ b/src/mame/drivers/m92.cpp @@ -399,7 +399,7 @@ void m92_state::sound_map(address_map &map) { map(0x00000, 0x1ffff).rom(); map(0xa0000, 0xa3fff).ram(); - map(0xa8000, 0xa803f).rw("irem", FUNC(iremga20_device::irem_ga20_r), FUNC(iremga20_device::irem_ga20_w)).umask16(0x00ff); + map(0xa8000, 0xa803f).rw("irem", FUNC(iremga20_device::read), FUNC(iremga20_device::write)).umask16(0x00ff); map(0xa8040, 0xa8043).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)).umask16(0x00ff); map(0xa8044, 0xa8044).rw("soundlatch", FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::acknowledge_w)); map(0xa8046, 0xa8046).w("soundlatch2", FUNC(generic_latch_8_device::write)); diff --git a/src/mame/drivers/mastboy.cpp b/src/mame/drivers/mastboy.cpp index 5386e7ffc2a..8c2d85276c3 100644 --- a/src/mame/drivers/mastboy.cpp +++ b/src/mame/drivers/mastboy.cpp @@ -595,7 +595,7 @@ WRITE8_MEMBER(mastboy_state::msm5205_data_w) WRITE_LINE_MEMBER(mastboy_state::adpcm_int) { - m_msm->write_data(m_m5205_next); + m_msm->data_w(m_m5205_next); m_m5205_next >>= 4; m_m5205_part ^= 1; diff --git a/src/mame/drivers/megasys1.cpp b/src/mame/drivers/megasys1.cpp index 6931a261ef6..1f8aba16840 100644 --- a/src/mame/drivers/megasys1.cpp +++ b/src/mame/drivers/megasys1.cpp @@ -508,7 +508,7 @@ void megasys1_state::p47b_adpcm_w(offs_t offset, u8 data) { // bit 6 is always set m_p47b_adpcm[offset]->reset_w(BIT(data, 7)); - m_p47b_adpcm[offset]->write_data(data & 0x0f); + m_p47b_adpcm[offset]->data_w(data & 0x0f); m_p47b_adpcm[offset]->vclk_w(1); m_p47b_adpcm[offset]->vclk_w(0); } diff --git a/src/mame/drivers/mermaid.cpp b/src/mame/drivers/mermaid.cpp index 37fcb30a87c..b50cf8b7b72 100644 --- a/src/mame/drivers/mermaid.cpp +++ b/src/mame/drivers/mermaid.cpp @@ -400,7 +400,7 @@ void mermaid_state::machine_reset() WRITE8_MEMBER(mermaid_state::adpcm_data_w) { m_adpcm_data = data; - m_adpcm->write_data(m_adpcm_trigger ? (data & 0x0f) : (data & 0xf0) >> 4); + m_adpcm->data_w(m_adpcm_trigger ? (data & 0x0f) : (data & 0xf0) >> 4); } WRITE_LINE_MEMBER(mermaid_state::rougien_adpcm_int) @@ -409,7 +409,7 @@ WRITE_LINE_MEMBER(mermaid_state::rougien_adpcm_int) return; m_adpcm_trigger ^= 1; - m_adpcm->write_data(m_adpcm_trigger ? (m_adpcm_data & 0x0f) : (m_adpcm_data & 0xf0) >> 4); + m_adpcm->data_w(m_adpcm_trigger ? (m_adpcm_data & 0x0f) : (m_adpcm_data & 0xf0) >> 4); m_adpcm_counter->clock_w(m_adpcm_trigger); if (m_adpcm_trigger == 0 && m_adpcm_counter->count() == 0) { diff --git a/src/mame/drivers/mgavegas.cpp b/src/mame/drivers/mgavegas.cpp index c9b80303565..eacf1129e31 100644 --- a/src/mame/drivers/mgavegas.cpp +++ b/src/mame/drivers/mgavegas.cpp @@ -349,7 +349,7 @@ WRITE8_MEMBER(mgavegas_state::csoki_w) if (LOG_MSM5205) logerror("MSM5205 write to %04X data = %02X \n",offset+0xc800,data); m_msm->reset_w(data&0x10>>4); - m_msm->write_data(data&0x0f); + m_msm->data_w(data&0x0f); } diff --git a/src/mame/drivers/milton6805.cpp b/src/mame/drivers/milton6805.cpp index d12a5b4ff58..6d8d1b45c04 100644 --- a/src/mame/drivers/milton6805.cpp +++ b/src/mame/drivers/milton6805.cpp @@ -160,7 +160,7 @@ WRITE8_MEMBER(milton_state::control_w) // d5: SP0250 data present if (~m_control & data & 0x20) - m_speech->write(space, 0, m_data); + m_speech->write(m_data); // d1: TMC0430 M // d3: TMC0430 MO diff --git a/src/mame/drivers/mjkjidai.cpp b/src/mame/drivers/mjkjidai.cpp index c83ef4b9023..013b2899006 100644 --- a/src/mame/drivers/mjkjidai.cpp +++ b/src/mame/drivers/mjkjidai.cpp @@ -48,7 +48,7 @@ WRITE_LINE_MEMBER(mjkjidai_state::adpcm_int) else { uint8_t const data = m_adpcmrom[m_adpcm_pos / 2]; - m_msm->write_data(m_adpcm_pos & 1 ? data & 0xf : data >> 4); + m_msm->data_w(m_adpcm_pos & 1 ? data & 0xf : data >> 4); m_adpcm_pos++; } } diff --git a/src/mame/drivers/mlanding.cpp b/src/mame/drivers/mlanding.cpp index 4023fda0f15..ef3b653a06a 100644 --- a/src/mame/drivers/mlanding.cpp +++ b/src/mame/drivers/mlanding.cpp @@ -585,7 +585,7 @@ void mlanding_state::msm5205_update(unsigned chip) const u8 data = m_msm_rom[chip][m_msm_pos[chip]]; - m_msm[chip]->write_data((m_msm_nibble[chip] ? data : data >> 4) & 0xf); + m_msm[chip]->data_w((m_msm_nibble[chip] ? data : data >> 4) & 0xf); if (m_msm_nibble[chip]) ++m_msm_pos[chip]; diff --git a/src/mame/drivers/namcos86.cpp b/src/mame/drivers/namcos86.cpp index fc4cc690188..e4514e17d53 100644 --- a/src/mame/drivers/namcos86.cpp +++ b/src/mame/drivers/namcos86.cpp @@ -302,7 +302,7 @@ WRITE8_MEMBER(namcos86_state::cus115_w) case 1: case 2: case 3: - m_63701x->namco_63701x_w(space, (offset & 0x1e00) >> 9,data); + m_63701x->write((offset & 0x1e00) >> 9, data); break; case 4: diff --git a/src/mame/drivers/nemesis.cpp b/src/mame/drivers/nemesis.cpp index eef93d8d906..914876e8e56 100644 --- a/src/mame/drivers/nemesis.cpp +++ b/src/mame/drivers/nemesis.cpp @@ -1771,8 +1771,8 @@ void nemesis_state::nemesis(machine_config &config) ay1.add_route(ALL_OUTPUTS, "filter1", 0.20); ay8910_device &ay2(AY8910(config, "ay2", 14318180/8)); - ay2.port_a_write_callback().set(m_k005289, FUNC(k005289_device::k005289_control_A_w)); - ay2.port_b_write_callback().set(m_k005289, FUNC(k005289_device::k005289_control_B_w)); + ay2.port_a_write_callback().set(m_k005289, FUNC(k005289_device::control_A_w)); + ay2.port_b_write_callback().set(m_k005289, FUNC(k005289_device::control_B_w)); ay2.add_route(0, "filter2", 1.00); ay2.add_route(1, "filter3", 1.00); ay2.add_route(2, "filter4", 1.00); @@ -1835,8 +1835,8 @@ void nemesis_state::gx400(machine_config &config) ay1.add_route(ALL_OUTPUTS, "filter1", 0.20); ay8910_device &ay2(AY8910(config, "ay2", 14318180/8)); - ay2.port_a_write_callback().set(m_k005289, FUNC(k005289_device::k005289_control_A_w)); - ay2.port_b_write_callback().set(m_k005289, FUNC(k005289_device::k005289_control_B_w)); + ay2.port_a_write_callback().set(m_k005289, FUNC(k005289_device::control_A_w)); + ay2.port_b_write_callback().set(m_k005289, FUNC(k005289_device::control_B_w)); ay2.add_route(0, "filter2", 1.00); ay2.add_route(1, "filter3", 1.00); ay2.add_route(2, "filter4", 1.00); @@ -1901,8 +1901,8 @@ void nemesis_state::konamigt(machine_config &config) ay1.add_route(ALL_OUTPUTS, "filter1", 0.20); ay8910_device &ay2(AY8910(config, "ay2", 14318180/8)); - ay2.port_a_write_callback().set(m_k005289, FUNC(k005289_device::k005289_control_A_w)); - ay2.port_b_write_callback().set(m_k005289, FUNC(k005289_device::k005289_control_B_w)); + ay2.port_a_write_callback().set(m_k005289, FUNC(k005289_device::control_A_w)); + ay2.port_b_write_callback().set(m_k005289, FUNC(k005289_device::control_B_w)); ay2.add_route(0, "filter2", 1.00); ay2.add_route(1, "filter3", 1.00); ay2.add_route(2, "filter4", 1.00); @@ -1965,8 +1965,8 @@ void nemesis_state::rf2_gx400(machine_config &config) ay1.add_route(ALL_OUTPUTS, "filter1", 0.20); ay8910_device &ay2(AY8910(config, "ay2", 14318180/8)); - ay2.port_a_write_callback().set(m_k005289, FUNC(k005289_device::k005289_control_A_w)); - ay2.port_b_write_callback().set(m_k005289, FUNC(k005289_device::k005289_control_B_w)); + ay2.port_a_write_callback().set(m_k005289, FUNC(k005289_device::control_A_w)); + ay2.port_b_write_callback().set(m_k005289, FUNC(k005289_device::control_B_w)); ay2.add_route(0, "filter2", 1.00); ay2.add_route(1, "filter3", 1.00); ay2.add_route(2, "filter4", 1.00); @@ -2973,8 +2973,8 @@ void nemesis_state::bubsys(machine_config &config) ay1.add_route(ALL_OUTPUTS, "filter1", 0.20); ay8910_device &ay2(AY8910(config, "ay2", 14318180/8)); - ay2.port_a_write_callback().set(m_k005289, FUNC(k005289_device::k005289_control_A_w)); - ay2.port_b_write_callback().set(m_k005289, FUNC(k005289_device::k005289_control_B_w)); + ay2.port_a_write_callback().set(m_k005289, FUNC(k005289_device::control_A_w)); + ay2.port_b_write_callback().set(m_k005289, FUNC(k005289_device::control_B_w)); ay2.add_route(0, "filter2", 1.00); ay2.add_route(1, "filter3", 1.00); ay2.add_route(2, "filter4", 1.00); diff --git a/src/mame/drivers/ojankohs.cpp b/src/mame/drivers/ojankohs.cpp index 4170bea8dae..9ba9c4a517f 100644 --- a/src/mame/drivers/ojankohs.cpp +++ b/src/mame/drivers/ojankohs.cpp @@ -76,7 +76,7 @@ WRITE_LINE_MEMBER(ojankohs_state::ojankohs_adpcm_int) /* clock the data through */ if (m_vclk_left) { - m_msm->write_data((m_adpcm_data >> 4)); + m_msm->data_w(m_adpcm_data >> 4); m_adpcm_data <<= 4; m_vclk_left--; } diff --git a/src/mame/drivers/opwolf.cpp b/src/mame/drivers/opwolf.cpp index 36a5af75c02..cab5e75b55c 100644 --- a/src/mame/drivers/opwolf.cpp +++ b/src/mame/drivers/opwolf.cpp @@ -727,7 +727,7 @@ WRITE_LINE_MEMBER(opwolf_state::msm5205_vck_w) { if (m_adpcm_data[N] != -1) { - m_msm[N]->write_data(m_adpcm_data[N] & 0x0f); + m_msm[N]->data_w(m_adpcm_data[N] & 0x0f); m_adpcm_data[N] = -1; if (m_adpcm_pos[N] == m_adpcm_end[N]) { @@ -739,7 +739,7 @@ WRITE_LINE_MEMBER(opwolf_state::msm5205_vck_w) { m_adpcm_data[N] = memregion("adpcm")->base()[m_adpcm_pos[N]]; m_adpcm_pos[N] = (m_adpcm_pos[N] + 1) & 0x7ffff; - m_msm[N]->write_data(m_adpcm_data[N] >> 4); + m_msm[N]->data_w(m_adpcm_data[N] >> 4); } } diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp index 1d3473648b2..a47806a0201 100644 --- a/src/mame/drivers/pacman.cpp +++ b/src/mame/drivers/pacman.cpp @@ -546,7 +546,7 @@ WRITE8_MEMBER(pacman_state::alibaba_sound_w) /* since the sound region in Ali Baba is not contiguous, translate the offset into the 0-0x1f range */ offset = (offset >> 1 & 0x10) | (offset & 0x0f); - m_namco_sound->pacman_sound_w(space, offset, data); + m_namco_sound->pacman_sound_w(offset, data); } READ8_MEMBER(pacman_state::alibaba_mystery_1_r) diff --git a/src/mame/drivers/pcktgal.cpp b/src/mame/drivers/pcktgal.cpp index 30c34152edd..293c6d6f1ed 100644 --- a/src/mame/drivers/pcktgal.cpp +++ b/src/mame/drivers/pcktgal.cpp @@ -50,7 +50,7 @@ WRITE8_MEMBER(pcktgal_state::sound_w) WRITE_LINE_MEMBER(pcktgal_state::adpcm_int) { - m_msm->write_data(m_msm5205next >> 4); + m_msm->data_w(m_msm5205next >> 4); m_msm5205next <<= 4; m_toggle = 1 - m_toggle; diff --git a/src/mame/drivers/pofo.cpp b/src/mame/drivers/pofo.cpp index fc06eb42e42..c9e4ca36fa7 100644 --- a/src/mame/drivers/pofo.cpp +++ b/src/mame/drivers/pofo.cpp @@ -381,7 +381,7 @@ WRITE8_MEMBER( portfolio_state::dtmf_w ) m_dtmf->mode_w(!BIT(data, 7)); m_dtmf->a0_w(!BIT(data, 7)); - m_dtmf->write(space, 0, data & 0x3f); + m_dtmf->write(data & 0x3f); m_dtmf->strobe_w(BIT(data, 6)); } diff --git a/src/mame/drivers/renegade.cpp b/src/mame/drivers/renegade.cpp index c7fb5d19008..566e816b688 100644 --- a/src/mame/drivers/renegade.cpp +++ b/src/mame/drivers/renegade.cpp @@ -165,7 +165,7 @@ WRITE_LINE_MEMBER(renegade_state::adpcm_int) else { uint8_t const data = m_adpcmrom[m_adpcm_pos / 2]; - m_msm->write_data(m_adpcm_pos & 1 ? data & 0xf : data >> 4); + m_msm->data_w(m_adpcm_pos & 1 ? data & 0xf : data >> 4); m_adpcm_pos++; } } diff --git a/src/mame/drivers/rmhaihai.cpp b/src/mame/drivers/rmhaihai.cpp index 95d1a2605c2..09c913747fe 100644 --- a/src/mame/drivers/rmhaihai.cpp +++ b/src/mame/drivers/rmhaihai.cpp @@ -213,7 +213,7 @@ READ8_MEMBER(rmhaihai_state::samples_r) WRITE8_MEMBER(rmhaihai_state::adpcm_w) { - m_msm->write_data(data); // bit0..3 + m_msm->data_w(data); // bit0..3 m_msm->reset_w(BIT(data, 5)); // bit 5 m_msm->vclk_w(BIT(data, 4)); // bit4 } diff --git a/src/mame/drivers/rz1.cpp b/src/mame/drivers/rz1.cpp index 7dc22f683ba..eced82164a0 100644 --- a/src/mame/drivers/rz1.cpp +++ b/src/mame/drivers/rz1.cpp @@ -232,12 +232,12 @@ READ8_MEMBER( rz1_state::upd934g_b_data_r ) WRITE8_MEMBER( rz1_state::upd934g_c_w ) { - m_pg[0]->write(space, offset >> 8, data); + m_pg[0]->write(offset >> 8, data); } WRITE8_MEMBER( rz1_state::upd934g_b_w ) { - m_pg[1]->write(space, offset >> 8, data); + m_pg[1]->write(offset >> 8, data); } READ8_MEMBER( rz1_state::port_a_r ) diff --git a/src/mame/drivers/segahang.cpp b/src/mame/drivers/segahang.cpp index c8f9890fad8..ee677c7015c 100644 --- a/src/mame/drivers/segahang.cpp +++ b/src/mame/drivers/segahang.cpp @@ -403,7 +403,7 @@ void segahang_state::sound_map_2203(address_map &map) map(0x0000, 0x7fff).rom(); map(0xc000, 0xc7ff).mirror(0x0800).ram(); map(0xd000, 0xd001).mirror(0x0ffe).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); - map(0xe000, 0xe0ff).mirror(0x0f00).rw("pcm", FUNC(segapcm_device::sega_pcm_r), FUNC(segapcm_device::sega_pcm_w)); + map(0xe000, 0xe0ff).mirror(0x0f00).rw("pcm", FUNC(segapcm_device::read), FUNC(segapcm_device::write)); } void segahang_state::sound_portmap_2203(address_map &map) @@ -417,7 +417,7 @@ void segahang_state::sound_map_2151(address_map &map) { map.unmap_value_high(); map(0x0000, 0x7fff).rom(); - map(0xf000, 0xf0ff).mirror(0x700).rw("pcm", FUNC(segapcm_device::sega_pcm_r), FUNC(segapcm_device::sega_pcm_w)); + map(0xf000, 0xf0ff).mirror(0x700).rw("pcm", FUNC(segapcm_device::read), FUNC(segapcm_device::write)); map(0xf800, 0xffff).ram(); } diff --git a/src/mame/drivers/segaorun.cpp b/src/mame/drivers/segaorun.cpp index 2669b2498e3..8ca14f8614b 100644 --- a/src/mame/drivers/segaorun.cpp +++ b/src/mame/drivers/segaorun.cpp @@ -892,7 +892,7 @@ void segaorun_state::sound_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0xefff).rom(); - map(0xf000, 0xf0ff).mirror(0x0700).rw("pcm", FUNC(segapcm_device::sega_pcm_r), FUNC(segapcm_device::sega_pcm_w)); + map(0xf000, 0xf0ff).mirror(0x0700).rw("pcm", FUNC(segapcm_device::read), FUNC(segapcm_device::write)); map(0xf800, 0xffff).ram(); } diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp index caf6927064c..36790b5b240 100644 --- a/src/mame/drivers/segaxbd.cpp +++ b/src/mame/drivers/segaxbd.cpp @@ -992,7 +992,7 @@ void segaxbd_state::sound_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0xefff).rom(); - map(0xf000, 0xf0ff).mirror(0x0700).rw("pcm", FUNC(segapcm_device::sega_pcm_r), FUNC(segapcm_device::sega_pcm_w)); + map(0xf000, 0xf0ff).mirror(0x0700).rw("pcm", FUNC(segapcm_device::read), FUNC(segapcm_device::write)); map(0xf800, 0xffff).ram(); } @@ -1017,7 +1017,7 @@ void segaxbd_state::smgp_sound2_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0xefff).rom(); - map(0xf000, 0xf0ff).mirror(0x0700).rw("pcm2", FUNC(segapcm_device::sega_pcm_r), FUNC(segapcm_device::sega_pcm_w)); + map(0xf000, 0xf0ff).mirror(0x0700).rw("pcm2", FUNC(segapcm_device::read), FUNC(segapcm_device::write)); map(0xf800, 0xffff).ram(); } diff --git a/src/mame/drivers/segaybd.cpp b/src/mame/drivers/segaybd.cpp index 3136860a984..f8e5023c6f9 100644 --- a/src/mame/drivers/segaybd.cpp +++ b/src/mame/drivers/segaybd.cpp @@ -641,7 +641,7 @@ void segaybd_state::sound_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0xefff).rom(); - map(0xf000, 0xf0ff).mirror(0x0700).rw("pcm", FUNC(segapcm_device::sega_pcm_r), FUNC(segapcm_device::sega_pcm_w)); + map(0xf000, 0xf0ff).mirror(0x0700).rw("pcm", FUNC(segapcm_device::read), FUNC(segapcm_device::write)); map(0xf800, 0xffff).ram(); } diff --git a/src/mame/drivers/sf.cpp b/src/mame/drivers/sf.cpp index db9fd9f9721..6b02c2cb044 100644 --- a/src/mame/drivers/sf.cpp +++ b/src/mame/drivers/sf.cpp @@ -148,7 +148,7 @@ WRITE8_MEMBER(sf_state::msm_w) { m_msm[Chip]->reset_w(BIT(data, 7)); /* ?? bit 6?? */ - m_msm[Chip]->write_data(data); + m_msm[Chip]->data_w(data); m_msm[Chip]->vclk_w(1); m_msm[Chip]->vclk_w(0); } diff --git a/src/mame/drivers/sothello.cpp b/src/mame/drivers/sothello.cpp index 450af20c0c8..b88d662fb73 100644 --- a/src/mame/drivers/sothello.cpp +++ b/src/mame/drivers/sothello.cpp @@ -343,7 +343,7 @@ INPUT_PORTS_END WRITE_LINE_MEMBER(sothello_state::adpcm_int) { /* only 4 bits are used */ - m_msm->write_data(m_msm_data & 0x0f); + m_msm->data_w(m_msm_data & 0x0f); m_soundcpu->set_input_line(0, ASSERT_LINE); } diff --git a/src/mame/drivers/spdodgeb.cpp b/src/mame/drivers/spdodgeb.cpp index 83d74a842c7..6261d02dd80 100644 --- a/src/mame/drivers/spdodgeb.cpp +++ b/src/mame/drivers/spdodgeb.cpp @@ -68,7 +68,7 @@ void spdodgeb_state::spd_adpcm_int( msm5205_device *device, int chip ) } else if (m_adpcm_data[chip] != -1) { - device->write_data(m_adpcm_data[chip] & 0x0f); + device->data_w(m_adpcm_data[chip] & 0x0f); m_adpcm_data[chip] = -1; } else @@ -76,7 +76,7 @@ void spdodgeb_state::spd_adpcm_int( msm5205_device *device, int chip ) uint8_t *ROM = memregion("adpcm")->base() + 0x10000 * chip; m_adpcm_data[chip] = ROM[m_adpcm_pos[chip]++]; - device->write_data(m_adpcm_data[chip] >> 4); + device->data_w(m_adpcm_data[chip] >> 4); } } diff --git a/src/mame/drivers/splash.cpp b/src/mame/drivers/splash.cpp index 501213dc9f5..7d7b4e8b8ec 100644 --- a/src/mame/drivers/splash.cpp +++ b/src/mame/drivers/splash.cpp @@ -103,7 +103,7 @@ WRITE8_MEMBER(splash_state::splash_adpcm_control_w) WRITE_LINE_MEMBER(splash_state::splash_msm5205_int) { - m_msm->write_data(m_adpcm_data >> 4); + m_msm->data_w(m_adpcm_data >> 4); m_adpcm_data = (m_adpcm_data << 4) & 0xf0; } @@ -591,7 +591,7 @@ WRITE_LINE_MEMBER(funystrp_state::adpcm_int1) { if (m_snd_interrupt_enable1 || m_msm_toggle1 == 1) { - m_msm1->write_data(m_msm_data1 >> 4); + m_msm1->data_w(m_msm_data1 >> 4); m_msm_data1 <<= 4; m_msm_toggle1 ^= 1; if (m_msm_toggle1 == 0) @@ -606,7 +606,7 @@ WRITE_LINE_MEMBER(funystrp_state::adpcm_int2) { if (m_snd_interrupt_enable2 || m_msm_toggle2 == 1) { - m_msm2->write_data(m_msm_data2 >> 4); + m_msm2->data_w(m_msm_data2 >> 4); m_msm_data2 <<= 4; m_msm_toggle2 ^= 1; if (m_msm_toggle2 == 0) diff --git a/src/mame/drivers/srmp2.cpp b/src/mame/drivers/srmp2.cpp index 100d4cd35a7..a9faae1d415 100644 --- a/src/mame/drivers/srmp2.cpp +++ b/src/mame/drivers/srmp2.cpp @@ -240,12 +240,12 @@ WRITE_LINE_MEMBER(srmp2_state::adpcm_int) } else { - m_msm->write_data(((m_adpcm_data >> 4) & 0x0f)); + m_msm->data_w((m_adpcm_data >> 4) & 0x0f); } } else { - m_msm->write_data(((m_adpcm_data >> 0) & 0x0f)); + m_msm->data_w((m_adpcm_data >> 0) & 0x0f); m_adpcm_sptr++; m_adpcm_data = -1; } diff --git a/src/mame/drivers/st_mp200.cpp b/src/mame/drivers/st_mp200.cpp index 55f6a38a987..df0c33efa49 100644 --- a/src/mame/drivers/st_mp200.cpp +++ b/src/mame/drivers/st_mp200.cpp @@ -354,7 +354,7 @@ WRITE_LINE_MEMBER( st_mp200_state::u11_ca2_w ) { if (BIT(m_u10a, 7)) { - m_s14001a->data_w(generic_space(), 0, m_u10a & 0x3f); + m_s14001a->data_w(m_u10a & 0x3f); m_s14001a->start_w(1); m_s14001a->start_w(0); } diff --git a/src/mame/drivers/suprgolf.cpp b/src/mame/drivers/suprgolf.cpp index 9f8f3c19f02..ec87ab2aa5f 100644 --- a/src/mame/drivers/suprgolf.cpp +++ b/src/mame/drivers/suprgolf.cpp @@ -466,12 +466,12 @@ WRITE_LINE_MEMBER(suprgolf_state::adpcm_int) m_toggle ^= 1; if(m_toggle) { - m_msm->write_data((m_msm5205next & 0xf0) >> 4); + m_msm->data_w((m_msm5205next & 0xf0) >> 4); if(m_msm_nmi_mask) { m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } } else { - m_msm->write_data((m_msm5205next & 0x0f) >> 0); + m_msm->data_w((m_msm5205next & 0x0f) >> 0); } } diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp index 8182e183faf..54a048a100b 100644 --- a/src/mame/drivers/system16.cpp +++ b/src/mame/drivers/system16.cpp @@ -397,7 +397,7 @@ WRITE8_MEMBER(segas1x_bootleg_state::tturfbl_msm5205_data_w) WRITE_LINE_MEMBER(segas1x_bootleg_state::tturfbl_msm5205_callback) { - m_msm->write_data((m_sample_buffer >> 4) & 0x0f); + m_msm->data_w((m_sample_buffer >> 4) & 0x0f); m_sample_buffer <<= 4; m_sample_select ^= 1; @@ -1213,7 +1213,7 @@ WRITE8_MEMBER(segas1x_bootleg_state::shdancbl_msm5205_data_w) WRITE_LINE_MEMBER(segas1x_bootleg_state::shdancbl_msm5205_callback) { - m_msm->write_data(m_sample_buffer & 0x0f); + m_msm->data_w(m_sample_buffer & 0x0f); m_sample_buffer >>= 4; m_sample_select ^= 1; diff --git a/src/mame/drivers/taito_l.cpp b/src/mame/drivers/taito_l.cpp index 0ce3a8aa1a3..48ab769b489 100644 --- a/src/mame/drivers/taito_l.cpp +++ b/src/mame/drivers/taito_l.cpp @@ -339,14 +339,14 @@ WRITE_LINE_MEMBER(champwr_state::msm5205_vck) { if (m_adpcm_data != -1) { - m_msm->write_data(m_adpcm_data & 0x0f); + m_msm->data_w(m_adpcm_data & 0x0f); m_adpcm_data = -1; } else { m_adpcm_data = m_adpcm_rgn[m_adpcm_pos]; m_adpcm_pos = (m_adpcm_pos + 1) & 0x1ffff; - m_msm->write_data(m_adpcm_data >> 4); + m_msm->data_w(m_adpcm_data >> 4); } } diff --git a/src/mame/drivers/tbowl.cpp b/src/mame/drivers/tbowl.cpp index 1963ecfba4a..f1eb041866a 100644 --- a/src/mame/drivers/tbowl.cpp +++ b/src/mame/drivers/tbowl.cpp @@ -141,7 +141,7 @@ void tbowl_state::adpcm_int( msm5205_device *device, int num ) device->reset_w(1); else if (m_adpcm_data[num] != -1) { - device->write_data(m_adpcm_data[num] & 0x0f); + device->data_w(m_adpcm_data[num] & 0x0f); m_adpcm_data[num] = -1; } else @@ -149,7 +149,7 @@ void tbowl_state::adpcm_int( msm5205_device *device, int num ) uint8_t *ROM = memregion("adpcm")->base() + 0x10000 * num; m_adpcm_data[num] = ROM[m_adpcm_pos[num]++]; - device->write_data(m_adpcm_data[num] >> 4); + device->data_w(m_adpcm_data[num] >> 4); } } diff --git a/src/mame/drivers/tecmo.cpp b/src/mame/drivers/tecmo.cpp index b0f431cb693..9c8029bdc27 100644 --- a/src/mame/drivers/tecmo.cpp +++ b/src/mame/drivers/tecmo.cpp @@ -95,13 +95,13 @@ WRITE_LINE_MEMBER(tecmo_state::adpcm_int) m_msm->reset_w(1); else if (m_adpcm_data != -1) { - m_msm->write_data(m_adpcm_data & 0x0f); + m_msm->data_w(m_adpcm_data & 0x0f); m_adpcm_data = -1; } else { m_adpcm_data = m_adpcm_rom[m_adpcm_pos++]; - m_msm->write_data(m_adpcm_data >> 4); + m_msm->data_w(m_adpcm_data >> 4); } } diff --git a/src/mame/drivers/tehkanwc.cpp b/src/mame/drivers/tehkanwc.cpp index 66566360155..4ec046be2ac 100644 --- a/src/mame/drivers/tehkanwc.cpp +++ b/src/mame/drivers/tehkanwc.cpp @@ -217,10 +217,10 @@ WRITE_LINE_MEMBER(tehkanwc_state::adpcm_int) int msm_data = SAMPLES[m_msm_data_offs & 0x7fff]; if (m_toggle == 0) - m_msm->write_data((msm_data >> 4) & 0x0f); + m_msm->data_w((msm_data >> 4) & 0x0f); else { - m_msm->write_data(msm_data & 0x0f); + m_msm->data_w(msm_data & 0x0f); m_msm_data_offs++; } diff --git a/src/mame/drivers/tigeroad.cpp b/src/mame/drivers/tigeroad.cpp index d8b1ee271a0..8ea7feca160 100644 --- a/src/mame/drivers/tigeroad.cpp +++ b/src/mame/drivers/tigeroad.cpp @@ -68,7 +68,7 @@ WRITE16_MEMBER(tigeroad_state::tigeroad_soundcmd_w) WRITE8_MEMBER(tigeroad_state::msm5205_w) { m_msm->reset_w(BIT(data, 7)); - m_msm->write_data(data); + m_msm->data_w(data); m_msm->vclk_w(1); m_msm->vclk_w(0); } diff --git a/src/mame/drivers/tispeak.cpp b/src/mame/drivers/tispeak.cpp index 80e0486910d..7a8f6f6c8da 100644 --- a/src/mame/drivers/tispeak.cpp +++ b/src/mame/drivers/tispeak.cpp @@ -672,14 +672,14 @@ WRITE16_MEMBER(tispeak_state::snspellc_write_r) WRITE16_MEMBER(tispeak_state::snspellc_write_o) { // O3210: TMS5100 CTL8124 - m_tms5100->ctl_w(space, 0, bitswap<4>(data,3,0,1,2)); + m_tms5100->ctl_w(bitswap<4>(data,3,0,1,2)); m_o = data; } READ8_MEMBER(tispeak_state::snspellc_read_k) { // K4: TMS5100 CTL1 - u8 k4 = m_tms5100->ctl_r(space, 0) << 2 & 4; + u8 k4 = m_tms5100->ctl_r() << 2 & 4; // K: multiplexed inputs (note: the Vss row is always on) return k4 | m_inputs[9]->read() | read_inputs(9); @@ -747,7 +747,7 @@ WRITE16_MEMBER(tispeak_state::k28_write_r) { // R1234: TMS5100 CTL8421 u16 r = bitswap<5>(data,0,1,2,3,4) | (data & ~0x1f); - m_tms5100->ctl_w(space, 0, r & 0xf); + m_tms5100->ctl_w(r & 0xf); // R0: TMS5100 PDC pin m_tms5100->pdc_w(data & 1); @@ -773,7 +773,7 @@ WRITE16_MEMBER(tispeak_state::k28_write_o) READ8_MEMBER(tispeak_state::k28_read_k) { // K: TMS5100 CTL, multiplexed inputs (also tied to R1234) - return m_tms5100->ctl_r(space, 0) | read_inputs(9) | (m_r & 0xf); + return m_tms5100->ctl_r() | read_inputs(9) | (m_r & 0xf); } diff --git a/src/mame/drivers/toki.cpp b/src/mame/drivers/toki.cpp index 1c365754f82..4e5aea77002 100644 --- a/src/mame/drivers/toki.cpp +++ b/src/mame/drivers/toki.cpp @@ -118,7 +118,7 @@ READ16_MEMBER(toki_state::pip_r) WRITE_LINE_MEMBER(toki_state::tokib_adpcm_int) { - m_msm->write_data(m_msm5205next); + m_msm->data_w(m_msm5205next); m_msm5205next >>= 4; m_toggle ^= 1; diff --git a/src/mame/drivers/toki_ms.cpp b/src/mame/drivers/toki_ms.cpp index 22ea0e26dc8..947f69fc1c5 100644 --- a/src/mame/drivers/toki_ms.cpp +++ b/src/mame/drivers/toki_ms.cpp @@ -530,7 +530,7 @@ WRITE8_MEMBER(toki_ms_state::adpcm_w) m_msm->reset_w(BIT(data, 4)); m_adpcm_data = data & 0xf; - //m_msm->write_data(data & 0xf); + //m_msm->data_w(data & 0xf); // m_msm->vclk_w(BIT(data, 7)); //m_msm->vclk_w(1); //m_msm->vclk_w(0); @@ -679,7 +679,7 @@ void toki_ms_state::machine_start() WRITE_LINE_MEMBER(toki_ms_state::adpcm_int) { - m_msm->write_data(m_adpcm_data); + m_msm->data_w(m_adpcm_data); m_audiocpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/topspeed.cpp b/src/mame/drivers/topspeed.cpp index 377ea3738f0..5550b21e71c 100644 --- a/src/mame/drivers/topspeed.cpp +++ b/src/mame/drivers/topspeed.cpp @@ -275,7 +275,7 @@ void topspeed_state::msm5205_update(int chip) const u8 data = m_msm_rom[chip][m_msm_pos[chip]]; - m_msm[chip]->write_data((m_msm_nibble[chip] ? data : data >> 4) & 0xf); + m_msm[chip]->data_w((m_msm_nibble[chip] ? data : data >> 4) & 0xf); if (m_msm_nibble[chip]) ++m_msm_pos[chip]; diff --git a/src/mame/drivers/tubep.cpp b/src/mame/drivers/tubep.cpp index b391248d541..baf3d20546c 100644 --- a/src/mame/drivers/tubep.cpp +++ b/src/mame/drivers/tubep.cpp @@ -536,12 +536,12 @@ WRITE_LINE_MEMBER(tubep_state::rjammer_adpcm_vck) if (m_ls74 == 1) { - m_msm->write_data((m_ls377 >> 0) & 15); + m_msm->data_w((m_ls377 >> 0) & 15); m_soundcpu->set_input_line(0, ASSERT_LINE); } else { - m_msm->write_data((m_ls377 >> 4) & 15); + m_msm->data_w((m_ls377 >> 4) & 15); } } diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp index 56bc13a7204..2b7460c6f6c 100644 --- a/src/mame/drivers/vgmplay.cpp +++ b/src/mame/drivers/vgmplay.cpp @@ -3184,8 +3184,8 @@ void vgmplay_state::soundchips_map(address_map &map) map(vgmplay_device::A_YM2612_1, vgmplay_device::A_YM2612_1 + 3).w(m_ym2612[1], FUNC(ym2612_device::write)); map(vgmplay_device::A_YM2151_0, vgmplay_device::A_YM2151_0 + 1).w(m_ym2151[0], FUNC(ym2151_device::write)); map(vgmplay_device::A_YM2151_1, vgmplay_device::A_YM2151_1 + 1).w(m_ym2151[1], FUNC(ym2151_device::write)); - map(vgmplay_device::A_SEGAPCM_0, vgmplay_device::A_SEGAPCM_0 + 0x7ff).w(m_segapcm[0], FUNC(segapcm_device::sega_pcm_w)); - map(vgmplay_device::A_SEGAPCM_1, vgmplay_device::A_SEGAPCM_1 + 0x7ff).w(m_segapcm[1], FUNC(segapcm_device::sega_pcm_w)); + map(vgmplay_device::A_SEGAPCM_0, vgmplay_device::A_SEGAPCM_0 + 0x7ff).w(m_segapcm[0], FUNC(segapcm_device::write)); + map(vgmplay_device::A_SEGAPCM_1, vgmplay_device::A_SEGAPCM_1 + 0x7ff).w(m_segapcm[1], FUNC(segapcm_device::write)); map(vgmplay_device::A_RF5C68, vgmplay_device::A_RF5C68 + 0xf).w(m_rf5c68, FUNC(rf5c68_device::rf5c68_w)); map(vgmplay_device::A_RF5C68_RAM, vgmplay_device::A_RF5C68_RAM + 0xffff).w(m_rf5c68, FUNC(rf5c68_device::rf5c68_mem_w)); map(vgmplay_device::A_YM2203_0, vgmplay_device::A_YM2203_0 + 1).w(m_ym2203[0], FUNC(ym2203_device::write)); @@ -3286,8 +3286,8 @@ void vgmplay_state::soundchips_map(address_map &map) // TODO: es5505 map(vgmplay_device::A_X1_010_0, vgmplay_device::A_X1_010_0 + 0x1fff).w(m_x1_010[0], FUNC(x1_010_device::write)); map(vgmplay_device::A_X1_010_1, vgmplay_device::A_X1_010_1 + 0x1fff).w(m_x1_010[1], FUNC(x1_010_device::write)); - map(vgmplay_device::A_GA20_0, vgmplay_device::A_GA20_0 + 0x1f).w(m_ga20[0], FUNC(iremga20_device::irem_ga20_w)); - map(vgmplay_device::A_GA20_1, vgmplay_device::A_GA20_1 + 0x1f).w(m_ga20[1], FUNC(iremga20_device::irem_ga20_w)); + map(vgmplay_device::A_GA20_0, vgmplay_device::A_GA20_0 + 0x1f).w(m_ga20[0], FUNC(iremga20_device::write)); + map(vgmplay_device::A_GA20_1, vgmplay_device::A_GA20_1 + 0x1f).w(m_ga20[1], FUNC(iremga20_device::write)); } void vgmplay_state::soundchips16_map(address_map &map) diff --git a/src/mame/drivers/vic20.cpp b/src/mame/drivers/vic20.cpp index 72eae20ecfa..2ab6080b114 100644 --- a/src/mame/drivers/vic20.cpp +++ b/src/mame/drivers/vic20.cpp @@ -224,7 +224,7 @@ READ8_MEMBER( vic20_state::read ) } else if (offset >= 0x9000 && offset < 0x9010) { - data = m_vic->read(space, offset & 0x0f); + data = m_vic->read(offset & 0x0f); } break; @@ -299,7 +299,7 @@ WRITE8_MEMBER( vic20_state::write ) } else if (offset >= 0x9000 && offset < 0x9010) { - m_vic->write(space, offset & 0x0f, data); + m_vic->write(offset & 0x0f, data); } break; diff --git a/src/mame/drivers/wacky_gator.cpp b/src/mame/drivers/wacky_gator.cpp index 07d43f95a81..2be0ff33b12 100644 --- a/src/mame/drivers/wacky_gator.cpp +++ b/src/mame/drivers/wacky_gator.cpp @@ -253,7 +253,7 @@ WRITE_LINE_MEMBER(wackygtr_state::adpcm_int) if (!(m_adpcm_ctrl & 0x80)) { uint8_t data = m_samples->base()[m_adpcm_pos & 0xffff]; - m_msm->write_data((m_adpcm_sel ? data : (data >> 4)) & 0x0f); + m_msm->data_w((m_adpcm_sel ? data : (data >> 4)) & 0x0f); m_adpcm_pos += m_adpcm_sel; m_adpcm_sel ^= 1; } diff --git a/src/mame/drivers/wc90b.cpp b/src/mame/drivers/wc90b.cpp index a06400b1d6f..cab64e84206 100644 --- a/src/mame/drivers/wc90b.cpp +++ b/src/mame/drivers/wc90b.cpp @@ -333,11 +333,11 @@ WRITE_LINE_MEMBER(wc90b_state::adpcm_int) m_toggle ^= 1; if(m_toggle) { - m_msm->write_data((m_msm5205next & 0xf0) >> 4); + m_msm->data_w((m_msm5205next & 0xf0) >> 4); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } else - m_msm->write_data((m_msm5205next & 0x0f) >> 0); + m_msm->data_w((m_msm5205next & 0x0f) >> 0); } void wc90b_state::machine_start() diff --git a/src/mame/drivers/wecleman.cpp b/src/mame/drivers/wecleman.cpp index 1b2b5e46a53..adc29cf0e82 100644 --- a/src/mame/drivers/wecleman.cpp +++ b/src/mame/drivers/wecleman.cpp @@ -722,13 +722,13 @@ WRITE8_MEMBER(wecleman_state::hotchase_sound_hs_w) template<int Chip> READ8_MEMBER(wecleman_state::hotchase_k007232_r) { - return m_k007232[Chip]->read(space, offset ^ 1); + return m_k007232[Chip]->read(offset ^ 1); } template<int Chip> WRITE8_MEMBER(wecleman_state::hotchase_k007232_w) { - m_k007232[Chip]->write(space, offset ^ 1, data); + m_k007232[Chip]->write(offset ^ 1, data); } void wecleman_state::hotchase_sound_map(address_map &map) diff --git a/src/mame/drivers/wolfpack.cpp b/src/mame/drivers/wolfpack.cpp index 29364110e13..426c730ae63 100644 --- a/src/mame/drivers/wolfpack.cpp +++ b/src/mame/drivers/wolfpack.cpp @@ -101,7 +101,7 @@ WRITE8_MEMBER(wolfpack_state::word_w) { /* latch word from bus into temp register, and place on s14001a input bus */ /* there is no real need for a temp register at all, since the bus 'register' acts as one */ - m_s14001a->data_w(space, 0, data & 0x1f); /* SA0 (IN5) is pulled low according to the schematic, so its 0x1f and not 0x3f as one would expect */ + m_s14001a->data_w(data & 0x1f); /* SA0 (IN5) is pulled low according to the schematic, so its 0x1f and not 0x3f as one would expect */ } WRITE8_MEMBER(wolfpack_state::start_speech_w) |