From f87c78e443cd8f2901fbb692109a88bff057ba18 Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 5 Aug 2018 16:05:43 -0400 Subject: Build fixes (some compilers are too permissive about member pointer syntax) (nw) --- src/mame/drivers/actfancr.cpp | 4 ++-- src/mame/drivers/battlera.cpp | 6 +++--- src/mame/drivers/boogwing.cpp | 2 +- src/mame/drivers/cbuster.cpp | 2 +- src/mame/drivers/cninja.cpp | 16 ++++++++-------- src/mame/drivers/darkseal.cpp | 2 +- src/mame/drivers/dassault.cpp | 2 +- src/mame/drivers/dec0.cpp | 10 +++++----- src/mame/drivers/deco32.cpp | 8 ++++---- src/mame/drivers/dietgo.cpp | 2 +- src/mame/drivers/funkyjet.cpp | 2 +- src/mame/drivers/ggconnie.cpp | 4 ++-- src/mame/drivers/madmotor.cpp | 2 +- src/mame/drivers/paranoia.cpp | 4 ++-- src/mame/drivers/pce.cpp | 8 ++++---- src/mame/drivers/rohga.cpp | 8 ++++---- src/mame/drivers/supbtime.cpp | 2 +- src/mame/drivers/tourvis.cpp | 4 ++-- src/mame/drivers/uapce.cpp | 4 ++-- src/mame/drivers/vaportra.cpp | 2 +- 20 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/mame/drivers/actfancr.cpp b/src/mame/drivers/actfancr.cpp index ce9644417c9..3c66891f729 100644 --- a/src/mame/drivers/actfancr.cpp +++ b/src/mame/drivers/actfancr.cpp @@ -289,7 +289,7 @@ MACHINE_CONFIG_START(actfancr_state::actfancr) /* basic machine hardware */ H6280(config, m_maincpu, 21477200/3); /* Should be accurate */ - m_maincpu->set_addrmap(AS_PROGRAM, actfan_map); + m_maincpu->set_addrmap(AS_PROGRAM, &actfancr_state::actfan_map); m_maincpu->add_route(ALL_OUTPUTS, "mono", 0); // internal sound unused MCFG_DEVICE_ADD("audiocpu",M6502, 1500000) /* Should be accurate */ @@ -345,7 +345,7 @@ MACHINE_CONFIG_START(actfancr_state::triothep) /* basic machine hardware */ H6280(config, m_maincpu, XTAL(21'477'272)/3); /* XIN=21.4772Mhz, verified on pcb */ - m_maincpu->set_addrmap(AS_PROGRAM, triothep_map); + m_maincpu->set_addrmap(AS_PROGRAM, &actfancr_state::triothep_map); m_maincpu->port_in_cb().set(FUNC(actfancr_state::triothep_control_r)); m_maincpu->port_out_cb().set(FUNC(actfancr_state::triothep_control_select_w)); m_maincpu->add_route(ALL_OUTPUTS, "mono", 0); // internal sound unused diff --git a/src/mame/drivers/battlera.cpp b/src/mame/drivers/battlera.cpp index 9521a575a23..375de03892c 100644 --- a/src/mame/drivers/battlera.cpp +++ b/src/mame/drivers/battlera.cpp @@ -254,14 +254,14 @@ MACHINE_CONFIG_START(battlera_state::battlera) /* basic machine hardware */ H6280(config, m_maincpu, 21477200/3); - m_maincpu->set_addrmap(AS_PROGRAM, battlera_map); - m_maincpu->set_addrmap(AS_IO, battlera_portmap); + m_maincpu->set_addrmap(AS_PROGRAM, &battlera_state::battlera_map); + m_maincpu->set_addrmap(AS_IO, &battlera_state::battlera_portmap); m_maincpu->port_in_cb().set(FUNC(battlera_state::control_data_r)); m_maincpu->port_out_cb().set(FUNC(battlera_state::control_data_w)); m_maincpu->add_route(ALL_OUTPUTS, "mono", 0); // internal sound unused H6280(config, m_audiocpu, 21477200/3); - m_audiocpu->set_addrmap(AS_PROGRAM, sound_map); + m_audiocpu->set_addrmap(AS_PROGRAM, &battlera_state::sound_map); m_audiocpu->port_in_cb().set(m_soundlatch, FUNC(generic_latch_8_device::read)); m_audiocpu->port_out_cb().set(FUNC(battlera_state::adpcm_reset_w)); m_audiocpu->add_route(ALL_OUTPUTS, "mono", 0.60); // music data is stereo, but hardware isn't diff --git a/src/mame/drivers/boogwing.cpp b/src/mame/drivers/boogwing.cpp index 41c093f162f..bd2a19485ed 100644 --- a/src/mame/drivers/boogwing.cpp +++ b/src/mame/drivers/boogwing.cpp @@ -345,7 +345,7 @@ MACHINE_CONFIG_START(boogwing_state::boogwing) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", boogwing_state, irq6_line_hold) H6280(config, m_audiocpu, SOUND_XTAL/4); - m_audiocpu->set_addrmap(AS_PROGRAM, audio_map); + m_audiocpu->set_addrmap(AS_PROGRAM, &boogwing_state::audio_map); m_audiocpu->add_route(ALL_OUTPUTS, "lspeaker", 0); // internal sound unused m_audiocpu->add_route(ALL_OUTPUTS, "rspeaker", 0); diff --git a/src/mame/drivers/cbuster.cpp b/src/mame/drivers/cbuster.cpp index 1d71dfc3cca..01c5feda7bd 100644 --- a/src/mame/drivers/cbuster.cpp +++ b/src/mame/drivers/cbuster.cpp @@ -307,7 +307,7 @@ MACHINE_CONFIG_START(cbuster_state::twocrude) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cbuster_state, irq4_line_assert)/* VBL */ H6280(config, m_audiocpu, XTAL(24'000'000)/4); /* Custom chip 45, 6MHz Verified */ - m_audiocpu->set_addrmap(AS_PROGRAM, sound_map); + m_audiocpu->set_addrmap(AS_PROGRAM, &cbuster_state::sound_map); m_audiocpu->add_route(ALL_OUTPUTS, "mono", 0); // internal sound unused MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/cninja.cpp b/src/mame/drivers/cninja.cpp index d2857da5d8e..107b166366c 100644 --- a/src/mame/drivers/cninja.cpp +++ b/src/mame/drivers/cninja.cpp @@ -797,8 +797,8 @@ MACHINE_CONFIG_START(cninja_state::cninja) MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000) / 2) MCFG_DEVICE_PROGRAM_MAP(cninja_map) - h6280_device &audiocpu(H6280(config, m_audiocpu, XTAL(32'220'000) / 8); - audiocpu.set_addrmap(AS_PROGRAM, sound_map); + h6280_device &audiocpu(H6280(config, m_audiocpu, XTAL(32'220'000) / 8)); + audiocpu.set_addrmap(AS_PROGRAM, &cninja_state::sound_map); audiocpu.add_route(ALL_OUTPUTS, "mono", 0); // internal sound unused MCFG_DECO_IRQ_ADD("irq", "screen") @@ -1058,8 +1058,8 @@ MACHINE_CONFIG_START(cninja_state::edrandy) MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000) / 2) MCFG_DEVICE_PROGRAM_MAP(edrandy_map) - h6280_device &audiocpu(H6280(config, m_audiocpu, XTAL(32'220'000) / 8); - audiocpu.set_addrmap(AS_PROGRAM, sound_map); + h6280_device &audiocpu(H6280(config, m_audiocpu, XTAL(32'220'000) / 8)); + audiocpu.set_addrmap(AS_PROGRAM, &cninja_state::sound_map); audiocpu.add_route(ALL_OUTPUTS, "mono", 0); // internal sound unused MCFG_DECO_IRQ_ADD("irq", "screen") @@ -1146,8 +1146,8 @@ MACHINE_CONFIG_START(cninja_state::robocop2) MCFG_DEVICE_ADD("maincpu", M68000, XTAL(28'000'000) / 2) MCFG_DEVICE_PROGRAM_MAP(robocop2_map) - h6280_device &audiocpu(H6280(config, m_audiocpu, XTAL(32'220'000) / 8); - audiocpu.set_addrmap(AS_PROGRAM, sound_map); + h6280_device &audiocpu(H6280(config, m_audiocpu, XTAL(32'220'000) / 8)); + audiocpu.set_addrmap(AS_PROGRAM, &cninja_state::sound_map); audiocpu.add_route(ALL_OUTPUTS, "mono", 0); // internal sound unused MCFG_DECO_IRQ_ADD("irq", "screen") @@ -1245,8 +1245,8 @@ MACHINE_CONFIG_START(cninja_state::mutantf) MCFG_DEVICE_PROGRAM_MAP(mutantf_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cninja_state, irq6_line_hold) - h6280_device &audiocpu(H6280(config, m_audiocpu, XTAL(32'220'000) / 8); - audiocpu.set_addrmap(AS_PROGRAM, sound_map_mutantf); + h6280_device &audiocpu(H6280(config, m_audiocpu, XTAL(32'220'000) / 8)); + audiocpu.set_addrmap(AS_PROGRAM, &cninja_state::sound_map_mutantf); audiocpu.add_route(ALL_OUTPUTS, "mono", 0); // internal sound unused /* video hardware */ diff --git a/src/mame/drivers/darkseal.cpp b/src/mame/drivers/darkseal.cpp index 8cf09f067af..6eac007f008 100644 --- a/src/mame/drivers/darkseal.cpp +++ b/src/mame/drivers/darkseal.cpp @@ -209,7 +209,7 @@ MACHINE_CONFIG_START(darkseal_state::darkseal) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", darkseal_state, irq6_line_assert)/* VBL */ H6280(config, m_audiocpu, XTAL(32'220'000)/4); /* Custom chip 45, Audio section crystal is 32.220 MHz */ - m_audiocpu->set_addrmap(AS_PROGRAM, sound_map); + m_audiocpu->set_addrmap(AS_PROGRAM, &darkseal_state::sound_map); m_audiocpu->add_route(ALL_OUTPUTS, "mono", 0); // internal sound unused /* video hardware */ diff --git a/src/mame/drivers/dassault.cpp b/src/mame/drivers/dassault.cpp index 9c2392b4665..4376c02bd5a 100644 --- a/src/mame/drivers/dassault.cpp +++ b/src/mame/drivers/dassault.cpp @@ -534,7 +534,7 @@ MACHINE_CONFIG_START(dassault_state::dassault) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dassault_state, irq5_line_assert) H6280(config, m_audiocpu, XTAL(32'220'000)/8); /* Accurate */ - m_audiocpu->set_addrmap(AS_PROGRAM, sound_map); + m_audiocpu->set_addrmap(AS_PROGRAM, &dassault_state::sound_map); m_audiocpu->add_route(ALL_OUTPUTS, "lspeaker", 0); // internal sound unused m_audiocpu->add_route(ALL_OUTPUTS, "rspeaker", 0); diff --git a/src/mame/drivers/dec0.cpp b/src/mame/drivers/dec0.cpp index 942b5b24a40..ce24fe9289a 100644 --- a/src/mame/drivers/dec0.cpp +++ b/src/mame/drivers/dec0.cpp @@ -1933,7 +1933,7 @@ MACHINE_CONFIG_START(dec0_state::robocop) MCFG_DEVICE_PROGRAM_MAP(robocop_map) H6280(config, m_subcpu, XTAL(21'477'272) / 16); - m_subcpu->set_addrmap(AS_PROGRAM, robocop_sub_map); + m_subcpu->set_addrmap(AS_PROGRAM, &dec0_state::robocop_sub_map); m_subcpu->add_route(ALL_OUTPUTS, "mono", 0); // internal sound unused MCFG_QUANTUM_TIME(attotime::from_hz(3000)) /* Interleave between HuC6280 & 68000 */ @@ -1958,7 +1958,7 @@ MACHINE_CONFIG_START(dec0_state::hippodrm) MCFG_DEVICE_PROGRAM_MAP(hippodrm_map) H6280(config, m_subcpu, XTAL(21'477'272) / 16); - m_subcpu->set_addrmap(AS_PROGRAM, hippodrm_sub_map); + m_subcpu->set_addrmap(AS_PROGRAM, &dec0_state::hippodrm_sub_map); m_subcpu->add_route(ALL_OUTPUTS, "mono", 0); // internal sound unused MCFG_QUANTUM_TIME(attotime::from_hz(300)) /* Interleave between H6280 & 68000 */ @@ -1973,7 +1973,7 @@ MACHINE_CONFIG_START(dec0_state::ffantasybl) dec0(config); // H6280(config, m_subcpu, XTAL(21'477'272) / 16); -// m_subcpu->set_addrmap(AS_PROGRAM, hippodrm_sub_map); +// m_subcpu->set_addrmap(AS_PROGRAM, &dec0_state::hippodrm_sub_map); // m_subcpu->add_route(ALL_OUTPUTS, "mono", 0); // internal sound unused // MCFG_QUANTUM_TIME(attotime::from_hz(300)) /* Interleave between H6280 & 68000 */ @@ -2002,7 +2002,7 @@ MACHINE_CONFIG_START(dec0_state::slyspy) // TODO: both games doesn't like /3 here, MT #06740 h6280_device &audiocpu(H6280(config, m_audiocpu, XTAL(12'000'000)/2/2)); /* verified on pcb (6Mhz is XIN on pin 10 of H6280) */ - audiocpu.set_addrmap(AS_PROGRAM, slyspy_s_map); + audiocpu.set_addrmap(AS_PROGRAM, &dec0_state::slyspy_s_map); audiocpu.add_route(ALL_OUTPUTS, "mono", 0); // internal sound unused MCFG_DEVICE_ADD("pfprotect", ADDRESS_MAP_BANK, 0) @@ -2036,7 +2036,7 @@ MACHINE_CONFIG_START(dec0_state::midres) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_hold)/* VBL */ h6280_device &audiocpu(H6280(config, m_audiocpu, XTAL(24'000'000)/4/3)); /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */ - audiocpu.set_addrmap(AS_PROGRAM, midres_s_map); + audiocpu.set_addrmap(AS_PROGRAM, &dec0_state::midres_s_map); audiocpu.add_route(ALL_OUTPUTS, "mono", 0); // internal sound unused /* video hardware */ diff --git a/src/mame/drivers/deco32.cpp b/src/mame/drivers/deco32.cpp index 504f35ed748..88d46984215 100644 --- a/src/mame/drivers/deco32.cpp +++ b/src/mame/drivers/deco32.cpp @@ -1868,7 +1868,7 @@ MACHINE_CONFIG_START(captaven_state::captaven) MCFG_DEVICE_PROGRAM_MAP(captaven_map) h6280_device &audiocpu(H6280(config, m_audiocpu, XTAL(32'220'000)/4/3)); /* pin 10 is 32mhz/4, pin 14 is High so internal divisor is 3 (verified on pcb) */ - audiocpu.set_addrmap(AS_PROGRAM, h6280_sound_map); + audiocpu.set_addrmap(AS_PROGRAM, &captaven_state::h6280_sound_map); audiocpu.add_route(ALL_OUTPUTS, "lspeaker", 0); // internal sound unused audiocpu.add_route(ALL_OUTPUTS, "rspeaker", 0); @@ -1957,7 +1957,7 @@ MACHINE_CONFIG_START(fghthist_state::fghthist) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", deco32_state, irq0_line_assert) h6280_device &audiocpu(H6280(config, m_audiocpu, XTAL(32'220'000) / 8)); - audiocpu.set_addrmap(AS_PROGRAM, h6280_sound_custom_latch_map); + audiocpu.set_addrmap(AS_PROGRAM, &fghthist_state::h6280_sound_custom_latch_map); audiocpu.add_route(ALL_OUTPUTS, "lspeaker", 0); // internal sound unused audiocpu.add_route(ALL_OUTPUTS, "rspeaker", 0); @@ -2082,7 +2082,7 @@ MACHINE_CONFIG_START(dragngun_state::dragngun) MCFG_DEVICE_PROGRAM_MAP(dragngun_map) h6280_device &audiocpu(H6280(config, m_audiocpu, 32220000/8)); - audiocpu.set_addrmap(AS_PROGRAM, h6280_sound_map); + audiocpu.set_addrmap(AS_PROGRAM, &dragngun_state::h6280_sound_map); audiocpu.add_route(ALL_OUTPUTS, "lspeaker", 0); // internal sound unused audiocpu.add_route(ALL_OUTPUTS, "rspeaker", 0); @@ -2476,7 +2476,7 @@ MACHINE_CONFIG_START(nslasher_state::nslasheru) MCFG_DEVICE_REMOVE("audiocpu") h6280_device &audiocpu(H6280(config, m_audiocpu, 32220000/8)); - audiocpu.set_addrmap(AS_PROGRAM, h6280_sound_map); + audiocpu.set_addrmap(AS_PROGRAM, &nslasher_state::h6280_sound_map); audiocpu.add_route(ALL_OUTPUTS, "lspeaker", 0); // internal sound unused audiocpu.add_route(ALL_OUTPUTS, "rspeaker", 0); diff --git a/src/mame/drivers/dietgo.cpp b/src/mame/drivers/dietgo.cpp index 6f1076ee6ca..9e8a9702740 100644 --- a/src/mame/drivers/dietgo.cpp +++ b/src/mame/drivers/dietgo.cpp @@ -214,7 +214,7 @@ MACHINE_CONFIG_START(dietgo_state::dietgo) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dietgo_state, irq6_line_hold) H6280(config, m_audiocpu, XTAL(32'220'000)/4/3); /* Custom chip 45; XIN is 32.220MHZ/4, verified on pcb */ - m_audiocpu->set_addrmap(AS_PROGRAM, sound_map); + m_audiocpu->set_addrmap(AS_PROGRAM, &dietgo_state::sound_map); m_audiocpu->add_route(ALL_OUTPUTS, "mono", 0); // internal sound unused /* video hardware */ diff --git a/src/mame/drivers/funkyjet.cpp b/src/mame/drivers/funkyjet.cpp index 3f95be92f50..ae529c63665 100644 --- a/src/mame/drivers/funkyjet.cpp +++ b/src/mame/drivers/funkyjet.cpp @@ -310,7 +310,7 @@ MACHINE_CONFIG_START(funkyjet_state::funkyjet) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", funkyjet_state, irq6_line_hold) H6280(config, m_audiocpu, XTAL(32'220'000)/4); /* Custom chip 45, Audio section crystal is 32.220 MHz */ - m_audiocpu->set_addrmap(AS_PROGRAM, sound_map); + m_audiocpu->set_addrmap(AS_PROGRAM, &funkyjet_state::sound_map); m_audiocpu->add_route(ALL_OUTPUTS, "lspeaker", 0); // internal sound unused m_audiocpu->add_route(ALL_OUTPUTS, "rspeaker", 0); diff --git a/src/mame/drivers/ggconnie.cpp b/src/mame/drivers/ggconnie.cpp index f3204a1fdba..4507667f359 100644 --- a/src/mame/drivers/ggconnie.cpp +++ b/src/mame/drivers/ggconnie.cpp @@ -265,8 +265,8 @@ INPUT_PORTS_END MACHINE_CONFIG_START(ggconnie_state::ggconnie) /* basic machine hardware */ H6280(config, m_maincpu, PCE_MAIN_CLOCK/3); - m_maincpu->set_addrmap(AS_PROGRAM, sgx_mem); - m_maincpu->set_addrmap(AS_IO, sgx_io); + m_maincpu->set_addrmap(AS_PROGRAM, &ggconnie_state::sgx_mem); + m_maincpu->set_addrmap(AS_IO, &ggconnie_state::sgx_io); m_maincpu->port_in_cb().set_ioport("IN0"); m_maincpu->port_out_cb().set(FUNC(ggconnie_state::lamp_w)); m_maincpu->add_route(0, "lspeaker", 1.00); diff --git a/src/mame/drivers/madmotor.cpp b/src/mame/drivers/madmotor.cpp index 5c12d2eded7..921471b9f71 100644 --- a/src/mame/drivers/madmotor.cpp +++ b/src/mame/drivers/madmotor.cpp @@ -266,7 +266,7 @@ MACHINE_CONFIG_START(madmotor_state::madmotor) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", madmotor_state, irq6_line_hold)/* VBL */ H6280(config, m_audiocpu, 8053000/2); /* Custom chip 45, Crystal near CPU is 8.053 MHz */ - m_audiocpu->set_addrmap(AS_PROGRAM, sound_map); + m_audiocpu->set_addrmap(AS_PROGRAM, &madmotor_state::sound_map); m_audiocpu->add_route(ALL_OUTPUTS, "mono", 0); // internal sound unused /* video hardware */ diff --git a/src/mame/drivers/paranoia.cpp b/src/mame/drivers/paranoia.cpp index 12dac0ee646..fbe47b2aa19 100644 --- a/src/mame/drivers/paranoia.cpp +++ b/src/mame/drivers/paranoia.cpp @@ -168,8 +168,8 @@ WRITE_LINE_MEMBER(paranoia_state::i8155_timer_out) MACHINE_CONFIG_START(paranoia_state::paranoia) /* basic machine hardware */ H6280(config, m_maincpu, PCE_MAIN_CLOCK/3); - m_maincpu->set_addrmap(AS_PROGRAM, pce_mem); - m_maincpu->set_addrmap(AS_IO, pce_io); + m_maincpu->set_addrmap(AS_PROGRAM, ¶noia_state::pce_mem); + m_maincpu->set_addrmap(AS_IO, ¶noia_state::pce_io); m_maincpu->port_in_cb().set(FUNC(paranoia_state::pce_joystick_r)); m_maincpu->port_out_cb().set(FUNC(paranoia_state::pce_joystick_w)); m_maincpu->add_route(0, "lspeaker", 1.00); diff --git a/src/mame/drivers/pce.cpp b/src/mame/drivers/pce.cpp index 2b322c7287d..82470364102 100644 --- a/src/mame/drivers/pce.cpp +++ b/src/mame/drivers/pce.cpp @@ -308,8 +308,8 @@ static void pce_cart(device_slot_interface &device) MACHINE_CONFIG_START(pce_state::pce_common) /* basic machine hardware */ H6280(config, m_maincpu, MAIN_CLOCK/3); - m_maincpu->set_addrmap(AS_PROGRAM, pce_mem); - m_maincpu->set_addrmap(AS_IO, pce_io); + m_maincpu->set_addrmap(AS_PROGRAM, &pce_state::pce_mem); + m_maincpu->set_addrmap(AS_IO, &pce_state::pce_io); m_maincpu->port_in_cb().set(FUNC(pce_state::mess_pce_joystick_r)); m_maincpu->port_out_cb().set(FUNC(pce_state::mess_pce_joystick_w)); m_maincpu->add_route(0, "lspeaker", 1.00); @@ -362,8 +362,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(pce_state::sgx) /* basic machine hardware */ H6280(config, m_maincpu, MAIN_CLOCK/3); - m_maincpu->set_addrmap(AS_PROGRAM, sgx_mem); - m_maincpu->set_addrmap(AS_IO, sgx_io); + m_maincpu->set_addrmap(AS_PROGRAM, &pce_state::sgx_mem); + m_maincpu->set_addrmap(AS_IO, &pce_state::sgx_io); m_maincpu->port_in_cb().set(FUNC(pce_state::mess_pce_joystick_r)); m_maincpu->port_out_cb().set(FUNC(pce_state::mess_pce_joystick_w)); m_maincpu->add_route(0, "lspeaker", 1.00); diff --git a/src/mame/drivers/rohga.cpp b/src/mame/drivers/rohga.cpp index 2cc20950377..8005b40fb35 100644 --- a/src/mame/drivers/rohga.cpp +++ b/src/mame/drivers/rohga.cpp @@ -879,7 +879,7 @@ MACHINE_CONFIG_START(rohga_state::rohga) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rohga_state, irq6_line_assert) H6280(config, m_audiocpu, 32220000/4/3); /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */ - m_audiocpu->set_addrmap(AS_PROGRAM, sound_map); + m_audiocpu->set_addrmap(AS_PROGRAM, &rohga_state::sound_map); m_audiocpu->add_route(ALL_OUTPUTS, "lspeaker", 0); // internal sound unused m_audiocpu->add_route(ALL_OUTPUTS, "rspeaker", 0); @@ -971,7 +971,7 @@ MACHINE_CONFIG_START(rohga_state::wizdfire) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rohga_state, irq6_line_assert) H6280(config, m_audiocpu, 32220000/4/3); /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */ - m_audiocpu->set_addrmap(AS_PROGRAM, sound_map); + m_audiocpu->set_addrmap(AS_PROGRAM, &rohga_state::sound_map); m_audiocpu->add_route(ALL_OUTPUTS, "lspeaker", 0); // internal sound unused m_audiocpu->add_route(ALL_OUTPUTS, "rspeaker", 0); @@ -1068,7 +1068,7 @@ MACHINE_CONFIG_START(rohga_state::nitrobal) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rohga_state, irq6_line_assert) H6280(config, m_audiocpu, 32220000/4/3); /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */ - m_audiocpu->set_addrmap(AS_PROGRAM, sound_map); + m_audiocpu->set_addrmap(AS_PROGRAM, &rohga_state::sound_map); m_audiocpu->add_route(ALL_OUTPUTS, "lspeaker", 0); // internal sound unused m_audiocpu->add_route(ALL_OUTPUTS, "rspeaker", 0); @@ -1166,7 +1166,7 @@ MACHINE_CONFIG_START(rohga_state::schmeisr) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rohga_state, irq6_line_assert) H6280(config, m_audiocpu, 32220000/4/3); /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */ - m_audiocpu->set_addrmap(AS_PROGRAM, sound_map); + m_audiocpu->set_addrmap(AS_PROGRAM, &rohga_state::sound_map); m_audiocpu->add_route(ALL_OUTPUTS, "lspeaker", 0); // internal sound unused m_audiocpu->add_route(ALL_OUTPUTS, "rspeaker", 0); diff --git a/src/mame/drivers/supbtime.cpp b/src/mame/drivers/supbtime.cpp index bf9c14be2f5..8ebc21e8bc1 100644 --- a/src/mame/drivers/supbtime.cpp +++ b/src/mame/drivers/supbtime.cpp @@ -342,7 +342,7 @@ MACHINE_CONFIG_START(supbtime_state::supbtime) MCFG_DEVICE_PROGRAM_MAP(supbtime_map) H6280(config, m_audiocpu, XTAL(32'220'000) / 8); - m_audiocpu->set_addrmap(AS_PROGRAM, sound_map); + m_audiocpu->set_addrmap(AS_PROGRAM, &supbtime_state::sound_map); m_audiocpu->add_route(ALL_OUTPUTS, "mono", 0); // internal sound unused // video hardware diff --git a/src/mame/drivers/tourvis.cpp b/src/mame/drivers/tourvis.cpp index 77e0df9c929..6b04d125006 100644 --- a/src/mame/drivers/tourvis.cpp +++ b/src/mame/drivers/tourvis.cpp @@ -392,8 +392,8 @@ WRITE_LINE_MEMBER(tourvision_state::tourvision_timer_out) MACHINE_CONFIG_START(tourvision_state::tourvision) /* basic machine hardware */ H6280(config, m_maincpu, PCE_MAIN_CLOCK/3); - m_maincpu->set_addrmap(AS_PROGRAM, pce_mem); - m_maincpu->set_addrmap(AS_IO, pce_io); + m_maincpu->set_addrmap(AS_PROGRAM, &tourvision_state::pce_mem); + m_maincpu->set_addrmap(AS_IO, &tourvision_state::pce_io); m_maincpu->port_in_cb().set(FUNC(tourvision_state::pce_joystick_r)); m_maincpu->port_out_cb().set(FUNC(tourvision_state::pce_joystick_w)); m_maincpu->add_route(0, "lspeaker", 1.00); diff --git a/src/mame/drivers/uapce.cpp b/src/mame/drivers/uapce.cpp index 5fbf2ceb453..0af479652e2 100644 --- a/src/mame/drivers/uapce.cpp +++ b/src/mame/drivers/uapce.cpp @@ -306,8 +306,8 @@ void uapce_state::pce_io(address_map &map) MACHINE_CONFIG_START(uapce_state::uapce) /* basic machine hardware */ H6280(config, m_maincpu, PCE_MAIN_CLOCK/3); - m_maincpu->set_addrmap(AS_PROGRAM, pce_mem); - m_maincpu->set_addrmap(AS_IO, pce_io); + m_maincpu->set_addrmap(AS_PROGRAM, &uapce_state::pce_mem); + m_maincpu->set_addrmap(AS_IO, &uapce_state::pce_io); m_maincpu->port_in_cb().set(FUNC(uapce_state::pce_joystick_r)); m_maincpu->port_out_cb().set(FUNC(uapce_state::pce_joystick_w)); m_maincpu->add_route(0, "lspeaker", 0.5); diff --git a/src/mame/drivers/vaportra.cpp b/src/mame/drivers/vaportra.cpp index 2e57ee02733..217a7f58cbd 100644 --- a/src/mame/drivers/vaportra.cpp +++ b/src/mame/drivers/vaportra.cpp @@ -215,7 +215,7 @@ MACHINE_CONFIG_START(vaportra_state::vaportra) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vaportra_state, irq6_line_assert) H6280(config, m_audiocpu, XTAL(24'000'000)/4); /* Custom chip 45; Audio section crystal is 32.220 MHz but CPU clock is confirmed as coming from the 24MHz crystal (6Mhz exactly on the CPU) */ - m_audiocpu->set_addrmap(AS_PROGRAM, sound_map); + m_audiocpu->set_addrmap(AS_PROGRAM, &vaportra_state::sound_map); m_audiocpu->add_route(ALL_OUTPUTS, "mono", 0); // internal sound unused /* video hardware */ -- cgit v1.2.3