diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2018-01-22 22:04:02 -0500 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2018-01-22 22:09:29 -0500 |
commit | 6be34df91fcc4f3957fdb380d307044f8817fb4e (patch) | |
tree | 8f06e26c9600695fa1a0ab4fde06762410d92276 | |
parent | fd8a0c0407d0190b011ac22891911e3e04a36bb8 (diff) |
pooyan, rocnrope, tutankhm: Regression fixes/cleanups (nw)
-rw-r--r-- | src/mame/drivers/pooyan.cpp | 50 | ||||
-rw-r--r-- | src/mame/drivers/rocnrope.cpp | 50 | ||||
-rw-r--r-- | src/mame/drivers/tutankhm.cpp | 48 |
3 files changed, 11 insertions, 137 deletions
diff --git a/src/mame/drivers/pooyan.cpp b/src/mame/drivers/pooyan.cpp index a7c3550867f..2920cd4a302 100644 --- a/src/mame/drivers/pooyan.cpp +++ b/src/mame/drivers/pooyan.cpp @@ -192,16 +192,6 @@ void pooyan_state::machine_start() save_item(NAME(m_irq_enable)); } -static ADDRESS_MAP_START( timeplt_sound_map, AS_PROGRAM, 8, timeplt_audio_device ) - AM_RANGE(0x0000, 0x2fff) AM_ROM - AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0x0c00) AM_RAM - AM_RANGE(0x4000, 0x4000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay1", ay8910_device, data_r, data_w) - AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay1", ay8910_device, address_w) - AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay2", ay8910_device, data_r, data_w) - AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay2", ay8910_device, address_w) - AM_RANGE(0x8000, 0xffff) AM_DEVWRITE("timeplt_audio", timeplt_audio_device, filter_w) -ADDRESS_MAP_END - MACHINE_CONFIG_START(pooyan_state::pooyan) @@ -238,40 +228,8 @@ MACHINE_CONFIG_START(pooyan_state::pooyan) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - /* basic machine hardware */ - MCFG_CPU_ADD("tpsound",Z80,MASTER_CLOCK/8) - MCFG_CPU_PROGRAM_MAP(timeplt_sound_map) - - /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("timeplt_audio", TIMEPLT_AUDIO, 0) - - MCFG_SOUND_ADD("ay1", AY8910, MASTER_CLOCK/8) - MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read)) - MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("timeplt_audio", timeplt_audio_device, portB_r)) - MCFG_SOUND_ROUTE(0, "filter.0.0", 0.60) - MCFG_SOUND_ROUTE(1, "filter.0.1", 0.60) - MCFG_SOUND_ROUTE(2, "filter.0.2", 0.60) - - MCFG_SOUND_ADD("ay2", AY8910, MASTER_CLOCK/8) - MCFG_SOUND_ROUTE(0, "filter.1.0", 0.60) - MCFG_SOUND_ROUTE(1, "filter.1.1", 0.60) - MCFG_SOUND_ROUTE(2, "filter.1.2", 0.60) - - MCFG_FILTER_RC_ADD("filter.0.0", 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MCFG_FILTER_RC_ADD("filter.0.1", 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MCFG_FILTER_RC_ADD("filter.0.2", 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - - MCFG_FILTER_RC_ADD("filter.1.0", 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MCFG_FILTER_RC_ADD("filter.1.1", 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MCFG_FILTER_RC_ADD("filter.1.2", 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + downcast<timeplt_audio_device *>(device)->timeplt_sound(config); MACHINE_CONFIG_END @@ -288,7 +246,7 @@ ROM_START( pooyan ) ROM_LOAD( "3.6a", 0x4000, 0x2000, CRC(fe1a9e08) SHA1(5206893760f188ac71a5e6bd42561cf25fcc3d49) ) ROM_LOAD( "4.7a", 0x6000, 0x2000, CRC(9e0f9bcc) SHA1(4d9707423ad531ac535db432e329b3d52cbb4559) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "xx.7a", 0x0000, 0x1000, CRC(fbe2b368) SHA1(5689a84ef110bdc0039ad1a6c5778e0b8eccfce0) ) ROM_LOAD( "xx.8a", 0x1000, 0x1000, CRC(e1795b3d) SHA1(9ab4e5362f9f7d9b46b750e14b1d9d71c57be40f) ) @@ -313,7 +271,7 @@ ROM_START( pooyans ) ROM_LOAD( "ic24_a6.cpu", 0x4000, 0x2000, CRC(2660218a) SHA1(606b10a4bab2432e20471440105e04d15d384570) ) ROM_LOAD( "ic25_a7.cpu", 0x6000, 0x2000, CRC(3d2a10ad) SHA1(962c621a19e9797b8f3d12c150aa0b90958c9498) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "xx.7a", 0x0000, 0x1000, CRC(fbe2b368) SHA1(5689a84ef110bdc0039ad1a6c5778e0b8eccfce0) ) ROM_LOAD( "xx.8a", 0x1000, 0x1000, CRC(e1795b3d) SHA1(9ab4e5362f9f7d9b46b750e14b1d9d71c57be40f) ) @@ -338,7 +296,7 @@ ROM_START( pootan ) ROM_LOAD( "3.6a", 0x4000, 0x2000, CRC(fe1a9e08) SHA1(5206893760f188ac71a5e6bd42561cf25fcc3d49) ) ROM_LOAD( "poo_ic25.bin", 0x6000, 0x2000, CRC(8ae459ef) SHA1(995eba204bbb82da20063b965bf79a64441a907a) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "xx.7a", 0x0000, 0x1000, CRC(fbe2b368) SHA1(5689a84ef110bdc0039ad1a6c5778e0b8eccfce0) ) ROM_LOAD( "xx.8a", 0x1000, 0x1000, CRC(e1795b3d) SHA1(9ab4e5362f9f7d9b46b750e14b1d9d71c57be40f) ) diff --git a/src/mame/drivers/rocnrope.cpp b/src/mame/drivers/rocnrope.cpp index 7019a5ecc9b..7e115a79296 100644 --- a/src/mame/drivers/rocnrope.cpp +++ b/src/mame/drivers/rocnrope.cpp @@ -206,16 +206,6 @@ INTERRUPT_GEN_MEMBER(rocnrope_state::vblank_irq) device.execute().set_input_line(0, ASSERT_LINE); } -static ADDRESS_MAP_START( timeplt_sound_map, AS_PROGRAM, 8, timeplt_audio_device ) - AM_RANGE(0x0000, 0x2fff) AM_ROM - AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0x0c00) AM_RAM - AM_RANGE(0x4000, 0x4000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay1", ay8910_device, data_r, data_w) - AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay1", ay8910_device, address_w) - AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay2", ay8910_device, data_r, data_w) - AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay2", ay8910_device, address_w) - AM_RANGE(0x8000, 0xffff) AM_DEVWRITE("timeplt_audio", timeplt_audio_device, filter_w) -ADDRESS_MAP_END - MACHINE_CONFIG_START(rocnrope_state::rocnrope) /* basic machine hardware */ @@ -251,40 +241,8 @@ MACHINE_CONFIG_START(rocnrope_state::rocnrope) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - /* basic machine hardware */ - MCFG_CPU_ADD("tpsound",Z80,MASTER_CLOCK/8) - MCFG_CPU_PROGRAM_MAP(timeplt_sound_map) - - /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("timeplt_audio", TIMEPLT_AUDIO, 0) - - MCFG_SOUND_ADD("ay1", AY8910, MASTER_CLOCK/8) - MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read)) - MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("timeplt_audio", timeplt_audio_device, portB_r)) - MCFG_SOUND_ROUTE(0, "filter.0.0", 0.60) - MCFG_SOUND_ROUTE(1, "filter.0.1", 0.60) - MCFG_SOUND_ROUTE(2, "filter.0.2", 0.60) - - MCFG_SOUND_ADD("ay2", AY8910, MASTER_CLOCK/8) - MCFG_SOUND_ROUTE(0, "filter.1.0", 0.60) - MCFG_SOUND_ROUTE(1, "filter.1.1", 0.60) - MCFG_SOUND_ROUTE(2, "filter.1.2", 0.60) - - MCFG_FILTER_RC_ADD("filter.0.0", 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MCFG_FILTER_RC_ADD("filter.0.1", 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MCFG_FILTER_RC_ADD("filter.0.2", 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - - MCFG_FILTER_RC_ADD("filter.1.0", 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MCFG_FILTER_RC_ADD("filter.1.1", 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MCFG_FILTER_RC_ADD("filter.1.2", 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + downcast<timeplt_audio_device *>(device)->timeplt_sound(config); MACHINE_CONFIG_END /************************************* @@ -308,7 +266,7 @@ ROM_START( rocnrope ) ROM_LOAD( "rr4.4h", 0xc000, 0x2000, CRC(7acb2a05) SHA1(93762d1890f40abc98372a2aa9fe0f63252b6389) ) ROM_LOAD( "rnr_h5.vid", 0xe000, 0x2000, CRC(150a6264) SHA1(930ccf8dcf4971d0a15f406d9114be5ecfaa1727) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "rnr_7a.snd", 0x0000, 0x1000, CRC(75d2c4e2) SHA1(b701019b4e7b06b268be660ce7958b5367318c27) ) ROM_LOAD( "rnr_8a.snd", 0x1000, 0x1000, CRC(ca4325ae) SHA1(34ac035c0c2ed6bcafde1491d976bb9e9d2a2a7d) ) @@ -339,7 +297,7 @@ ROM_START( rocnropek ) ROM_LOAD( "rnr_h4.vid", 0xc000, 0x2000, CRC(9b2e5f2a) SHA1(e91d7a9141dbe0fc5eacc2c5a672935993a3316f) ) ROM_LOAD( "rnr_h5.vid", 0xe000, 0x2000, CRC(150a6264) SHA1(930ccf8dcf4971d0a15f406d9114be5ecfaa1727) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "rnr_7a.snd", 0x0000, 0x1000, CRC(75d2c4e2) SHA1(b701019b4e7b06b268be660ce7958b5367318c27) ) ROM_LOAD( "rnr_8a.snd", 0x1000, 0x1000, CRC(ca4325ae) SHA1(34ac035c0c2ed6bcafde1491d976bb9e9d2a2a7d) ) @@ -387,7 +345,7 @@ ROM_START( ropeman ) ROM_LOAD( "r4.4j", 0xc000, 0x2000, CRC(7acb2a05) SHA1(93762d1890f40abc98372a2aa9fe0f63252b6389) ) ROM_LOAD( "r5.5j", 0xe000, 0x2000, CRC(150a6264) SHA1(930ccf8dcf4971d0a15f406d9114be5ecfaa1727) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "r12.7a", 0x0000, 0x1000, CRC(75d2c4e2) SHA1(b701019b4e7b06b268be660ce7958b5367318c27) ) ROM_LOAD( "r13.8a", 0x1000, 0x1000, CRC(ca4325ae) SHA1(34ac035c0c2ed6bcafde1491d976bb9e9d2a2a7d) ) diff --git a/src/mame/drivers/tutankhm.cpp b/src/mame/drivers/tutankhm.cpp index 3205b811755..b984a3fb9f1 100644 --- a/src/mame/drivers/tutankhm.cpp +++ b/src/mame/drivers/tutankhm.cpp @@ -223,16 +223,6 @@ MACHINE_RESET_MEMBER(tutankhm_state,tutankhm) m_irq_toggle = 0; } -static ADDRESS_MAP_START( timeplt_sound_map, AS_PROGRAM, 8, timeplt_audio_device ) - AM_RANGE(0x0000, 0x2fff) AM_ROM - AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0x0c00) AM_RAM - AM_RANGE(0x4000, 0x4000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay1", ay8910_device, data_r, data_w) - AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay1", ay8910_device, address_w) - AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay2", ay8910_device, data_r, data_w) - AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay2", ay8910_device, address_w) - AM_RANGE(0x8000, 0xffff) AM_DEVWRITE("timeplt_audio", timeplt_audio_device, filter_w) -ADDRESS_MAP_END - MACHINE_CONFIG_START(tutankhm_state::tutankhm) /* basic machine hardware */ @@ -270,40 +260,8 @@ MACHINE_CONFIG_START(tutankhm_state::tutankhm) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - /* basic machine hardware */ - MCFG_CPU_ADD("tpsound",Z80,XTAL_14_31818MHz/8) - MCFG_CPU_PROGRAM_MAP(timeplt_sound_map) - - /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("timeplt_audio", TIMEPLT_AUDIO, 0) - - MCFG_SOUND_ADD("ay1", AY8910, XTAL_14_31818MHz/8) - MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read)) - MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("timeplt_audio", timeplt_audio_device, portB_r)) - MCFG_SOUND_ROUTE(0, "filter.0.0", 0.60) - MCFG_SOUND_ROUTE(1, "filter.0.1", 0.60) - MCFG_SOUND_ROUTE(2, "filter.0.2", 0.60) - - MCFG_SOUND_ADD("ay2", AY8910, XTAL_14_31818MHz/8) - MCFG_SOUND_ROUTE(0, "filter.1.0", 0.60) - MCFG_SOUND_ROUTE(1, "filter.1.1", 0.60) - MCFG_SOUND_ROUTE(2, "filter.1.2", 0.60) - - MCFG_FILTER_RC_ADD("filter.0.0", 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MCFG_FILTER_RC_ADD("filter.0.1", 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MCFG_FILTER_RC_ADD("filter.0.2", 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - - MCFG_FILTER_RC_ADD("filter.1.0", 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MCFG_FILTER_RC_ADD("filter.1.1", 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MCFG_FILTER_RC_ADD("filter.1.2", 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + downcast<timeplt_audio_device *>(device)->timeplt_sound(config); MACHINE_CONFIG_END @@ -341,7 +299,7 @@ ROM_START( tutankhm ) /* the other banks (1900-1fff) are empty */ /* ROMS located on the KT-5112-2B board. */ - ROM_REGION( 0x10000 , "tpsound", 0 ) /* 64k for Z80 sound CPU code */ + ROM_REGION( 0x10000 , "timeplt_audio:tpsound", 0 ) /* 64k for Z80 sound CPU code */ ROM_LOAD( "s1.7a", 0x0000, 0x1000, CRC(b52d01fa) SHA1(9b6cf9ea51d3a87c174f34d42a4b1b5f38b48723) ) ROM_LOAD( "s2.8a", 0x1000, 0x1000, CRC(9db5c0ce) SHA1(b5bc1d89a7f7d7a0baae64390c37ee11f69a0e76) ) ROM_END @@ -368,7 +326,7 @@ ROM_START( tutankhms ) /* the other banks (1900-1fff) are empty */ /* ROMS located on the KT-5112-2B board. */ - ROM_REGION( 0x10000, "tpsound", 0 ) /* 64k for Z80 sound CPU code */ + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) /* 64k for Z80 sound CPU code */ ROM_LOAD( "s1.7a", 0x0000, 0x1000, CRC(b52d01fa) SHA1(9b6cf9ea51d3a87c174f34d42a4b1b5f38b48723) ) ROM_LOAD( "s2.8a", 0x1000, 0x1000, CRC(9db5c0ce) SHA1(b5bc1d89a7f7d7a0baae64390c37ee11f69a0e76) ) ROM_END |