summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2019-02-04 13:01:53 -0500
committer GitHub <noreply@github.com>2019-02-04 13:01:53 -0500
commitd903f946fa4dc592e8a10d916668798638b4eb21 (patch)
tree7e5a7a86f5afbe38e11f0ee43a4b920f8216f37e
parentdcbb112cde1d47d21092a215f9db41848e1b8161 (diff)
parentde347d7fdb4bdc3d897888b21875520f3b208dd2 (diff)
Merge pull request #4589 from cam900/k054539_args
k054539.cpp : Reduce unnecessary arguments in handlers
-rw-r--r--src/devices/sound/k054539.cpp4
-rw-r--r--src/devices/sound/k054539.h4
-rw-r--r--src/mame/drivers/mystwarr.cpp36
-rw-r--r--src/mame/drivers/rungun.cpp10
-rw-r--r--src/mame/drivers/tmnt.cpp15
-rw-r--r--src/mame/drivers/zr107.cpp10
-rw-r--r--src/mame/includes/mystwarr.h1
-rw-r--r--src/mame/includes/rungun.h1
-rw-r--r--src/mame/includes/tmnt.h2
9 files changed, 18 insertions, 65 deletions
diff --git a/src/devices/sound/k054539.cpp b/src/devices/sound/k054539.cpp
index 35f45bf4fa6..17dd9c97501 100644
--- a/src/devices/sound/k054539.cpp
+++ b/src/devices/sound/k054539.cpp
@@ -338,7 +338,7 @@ void k054539_device::init_chip()
save_item(NAME(m_timer_state));
}
-WRITE8_MEMBER(k054539_device::write)
+void k054539_device::write(offs_t offset, u8 data)
{
if(0) {
int voice, reg;
@@ -476,7 +476,7 @@ void k054539_device::device_post_load()
cur_limit = rom_addr == 0x80 ? 0x4000 : 0x20000;
}
-READ8_MEMBER(k054539_device::read)
+u8 k054539_device::read(offs_t offset)
{
switch(offset) {
case 0x22d:
diff --git a/src/devices/sound/k054539.h b/src/devices/sound/k054539.h
index ebc117d494c..9e7bafdb0fc 100644
--- a/src/devices/sound/k054539.h
+++ b/src/devices/sound/k054539.h
@@ -44,8 +44,8 @@ public:
set_analog_callback(cb_delegate(callback, name, nullptr, static_cast<FunctionClass *>(nullptr)));
}
- DECLARE_WRITE8_MEMBER(write);
- DECLARE_READ8_MEMBER(read);
+ void write(offs_t offset, u8 data);
+ u8 read(offs_t offset);
void init_flags(int flags);
diff --git a/src/mame/drivers/mystwarr.cpp b/src/mame/drivers/mystwarr.cpp
index ccf8a2721c7..a9229f5adbf 100644
--- a/src/mame/drivers/mystwarr.cpp
+++ b/src/mame/drivers/mystwarr.cpp
@@ -566,29 +566,13 @@ WRITE8_MEMBER(mystwarr_state::sound_ctrl_w)
quite similar to xexex/gijoe/asterix's sound.
*/
-void mystwarr_state::mystwarr_sound_map(address_map &map)
-{
- map(0x0000, 0x7fff).rom();
- map(0x8000, 0xbfff).bankr("z80bank");
- map(0x0000, 0xbfff).nopw();
- map(0xc000, 0xdfff).ram();
- map(0xe000, 0xe22f).rw(m_k054539_1, FUNC(k054539_device::read), FUNC(k054539_device::write));
- map(0xe230, 0xe3ff).ram();
- map(0xe400, 0xe62f).rw(m_k054539_2, FUNC(k054539_device::read), FUNC(k054539_device::write));
- map(0xe630, 0xe7ff).ram();
- map(0xf000, 0xf003).m(m_k054321, FUNC(k054321_device::sound_map));
- map(0xf800, 0xf800).w(FUNC(mystwarr_state::sound_ctrl_w));
- map(0xfff0, 0xfff3).nopw(); // unknown write
-}
-
-
void mystwarr_state::martchmp_sound_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
map(0x8000, 0xbfff).bankr("z80bank");
map(0x0000, 0xbfff).nopw();
map(0xc000, 0xdfff).ram();
- map(0xe000, 0xe22f).rw("k054539", FUNC(k054539_device::read), FUNC(k054539_device::write));
+ map(0xe000, 0xe22f).rw(m_k054539_1, FUNC(k054539_device::read), FUNC(k054539_device::write));
map(0xe230, 0xe3ff).ram();
map(0xe400, 0xe62f).noprw();
map(0xe630, 0xe7ff).ram();
@@ -598,9 +582,10 @@ void mystwarr_state::martchmp_sound_map(address_map &map)
}
-void mystwarr_state::mystwarr_k054539_map(address_map &map)
+void mystwarr_state::mystwarr_sound_map(address_map &map)
{
- map(0x000000, 0x3fffff).rom().region("k054539", 0);
+ martchmp_sound_map(map);
+ map(0xe400, 0xe62f).rw(m_k054539_2, FUNC(k054539_device::read), FUNC(k054539_device::write));
}
@@ -923,10 +908,9 @@ MACHINE_RESET_MEMBER(mystwarr_state,metamrph)
MACHINE_RESET_MEMBER(mystwarr_state,martchmp)
{
int i;
- k054539_device *k054539 = subdevice<k054539_device>("k054539");
// boost voice(chip 0 channel 4-7)
- for (i=4; i<=7; i++) k054539->set_gain(i, 1.4);
+ for (i=4; i<=7; i++) m_k054539_1->set_gain(i, 1.4);
}
MACHINE_RESET_MEMBER(mystwarr_state,gaiapols)
@@ -996,13 +980,13 @@ void mystwarr_state::mystwarr(machine_config &config)
K054321(config, m_k054321, "lspeaker", "rspeaker");
K054539(config, m_k054539_1, XTAL(18'432'000));
- m_k054539_1->set_addrmap(0, &mystwarr_state::mystwarr_k054539_map);
+ m_k054539_1->set_device_rom_tag("k054539");
m_k054539_1->timer_handler().set(FUNC(mystwarr_state::k054539_nmi_gen));
m_k054539_1->add_route(0, "rspeaker", 1.0); /* stereo channels are inverted */
m_k054539_1->add_route(1, "lspeaker", 1.0);
K054539(config, m_k054539_2, XTAL(18'432'000));
- m_k054539_2->set_addrmap(0, &mystwarr_state::mystwarr_k054539_map);
+ m_k054539_2->set_device_rom_tag("k054539");
m_k054539_2->add_route(0, "rspeaker", 1.0); /* stereo channels are inverted */
m_k054539_2->add_route(1, "lspeaker", 1.0);
}
@@ -1150,13 +1134,7 @@ void mystwarr_state::martchmp(machine_config &config)
m_k055673->set_sprite_callback(FUNC(mystwarr_state::martchmp_sprite_callback), this);
m_k055673->set_config("gfx2", K055673_LAYOUT_GX, -58, -23);
- config.device_remove("k054539_1");
config.device_remove("k054539_2");
-
- k054539_device &k054539(K054539(config, "k054539", XTAL(18'432'000)));
- k054539.timer_handler().set(FUNC(mystwarr_state::k054539_nmi_gen));
- k054539.add_route(0, "rspeaker", 1.0); /* stereo channels are inverted */
- k054539.add_route(1, "lspeaker", 1.0);
}
/**********************************************************************************/
diff --git a/src/mame/drivers/rungun.cpp b/src/mame/drivers/rungun.cpp
index a96c39610d6..db6766ca25a 100644
--- a/src/mame/drivers/rungun.cpp
+++ b/src/mame/drivers/rungun.cpp
@@ -256,12 +256,6 @@ void rungun_state::rungun_sound_map(address_map &map)
}
-void rungun_state::k054539_map(address_map &map)
-{
- map(0x000000, 0x3fffff).rom().region("k054539", 0);
-}
-
-
static INPUT_PORTS_START( rng )
PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -449,14 +443,14 @@ void rungun_state::rng(machine_config &config)
// SFX
K054539(config, m_k054539_1, 18.432_MHz_XTAL);
- m_k054539_1->set_addrmap(0, &rungun_state::k054539_map);
+ m_k054539_1->set_device_rom_tag("k054539");
m_k054539_1->timer_handler().set(FUNC(rungun_state::k054539_nmi_gen));
m_k054539_1->add_route(0, "rspeaker", 1.0);
m_k054539_1->add_route(1, "lspeaker", 1.0);
// BGM, volumes handtuned to make SFXs audible (still not 100% right tho)
K054539(config, m_k054539_2, 18.432_MHz_XTAL);
- m_k054539_2->set_addrmap(0, &rungun_state::k054539_map);
+ m_k054539_2->set_device_rom_tag("k054539");
m_k054539_2->add_route(0, "rspeaker", 0.6);
m_k054539_2->add_route(1, "lspeaker", 0.6);
}
diff --git a/src/mame/drivers/tmnt.cpp b/src/mame/drivers/tmnt.cpp
index 044c7efa14f..9666c5ee16d 100644
--- a/src/mame/drivers/tmnt.cpp
+++ b/src/mame/drivers/tmnt.cpp
@@ -1072,23 +1072,14 @@ void tmnt_state::thndrx2_audio_map(address_map &map)
}
-READ8_MEMBER(tmnt_state::k054539_ctrl_r)
-{
- return m_k054539->read(space, 0x200 + offset, 0xff);
-}
-
-WRITE8_MEMBER(tmnt_state::k054539_ctrl_w)
-{
- m_k054539->write(space, 0x200 + offset, data, 0xff);
-}
-
void tmnt_state::prmrsocr_audio_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
map(0x8000, 0xbfff).bankr("bank1");
map(0xc000, 0xdfff).ram();
- map(0xe000, 0xe0ff).rw(m_k054539, FUNC(k054539_device::read), FUNC(k054539_device::write));
- map(0xe100, 0xe12f).rw(FUNC(tmnt_state::k054539_ctrl_r), FUNC(tmnt_state::k054539_ctrl_w));
+ map(0xe000, 0xe12f).lrw8("k054539_rw",
+ [this](offs_t offset) { return m_k054539->read(((offset & 0x100) << 1) | (offset & 0xff)); },
+ [this](offs_t offset, u8 data) { m_k054539->write(((offset & 0x100) << 1) | (offset & 0xff), data); });
map(0xf000, 0xf000).w("soundlatch3", FUNC(generic_latch_8_device::write));
map(0xf002, 0xf002).r("soundlatch", FUNC(generic_latch_8_device::read));
map(0xf003, 0xf003).r("soundlatch2", FUNC(generic_latch_8_device::read));
diff --git a/src/mame/drivers/zr107.cpp b/src/mame/drivers/zr107.cpp
index 93d2492e745..14ebfa5ec1e 100644
--- a/src/mame/drivers/zr107.cpp
+++ b/src/mame/drivers/zr107.cpp
@@ -253,7 +253,6 @@ protected:
WRITE_LINE_MEMBER(k054539_irq_gen);
double adc0838_callback(uint8_t input);
- void k054539_map(address_map &map);
void sharc_memmap(address_map &map);
void sound_memmap(address_map &map);
@@ -570,11 +569,6 @@ void zr107_state::sound_memmap(address_map &map)
map(0x580000, 0x580001).nopw(); // 'NRES' - D2: K056602 /RESET
}
-void zr107_state::k054539_map(address_map &map)
-{
- map(0x000000, 0x5fffff).rom().region("k054539", 0);
-}
-
/*****************************************************************************/
@@ -827,13 +821,13 @@ void zr107_state::zr107(machine_config &config)
SPEAKER(config, "rspeaker").front_right();
k054539_device &k054539_1(K054539(config, "k054539_1", XTAL(18'432'000)));
- k054539_1.set_addrmap(0, &zr107_state::k054539_map);
+ k054539_1.set_device_rom_tag("k054539");
k054539_1.timer_handler().set(FUNC(zr107_state::k054539_irq_gen));
k054539_1.add_route(0, "lspeaker", 0.75);
k054539_1.add_route(1, "rspeaker", 0.75);
k054539_device &k054539_2(K054539(config, "k054539_2", XTAL(18'432'000)));
- k054539_2.set_addrmap(0, &zr107_state::k054539_map);
+ k054539_2.set_device_rom_tag("k054539");
k054539_2.add_route(0, "lspeaker", 0.75);
k054539_2.add_route(1, "rspeaker", 0.75);
diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h
index e4fcd8b5f11..7a07c077fcd 100644
--- a/src/mame/includes/mystwarr.h
+++ b/src/mame/includes/mystwarr.h
@@ -110,7 +110,6 @@ private:
void martchmp_map(address_map &map);
void martchmp_sound_map(address_map &map);
void metamrph_map(address_map &map);
- void mystwarr_k054539_map(address_map &map);
void mystwarr_map(address_map &map);
void mystwarr_sound_map(address_map &map);
void viostorm_map(address_map &map);
diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h
index 6b32dbc65dc..8b811b3a494 100644
--- a/src/mame/includes/rungun.h
+++ b/src/mame/includes/rungun.h
@@ -120,7 +120,6 @@ private:
INTERRUPT_GEN_MEMBER(rng_interrupt);
- void k054539_map(address_map &map);
void rungun_map(address_map &map);
void rungun_sound_map(address_map &map);
};
diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h
index 817ec7f8a35..4714b66055e 100644
--- a/src/mame/includes/tmnt.h
+++ b/src/mame/includes/tmnt.h
@@ -147,8 +147,6 @@ private:
DECLARE_WRITE16_MEMBER(ssriders_soundkludge_w);
DECLARE_WRITE16_MEMBER(k053251_glfgreat_w);
DECLARE_WRITE16_MEMBER(tmnt2_1c0800_w);
- DECLARE_READ8_MEMBER(k054539_ctrl_r);
- DECLARE_WRITE8_MEMBER(k054539_ctrl_w);
DECLARE_WRITE16_MEMBER(tmnt_0a0000_w);
DECLARE_WRITE16_MEMBER(punkshot_0a0020_w);
DECLARE_WRITE16_MEMBER(lgtnfght_0a0018_w);