From 6525dc0cbfcfde2d123a4f7beaf42570010238b1 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Thu, 12 Mar 2020 18:10:30 +0100 Subject: devices/sound: more handler simplification (nw) --- src/devices/sound/cdp1869.cpp | 22 +++++++++++----------- src/devices/sound/cdp1869.h | 22 +++++++++++----------- src/devices/sound/dave.cpp | 8 ++++---- src/devices/sound/dave.h | 8 ++++---- src/devices/sound/digitalk.cpp | 2 +- src/devices/sound/digitalk.h | 2 +- src/devices/sound/es5506.cpp | 4 ++-- src/devices/sound/es5506.h | 4 ++-- src/devices/sound/es8712.cpp | 8 ++++---- src/devices/sound/es8712.h | 8 ++++---- src/devices/sound/huc6230.cpp | 2 +- src/devices/sound/huc6230.h | 2 +- src/devices/sound/iremga20.cpp | 4 ++-- src/devices/sound/iremga20.h | 4 ++-- src/devices/sound/k005289.cpp | 12 ++++++------ src/devices/sound/k005289.h | 12 ++++++------ src/devices/sound/k007232.cpp | 4 ++-- src/devices/sound/k007232.h | 4 ++-- src/devices/sound/k056800.cpp | 8 ++++---- src/devices/sound/k056800.h | 8 ++++---- src/devices/sound/mea8000.cpp | 4 ++-- src/devices/sound/mea8000.h | 4 ++-- src/devices/sound/mos6560.cpp | 6 +++--- src/devices/sound/mos6560.h | 6 +++--- src/devices/sound/msm5205.cpp | 10 +++++----- src/devices/sound/msm5205.h | 11 +++++------ src/devices/sound/msm5232.cpp | 10 ++++------ src/devices/sound/msm5232.h | 2 +- src/devices/sound/multipcm.cpp | 4 ++-- src/devices/sound/multipcm.h | 4 ++-- src/devices/sound/n63701x.cpp | 2 +- src/devices/sound/n63701x.h | 2 +- src/devices/sound/namco.cpp | 26 +++++++++++++------------- src/devices/sound/namco.h | 24 +++++++++++------------- src/devices/sound/okim9810.cpp | 26 +++++++++++++------------- src/devices/sound/okim9810.h | 26 +++++++++++++------------- src/devices/sound/pcd3311.h | 8 ++++---- src/devices/sound/qs1000.cpp | 22 +++++++++++----------- src/devices/sound/qs1000.h | 23 ++++++++++++----------- src/devices/sound/qsoundhle.cpp | 4 ++-- src/devices/sound/qsoundhle.h | 4 ++-- src/devices/sound/s14001a.cpp | 8 ++++---- src/devices/sound/s14001a.h | 8 ++++---- src/devices/sound/segapcm.cpp | 4 ++-- src/devices/sound/segapcm.h | 4 ++-- src/devices/sound/snkwave.cpp | 2 +- src/devices/sound/snkwave.h | 2 +- src/devices/sound/sp0250.cpp | 2 +- src/devices/sound/sp0250.h | 2 +- src/devices/sound/st0016.cpp | 4 ++-- src/devices/sound/st0016.h | 4 ++-- src/devices/sound/tiaintf.cpp | 2 +- src/devices/sound/tiaintf.h | 2 +- src/devices/sound/tms5110.cpp | 20 ++++++++++---------- src/devices/sound/tms5110.h | 22 +++++++++++----------- src/devices/sound/upd1771.cpp | 6 +++--- src/devices/sound/upd1771.h | 6 +++--- src/devices/sound/upd7752.cpp | 4 ++-- src/devices/sound/upd7752.h | 5 +++-- src/devices/sound/upd934g.cpp | 2 +- src/devices/sound/upd934g.h | 2 +- src/devices/sound/ymz770.cpp | 4 ++-- src/devices/sound/ymz770.h | 6 ++++-- src/mame/audio/dkong.cpp | 2 +- src/mame/audio/gottlieb.cpp | 2 +- src/mame/audio/hyprolyb.cpp | 2 +- src/mame/audio/irem.cpp | 6 +++--- src/mame/audio/scramble.cpp | 6 +++--- src/mame/drivers/a7800.cpp | 2 +- src/mame/drivers/appoooh.cpp | 4 ++-- src/mame/drivers/ashnojoe.cpp | 4 ++-- src/mame/drivers/bagman.cpp | 6 +++--- src/mame/drivers/battlera.cpp | 2 +- src/mame/drivers/berzerk.cpp | 2 +- src/mame/drivers/cabal.cpp | 4 ++-- src/mame/drivers/chexx.cpp | 2 +- src/mame/drivers/chinagat.cpp | 2 +- src/mame/drivers/chinsan.cpp | 2 +- src/mame/drivers/combatsc.cpp | 2 +- src/mame/drivers/comx35.cpp | 6 +++--- src/mame/drivers/crgolf.cpp | 2 +- src/mame/drivers/cvs.cpp | 4 ++-- src/mame/drivers/dacholer.cpp | 2 +- src/mame/drivers/darius.cpp | 2 +- src/mame/drivers/ddragon.cpp | 4 ++-- src/mame/drivers/de_2.cpp | 2 +- src/mame/drivers/dec8.cpp | 2 +- src/mame/drivers/docastle.cpp | 4 ++-- src/mame/drivers/drmicro.cpp | 2 +- src/mame/drivers/dynax.cpp | 4 ++-- src/mame/drivers/eva.cpp | 6 +++--- src/mame/drivers/fantland.cpp | 2 +- src/mame/drivers/fastlane.cpp | 8 ++++---- src/mame/drivers/fcrash.cpp | 4 ++-- src/mame/drivers/fidel_card.cpp | 2 +- src/mame/drivers/fidel_csc.cpp | 2 +- src/mame/drivers/fidel_elite.cpp | 2 +- src/mame/drivers/fidel_excel.cpp | 2 +- src/mame/drivers/fidel_vcc.cpp | 2 +- src/mame/drivers/fidel_vsc.cpp | 2 +- src/mame/drivers/fromance.cpp | 2 +- src/mame/drivers/gladiatr.cpp | 4 ++-- src/mame/drivers/goal92.cpp | 2 +- src/mame/drivers/gsword.cpp | 2 +- src/mame/drivers/hh_tms1k.cpp | 2 +- src/mame/drivers/hnayayoi.cpp | 2 +- src/mame/drivers/jangou.cpp | 4 ++-- src/mame/drivers/jantotsu.cpp | 2 +- src/mame/drivers/jeutel.cpp | 4 ++-- src/mame/drivers/kungfur.cpp | 2 +- src/mame/drivers/kurukuru.cpp | 2 +- src/mame/drivers/lucky74.cpp | 4 ++-- src/mame/drivers/lwings.cpp | 2 +- src/mame/drivers/m107.cpp | 2 +- src/mame/drivers/m92.cpp | 2 +- src/mame/drivers/mastboy.cpp | 2 +- src/mame/drivers/megasys1.cpp | 2 +- src/mame/drivers/mermaid.cpp | 4 ++-- src/mame/drivers/mgavegas.cpp | 2 +- src/mame/drivers/milton6805.cpp | 2 +- src/mame/drivers/mjkjidai.cpp | 2 +- src/mame/drivers/mlanding.cpp | 2 +- src/mame/drivers/namcos86.cpp | 2 +- src/mame/drivers/nemesis.cpp | 20 ++++++++++---------- src/mame/drivers/ojankohs.cpp | 2 +- src/mame/drivers/opwolf.cpp | 4 ++-- src/mame/drivers/pacman.cpp | 2 +- src/mame/drivers/pcktgal.cpp | 2 +- src/mame/drivers/pofo.cpp | 2 +- src/mame/drivers/renegade.cpp | 2 +- src/mame/drivers/rmhaihai.cpp | 2 +- src/mame/drivers/rz1.cpp | 4 ++-- src/mame/drivers/segahang.cpp | 4 ++-- src/mame/drivers/segaorun.cpp | 2 +- src/mame/drivers/segaxbd.cpp | 4 ++-- src/mame/drivers/segaybd.cpp | 2 +- src/mame/drivers/sf.cpp | 2 +- src/mame/drivers/sothello.cpp | 2 +- src/mame/drivers/spdodgeb.cpp | 4 ++-- src/mame/drivers/splash.cpp | 6 +++--- src/mame/drivers/srmp2.cpp | 4 ++-- src/mame/drivers/st_mp200.cpp | 2 +- src/mame/drivers/suprgolf.cpp | 4 ++-- src/mame/drivers/system16.cpp | 4 ++-- src/mame/drivers/taito_l.cpp | 4 ++-- src/mame/drivers/tbowl.cpp | 4 ++-- src/mame/drivers/tecmo.cpp | 4 ++-- src/mame/drivers/tehkanwc.cpp | 4 ++-- src/mame/drivers/tigeroad.cpp | 2 +- src/mame/drivers/tispeak.cpp | 8 ++++---- src/mame/drivers/toki.cpp | 2 +- src/mame/drivers/toki_ms.cpp | 4 ++-- src/mame/drivers/topspeed.cpp | 2 +- src/mame/drivers/tubep.cpp | 4 ++-- src/mame/drivers/vgmplay.cpp | 8 ++++---- src/mame/drivers/vic20.cpp | 4 ++-- src/mame/drivers/wacky_gator.cpp | 2 +- src/mame/drivers/wc90b.cpp | 4 ++-- src/mame/drivers/wecleman.cpp | 4 ++-- src/mame/drivers/wolfpack.cpp | 2 +- src/mame/machine/pce_cd.cpp | 2 +- src/mame/machine/pecom.cpp | 8 ++++---- src/mame/machine/rmnimbus.cpp | 2 +- src/mame/machine/st0016.cpp | 2 +- src/mame/machine/stfight.cpp | 2 +- src/mame/machine/thomson.cpp | 4 ++-- src/mame/video/cidelsa.cpp | 10 +++++----- src/mame/video/comx35.cpp | 10 +++++----- src/mame/video/pecom.cpp | 10 +++++----- src/mame/video/tia.cpp | 2 +- src/mame/video/tmc600.cpp | 10 +++++----- 171 files changed, 436 insertions(+), 437 deletions(-) diff --git a/src/devices/sound/cdp1869.cpp b/src/devices/sound/cdp1869.cpp index 169b87cf7f7..02977b6d860 100644 --- a/src/devices/sound/cdp1869.cpp +++ b/src/devices/sound/cdp1869.cpp @@ -648,7 +648,7 @@ void cdp1869_device::draw_char(bitmap_rgb32 &bitmap, const rectangle &rect, int // out3_w - register 3 write //------------------------------------------------- -WRITE8_MEMBER( cdp1869_device::out3_w ) +void cdp1869_device::out3_w(uint8_t data) { /* bit description @@ -675,7 +675,7 @@ WRITE8_MEMBER( cdp1869_device::out3_w ) // out4_w - register 4 write //------------------------------------------------- -WRITE8_MEMBER( cdp1869_device::out4_w ) +void cdp1869_device::out4_w(offs_t offset) { /* bit description @@ -711,7 +711,7 @@ WRITE8_MEMBER( cdp1869_device::out4_w ) // out5_w - register 5 write //------------------------------------------------- -WRITE8_MEMBER( cdp1869_device::out5_w ) +void cdp1869_device::out5_w(offs_t offset) { /* bit description @@ -760,7 +760,7 @@ WRITE8_MEMBER( cdp1869_device::out5_w ) // out6_w - register 6 write //------------------------------------------------- -WRITE8_MEMBER( cdp1869_device::out6_w ) +void cdp1869_device::out6_w(offs_t offset) { /* bit description @@ -791,7 +791,7 @@ WRITE8_MEMBER( cdp1869_device::out6_w ) // out7_w - register 7 write //------------------------------------------------- -WRITE8_MEMBER( cdp1869_device::out7_w ) +void cdp1869_device::out7_w(offs_t offset) { /* bit description @@ -822,7 +822,7 @@ WRITE8_MEMBER( cdp1869_device::out7_w ) // char_ram_r - character RAM read //------------------------------------------------- -READ8_MEMBER( cdp1869_device::char_ram_r ) +uint8_t cdp1869_device::char_ram_r(offs_t offset) { uint8_t cma = offset & 0x0f; uint16_t pma; @@ -851,7 +851,7 @@ READ8_MEMBER( cdp1869_device::char_ram_r ) // char_ram_w - character RAM write //------------------------------------------------- -WRITE8_MEMBER( cdp1869_device::char_ram_w ) +void cdp1869_device::char_ram_w(offs_t offset, uint8_t data) { uint8_t cma = offset & 0x0f; uint16_t pma; @@ -880,7 +880,7 @@ WRITE8_MEMBER( cdp1869_device::char_ram_w ) // page_ram_r - page RAM read //------------------------------------------------- -READ8_MEMBER( cdp1869_device::page_ram_r ) +uint8_t cdp1869_device::page_ram_r(offs_t offset) { uint16_t pma; @@ -901,7 +901,7 @@ READ8_MEMBER( cdp1869_device::page_ram_r ) // page_ram_w - page RAM write //------------------------------------------------- -WRITE8_MEMBER( cdp1869_device::page_ram_w ) +void cdp1869_device::page_ram_w(offs_t offset, uint8_t data) { uint16_t pma; @@ -922,7 +922,7 @@ WRITE8_MEMBER( cdp1869_device::page_ram_w ) // page_ram_w - predisplay //------------------------------------------------- -READ_LINE_MEMBER( cdp1869_device::predisplay_r ) +int cdp1869_device::predisplay_r() { return m_prd; } @@ -932,7 +932,7 @@ READ_LINE_MEMBER( cdp1869_device::predisplay_r ) // pal_ntsc_r - PAL/NTSC //------------------------------------------------- -READ_LINE_MEMBER( cdp1869_device::pal_ntsc_r ) +int cdp1869_device::pal_ntsc_r() { return m_read_pal_ntsc(); } diff --git a/src/devices/sound/cdp1869.h b/src/devices/sound/cdp1869.h index ac377a9815c..be366a8d029 100644 --- a/src/devices/sound/cdp1869.h +++ b/src/devices/sound/cdp1869.h @@ -187,20 +187,20 @@ public: virtual void char_map(address_map &map); virtual void page_map(address_map &map); - DECLARE_WRITE8_MEMBER( out3_w ); - DECLARE_WRITE8_MEMBER( out4_w ); - DECLARE_WRITE8_MEMBER( out5_w ); - DECLARE_WRITE8_MEMBER( out6_w ); - DECLARE_WRITE8_MEMBER( out7_w ); + void out3_w(uint8_t data); + void out4_w(offs_t offset); + void out5_w(offs_t offset); + void out6_w(offs_t offset); + void out7_w(offs_t offset); - DECLARE_READ8_MEMBER( char_ram_r ); - DECLARE_WRITE8_MEMBER( char_ram_w ); + uint8_t char_ram_r(offs_t offset); + void char_ram_w(offs_t offset, uint8_t data); - DECLARE_READ8_MEMBER( page_ram_r ); - DECLARE_WRITE8_MEMBER( page_ram_w ); + uint8_t page_ram_r(offs_t offset); + void page_ram_w(offs_t offset, uint8_t data); - DECLARE_READ_LINE_MEMBER( predisplay_r ); - DECLARE_READ_LINE_MEMBER( pal_ntsc_r ); + int predisplay_r(); + int pal_ntsc_r(); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/devices/sound/dave.cpp b/src/devices/sound/dave.cpp index 4ca7248a520..bac697ca619 100644 --- a/src/devices/sound/dave.cpp +++ b/src/devices/sound/dave.cpp @@ -312,7 +312,7 @@ WRITE_LINE_MEMBER( dave_device::int2_w ) // program_r - program space read //------------------------------------------------- -READ8_MEMBER( dave_device::program_r ) +uint8_t dave_device::program_r(offs_t offset) { uint8_t segment = m_segment[offset >> 14]; offset = (segment << 14) | (offset & 0x3fff); @@ -325,7 +325,7 @@ READ8_MEMBER( dave_device::program_r ) // program_w - program space write //------------------------------------------------- -WRITE8_MEMBER( dave_device::program_w ) +void dave_device::program_w(offs_t offset, uint8_t data) { uint8_t segment = m_segment[offset >> 14]; offset = (segment << 14) | (offset & 0x3fff); @@ -338,7 +338,7 @@ WRITE8_MEMBER( dave_device::program_w ) // io_r - I/O space read //------------------------------------------------- -READ8_MEMBER( dave_device::io_r ) +uint8_t dave_device::io_r(offs_t offset) { uint8_t data = 0; @@ -391,7 +391,7 @@ READ8_MEMBER( dave_device::io_r ) // io_w - I/O space write //------------------------------------------------- -WRITE8_MEMBER( dave_device::io_w ) +void dave_device::io_w(offs_t offset, uint8_t data) { switch (offset & 0xff) { diff --git a/src/devices/sound/dave.h b/src/devices/sound/dave.h index f7bc83373b8..bd5cb6a8445 100644 --- a/src/devices/sound/dave.h +++ b/src/devices/sound/dave.h @@ -49,11 +49,11 @@ protected: // sound stream update overrides virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; - DECLARE_READ8_MEMBER( program_r ); - DECLARE_WRITE8_MEMBER( program_w ); + uint8_t program_r(offs_t offset); + void program_w(offs_t offset, uint8_t data); - 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); private: enum diff --git a/src/devices/sound/digitalk.cpp b/src/devices/sound/digitalk.cpp index d69f9098cc3..9992d6b160d 100644 --- a/src/devices/sound/digitalk.cpp +++ b/src/devices/sound/digitalk.cpp @@ -685,7 +685,7 @@ int digitalker_device::digitalker_0_intr_r() return digitalker_intr_r(); } -WRITE8_MEMBER( digitalker_device::digitalker_data_w ) +void digitalker_device::digitalker_data_w(uint8_t data) { m_data = data; } diff --git a/src/devices/sound/digitalk.h b/src/devices/sound/digitalk.h index b4e2cb5cb97..44eff1e0343 100644 --- a/src/devices/sound/digitalk.h +++ b/src/devices/sound/digitalk.h @@ -22,7 +22,7 @@ public: void digitalker_0_wr_w(int line); int digitalker_0_intr_r(); - DECLARE_WRITE8_MEMBER(digitalker_data_w); + void digitalker_data_w(uint8_t data); protected: // device-level overrides diff --git a/src/devices/sound/es5506.cpp b/src/devices/sound/es5506.cpp index 351400dd116..73057087707 100644 --- a/src/devices/sound/es5506.cpp +++ b/src/devices/sound/es5506.cpp @@ -1422,7 +1422,7 @@ inline void es5506_device::reg_write_test(es550x_voice *voice, offs_t offset, u3 } } -WRITE8_MEMBER(es5506_device::write) +void es5506_device::write(offs_t offset, uint8_t data) { es550x_voice *voice = &m_voice[m_current_page & 0x1f]; int shift = 8 * (offset & 3); @@ -1631,7 +1631,7 @@ inline u32 es5506_device::reg_read_test(es550x_voice *voice, offs_t offset) return result; } -READ8_MEMBER(es5506_device::read) +uint8_t es5506_device::read(offs_t offset) { es550x_voice *voice = &m_voice[m_current_page & 0x1f]; int shift = 8 * (offset & 3); diff --git a/src/devices/sound/es5506.h b/src/devices/sound/es5506.h index d1d0b7d89ee..de26c0b1e5a 100644 --- a/src/devices/sound/es5506.h +++ b/src/devices/sound/es5506.h @@ -159,8 +159,8 @@ public: es5506_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); ~es5506_device() {} - DECLARE_READ8_MEMBER(read); - DECLARE_WRITE8_MEMBER(write); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); void voice_bank_w(int voice, int bank); protected: diff --git a/src/devices/sound/es8712.cpp b/src/devices/sound/es8712.cpp index 00ec7fe90d3..f927f942bd0 100644 --- a/src/devices/sound/es8712.cpp +++ b/src/devices/sound/es8712.cpp @@ -177,7 +177,7 @@ void es8712_device::play() * ***********************************************************************************************/ -WRITE8_MEMBER(es8712_device::write) +void es8712_device::write(offs_t offset, uint8_t data) { switch (offset) { @@ -200,7 +200,7 @@ WRITE8_MEMBER(es8712_device::write) m_start &= 0xfffff; m_end &= 0xfffff; } -READ8_MEMBER(es8712_device::read) +uint8_t es8712_device::read(offs_t offset) { // busy state (other bits unknown) if (offset == 0) @@ -209,12 +209,12 @@ READ8_MEMBER(es8712_device::read) return 0; } -WRITE8_MEMBER(es8712_device::msm_w) +void es8712_device::msm_w(offs_t offset, uint8_t data) { m_msm_write_cb(offset, data); } -WRITE_LINE_MEMBER(es8712_device::msm_int) +void es8712_device::msm_int(int state) { if (!state || !m_playing) return; diff --git a/src/devices/sound/es8712.h b/src/devices/sound/es8712.h index b1cfafc1424..aa87135426d 100644 --- a/src/devices/sound/es8712.h +++ b/src/devices/sound/es8712.h @@ -27,10 +27,10 @@ public: auto reset_handler() { return m_reset_handler.bind(); } auto msm_write_handler() { return m_msm_write_cb.bind(); } - DECLARE_WRITE8_MEMBER(write); - DECLARE_READ8_MEMBER(read); - DECLARE_WRITE8_MEMBER(msm_w); - DECLARE_WRITE_LINE_MEMBER(msm_int); + void write(offs_t offset, uint8_t data); + uint8_t read(offs_t offset); + void msm_w(offs_t offset, uint8_t data); + void msm_int(int state); void play(); diff --git a/src/devices/sound/huc6230.cpp b/src/devices/sound/huc6230.cpp index 01d5799ac59..88206877a36 100644 --- a/src/devices/sound/huc6230.cpp +++ b/src/devices/sound/huc6230.cpp @@ -46,7 +46,7 @@ void huc6230_device::sound_stream_update(sound_stream &stream, stream_sample_t * /* MAME specific code */ /*--------------------------------------------------------------------------*/ -WRITE8_MEMBER( huc6230_device::write ) +void huc6230_device::write(offs_t offset, uint8_t data) { /* Update stream */ m_stream->update(); diff --git a/src/devices/sound/huc6230.h b/src/devices/sound/huc6230.h index a8ccfcf12ae..0337d3165e5 100644 --- a/src/devices/sound/huc6230.h +++ b/src/devices/sound/huc6230.h @@ -19,7 +19,7 @@ public: auto vca_callback() { return m_vca_cb.bind(); } // write only - DECLARE_WRITE8_MEMBER( write ); + void write(offs_t offset, uint8_t data); protected: // device-level overrides diff --git a/src/devices/sound/iremga20.cpp b/src/devices/sound/iremga20.cpp index 968ac748645..be8b00e85c2 100644 --- a/src/devices/sound/iremga20.cpp +++ b/src/devices/sound/iremga20.cpp @@ -166,7 +166,7 @@ void iremga20_device::sound_stream_update(sound_stream &stream, stream_sample_t } } -WRITE8_MEMBER( iremga20_device::irem_ga20_w ) +void iremga20_device::write(offs_t offset, uint8_t data) { m_stream->update(); @@ -210,7 +210,7 @@ WRITE8_MEMBER( iremga20_device::irem_ga20_w ) } } -READ8_MEMBER( iremga20_device::irem_ga20_r ) +uint8_t iremga20_device::read(offs_t offset) { m_stream->update(); diff --git a/src/devices/sound/iremga20.h b/src/devices/sound/iremga20.h index e5b250a8f0a..61a37d40f8c 100644 --- a/src/devices/sound/iremga20.h +++ b/src/devices/sound/iremga20.h @@ -25,8 +25,8 @@ class iremga20_device : public device_t, public: iremga20_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER( irem_ga20_w ); - DECLARE_READ8_MEMBER( irem_ga20_r ); + void write(offs_t offset, uint8_t data); + uint8_t read(offs_t offset); protected: // device-level overrides diff --git a/src/devices/sound/k005289.cpp b/src/devices/sound/k005289.cpp index 9e65eb5783d..02903063b85 100644 --- a/src/devices/sound/k005289.cpp +++ b/src/devices/sound/k005289.cpp @@ -194,7 +194,7 @@ void k005289_device::make_mixer_table(int voices) } -WRITE8_MEMBER( k005289_device::k005289_control_A_w ) +void k005289_device::control_A_w(uint8_t data) { m_stream->update(); @@ -203,7 +203,7 @@ WRITE8_MEMBER( k005289_device::k005289_control_A_w ) } -WRITE8_MEMBER( k005289_device::k005289_control_B_w ) +void k005289_device::control_B_w(uint8_t data) { m_stream->update(); @@ -212,19 +212,19 @@ WRITE8_MEMBER( k005289_device::k005289_control_B_w ) } -WRITE8_MEMBER( k005289_device::ld1_w ) +void k005289_device::ld1_w(offs_t offset) { m_freq_latch[0] = 0xfff - offset; } -WRITE8_MEMBER( k005289_device::ld2_w ) +void k005289_device::ld2_w(offs_t offset) { m_freq_latch[1] = 0xfff - offset; } -WRITE8_MEMBER( k005289_device::tg1_w ) +void k005289_device::tg1_w(uint8_t data) { m_stream->update(); @@ -232,7 +232,7 @@ WRITE8_MEMBER( k005289_device::tg1_w ) } -WRITE8_MEMBER( k005289_device::tg2_w ) +void k005289_device::tg2_w(uint8_t data) { m_stream->update(); diff --git a/src/devices/sound/k005289.h b/src/devices/sound/k005289.h index 04e4c29672d..83bbb7b89b2 100644 --- a/src/devices/sound/k005289.h +++ b/src/devices/sound/k005289.h @@ -14,12 +14,12 @@ class k005289_device : public device_t, public: k005289_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER( k005289_control_A_w ); - DECLARE_WRITE8_MEMBER( k005289_control_B_w ); - DECLARE_WRITE8_MEMBER( ld1_w ); - DECLARE_WRITE8_MEMBER( ld2_w ); - DECLARE_WRITE8_MEMBER( tg1_w ); - DECLARE_WRITE8_MEMBER( tg2_w ); + void control_A_w(uint8_t data); + void control_B_w(uint8_t data); + void ld1_w(offs_t offset); + void ld2_w(offs_t offset); + void tg1_w(uint8_t data); + void tg2_w(uint8_t data); protected: // device-level overrides diff --git a/src/devices/sound/k007232.cpp b/src/devices/sound/k007232.cpp index 8e141206b99..d7bc1cdc144 100644 --- a/src/devices/sound/k007232.cpp +++ b/src/devices/sound/k007232.cpp @@ -98,7 +98,7 @@ uint32_t k007232_device::get_start_address(int channel) /* Konami PCM write register */ /************************************************/ -WRITE8_MEMBER(k007232_device::write) +void k007232_device::write(offs_t offset, uint8_t data) { m_stream->update(); @@ -147,7 +147,7 @@ WRITE8_MEMBER(k007232_device::write) /* Konami PCM read register */ /************************************************/ -READ8_MEMBER(k007232_device::read) +uint8_t k007232_device::read(offs_t offset) { if (offset == 5 || offset == 11) { diff --git a/src/devices/sound/k007232.h b/src/devices/sound/k007232.h index 84cabc1d6d9..e32cfd24053 100644 --- a/src/devices/sound/k007232.h +++ b/src/devices/sound/k007232.h @@ -16,8 +16,8 @@ public: auto port_write() { return m_port_write_handler.bind(); } - DECLARE_WRITE8_MEMBER( write ); - DECLARE_READ8_MEMBER( read ); + void write(offs_t offset, uint8_t data); + uint8_t read(offs_t offset); /* The 007232 has two channels and produces two outputs. The volume control diff --git a/src/devices/sound/k056800.cpp b/src/devices/sound/k056800.cpp index 2bb499eb414..aae1aa10bf2 100644 --- a/src/devices/sound/k056800.cpp +++ b/src/devices/sound/k056800.cpp @@ -63,7 +63,7 @@ void k056800_device::device_reset() DEVICE HANDLERS *****************************************************************************/ -READ8_MEMBER( k056800_device::host_r ) +uint8_t k056800_device::host_r(offs_t offset) { uint32_t r = offset & 7; uint8_t data = 0; @@ -85,7 +85,7 @@ READ8_MEMBER( k056800_device::host_r ) } -WRITE8_MEMBER( k056800_device::host_w ) +void k056800_device::host_w(offs_t offset, uint8_t data) { uint32_t r = offset & 7; @@ -123,7 +123,7 @@ WRITE8_MEMBER( k056800_device::host_w ) } -READ8_MEMBER( k056800_device::sound_r ) +uint8_t k056800_device::sound_r(offs_t offset) { uint32_t r = offset & 7; uint8_t data = 0; @@ -142,7 +142,7 @@ READ8_MEMBER( k056800_device::sound_r ) } -WRITE8_MEMBER( k056800_device::sound_w ) +void k056800_device::sound_w(offs_t offset, uint8_t data) { uint32_t r = offset & 7; diff --git a/src/devices/sound/k056800.h b/src/devices/sound/k056800.h index ea20ebdb23d..a6d0aa6e567 100644 --- a/src/devices/sound/k056800.h +++ b/src/devices/sound/k056800.h @@ -23,10 +23,10 @@ public: // configuration helpers auto int_callback() { return m_int_handler.bind(); } - DECLARE_READ8_MEMBER( host_r ); - DECLARE_WRITE8_MEMBER( host_w ); - DECLARE_READ8_MEMBER( sound_r ); - DECLARE_WRITE8_MEMBER( sound_w ); + uint8_t host_r(offs_t offset); + void host_w(offs_t offset, uint8_t data); + uint8_t sound_r(offs_t offset); + void sound_w(offs_t offset, uint8_t data); protected: // device-level overrides diff --git a/src/devices/sound/mea8000.cpp b/src/devices/sound/mea8000.cpp index af330349fad..ef528309897 100644 --- a/src/devices/sound/mea8000.cpp +++ b/src/devices/sound/mea8000.cpp @@ -495,7 +495,7 @@ TIMER_CALLBACK_MEMBER( mea8000_device::timer_expire ) /************************** CPU interface ****************************/ -READ8_MEMBER( mea8000_device::read ) +uint8_t mea8000_device::read(offs_t offset) { switch (offset) { @@ -513,7 +513,7 @@ READ8_MEMBER( mea8000_device::read ) return 0; } -WRITE8_MEMBER( mea8000_device::write ) +void mea8000_device::write(offs_t offset, uint8_t data) { switch (offset) { diff --git a/src/devices/sound/mea8000.h b/src/devices/sound/mea8000.h index 86fa0808ed8..77c61669721 100644 --- a/src/devices/sound/mea8000.h +++ b/src/devices/sound/mea8000.h @@ -23,8 +23,8 @@ public: auto req() { return m_write_req.bind(); } - DECLARE_READ8_MEMBER(read); - DECLARE_WRITE8_MEMBER(write); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); protected: // device-level overrides diff --git a/src/devices/sound/mos6560.cpp b/src/devices/sound/mos6560.cpp index d332791ec7c..a0121a79e08 100644 --- a/src/devices/sound/mos6560.cpp +++ b/src/devices/sound/mos6560.cpp @@ -328,7 +328,7 @@ void mos6560_device::drawlines( int first, int last ) mos6560_port_w - write to regs -------------------------------------------------*/ -WRITE8_MEMBER( mos6560_device::write ) +void mos6560_device::write(offs_t offset, uint8_t data) { DBG_LOG(1, "mos6560_port_w", ("%.4x:%.2x\n", offset, data)); @@ -406,7 +406,7 @@ WRITE8_MEMBER( mos6560_device::write ) mos6560_port_r - read from regs -------------------------------------------------*/ -READ8_MEMBER( mos6560_device::read ) +uint8_t mos6560_device::read(offs_t offset) { int val; @@ -450,7 +450,7 @@ READ8_MEMBER( mos6560_device::read ) return val; } -WRITE_LINE_MEMBER( mos6560_device::lp_w ) +void mos6560_device::lp_w(int state) { // TODO } diff --git a/src/devices/sound/mos6560.h b/src/devices/sound/mos6560.h index 847ec1bacd6..ecee2ec3f82 100644 --- a/src/devices/sound/mos6560.h +++ b/src/devices/sound/mos6560.h @@ -92,12 +92,12 @@ public: virtual space_config_vector memory_space_config() const override; - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); uint8_t bus_r(); - DECLARE_WRITE_LINE_MEMBER( lp_w ); + void lp_w(int state); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/devices/sound/msm5205.cpp b/src/devices/sound/msm5205.cpp index 7be11f8bbee..718f82530e7 100644 --- a/src/devices/sound/msm5205.cpp +++ b/src/devices/sound/msm5205.cpp @@ -239,7 +239,7 @@ void msm5205_device::update_adpcm() * Handle an update of the VCK status of a chip (1 is reset ON, 0 is reset OFF) * This function can use selector = MSM5205_SEX only */ -WRITE_LINE_MEMBER(msm5205_device::vclk_w) +void msm5205_device::vclk_w(int state) { if (get_prescaler() != 0) logerror("Error: vclk_w() called but VCK selected master mode\n"); @@ -255,7 +255,7 @@ WRITE_LINE_MEMBER(msm5205_device::vclk_w) * Handle an update of the reset status of a chip (1 is reset ON, 0 is reset OFF) */ -WRITE_LINE_MEMBER(msm5205_device::reset_w) +void msm5205_device::reset_w(int state) { m_reset = state; } @@ -264,7 +264,7 @@ WRITE_LINE_MEMBER(msm5205_device::reset_w) * Handle an update of the data to the chip */ -void msm5205_device::write_data(int data) +void msm5205_device::data_w(uint8_t data) { if (m_bitwidth == 4) m_data = data & 0x0f; @@ -311,7 +311,7 @@ void msm5205_device::playmode_w(int select) } } -WRITE_LINE_MEMBER(msm5205_device::s1_w) +void msm5205_device::s1_w(int state) { if (m_s1 != bool(state)) { @@ -321,7 +321,7 @@ WRITE_LINE_MEMBER(msm5205_device::s1_w) } } -WRITE_LINE_MEMBER(msm5205_device::s2_w) +void msm5205_device::s2_w(int state) { if (m_s2 != bool(state)) { diff --git a/src/devices/sound/msm5205.h b/src/devices/sound/msm5205.h index 74cd39c7a7c..87df5e870f8 100644 --- a/src/devices/sound/msm5205.h +++ b/src/devices/sound/msm5205.h @@ -32,21 +32,20 @@ public: auto vck_legacy_callback() { return m_vck_legacy_cb.bind(); } // reset signal should keep for 2cycle of VCLK - DECLARE_WRITE_LINE_MEMBER(reset_w); + void reset_w(int state); // adpcmata is latched after vclk_interrupt callback - void write_data(int data); - DECLARE_WRITE8_MEMBER(data_w) { write_data(data); } + void data_w(uint8_t data); // VCLK slave mode option // if VCLK and reset or data is changed at the same time, // call vclk_w after data_w and reset_w. - DECLARE_WRITE_LINE_MEMBER(vclk_w); + void vclk_w(int state); // option , selected pin selector void playmode_w(int select); - DECLARE_WRITE_LINE_MEMBER(s1_w); - DECLARE_WRITE_LINE_MEMBER(s2_w); + void s1_w(int state); + void s2_w(int state); protected: enum diff --git a/src/devices/sound/msm5232.cpp b/src/devices/sound/msm5232.cpp index 7bcaf059d5d..9a4317491e3 100644 --- a/src/devices/sound/msm5232.cpp +++ b/src/devices/sound/msm5232.cpp @@ -80,12 +80,10 @@ void msm5232_device::device_start() void msm5232_device::device_reset() { - int i; - - for (i=0; i<8; i++) + for (int i=0; i<8; i++) { - write(machine().dummy_space(), i, 0x80); - write(machine().dummy_space(), i, 0x00); + write(i, 0x80); + write(i, 0x00); } m_noise_cnt = 0; m_noise_rng = 1; @@ -341,7 +339,7 @@ void msm5232_device::init(int clock, int rate) } -WRITE8_MEMBER( msm5232_device::write ) +void msm5232_device::write(offs_t offset, uint8_t data) { if (offset > 0x0d) return; diff --git a/src/devices/sound/msm5232.h b/src/devices/sound/msm5232.h index da94899ccd9..2dd3997a346 100644 --- a/src/devices/sound/msm5232.h +++ b/src/devices/sound/msm5232.h @@ -15,7 +15,7 @@ public: void set_capacitors(double cap1, double cap2, double cap3, double cap4, double cap5, double cap6, double cap7, double cap8); auto gate() { return m_gate_handler_cb.bind(); } - DECLARE_WRITE8_MEMBER( write ); + void write(offs_t offset, uint8_t data); void set_clock(int clock); protected: diff --git a/src/devices/sound/multipcm.cpp b/src/devices/sound/multipcm.cpp index ca8b179ac5d..8cc00b649d7 100644 --- a/src/devices/sound/multipcm.cpp +++ b/src/devices/sound/multipcm.cpp @@ -424,12 +424,12 @@ void multipcm_device::write_slot(slot_t &slot, int32_t reg, uint8_t data) } } -READ8_MEMBER( multipcm_device::read ) +uint8_t multipcm_device::read() { return 0; } -WRITE8_MEMBER( multipcm_device::write ) +void multipcm_device::write(offs_t offset, uint8_t data) { switch(offset) { diff --git a/src/devices/sound/multipcm.h b/src/devices/sound/multipcm.h index 08d1e8d2fcf..135478239fa 100644 --- a/src/devices/sound/multipcm.h +++ b/src/devices/sound/multipcm.h @@ -18,8 +18,8 @@ class multipcm_device : public device_t, public: multipcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER( write ); - DECLARE_READ8_MEMBER( read ); + void write(offs_t offset, uint8_t data); + uint8_t read(); protected: // device-level overrides diff --git a/src/devices/sound/n63701x.cpp b/src/devices/sound/n63701x.cpp index fae1ff01edd..7ba7eb2af7f 100644 --- a/src/devices/sound/n63701x.cpp +++ b/src/devices/sound/n63701x.cpp @@ -118,7 +118,7 @@ void namco_63701x_device::sound_stream_update(sound_stream &stream, stream_sampl -WRITE8_MEMBER( namco_63701x_device::namco_63701x_w ) +void namco_63701x_device::write(offs_t offset, uint8_t data) { int ch = offset / 2; diff --git a/src/devices/sound/n63701x.h b/src/devices/sound/n63701x.h index 062a5047d4f..0bb48b5afc8 100644 --- a/src/devices/sound/n63701x.h +++ b/src/devices/sound/n63701x.h @@ -18,7 +18,7 @@ class namco_63701x_device : public device_t, public: namco_63701x_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER(namco_63701x_w); + void write(offs_t offset, uint8_t data); protected: // device-level overrides diff --git a/src/devices/sound/namco.cpp b/src/devices/sound/namco.cpp index a8a0d3b9259..3eeb77617bc 100644 --- a/src/devices/sound/namco.cpp +++ b/src/devices/sound/namco.cpp @@ -245,7 +245,7 @@ uint32_t namco_audio_device::namco_update_one(stream_sample_t *buffer, int lengt } -WRITE_LINE_MEMBER(namco_audio_device::sound_enable_w) +void namco_audio_device::sound_enable_w(int state) { m_sound_enable = state; } @@ -269,7 +269,7 @@ WRITE_LINE_MEMBER(namco_audio_device::sound_enable_w) 0x1f: ch 2 volume */ -WRITE8_MEMBER( namco_device::pacman_sound_w ) +void namco_device::pacman_sound_w(offs_t offset, uint8_t data) { sound_channel *voice; int ch; @@ -322,7 +322,7 @@ WRITE8_MEMBER( namco_device::pacman_sound_w ) } } -WRITE8_MEMBER( namco_cus30_device::pacman_sound_w ) +void namco_cus30_device::pacman_sound_w(offs_t offset, uint8_t data) { sound_channel *voice; int ch; @@ -411,12 +411,12 @@ it select the 54XX/52XX outputs on those channels 0x3f ch 7 */ -READ8_MEMBER( namco_device::polepos_sound_r ) +uint8_t namco_device::polepos_sound_r(offs_t offset) { return m_soundregs[offset]; } -WRITE8_MEMBER( namco_device::polepos_sound_w ) +void namco_device::polepos_sound_w(offs_t offset, uint8_t data) { sound_channel *voice; int ch; @@ -487,7 +487,7 @@ WRITE8_MEMBER( namco_device::polepos_sound_w ) 0x3e ch 7 waveform select & frequency */ -WRITE8_MEMBER(namco_15xx_device::namco_15xx_w) +void namco_15xx_device::namco_15xx_w(offs_t offset, uint8_t data) { sound_channel *voice; int ch; @@ -552,7 +552,7 @@ WRITE8_MEMBER(namco_15xx_device::namco_15xx_w) 0x3c ch 0 noise sw */ - WRITE8_MEMBER(namco_cus30_device::namcos1_sound_w) +void namco_cus30_device::namcos1_sound_w(offs_t offset, uint8_t data) { sound_channel *voice; int ch; @@ -610,7 +610,7 @@ WRITE8_MEMBER(namco_15xx_device::namco_15xx_w) } } -WRITE8_MEMBER( namco_cus30_device::namcos1_cus30_w ) +void namco_cus30_device::namcos1_cus30_w(offs_t offset, uint8_t data) { if (offset < 0x100) { @@ -626,25 +626,25 @@ WRITE8_MEMBER( namco_cus30_device::namcos1_cus30_w ) } } else if (offset < 0x140) - namcos1_sound_w(space, offset - 0x100,data); + namcos1_sound_w(offset - 0x100,data); else m_wavedata[offset] = data; } -READ8_MEMBER( namco_cus30_device::namcos1_cus30_r ) +uint8_t namco_cus30_device::namcos1_cus30_r(offs_t offset) { return m_wavedata[offset]; } -READ8_MEMBER( namco_15xx_device::sharedram_r ) +uint8_t namco_15xx_device::sharedram_r(offs_t offset) { return m_soundregs[offset]; } -WRITE8_MEMBER( namco_15xx_device::sharedram_w ) +void namco_15xx_device::sharedram_w(offs_t offset, uint8_t data) { if (offset < 0x40) - namco_15xx_w(space, offset, data); + namco_15xx_w(offset, data); else { m_soundregs[offset] = data; diff --git a/src/devices/sound/namco.h b/src/devices/sound/namco.h index 730cd581e1d..770e0e287c8 100644 --- a/src/devices/sound/namco.h +++ b/src/devices/sound/namco.h @@ -14,7 +14,7 @@ public: void set_voices(int voices) { m_voices = voices; } void set_stereo(bool stereo) { m_stereo = stereo; } - DECLARE_WRITE_LINE_MEMBER(sound_enable_w); + void sound_enable_w(int state); protected: static constexpr unsigned MAX_VOICES = 8; @@ -77,12 +77,12 @@ class namco_device : public namco_audio_device public: namco_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER(pacman_sound_w); + void pacman_sound_w(offs_t offset, uint8_t data); void polepos_sound_enable(int enable); - DECLARE_READ8_MEMBER(polepos_sound_r); - DECLARE_WRITE8_MEMBER(polepos_sound_w); + uint8_t polepos_sound_r(offs_t offset); + void polepos_sound_w(offs_t offset, uint8_t data); protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; @@ -94,11 +94,9 @@ class namco_15xx_device : public namco_audio_device public: namco_15xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER( namco_15xx_w ); - DECLARE_READ8_MEMBER( sharedram_r ); - DECLARE_WRITE8_MEMBER( sharedram_w ); - - DECLARE_WRITE_LINE_MEMBER(mappy_sound_enable); + void namco_15xx_w(offs_t offset, uint8_t data); + uint8_t sharedram_r(offs_t offset); + void sharedram_w(offs_t offset, uint8_t data); protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; @@ -110,11 +108,11 @@ class namco_cus30_device : public namco_audio_device public: namco_cus30_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER( namcos1_cus30_w ); /* wavedata + sound registers + RAM */ - DECLARE_READ8_MEMBER( namcos1_cus30_r ); - DECLARE_WRITE8_MEMBER( namcos1_sound_w ); + void namcos1_cus30_w(offs_t offset, uint8_t data); /* wavedata + sound registers + RAM */ + uint8_t namcos1_cus30_r(offs_t offset); + void namcos1_sound_w(offs_t offset, uint8_t data); - DECLARE_WRITE8_MEMBER( pacman_sound_w ); + void pacman_sound_w(offs_t offset, uint8_t data); protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; diff --git a/src/devices/sound/okim9810.cpp b/src/devices/sound/okim9810.cpp index 2641e1527e2..d2426cb4947 100644 --- a/src/devices/sound/okim9810.cpp +++ b/src/devices/sound/okim9810.cpp @@ -242,7 +242,7 @@ uint8_t okim9810_device::read_status() // read - memory interface for reading the active status //------------------------------------------------- -READ8_MEMBER( okim9810_device::read ) +uint8_t okim9810_device::read() { assert(!m_serial); return read_status(); @@ -444,7 +444,7 @@ void okim9810_device::write_command(uint8_t data) m_dadr = 0; } -WRITE8_MEMBER( okim9810_device::write ) +void okim9810_device::write(uint8_t data) { assert(!m_serial); write_command(data); @@ -493,7 +493,7 @@ void okim9810_device::write_tmp_register(uint8_t data) } } -WRITE8_MEMBER( okim9810_device::tmp_register_w ) +void okim9810_device::tmp_register_w(uint8_t data) { assert(!m_serial); write_tmp_register(data); @@ -504,12 +504,12 @@ WRITE8_MEMBER( okim9810_device::tmp_register_w ) // Serial interface, NOT verified //----------------------------------------------------------- -WRITE_LINE_MEMBER( okim9810_device::serial_w ) +void okim9810_device::serial_w(int state) { m_serial = state; } -WRITE_LINE_MEMBER( okim9810_device::si_w ) +void okim9810_device::si_w(int state) { if (m_si != state) { @@ -534,43 +534,43 @@ WRITE_LINE_MEMBER( okim9810_device::si_w ) } } -WRITE_LINE_MEMBER( okim9810_device::sd_w ) +void okim9810_device::sd_w(int state) { m_sd = state; } -WRITE_LINE_MEMBER( okim9810_device::ud_w ) +void okim9810_device::ud_w(int state) { m_ud = state; } -WRITE_LINE_MEMBER( okim9810_device::cmd_w ) +void okim9810_device::cmd_w(int state) { m_cmd = state; } -READ_LINE_MEMBER( okim9810_device::so_r ) +int okim9810_device::so_r() { m_serial_read_latch = (m_serial_read_latch & ~(1<> (7-m_serial_bits)) & 1; } -READ_LINE_MEMBER( okim9810_device::sr0_r ) +int okim9810_device::sr0_r() { return (m_serial_read_latch >> ((m_ud) ? 4 : 0)) & 1; } -READ_LINE_MEMBER( okim9810_device::sr1_r ) +int okim9810_device::sr1_r() { return (m_serial_read_latch >> ((m_ud) ? 5 : 1)) & 1; } -READ_LINE_MEMBER( okim9810_device::sr2_r ) +int okim9810_device::sr2_r() { return (m_serial_read_latch >> ((m_ud) ? 6 : 2)) & 1; } -READ_LINE_MEMBER( okim9810_device::sr3_r ) +int okim9810_device::sr3_r() { return (m_serial_read_latch >> ((m_ud) ? 7 : 3)) & 1; } diff --git a/src/devices/sound/okim9810.h b/src/devices/sound/okim9810.h index f790e28c924..b9fcb2db367 100644 --- a/src/devices/sound/okim9810.h +++ b/src/devices/sound/okim9810.h @@ -39,21 +39,21 @@ public: void write_tmp_register(uint8_t command); void write_command(uint8_t command); - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); - DECLARE_WRITE8_MEMBER( tmp_register_w ); + uint8_t read(); + void write(uint8_t data); + void tmp_register_w(uint8_t data); // serial read/write handlers - DECLARE_WRITE_LINE_MEMBER( serial_w ); - DECLARE_WRITE_LINE_MEMBER( si_w ); - DECLARE_WRITE_LINE_MEMBER( sd_w ); - DECLARE_WRITE_LINE_MEMBER( ud_w ); - DECLARE_WRITE_LINE_MEMBER( cmd_w ); - DECLARE_READ_LINE_MEMBER( so_r ); - DECLARE_READ_LINE_MEMBER( sr0_r ); - DECLARE_READ_LINE_MEMBER( sr1_r ); - DECLARE_READ_LINE_MEMBER( sr2_r ); - DECLARE_READ_LINE_MEMBER( sr3_r ); + void serial_w(int state); + void si_w(int state); + void sd_w(int state); + void ud_w(int state); + void cmd_w(int state); + int so_r(); + int sr0_r(); + int sr1_r(); + int sr2_r(); + int sr3_r(); protected: enum diff --git a/src/devices/sound/pcd3311.h b/src/devices/sound/pcd3311.h index 9abb61f8c21..25c5c630fc6 100644 --- a/src/devices/sound/pcd3311.h +++ b/src/devices/sound/pcd3311.h @@ -38,10 +38,10 @@ public: // construction/destruction pcd3311_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER( write ) { m_data = data; } - DECLARE_WRITE_LINE_MEMBER( strobe_w ) { m_strobe = state; } - DECLARE_WRITE_LINE_MEMBER( mode_w ) { m_mode = state; } - DECLARE_WRITE_LINE_MEMBER( a0_w ) { m_a0 = state; } + void write(uint8_t data) { m_data = data; } + void strobe_w(int state) { m_strobe = state; } + void mode_w(int state) { m_mode = state; } + void a0_w(int state) { m_a0 = state; } protected: // device-level overrides diff --git a/src/devices/sound/qs1000.cpp b/src/devices/sound/qs1000.cpp index 92943066296..1d9ddcee7e4 100644 --- a/src/devices/sound/qs1000.cpp +++ b/src/devices/sound/qs1000.cpp @@ -279,7 +279,7 @@ void qs1000_device::serial_in(uint8_t data) //------------------------------------------------- // set_irq - interrupt the internal CPU //------------------------------------------------- -WRITE_LINE_MEMBER(qs1000_device::set_irq) +void qs1000_device::set_irq(int state) { // Signal to the CPU that data is available m_cpu->set_input_line(MCS51_INT1_LINE, state ? ASSERT_LINE : CLEAR_LINE); @@ -290,7 +290,7 @@ WRITE_LINE_MEMBER(qs1000_device::set_irq) // data_to_i8052 - called by the 8052 core to // receive serial data //------------------------------------------------- -READ8_MEMBER(qs1000_device::data_to_i8052) +uint8_t qs1000_device::data_to_i8052() { return m_serial_data_in; } @@ -320,7 +320,7 @@ void qs1000_device::device_timer(emu_timer &timer, device_timer_id id, int param //------------------------------------------------- // p0_r //------------------------------------------------- -READ8_MEMBER( qs1000_device::p0_r ) +uint8_t qs1000_device::p0_r() { return 0xff; } @@ -329,7 +329,7 @@ READ8_MEMBER( qs1000_device::p0_r ) //------------------------------------------------- // p1_r //------------------------------------------------- -READ8_MEMBER( qs1000_device::p1_r ) +uint8_t qs1000_device::p1_r() { return m_in_p1_cb(0); } @@ -338,7 +338,7 @@ READ8_MEMBER( qs1000_device::p1_r ) //------------------------------------------------- // p2_r //------------------------------------------------- -READ8_MEMBER( qs1000_device::p2_r ) +uint8_t qs1000_device::p2_r() { return m_in_p2_cb(0); } @@ -347,7 +347,7 @@ READ8_MEMBER( qs1000_device::p2_r ) //------------------------------------------------- // p3_r //------------------------------------------------- -READ8_MEMBER( qs1000_device::p3_r ) +uint8_t qs1000_device::p3_r() { return m_in_p3_cb(0); } @@ -356,7 +356,7 @@ READ8_MEMBER( qs1000_device::p3_r ) //------------------------------------------------- // p0_w //------------------------------------------------- -WRITE8_MEMBER( qs1000_device::p0_w ) +void qs1000_device::p0_w(uint8_t data) { } @@ -365,7 +365,7 @@ WRITE8_MEMBER( qs1000_device::p0_w ) // p1_w //------------------------------------------------- -WRITE8_MEMBER( qs1000_device::p1_w ) +void qs1000_device::p1_w(uint8_t data) { m_out_p1_cb((offs_t)0, data); } @@ -375,7 +375,7 @@ WRITE8_MEMBER( qs1000_device::p1_w ) // p2_w //------------------------------------------------- -WRITE8_MEMBER( qs1000_device::p2_w ) +void qs1000_device::p2_w(uint8_t data) { m_out_p2_cb((offs_t)0, data); } @@ -385,7 +385,7 @@ WRITE8_MEMBER( qs1000_device::p2_w ) // p3_w //------------------------------------------------- -WRITE8_MEMBER( qs1000_device::p3_w ) +void qs1000_device::p3_w(uint8_t data) { m_out_p3_cb((offs_t)0, data); } @@ -395,7 +395,7 @@ WRITE8_MEMBER( qs1000_device::p3_w ) // wave_w - process writes to wavetable engine //------------------------------------------------- -WRITE8_MEMBER( qs1000_device::wave_w ) +void qs1000_device::wave_w(offs_t offset, uint8_t data) { m_stream->update(); diff --git a/src/devices/sound/qs1000.h b/src/devices/sound/qs1000.h index e8c2d550efa..e9e9b615951 100644 --- a/src/devices/sound/qs1000.h +++ b/src/devices/sound/qs1000.h @@ -44,24 +44,25 @@ public: // external i8052_device &cpu() const { return *m_cpu; } void serial_in(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( set_irq ); + void set_irq(int state); - DECLARE_WRITE8_MEMBER( wave_w ); + void wave_w(offs_t offset, uint8_t data); - DECLARE_READ8_MEMBER( p0_r ); - DECLARE_WRITE8_MEMBER( p0_w ); + uint8_t p0_r(); + void p0_w(uint8_t data); - DECLARE_READ8_MEMBER( p1_r ); - DECLARE_WRITE8_MEMBER( p1_w ); + uint8_t p1_r(); + void p1_w(uint8_t data); - DECLARE_READ8_MEMBER( p2_r ); - DECLARE_WRITE8_MEMBER( p2_w ); + uint8_t p2_r(); + void p2_w(uint8_t data); - DECLARE_READ8_MEMBER( p3_r ); - DECLARE_WRITE8_MEMBER( p3_w ); + uint8_t p3_r(); + void p3_w(uint8_t data); void qs1000_io_map(address_map &map); void qs1000_prg_map(address_map &map); + protected: // device-level overrides virtual const tiny_rom_entry *device_rom_region() const override; @@ -129,7 +130,7 @@ private: qs1000_channel m_channels[QS1000_CHANNELS]; - DECLARE_READ8_MEMBER( data_to_i8052 ); + uint8_t data_to_i8052(); }; diff --git a/src/devices/sound/qsoundhle.cpp b/src/devices/sound/qsoundhle.cpp index a917728ed1f..e332add2977 100644 --- a/src/devices/sound/qsoundhle.cpp +++ b/src/devices/sound/qsoundhle.cpp @@ -176,7 +176,7 @@ void qsound_hle_device::sound_stream_update(sound_stream &stream, stream_sample_ } -WRITE8_MEMBER(qsound_hle_device::qsound_w) +void qsound_hle_device::qsound_w(offs_t offset, uint8_t data) { switch (offset) { @@ -200,7 +200,7 @@ WRITE8_MEMBER(qsound_hle_device::qsound_w) } -READ8_MEMBER(qsound_hle_device::qsound_r) +uint8_t qsound_hle_device::qsound_r() { // ready bit (0x00 = busy, 0x80 == ready) m_stream->update(); diff --git a/src/devices/sound/qsoundhle.h b/src/devices/sound/qsoundhle.h index 53d1300b583..744569184cd 100644 --- a/src/devices/sound/qsoundhle.h +++ b/src/devices/sound/qsoundhle.h @@ -19,8 +19,8 @@ public: // default 60MHz clock (divided by 2 for DSP core clock, and then by 1248 for sample rate) qsound_hle_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock = 60'000'000); - DECLARE_WRITE8_MEMBER(qsound_w); - DECLARE_READ8_MEMBER(qsound_r); + void qsound_w(offs_t offset, uint8_t data); + uint8_t qsound_r(); protected: // device_t implementation diff --git a/src/devices/sound/s14001a.cpp b/src/devices/sound/s14001a.cpp index 75227c22c2d..524e996e31c 100644 --- a/src/devices/sound/s14001a.cpp +++ b/src/devices/sound/s14001a.cpp @@ -304,25 +304,25 @@ void s14001a_device::force_update() m_stream->update(); } -READ_LINE_MEMBER(s14001a_device::romen_r) +int s14001a_device::romen_r() { m_stream->update(); return (m_bPhase1) ? 1 : 0; } -READ_LINE_MEMBER(s14001a_device::busy_r) +int s14001a_device::busy_r() { m_stream->update(); return (m_bBusyP1) ? 1 : 0; } -WRITE8_MEMBER(s14001a_device::data_w) +void s14001a_device::data_w(uint8_t data) { m_stream->update(); m_uWord = data & 0x3f; // C0-C5 } -WRITE_LINE_MEMBER(s14001a_device::start_w) +void s14001a_device::start_w(int state) { m_stream->update(); m_bStart = (state != 0); diff --git a/src/devices/sound/s14001a.h b/src/devices/sound/s14001a.h index 9c5208f410d..819cfba1920 100644 --- a/src/devices/sound/s14001a.h +++ b/src/devices/sound/s14001a.h @@ -17,10 +17,10 @@ public: auto bsy() { return m_bsy_handler.bind(); } auto ext_read() { return m_ext_read_handler.bind(); } - DECLARE_READ_LINE_MEMBER(busy_r); // /BUSY (pin 40) - DECLARE_READ_LINE_MEMBER(romen_r); // ROM /EN (pin 9) - DECLARE_WRITE_LINE_MEMBER(start_w); // START (pin 10) - DECLARE_WRITE8_MEMBER(data_w); // 6-bit word + int busy_r(); // /BUSY (pin 40) + int romen_r(); // ROM /EN (pin 9) + void start_w(int state); // START (pin 10) + void data_w(uint8_t data); // 6-bit word void set_clock(uint32_t clock); // set new CLK frequency void set_clock(const XTAL &xtal) { set_clock(xtal.value()); } diff --git a/src/devices/sound/segapcm.cpp b/src/devices/sound/segapcm.cpp index 6daa0339de2..c9a9f6be8ab 100644 --- a/src/devices/sound/segapcm.cpp +++ b/src/devices/sound/segapcm.cpp @@ -146,14 +146,14 @@ void segapcm_device::sound_stream_update(sound_stream &stream, stream_sample_t * } -WRITE8_MEMBER( segapcm_device::sega_pcm_w ) +void segapcm_device::write(offs_t offset, uint8_t data) { m_stream->update(); m_ram[offset & 0x07ff] = data; } -READ8_MEMBER( segapcm_device::sega_pcm_r ) +uint8_t segapcm_device::read(offs_t offset) { m_stream->update(); return m_ram[offset & 0x07ff]; diff --git a/src/devices/sound/segapcm.h b/src/devices/sound/segapcm.h index 2ca83cb73ee..2a25c1eefeb 100644 --- a/src/devices/sound/segapcm.h +++ b/src/devices/sound/segapcm.h @@ -31,8 +31,8 @@ public: // configuration void set_bank(int bank) { m_bankshift = (bank & 0xf); m_bankmask = (0x70|((bank >> 16) & 0xfc)); } - DECLARE_WRITE8_MEMBER( sega_pcm_w ); - DECLARE_READ8_MEMBER( sega_pcm_r ); + void write(offs_t offset, uint8_t data); + uint8_t read(offs_t offset); protected: // device-level overrides diff --git a/src/devices/sound/snkwave.cpp b/src/devices/sound/snkwave.cpp index 4a16946199b..2c9e9b75f9f 100644 --- a/src/devices/sound/snkwave.cpp +++ b/src/devices/sound/snkwave.cpp @@ -115,7 +115,7 @@ void snkwave_device::sound_stream_update(sound_stream &stream, stream_sample_t * 2-5 waveform (8 3-bit nibbles) */ -WRITE8_MEMBER( snkwave_device::snkwave_w ) +void snkwave_device::snkwave_w(offs_t offset, uint8_t data) { m_stream->update(); diff --git a/src/devices/sound/snkwave.h b/src/devices/sound/snkwave.h index 6f07bca26af..6777118c7ca 100644 --- a/src/devices/sound/snkwave.h +++ b/src/devices/sound/snkwave.h @@ -19,7 +19,7 @@ class snkwave_device : public device_t, public: snkwave_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER( snkwave_w ); + void snkwave_w(offs_t offset, uint8_t data); protected: // device-level overrides diff --git a/src/devices/sound/sp0250.cpp b/src/devices/sound/sp0250.cpp index 9894b2cbe6c..898bd778dad 100644 --- a/src/devices/sound/sp0250.cpp +++ b/src/devices/sound/sp0250.cpp @@ -155,7 +155,7 @@ TIMER_CALLBACK_MEMBER( sp0250_device::timer_tick ) m_stream->update(); } -WRITE8_MEMBER( sp0250_device::write ) +void sp0250_device::write(uint8_t data) { m_stream->update(); if (m_fifo_pos != 15) diff --git a/src/devices/sound/sp0250.h b/src/devices/sound/sp0250.h index dd1b0aa160b..9685fa4fea2 100644 --- a/src/devices/sound/sp0250.h +++ b/src/devices/sound/sp0250.h @@ -12,7 +12,7 @@ public: auto drq() { return m_drq.bind(); } - DECLARE_WRITE8_MEMBER( write ); + void write(uint8_t data); uint8_t drq_r(); protected: diff --git a/src/devices/sound/st0016.cpp b/src/devices/sound/st0016.cpp index d2f0653364a..6ba2a8ec015 100644 --- a/src/devices/sound/st0016.cpp +++ b/src/devices/sound/st0016.cpp @@ -132,12 +132,12 @@ void st0016_device::sound_stream_update(sound_stream &stream, stream_sample_t ** } -READ8_MEMBER( st0016_device::st0016_snd_r ) +uint8_t st0016_device::snd_r(offs_t offset) { return m_regs[offset]; } -WRITE8_MEMBER( st0016_device::st0016_snd_w ) +void st0016_device::snd_w(offs_t offset, uint8_t data) { int voice = offset/32; int reg = offset & 0x1f; diff --git a/src/devices/sound/st0016.h b/src/devices/sound/st0016.h index 9de0065538b..4dde038cfe8 100644 --- a/src/devices/sound/st0016.h +++ b/src/devices/sound/st0016.h @@ -19,8 +19,8 @@ public: auto ram_read() { return m_ram_read_cb.bind(); } - DECLARE_READ8_MEMBER( st0016_snd_r ); - DECLARE_WRITE8_MEMBER( st0016_snd_w ); + uint8_t snd_r(offs_t offset); + void snd_w(offs_t offset, uint8_t data); protected: // device-level overrides diff --git a/src/devices/sound/tiaintf.cpp b/src/devices/sound/tiaintf.cpp index da0f0c27759..d382707612a 100644 --- a/src/devices/sound/tiaintf.cpp +++ b/src/devices/sound/tiaintf.cpp @@ -58,7 +58,7 @@ void tia_device::sound_stream_update(sound_stream &stream, stream_sample_t **inp } -WRITE8_MEMBER( tia_device::tia_sound_w ) +void tia_device::tia_sound_w(offs_t offset, uint8_t data) { m_channel->update(); tia_write(m_chip, offset, data); diff --git a/src/devices/sound/tiaintf.h b/src/devices/sound/tiaintf.h index 36c5126ba04..140c4f3de65 100644 --- a/src/devices/sound/tiaintf.h +++ b/src/devices/sound/tiaintf.h @@ -16,7 +16,7 @@ class tia_device : public device_t, public device_sound_interface public: tia_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER( tia_sound_w ); + void tia_sound_w(offs_t offset, uint8_t data); protected: // device-level overrides diff --git a/src/devices/sound/tms5110.cpp b/src/devices/sound/tms5110.cpp index b7bef7f741e..d9d8427688a 100644 --- a/src/devices/sound/tms5110.cpp +++ b/src/devices/sound/tms5110.cpp @@ -1119,7 +1119,7 @@ commands like Speech, Reset, etc., are loaded into the chip via the CTL pins ******************************************************************************/ -WRITE8_MEMBER( tms5110_device::ctl_w ) +void tms5110_device::ctl_w(uint8_t data) { /* bring up to date first */ m_stream->update(); @@ -1133,7 +1133,7 @@ WRITE8_MEMBER( tms5110_device::ctl_w ) ******************************************************************************/ -WRITE_LINE_MEMBER( tms5110_device::pdc_w ) +void tms5110_device::pdc_w(int state) { /* bring up to date first */ m_stream->update(); @@ -1159,7 +1159,7 @@ WRITE_LINE_MEMBER( tms5110_device::pdc_w ) ******************************************************************************/ -READ8_MEMBER( tms5110_device::ctl_r ) +uint8_t tms5110_device::ctl_r() { /* bring up to date first */ m_stream->update(); @@ -1180,7 +1180,7 @@ READ8_MEMBER( tms5110_device::ctl_r ) } } -READ8_MEMBER( m58817_device::status_r ) +uint8_t m58817_device::status_r() { /* bring up to date first */ m_stream->update(); @@ -1198,7 +1198,7 @@ void tms5110_device::device_timer(emu_timer &timer, device_timer_id id, int para m_romclk_hack_state = !m_romclk_hack_state; } -READ_LINE_MEMBER( tms5110_device::romclk_hack_r ) +int tms5110_device::romclk_hack_r() { /* bring up to date first */ m_stream->update(); @@ -1374,7 +1374,7 @@ void tmsprom_device::device_start() register_for_save_states(); } -WRITE_LINE_MEMBER( tmsprom_device::m0_w ) +void tmsprom_device::m0_w(int state) { /* falling edge counts */ if (m_m0 && !state) @@ -1385,24 +1385,24 @@ WRITE_LINE_MEMBER( tmsprom_device::m0_w ) m_m0 = state; } -READ_LINE_MEMBER( tmsprom_device::data_r ) +int tmsprom_device::data_r() { return (m_rom[m_base_address + m_address] >> m_bit) & 0x01; } -WRITE8_MEMBER( tmsprom_device::rom_csq_w ) +void tmsprom_device::rom_csq_w(offs_t offset, uint8_t data) { if (!data) m_base_address = offset * m_rom_size; } -WRITE8_MEMBER( tmsprom_device::bit_w ) +void tmsprom_device::bit_w(uint8_t data) { m_bit = data; } -WRITE_LINE_MEMBER( tmsprom_device::enable_w ) +void tmsprom_device::enable_w(int state) { if (state != m_enable) { diff --git a/src/devices/sound/tms5110.h b/src/devices/sound/tms5110.h index 12f279155eb..d873da55db4 100644 --- a/src/devices/sound/tms5110.h +++ b/src/devices/sound/tms5110.h @@ -41,13 +41,13 @@ public: auto data() { return m_data_cb.bind(); } auto romclk() { return m_romclk_cb.bind(); } - DECLARE_WRITE8_MEMBER( ctl_w ); - DECLARE_READ8_MEMBER( ctl_r ); - DECLARE_WRITE_LINE_MEMBER( pdc_w ); + void ctl_w(uint8_t data); + uint8_t ctl_r(); + void pdc_w(int state); - // this is only used by cvs.c + // this is only used by cvs.cpp // it is not related at all to the speech generation and conflicts with the new ROM controller interface. - DECLARE_READ_LINE_MEMBER( romclk_hack_r ); + int romclk_hack_r(); protected: tms5110_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int variant); @@ -238,7 +238,7 @@ class m58817_device : public tms5110_device public: m58817_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( status_r ); + uint8_t status_r(); }; @@ -273,13 +273,13 @@ public: auto pdc() { return m_pdc_cb.bind(); } auto ctl() { return m_ctl_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER( m0_w ); - DECLARE_READ_LINE_MEMBER( data_r ); + void m0_w(int state); + int data_r(); /* offset is rom # */ - DECLARE_WRITE8_MEMBER( rom_csq_w ); - DECLARE_WRITE8_MEMBER( bit_w ); - DECLARE_WRITE_LINE_MEMBER( enable_w ); + void rom_csq_w(offs_t offset, uint8_t data); + void bit_w(uint8_t data); + void enable_w(int state); protected: // device-level overrides diff --git a/src/devices/sound/upd1771.cpp b/src/devices/sound/upd1771.cpp index c156c084681..c646f9954a6 100644 --- a/src/devices/sound/upd1771.cpp +++ b/src/devices/sound/upd1771.cpp @@ -298,7 +298,7 @@ void upd1771c_device::device_reset() -READ8_MEMBER( upd1771c_device::read ) +uint8_t upd1771c_device::read() { return 0x80; // TODO } @@ -365,7 +365,7 @@ Byte8: 0b???VVVVV Low Freq1 volume Byte9: 0b???VVVVV Low Freq2 volume */ -WRITE8_MEMBER( upd1771c_device::write ) +void upd1771c_device::write(uint8_t data) { LOG("upd1771_w: received byte 0x%02x\n", data); @@ -455,7 +455,7 @@ WRITE8_MEMBER( upd1771c_device::write ) } -WRITE_LINE_MEMBER( upd1771c_device::pcm_write ) +void upd1771c_device::pcm_write(int state) { //RESET upon HIGH if (state != m_pc3) diff --git a/src/devices/sound/upd1771.h b/src/devices/sound/upd1771.h index 20b0467670f..7dfc7ae32e5 100644 --- a/src/devices/sound/upd1771.h +++ b/src/devices/sound/upd1771.h @@ -22,9 +22,9 @@ public: auto ack_handler() { return m_ack_handler.bind(); } - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); - WRITE_LINE_MEMBER( pcm_write ); + uint8_t read(); + void write(uint8_t data); + void pcm_write(int state); protected: // device-level overrides diff --git a/src/devices/sound/upd7752.cpp b/src/devices/sound/upd7752.cpp index e2e28317d4c..c1253da1a2b 100644 --- a/src/devices/sound/upd7752.cpp +++ b/src/devices/sound/upd7752.cpp @@ -133,7 +133,7 @@ void upd7752_device::status_change(uint8_t flag,bool type) m_status &= ~flag; } -READ8_MEMBER( upd7752_device::read ) +uint8_t upd7752_device::read(offs_t offset) { switch(offset & 3) { @@ -151,7 +151,7 @@ READ8_MEMBER( upd7752_device::read ) return 0xff; } -WRITE8_MEMBER( upd7752_device::write ) +void upd7752_device::write(offs_t offset, uint8_t data) { switch(offset & 3) { diff --git a/src/devices/sound/upd7752.h b/src/devices/sound/upd7752.h index 4ec24ddfd72..85c3cd82d3c 100644 --- a/src/devices/sound/upd7752.h +++ b/src/devices/sound/upd7752.h @@ -19,10 +19,11 @@ public: upd7752_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // I/O operations - DECLARE_WRITE8_MEMBER( write ); - DECLARE_READ8_MEMBER( read ); + void write(offs_t offset, uint8_t data); + uint8_t read(offs_t offset); void upd7752_ram(address_map &map); + protected: // device-level overrides virtual void device_start() override; diff --git a/src/devices/sound/upd934g.cpp b/src/devices/sound/upd934g.cpp index 090fb98d725..75ba3fb4186 100644 --- a/src/devices/sound/upd934g.cpp +++ b/src/devices/sound/upd934g.cpp @@ -115,7 +115,7 @@ void upd934g_device::sound_stream_update(sound_stream &stream, stream_sample_t * // INTERFACE //************************************************************************** -WRITE8_MEMBER( upd934g_device::write ) +void upd934g_device::write(offs_t offset, uint8_t data) { switch (offset) { diff --git a/src/devices/sound/upd934g.h b/src/devices/sound/upd934g.h index d2ecf716d98..9d872104617 100644 --- a/src/devices/sound/upd934g.h +++ b/src/devices/sound/upd934g.h @@ -29,7 +29,7 @@ public: // configuration auto data_callback() { return m_data_cb.bind(); } - DECLARE_WRITE8_MEMBER(write); + void write(offs_t offset, uint8_t data); protected: // device-level overrides diff --git a/src/devices/sound/ymz770.cpp b/src/devices/sound/ymz770.cpp index c479cf8cf74..bba6ca59622 100644 --- a/src/devices/sound/ymz770.cpp +++ b/src/devices/sound/ymz770.cpp @@ -326,7 +326,7 @@ void ymz770_device::sequencer() // write - write to the chip's registers //------------------------------------------------- -WRITE8_MEMBER( ymz770_device::write ) +void ymz770_device::write(offs_t offset, uint8_t data) { if (offset & 1) { @@ -471,7 +471,7 @@ ymz774_device::ymz774_device(const machine_config &mconfig, const char *tag, dev } } -READ8_MEMBER(ymz774_device::read) +uint8_t ymz774_device::read(offs_t offset) { if (offset & 1) { diff --git a/src/devices/sound/ymz770.h b/src/devices/sound/ymz770.h index ca57760fe5b..6d322490e46 100644 --- a/src/devices/sound/ymz770.h +++ b/src/devices/sound/ymz770.h @@ -26,7 +26,7 @@ public: // construction/destruction ymz770_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER(write); + void write(offs_t offset, uint8_t data); protected: // device-level overrides @@ -113,13 +113,15 @@ public: // construction/destruction ymz774_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER(read); + uint8_t read(offs_t offset); + protected: virtual void internal_reg_write(uint8_t reg, uint8_t data) override; virtual uint32_t get_phrase_offs(int phrase) override { int ph = phrase * 4; return ((m_rom[ph] & 0x0f) << 24 | m_rom[ph + 1] << 16 | m_rom[ph + 2] << 8 | m_rom[ph + 3]) * 2; }; virtual uint32_t get_seq_offs(int sqn) override { int sq = sqn * 4 + 0x2000; return ((m_rom[sq] & 0x0f) << 24 | m_rom[sq + 1] << 16 | m_rom[sq + 2] << 8 | m_rom[sq + 3]) * 2; }; uint32_t get_sqc_offs(int sqc) { int sq = sqc * 4 + 0x6000; return ((m_rom[sq] & 0x0f) << 24 | m_rom[sq + 1] << 16 | m_rom[sq + 2] << 8 | m_rom[sq + 3]) * 2; }; virtual void sequencer() override; + private: int m_bank; uint32_t volinc[256]; diff --git a/src/mame/audio/dkong.cpp b/src/mame/audio/dkong.cpp index e0ccea40d29..b34d12a090c 100644 --- a/src/mame/audio/dkong.cpp +++ b/src/mame/audio/dkong.cpp @@ -1199,7 +1199,7 @@ Addresses found at @0x510, cpu2 WRITE8_MEMBER(dkong_state::m58817_command_w) { - m_m58817->ctl_w(space, 0, data & 0x0f); + m_m58817->ctl_w(data & 0x0f); m_m58817->pdc_w((data>>4) & 0x01); /* FIXME 0x20 is CS */ } diff --git a/src/mame/audio/gottlieb.cpp b/src/mame/audio/gottlieb.cpp index cbab96454e2..a9227fd9f54 100644 --- a/src/mame/audio/gottlieb.cpp +++ b/src/mame/audio/gottlieb.cpp @@ -570,7 +570,7 @@ WRITE8_MEMBER( gottlieb_sound_r2_device::speech_control_w ) // bit 6 = speech chip DATA PRESENT pin; high then low to make the chip read data if ((previous & 0x40) == 0 && (data & 0x40) != 0) - m_sp0250->write(space, 0, m_sp0250_latch); + m_sp0250->write(m_sp0250_latch); // bit 7 goes to the speech chip RESET pin if ((previous ^ data) & 0x80) diff --git a/src/mame/audio/hyprolyb.cpp b/src/mame/audio/hyprolyb.cpp index 6f52a35727b..fed9ecdc505 100644 --- a/src/mame/audio/hyprolyb.cpp +++ b/src/mame/audio/hyprolyb.cpp @@ -54,7 +54,7 @@ READ8_MEMBER( hyprolyb_adpcm_device::busy_r ) WRITE8_MEMBER( hyprolyb_adpcm_device::msm_data_w ) { - m_msm->write_data(data); + m_msm->data_w(data); m_adpcm_busy = ~data & 0x80; } diff --git a/src/mame/audio/irem.cpp b/src/mame/audio/irem.cpp index 90eed039ad2..ec2c24a3856 100644 --- a/src/mame/audio/irem.cpp +++ b/src/mame/audio/irem.cpp @@ -226,12 +226,12 @@ WRITE8_MEMBER( irem_audio_device::m52_adpcm_w ) { if (offset & 1) { - m_adpcm1->write_data(data); + m_adpcm1->data_w(data); } if (offset & 2) { if (m_adpcm2 != nullptr) - m_adpcm2->write_data(data); + m_adpcm2->data_w(data); } } @@ -240,7 +240,7 @@ WRITE8_MEMBER( irem_audio_device::m62_adpcm_w ) { msm5205_device *adpcm = (offset & 1) ? m_adpcm2.target() : m_adpcm1.target(); if (adpcm != nullptr) - adpcm->write_data(data); + adpcm->data_w(data); } diff --git a/src/mame/audio/scramble.cpp b/src/mame/audio/scramble.cpp index 710568d899b..d6970d34c53 100644 --- a/src/mame/audio/scramble.cpp +++ b/src/mame/audio/scramble.cpp @@ -224,14 +224,14 @@ WRITE8_MEMBER( scramble_state::ad2083_tms5110_ctrl_w ) { static const int tbl[8] = {0,4,2,6,1,5,3,7}; - m_tmsprom->bit_w(space, 0, tbl[data & 0x07]); + m_tmsprom->bit_w(tbl[data & 0x07]); switch (data>>3) { case 0x01: - m_tmsprom->rom_csq_w(space, 1, 0); + m_tmsprom->rom_csq_w(1, 0); break; case 0x03: - m_tmsprom->rom_csq_w(space, 0, 0); + m_tmsprom->rom_csq_w(0, 0); break; case 0x00: /* Rom 2 select */ 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 READ8_MEMBER(wecleman_state::hotchase_k007232_r) { - return m_k007232[Chip]->read(space, offset ^ 1); + return m_k007232[Chip]->read(offset ^ 1); } template 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) diff --git a/src/mame/machine/pce_cd.cpp b/src/mame/machine/pce_cd.cpp index 50602b4e1cb..e0a57f00dcc 100644 --- a/src/mame/machine/pce_cd.cpp +++ b/src/mame/machine/pce_cd.cpp @@ -336,7 +336,7 @@ WRITE_LINE_MEMBER( pce_cd_device::msm5205_int ) /* Supply new ADPCM data */ msm_data = (m_msm_nibble) ? (m_adpcm_ram[m_msm_start_addr] & 0x0f) : ((m_adpcm_ram[m_msm_start_addr] & 0xf0) >> 4); - m_msm->write_data(msm_data); + m_msm->data_w(msm_data); m_msm_nibble ^= 1; if (m_msm_nibble == 0) diff --git a/src/mame/machine/pecom.cpp b/src/mame/machine/pecom.cpp index b3cb049347a..90d23931929 100644 --- a/src/mame/machine/pecom.cpp +++ b/src/mame/machine/pecom.cpp @@ -46,22 +46,22 @@ void pecom_state::machine_reset() READ8_MEMBER(pecom_state::pecom_cdp1869_charram_r) { - return m_cdp1869->char_ram_r(space, offset); + return m_cdp1869->char_ram_r(offset); } WRITE8_MEMBER(pecom_state::pecom_cdp1869_charram_w) { - return m_cdp1869->char_ram_w(space, offset, data); + return m_cdp1869->char_ram_w(offset, data); } READ8_MEMBER(pecom_state::pecom_cdp1869_pageram_r) { - return m_cdp1869->page_ram_r(space, offset); + return m_cdp1869->page_ram_r(offset); } WRITE8_MEMBER(pecom_state::pecom_cdp1869_pageram_w) { - return m_cdp1869->page_ram_w(space, offset, data); + return m_cdp1869->page_ram_w(offset, data); } WRITE8_MEMBER(pecom_state::pecom_bank_w) diff --git a/src/mame/machine/rmnimbus.cpp b/src/mame/machine/rmnimbus.cpp index bf6df08bb29..03dd21edead 100644 --- a/src/mame/machine/rmnimbus.cpp +++ b/src/mame/machine/rmnimbus.cpp @@ -1478,7 +1478,7 @@ void rmnimbus_state::rmni_sound_reset() WRITE8_MEMBER(rmnimbus_state::nimbus_sound_ay8910_porta_w) { - m_msm->write_data(data); + m_msm->data_w(data); // Mouse code needs a copy of this. m_ay8910_a=data; diff --git a/src/mame/machine/st0016.cpp b/src/mame/machine/st0016.cpp index cadd8bf046d..af553431260 100644 --- a/src/mame/machine/st0016.cpp +++ b/src/mame/machine/st0016.cpp @@ -18,7 +18,7 @@ void st0016_cpu_device::st0016_cpu_internal_map(address_map &map) map(0xd000, 0xdfff).r(FUNC(st0016_cpu_device::st0016_sprite2_ram_r)).w(FUNC(st0016_cpu_device::st0016_sprite2_ram_w)); map(0xea00, 0xebff).r(FUNC(st0016_cpu_device::st0016_palette_ram_r)).w(FUNC(st0016_cpu_device::st0016_palette_ram_w)); map(0xec00, 0xec1f).r(FUNC(st0016_cpu_device::st0016_character_ram_r)).w(FUNC(st0016_cpu_device::st0016_character_ram_w)); - map(0xe900, 0xe9ff).rw("stsnd", FUNC(st0016_device::st0016_snd_r), FUNC(st0016_device::st0016_snd_w)); /* sound regs 8 x $20 bytes, see notes */ + map(0xe900, 0xe9ff).rw("stsnd", FUNC(st0016_device::snd_r), FUNC(st0016_device::snd_w)); /* sound regs 8 x $20 bytes, see notes */ } diff --git a/src/mame/machine/stfight.cpp b/src/mame/machine/stfight.cpp index 2b6afd21814..90b863a9aa2 100644 --- a/src/mame/machine/stfight.cpp +++ b/src/mame/machine/stfight.cpp @@ -183,7 +183,7 @@ WRITE_LINE_MEMBER(stfight_state::stfight_adpcm_int) adpcm_data >>= 4; ++m_adpcm_data_offs; - m_msm->write_data(adpcm_data & 0x0f); + m_msm->data_w(adpcm_data & 0x0f); } } diff --git a/src/mame/machine/thomson.cpp b/src/mame/machine/thomson.cpp index 6ff719b606b..059dd1714ab 100644 --- a/src/mame/machine/thomson.cpp +++ b/src/mame/machine/thomson.cpp @@ -675,7 +675,7 @@ READ8_MEMBER( thomson_state::to7_modem_mea8000_r ) if ( m_io_mconfig->read() & 1 ) { - return m_mea8000->read(space, offset); + return m_mea8000->read(offset); } else { @@ -697,7 +697,7 @@ WRITE8_MEMBER( thomson_state::to7_modem_mea8000_w ) { if ( m_io_mconfig->read() & 1 ) { - m_mea8000->write(space, offset, data); + m_mea8000->write(offset, data); } else { diff --git a/src/mame/video/cidelsa.cpp b/src/mame/video/cidelsa.cpp index a5d1832d4b8..e8737cb969a 100644 --- a/src/mame/video/cidelsa.cpp +++ b/src/mame/video/cidelsa.cpp @@ -14,23 +14,23 @@ WRITE8_MEMBER( cidelsa_state::cdp1869_w ) switch (offset + 3) { case 3: - m_vis->out3_w(space, ma, data); + m_vis->out3_w(data); break; case 4: - m_vis->out4_w(space, ma, data); + m_vis->out4_w(ma); break; case 5: - m_vis->out5_w(space, ma, data); + m_vis->out5_w(ma); break; case 6: - m_vis->out6_w(space, ma, data); + m_vis->out6_w(ma); break; case 7: - m_vis->out7_w(space, ma, data); + m_vis->out7_w(ma); break; } } diff --git a/src/mame/video/comx35.cpp b/src/mame/video/comx35.cpp index 3fcf318ee8b..abbec0ff506 100644 --- a/src/mame/video/comx35.cpp +++ b/src/mame/video/comx35.cpp @@ -18,23 +18,23 @@ WRITE8_MEMBER( comx35_state::cdp1869_w ) switch (offset) { case 3: - m_vis->out3_w(space, ma, data); + m_vis->out3_w(data); break; case 4: - m_vis->out4_w(space, ma, data); + m_vis->out4_w(ma); break; case 5: - m_vis->out5_w(space, ma, data); + m_vis->out5_w(ma); break; case 6: - m_vis->out6_w(space, ma, data); + m_vis->out6_w(ma); break; case 7: - m_vis->out7_w(space, ma, data); + m_vis->out7_w(ma); break; } } diff --git a/src/mame/video/pecom.cpp b/src/mame/video/pecom.cpp index 1c583f3c0b8..303c28b7dd8 100644 --- a/src/mame/video/pecom.cpp +++ b/src/mame/video/pecom.cpp @@ -22,23 +22,23 @@ WRITE8_MEMBER(pecom_state::pecom_cdp1869_w) switch (offset + 3) { case 3: - m_cdp1869->out3_w(space, ma, data); + m_cdp1869->out3_w(data); break; case 4: - m_cdp1869->out4_w(space, ma, data); + m_cdp1869->out4_w(ma); break; case 5: - m_cdp1869->out5_w(space, ma, data); + m_cdp1869->out5_w(ma); break; case 6: - m_cdp1869->out6_w(space, ma, data); + m_cdp1869->out6_w(ma); break; case 7: - m_cdp1869->out7_w(space, ma, data); + m_cdp1869->out7_w(ma); break; } } diff --git a/src/mame/video/tia.cpp b/src/mame/video/tia.cpp index 6fe49fb13e7..d63c641f83b 100644 --- a/src/mame/video/tia.cpp +++ b/src/mame/video/tia.cpp @@ -1997,7 +1997,7 @@ WRITE8_MEMBER( tia_video_device::write ) case 0x18: /* AUDF1 */ case 0x19: /* AUDV0 */ case 0x1A: /* AUDV1 */ - m_tia->tia_sound_w(space, offset, data); + m_tia->tia_sound_w(offset, data); break; case 0x1B: diff --git a/src/mame/video/tmc600.cpp b/src/mame/video/tmc600.cpp index 56f414e3014..a2b79602b95 100644 --- a/src/mame/video/tmc600.cpp +++ b/src/mame/video/tmc600.cpp @@ -15,11 +15,11 @@ WRITE8_MEMBER( tmc600_state::vismac_data_w ) switch (m_vismac_reg_latch & 0x07) { case 2: m_vismac_color_latch = data & 0x0f; break; - case 3: m_vis->out3_w(space, ma, data); break; - case 4: m_vis->out4_w(space, ma, data); break; - case 5: m_vis->out5_w(space, ma, data); break; - case 6: m_vis->out6_w(space, ma, data); break; - case 7: m_vis->out7_w(space, ma, data); break; + case 3: m_vis->out3_w(data); break; + case 4: m_vis->out4_w(ma); break; + case 5: m_vis->out5_w(ma); break; + case 6: m_vis->out6_w(ma); break; + case 7: m_vis->out7_w(ma); break; } } -- cgit v1.2.3