From 0d914e1ffb34781fdf7c98b5ba55e831f72f3cae Mon Sep 17 00:00:00 2001 From: cam900 Date: Sat, 2 Feb 2019 09:39:01 +0900 Subject: [PATCH] sn76496.cpp : Remove unnecessary handler, Remove unnecessary arguments in stereo_w write8smo handler is already exists (write) --- src/devices/sound/sn76496.cpp | 4 ++-- src/devices/sound/sn76496.h | 5 ++--- src/mame/drivers/amusco.cpp | 2 +- src/mame/drivers/appoooh.cpp | 6 +++--- src/mame/drivers/apricot.cpp | 2 +- src/mame/drivers/apricotp.cpp | 2 +- src/mame/drivers/atetris.cpp | 6 +++--- src/mame/drivers/bankp.cpp | 6 +++--- src/mame/drivers/centiped.cpp | 2 +- src/mame/drivers/coleco.cpp | 2 +- src/mame/drivers/crvision.cpp | 2 +- src/mame/drivers/divebomb.cpp | 12 +++++------ src/mame/drivers/docastle.cpp | 16 +++++++------- src/mame/drivers/drmicro.cpp | 6 +++--- src/mame/drivers/ecoinf3.cpp | 2 +- src/mame/drivers/exedexes.cpp | 4 ++-- src/mame/drivers/finalizr.cpp | 2 +- src/mame/drivers/freekick.cpp | 32 ++++++++++++++-------------- src/mame/drivers/galaxold.cpp | 6 +++--- src/mame/drivers/gatron.cpp | 2 +- src/mame/drivers/gberet.cpp | 2 +- src/mame/drivers/goldstar.cpp | 38 +++++++++++++++++----------------- src/mame/drivers/homedata.cpp | 2 +- src/mame/drivers/ibmpcjr.cpp | 2 +- src/mame/drivers/ikki.cpp | 4 ++-- src/mame/drivers/jailbrek.cpp | 2 +- src/mame/drivers/jantotsu.cpp | 4 ++-- src/mame/drivers/kncljoe.cpp | 4 ++-- src/mame/drivers/konblands.cpp | 4 ++-- src/mame/drivers/kontest.cpp | 4 ++-- src/mame/drivers/ladybug.cpp | 14 ++++++------- src/mame/drivers/lucky74.cpp | 6 +++--- src/mame/drivers/m5.cpp | 4 ++-- src/mame/drivers/markham.cpp | 8 +++---- src/mame/drivers/megaplay.cpp | 2 +- src/mame/drivers/mikie.cpp | 4 ++-- src/mame/drivers/mjkjidai.cpp | 4 ++-- src/mame/drivers/mrdo.cpp | 4 ++-- src/mame/drivers/mrjong.cpp | 4 ++-- src/mame/drivers/mz700.cpp | 2 +- src/mame/drivers/pachifev.cpp | 4 ++-- src/mame/drivers/pacman.cpp | 6 +++--- src/mame/drivers/pencil2.cpp | 2 +- src/mame/drivers/pingpong.cpp | 4 ++-- src/mame/drivers/pv2000.cpp | 2 +- src/mame/drivers/rc759.cpp | 2 +- src/mame/drivers/retofinv.cpp | 4 ++-- src/mame/drivers/rx78.cpp | 2 +- src/mame/drivers/sbugger.cpp | 4 ++-- src/mame/drivers/segae.cpp | 4 ++-- src/mame/drivers/senjyo.cpp | 12 +++++------ src/mame/drivers/sg1000.cpp | 10 ++++----- src/mame/drivers/sg1000a.cpp | 4 ++-- src/mame/drivers/shaolins.cpp | 4 ++-- src/mame/drivers/smc777.cpp | 2 +- src/mame/drivers/sprcros2.cpp | 6 +++--- src/mame/drivers/superdq.cpp | 2 +- src/mame/drivers/suprloco.cpp | 4 ++-- src/mame/drivers/system1.cpp | 4 ++-- src/mame/drivers/tandy1t.cpp | 4 ++-- src/mame/drivers/tek440x.cpp | 2 +- src/mame/drivers/tp84.cpp | 6 +++--- src/mame/drivers/tutor.cpp | 4 ++-- src/mame/drivers/vgmplay.cpp | 4 ++-- src/mame/drivers/vsnes.cpp | 6 +++--- src/mame/drivers/wico.cpp | 4 ++-- src/mame/drivers/xyonix.cpp | 4 ++-- src/mame/drivers/zaxxon.cpp | 4 ++-- src/mame/machine/sms.cpp | 2 +- src/mame/machine/wangpckb.cpp | 2 +- 70 files changed, 181 insertions(+), 182 deletions(-) diff --git a/src/devices/sound/sn76496.cpp b/src/devices/sound/sn76496.cpp index 23b29c208e3..6765fb3393f 100644 --- a/src/devices/sound/sn76496.cpp +++ b/src/devices/sound/sn76496.cpp @@ -290,14 +290,14 @@ void sn76496_base_device::device_clock_changed() m_sound->set_sample_rate(clock()/2); } -WRITE8_MEMBER( sn76496_base_device::stereo_w ) +void sn76496_base_device::stereo_w(u8 data) { m_sound->update(); if (m_stereo) m_stereo_mask = data; else fatalerror("sn76496_base_device: Call to stereo write with mono chip!\n"); } -void sn76496_base_device::write(uint8_t data) +void sn76496_base_device::write(u8 data) { int n, r, c; diff --git a/src/devices/sound/sn76496.h b/src/devices/sound/sn76496.h index b518fa25398..cd7b4a6c509 100644 --- a/src/devices/sound/sn76496.h +++ b/src/devices/sound/sn76496.h @@ -24,9 +24,8 @@ class sn76496_base_device : public device_t, public device_sound_interface public: auto ready_cb() { return m_ready_handler.bind(); } - DECLARE_WRITE8_MEMBER( stereo_w ); - void write(uint8_t data); - DECLARE_WRITE8_MEMBER( command_w ) { write(data); } + void stereo_w(u8 data); + void write(u8 data); DECLARE_READ_LINE_MEMBER( ready_r ) { return m_ready_state ? 1 : 0; } protected: diff --git a/src/mame/drivers/amusco.cpp b/src/mame/drivers/amusco.cpp index d1caea3af5c..1183300e39d 100644 --- a/src/mame/drivers/amusco.cpp +++ b/src/mame/drivers/amusco.cpp @@ -372,7 +372,7 @@ void amusco_state::io_map(address_map &map) map(0x0020, 0x0023).w(m_pit, FUNC(pit8253_device::write)); map(0x0030, 0x0033).rw("ppi_outputs", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x0040, 0x0043).rw("ppi_inputs", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x0060, 0x0060).w("sn", FUNC(sn76489a_device::command_w)); + map(0x0060, 0x0060).w("sn", FUNC(sn76489a_device::write)); map(0x0070, 0x0071).w(FUNC(amusco_state::vram_w)); map(0x0280, 0x0283).rw("lpt_interface", FUNC(i8155_device::io_r), FUNC(i8155_device::io_w)); map(0x0380, 0x0383).rw("rtc_interface", FUNC(i8155_device::io_r), FUNC(i8155_device::io_w)); diff --git a/src/mame/drivers/appoooh.cpp b/src/mame/drivers/appoooh.cpp index 1c15989ee51..488fffffa82 100644 --- a/src/mame/drivers/appoooh.cpp +++ b/src/mame/drivers/appoooh.cpp @@ -240,9 +240,9 @@ void appoooh_state::decrypted_opcodes_map(address_map &map) void appoooh_state::main_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("P1").w("sn1", FUNC(sn76489_device::command_w)); - map(0x01, 0x01).portr("P2").w("sn2", FUNC(sn76489_device::command_w)); - map(0x02, 0x02).w("sn3", FUNC(sn76489_device::command_w)); + map(0x00, 0x00).portr("P1").w("sn1", FUNC(sn76489_device::write)); + map(0x01, 0x01).portr("P2").w("sn2", FUNC(sn76489_device::write)); + map(0x02, 0x02).w("sn3", FUNC(sn76489_device::write)); map(0x03, 0x03).portr("DSW1").w(FUNC(appoooh_state::adpcm_w)); map(0x04, 0x04).portr("BUTTON3").w(FUNC(appoooh_state::out_w)); map(0x05, 0x05).w(FUNC(appoooh_state::scroll_w)); /* unknown */ diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp index 5ccd0e5c225..a18a9735e61 100644 --- a/src/mame/drivers/apricot.cpp +++ b/src/mame/drivers/apricot.cpp @@ -339,7 +339,7 @@ void apricot_state::apricot_io(address_map &map) map(0x00, 0x03).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); map(0x40, 0x47).rw(m_fdc, FUNC(wd2797_device::read), FUNC(wd2797_device::write)).umask16(0x00ff); map(0x48, 0x4f).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); - map(0x50, 0x50).mirror(0x06).w("ic7", FUNC(sn76489_device::command_w)); + map(0x50, 0x50).mirror(0x06).w("ic7", FUNC(sn76489_device::write)); map(0x58, 0x5f).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff); map(0x60, 0x60).r(FUNC(apricot_state::sio_da_r)).w(m_sio, FUNC(z80sio_device::da_w)).umask16(0x00ff); map(0x62, 0x62).r(FUNC(apricot_state::sio_ca_r)).w(m_sio, FUNC(z80sio_device::ca_w)).umask16(0x00ff); diff --git a/src/mame/drivers/apricotp.cpp b/src/mame/drivers/apricotp.cpp index b1282b46279..77883f9d8ad 100644 --- a/src/mame/drivers/apricotp.cpp +++ b/src/mame/drivers/apricotp.cpp @@ -446,7 +446,7 @@ void fp_state::fp_io(address_map &map) map(0x020, 0x020).w("cent_data_out", FUNC(output_latch_device::bus_w)); map(0x022, 0x022).w(FUNC(fp_state::pint_clr_w)); map(0x024, 0x024).r(FUNC(fp_state::prtr_snd_r)); - map(0x026, 0x026).w(SN76489AN_TAG, FUNC(sn76489a_device::command_w)); + map(0x026, 0x026).w(SN76489AN_TAG, FUNC(sn76489a_device::write)); map(0x028, 0x028).w(FUNC(fp_state::contrast_w)); map(0x02a, 0x02a).w(FUNC(fp_state::palette_w)); map(0x02e, 0x02f).w(FUNC(fp_state::video_w)); diff --git a/src/mame/drivers/atetris.cpp b/src/mame/drivers/atetris.cpp index 1f87ca5c03a..1b9d58ee07d 100644 --- a/src/mame/drivers/atetris.cpp +++ b/src/mame/drivers/atetris.cpp @@ -195,9 +195,9 @@ void atetris_state::atetrisb2_map(address_map &map) map(0x1000, 0x1fff).ram().w(FUNC(atetris_state::videoram_w)).share("videoram"); map(0x2000, 0x20ff).ram().w("palette", FUNC(palette_device::write8)).share("palette"); map(0x2400, 0x25ff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)); - map(0x2802, 0x2802).w("sn1", FUNC(sn76496_device::command_w)); - map(0x2804, 0x2804).w("sn2", FUNC(sn76496_device::command_w)); - map(0x2806, 0x2806).w("sn3", FUNC(sn76496_device::command_w)); + map(0x2802, 0x2802).w("sn1", FUNC(sn76496_device::write)); + map(0x2804, 0x2804).w("sn2", FUNC(sn76496_device::write)); + map(0x2806, 0x2806).w("sn3", FUNC(sn76496_device::write)); map(0x2808, 0x2808).portr("IN0"); map(0x2808, 0x280f).nopw(); map(0x2818, 0x2818).portr("IN1"); diff --git a/src/mame/drivers/bankp.cpp b/src/mame/drivers/bankp.cpp index adc9223bfbc..35db3bbc218 100644 --- a/src/mame/drivers/bankp.cpp +++ b/src/mame/drivers/bankp.cpp @@ -137,9 +137,9 @@ void bankp_state::bankp_map(address_map &map) void bankp_state::bankp_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("IN0").w("sn1", FUNC(sn76489_device::command_w)); - map(0x01, 0x01).portr("IN1").w("sn2", FUNC(sn76489_device::command_w)); - map(0x02, 0x02).portr("IN2").w("sn3", FUNC(sn76489_device::command_w)); + map(0x00, 0x00).portr("IN0").w("sn1", FUNC(sn76489_device::write)); + map(0x01, 0x01).portr("IN1").w("sn2", FUNC(sn76489_device::write)); + map(0x02, 0x02).portr("IN2").w("sn3", FUNC(sn76489_device::write)); map(0x04, 0x04).portr("DSW1"); map(0x05, 0x05).w(FUNC(bankp_state::scroll_w)); map(0x07, 0x07).w(FUNC(bankp_state::out_w)); diff --git a/src/mame/drivers/centiped.cpp b/src/mame/drivers/centiped.cpp index e887a21948b..ca09a862432 100644 --- a/src/mame/drivers/centiped.cpp +++ b/src/mame/drivers/centiped.cpp @@ -985,7 +985,7 @@ void centiped_state::bullsdrt_port_map(address_map &map) void centiped_state::bullsdrt_data_map(address_map &map) { - map(S2650_DATA_PORT, S2650_DATA_PORT).r(FUNC(centiped_state::bullsdrt_data_port_r)).w("snsnd", FUNC(sn76496_device::command_w)); + map(S2650_DATA_PORT, S2650_DATA_PORT).r(FUNC(centiped_state::bullsdrt_data_port_r)).w("snsnd", FUNC(sn76496_device::write)); } diff --git a/src/mame/drivers/coleco.cpp b/src/mame/drivers/coleco.cpp index c554f43ea91..28d78166293 100644 --- a/src/mame/drivers/coleco.cpp +++ b/src/mame/drivers/coleco.cpp @@ -108,7 +108,7 @@ void coleco_state::coleco_io_map(address_map &map) map(0xa0, 0xa0).mirror(0x1e).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); map(0xa1, 0xa1).mirror(0x1e).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); map(0xc0, 0xc0).mirror(0x1f).w(FUNC(coleco_state::paddle_on_w)); - map(0xe0, 0xe0).mirror(0x1f).w("sn76489a", FUNC(sn76489a_device::command_w)); + map(0xe0, 0xe0).mirror(0x1f).w("sn76489a", FUNC(sn76489a_device::write)); map(0xe0, 0xe0).mirror(0x1d).r(FUNC(coleco_state::paddle_1_r)); map(0xe2, 0xe2).mirror(0x1d).r(FUNC(coleco_state::paddle_2_r)); } diff --git a/src/mame/drivers/crvision.cpp b/src/mame/drivers/crvision.cpp index 172241241ee..cde9a022154 100644 --- a/src/mame/drivers/crvision.cpp +++ b/src/mame/drivers/crvision.cpp @@ -748,7 +748,7 @@ void crvision_state::creativision(machine_config &config) m_pia->readpa_handler().set(FUNC(crvision_state::pia_pa_r)); m_pia->readpb_handler().set(FUNC(crvision_state::pia_pb_r)); m_pia->writepa_handler().set(FUNC(crvision_state::pia_pa_w)); - m_pia->writepb_handler().set(SN76489_TAG, FUNC(sn76496_base_device::command_w)); + m_pia->writepb_handler().set(SN76489_TAG, FUNC(sn76496_base_device::write)); CASSETTE(config, m_cassette); m_cassette->set_default_state((cassette_state)(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED)); diff --git a/src/mame/drivers/divebomb.cpp b/src/mame/drivers/divebomb.cpp index 63d305cfd08..a0002de0685 100644 --- a/src/mame/drivers/divebomb.cpp +++ b/src/mame/drivers/divebomb.cpp @@ -114,12 +114,12 @@ void divebomb_state::divebomb_fgcpu_map(address_map &map) void divebomb_state::divebomb_fgcpu_iomap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w("sn0", FUNC(sn76489_device::command_w)); - map(0x01, 0x01).w("sn1", FUNC(sn76489_device::command_w)); - map(0x02, 0x02).w("sn2", FUNC(sn76489_device::command_w)); - map(0x03, 0x03).w("sn3", FUNC(sn76489_device::command_w)); - map(0x04, 0x04).w("sn4", FUNC(sn76489_device::command_w)); - map(0x05, 0x05).w("sn5", FUNC(sn76489_device::command_w)); + map(0x00, 0x00).w("sn0", FUNC(sn76489_device::write)); + map(0x01, 0x01).w("sn1", FUNC(sn76489_device::write)); + map(0x02, 0x02).w("sn2", FUNC(sn76489_device::write)); + map(0x03, 0x03).w("sn3", FUNC(sn76489_device::write)); + map(0x04, 0x04).w("sn4", FUNC(sn76489_device::write)); + map(0x05, 0x05).w("sn5", FUNC(sn76489_device::write)); map(0x10, 0x10).r(m_roz2fg_latch, FUNC(generic_latch_8_device::read)).w("fg2roz", FUNC(generic_latch_8_device::write)); map(0x20, 0x20).r(m_spr2fg_latch, FUNC(generic_latch_8_device::read)).w("fg2spr", FUNC(generic_latch_8_device::write)); map(0x30, 0x30).portr("IN0"); diff --git a/src/mame/drivers/docastle.cpp b/src/mame/drivers/docastle.cpp index 35d85849b99..d90b12bf812 100644 --- a/src/mame/drivers/docastle.cpp +++ b/src/mame/drivers/docastle.cpp @@ -240,10 +240,10 @@ void docastle_state::docastle_map2(address_map &map) map(0x8000, 0x87ff).ram(); map(0xa000, 0xa008).rw(FUNC(docastle_state::docastle_shared1_r), FUNC(docastle_state::docastle_shared0_w)); map(0xc000, 0xc007).select(0x0080).rw(FUNC(docastle_state::inputs_flipscreen_r), FUNC(docastle_state::flipscreen_w)); - map(0xe000, 0xe000).w("sn1", FUNC(sn76489a_device::command_w)); - map(0xe400, 0xe400).w("sn2", FUNC(sn76489a_device::command_w)); - map(0xe800, 0xe800).w("sn3", FUNC(sn76489a_device::command_w)); - map(0xec00, 0xec00).w("sn4", FUNC(sn76489a_device::command_w)); + map(0xe000, 0xe000).w("sn1", FUNC(sn76489a_device::write)); + map(0xe400, 0xe400).w("sn2", FUNC(sn76489a_device::write)); + map(0xe800, 0xe800).w("sn3", FUNC(sn76489a_device::write)); + map(0xec00, 0xec00).w("sn4", FUNC(sn76489a_device::write)); } void docastle_state::docastle_map3(address_map &map) @@ -280,10 +280,10 @@ void docastle_state::dorunrun_map2(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x8000, 0x87ff).ram(); - map(0xa000, 0xa000).w("sn1", FUNC(sn76489a_device::command_w)); - map(0xa400, 0xa400).w("sn2", FUNC(sn76489a_device::command_w)); - map(0xa800, 0xa800).w("sn3", FUNC(sn76489a_device::command_w)); - map(0xac00, 0xac00).w("sn4", FUNC(sn76489a_device::command_w)); + map(0xa000, 0xa000).w("sn1", FUNC(sn76489a_device::write)); + map(0xa400, 0xa400).w("sn2", FUNC(sn76489a_device::write)); + map(0xa800, 0xa800).w("sn3", FUNC(sn76489a_device::write)); + map(0xac00, 0xac00).w("sn4", FUNC(sn76489a_device::write)); map(0xc000, 0xc007).select(0x0080).rw(FUNC(docastle_state::inputs_flipscreen_r), FUNC(docastle_state::flipscreen_w)); map(0xe000, 0xe008).rw(FUNC(docastle_state::docastle_shared1_r), FUNC(docastle_state::docastle_shared0_w)); } diff --git a/src/mame/drivers/drmicro.cpp b/src/mame/drivers/drmicro.cpp index 529ec424694..5dff7a2e260 100644 --- a/src/mame/drivers/drmicro.cpp +++ b/src/mame/drivers/drmicro.cpp @@ -87,9 +87,9 @@ void drmicro_state::drmicro_map(address_map &map) void drmicro_state::io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("P1").w("sn1", FUNC(sn76496_device::command_w)); - map(0x01, 0x01).portr("P2").w("sn2", FUNC(sn76496_device::command_w)); - map(0x02, 0x02).w("sn3", FUNC(sn76496_device::command_w)); + map(0x00, 0x00).portr("P1").w("sn1", FUNC(sn76496_device::write)); + map(0x01, 0x01).portr("P2").w("sn2", FUNC(sn76496_device::write)); + map(0x02, 0x02).w("sn3", FUNC(sn76496_device::write)); map(0x03, 0x03).portr("DSW1").w(FUNC(drmicro_state::pcm_set_w)); map(0x04, 0x04).portr("DSW2").w(FUNC(drmicro_state::nmi_enable_w)); map(0x05, 0x05).noprw(); // unused? / watchdog? diff --git a/src/mame/drivers/ecoinf3.cpp b/src/mame/drivers/ecoinf3.cpp index 13f690573ad..08aa113dd7c 100644 --- a/src/mame/drivers/ecoinf3.cpp +++ b/src/mame/drivers/ecoinf3.cpp @@ -446,7 +446,7 @@ void ecoinf3_state::pyramid_portmap(address_map &map) map(0x58, 0x5b).rw("ppi8255_g", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x5c, 0x5f).rw("ppi8255_h", FUNC(i8255_device::read), FUNC(i8255_device::write)); // frequently accesses DB after 5B, mirror? bug? - map(0xDB, 0xDB).w("sn1", FUNC(sn76489_device::command_w)); // no idea what the sound chip is, this sounds terrible + map(0xDB, 0xDB).w("sn1", FUNC(sn76489_device::write)); // no idea what the sound chip is, this sounds terrible } diff --git a/src/mame/drivers/exedexes.cpp b/src/mame/drivers/exedexes.cpp index 9ec6ab53863..f7595c62a49 100644 --- a/src/mame/drivers/exedexes.cpp +++ b/src/mame/drivers/exedexes.cpp @@ -63,8 +63,8 @@ void exedexes_state::sound_map(address_map &map) map(0x4000, 0x47ff).ram(); map(0x6000, 0x6000).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0x8000, 0x8001).w("aysnd", FUNC(ay8910_device::address_data_w)); - map(0x8002, 0x8002).w("sn1", FUNC(sn76489_device::command_w)); - map(0x8003, 0x8003).w("sn2", FUNC(sn76489_device::command_w)); + map(0x8002, 0x8002).w("sn1", FUNC(sn76489_device::write)); + map(0x8003, 0x8003).w("sn2", FUNC(sn76489_device::write)); } diff --git a/src/mame/drivers/finalizr.cpp b/src/mame/drivers/finalizr.cpp index 2fe257eb580..c1a6ae46271 100644 --- a/src/mame/drivers/finalizr.cpp +++ b/src/mame/drivers/finalizr.cpp @@ -117,7 +117,7 @@ void finalizr_state::main_map(address_map &map) map(0x0813, 0x0813).portr("DSW1"); map(0x0818, 0x0818).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x0819, 0x0819).w(FUNC(finalizr_state::finalizr_coin_w)); - map(0x081a, 0x081a).w("snsnd", FUNC(sn76489a_device::command_w)); /* This address triggers the SN chip to read the data port. */ + map(0x081a, 0x081a).w("snsnd", FUNC(sn76489a_device::write)); /* This address triggers the SN chip to read the data port. */ map(0x081b, 0x081b).nopw(); /* Loads the snd command into the snd latch */ map(0x081c, 0x081c).w(FUNC(finalizr_state::finalizr_i8039_irq_w)); /* custom sound chip */ map(0x081d, 0x081d).w("soundlatch", FUNC(generic_latch_8_device::write)); /* custom sound chip */ diff --git a/src/mame/drivers/freekick.cpp b/src/mame/drivers/freekick.cpp index 86b5022717d..8c20ab4f815 100644 --- a/src/mame/drivers/freekick.cpp +++ b/src/mame/drivers/freekick.cpp @@ -206,10 +206,10 @@ void freekick_state::omega_map(address_map &map) map(0xe800, 0xe800).portr("IN1"); map(0xf000, 0xf000).portr("DSW1").nopw(); //bankswitch ? map(0xf800, 0xf800).portr("DSW2"); - map(0xfc00, 0xfc00).w("sn1", FUNC(sn76489a_device::command_w)); - map(0xfc01, 0xfc01).w("sn2", FUNC(sn76489a_device::command_w)); - map(0xfc02, 0xfc02).w("sn3", FUNC(sn76489a_device::command_w)); - map(0xfc03, 0xfc03).w("sn4", FUNC(sn76489a_device::command_w)); + map(0xfc00, 0xfc00).w("sn1", FUNC(sn76489a_device::write)); + map(0xfc01, 0xfc01).w("sn2", FUNC(sn76489a_device::write)); + map(0xfc02, 0xfc02).w("sn3", FUNC(sn76489a_device::write)); + map(0xfc03, 0xfc03).w("sn4", FUNC(sn76489a_device::write)); } void freekick_state::pbillrd_map(address_map &map) @@ -225,10 +225,10 @@ void freekick_state::pbillrd_map(address_map &map) map(0xe800, 0xe800).portr("IN1"); map(0xf000, 0xf000).portr("DSW1").w(FUNC(freekick_state::pbillrd_bankswitch_w)); map(0xf800, 0xf800).portr("DSW2"); - map(0xfc00, 0xfc00).w("sn1", FUNC(sn76489a_device::command_w)); - map(0xfc01, 0xfc01).w("sn2", FUNC(sn76489a_device::command_w)); - map(0xfc02, 0xfc02).w("sn3", FUNC(sn76489a_device::command_w)); - map(0xfc03, 0xfc03).w("sn4", FUNC(sn76489a_device::command_w)); + map(0xfc00, 0xfc00).w("sn1", FUNC(sn76489a_device::write)); + map(0xfc01, 0xfc01).w("sn2", FUNC(sn76489a_device::write)); + map(0xfc02, 0xfc02).w("sn3", FUNC(sn76489a_device::write)); + map(0xfc03, 0xfc03).w("sn4", FUNC(sn76489a_device::write)); } void freekick_state::decrypted_opcodes_map(address_map &map) @@ -250,10 +250,10 @@ void freekick_state::freekick_map(address_map &map) map(0xf802, 0xf802).nopr(); //MUST return bit 0 = 0, otherwise game resets map(0xf803, 0xf803).r(FUNC(freekick_state::spinner_r)); map(0xf800, 0xf807).w(m_outlatch, FUNC(ls259_device::write_d0)); - map(0xfc00, 0xfc00).w("sn1", FUNC(sn76489a_device::command_w)); - map(0xfc01, 0xfc01).w("sn2", FUNC(sn76489a_device::command_w)); - map(0xfc02, 0xfc02).w("sn3", FUNC(sn76489a_device::command_w)); - map(0xfc03, 0xfc03).w("sn4", FUNC(sn76489a_device::command_w)); + map(0xfc00, 0xfc00).w("sn1", FUNC(sn76489a_device::write)); + map(0xfc01, 0xfc01).w("sn2", FUNC(sn76489a_device::write)); + map(0xfc02, 0xfc02).w("sn3", FUNC(sn76489a_device::write)); + map(0xfc03, 0xfc03).w("sn4", FUNC(sn76489a_device::write)); } void freekick_state::gigas_map(address_map &map) @@ -268,10 +268,10 @@ void freekick_state::gigas_map(address_map &map) map(0xe800, 0xe800).portr("IN1"); map(0xf000, 0xf000).portr("DSW1").nopw(); //bankswitch ? map(0xf800, 0xf800).portr("DSW2"); - map(0xfc00, 0xfc00).w("sn1", FUNC(sn76489a_device::command_w)); - map(0xfc01, 0xfc01).w("sn2", FUNC(sn76489a_device::command_w)); - map(0xfc02, 0xfc02).w("sn3", FUNC(sn76489a_device::command_w)); - map(0xfc03, 0xfc03).w("sn4", FUNC(sn76489a_device::command_w)); + map(0xfc00, 0xfc00).w("sn1", FUNC(sn76489a_device::write)); + map(0xfc01, 0xfc01).w("sn2", FUNC(sn76489a_device::write)); + map(0xfc02, 0xfc02).w("sn3", FUNC(sn76489a_device::write)); + map(0xfc03, 0xfc03).w("sn4", FUNC(sn76489a_device::write)); } void freekick_state::omega_io_map(address_map &map) diff --git a/src/mame/drivers/galaxold.cpp b/src/mame/drivers/galaxold.cpp index d078c26ee1f..c87e568e3ba 100644 --- a/src/mame/drivers/galaxold.cpp +++ b/src/mame/drivers/galaxold.cpp @@ -780,7 +780,7 @@ void galaxold_state::racknrol_map(address_map &map) void galaxold_state::racknrol_io(address_map &map) { - map(0x1d, 0x1d).w("snsnd", FUNC(sn76489a_device::command_w)); + map(0x1d, 0x1d).w("snsnd", FUNC(sn76489a_device::write)); // AM_RANGE(0x1e, 0x1e) AM_WRITENOP // AM_RANGE(0x1f, 0x1f) AM_WRITENOP map(0x20, 0x3f).w(FUNC(galaxold_state::racknrol_tiles_bank_w)).share("racknrol_tbank"); @@ -808,7 +808,7 @@ void galaxold_state::hexpoola_io(address_map &map) void galaxold_state::hexpoola_data(address_map &map) { - map(S2650_DATA_PORT, S2650_DATA_PORT).r(FUNC(galaxold_state::hexpoola_data_port_r)).w("snsnd", FUNC(sn76496_device::command_w)); + map(S2650_DATA_PORT, S2650_DATA_PORT).r(FUNC(galaxold_state::hexpoola_data_port_r)).w("snsnd", FUNC(sn76496_device::write)); } READ8_MEMBER(galaxold_state::bullsdrtg_data_port_r) @@ -834,7 +834,7 @@ READ8_MEMBER(galaxold_state::bullsdrtg_data_port_r) void galaxold_state::bullsdrtg_data_map(address_map &map) { - map(S2650_DATA_PORT, S2650_DATA_PORT).r(FUNC(galaxold_state::bullsdrtg_data_port_r)).w("snsnd", FUNC(sn76496_device::command_w)); + map(S2650_DATA_PORT, S2650_DATA_PORT).r(FUNC(galaxold_state::bullsdrtg_data_port_r)).w("snsnd", FUNC(sn76496_device::write)); } /* Lives Dips are spread across two input ports */ diff --git a/src/mame/drivers/gatron.cpp b/src/mame/drivers/gatron.cpp index 69ba8132478..4df60e2623f 100644 --- a/src/mame/drivers/gatron.cpp +++ b/src/mame/drivers/gatron.cpp @@ -450,7 +450,7 @@ void gatron_state::gat_map(address_map &map) map(0x0000, 0x5fff).rom(); map(0x6000, 0x63ff).ram().w(FUNC(gatron_state::videoram_w)).share("videoram"); map(0x8000, 0x87ff).ram().share("nvram"); /* battery backed RAM */ - map(0xa000, 0xa000).w("snsnd", FUNC(sn76489_device::command_w)); /* PSG */ + map(0xa000, 0xa000).w("snsnd", FUNC(sn76489_device::write)); /* PSG */ map(0xe000, 0xe000).w(FUNC(gatron_state::output_port_0_w)); /* lamps */ } diff --git a/src/mame/drivers/gberet.cpp b/src/mame/drivers/gberet.cpp index cb73c2c16c7..edb2755c1dd 100644 --- a/src/mame/drivers/gberet.cpp +++ b/src/mame/drivers/gberet.cpp @@ -227,7 +227,7 @@ void gberet_state::gberetb_map(address_map &map) map(0xe900, 0xe9ff).ram().share("spriteram"); map(0xf000, 0xf000).nopw(); // coin counter not supported map(0xf200, 0xf200).portr("DSW2"); - map(0xf400, 0xf400).w(m_sn, FUNC(sn76489a_device::command_w)); + map(0xf400, 0xf400).w(m_sn, FUNC(sn76489a_device::write)); map(0xf600, 0xf600).portr("P2"); map(0xf601, 0xf601).portr("DSW1"); map(0xf602, 0xf602).portr("P1"); diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp index be48644e9e9..ddc95ac1df3 100644 --- a/src/mame/drivers/goldstar.cpp +++ b/src/mame/drivers/goldstar.cpp @@ -628,7 +628,7 @@ void cb3_state::ncb3_map(address_map &map) map(0xf840, 0xf840).w("aysnd", FUNC(ay8910_device::address_w)); map(0xf850, 0xf850).w(FUNC(cb3_state::p1_lamps_w)); /* Control Set 1 lamps */ map(0xf860, 0xf860).w(FUNC(cb3_state::p2_lamps_w)); /* Control Set 2 lamps */ - map(0xf870, 0xf870).w("snsnd", FUNC(sn76489_device::command_w)); /* guess... device is initialized, but doesn't seems to be used.*/ + map(0xf870, 0xf870).w("snsnd", FUNC(sn76489_device::write)); /* guess... device is initialized, but doesn't seems to be used.*/ } void goldstar_state::ncb3_readwriteport(address_map &map) @@ -700,7 +700,7 @@ void goldstar_state::wcherry_map(address_map &map) map(0xf640, 0xf640).w("aysnd", FUNC(ay8910_device::address_w)); map(0xf650, 0xf650).nopw(); // AM_WRITE(output_w) // unknown register: 0x3e map(0xf660, 0xf660).nopw(); // AM_WRITE(output_w) // unknown register: 0x3e - map(0xf670, 0xf670).w("snsnd", FUNC(sn76489_device::command_w)); /* guess... device is initialized, but doesn't seems to be used.*/ + map(0xf670, 0xf670).w("snsnd", FUNC(sn76489_device::write)); /* guess... device is initialized, but doesn't seems to be used.*/ map(0xf800, 0xffff).ram(); } @@ -900,7 +900,7 @@ void goldstar_state::lucky8_map(address_map &map) map(0xb840, 0xb840).w("aysnd", FUNC(ay8910_device::address_w)); /* no sound... only use both ports for DSWs */ map(0xb850, 0xb850).w(FUNC(goldstar_state::p1_lamps_w)); map(0xb860, 0xb860).w(FUNC(goldstar_state::p2_lamps_w)); - map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::command_w)); /* sound */ + map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::write)); /* sound */ map(0xc000, 0xf7ff).rom(); // could be used by some sets like super972. map(0xf800, 0xffff).ram(); } @@ -933,7 +933,7 @@ void goldstar_state::flaming7_map(address_map &map) map(0xb840, 0xb840).w("aysnd", FUNC(ay8910_device::address_w)); /* no sound... only use both ports for DSWs */ map(0xb850, 0xb850).w(FUNC(goldstar_state::p1_lamps_w)); map(0xb860, 0xb860).w(FUNC(goldstar_state::p2_lamps_w)); - map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::command_w)); /* sound */ + map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::write)); /* sound */ // AM_RANGE(0xc000, 0xd3ff) AM_RAM map(0xf800, 0xffff).ram(); } @@ -985,7 +985,7 @@ void goldstar_state::mbstar_map(address_map &map) map(0xb840, 0xb840).w("aysnd", FUNC(ay8910_device::address_w)); /* no sound... only use both ports for DSWs */ map(0xb850, 0xb850).w(FUNC(goldstar_state::p1_lamps_w)); map(0xb860, 0xb860).w(FUNC(goldstar_state::p2_lamps_w)); - map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::command_w)); /* sound */ + map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::write)); /* sound */ map(0xc000, 0xf7ff).rom(); map(0xf800, 0xffff).ram(); } @@ -1038,7 +1038,7 @@ void wingco_state::magodds_map(address_map &map) map(0xb840, 0xb840).w("aysnd", FUNC(ay8910_device::address_w)); /* no sound... only use both ports for DSWs */ map(0xb850, 0xb850).w(FUNC(wingco_state::magodds_outb850_w)); /* lamps */ map(0xb860, 0xb860).w(FUNC(wingco_state::magodds_outb860_w)); /* watchdog */ - map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::command_w)); /* sound */ + map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::write)); /* sound */ map(0xc000, 0xffff).rom().region("maincpu", 0xc000); } @@ -1061,7 +1061,7 @@ void goldstar_state::kkotnoli_map(address_map &map) map(0xb830, 0xb830).nopw(); /* no ay8910 */ map(0xb840, 0xb840).nopw(); /* no ay8910 */ map(0xb850, 0xb850).w(FUNC(goldstar_state::p1_lamps_w)); - map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::command_w)); /* sound */ + map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::write)); /* sound */ map(0xf800, 0xffff).ram(); } @@ -1100,7 +1100,7 @@ void goldstar_state::ladylinr_map(address_map &map) map(0xb830, 0xb830).w("aysnd", FUNC(ay8910_device::address_w)); /* no sound... unused? */ map(0xb840, 0xb840).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0xb850, 0xb850).nopw(); /* just turn off the lamps, if exist */ - map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::command_w)); /* sound */ + map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::write)); /* sound */ map(0xf800, 0xffff).ram(); } @@ -1123,7 +1123,7 @@ void goldstar_state::wcat3_map(address_map &map) map(0xb830, 0xb830).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0xb840, 0xb840).w("aysnd", FUNC(ay8910_device::address_w)); /* no sound... only use both ports for DSWs */ map(0xb850, 0xb850).w(FUNC(goldstar_state::p1_lamps_w)); - map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::command_w)); /* sound */ + map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::write)); /* sound */ // AM_RANGE(0xc000, 0xc003) AM_DEVREADWRITE("ppi8255_3", i8255_device, read, write) /* Other PPI initialized? */ map(0xd000, 0xefff).rom(); map(0xf000, 0xffff).ram(); @@ -1273,9 +1273,9 @@ void unkch_state::megaline_map(address_map &map) void goldstar_state::megaline_portmap(address_map &map) { map.global_mask(0xff); - map(0xa0, 0xa0).w("sn1", FUNC(sn76489_device::command_w)); /* SN76489 #1 */ - map(0xc0, 0xc0).w("sn2", FUNC(sn76489_device::command_w)); /* SN76489 #2 */ - map(0xe0, 0xe0).w("sn3", FUNC(sn76489_device::command_w)); /* SN76489 #3 */ + map(0xa0, 0xa0).w("sn1", FUNC(sn76489_device::write)); /* SN76489 #1 */ + map(0xc0, 0xc0).w("sn2", FUNC(sn76489_device::write)); /* SN76489 #2 */ + map(0xe0, 0xe0).w("sn3", FUNC(sn76489_device::write)); /* SN76489 #3 */ map(0x60, 0x60).w("aysnd", FUNC(ay8910_device::address_w)); /* AY8910 control? */ map(0x80, 0x80).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); /* AY8910 Input? */ // AM_RANGE(0x01, 0x01) AM_DEVREAD("aysnd", ay8910_device, data_r) @@ -1330,10 +1330,10 @@ void goldstar_state::bonusch_portmap(address_map &map) map.global_mask(0xff); map(0x10, 0x10).portr("IN0"); map(0x20, 0x20).portr("IN1"); - map(0x50, 0x50).w("sn1", FUNC(sn76489_device::command_w)); /* SN76489 #1 */ - map(0x51, 0x51).w("sn2", FUNC(sn76489_device::command_w)); /* SN76489 #2 */ - map(0x52, 0x52).w("sn3", FUNC(sn76489_device::command_w)); /* SN76489 #3 */ - map(0x53, 0x53).w("sn4", FUNC(sn76489_device::command_w)); /* SN76489 #4 */ + map(0x50, 0x50).w("sn1", FUNC(sn76489_device::write)); /* SN76489 #1 */ + map(0x51, 0x51).w("sn2", FUNC(sn76489_device::write)); /* SN76489 #2 */ + map(0x52, 0x52).w("sn3", FUNC(sn76489_device::write)); /* SN76489 #3 */ + map(0x53, 0x53).w("sn4", FUNC(sn76489_device::write)); /* SN76489 #4 */ map(0x60, 0x60).portr("IN3"); } @@ -1369,9 +1369,9 @@ void goldstar_state::feverch_portmap(address_map &map) map(0x00, 0x03).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x08, 0x0b).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x10, 0x13).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x20, 0x20).w("sn1", FUNC(sn76489_device::command_w)); - map(0x28, 0x28).w("sn2", FUNC(sn76489_device::command_w)); - map(0x30, 0x30).w("sn3", FUNC(sn76489_device::command_w)); + map(0x20, 0x20).w("sn1", FUNC(sn76489_device::write)); + map(0x28, 0x28).w("sn2", FUNC(sn76489_device::write)); + map(0x30, 0x30).w("sn3", FUNC(sn76489_device::write)); //map(0x38, 0x3b) } diff --git a/src/mame/drivers/homedata.cpp b/src/mame/drivers/homedata.cpp index b51036d5946..f501d336a7c 100644 --- a/src/mame/drivers/homedata.cpp +++ b/src/mame/drivers/homedata.cpp @@ -501,7 +501,7 @@ void homedata_state::mrokumei_map(address_map &map) map(0x8000, 0x8000).w(FUNC(homedata_state::mrokumei_blitter_start_w)); // in some games also ROM bank switch to access service ROM map(0x8001, 0x8001).w(FUNC(homedata_state::mrokumei_keyboard_select_w)); map(0x8002, 0x8002).w(FUNC(homedata_state::mrokumei_sound_cmd_w)); - map(0x8003, 0x8003).w(m_sn, FUNC(sn76489a_device::command_w)); + map(0x8003, 0x8003).w(m_sn, FUNC(sn76489a_device::write)); map(0x8006, 0x8006).w(FUNC(homedata_state::homedata_blitter_param_w)); map(0x8007, 0x8007).w(FUNC(homedata_state::mrokumei_blitter_bank_w)); map(0x8000, 0xffff).rom(); diff --git a/src/mame/drivers/ibmpcjr.cpp b/src/mame/drivers/ibmpcjr.cpp index 7d43557de3a..990e70ca9ee 100644 --- a/src/mame/drivers/ibmpcjr.cpp +++ b/src/mame/drivers/ibmpcjr.cpp @@ -571,7 +571,7 @@ void pcjr_state::ibmpcjr_io(address_map &map) map(0x0040, 0x0043).rw(m_pit8253, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); map(0x0060, 0x0063).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x00a0, 0x00a0).rw(FUNC(pcjr_state::pcjr_nmi_enable_r), FUNC(pcjr_state::pc_nmi_enable_w)); - map(0x00c0, 0x00c0).w("sn76496", FUNC(sn76496_device::command_w)); + map(0x00c0, 0x00c0).w("sn76496", FUNC(sn76496_device::write)); map(0x00f2, 0x00f2).w(FUNC(pcjr_state::pcjr_fdc_dor_w)); map(0x00f4, 0x00f5).m(m_fdc, FUNC(upd765a_device::map)); map(0x0200, 0x0207).rw("pc_joy", FUNC(pc_joy_device::joy_port_r), FUNC(pc_joy_device::joy_port_w)); diff --git a/src/mame/drivers/ikki.cpp b/src/mame/drivers/ikki.cpp index 86720d5fbea..0ba8013b546 100644 --- a/src/mame/drivers/ikki.cpp +++ b/src/mame/drivers/ikki.cpp @@ -82,8 +82,8 @@ void ikki_state::ikki_cpu2(address_map &map) map(0x0000, 0x1fff).rom(); map(0xc000, 0xc7ff).ram().share("spriteram"); map(0xc800, 0xcfff).ram().share("share1"); - map(0xd801, 0xd801).w("sn1", FUNC(sn76496_device::command_w)); - map(0xd802, 0xd802).w("sn2", FUNC(sn76496_device::command_w)); + map(0xd801, 0xd801).w("sn1", FUNC(sn76496_device::write)); + map(0xd802, 0xd802).w("sn2", FUNC(sn76496_device::write)); } diff --git a/src/mame/drivers/jailbrek.cpp b/src/mame/drivers/jailbrek.cpp index d4529239329..cae5ca8996b 100644 --- a/src/mame/drivers/jailbrek.cpp +++ b/src/mame/drivers/jailbrek.cpp @@ -150,7 +150,7 @@ void jailbrek_state::jailbrek_map(address_map &map) map(0x2043, 0x2043).nopw(); /* ??? */ map(0x2044, 0x2044).w(FUNC(jailbrek_state::ctrl_w)); /* irq, nmi enable, screen flip */ map(0x3000, 0x3000).w(FUNC(jailbrek_state::coin_w)); - map(0x3100, 0x3100).portr("DSW2").w("snsnd", FUNC(sn76489a_device::command_w)); + map(0x3100, 0x3100).portr("DSW2").w("snsnd", FUNC(sn76489a_device::write)); map(0x3200, 0x3200).portr("DSW3").nopw(); /* mirror of the previous? */ map(0x3300, 0x3300).portr("SYSTEM").w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x3301, 0x3301).portr("P1"); diff --git a/src/mame/drivers/jantotsu.cpp b/src/mame/drivers/jantotsu.cpp index 2e67390fb58..92bf725bbad 100644 --- a/src/mame/drivers/jantotsu.cpp +++ b/src/mame/drivers/jantotsu.cpp @@ -348,8 +348,8 @@ void jantotsu_state::jantotsu_map(address_map &map) void jantotsu_state::jantotsu_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("DSW1").w("sn1", FUNC(sn76489a_device::command_w)); - map(0x01, 0x01).r(FUNC(jantotsu_state::jantotsu_dsw2_r)).w("sn2", FUNC(sn76489a_device::command_w)); + map(0x00, 0x00).portr("DSW1").w("sn1", FUNC(sn76489a_device::write)); + map(0x01, 0x01).r(FUNC(jantotsu_state::jantotsu_dsw2_r)).w("sn2", FUNC(sn76489a_device::write)); map(0x02, 0x03).w(FUNC(jantotsu_state::jan_adpcm_w)); map(0x04, 0x04).rw(FUNC(jantotsu_state::jantotsu_mux_r), FUNC(jantotsu_state::jantotsu_mux_w)); map(0x07, 0x07).w(FUNC(jantotsu_state::bankaddr_w)); diff --git a/src/mame/drivers/kncljoe.cpp b/src/mame/drivers/kncljoe.cpp index cdd8d80de2c..e6b8fde6c3b 100644 --- a/src/mame/drivers/kncljoe.cpp +++ b/src/mame/drivers/kncljoe.cpp @@ -57,8 +57,8 @@ void kncljoe_state::main_map(address_map &map) map(0xd804, 0xd804).portr("DSWB"); map(0xd800, 0xd800).w(FUNC(kncljoe_state::sound_cmd_w)); map(0xd801, 0xd801).w(FUNC(kncljoe_state::kncljoe_control_w)); - map(0xd802, 0xd802).w("sn1", FUNC(sn76489_device::command_w)); - map(0xd803, 0xd803).w("sn2", FUNC(sn76489_device::command_w)); + map(0xd802, 0xd802).w("sn1", FUNC(sn76489_device::write)); + map(0xd803, 0xd803).w("sn2", FUNC(sn76489_device::write)); map(0xd807, 0xd807).nopr(); /* unknown read */ map(0xd817, 0xd817).nopr(); /* unknown read */ map(0xe800, 0xefff).ram().share("spriteram"); diff --git a/src/mame/drivers/konblands.cpp b/src/mame/drivers/konblands.cpp index a50f23ca37e..693e9d80eb0 100644 --- a/src/mame/drivers/konblands.cpp +++ b/src/mame/drivers/konblands.cpp @@ -160,7 +160,7 @@ void konblands_state::konblands_map(address_map &map) map(0x1005, 0x1005).nopw(); // enable audio map(0x1006, 0x1006).w(FUNC(konblands_state::irq_enable_w)); map(0x1007, 0x1007).w(FUNC(konblands_state::firq_enable_w)); - map(0x1800, 0x1800).portr("INPUTS").w("sn", FUNC(sn76496_device::command_w)); + map(0x1800, 0x1800).portr("INPUTS").w("sn", FUNC(sn76496_device::write)); map(0x4000, 0x47ff).ram().share("vram"); map(0x4800, 0x4bff).ram(); map(0x5800, 0x5800).nopw(); // watchdog @@ -178,7 +178,7 @@ void konblands_state::konblandsh_map(address_map &map) map(0x0807, 0x0807).nopr().w(FUNC(konblands_state::firq_enable_w)); map(0x0c00, 0x0c00).portr("INPUTS"); map(0x1000, 0x1000).portr("DSW1"); - map(0x1400, 0x1400).w("sn", FUNC(sn76496_device::command_w)); + map(0x1400, 0x1400).w("sn", FUNC(sn76496_device::write)); map(0x1800, 0x1800).nopw(); // sn latch map(0x2000, 0x27ff).ram().share("vram"); map(0x2800, 0x2fff).ram(); diff --git a/src/mame/drivers/kontest.cpp b/src/mame/drivers/kontest.cpp index bc01ab4fe74..d3c8fc47410 100644 --- a/src/mame/drivers/kontest.cpp +++ b/src/mame/drivers/kontest.cpp @@ -179,8 +179,8 @@ void kontest_state::kontest_map(address_map &map) void kontest_state::kontest_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w("sn1", FUNC(sn76489a_device::command_w)); - map(0x04, 0x04).w("sn2", FUNC(sn76489a_device::command_w)); + map(0x00, 0x00).w("sn1", FUNC(sn76489a_device::write)); + map(0x04, 0x04).w("sn2", FUNC(sn76489a_device::write)); map(0x08, 0x08).w(FUNC(kontest_state::control_w)); map(0x0c, 0x0c).portr("IN0"); map(0x0d, 0x0d).portr("IN1"); diff --git a/src/mame/drivers/ladybug.cpp b/src/mame/drivers/ladybug.cpp index f97996b3580..55436fab490 100644 --- a/src/mame/drivers/ladybug.cpp +++ b/src/mame/drivers/ladybug.cpp @@ -122,8 +122,8 @@ void ladybug_state::ladybug_map(address_map &map) map(0x9002, 0x9002).portr("DSW0"); map(0x9003, 0x9003).portr("DSW1"); map(0xa000, 0xa007).w("videolatch", FUNC(ls259_device::write_d0)); - map(0xb000, 0xbfff).w("sn1", FUNC(sn76489_device::command_w)); - map(0xc000, 0xcfff).w("sn2", FUNC(sn76489_device::command_w)); + map(0xb000, 0xbfff).w("sn1", FUNC(sn76489_device::write)); + map(0xc000, 0xcfff).w("sn2", FUNC(sn76489_device::write)); map(0xd000, 0xd7ff).rw(m_video, FUNC(ladybug_video_device::bg_r), FUNC(ladybug_video_device::bg_w)); map(0xe000, 0xe000).portr("IN2"); } @@ -165,11 +165,11 @@ void sraider_state::sraider_cpu2_map(address_map &map) void sraider_state::sraider_cpu2_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w("sn1", FUNC(sn76489_device::command_w)); - map(0x08, 0x08).w("sn2", FUNC(sn76489_device::command_w)); - map(0x10, 0x10).w("sn3", FUNC(sn76489_device::command_w)); - map(0x18, 0x18).w("sn4", FUNC(sn76489_device::command_w)); - map(0x20, 0x20).w("sn5", FUNC(sn76489_device::command_w)); + map(0x00, 0x00).w("sn1", FUNC(sn76489_device::write)); + map(0x08, 0x08).w("sn2", FUNC(sn76489_device::write)); + map(0x10, 0x10).w("sn3", FUNC(sn76489_device::write)); + map(0x18, 0x18).w("sn4", FUNC(sn76489_device::write)); + map(0x20, 0x20).w("sn5", FUNC(sn76489_device::write)); map(0x28, 0x3f).w(FUNC(sraider_state::sraider_misc_w)); // lots unknown } diff --git a/src/mame/drivers/lucky74.cpp b/src/mame/drivers/lucky74.cpp index a7de3196370..eef05d50adb 100644 --- a/src/mame/drivers/lucky74.cpp +++ b/src/mame/drivers/lucky74.cpp @@ -937,11 +937,11 @@ void lucky74_state::lucky74_map(address_map &map) map(0xf000, 0xf003).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); // Input Ports 0 & 1 map(0xf080, 0xf083).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)); // DSW 1, 2 & 3 map(0xf0c0, 0xf0c3).rw("ppi8255_3", FUNC(i8255_device::read), FUNC(i8255_device::write)); // DSW 4 - map(0xf100, 0xf100).w("sn1", FUNC(sn76489_device::command_w)); // SN76489 #1 + map(0xf100, 0xf100).w("sn1", FUNC(sn76489_device::write)); // SN76489 #1 map(0xf200, 0xf203).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); // Input Ports 2 & 4 - map(0xf300, 0xf300).w("sn2", FUNC(sn76489_device::command_w)); // SN76489 #2 + map(0xf300, 0xf300).w("sn2", FUNC(sn76489_device::write)); // SN76489 #2 map(0xf400, 0xf400).w("aysnd", FUNC(ay8910_device::address_w)); // YM2149 control - map(0xf500, 0xf500).w("sn3", FUNC(sn76489_device::command_w)); // SN76489 #3 + map(0xf500, 0xf500).w("sn3", FUNC(sn76489_device::write)); // SN76489 #3 map(0xf600, 0xf600).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); // YM2149 (Input Port 1) map(0xf700, 0xf701).rw(FUNC(lucky74_state::usart_8251_r), FUNC(lucky74_state::usart_8251_w)); // USART 8251 port map(0xf800, 0xf803).rw(FUNC(lucky74_state::copro_sm7831_r), FUNC(lucky74_state::copro_sm7831_w)); // SM7831 Co-Processor diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp index ff7f9e4d43d..14104c55c04 100644 --- a/src/mame/drivers/m5.cpp +++ b/src/mame/drivers/m5.cpp @@ -720,7 +720,7 @@ void m5_state::m5_io(address_map &map) map(0x00, 0x03).mirror(0x0c).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x10, 0x10).mirror(0x0e).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); map(0x11, 0x11).mirror(0x0e).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); - map(0x20, 0x20).mirror(0x0f).w(SN76489AN_TAG, FUNC(sn76489a_device::command_w)); + map(0x20, 0x20).mirror(0x0f).w(SN76489AN_TAG, FUNC(sn76489a_device::write)); map(0x30, 0x30).mirror(0x08).portr("Y0").w(FUNC(m5_state::mem64KBF_w)); // 64KBF paging map(0x31, 0x31).mirror(0x08).portr("Y1"); map(0x32, 0x32).mirror(0x08).portr("Y2"); @@ -1042,7 +1042,7 @@ void brno_state::brno_io(address_map &map) map(0x00, 0x03).mirror(0x0c).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x10, 0x10).mirror(0x0e).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); map(0x11, 0x11).mirror(0x0e).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); - map(0x20, 0x20).mirror(0x0f).w(SN76489AN_TAG, FUNC(sn76489a_device::command_w)); + map(0x20, 0x20).mirror(0x0f).w(SN76489AN_TAG, FUNC(sn76489a_device::write)); map(0x30, 0x30).portr("Y0"); map(0x31, 0x31).portr("Y1"); map(0x32, 0x32).portr("Y2"); diff --git a/src/mame/drivers/markham.cpp b/src/mame/drivers/markham.cpp index bad9c21f7b1..29a4616c748 100644 --- a/src/mame/drivers/markham.cpp +++ b/src/mame/drivers/markham.cpp @@ -242,8 +242,8 @@ void markham_state::markham_slave_map(address_map &map) map(0x0000, 0x5fff).rom(); map(0x8000, 0x87ff).ram().share("share1"); - map(0xc000, 0xc000).w("sn1", FUNC(sn76496_device::command_w)); - map(0xc001, 0xc001).w("sn2", FUNC(sn76496_device::command_w)); + map(0xc000, 0xc000).w("sn1", FUNC(sn76496_device::write)); + map(0xc001, 0xc001).w("sn2", FUNC(sn76496_device::write)); map(0xc002, 0xc002).nopw(); /* unknown */ map(0xc003, 0xc003).nopw(); /* unknown */ @@ -255,8 +255,8 @@ void markham_state::strnskil_slave_map(address_map &map) map(0xc000, 0xc7ff).ram().share("spriteram"); map(0xc800, 0xcfff).ram().share("share1"); - map(0xd801, 0xd801).w("sn1", FUNC(sn76496_device::command_w)); - map(0xd802, 0xd802).w("sn2", FUNC(sn76496_device::command_w)); + map(0xd801, 0xd801).w("sn1", FUNC(sn76496_device::write)); + map(0xd802, 0xd802).w("sn2", FUNC(sn76496_device::write)); } /****************************************************************************/ diff --git a/src/mame/drivers/megaplay.cpp b/src/mame/drivers/megaplay.cpp index 75b49c8fef5..e53a4769262 100644 --- a/src/mame/drivers/megaplay.cpp +++ b/src/mame/drivers/megaplay.cpp @@ -617,7 +617,7 @@ READ8_MEMBER(mplay_state::vdp1_count_r) void mplay_state::megaplay_bios_io_map(address_map &map) { map.global_mask(0xff); - map(0x7f, 0x7f).w("sn2", FUNC(sn76496_device::command_w)); + map(0x7f, 0x7f).w("sn2", FUNC(sn76496_device::write)); map(0x40, 0x41).mirror(0x3e).r(FUNC(mplay_state::vdp1_count_r)); map(0x80, 0x80).mirror(0x3e).rw(m_vdp1, FUNC(sega315_5124_device::data_read), FUNC(sega315_5124_device::data_write)); diff --git a/src/mame/drivers/mikie.cpp b/src/mame/drivers/mikie.cpp index 3b8c548fdba..7f18b9c86cf 100644 --- a/src/mame/drivers/mikie.cpp +++ b/src/mame/drivers/mikie.cpp @@ -132,9 +132,9 @@ void mikie_state::sound_map(address_map &map) map(0x4000, 0x43ff).ram(); map(0x8000, 0x8000).nopw(); // sound command latch map(0x8001, 0x8001).nopw(); // ??? - map(0x8002, 0x8002).w("sn1", FUNC(sn76489a_device::command_w)); // trigger read of latch + map(0x8002, 0x8002).w("sn1", FUNC(sn76489a_device::write)); // trigger read of latch map(0x8003, 0x8003).r("soundlatch", FUNC(generic_latch_8_device::read)); - map(0x8004, 0x8004).w("sn2", FUNC(sn76489a_device::command_w)); // trigger read of latch + map(0x8004, 0x8004).w("sn2", FUNC(sn76489a_device::write)); // trigger read of latch map(0x8005, 0x8005).r(FUNC(mikie_state::mikie_sh_timer_r)); map(0x8079, 0x8079).nopw(); // ??? map(0xa003, 0xa003).nopw(); // ??? diff --git a/src/mame/drivers/mjkjidai.cpp b/src/mame/drivers/mjkjidai.cpp index 633b9124b42..d80bef0cb4d 100644 --- a/src/mame/drivers/mjkjidai.cpp +++ b/src/mame/drivers/mjkjidai.cpp @@ -94,8 +94,8 @@ void mjkjidai_state::mjkjidai_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x03).rw("ppi1", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x10, 0x13).rw("ppi2", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x20, 0x20).w("sn1", FUNC(sn76489_device::command_w)); - map(0x30, 0x30).w("sn2", FUNC(sn76489_device::command_w)); + map(0x20, 0x20).w("sn1", FUNC(sn76489_device::write)); + map(0x30, 0x30).w("sn2", FUNC(sn76489_device::write)); map(0x40, 0x40).w(FUNC(mjkjidai_state::adpcm_w)); } diff --git a/src/mame/drivers/mrdo.cpp b/src/mame/drivers/mrdo.cpp index 679bccc5686..90744563f71 100644 --- a/src/mame/drivers/mrdo.cpp +++ b/src/mame/drivers/mrdo.cpp @@ -57,8 +57,8 @@ void mrdo_state::main_map(address_map &map) map(0x8800, 0x8fff).ram().w(FUNC(mrdo_state::mrdo_fgvideoram_w)).share("fgvideoram"); map(0x9000, 0x90ff).writeonly().share("spriteram"); map(0x9800, 0x9800).w(FUNC(mrdo_state::mrdo_flipscreen_w)); /* screen flip + playfield priority */ - map(0x9801, 0x9801).w("u8106_1", FUNC(u8106_device::command_w)); - map(0x9802, 0x9802).w("u8106_2", FUNC(u8106_device::command_w)); + map(0x9801, 0x9801).w("u8106_1", FUNC(u8106_device::write)); + map(0x9802, 0x9802).w("u8106_2", FUNC(u8106_device::write)); map(0x9803, 0x9803).r(FUNC(mrdo_state::mrdo_SECRE_r)); map(0xa000, 0xa000).portr("P1"); map(0xa001, 0xa001).portr("P2"); diff --git a/src/mame/drivers/mrjong.cpp b/src/mame/drivers/mrjong.cpp index f0cafad98c4..6f89035cbb5 100644 --- a/src/mame/drivers/mrjong.cpp +++ b/src/mame/drivers/mrjong.cpp @@ -85,8 +85,8 @@ void mrjong_state::mrjong_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).portr("P2").w(FUNC(mrjong_state::mrjong_flipscreen_w)); - map(0x01, 0x01).portr("P1").w("sn1", FUNC(sn76489_device::command_w)); - map(0x02, 0x02).portr("DSW").w("sn2", FUNC(sn76489_device::command_w)); + map(0x01, 0x01).portr("P1").w("sn1", FUNC(sn76489_device::write)); + map(0x02, 0x02).portr("DSW").w("sn2", FUNC(sn76489_device::write)); map(0x03, 0x03).r(FUNC(mrjong_state::io_0x03_r)); // Unknown } diff --git a/src/mame/drivers/mz700.cpp b/src/mame/drivers/mz700.cpp index 64432f2eb67..e6d8b86ebea 100644 --- a/src/mame/drivers/mz700.cpp +++ b/src/mame/drivers/mz700.cpp @@ -189,7 +189,7 @@ void mz_state::mz800_io(address_map &map) map(0xeb, 0xeb).w(FUNC(mz_state::mz800_ramaddr_w)); map(0xf0, 0xf0).portr("atari_joy1").w(FUNC(mz_state::mz800_palette_w)); map(0xf1, 0xf1).portr("atari_joy2"); - map(0xf2, 0xf2).w("sn76489n", FUNC(sn76489_device::command_w)); + map(0xf2, 0xf2).w("sn76489n", FUNC(sn76489_device::write)); map(0xfc, 0xff).rw("z80pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write)); } diff --git a/src/mame/drivers/pachifev.cpp b/src/mame/drivers/pachifev.cpp index f7b20e58ede..1f52f99fadb 100644 --- a/src/mame/drivers/pachifev.cpp +++ b/src/mame/drivers/pachifev.cpp @@ -157,8 +157,8 @@ void pachifev_state::pachifev_map(address_map &map) map(0xff08, 0xff08).portr("DSW3"); map(0xff10, 0xff10).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); map(0xff12, 0xff12).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); - map(0xff20, 0xff20).w("y2404_1", FUNC(y2404_device::command_w)); - map(0xff30, 0xff30).w("y2404_2", FUNC(y2404_device::command_w)); + map(0xff20, 0xff20).w("y2404_1", FUNC(y2404_device::write)); + map(0xff30, 0xff30).w("y2404_2", FUNC(y2404_device::write)); map(0xff40, 0xff40).w(FUNC(pachifev_state::controls_w)); map(0xff50, 0xff50).nopw(); /* unknown */ map(0xfffa, 0xfffb).noprw(); /* decrementer */ diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp index 2d04b3bc995..2cacbc19b70 100644 --- a/src/mame/drivers/pacman.cpp +++ b/src/mame/drivers/pacman.cpp @@ -1376,8 +1376,8 @@ void pacman_state::writeport(address_map &map) void pacman_state::vanvan_portmap(address_map &map) { map.global_mask(0xff); - map(0x01, 0x01).w("sn1", FUNC(sn76496_device::command_w)); - map(0x02, 0x02).w("sn2", FUNC(sn76496_device::command_w)); + map(0x01, 0x01).w("sn1", FUNC(sn76496_device::write)); + map(0x02, 0x02).w("sn2", FUNC(sn76496_device::write)); } void pacman_state::dremshpr_portmap(address_map &map) @@ -1417,7 +1417,7 @@ void pacman_state::bigbucks_portmap(address_map &map) void pacman_state::s2650games_dataport(address_map &map) { - map(S2650_DATA_PORT, S2650_DATA_PORT).w("sn1", FUNC(sn76496_device::command_w)); + map(S2650_DATA_PORT, S2650_DATA_PORT).w("sn1", FUNC(sn76496_device::write)); } void pacman_state::drivfrcp_portmap(address_map &map) diff --git a/src/mame/drivers/pencil2.cpp b/src/mame/drivers/pencil2.cpp index 4ee4a601c5e..707dc60e183 100644 --- a/src/mame/drivers/pencil2.cpp +++ b/src/mame/drivers/pencil2.cpp @@ -152,7 +152,7 @@ void pencil2_state::io_map(address_map &map) map(0xa0, 0xa0).mirror(0x1e).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); map(0xa1, 0xa1).mirror(0x1e).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); map(0xc0, 0xdf).w(FUNC(pencil2_state::portc0_w)); - map(0xe0, 0xff).w("sn76489a", FUNC(sn76489a_device::command_w)); + map(0xe0, 0xff).w("sn76489a", FUNC(sn76489a_device::write)); map(0xe0, 0xe0).portr("E0"); map(0xe1, 0xe1).portr("E1"); map(0xe2, 0xe2).r(FUNC(pencil2_state::porte2_r)); diff --git a/src/mame/drivers/pingpong.cpp b/src/mame/drivers/pingpong.cpp index dc96c3bb143..8530e42128a 100644 --- a/src/mame/drivers/pingpong.cpp +++ b/src/mame/drivers/pingpong.cpp @@ -103,7 +103,7 @@ void pingpong_state::pingpong_map(address_map &map) map(0xa980, 0xa980).portr("DSW2"); map(0xa000, 0xa000).w(FUNC(pingpong_state::coin_w)); /* coin counters + irq enables */ map(0xa200, 0xa200).nopw(); /* SN76496 data latch */ - map(0xa400, 0xa400).w("snsnd", FUNC(sn76496_device::command_w)); /* trigger read */ + map(0xa400, 0xa400).w("snsnd", FUNC(sn76496_device::write)); /* trigger read */ map(0xa600, 0xa600).w("watchdog", FUNC(watchdog_timer_device::reset_w)); } @@ -125,7 +125,7 @@ void pingpong_state::merlinmm_map(address_map &map) map(0xa100, 0xa100).portr("IN2"); map(0xa180, 0xa180).portr("IN3"); map(0xa200, 0xa200).nopw(); /* SN76496 data latch */ - map(0xa400, 0xa400).w("snsnd", FUNC(sn76496_device::command_w)); /* trigger read */ + map(0xa400, 0xa400).w("snsnd", FUNC(sn76496_device::write)); /* trigger read */ map(0xa600, 0xa600).w("watchdog", FUNC(watchdog_timer_device::reset_w)); } diff --git a/src/mame/drivers/pv2000.cpp b/src/mame/drivers/pv2000.cpp index 5931f3facd9..ed0fc76a738 100644 --- a/src/mame/drivers/pv2000.cpp +++ b/src/mame/drivers/pv2000.cpp @@ -205,7 +205,7 @@ void pv2000_state::pv2000_io_map(address_map &map) map(0x20, 0x20).rw(FUNC(pv2000_state::keys_lo_r), FUNC(pv2000_state::keys_w)); //sn76489a - map(0x40, 0x40).r(FUNC(pv2000_state::keys_mod_r)).w("sn76489a", FUNC(sn76489a_device::command_w)); + map(0x40, 0x40).r(FUNC(pv2000_state::keys_mod_r)).w("sn76489a", FUNC(sn76489a_device::write)); /* Cassette input. Gets hit a lot after a GLOAD command */ map(0x60, 0x60).rw(FUNC(pv2000_state::cass_in), FUNC(pv2000_state::cass_out)); diff --git a/src/mame/drivers/rc759.cpp b/src/mame/drivers/rc759.cpp index 85161519be8..e5db39cbf0a 100644 --- a/src/mame/drivers/rc759.cpp +++ b/src/mame/drivers/rc759.cpp @@ -482,7 +482,7 @@ void rc759_state::rc759_io(address_map &map) map(0x000, 0x003).mirror(0x0c).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); map(0x020, 0x020).r(FUNC(rc759_state::keyboard_r)); map(0x056, 0x057).noprw(); // in reality, access to sound and rtc is a bit more involved - map(0x05a, 0x05a).w(m_snd, FUNC(sn76489a_device::command_w)); + map(0x05a, 0x05a).w(m_snd, FUNC(sn76489a_device::write)); map(0x05c, 0x05c).rw(FUNC(rc759_state::rtc_r), FUNC(rc759_state::rtc_w)); // AM_RANGE(0x060, 0x06f) AM_WRITE8(crt_control_w, 0x00ff) map(0x070, 0x077).mirror(0x08).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); diff --git a/src/mame/drivers/retofinv.cpp b/src/mame/drivers/retofinv.cpp index a6736534b00..1a4bb7374be 100644 --- a/src/mame/drivers/retofinv.cpp +++ b/src/mame/drivers/retofinv.cpp @@ -220,8 +220,8 @@ void retofinv_state::sound_map(address_map &map) map(0x2000, 0x27ff).ram(); /* 6116 sram at IC28 */ map(0x4000, 0x4000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x6000, 0x6000).w(FUNC(retofinv_state::cpu2_m6000_w)); - map(0x8000, 0x8000).w("sn1", FUNC(sn76489a_device::command_w)); - map(0xa000, 0xa000).w("sn2", FUNC(sn76489a_device::command_w)); + map(0x8000, 0x8000).w("sn1", FUNC(sn76489a_device::write)); + map(0xa000, 0xa000).w("sn2", FUNC(sn76489a_device::write)); map(0xe000, 0xffff).rom(); /* space for diagnostic ROM */ } diff --git a/src/mame/drivers/rx78.cpp b/src/mame/drivers/rx78.cpp index 4050d85d618..7b2bc35d161 100644 --- a/src/mame/drivers/rx78.cpp +++ b/src/mame/drivers/rx78.cpp @@ -298,7 +298,7 @@ void rx78_state::rx78_io(address_map &map) map(0xf5, 0xfb).w(FUNC(rx78_state::vdp_reg_w)); //vdp map(0xfc, 0xfc).w(FUNC(rx78_state::vdp_bg_reg_w)); //vdp map(0xfe, 0xfe).w(FUNC(rx78_state::vdp_pri_mask_w)); - map(0xff, 0xff).w("sn1", FUNC(sn76489a_device::command_w)); //psg + map(0xff, 0xff).w("sn1", FUNC(sn76489a_device::write)); //psg } /* Input ports */ diff --git a/src/mame/drivers/sbugger.cpp b/src/mame/drivers/sbugger.cpp index 377222f1d9e..353193fc1bb 100644 --- a/src/mame/drivers/sbugger.cpp +++ b/src/mame/drivers/sbugger.cpp @@ -123,8 +123,8 @@ void sbugger_state::sbugger_map(address_map &map) void sbugger_state::sbugger_io_map(address_map &map) { map(0xe0, 0xe7).rw("i8156", FUNC(i8155_device::io_r), FUNC(i8155_device::io_w)); - map(0xe8, 0xe8).w("sn76489.1", FUNC(sn76489_device::command_w)); - map(0xe9, 0xe9).w("sn76489.2", FUNC(sn76489_device::command_w)); + map(0xe8, 0xe8).w("sn76489.1", FUNC(sn76489_device::write)); + map(0xe9, 0xe9).w("sn76489.2", FUNC(sn76489_device::write)); } diff --git a/src/mame/drivers/segae.cpp b/src/mame/drivers/segae.cpp index afa016e5a39..f095ea93609 100644 --- a/src/mame/drivers/segae.cpp +++ b/src/mame/drivers/segae.cpp @@ -411,8 +411,8 @@ void systeme_state::io_map(address_map &map) { map.global_mask(0xff); - map(0x7b, 0x7b).w("sn1", FUNC(segapsg_device::command_w)); - map(0x7e, 0x7f).w("sn2", FUNC(segapsg_device::command_w)); + map(0x7b, 0x7b).w("sn1", FUNC(segapsg_device::write)); + map(0x7e, 0x7f).w("sn2", FUNC(segapsg_device::write)); map(0x7e, 0x7e).r(m_vdp1, FUNC(sega315_5124_device::vcount_read)); map(0xba, 0xba).rw(m_vdp1, FUNC(sega315_5124_device::data_read), FUNC(sega315_5124_device::data_write)); map(0xbb, 0xbb).rw(m_vdp1, FUNC(sega315_5124_device::control_read), FUNC(sega315_5124_device::control_write)); diff --git a/src/mame/drivers/senjyo.cpp b/src/mame/drivers/senjyo.cpp index 91184fa8cca..fd7f171019a 100644 --- a/src/mame/drivers/senjyo.cpp +++ b/src/mame/drivers/senjyo.cpp @@ -166,9 +166,9 @@ void senjyo_state::senjyo_sound_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x4000, 0x43ff).ram(); - map(0x8000, 0x8000).w("sn1", FUNC(sn76496_device::command_w)); - map(0x9000, 0x9000).w("sn2", FUNC(sn76496_device::command_w)); - map(0xa000, 0xa000).w("sn3", FUNC(sn76496_device::command_w)); + map(0x8000, 0x8000).w("sn1", FUNC(sn76496_device::write)); + map(0x9000, 0x9000).w("sn2", FUNC(sn76496_device::write)); + map(0xa000, 0xa000).w("sn3", FUNC(sn76496_device::write)); map(0xd000, 0xd000).w(FUNC(senjyo_state::volume_w)); } @@ -231,9 +231,9 @@ void senjyo_state::starforb_sound_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x4000, 0x43ff).ram(); - map(0x8000, 0x8000).w("sn1", FUNC(sn76496_device::command_w)); - map(0x9000, 0x9000).w("sn2", FUNC(sn76496_device::command_w)); - map(0xa000, 0xa000).w("sn3", FUNC(sn76496_device::command_w)); + map(0x8000, 0x8000).w("sn1", FUNC(sn76496_device::write)); + map(0x9000, 0x9000).w("sn2", FUNC(sn76496_device::write)); + map(0xa000, 0xa000).w("sn3", FUNC(sn76496_device::write)); map(0xd000, 0xd000).w(FUNC(senjyo_state::volume_w)); map(0xf000, 0xffff).ram(); } diff --git a/src/mame/drivers/sg1000.cpp b/src/mame/drivers/sg1000.cpp index 70787c95f75..5a9b1cc3f4f 100644 --- a/src/mame/drivers/sg1000.cpp +++ b/src/mame/drivers/sg1000.cpp @@ -136,7 +136,7 @@ void sg1000_state::sg1000_map(address_map &map) void sg1000_state::sg1000_io_map(address_map &map) { map.global_mask(0xff); - map(0x40, 0x40).mirror(0x3f).w(SN76489AN_TAG, FUNC(sn76489a_device::command_w)); + map(0x40, 0x40).mirror(0x3f).w(SN76489AN_TAG, FUNC(sn76489a_device::write)); map(0x80, 0x80).mirror(0x3e).rw(TMS9918A_TAG, FUNC(tms9918a_device::vram_r), FUNC(tms9918a_device::vram_w)); map(0x81, 0x81).mirror(0x3e).rw(TMS9918A_TAG, FUNC(tms9918a_device::register_r), FUNC(tms9918a_device::register_w)); map(0xdc, 0xdf).rw(FUNC(sg1000_state::peripheral_r), FUNC(sg1000_state::peripheral_w)); @@ -159,7 +159,7 @@ void sg1000_state::omv_map(address_map &map) void sg1000_state::omv_io_map(address_map &map) { map.global_mask(0xff); - map(0x40, 0x40).mirror(0x3f).w(SN76489AN_TAG, FUNC(sn76489a_device::command_w)); + map(0x40, 0x40).mirror(0x3f).w(SN76489AN_TAG, FUNC(sn76489a_device::write)); map(0x80, 0x80).mirror(0x3e).rw(TMS9918A_TAG, FUNC(tms9918a_device::vram_r), FUNC(tms9918a_device::vram_w)); map(0x81, 0x81).mirror(0x3e).rw(TMS9918A_TAG, FUNC(tms9918a_device::register_r), FUNC(tms9918a_device::register_w)); map(0xc0, 0xc0).mirror(0x38).portr("C0"); @@ -188,7 +188,7 @@ void sg1000_state::sc3000_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0xff).rw(CARTSLOT_TAG, FUNC(sega8_cart_slot_device::read_io), FUNC(sega8_cart_slot_device::write_io)); - map(0x7f, 0x7f).w(SN76489AN_TAG, FUNC(sn76489a_device::command_w)); + map(0x7f, 0x7f).w(SN76489AN_TAG, FUNC(sn76489a_device::write)); map(0xbe, 0xbe).rw(TMS9918A_TAG, FUNC(tms9918a_device::vram_r), FUNC(tms9918a_device::vram_w)); map(0xbf, 0xbf).rw(TMS9918A_TAG, FUNC(tms9918a_device::register_r), FUNC(tms9918a_device::register_w)); map(0xdc, 0xdf).rw(FUNC(sg1000_state::peripheral_r), FUNC(sg1000_state::peripheral_w)); @@ -199,7 +199,7 @@ void sg1000_state::sc3000_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).mirror(0xdf).rw(UPD9255_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x00, 0x00).mirror(0x7f).w(SN76489AN_TAG, FUNC(sn76489a_device::command_w)); + map(0x00, 0x00).mirror(0x7f).w(SN76489AN_TAG, FUNC(sn76489a_device::write)); map(0x00, 0x00).mirror(0xae).rw(TMS9918A_TAG, FUNC(tms9918a_device::vram_r), FUNC(tms9918a_device::vram_w)); map(0x01, 0x01).mirror(0xae).rw(TMS9918A_TAG, FUNC(tms9918a_device::register_r), FUNC(tms9918a_device::register_w)); map(0x60, 0x60).mirror(0x9f).r(FUNC(sg1000_state::sc3000_r_r)); @@ -223,7 +223,7 @@ void sf7000_state::sf7000_map(address_map &map) void sf7000_state::sf7000_io_map(address_map &map) { map.global_mask(0xff); - map(0x7f, 0x7f).w(SN76489AN_TAG, FUNC(sn76489a_device::command_w)); + map(0x7f, 0x7f).w(SN76489AN_TAG, FUNC(sn76489a_device::write)); map(0xbe, 0xbe).rw(TMS9918A_TAG, FUNC(tms9918a_device::vram_r), FUNC(tms9918a_device::vram_w)); map(0xbf, 0xbf).rw(TMS9918A_TAG, FUNC(tms9918a_device::register_r), FUNC(tms9918a_device::register_w)); map(0xdc, 0xdf).rw(FUNC(sf7000_state::peripheral_r), FUNC(sf7000_state::peripheral_w)); diff --git a/src/mame/drivers/sg1000a.cpp b/src/mame/drivers/sg1000a.cpp index 0bd5a5cbcd1..c0f2279c39d 100644 --- a/src/mame/drivers/sg1000a.cpp +++ b/src/mame/drivers/sg1000a.cpp @@ -324,7 +324,7 @@ void sg1000a_state::decrypted_opcodes_map(address_map &map) void sg1000a_state::io_map(address_map &map) { map.global_mask(0xff); - map(0x7f, 0x7f).w("snsnd", FUNC(sn76489a_device::command_w)); + map(0x7f, 0x7f).w("snsnd", FUNC(sn76489a_device::write)); map(0xbe, 0xbe).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); map(0xbf, 0xbf).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); map(0xdc, 0xdf).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); @@ -333,7 +333,7 @@ void sg1000a_state::io_map(address_map &map) void sg1000a_state::sderby_io_map(address_map &map) { map.global_mask(0xff); - map(0x40, 0x40).mirror(0x3f).w("snsnd", FUNC(sn76489a_device::command_w)); + map(0x40, 0x40).mirror(0x3f).w("snsnd", FUNC(sn76489a_device::write)); map(0x80, 0x80).mirror(0x3e).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); map(0x81, 0x81).mirror(0x3e).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); // map(0xc0, 0xc1).mirror(0x06) NEC D8251AC UART diff --git a/src/mame/drivers/shaolins.cpp b/src/mame/drivers/shaolins.cpp index 28fd15264ca..a27c0159396 100644 --- a/src/mame/drivers/shaolins.cpp +++ b/src/mame/drivers/shaolins.cpp @@ -37,8 +37,8 @@ void shaolins_state::shaolins_map(address_map &map) map(0x0000, 0x0000).w(FUNC(shaolins_state::nmi_w)); /* bit 0 = flip screen, bit 1 = nmi enable, bit 2 = ? */ /* bit 3, bit 4 = coin counters */ map(0x0100, 0x0100).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x0300, 0x0300).w("sn1", FUNC(sn76489a_device::command_w)); /* trigger chip to read from latch. The program always */ - map(0x0400, 0x0400).w("sn2", FUNC(sn76489a_device::command_w)); /* writes the same number as the latch, so we don't */ + map(0x0300, 0x0300).w("sn1", FUNC(sn76489a_device::write)); /* trigger chip to read from latch. The program always */ + map(0x0400, 0x0400).w("sn2", FUNC(sn76489a_device::write)); /* writes the same number as the latch, so we don't */ /* bother emulating them. */ map(0x0500, 0x0500).portr("DSW1"); map(0x0600, 0x0600).portr("DSW2"); diff --git a/src/mame/drivers/smc777.cpp b/src/mame/drivers/smc777.cpp index dbd845f2c13..d8716355230 100644 --- a/src/mame/drivers/smc777.cpp +++ b/src/mame/drivers/smc777.cpp @@ -755,7 +755,7 @@ void smc777_state::smc777_io(address_map &map) // TODO: address bit 8 selects joy port 2 map(0x51, 0x51).mirror(0xff00).portr("JOY_1P").w(FUNC(smc777_state::color_mode_w)); map(0x52, 0x52).select(0xff00).w(FUNC(smc777_state::ramdac_w)); - map(0x53, 0x53).mirror(0xff00).w("sn1", FUNC(sn76489a_device::command_w)); + map(0x53, 0x53).mirror(0xff00).w("sn1", FUNC(sn76489a_device::write)); // map(0x54, 0x59) vrt controller // map(0x5a, 0x5b) ram banking // map(0x70, 0x70) auto-start ROM (ext-ROM) diff --git a/src/mame/drivers/sprcros2.cpp b/src/mame/drivers/sprcros2.cpp index 87291d6bdbf..ff1f2af6527 100644 --- a/src/mame/drivers/sprcros2.cpp +++ b/src/mame/drivers/sprcros2.cpp @@ -260,9 +260,9 @@ void sprcros2_state::master_map(address_map &map) void sprcros2_state::master_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("P1").w("sn1", FUNC(sn76489_device::command_w)); - map(0x01, 0x01).portr("P2").w("sn2", FUNC(sn76489_device::command_w)); - map(0x02, 0x02).portr("EXTRA").w("sn3", FUNC(sn76489_device::command_w)); + map(0x00, 0x00).portr("P1").w("sn1", FUNC(sn76489_device::write)); + map(0x01, 0x01).portr("P2").w("sn2", FUNC(sn76489_device::write)); + map(0x02, 0x02).portr("EXTRA").w("sn3", FUNC(sn76489_device::write)); map(0x04, 0x04).portr("DSW1"); map(0x05, 0x05).portr("DSW2"); map(0x07, 0x07).w(FUNC(sprcros2_state::master_output_w)); diff --git a/src/mame/drivers/superdq.cpp b/src/mame/drivers/superdq.cpp index 46fa1572638..8179867cb92 100644 --- a/src/mame/drivers/superdq.cpp +++ b/src/mame/drivers/superdq.cpp @@ -228,7 +228,7 @@ void superdq_state::superdq_io(address_map &map) map(0x01, 0x01).portr("IN1"); map(0x02, 0x02).portr("DSW1"); map(0x03, 0x03).portr("DSW2"); - map(0x04, 0x04).r(FUNC(superdq_state::superdq_ld_r)).w("snsnd", FUNC(sn76496_device::command_w)); + map(0x04, 0x04).r(FUNC(superdq_state::superdq_ld_r)).w("snsnd", FUNC(sn76496_device::write)); map(0x08, 0x08).w(FUNC(superdq_state::superdq_io_w)); map(0x0c, 0x0d).noprw(); /* HD46505S */ } diff --git a/src/mame/drivers/suprloco.cpp b/src/mame/drivers/suprloco.cpp index 9d0428c4996..46c0fec438d 100644 --- a/src/mame/drivers/suprloco.cpp +++ b/src/mame/drivers/suprloco.cpp @@ -58,8 +58,8 @@ void suprloco_state::sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0xa000, 0xa003).w("sn1", FUNC(sn76496_device::command_w)); - map(0xc000, 0xc003).w("sn2", FUNC(sn76496_device::command_w)); + map(0xa000, 0xa003).w("sn1", FUNC(sn76496_device::write)); + map(0xc000, 0xc003).w("sn2", FUNC(sn76496_device::write)); map(0xe000, 0xe000).r("ppi", FUNC(i8255_device::acka_r)); } diff --git a/src/mame/drivers/system1.cpp b/src/mame/drivers/system1.cpp index 24593c4a3e8..f5deda2c5f1 100644 --- a/src/mame/drivers/system1.cpp +++ b/src/mame/drivers/system1.cpp @@ -835,8 +835,8 @@ void system1_state::sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).mirror(0x1800).ram(); - map(0xa000, 0xa000).mirror(0x1fff).w("sn1", FUNC(sn76489a_device::command_w)); - map(0xc000, 0xc000).mirror(0x1fff).w("sn2", FUNC(sn76489a_device::command_w)); + map(0xa000, 0xa000).mirror(0x1fff).w("sn1", FUNC(sn76489a_device::write)); + map(0xc000, 0xc000).mirror(0x1fff).w("sn2", FUNC(sn76489a_device::write)); map(0xe000, 0xe000).mirror(0x1fff).r(FUNC(system1_state::sound_data_r)); } diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp index be210fffd31..64d5983bb4e 100644 --- a/src/mame/drivers/tandy1t.cpp +++ b/src/mame/drivers/tandy1t.cpp @@ -573,7 +573,7 @@ void tandy1000_state::tandy1000_io(address_map &map) map(0x0000, 0x00ff).m(m_mb, FUNC(t1000_mb_device::map)); map(0x0060, 0x0063).rw(FUNC(tandy1000_state::tandy1000_pio_r), FUNC(tandy1000_state::tandy1000_pio_w)); map(0x00a0, 0x00a0).w(FUNC(tandy1000_state::nmi_vram_bank_w)); - map(0x00c0, 0x00c0).w("sn76496", FUNC(ncr8496_device::command_w)); + map(0x00c0, 0x00c0).w("sn76496", FUNC(ncr8496_device::write)); map(0x0200, 0x0207).rw("pc_joy", FUNC(pc_joy_device::joy_port_r), FUNC(pc_joy_device::joy_port_w)); map(0x0378, 0x037f).rw(FUNC(tandy1000_state::pc_t1t_p37x_r), FUNC(tandy1000_state::pc_t1t_p37x_w)); map(0x03d0, 0x03df).r(m_video, FUNC(pcvideo_t1000_device::read)).w(m_video, FUNC(pcvideo_t1000_device::write)); @@ -600,7 +600,7 @@ void tandy1000_state::tandy1000_16_io(address_map &map) map(0x0060, 0x0063).rw(FUNC(tandy1000_state::tandy1000_pio_r), FUNC(tandy1000_state::tandy1000_pio_w)); map(0x0065, 0x0065).w(FUNC(tandy1000_state::devctrl_w)); map(0x00a0, 0x00a0).r(FUNC(tandy1000_state::unk_r)); - map(0x00c0, 0x00c1).w("sn76496", FUNC(ncr8496_device::command_w)); + map(0x00c0, 0x00c1).w("sn76496", FUNC(ncr8496_device::write)); map(0x0200, 0x0207).rw("pc_joy", FUNC(pc_joy_device::joy_port_r), FUNC(pc_joy_device::joy_port_w)); map(0x0378, 0x037f).rw(FUNC(tandy1000_state::pc_t1t_p37x_r), FUNC(tandy1000_state::pc_t1t_p37x_w)); map(0x03d0, 0x03df).r(m_video, FUNC(pcvideo_t1000_device::read)).w(m_video, FUNC(pcvideo_t1000_device::write)); diff --git a/src/mame/drivers/tek440x.cpp b/src/mame/drivers/tek440x.cpp index 82ae82e2174..4c71fc1b4a3 100644 --- a/src/mame/drivers/tek440x.cpp +++ b/src/mame/drivers/tek440x.cpp @@ -159,7 +159,7 @@ void tek440x_state::maincpu_map(address_map &map) map(0x780000, 0x781fff).ram(); // map registers // 782000-783fff: video address registers // 784000-785fff: video control registers - map(0x788000, 0x788000).w("snsnd", FUNC(sn76496_device::command_w)); + map(0x788000, 0x788000).w("snsnd", FUNC(sn76496_device::write)); // 78a000-78bfff: NS32081 FPU map(0x78c000, 0x78c007).rw("aica", FUNC(mos6551_device::read), FUNC(mos6551_device::write)).umask16(0xff00); // 7b1000-7b2fff: diagnostic registers diff --git a/src/mame/drivers/tp84.cpp b/src/mame/drivers/tp84.cpp index aa14a87c65f..fe252e1fcf3 100644 --- a/src/mame/drivers/tp84.cpp +++ b/src/mame/drivers/tp84.cpp @@ -242,9 +242,9 @@ void tp84_state::audio_map(address_map &map) map(0x8000, 0x8000).r(FUNC(tp84_state::tp84_sh_timer_r)); map(0xa000, 0xa1ff).w(FUNC(tp84_state::tp84_filter_w)); map(0xc000, 0xc000).nopw(); - map(0xc001, 0xc001).w("y2404_1", FUNC(y2404_device::command_w)); - map(0xc003, 0xc003).w("y2404_2", FUNC(y2404_device::command_w)); - map(0xc004, 0xc004).w("y2404_3", FUNC(y2404_device::command_w)); + map(0xc001, 0xc001).w("y2404_1", FUNC(y2404_device::write)); + map(0xc003, 0xc003).w("y2404_2", FUNC(y2404_device::write)); + map(0xc004, 0xc004).w("y2404_3", FUNC(y2404_device::write)); } diff --git a/src/mame/drivers/tutor.cpp b/src/mame/drivers/tutor.cpp index bb7d1e5c27f..e17d19012b8 100644 --- a/src/mame/drivers/tutor.cpp +++ b/src/mame/drivers/tutor.cpp @@ -562,7 +562,7 @@ void tutor_state::tutor_memmap(address_map &map) map(0xe000, 0xe000).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); /*VDP data*/ map(0xe002, 0xe002).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w));/*VDP status*/ map(0xe100, 0xe1ff).rw(FUNC(tutor_state::tutor_mapper_r), FUNC(tutor_state::tutor_mapper_w)); /*cartridge mapper*/ - map(0xe200, 0xe200).w("sn76489a", FUNC(sn76489a_device::command_w)); /*sound chip*/ + map(0xe200, 0xe200).w("sn76489a", FUNC(sn76489a_device::write)); /*sound chip*/ map(0xe800, 0xe8ff).rw(FUNC(tutor_state::tutor_printer_r), FUNC(tutor_state::tutor_printer_w)); /*printer*/ map(0xee00, 0xeeff).nopr().w(FUNC(tutor_state::tutor_cassette_w)); /*cassette interface*/ @@ -579,7 +579,7 @@ void tutor_state::pyuutajr_mem(address_map &map) map(0xe000, 0xe000).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); /*VDP data*/ map(0xe002, 0xe002).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w));/*VDP status*/ map(0xe100, 0xe1ff).rw(FUNC(tutor_state::tutor_mapper_r), FUNC(tutor_state::tutor_mapper_w)); /*cartridge mapper*/ - map(0xe200, 0xe200).w("sn76489a", FUNC(sn76489a_device::command_w)); /*sound chip*/ + map(0xe200, 0xe200).w("sn76489a", FUNC(sn76489a_device::write)); /*sound chip*/ map(0xe800, 0xe800).portr("LINE0"); map(0xea00, 0xea00).portr("LINE1"); map(0xec00, 0xec00).portr("LINE2"); diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp index f508799a46f..83eaca695a2 100644 --- a/src/mame/drivers/vgmplay.cpp +++ b/src/mame/drivers/vgmplay.cpp @@ -3152,9 +3152,9 @@ void vgmplay_state::file_map(address_map &map) void vgmplay_state::soundchips_map(address_map &map) { map(vgmplay_device::REG_SIZE, vgmplay_device::REG_SIZE + 3).r(FUNC(vgmplay_state::file_size_r)); - map(vgmplay_device::A_SN76489_0 + 0, vgmplay_device::A_SN76489_0 + 0).w(m_sn76489[0], FUNC(sn76489_device::command_w)); + map(vgmplay_device::A_SN76489_0 + 0, vgmplay_device::A_SN76489_0 + 0).w(m_sn76489[0], FUNC(sn76489_device::write)); //map(vgmplay_device::A_SN76489_0 + 1, vgmplay_device::A_SN76489_0 + 1).w(m_sn76489[0], FUNC(sn76489_device::stereo_w)); // TODO: GG stereo - map(vgmplay_device::A_SN76489_1 + 0, vgmplay_device::A_SN76489_1 + 0).w(m_sn76489[1], FUNC(sn76489_device::command_w)); + map(vgmplay_device::A_SN76489_1 + 0, vgmplay_device::A_SN76489_1 + 0).w(m_sn76489[1], FUNC(sn76489_device::write)); //map(vgmplay_device::A_SN76489_1 + 1, vgmplay_device::A_SN76489_1 + 1).w(m_sn76489[1], FUNC(sn76489_device::stereo_w)); // TODO: GG stereo map(vgmplay_device::A_YM2413_0, vgmplay_device::A_YM2413_0 + 1).w(m_ym2413[0], FUNC(ym2413_device::write)); map(vgmplay_device::A_YM2413_1, vgmplay_device::A_YM2413_1 + 1).w(m_ym2413[1], FUNC(ym2413_device::write)); diff --git a/src/mame/drivers/vsnes.cpp b/src/mame/drivers/vsnes.cpp index d935b964e59..618e9df385a 100644 --- a/src/mame/drivers/vsnes.cpp +++ b/src/mame/drivers/vsnes.cpp @@ -276,9 +276,9 @@ void vsnes_state::vsnes_bootleg_z80_map(address_map &map) map(0x6001, 0x6001).r(FUNC(vsnes_state::vsnes_bootleg_z80_address_r)); // ^ - map(0x60FA, 0x60FA).w("sn1", FUNC(sn76489_device::command_w)); - map(0x60F9, 0x60F9).w("sn2", FUNC(sn76489_device::command_w)); - map(0x60FF, 0x60FF).w("sn3", FUNC(sn76489_device::command_w)); + map(0x60FA, 0x60FA).w("sn1", FUNC(sn76489_device::write)); + map(0x60F9, 0x60F9).w("sn2", FUNC(sn76489_device::write)); + map(0x60FF, 0x60FF).w("sn3", FUNC(sn76489_device::write)); } diff --git a/src/mame/drivers/wico.cpp b/src/mame/drivers/wico.cpp index a3db68312a7..5a0c1d248cb 100644 --- a/src/mame/drivers/wico.cpp +++ b/src/mame/drivers/wico.cpp @@ -102,7 +102,7 @@ void wico_state::hcpu_map(address_map &map) map(0x1fe2, 0x1fe2).w(FUNC(wico_state::muxen_w)); //AM_RANGE(0x1fe3, 0x1fe3) AM_WRITE(csols_w) map(0x1fe4, 0x1fe4).noprw(); - map(0x1fe5, 0x1fe5).w("sn76494", FUNC(sn76494_device::command_w)); + map(0x1fe5, 0x1fe5).w("sn76494", FUNC(sn76494_device::write)); map(0x1fe6, 0x1fe6).w(FUNC(wico_state::wdogcl_w)); map(0x1fe7, 0x1fe7).w(FUNC(wico_state::zcres_w)); map(0x1fe8, 0x1fe8).w(FUNC(wico_state::dled0_w)); @@ -125,7 +125,7 @@ void wico_state::ccpu_map(address_map &map) map(0x1fe2, 0x1fe2).w(FUNC(wico_state::muxen_w)); // digit to display on diagnostic LED; d0=L will disable main displays map(0x1fe3, 0x1fe3).w(FUNC(wico_state::csols_w)); // solenoid column map(0x1fe4, 0x1fe4).w(FUNC(wico_state::msols_w)); // solenoid row - map(0x1fe5, 0x1fe5).w("sn76494", FUNC(sn76494_device::command_w)); + map(0x1fe5, 0x1fe5).w("sn76494", FUNC(sn76494_device::write)); map(0x1fe6, 0x1fe6).w(FUNC(wico_state::wdogcl_w)); // watchdog clear map(0x1fe7, 0x1fe7).w(FUNC(wico_state::zcres_w)); // enable IRQ on hcpu map(0x1fe8, 0x1fe8).w(FUNC(wico_state::dled0_w)); // turn off diagnostic LED diff --git a/src/mame/drivers/xyonix.cpp b/src/mame/drivers/xyonix.cpp index e7d5beac560..f636445eb2a 100644 --- a/src/mame/drivers/xyonix.cpp +++ b/src/mame/drivers/xyonix.cpp @@ -173,8 +173,8 @@ void xyonix_state::main_map(address_map &map) void xyonix_state::port_map(address_map &map) { map.global_mask(0xff); - map(0x20, 0x20).nopr().w("sn1", FUNC(sn76496_device::command_w)); /* SN76496 ready signal */ - map(0x21, 0x21).nopr().w("sn2", FUNC(sn76496_device::command_w)); + map(0x20, 0x20).nopr().w("sn1", FUNC(sn76496_device::write)); /* SN76496 ready signal */ + map(0x21, 0x21).nopr().w("sn2", FUNC(sn76496_device::write)); map(0x40, 0x40).w(FUNC(xyonix_state::nmiack_w)); map(0x50, 0x50).w(FUNC(xyonix_state::irqack_w)); map(0x60, 0x61).nopw(); /* mc6845 */ diff --git a/src/mame/drivers/zaxxon.cpp b/src/mame/drivers/zaxxon.cpp index 7fa9581d499..d8a295b075b 100644 --- a/src/mame/drivers/zaxxon.cpp +++ b/src/mame/drivers/zaxxon.cpp @@ -500,9 +500,9 @@ void zaxxon_state::congo_sound_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x4000, 0x47ff).mirror(0x1800).ram(); - map(0x6000, 0x6000).mirror(0x1fff).w("sn1", FUNC(sn76489a_device::command_w)); + map(0x6000, 0x6000).mirror(0x1fff).w("sn1", FUNC(sn76489a_device::write)); map(0x8000, 0x8003).mirror(0x1ffc).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xa000, 0xa000).mirror(0x1fff).w("sn2", FUNC(sn76489a_device::command_w)); + map(0xa000, 0xa000).mirror(0x1fff).w("sn2", FUNC(sn76489a_device::write)); } diff --git a/src/mame/machine/sms.cpp b/src/mame/machine/sms.cpp index b91d73dad44..55c9f01871c 100644 --- a/src/mame/machine/sms.cpp +++ b/src/mame/machine/sms.cpp @@ -543,7 +543,7 @@ WRITE8_MEMBER(sms_state::gg_psg_stereo_w) if (m_cartslot->exists() && m_cartslot->get_sms_mode()) return; - m_psg_gg->stereo_w(space, offset, data, mem_mask); + m_psg_gg->stereo_w(data); } diff --git a/src/mame/machine/wangpckb.cpp b/src/mame/machine/wangpckb.cpp index 26c26b7204d..41aa630bb7a 100644 --- a/src/mame/machine/wangpckb.cpp +++ b/src/mame/machine/wangpckb.cpp @@ -102,7 +102,7 @@ void wangpc_keyboard_device::wangpc_keyboard_io(address_map &map) { //AM_RANGE(0x0000, 0xfeff) AM_READNOP map(0x47, 0x58).mirror(0xff00).nopr(); - map(0x00, 0x00).mirror(0xff00).w(SN76496_TAG, FUNC(sn76496_device::command_w)); + map(0x00, 0x00).mirror(0xff00).w(SN76496_TAG, FUNC(sn76496_device::write)); }