From 3e40fd3f9b5e09b9979bf8fe4dabbf6af927d7a7 Mon Sep 17 00:00:00 2001 From: "DESKTOP-LP5JPA4\\dbtlr" Date: Wed, 24 Jan 2018 20:39:55 +0900 Subject: vgmplay : Add K054539 Support qdrmfgp, djmain, konamigq : Moved sample RAM to K054539 address map plygonet : Add K054321 --- src/devices/sound/k054539.cpp | 84 ++++++++++++++-------------- src/devices/sound/k054539.h | 12 ++-- src/mame/drivers/djmain.cpp | 64 +++------------------ src/mame/drivers/konamigq.cpp | 23 +++++--- src/mame/drivers/konamigx.cpp | 86 ++++++++++++++-------------- src/mame/drivers/mystwarr.cpp | 91 ++++++++++++++++++++---------- src/mame/drivers/plygonet.cpp | 74 +++---------------------- src/mame/drivers/qdrmfgp.cpp | 13 +++-- src/mame/drivers/rungun.cpp | 31 ++++++----- src/mame/drivers/vgmplay.cpp | 126 +++++++++++++++++++++++++++++++----------- src/mame/drivers/zr107.cpp | 30 +++++----- src/mame/includes/djmain.h | 23 ++++---- src/mame/includes/plygonet.h | 12 +--- src/mame/includes/qdrmfgp.h | 5 +- 14 files changed, 342 insertions(+), 332 deletions(-) diff --git a/src/devices/sound/k054539.cpp b/src/devices/sound/k054539.cpp index c5dc57c0528..f485c5fab0e 100644 --- a/src/devices/sound/k054539.cpp +++ b/src/devices/sound/k054539.cpp @@ -19,20 +19,19 @@ DEFINE_DEVICE_TYPE(K054539, k054539_device, "k054539", "K054539 ADPCM") k054539_device::k054539_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, K054539, tag, owner, clock), - device_sound_interface(mconfig, *this), - flags(0), - ram(nullptr), - reverb_pos(0), - cur_ptr(0), - cur_limit(0), - cur_zone(nullptr), - m_rom(*this, DEVICE_SELF), - rom_mask(0), - stream(nullptr), - m_timer(nullptr), - m_timer_state(0), - m_timer_handler(*this) + : device_t(mconfig, K054539, tag, owner, clock) + , device_sound_interface(mconfig, *this), + , device_rom_interface(mconfig, *this, 24) + , flags(0) + , ram(nullptr) + , reverb_pos(0) + , cur_ptr(0) + , cur_limit(0) + , rom_addr(0) + , stream(nullptr) + , m_timer(nullptr) + , m_timer_state(0) + , m_timer_handler(*this) { } @@ -168,7 +167,7 @@ void k054539_device::sound_stream_update(sound_stream &stream, stream_sample_t * int rdelta = (base1[6] | (base1[7] << 8)) >> 3; rdelta = (rdelta + reverb_pos) & 0x3fff; - int cur_pos = (base1[0x0c] | (base1[0x0d] << 8) | (base1[0x0e] << 16)) & rom_mask; + int cur_pos = (base1[0x0c] | (base1[0x0d] << 8) | (base1[0x0e] << 16)); int fdelta, pdelta; if(base2[0] & 0x20) { @@ -200,10 +199,10 @@ void k054539_device::sound_stream_update(sound_stream &stream, stream_sample_t * cur_pos += pdelta; cur_pval = cur_val; - cur_val = (int16_t)(m_rom[cur_pos] << 8); + cur_val = (int16_t)(read_byte(cur_pos) << 8); if(cur_val == (int16_t)0x8000 && (base2[1] & 1)) { - cur_pos = (base1[0x08] | (base1[0x09] << 8) | (base1[0x0a] << 16)) & rom_mask; - cur_val = (int16_t)(m_rom[cur_pos] << 8); + cur_pos = (base1[0x08] | (base1[0x09] << 8) | (base1[0x0a] << 16)); + cur_val = (int16_t)(read_byte(cur_pos) << 8); } if(cur_val == (int16_t)0x8000) { keyoff(ch); @@ -223,10 +222,10 @@ void k054539_device::sound_stream_update(sound_stream &stream, stream_sample_t * cur_pos += pdelta; cur_pval = cur_val; - cur_val = (int16_t)(m_rom[cur_pos] | m_rom[cur_pos+1]<<8); + cur_val = (int16_t)(read_byte(cur_pos) | read_byte(cur_pos+1)<<8); if(cur_val == (int16_t)0x8000 && (base2[1] & 1)) { - cur_pos = (base1[0x08] | (base1[0x09] << 8) | (base1[0x0a] << 16)) & rom_mask; - cur_val = (int16_t)(m_rom[cur_pos] | m_rom[cur_pos+1]<<8); + cur_pos = (base1[0x08] | (base1[0x09] << 8) | (base1[0x0a] << 16)); + cur_val = (int16_t)(read_byte(cur_pos) | read_byte(cur_pos+1)<<8); } if(cur_val == (int16_t)0x8000) { keyoff(ch); @@ -251,10 +250,10 @@ void k054539_device::sound_stream_update(sound_stream &stream, stream_sample_t * cur_pos += pdelta; cur_pval = cur_val; - cur_val = m_rom[cur_pos>>1]; + cur_val = read_byte(cur_pos>>1); if(cur_val == 0x88 && (base2[1] & 1)) { - cur_pos = ((base1[0x08] | (base1[0x09] << 8) | (base1[0x0a] << 16)) & rom_mask) << 1; - cur_val = m_rom[cur_pos>>1]; + cur_pos = (base1[0x08] | (base1[0x09] << 8) | (base1[0x0a] << 16)) << 1; + cur_val = read_byte(cur_pos>>1); } if(cur_val == 0x88) { keyoff(ch); @@ -321,13 +320,6 @@ void k054539_device::init_chip() cur_ptr = 0; memset(ram.get(), 0, 0x4000); - rom_mask = 0xffffffffU; - for(int i=0; i<32; i++) - if((1U<= m_rom.bytes()) { - rom_mask = (1U<enable(false); } + + +//------------------------------------------------- +// rom_bank_updated - the rom bank has changed +//------------------------------------------------- + +void k053260_device::rom_bank_updated() +{ + m_stream->update(); +} + diff --git a/src/devices/sound/k054539.h b/src/devices/sound/k054539.h index c9225c6b1e6..920177f025d 100644 --- a/src/devices/sound/k054539.h +++ b/src/devices/sound/k054539.h @@ -23,7 +23,9 @@ devcb = &k054539_device::set_timer_handler(*device, DEVCB_##_devcb); -class k054539_device : public device_t, public device_sound_interface +class k054539_device : public device_t, + public device_sound_interface, + public device_rom_interface { public: // control flags, may be set at DRIVER_INIT(). @@ -41,7 +43,6 @@ public: // static configuration helpers static void set_analog_callback(device_t &device, cb_delegate &&cb) { downcast(device).m_apan_cb = std::move(cb); } - static void set_override(device_t &device, const char *rgnoverride) { downcast(device).m_rom.set_tag(rgnoverride); } template static devcb_base &set_timer_handler(device_t &device, Object &&cb) { return downcast(device).m_timer_handler.set_callback(std::forward(cb)); } @@ -72,6 +73,9 @@ protected: // device_sound_interface overrides virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; + + // device_rom_interface overrides + virtual void rom_bank_updated() override; private: struct channel { @@ -94,9 +98,7 @@ private: int32_t cur_ptr; int cur_limit; - unsigned char *cur_zone; - required_region_ptr m_rom; - uint32_t rom_mask; + uint32_t rom_addr; channel channels[8]; sound_stream *stream; diff --git a/src/mame/drivers/djmain.cpp b/src/mame/drivers/djmain.cpp index 3cad2bf7943..b40705b5e0d 100644 --- a/src/mame/drivers/djmain.cpp +++ b/src/mame/drivers/djmain.cpp @@ -88,17 +88,11 @@ hard drive 3.5 adapter long 3.5 IDE cable 3.5 adapter PCB * *************************************/ -void djmain_state::sndram_set_bank() -{ - m_sndram = memregion("shared")->base() + 0x80000 * m_sndram_bank; -} - WRITE32_MEMBER(djmain_state::sndram_bank_w) { if (ACCESSING_BITS_16_31) { m_sndram_bank = (data >> 16) & 0x1f; - sndram_set_bank(); } } @@ -106,6 +100,7 @@ READ32_MEMBER(djmain_state::sndram_r) { uint32_t data = 0; + offset |= 0x80000 * m_sndram_bank; if (ACCESSING_BITS_24_31) data |= m_sndram[offset * 4] << 24; @@ -123,6 +118,7 @@ READ32_MEMBER(djmain_state::sndram_r) WRITE32_MEMBER(djmain_state::sndram_w) { + offset |= 0x80000 * m_sndram_bank; if (ACCESSING_BITS_24_31) m_sndram[offset * 4] = data >> 24; @@ -426,6 +422,9 @@ static ADDRESS_MAP_START(maincpu_djmaina, AS_PROGRAM, 32, djmain_state) AM_RANGE(0xf00000, 0xf01fff) AM_DEVREADWRITE("k056832", k056832_device, ram_long_r, ram_long_w) // VIDEO RAM (tilemap) ADDRESS_MAP_END +static ADDRESS_MAP_START(k054539_map, 0, 8, djmain_state) + AM_RANGE(0x000000, 0xffffff) AM_RAM AM_SHARE("sndram") +ADDRESS_MAP_END /************************************* @@ -1351,8 +1350,6 @@ void djmain_state::machine_start() save_item(NAME(m_pending_vb_int)); save_item(NAME(m_v_ctrl)); save_item(NAME(m_obj_regs)); - - machine().save().register_postload(save_prepost_delegate(FUNC(djmain_state::sndram_set_bank), this)); } @@ -1360,7 +1357,6 @@ void djmain_state::machine_reset() { /* reset sound ram bank */ m_sndram_bank = 0; - sndram_set_bank(); /* reset LEDs */ output().set_led_value(0, 1); @@ -1411,12 +1407,12 @@ MACHINE_CONFIG_START(djmain_state::djmainj) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000)) - MCFG_K054539_REGION_OVERRRIDE("shared") + MCFG_DEVICE_ADDRESS_MAP(0, k054539_map) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_DEVICE_ADD("k054539_2", K054539, XTAL(18'432'000)) - MCFG_K054539_REGION_OVERRRIDE("shared") + MCFG_DEVICE_ADDRESS_MAP(0, k054539_map) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -1460,8 +1456,6 @@ ROM_START( bm1stmix ) DISK_IMAGE( "753jaa11", 0, SHA1(2e70cf31a853322f29f99b6f292c187a2cf33015) ) /* ver 1.00 JA */ // There is an alternate image //DISK_IMAGE( "753jaa11", 0, MD5(260c9b72f4a03055e3abad61c6225324) SHA1(2cc3e149744516bf2353a2b47d33bc9d2072b6c4) ) /* ver 1.00 JA */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( bm2ndmix ) @@ -1483,8 +1477,6 @@ ROM_START( bm2ndmix ) DISK_REGION( "ata:0:hdd:image" ) /* IDE HARD DRIVE */ DISK_IMAGE( "853jaa11", 0, SHA1(9683ff8462491252b6eb2e5b3aa6496884c01506) ) /* ver 1.10 JA */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( bm2ndmxa ) @@ -1506,8 +1498,6 @@ ROM_START( bm2ndmxa ) DISK_REGION( "ata:0:hdd:image" ) /* IDE HARD DRIVE */ DISK_IMAGE( "853jaa11", 0, SHA1(9683ff8462491252b6eb2e5b3aa6496884c01506) ) /* ver 1.10 JA */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( bm3rdmix ) @@ -1529,8 +1519,6 @@ ROM_START( bm3rdmix ) DISK_REGION( "ata:0:hdd:image" ) /* IDE HARD DRIVE */ DISK_IMAGE( "825jaa11", 0, SHA1(048919977232bbce046406a7212586cf39b77cf2) ) /* ver 1.00 JA */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( bmcompmx ) @@ -1552,8 +1540,6 @@ ROM_START( bmcompmx ) DISK_REGION( "ata:0:hdd:image" ) /* IDE HARD DRIVE */ DISK_IMAGE( "858jaa11", 0, SHA1(bc590472046336a1000f29901fe3fd7b29747e47) ) /* ver 1.00 JA */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( hmcompmx ) @@ -1575,8 +1561,6 @@ ROM_START( hmcompmx ) DISK_REGION( "ata:0:hdd:image" ) /* IDE HARD DRIVE */ DISK_IMAGE( "858jaa11", 0, SHA1(bc590472046336a1000f29901fe3fd7b29747e47) ) /* ver 1.00 JA */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( bm4thmix ) @@ -1598,8 +1582,6 @@ ROM_START( bm4thmix ) DISK_REGION( "ata:0:hdd:image" ) /* IDE HARD DRIVE */ DISK_IMAGE( "847jaa11", 0, SHA1(8cad631531b5616d6a4b0a99d988f4b525932dc7) ) /* ver 1.00 JA */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( bm5thmix ) @@ -1621,8 +1603,6 @@ ROM_START( bm5thmix ) DISK_REGION( "ata:0:hdd:image" ) /* IDE HARD DRIVE */ DISK_IMAGE( "981jaa11", 0, SHA1(dc7353fa436d96ae174a58d3a38ca9928a63727f) ) /* ver 1.00 JA */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( bmclubmx ) @@ -1646,8 +1626,6 @@ ROM_START( bmclubmx ) DISK_IMAGE( "993hdda01", 0, SHA1(f5d4df1dd27ce6ee2d0897852342691d55b63bfb) ) // this image has not been verified // DISK_IMAGE( "993jaa11", 0, MD5(e26eb62d7cf3357585f5066da6063143) ) /* ver 1.00 JA */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( bmcompm2 ) @@ -1669,8 +1647,6 @@ ROM_START( bmcompm2 ) DISK_REGION( "ata:0:hdd:image" ) /* IDE HARD DRIVE */ DISK_IMAGE( "988jaa11", 0, SHA1(12a0988c631dd3331e54b8417a9659402afe168b) ) /* ver 1.00 JA */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( hmcompm2 ) @@ -1692,8 +1668,6 @@ ROM_START( hmcompm2 ) DISK_REGION( "ata:0:hdd:image" ) /* IDE HARD DRIVE */ DISK_IMAGE( "988jaa11", 0, SHA1(12a0988c631dd3331e54b8417a9659402afe168b) ) /* ver 1.00 JA */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( bmdct ) @@ -1715,8 +1689,6 @@ ROM_START( bmdct ) DISK_REGION( "ata:0:hdd:image" ) /* IDE HARD DRIVE */ DISK_IMAGE( "995jaa11", 0, SHA1(8fec3c4d97f64f48b9867230a97cda4347496075) ) /* ver 1.00 JA */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( bmcorerm ) @@ -1738,8 +1710,6 @@ ROM_START( bmcorerm ) DISK_REGION( "ata:0:hdd:image" ) /* IDE HARD DRIVE */ DISK_IMAGE( "a05jaa11", 0, SHA1(7ebc41cc3e9a0a922b49201b34e29201522eb726) ) /* ver 1.00 JA */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( bm6thmix ) @@ -1761,8 +1731,6 @@ ROM_START( bm6thmix ) DISK_REGION( "ata:0:hdd:image" ) /* IDE HARD DRIVE */ DISK_IMAGE( "a21jaa11", 0, SHA1(ed0a07212a360e75934fc22c56265842cf0829b6) ) /* ver 1.00 JA */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( bm7thmix ) @@ -1786,8 +1754,6 @@ ROM_START( bm7thmix ) DISK_IMAGE( "b07jaa11", 0, SHA1(e4925494f0a801abb4d3aa6524c379eb445d8dff) ) /* ver 1.00 JA */ // this image has not been verified //DISK_IMAGE( "b07jab11", 0, MD5(0e9440787ca69567792095085e2a3619) ) /* ver 1.00 JA */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( bmfinal ) @@ -1811,8 +1777,6 @@ ROM_START( bmfinal ) DISK_IMAGE( "c01jaa11", 0, SHA1(0a53c4412a72a886f5fb98c12c529d056d625244) ) /* ver 1.00 JA */ // this image has not been verified //DISK_IMAGE( "c01jaa11", 0, MD5(8bb7e6b6bc63cac8a4f2997307c25748) ) /* ver 1.00 JA */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( popn1 ) @@ -1834,8 +1798,6 @@ ROM_START( popn1 ) DISK_REGION( "ata:0:hdd:image" ) /* IDE HARD DRIVE */ DISK_IMAGE( "803aaa11", 0, SHA1(8684c1a1f0de9496bac0333c0302e35359173d8a) ) /* ver 1.00 JA */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( popn2 ) @@ -1857,8 +1819,6 @@ ROM_START( popn2 ) DISK_REGION( "ata:0:hdd:image" ) /* IDE HARD DRIVE */ DISK_IMAGE( "831jhdda01", 0, SHA1(ef62d5fcc1a36235fc932e6ecef71dc845d1d72d) ) - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( popn3 ) @@ -1880,8 +1840,6 @@ ROM_START( popn3 ) DISK_REGION( "ata:0:hdd:image" ) /* IDE HARD DRIVE */ DISK_IMAGE( "980hdda01", 0, SHA1(57ece2b63c32d194d4e41b4e4a45aaab30150fd4) ) - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( popnstage ) @@ -1903,8 +1861,6 @@ ROM_START( popnstage ) DISK_REGION( "ata:0:hdd:image" ) /* IDE HARD DRIVE */ DISK_IMAGE( "970jba11", 0, SHA1(72e92b73b22a8f35e9faca93211e5acf781e66bb) ) /* GQ970 pop'n stage 1.5 ver1.00 1999/10/15 (C) KONAMI */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END #if 0 @@ -1928,8 +1884,6 @@ ROM_START( bm3rdmxb ) DISK_REGION( "ata:0:hdd:image" ) /* IDE HARD DRIVE */ DISK_IMAGE( "825jab11", 0, MD5(f4360da10a932ba90e93469df7426d1d) SHA1(1) ) /* ver 1.01 JA */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( popn1j ) @@ -1951,8 +1905,6 @@ ROM_START( popn1j ) DISK_REGION( "ata:0:hdd:image" ) /* IDE HARD DRIVE */ DISK_IMAGE( "803jaa11", 0, MD5(54a8ac87857d81740621c622e27736d7) ) /* ver 1.00 JA */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END ROM_START( popnstex ) @@ -1974,8 +1926,6 @@ ROM_START( popnstex ) DISK_REGION( "ata:0:hdd:image" ) /* IDE HARD DRIVE */ DISK_IMAGE( "970jba11", 0, MD5(1616905838fdb2b521d53499c6c2a7a4) ) /* ver 1.00 JA */ - - ROM_REGION( 0x1000000, "shared", ROMREGION_ERASE00 ) /* K054539 RAM */ ROM_END #endif diff --git a/src/mame/drivers/konamigq.cpp b/src/mame/drivers/konamigq.cpp index 9980d38ff96..4ce806a8005 100644 --- a/src/mame/drivers/konamigq.cpp +++ b/src/mame/drivers/konamigq.cpp @@ -93,7 +93,8 @@ public: m_soundcpu(*this, "soundcpu"), m_dasp(*this, "dasp"), m_am53cf96(*this, "am53cf96"), - m_k056800(*this, "k056800") + m_k056800(*this, "k056800"), + m_pcmram(*this, "pcmram") { } @@ -102,6 +103,7 @@ public: required_device m_dasp; required_device m_am53cf96; required_device m_k056800; + required_shared_ptr m_pcmram; uint8_t *m_p_n_pcmram; uint8_t m_sector_buffer[ 512 ]; @@ -151,12 +153,12 @@ WRITE16_MEMBER(konamigq_state::eeprom_w) WRITE8_MEMBER(konamigq_state::pcmram_w) { - m_p_n_pcmram[ offset ] = data; + m_pcmram[ offset ] = data; } READ8_MEMBER(konamigq_state::pcmram_r) { - return m_p_n_pcmram[ offset ]; + return m_pcmram[ offset ]; } /* Video */ @@ -242,6 +244,13 @@ static ADDRESS_MAP_START( konamigq_dasp_map, AS_DATA, 8, konamigq_state ) ADDRESS_MAP_END +/* K058141 memory handling */ +static ADDRESS_MAP_START( konamigq_k054539_map, 0, 8, konamigq_state ) + AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_REGION("k054539", 0) + AM_RANGE(0x080000, 0x3fffff) AM_RAM AM_SHARE("pcmram") +ADDRESS_MAP_END + + /* 058141 */ WRITE_LINE_MEMBER(konamigq_state::k054539_irq_gen) { @@ -297,12 +306,10 @@ void konamigq_state::scsi_dma_write( uint32_t *p_n_psxram, uint32_t n_address, i DRIVER_INIT_MEMBER(konamigq_state,konamigq) { - m_p_n_pcmram = memregion( "shared" )->base() + 0x80000; } MACHINE_START_MEMBER(konamigq_state,konamigq) { - save_pointer(NAME(m_p_n_pcmram), 0x380000); save_item(NAME(m_sector_buffer)); save_item(NAME(m_sound_ctrl)); save_item(NAME(m_sound_intck)); @@ -354,13 +361,13 @@ MACHINE_CONFIG_START(konamigq_state::konamigq) MCFG_K056800_INT_HANDLER(INPUTLINE("soundcpu", M68K_IRQ_1)) MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000)) - MCFG_K054539_REGION_OVERRRIDE("shared") + MCFG_DEVICE_ADDRESS_MAP(0, konamigq_k054539_map) MCFG_K054539_TIMER_HANDLER(WRITELINE(konamigq_state, k054539_irq_gen)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_DEVICE_ADD("k054539_2", K054539, XTAL(18'432'000)) - MCFG_K054539_REGION_OVERRRIDE("shared") + MCFG_DEVICE_ADDRESS_MAP(0, konamigq_k054539_map) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -453,7 +460,7 @@ ROM_START( cryptklr ) ROM_REGION( 0x80000, "soundcpu", 0 ) /* 68000 sound program */ ROM_LOAD16_WORD_SWAP( "420a01.2g", 0x000000, 0x080000, CRC(84fc2613) SHA1(e06f4284614d33c76529eb43b168d095200a9eac) ) - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x80000, "k054539", 0 ) ROM_LOAD( "420a02.3m", 0x000000, 0x080000, CRC(2169c3c4) SHA1(6d525f10385791e19eb1897d18f0bab319640162) ) ROM_REGION32_LE( 0x080000, "maincpu:rom", 0 ) /* bios */ diff --git a/src/mame/drivers/konamigx.cpp b/src/mame/drivers/konamigx.cpp index 62525cb183d..980abc8e597 100644 --- a/src/mame/drivers/konamigx.cpp +++ b/src/mame/drivers/konamigx.cpp @@ -1119,6 +1119,10 @@ static ADDRESS_MAP_START( gxtmsmap, AS_DATA, 8, konamigx_state ) AM_RANGE(0x00000, 0x3ffff) AM_RAM ADDRESS_MAP_END +static ADDRESS_MAP_START( gxk054539map, 0, 8, konamigx_state ) + AM_RANGE(0x000000, 0x3fffff) AM_ROM AM_REGION("k054539", 0) +ADDRESS_MAP_END + WRITE_LINE_MEMBER(konamigx_state::k054539_irq_gen) { @@ -1677,7 +1681,7 @@ MACHINE_CONFIG_START(konamigx_state::konamigx) MCFG_K056800_INT_HANDLER(INPUTLINE("soundcpu", M68K_IRQ_1)) MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000)) - MCFG_K054539_REGION_OVERRRIDE("shared") + MCFG_DEVICE_ADDRESS_MAP(0, gxk054539map) MCFG_K054539_TIMER_HANDLER(WRITELINE(konamigx_state, k054539_irq_gen)) MCFG_SOUND_ROUTE_EX(0, "dasp", 0.5, 0) MCFG_SOUND_ROUTE_EX(1, "dasp", 0.5, 1) @@ -1685,7 +1689,7 @@ MACHINE_CONFIG_START(konamigx_state::konamigx) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_DEVICE_ADD("k054539_2", K054539, XTAL(18'432'000)) - MCFG_K054539_REGION_OVERRRIDE("shared") + MCFG_DEVICE_ADDRESS_MAP(0, gxk054539map) MCFG_SOUND_ROUTE_EX(0, "dasp", 0.5, 2) MCFG_SOUND_ROUTE_EX(1, "dasp", 0.5, 3) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) @@ -1955,7 +1959,7 @@ ROM_START(konamigx) /* sprites */ ROM_REGION( 0x500000, "gfx2", ROMREGION_ERASEFF ) /* sound samples */ - ROM_REGION( 0x400000, "shared", ROMREGION_ERASE00 ) + ROM_REGION( 0x400000, "k054539", ROMREGION_ERASE00 ) ROM_END #define SPR_WOR_DROM_LOAD(name,offset,length,crc) ROMX_LOAD(name, offset, length, crc, ROM_GROUPWORD | ROM_SKIP(5)) @@ -1998,7 +2002,7 @@ ROM_START( gokuparo ) ROM_LOAD( "321b09.30g", 0x400000, 1*1024*1024, CRC(94add237) SHA1(9a6d0a9727e7fa02d91ece220b145074a6741a95) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "321b17.9g", 0x000000, 2*1024*1024, CRC(b3e8d5d8) SHA1(6644a414e7f0e69ded9aa1bf892566002cebae26) ) ROM_LOAD( "321b18.7g", 0x200000, 2*1024*1024, CRC(2c561ad0) SHA1(6265054072ba1c2837dd96e0259b20bc50457160) ) @@ -2031,7 +2035,7 @@ ROM_START( fantjour ) ROM_LOAD( "321b09.30g", 0x400000, 1*1024*1024, CRC(94add237) SHA1(9a6d0a9727e7fa02d91ece220b145074a6741a95) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "321b17.9g", 0x000000, 2*1024*1024, CRC(b3e8d5d8) SHA1(6644a414e7f0e69ded9aa1bf892566002cebae26) ) ROM_LOAD( "321b18.7g", 0x200000, 2*1024*1024, CRC(2c561ad0) SHA1(6265054072ba1c2837dd96e0259b20bc50457160) ) @@ -2064,7 +2068,7 @@ ROM_START( fantjoura ) ROM_LOAD( "321b09.30g", 0x400000, 1*1024*1024, CRC(94add237) SHA1(9a6d0a9727e7fa02d91ece220b145074a6741a95) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "321b17.9g", 0x000000, 2*1024*1024, CRC(b3e8d5d8) SHA1(6644a414e7f0e69ded9aa1bf892566002cebae26) ) ROM_LOAD( "321b18.7g", 0x200000, 2*1024*1024, CRC(2c561ad0) SHA1(6265054072ba1c2837dd96e0259b20bc50457160) ) @@ -2098,7 +2102,7 @@ ROM_START( salmndr2 ) _48_WORD_ROM_LOAD( "521-a06.30g", 0x000004, 2*1024*1024, CRC(cba5db2c) SHA1(505efdf8571ae28d8788dcafbfffcfb67e3189ce) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "521-a12.9g", 0x000000, 2*1024*1024, CRC(66614d3b) SHA1(e1e5ebe546bced6ab74b0af500acf0f3308902a4) ) ROM_LOAD( "521-a13.7g", 0x200000, 1*1024*1024, CRC(c3322475) SHA1(1774524ff031e0c4a7f3432810e968d37f9c6331) ) @@ -2132,7 +2136,7 @@ ROM_START( salmndr2a ) _48_WORD_ROM_LOAD( "521-a06.30g", 0x000004, 2*1024*1024, CRC(cba5db2c) SHA1(505efdf8571ae28d8788dcafbfffcfb67e3189ce) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "521-a12.9g", 0x000000, 2*1024*1024, CRC(66614d3b) SHA1(e1e5ebe546bced6ab74b0af500acf0f3308902a4) ) ROM_LOAD( "521-a13.7g", 0x200000, 1*1024*1024, CRC(c3322475) SHA1(1774524ff031e0c4a7f3432810e968d37f9c6331) ) @@ -2165,7 +2169,7 @@ ROM_START( tbyahhoo ) ROM_LOAD( "424a09.30g", 0x400000, 1*1024*1024, CRC(daa07224) SHA1(198cafa3d0ead2aa2593be066c6f372e66c11c44) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "424a17.9g", 0x000000, 2*1024*1024, CRC(e9dd9692) SHA1(c289019c8d1dd71b3cec26479c39b649de804707) ) ROM_LOAD( "424a18.7g", 0x200000, 2*1024*1024, CRC(0f0d9f3a) SHA1(57f6b113b80f06964b7e672ad517c1654c5569c5) ) @@ -2198,7 +2202,7 @@ ROM_START( daiskiss ) ROM_LOAD( "535a11.30g", 0x400000, 512*1024, CRC(2b176b0f) SHA1(ecf4114d95a308be8f96a5c602c0f5ed5ffc8f29) ) /* sound data */ - ROM_REGION( 0x200000, "shared", 0 ) + ROM_REGION( 0x200000, "k054539", 0 ) ROM_LOAD( "535a22.9g", 0x000000, 2*1024*1024, CRC(7ee59acb) SHA1(782bf15f205e9fe7bd069f6445eb8187837dee32) ) ROM_END @@ -2227,7 +2231,7 @@ ROM_START( sexyparo ) ROM_LOAD( "533a11.30g", 0x400000, 2*1024*1024, CRC(983105e1) SHA1(c688f6f73fab16107f01523081558a2e02a5311c) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "533a22.9g", 0x000000, 2*1024*1024, CRC(97233814) SHA1(dba20a81517796b7baf7c82551bd7f1c1a8ecd7e) ) ROM_LOAD( "533a23.7g", 0x200000, 2*1024*1024, CRC(1bb7552b) SHA1(3c6f96b4ab97737c3634c08b94dd304d5517d88d) ) ROM_END @@ -2257,7 +2261,7 @@ ROM_START( sexyparoa ) ROM_LOAD( "533a11.30g", 0x400000, 2*1024*1024, CRC(983105e1) SHA1(c688f6f73fab16107f01523081558a2e02a5311c) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "533a22.9g", 0x000000, 2*1024*1024, CRC(97233814) SHA1(dba20a81517796b7baf7c82551bd7f1c1a8ecd7e) ) ROM_LOAD( "533a23.7g", 0x200000, 2*1024*1024, CRC(1bb7552b) SHA1(3c6f96b4ab97737c3634c08b94dd304d5517d88d) ) ROM_END @@ -2303,7 +2307,7 @@ ROM_START( rungun2 ) ROM_LOAD("505a24.22h", 0x000000, 2*1024*1024, CRC(70e906da) SHA1(4b1a412a71910633f48c6a0b9fd6949dcc82e365) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "505a23.7r", 0x000000, 2*1024*1024, CRC(67f03445) SHA1(9b5c1d1bb7b0ee275862d10effd9daed49568af4) ) ROM_LOAD( "505a22.9r", 0x200000, 2*1024*1024, CRC(c2b67a9d) SHA1(9ff091972d7fad50bf0df2b3d8b5ee989e3df27f) ) ROM_END @@ -2351,7 +2355,7 @@ ROM_START( slamdnk2 ) ROM_LOAD("505a24.22h", 0x000000, 2*1024*1024, CRC(70e906da) SHA1(4b1a412a71910633f48c6a0b9fd6949dcc82e365) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "505a23.7r", 0x000000, 2*1024*1024, CRC(67f03445) SHA1(9b5c1d1bb7b0ee275862d10effd9daed49568af4) ) ROM_LOAD( "505a22.9r", 0x200000, 2*1024*1024, CRC(c2b67a9d) SHA1(9ff091972d7fad50bf0df2b3d8b5ee989e3df27f) ) ROM_END @@ -2398,7 +2402,7 @@ ROM_START( rushhero ) ROM_LOAD("605a24.22h", 0x000000, 2*1024*1024, CRC(73f06065) SHA1(8ca6747204a4c2cf59f19bcc9fce280e796e4a6e) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "605a23.7r", 0x000000, 4*1024*1024, CRC(458ecee1) SHA1(4adcbbff312597716c6db1cd5df6cdf7022d4961) ) ROM_END @@ -2430,7 +2434,7 @@ ROM_START( tokkae ) ROM_LOAD( "615a11.30g", 0x800000, 2*1024*1024, CRC(f25946e4) SHA1(e7744cdbeccc7325fdb31e134fed71d4cf8f9b0a) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "615a22.9g", 0x000000, 2*1024*1024, CRC(ea7e47dd) SHA1(5bf5bad9427b083757c400eaf58c63a6267c1caf) ) ROM_LOAD( "615a23.7g", 0x200000, 2*1024*1024, CRC(22d71f36) SHA1(3f24bb4cd8e1d693b42219e05960ad0c756b08cb) ) @@ -2465,7 +2469,7 @@ ROM_START( tkmmpzdm ) ROM_LOAD( "515a06.30g", 0x800000, 2*1024*1024, CRC(13b7b953) SHA1(4393c5b3515f3ded9db3ac5d59308f99f40f2b76) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "515a13.9g", 0x000000, 2*1024*1024, CRC(4b066b00) SHA1(874dd49847b10e6d9c39decb81557534baa36d79) ) ROM_LOAD( "515a14.7g", 0x200000, 2*1024*1024, CRC(128cc944) SHA1(b0cd2ec1b9a2ac936d57b6d6c2a70f9c13dc97a5) ) @@ -2500,7 +2504,7 @@ ROM_START( winspike ) ROM_LOAD64_WORD( "705a10.33g", 0x000006, 0x400000, CRC(fc4dc78b) SHA1(520cdcf9ca20ec1c84be734e06e183e7a871090b) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "705a22.9g", 0x000000, 4*1024*1024, CRC(1a9246f6) SHA1(a40ff43310d035f7b88c4e397a4ee75151578c17) ) ROM_END @@ -2559,7 +2563,7 @@ ROM_START( winspikej ) ROM_LOAD64_WORD( "705a10.33g", 0x000006, 0x400000, CRC(fc4dc78b) SHA1(520cdcf9ca20ec1c84be734e06e183e7a871090b) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "705a22.9g", 0x000000, 4*1024*1024, CRC(1a9246f6) SHA1(a40ff43310d035f7b88c4e397a4ee75151578c17) ) ROM_END @@ -2588,7 +2592,7 @@ ROM_START( crzcross ) ROM_LOAD( "315a09.30g", 0x400000, 1*1024*1024, CRC(82580329) SHA1(99749a67f1843dfd0fe93cc6bbcbc126b7bb7fb4) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "315a17.9g", 0x000000, 2*1024*1024, CRC(ea763d61) SHA1(2a7dcb2a2a23c9fea62fb82ffc18949bf15b9f6f) ) ROM_LOAD( "315a18.7g", 0x200000, 2*1024*1024, CRC(6e416cee) SHA1(145a766ad2fa2b692692053dd36e0caf51d67a56) ) @@ -2621,7 +2625,7 @@ ROM_START( puzldama ) ROM_LOAD( "315a09.30g", 0x400000, 1*1024*1024, CRC(82580329) SHA1(99749a67f1843dfd0fe93cc6bbcbc126b7bb7fb4) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "315a17.9g", 0x000000, 2*1024*1024, CRC(ea763d61) SHA1(2a7dcb2a2a23c9fea62fb82ffc18949bf15b9f6f) ) ROM_LOAD( "315a18.7g", 0x200000, 2*1024*1024, CRC(6e416cee) SHA1(145a766ad2fa2b692692053dd36e0caf51d67a56) ) @@ -2662,7 +2666,7 @@ ROM_START( dragoonj ) ROM_LOAD32_WORD( "417a08.33g", 0xc00002, 2*1024*1024, CRC(801e9d93) SHA1(9364d802b4ca03e652b25304c8298be8de8936b4) ) /* sound data */ - ROM_REGION( 0x200000, "shared", 0 ) + ROM_REGION( 0x200000, "k054539", 0 ) ROM_LOAD( "417a17.9g", 0x000000, 2*1024*1024, CRC(88d47dfd) SHA1(b5d6dd7ee9ac0c427dc3e714a97945c954260913) ) ROM_REGION16_BE( 0x80, "eeprom", 0 ) // default eeprom to prevent game booting with error @@ -2702,7 +2706,7 @@ ROM_START( dragoona ) ROM_LOAD32_WORD( "417a08.33g", 0xc00002, 2*1024*1024, CRC(801e9d93) SHA1(9364d802b4ca03e652b25304c8298be8de8936b4) ) /* sound data */ - ROM_REGION( 0x200000, "shared", 0 ) + ROM_REGION( 0x200000, "k054539", 0 ) ROM_LOAD( "417a17.9g", 0x000000, 2*1024*1024, CRC(88d47dfd) SHA1(b5d6dd7ee9ac0c427dc3e714a97945c954260913) ) ROM_REGION16_BE( 0x80, "eeprom", 0 ) // default eeprom to prevent game booting with error @@ -2761,7 +2765,7 @@ ROM_START( soccerss ) /* 0x70000-0x7ffff garbage? */ /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "427a16.9r", 0x000000, 2*1024*1024, CRC(39547265) SHA1(c0efd68c0c1ea59141045150842f36d43e1f01d8) ) ROM_REGION16_BE( 0x80, "eeprom", 0 ) // default eeprom to prevent game booting with error @@ -2820,7 +2824,7 @@ ROM_START( soccerssu ) /* 0x70000-0x7ffff garbage? */ /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "427a16.9r", 0x000000, 2*1024*1024, CRC(39547265) SHA1(c0efd68c0c1ea59141045150842f36d43e1f01d8) ) ROM_REGION16_BE( 0x80, "eeprom", 0 ) // default eeprom to prevent game booting with error @@ -2867,7 +2871,7 @@ ROM_START( soccerssj ) ROM_LOAD( "427a17.24c", 0x000000, 0x080000, CRC(fb6eb01f) SHA1(28cdb30ff70ee5fc7624e18fe048dd85dfa49ace) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "427a16.9r", 0x000000, 2*1024*1024, CRC(39547265) SHA1(c0efd68c0c1ea59141045150842f36d43e1f01d8) ) ROM_REGION16_BE( 0x80, "eeprom", 0 ) // default eeprom to prevent game booting with error @@ -2914,7 +2918,7 @@ ROM_START( soccerssja ) ROM_LOAD( "427a17.24c", 0x000000, 0x080000, CRC(fb6eb01f) SHA1(28cdb30ff70ee5fc7624e18fe048dd85dfa49ace) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "427a16.9r", 0x000000, 2*1024*1024, CRC(39547265) SHA1(c0efd68c0c1ea59141045150842f36d43e1f01d8) ) ROM_REGION16_BE( 0x80, "eeprom", 0 ) // default eeprom to prevent game booting with error @@ -2961,7 +2965,7 @@ ROM_START( soccerssa ) ROM_LOAD( "427a17.24c", 0x000000, 0x080000, CRC(fb6eb01f) SHA1(28cdb30ff70ee5fc7624e18fe048dd85dfa49ace) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "427a16.9r", 0x000000, 2*1024*1024, CRC(39547265) SHA1(c0efd68c0c1ea59141045150842f36d43e1f01d8) ) ROM_REGION16_BE( 0x80, "eeprom", 0 ) // default eeprom to prevent game booting with error @@ -3004,7 +3008,7 @@ ROM_START( vsnetscr ) ROM_LOAD( "627a24.22h", 0x000000, 0x200000, CRC(2cd73305) SHA1(5a46148c08198499639adc4b6936af0b2b530bc9) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "627a23.7r", 0x000000, 0x400000, CRC(d70c59dd) SHA1(c33caca20611202fb489d9416083f41754b1d6e1) ) ROM_END @@ -3042,7 +3046,7 @@ ROM_START( vsnetscreb ) ROM_LOAD( "627a24.22h", 0x000000, 0x200000, CRC(2cd73305) SHA1(5a46148c08198499639adc4b6936af0b2b530bc9) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "627a23.7r", 0x000000, 0x400000, CRC(d70c59dd) SHA1(c33caca20611202fb489d9416083f41754b1d6e1) ) ROM_END @@ -3080,7 +3084,7 @@ ROM_START( vsnetscru ) ROM_LOAD( "627a24.22h", 0x000000, 0x200000, CRC(2cd73305) SHA1(5a46148c08198499639adc4b6936af0b2b530bc9) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "627a23.7r", 0x000000, 0x400000, CRC(d70c59dd) SHA1(c33caca20611202fb489d9416083f41754b1d6e1) ) ROM_END @@ -3244,7 +3248,7 @@ ROM_START( vsnetscrj ) ROM_LOAD( "627a24.22h", 0x000000, 0x200000, CRC(2cd73305) SHA1(5a46148c08198499639adc4b6936af0b2b530bc9) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "627a23.7r", 0x000000, 0x400000, CRC(d70c59dd) SHA1(c33caca20611202fb489d9416083f41754b1d6e1) ) ROM_END @@ -3282,7 +3286,7 @@ ROM_START( vsnetscra ) ROM_LOAD( "627a24.22h", 0x000000, 0x200000, CRC(2cd73305) SHA1(5a46148c08198499639adc4b6936af0b2b530bc9) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "627a23.7r", 0x000000, 0x400000, CRC(d70c59dd) SHA1(c33caca20611202fb489d9416083f41754b1d6e1) ) ROM_END @@ -3316,7 +3320,7 @@ ROM_START( le2 ) ROM_LOAD64_WORD( "312a08.33g", 0x000006, 2*1024*1024, CRC(29015d56) SHA1(7273270804ecefd8f59469c2c2a8a89fb045a12b) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "312a17.9g", 0x000000, 2*1024*1024, CRC(ed101448) SHA1(ef1342f37fbbb092eddee0c237b40989ad42cf26) ) ROM_LOAD( "312a18.7g", 0x200000, 1*1024*1024, CRC(5717abd7) SHA1(d304d733e7fca0363ea6b3872c2d3bbe4edf1179) ) @@ -3354,7 +3358,7 @@ ROM_START( le2u ) ROM_LOAD64_WORD( "312a08.33g", 0x000006, 2*1024*1024, CRC(29015d56) SHA1(7273270804ecefd8f59469c2c2a8a89fb045a12b) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "312a17.9g", 0x000000, 2*1024*1024, CRC(ed101448) SHA1(ef1342f37fbbb092eddee0c237b40989ad42cf26) ) ROM_LOAD( "312a18.7g", 0x200000, 1*1024*1024, CRC(5717abd7) SHA1(d304d733e7fca0363ea6b3872c2d3bbe4edf1179) ) @@ -3393,7 +3397,7 @@ ROM_START( le2j ) ROM_LOAD64_WORD( "312a08.33g", 0x000006, 2*1024*1024, CRC(29015d56) SHA1(7273270804ecefd8f59469c2c2a8a89fb045a12b) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "312a17.9g", 0x000000, 2*1024*1024, CRC(ed101448) SHA1(ef1342f37fbbb092eddee0c237b40989ad42cf26) ) ROM_LOAD( "312a18.7g", 0x200000, 1*1024*1024, CRC(5717abd7) SHA1(d304d733e7fca0363ea6b3872c2d3bbe4edf1179) ) @@ -3443,7 +3447,7 @@ ROM_START( racinfrc ) T1_PSAC6_ROM_LOAD( "250a26.5h", 0x000002, 0x100000, CRC(f72e4cbe) SHA1(822895b42fe4dc8fc1c55501009b6d6e57ee46a1) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "250a17.14y", 0x000000, 2*1024*1024, CRC(adefa079) SHA1(d25911e3a02d92dc936c3d7e9d76fc270bd1a75a) ) ROM_LOAD( "250a18.12y", 0x200000, 2*1024*1024, CRC(8014a2eb) SHA1(d82f0a7d559340ae05a78ecc8bb69bb35b9c0658) ) @@ -3495,7 +3499,7 @@ ROM_START( racinfrcu ) T1_PSAC6_ROM_LOAD( "250a26.5h", 0x000002, 0x100000, CRC(f72e4cbe) SHA1(822895b42fe4dc8fc1c55501009b6d6e57ee46a1) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "250a17.14y", 0x000000, 2*1024*1024, CRC(adefa079) SHA1(d25911e3a02d92dc936c3d7e9d76fc270bd1a75a) ) ROM_LOAD( "250a18.12y", 0x200000, 2*1024*1024, CRC(8014a2eb) SHA1(d82f0a7d559340ae05a78ecc8bb69bb35b9c0658) ) @@ -3582,7 +3586,7 @@ ROM_START( opengolf ) T1_PSAC6_ROM_LOAD( "218a26.5h", 0x000002, 0x200000, CRC(b37e4b7a) SHA1(3d21e540a366f6ef8ba761855fceecd8591179d7) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "218a17.14y", 0x000000, 2*1024*1024, CRC(0b525127) SHA1(218b306c12e1094a676815b7dddaf13bf19be2d5) ) ROM_LOAD( "218a18.12y", 0x200000, 1*1024*1024, CRC(98ec4cfb) SHA1(638753f9d9269719a37133b9c39c242507fdd8ac) ) @@ -3637,7 +3641,7 @@ ROM_START( opengolf2 ) T1_PSAC6_ROM_LOAD( "218a26.5h", 0x000002, 0x200000, CRC(b37e4b7a) SHA1(3d21e540a366f6ef8ba761855fceecd8591179d7) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "218a17.14y", 0x000000, 2*1024*1024, CRC(0b525127) SHA1(218b306c12e1094a676815b7dddaf13bf19be2d5) ) ROM_LOAD( "218a18.12y", 0x200000, 1*1024*1024, CRC(98ec4cfb) SHA1(638753f9d9269719a37133b9c39c242507fdd8ac) ) @@ -3691,7 +3695,7 @@ ROM_START( ggreats2 ) T1_PSAC6_ROM_LOAD( "218a26.5h", 0x000002, 0x200000, CRC(b37e4b7a) SHA1(3d21e540a366f6ef8ba761855fceecd8591179d7) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "218a17.14y", 0x000000, 2*1024*1024, CRC(0b525127) SHA1(218b306c12e1094a676815b7dddaf13bf19be2d5) ) ROM_LOAD( "218a18.12y", 0x200000, 1*1024*1024, CRC(98ec4cfb) SHA1(638753f9d9269719a37133b9c39c242507fdd8ac) ) diff --git a/src/mame/drivers/mystwarr.cpp b/src/mame/drivers/mystwarr.cpp index 38a6e87a2d0..29cd2babb8b 100644 --- a/src/mame/drivers/mystwarr.cpp +++ b/src/mame/drivers/mystwarr.cpp @@ -575,6 +575,26 @@ static ADDRESS_MAP_START( mystwarr_sound_map, AS_PROGRAM, 8, mystwarr_state ) ADDRESS_MAP_END +static ADDRESS_MAP_START( martchmp_sound_map, AS_PROGRAM, 8, mystwarr_state ) + AM_RANGE(0x0000, 0x7fff) AM_ROM + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("z80bank") + AM_RANGE(0x0000, 0xbfff) AM_WRITENOP + AM_RANGE(0xc000, 0xdfff) AM_RAM + AM_RANGE(0xe000, 0xe22f) AM_DEVREADWRITE("k054539", k054539_device, read, write) + AM_RANGE(0xe230, 0xe3ff) AM_RAM + AM_RANGE(0xe400, 0xe62f) AM_NOP + AM_RANGE(0xe630, 0xe7ff) AM_RAM + AM_RANGE(0xf000, 0xf003) AM_DEVICE("k054321", k054321_device, sound_map) + AM_RANGE(0xf800, 0xf800) AM_WRITE(sound_ctrl_w) + AM_RANGE(0xfff0, 0xfff3) AM_WRITENOP // unknown write +ADDRESS_MAP_END + + +static ADDRESS_MAP_START( mystwarr_k054539_map, 0, 8, mystwarr_state ) + AM_RANGE(0x000000, 0x3fffff) AM_ROM AM_REGION("k054539", 0) +ADDRESS_MAP_END + + WRITE_LINE_MEMBER(mystwarr_state::k054539_nmi_gen) { if (m_sound_ctrl & 0x10) @@ -969,13 +989,13 @@ MACHINE_CONFIG_START(mystwarr_state::mystwarr) MCFG_K054321_ADD("k054321", ":lspeaker", ":rspeaker") MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000)) - MCFG_K054539_REGION_OVERRRIDE("shared") + MCFG_DEVICE_ADDRESS_MAP(0, mystwarr_k054539_map) MCFG_K054539_TIMER_HANDLER(WRITELINE(mystwarr_state, k054539_nmi_gen)) MCFG_SOUND_ROUTE(0, "rspeaker", 1.0) /* stereo channels are inverted */ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0) MCFG_DEVICE_ADD("k054539_2", K054539, XTAL(18'432'000)) - MCFG_K054539_REGION_OVERRRIDE("shared") + MCFG_DEVICE_ADDRESS_MAP(0, mystwarr_k054539_map) MCFG_SOUND_ROUTE(0, "rspeaker", 1.0) /* stereo channels are inverted */ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0) MACHINE_CONFIG_END @@ -1122,6 +1142,9 @@ MACHINE_CONFIG_DERIVED(mystwarr_state::martchmp, mystwarr) MCFG_CPU_PROGRAM_MAP(martchmp_map) MCFG_TIMER_MODIFY("scantimer") MCFG_TIMER_DRIVER_CALLBACK(mystwarr_state, mchamp_interrupt) + + MCFG_CPU_MODIFY("soundcpu") + MCFG_CPU_PROGRAM_MAP(martchmp_sound_map) MCFG_DEVICE_REPLACE("k053252", K053252, 16000000/2) MCFG_K053252_OFFSETS(32, 24-1) @@ -1146,6 +1169,14 @@ MACHINE_CONFIG_DERIVED(mystwarr_state::martchmp, mystwarr) MCFG_DEVICE_MODIFY("k055673") MCFG_K055673_CB(mystwarr_state, martchmp_sprite_callback) MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX, -58, -23) + + MCFG_DEVICE_REMOVE("k054539_1") + MCFG_DEVICE_REMOVE("k054539_2") + + MCFG_DEVICE_ADD("k054539", K054539, XTAL(18'432'000)) + MCFG_K054539_TIMER_HANDLER(WRITELINE(mystwarr_state, k054539_nmi_gen)) + MCFG_SOUND_ROUTE(0, "rspeaker", 1.0) /* stereo channels are inverted */ + MCFG_SOUND_ROUTE(1, "lspeaker", 1.0) MACHINE_CONFIG_END /**********************************************************************************/ @@ -1185,7 +1216,7 @@ ROM_START( mystwarr ) ROM_REGION( 0x40000, "gfx3", ROMREGION_ERASE00 ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "128a06.2d", 0x000000, 2*1024*1024, CRC(88ed598c) SHA1(3c123e26b3a12541df77b368bc0e0d486f5622b6) ) ROM_LOAD( "128a07.1d", 0x200000, 2*1024*1024, CRC(db79a66e) SHA1(b7e118ed26bac557038e8ae6cb77f23f3da5646f) ) @@ -1225,7 +1256,7 @@ ROM_START( mystwarru ) ROM_REGION( 0x40000, "gfx3", ROMREGION_ERASE00 ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "128a06.2d", 0x000000, 2*1024*1024, CRC(88ed598c) SHA1(3c123e26b3a12541df77b368bc0e0d486f5622b6) ) ROM_LOAD( "128a07.1d", 0x200000, 2*1024*1024, CRC(db79a66e) SHA1(b7e118ed26bac557038e8ae6cb77f23f3da5646f) ) @@ -1265,7 +1296,7 @@ ROM_START( mystwarrj ) ROM_REGION( 0x40000, "gfx3", ROMREGION_ERASE00 ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "128a06.2d", 0x000000, 2*1024*1024, CRC(88ed598c) SHA1(3c123e26b3a12541df77b368bc0e0d486f5622b6) ) ROM_LOAD( "128a07.1d", 0x200000, 2*1024*1024, CRC(db79a66e) SHA1(b7e118ed26bac557038e8ae6cb77f23f3da5646f) ) @@ -1305,7 +1336,7 @@ ROM_START( mystwarra ) ROM_REGION( 0x40000, "gfx3", ROMREGION_ERASE00 ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "128a06.2d", 0x000000, 2*1024*1024, CRC(88ed598c) SHA1(3c123e26b3a12541df77b368bc0e0d486f5622b6) ) ROM_LOAD( "128a07.1d", 0x200000, 2*1024*1024, CRC(db79a66e) SHA1(b7e118ed26bac557038e8ae6cb77f23f3da5646f) ) @@ -1345,7 +1376,7 @@ ROM_START( mystwarraa ) ROM_REGION( 0x40000, "gfx3", ROMREGION_ERASE00 ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "128a06.2d", 0x000000, 2*1024*1024, CRC(88ed598c) SHA1(3c123e26b3a12541df77b368bc0e0d486f5622b6) ) ROM_LOAD( "128a07.1d", 0x200000, 2*1024*1024, CRC(db79a66e) SHA1(b7e118ed26bac557038e8ae6cb77f23f3da5646f) ) @@ -1380,7 +1411,7 @@ ROM_START( viostorm ) ROM_REGION( 0x40000, "gfx3", ROMREGION_ERASE00) /* sound data */ - ROM_REGION( 0x400000, "shared", 0) + ROM_REGION( 0x400000, "k054539", 0) ROM_LOAD( "168a06.1c", 0x000000, 2*1024*1024, CRC(25404fd7) SHA1(282cf523728b38d0bf14d765dd7257aa1fb2af39) ) ROM_LOAD( "168a07.1e", 0x200000, 2*1024*1024, CRC(fdbbf8cc) SHA1(a8adf72a25fe2b9c4c338350d02c92deb5f8c8e9) ) @@ -1415,7 +1446,7 @@ ROM_START( viostormeb ) ROM_REGION( 0x40000, "gfx3", ROMREGION_ERASE00) /* sound data */ - ROM_REGION( 0x400000, "shared", 0) + ROM_REGION( 0x400000, "k054539", 0) ROM_LOAD( "168a06.1c", 0x000000, 2*1024*1024, CRC(25404fd7) SHA1(282cf523728b38d0bf14d765dd7257aa1fb2af39) ) ROM_LOAD( "168a07.1e", 0x200000, 2*1024*1024, CRC(fdbbf8cc) SHA1(a8adf72a25fe2b9c4c338350d02c92deb5f8c8e9) ) @@ -1450,7 +1481,7 @@ ROM_START( viostormu ) ROM_REGION( 0x40000, "gfx3", ROMREGION_ERASE00) /* sound data */ - ROM_REGION( 0x400000, "shared", 0) + ROM_REGION( 0x400000, "k054539", 0) ROM_LOAD( "168a06.1c", 0x000000, 2*1024*1024, CRC(25404fd7) SHA1(282cf523728b38d0bf14d765dd7257aa1fb2af39) ) ROM_LOAD( "168a07.1e", 0x200000, 2*1024*1024, CRC(fdbbf8cc) SHA1(a8adf72a25fe2b9c4c338350d02c92deb5f8c8e9) ) @@ -1485,7 +1516,7 @@ ROM_START( viostormub ) ROM_REGION( 0x40000, "gfx3", ROMREGION_ERASE00) /* sound data */ - ROM_REGION( 0x400000, "shared", 0) + ROM_REGION( 0x400000, "k054539", 0) ROM_LOAD( "168a06.1c", 0x000000, 2*1024*1024, CRC(25404fd7) SHA1(282cf523728b38d0bf14d765dd7257aa1fb2af39) ) ROM_LOAD( "168a07.1e", 0x200000, 2*1024*1024, CRC(fdbbf8cc) SHA1(a8adf72a25fe2b9c4c338350d02c92deb5f8c8e9) ) @@ -1520,7 +1551,7 @@ ROM_START( viostorma ) ROM_REGION( 0x40000, "gfx3", ROMREGION_ERASE00 ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "168a06.1c", 0x000000, 2*1024*1024, CRC(25404fd7) SHA1(282cf523728b38d0bf14d765dd7257aa1fb2af39) ) ROM_LOAD( "168a07.1e", 0x200000, 2*1024*1024, CRC(fdbbf8cc) SHA1(a8adf72a25fe2b9c4c338350d02c92deb5f8c8e9) ) @@ -1555,7 +1586,7 @@ ROM_START( viostormab ) ROM_REGION( 0x40000, "gfx3", ROMREGION_ERASE00 ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "168a06.1c", 0x000000, 2*1024*1024, CRC(25404fd7) SHA1(282cf523728b38d0bf14d765dd7257aa1fb2af39) ) ROM_LOAD( "168a07.1e", 0x200000, 2*1024*1024, CRC(fdbbf8cc) SHA1(a8adf72a25fe2b9c4c338350d02c92deb5f8c8e9) ) @@ -1591,7 +1622,7 @@ ROM_START( viostormj ) ROM_REGION( 0x40000, "gfx3", ROMREGION_ERASE00 ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "168a06.1c", 0x000000, 2*1024*1024, CRC(25404fd7) SHA1(282cf523728b38d0bf14d765dd7257aa1fb2af39) ) ROM_LOAD( "168a07.1e", 0x200000, 2*1024*1024, CRC(fdbbf8cc) SHA1(a8adf72a25fe2b9c4c338350d02c92deb5f8c8e9) ) @@ -1628,7 +1659,7 @@ ROM_START( metamrph ) ROM_LOAD( "224a14", 0x000000, 0x40000, CRC(3c79b404) SHA1(7c6bb4cbf050f314ea0cd3e8bc6e1947d0573084) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "224a06", 0x000000, 2*1024*1024, CRC(972f6abe) SHA1(30907495fc49fe3424c092b074c1dc137aa14306) ) ROM_LOAD( "224a07", 0x200000, 1*1024*1024, CRC(61b2f97a) SHA1(34bf835d6361c7809d40fa20fd238c9e2a84b101) ) @@ -1665,7 +1696,7 @@ ROM_START( metamrphe ) /* alternate set - possibly a bugfix version. Only 2 adju ROM_LOAD( "224a14", 0x000000, 0x40000, CRC(3c79b404) SHA1(7c6bb4cbf050f314ea0cd3e8bc6e1947d0573084) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "224a06", 0x000000, 2*1024*1024, CRC(972f6abe) SHA1(30907495fc49fe3424c092b074c1dc137aa14306) ) ROM_LOAD( "224a07", 0x200000, 1*1024*1024, CRC(61b2f97a) SHA1(34bf835d6361c7809d40fa20fd238c9e2a84b101) ) @@ -1702,7 +1733,7 @@ ROM_START( metamrpha ) ROM_LOAD( "224a14", 0x000000, 0x40000, CRC(3c79b404) SHA1(7c6bb4cbf050f314ea0cd3e8bc6e1947d0573084) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "224a06", 0x000000, 2*1024*1024, CRC(972f6abe) SHA1(30907495fc49fe3424c092b074c1dc137aa14306) ) ROM_LOAD( "224a07", 0x200000, 1*1024*1024, CRC(61b2f97a) SHA1(34bf835d6361c7809d40fa20fd238c9e2a84b101) ) @@ -1739,7 +1770,7 @@ ROM_START( metamrphu ) ROM_LOAD( "224a14", 0x000000, 0x40000, CRC(3c79b404) SHA1(7c6bb4cbf050f314ea0cd3e8bc6e1947d0573084) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "224a06", 0x000000, 2*1024*1024, CRC(972f6abe) SHA1(30907495fc49fe3424c092b074c1dc137aa14306) ) ROM_LOAD( "224a07", 0x200000, 1*1024*1024, CRC(61b2f97a) SHA1(34bf835d6361c7809d40fa20fd238c9e2a84b101) ) @@ -1776,7 +1807,7 @@ ROM_START( metamrphj ) ROM_LOAD( "224a14", 0x000000, 0x40000, CRC(3c79b404) SHA1(7c6bb4cbf050f314ea0cd3e8bc6e1947d0573084) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "224a06", 0x000000, 2*1024*1024, CRC(972f6abe) SHA1(30907495fc49fe3424c092b074c1dc137aa14306) ) ROM_LOAD( "224a07", 0x200000, 1*1024*1024, CRC(61b2f97a) SHA1(34bf835d6361c7809d40fa20fd238c9e2a84b101) ) @@ -1813,7 +1844,7 @@ ROM_START( mtlchamp ) ROM_LOAD16_BYTE( "234a11.10k", 0x800001, 1024*1024, CRC(82923713) SHA1(a36cd3b2c9d36e93a3c25ba1d4e162f3d92e06ae) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "234a06.2d", 0x000000, 2*1024*1024, CRC(12d32384) SHA1(ecd6cd752b0e20339e17a7652ed843fbb43f7595) ) ROM_LOAD( "234a07.1d", 0x200000, 2*1024*1024, CRC(05ee239f) SHA1(f4e6e7568dc73666a2b5e0c3fe743432e0436464) ) @@ -1850,7 +1881,7 @@ ROM_START( mtlchamp1 ) ROM_LOAD16_BYTE( "234a11.10k", 0x800001, 1024*1024, CRC(82923713) SHA1(a36cd3b2c9d36e93a3c25ba1d4e162f3d92e06ae) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "234a06.2d", 0x000000, 2*1024*1024, CRC(12d32384) SHA1(ecd6cd752b0e20339e17a7652ed843fbb43f7595) ) ROM_LOAD( "234a07.1d", 0x200000, 2*1024*1024, CRC(05ee239f) SHA1(f4e6e7568dc73666a2b5e0c3fe743432e0436464) ) @@ -1887,7 +1918,7 @@ ROM_START( mtlchampa ) ROM_LOAD16_BYTE( "234a11.10k", 0x800001, 1024*1024, CRC(82923713) SHA1(a36cd3b2c9d36e93a3c25ba1d4e162f3d92e06ae) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "234a06.2d", 0x000000, 2*1024*1024, CRC(12d32384) SHA1(ecd6cd752b0e20339e17a7652ed843fbb43f7595) ) ROM_LOAD( "234a07.1d", 0x200000, 2*1024*1024, CRC(05ee239f) SHA1(f4e6e7568dc73666a2b5e0c3fe743432e0436464) ) @@ -1924,7 +1955,7 @@ ROM_START( mtlchampj ) ROM_LOAD16_BYTE( "234a11.10k", 0x800001, 1024*1024, CRC(82923713) SHA1(a36cd3b2c9d36e93a3c25ba1d4e162f3d92e06ae) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "234a06.2d", 0x000000, 2*1024*1024, CRC(12d32384) SHA1(ecd6cd752b0e20339e17a7652ed843fbb43f7595) ) ROM_LOAD( "234a07.1d", 0x200000, 2*1024*1024, CRC(05ee239f) SHA1(f4e6e7568dc73666a2b5e0c3fe743432e0436464) ) @@ -1961,7 +1992,7 @@ ROM_START( mtlchampu ) ROM_LOAD16_BYTE( "234a11.10k", 0x800001, 1024*1024, CRC(82923713) SHA1(a36cd3b2c9d36e93a3c25ba1d4e162f3d92e06ae) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "234a06.2d", 0x000000, 2*1024*1024, CRC(12d32384) SHA1(ecd6cd752b0e20339e17a7652ed843fbb43f7595) ) ROM_LOAD( "234a07.1d", 0x200000, 2*1024*1024, CRC(05ee239f) SHA1(f4e6e7568dc73666a2b5e0c3fe743432e0436464) ) @@ -1998,7 +2029,7 @@ ROM_START( mtlchampu1 ) ROM_LOAD16_BYTE( "234a11.10k", 0x800001, 1024*1024, CRC(82923713) SHA1(a36cd3b2c9d36e93a3c25ba1d4e162f3d92e06ae) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "234a06.2d", 0x000000, 2*1024*1024, CRC(12d32384) SHA1(ecd6cd752b0e20339e17a7652ed843fbb43f7595) ) ROM_LOAD( "234a07.1d", 0x200000, 2*1024*1024, CRC(05ee239f) SHA1(f4e6e7568dc73666a2b5e0c3fe743432e0436464) ) @@ -2045,7 +2076,7 @@ ROM_START( gaiapols ) ROM_LOAD( "123e03.36m", 0x060000, 0x40000, CRC(fde4749f) SHA1(7f9c09d11dcb16d72046c7605570c3a29e279fa9) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "123e14.2g", 0x000000, 2*1024*1024, CRC(65dfd3ff) SHA1(57e13c05f420747c1c2010cc5340dd70e2c28971) ) ROM_LOAD( "123e15.2m", 0x200000, 2*1024*1024, CRC(7017ff07) SHA1(37ecd54f2c757c5385305ab726d9f66aa1afd456) ) @@ -2092,7 +2123,7 @@ ROM_START( gaiapolsu ) ROM_LOAD( "123e03.36m", 0x060000, 0x40000, CRC(fde4749f) SHA1(7f9c09d11dcb16d72046c7605570c3a29e279fa9) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "123e14.2g", 0x000000, 2*1024*1024, CRC(65dfd3ff) SHA1(57e13c05f420747c1c2010cc5340dd70e2c28971) ) ROM_LOAD( "123e15.2m", 0x200000, 2*1024*1024, CRC(7017ff07) SHA1(37ecd54f2c757c5385305ab726d9f66aa1afd456) ) @@ -2139,7 +2170,7 @@ ROM_START( gaiapolsj ) ROM_LOAD( "123e03.36m", 0x060000, 0x40000, CRC(fde4749f) SHA1(7f9c09d11dcb16d72046c7605570c3a29e279fa9) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD( "123e14.2g", 0x000000, 2*1024*1024, CRC(65dfd3ff) SHA1(57e13c05f420747c1c2010cc5340dd70e2c28971) ) ROM_LOAD( "123e15.2m", 0x200000, 2*1024*1024, CRC(7017ff07) SHA1(37ecd54f2c757c5385305ab726d9f66aa1afd456) ) @@ -2186,7 +2217,7 @@ ROM_START( mmaulers ) ROM_LOAD( "170a03.36m", 0x040000, 0x40000, CRC(7fb412b2) SHA1(f603a8f0becf88e345f4b7a68cf018962a255a1e) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD("170a14.2g", 0x000000, 2*1024*1024, CRC(83317cda) SHA1(c5398c5959ef3ea73835e13db69660dd28c31486) ) ROM_LOAD("170a15.2m", 0x200000, 2*1024*1024, CRC(d4113ae9) SHA1(e234d06f462e3db64455c384c2f42174f9ef9c6a) ) @@ -2233,7 +2264,7 @@ ROM_START( dadandrn ) ROM_LOAD( "170a03.36m", 0x040000, 0x40000, CRC(7fb412b2) SHA1(f603a8f0becf88e345f4b7a68cf018962a255a1e) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0 ) + ROM_REGION( 0x400000, "k054539", 0 ) ROM_LOAD("170a14.2g", 0x000000, 2*1024*1024, CRC(83317cda) SHA1(c5398c5959ef3ea73835e13db69660dd28c31486) ) ROM_LOAD("170a15.2m", 0x200000, 2*1024*1024, CRC(d4113ae9) SHA1(e234d06f462e3db64455c384c2f42174f9ef9c6a) ) diff --git a/src/mame/drivers/plygonet.cpp b/src/mame/drivers/plygonet.cpp index 0f2cac4a106..f795b3380a7 100644 --- a/src/mame/drivers/plygonet.cpp +++ b/src/mame/drivers/plygonet.cpp @@ -135,58 +135,6 @@ INTERRUPT_GEN_MEMBER(polygonet_state::polygonet_interrupt) device.execute().set_input_line(M68K_IRQ_5, ASSERT_LINE); } -/* sound CPU communications */ -READ8_MEMBER(polygonet_state::sound_comms_r) -{ - switch (offset) - { - case 0: - // unknown - return 0; - - case 2: - return m_soundlatch->read(space, 0); - - default: - break; - } - - return 0; -} - -WRITE8_MEMBER(polygonet_state::sound_comms_w) -{ - switch (offset) - { - case 0: - // unknown, writes once at boot - break; - - case 2: - // TODO: reset global volume - break; - - case 3: - // TODO: increase global volume - break; - - case 4: - // unknown - break; - - case 6: - m_soundlatch2->write(space, 0, data); - break; - - case 7: - m_soundlatch3->write(space, 0, data); - break; - - default: - break; - } -} - WRITE32_MEMBER(polygonet_state::sound_irq_w) { // Auto-acknowledged interrupt @@ -479,8 +427,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 32, polygonet_state ) AM_RANGE(0x541000, 0x54101f) AM_RAM AM_RANGE(0x580000, 0x5807ff) AM_RAM AM_RANGE(0x580800, 0x580803) AM_READ(network_r) AM_WRITENOP /* network RAM | registers? */ - AM_RANGE(0x600000, 0x600007) AM_WRITE8(sound_comms_w, 0xffffffff) - AM_RANGE(0x600008, 0x60000b) AM_READ8(sound_comms_r, 0xffffffff) + AM_RANGE(0x600000, 0x60000f) AM_DEVICE8("k054321", k054321_device, main_map, 0xffffffff) AM_RANGE(0x640000, 0x640003) AM_WRITE(sound_irq_w) AM_RANGE(0x680000, 0x680003) AM_DEVWRITE("watchdog", watchdog_timer_device, reset32_w) AM_RANGE(0x700000, 0x73ffff) AM_ROM AM_REGION("gfx2", 0) @@ -529,13 +476,11 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, polygonet_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe22f) AM_DEVREADWRITE("k054539_1", k054539_device, read, write) + AM_RANGE(0xe000, 0xe22f) AM_DEVREADWRITE("k054539", k054539_device, read, write) AM_RANGE(0xe230, 0xe3ff) AM_RAM AM_RANGE(0xe400, 0xe62f) AM_READNOP AM_WRITENOP // Second 054539 (not present) AM_RANGE(0xe630, 0xe7ff) AM_RAM - AM_RANGE(0xf000, 0xf000) AM_DEVWRITE("soundlatch", generic_latch_8_device, write) - AM_RANGE(0xf002, 0xf002) AM_DEVREAD("soundlatch2", generic_latch_8_device, read) - AM_RANGE(0xf003, 0xf003) AM_DEVREAD("soundlatch3", generic_latch_8_device, read) + AM_RANGE(0xf000, 0xf003) AM_DEVICE("k054321", k054321_device, sound_map) AM_RANGE(0xf800, 0xf800) AM_WRITE(sound_ctrl_w) ADDRESS_MAP_END @@ -640,13 +585,10 @@ MACHINE_CONFIG_START(polygonet_state::plygonet) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + + MCFG_K054321_ADD("k054321", ":lspeaker", ":rspeaker") - MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_GENERIC_LATCH_8_ADD("soundlatch2") - MCFG_GENERIC_LATCH_8_ADD("soundlatch3") - - MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000)) - MCFG_K054539_REGION_OVERRRIDE("shared") + MCFG_DEVICE_ADD("k054539", K054539, XTAL(18'432'000)) MCFG_K054539_TIMER_HANDLER(WRITELINE(polygonet_state, k054539_nmi_gen)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) MCFG_SOUND_ROUTE(1, "rspeaker", 0.75) @@ -747,7 +689,7 @@ ROM_START( plygonet ) ROM_REGION( 0x40000, "gfx2", 0 ) /* '936 tiles */ ROM_LOAD( "305b07.20d", 0x000000, 0x40000, CRC(e4320bc3) SHA1(b0bb2dac40d42f97da94516d4ebe29b1c3d77c37) ) - ROM_REGION( 0x200000, "shared", 0 ) /* sound data */ + ROM_REGION( 0x200000, "k054539", 0 ) /* sound data */ ROM_LOAD( "305b08.2e", 0x000000, 0x200000, CRC(874607df) SHA1(763b44a80abfbc355bcb9be8bf44373254976019) ) ROM_REGION( 0x80, "eeprom", ROMREGION_ERASEFF ) @@ -770,7 +712,7 @@ ROM_START( polynetw ) ROM_REGION( 0x40000, "gfx2", 0 ) /* '936 tiles */ ROM_LOAD( "305a07.20d", 0x000000, 0x020000, CRC(0959283b) SHA1(482caf96e8e430b87810508b1a1420cd3b58f203) ) - ROM_REGION( 0x400000, "shared", 0 ) /* sound data */ + ROM_REGION( 0x400000, "k054539", 0 ) /* sound data */ ROM_LOAD( "305a08.2e", 0x000000, 0x200000, CRC(7ddb8a52) SHA1(3199b347fc433ffe0de8521001df77672d40771e) ) ROM_LOAD( "305a09.3e", 0x200000, 0x200000, CRC(6da1be58) SHA1(d63ac16ac551193ff8a6036724fb59e1d702e06b) ) diff --git a/src/mame/drivers/qdrmfgp.cpp b/src/mame/drivers/qdrmfgp.cpp index 1f279163ab9..a4c248fc56c 100644 --- a/src/mame/drivers/qdrmfgp.cpp +++ b/src/mame/drivers/qdrmfgp.cpp @@ -351,6 +351,11 @@ static ADDRESS_MAP_START( qdrmfgp2_map, AS_PROGRAM, 16, qdrmfgp_state ) ADDRESS_MAP_END +static ADDRESS_MAP_START( qdrmfgp_k054539_map, 0, 8, qdrmfgp_state ) + AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_REGION("k054539", 0) + AM_RANGE(0x100000, 0x45ffff) AM_RAM AM_SHARE("sndram") +ADDRESS_MAP_END + /************************************* * * Port definitions @@ -562,8 +567,6 @@ MACHINE_START_MEMBER(qdrmfgp_state,qdrmfgp2) void qdrmfgp_state::machine_reset() { - m_sndram = memregion("k054539")->base() + 0x100000; - /* reset the IDE controller */ m_gp2_irq_control = 0; } @@ -613,6 +616,7 @@ MACHINE_CONFIG_START(qdrmfgp_state::qdrmfgp) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_DEVICE_ADD("k054539", K054539, XTAL(18'432'000)) + MCFG_DEVICE_ADDRESS_MAP(0, qdrmfgp_k054539_map) MCFG_K054539_TIMER_HANDLER(WRITELINE(qdrmfgp_state, k054539_irq1_gen)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -657,6 +661,7 @@ MACHINE_CONFIG_START(qdrmfgp_state::qdrmfgp2) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_DEVICE_ADD("k054539", K054539, XTAL(18'432'000)) + MCFG_DEVICE_ADDRESS_MAP(0, qdrmfgp_k054539_map) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -677,7 +682,7 @@ ROM_START( qdrmfgp ) ROM_LOAD( "gq_460_a01.15e", 0x000000, 0x80000, CRC(6536b700) SHA1(47ffe0cfbf80810179560150b23d825fe1a5c5ca) ) ROM_LOAD( "gq_460_a02.17e", 0x080000, 0x80000, CRC(ac01d675) SHA1(bf66433ace95f4ef14699d03add7cbc2e5d90eea) ) - ROM_REGION( 0x460000, "k054539", 0) /* SE SAMPLES + space for additional RAM */ + ROM_REGION( 0x100000, "k054539", 0) /* SE SAMPLES + space for additional RAM */ ROM_LOAD( "gq_460_a07.14h", 0x000000, 0x80000, CRC(67d8ea6b) SHA1(11af1b5a33de2a6e24823964d210bef193ecefe4) ) ROM_LOAD( "gq_460_a06.12h", 0x080000, 0x80000, CRC(97ed5a77) SHA1(68600fd8d914451284cf181fb4bd5872860fb9ad) ) @@ -694,7 +699,7 @@ ROM_START( qdrmfgp2 ) ROM_LOAD( "ge_557_a01.13e", 0x000000, 0x80000, CRC(c301d406) SHA1(5fad8cc611edd83380972abf37ec80561b9317a6) ) ROM_LOAD( "ge_557_a02.15e", 0x080000, 0x80000, CRC(3bfe1e56) SHA1(9e4df512a804a96fcb545d4e0eb58b5421d65ea4) ) - ROM_REGION( 0x460000, "k054539", 0) /* SE SAMPLES + space for additional RAM */ + ROM_REGION( 0x100000, "k054539", 0) /* SE SAMPLES + space for additional RAM */ ROM_LOAD( "ge_557_a07.19h", 0x000000, 0x80000, CRC(7491e0c8) SHA1(6459ab5e7af052ef7a1c4ce01cd844c0f4319f2e) ) ROM_LOAD( "ge_557_a08.19k", 0x080000, 0x80000, CRC(3da2b20c) SHA1(fdc2cdc27f3299f541944a78ce36ed33a7926056) ) diff --git a/src/mame/drivers/rungun.cpp b/src/mame/drivers/rungun.cpp index 6c9afbae219..8a4fe3e5d5e 100644 --- a/src/mame/drivers/rungun.cpp +++ b/src/mame/drivers/rungun.cpp @@ -250,6 +250,11 @@ static ADDRESS_MAP_START( rungun_sound_map, AS_PROGRAM, 8, rungun_state ) ADDRESS_MAP_END +static ADDRESS_MAP_START( rungun_k054539_map, 0, 8, rungun_state ) + AM_RANGE(0x000000, 0x3fffff) AM_ROM AM_REGION("k054539", 0) +ADDRESS_MAP_END + + static INPUT_PORTS_START( rng ) PORT_START("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) @@ -440,13 +445,13 @@ MACHINE_CONFIG_START(rungun_state::rng) MCFG_K054321_ADD("k054321", ":lspeaker", ":rspeaker") MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000)) - MCFG_K054539_REGION_OVERRRIDE("shared") + MCFG_DEVICE_ADDRESS_MAP(0, rungun_k054539_map) MCFG_K054539_TIMER_HANDLER(WRITELINE(rungun_state, k054539_nmi_gen)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_DEVICE_ADD("k054539_2", K054539, XTAL(18'432'000)) - MCFG_K054539_REGION_OVERRRIDE("shared") + MCFG_DEVICE_ADDRESS_MAP(0, rungun_k054539_map) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -510,7 +515,7 @@ ROM_START( rungun ) ROM_LOAD( "247-a12", 0x000000, 0x20000, CRC(57a8d26e) SHA1(0431d10b76d77c26a1f6f2b55d9dbcfa959e1cd0) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0) + ROM_REGION( 0x400000, "k054539", 0) ROM_LOAD( "247-a06", 0x000000, 0x200000, CRC(b8b2a67e) SHA1(a873d32f4b178c714743664fa53c0dca29cb3ce4) ) ROM_LOAD( "247-a07", 0x200000, 0x200000, CRC(0108142d) SHA1(4dc6a36d976dad9c0da5a5b1f01f2eb3b369c99d) ) @@ -552,7 +557,7 @@ ROM_START( rungund ) // same as above set, but with demux adapter connected ROM_LOAD( "247-a12", 0x000000, 0x20000, CRC(57a8d26e) SHA1(0431d10b76d77c26a1f6f2b55d9dbcfa959e1cd0) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0) + ROM_REGION( 0x400000, "k054539", 0) ROM_LOAD( "247-a06", 0x000000, 0x200000, CRC(b8b2a67e) SHA1(a873d32f4b178c714743664fa53c0dca29cb3ce4) ) ROM_LOAD( "247-a07", 0x200000, 0x200000, CRC(0108142d) SHA1(4dc6a36d976dad9c0da5a5b1f01f2eb3b369c99d) ) @@ -594,7 +599,7 @@ ROM_START( runguna ) ROM_LOAD( "247-a12", 0x000000, 0x20000, CRC(57a8d26e) SHA1(0431d10b76d77c26a1f6f2b55d9dbcfa959e1cd0) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0) + ROM_REGION( 0x400000, "k054539", 0) ROM_LOAD( "247-a06", 0x000000, 0x200000, CRC(b8b2a67e) SHA1(a873d32f4b178c714743664fa53c0dca29cb3ce4) ) ROM_LOAD( "247-a07", 0x200000, 0x200000, CRC(0108142d) SHA1(4dc6a36d976dad9c0da5a5b1f01f2eb3b369c99d) ) @@ -637,7 +642,7 @@ ROM_START( rungunad ) // same as above set, but with demux adapter connected ROM_LOAD( "247-a12", 0x000000, 0x20000, CRC(57a8d26e) SHA1(0431d10b76d77c26a1f6f2b55d9dbcfa959e1cd0) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0) + ROM_REGION( 0x400000, "k054539", 0) ROM_LOAD( "247-a06", 0x000000, 0x200000, CRC(b8b2a67e) SHA1(a873d32f4b178c714743664fa53c0dca29cb3ce4) ) ROM_LOAD( "247-a07", 0x200000, 0x200000, CRC(0108142d) SHA1(4dc6a36d976dad9c0da5a5b1f01f2eb3b369c99d) ) @@ -684,7 +689,7 @@ ROM_START( rungunb ) ROM_LOAD( "247-a12", 0x000000, 0x20000, CRC(57a8d26e) SHA1(0431d10b76d77c26a1f6f2b55d9dbcfa959e1cd0) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0) + ROM_REGION( 0x400000, "k054539", 0) ROM_LOAD( "247-a06", 0x000000, 0x200000, CRC(b8b2a67e) SHA1(a873d32f4b178c714743664fa53c0dca29cb3ce4) ) ROM_LOAD( "247-a07", 0x200000, 0x200000, CRC(0108142d) SHA1(4dc6a36d976dad9c0da5a5b1f01f2eb3b369c99d) ) @@ -727,7 +732,7 @@ ROM_START( rungunbd ) // same as above set, but with demux adapter connected ROM_LOAD( "247-a12", 0x000000, 0x20000, CRC(57a8d26e) SHA1(0431d10b76d77c26a1f6f2b55d9dbcfa959e1cd0) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0) + ROM_REGION( 0x400000, "k054539", 0) ROM_LOAD( "247-a06", 0x000000, 0x200000, CRC(b8b2a67e) SHA1(a873d32f4b178c714743664fa53c0dca29cb3ce4) ) ROM_LOAD( "247-a07", 0x200000, 0x200000, CRC(0108142d) SHA1(4dc6a36d976dad9c0da5a5b1f01f2eb3b369c99d) ) @@ -768,7 +773,7 @@ ROM_START( rungunua ) ROM_LOAD( "247-a12", 0x000000, 0x20000, CRC(57a8d26e) SHA1(0431d10b76d77c26a1f6f2b55d9dbcfa959e1cd0) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0) + ROM_REGION( 0x400000, "k054539", 0) ROM_LOAD( "247-a06", 0x000000, 0x200000, CRC(b8b2a67e) SHA1(a873d32f4b178c714743664fa53c0dca29cb3ce4) ) ROM_LOAD( "247-a07", 0x200000, 0x200000, CRC(0108142d) SHA1(4dc6a36d976dad9c0da5a5b1f01f2eb3b369c99d) ) @@ -810,7 +815,7 @@ ROM_START( rungunuad ) // same as above set, but with demux adapter connected ROM_LOAD( "247-a12", 0x000000, 0x20000, CRC(57a8d26e) SHA1(0431d10b76d77c26a1f6f2b55d9dbcfa959e1cd0) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0) + ROM_REGION( 0x400000, "k054539", 0) ROM_LOAD( "247-a06", 0x000000, 0x200000, CRC(b8b2a67e) SHA1(a873d32f4b178c714743664fa53c0dca29cb3ce4) ) ROM_LOAD( "247-a07", 0x200000, 0x200000, CRC(0108142d) SHA1(4dc6a36d976dad9c0da5a5b1f01f2eb3b369c99d) ) @@ -852,7 +857,7 @@ ROM_START( slmdunkj ) ROM_LOAD( "247-a12", 0x000000, 0x20000, CRC(57a8d26e) SHA1(0431d10b76d77c26a1f6f2b55d9dbcfa959e1cd0) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0) + ROM_REGION( 0x400000, "k054539", 0) ROM_LOAD( "247-a06", 0x000000, 0x200000, CRC(b8b2a67e) SHA1(a873d32f4b178c714743664fa53c0dca29cb3ce4) ) ROM_LOAD( "247-a07", 0x200000, 0x200000, CRC(0108142d) SHA1(4dc6a36d976dad9c0da5a5b1f01f2eb3b369c99d) ) @@ -894,7 +899,7 @@ ROM_START( slmdunkjd ) // same as above set, but with demux adapter connected ROM_LOAD( "247-a12", 0x000000, 0x20000, CRC(57a8d26e) SHA1(0431d10b76d77c26a1f6f2b55d9dbcfa959e1cd0) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0) + ROM_REGION( 0x400000, "k054539", 0) ROM_LOAD( "247-a06", 0x000000, 0x200000, CRC(b8b2a67e) SHA1(a873d32f4b178c714743664fa53c0dca29cb3ce4) ) ROM_LOAD( "247-a07", 0x200000, 0x200000, CRC(0108142d) SHA1(4dc6a36d976dad9c0da5a5b1f01f2eb3b369c99d) ) @@ -935,7 +940,7 @@ ROM_START( rungunud ) // dual cabinet setup ONLY ROM_LOAD( "247-a12", 0x000000, 0x20000, CRC(57a8d26e) SHA1(0431d10b76d77c26a1f6f2b55d9dbcfa959e1cd0) ) /* sound data */ - ROM_REGION( 0x400000, "shared", 0) + ROM_REGION( 0x400000, "k054539", 0) ROM_LOAD( "247-a06", 0x000000, 0x200000, CRC(b8b2a67e) SHA1(a873d32f4b178c714743664fa53c0dca29cb3ce4) ) ROM_LOAD( "247-a07", 0x200000, 0x200000, CRC(0108142d) SHA1(4dc6a36d976dad9c0da5a5b1f01f2eb3b369c99d) ) diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp index 39404afc759..159a34eb4eb 100644 --- a/src/mame/drivers/vgmplay.cpp +++ b/src/mame/drivers/vgmplay.cpp @@ -19,6 +19,7 @@ #include "sound/c6280.h" #include "sound/gb.h" #include "sound/k053260.h" +#include "sound/k054539.h" #include "sound/multipcm.h" #include "sound/okim6295.h" #include "sound/pokey.h" @@ -78,6 +79,8 @@ public: A_YMF271 = 0x00013040, A_YMZ280B = 0x00013050, A_YM2608 = 0x00013060 + A_K054539A = 0x00014000, + A_K054539B = 0x00014400, }; enum io16_t @@ -110,6 +113,8 @@ public: READ8_MEMBER(multipcma_rom_r); READ8_MEMBER(multipcmb_rom_r); READ8_MEMBER(k053260_rom_r); + READ8_MEMBER(k054539a_rom_r); + READ8_MEMBER(k054539b_rom_r); READ8_MEMBER(okim6295_rom_r); READ8_MEMBER(c352_rom_r); @@ -182,6 +187,8 @@ private: required_device m_nescpu; required_shared_ptr m_nesram; required_device m_k053260; + required_device m_k054539a; + required_device m_k054539b; required_device m_c6280; required_device m_h6280; required_device m_pokeya; @@ -536,6 +543,15 @@ void vgmplay_device::execute_run() m_pc += 4; break; } + + case 0xd3: + uint16_t offset = m_file->read_byte(m_pc+1) << 16 | m_file->read_byte(m_pc+2); + if (offset & 0x8000) + m_io->write_byte(A_K054539B + (offset & 0x3ff), m_file->read_byte(m_pc+3)); + else + m_io->write_byte(A_K054539A + (offset & 0x3ff), m_file->read_byte(m_pc+3)); + m_pc += 4; + break; case 0xe0: m_ym2612_stream_offset = m_file->read_dword(m_pc+1); @@ -942,6 +958,16 @@ READ8_MEMBER(vgmplay_device::okim6295_rom_r) return rom_r(0, 0x8b, offset); } +READ8_MEMBER(vgmplay_device::k054539a_rom_r) +{ + return rom_r(0, 0x8c, offset); +} + +READ8_MEMBER(vgmplay_device::k054539b_rom_r) +{ + return rom_r(1, 0x8c, offset); +} + READ8_MEMBER(vgmplay_device::k053260_rom_r) { return rom_r(0, 0x8e, offset); @@ -972,6 +998,8 @@ vgmplay_state::vgmplay_state(const machine_config &mconfig, device_type type, co , m_nescpu(*this, "nescpu") , m_nesram(*this, "nesapu_ram") , m_k053260(*this, "k053260") + , m_k054539a(*this, "k054539a") + , m_k054539b(*this, "k054539b") , m_c6280(*this, "c6280") , m_h6280(*this, "h6280") , m_pokeya(*this, "pokeya") @@ -1178,6 +1206,10 @@ void vgmplay_state::machine_start() m_multipcmb->set_unscaled_clock(clock); } } + if(version >= 0x161 && r8(0x95)) { + m_k054539a->init_flags(r8(0x95)); + m_k054539b->init_flags(r8(0x95)); + } if(version >= 0x161 && r32(0x98)) { uint32_t clock = r32(0x98); uint32_t pin7 = 0; @@ -1188,6 +1220,14 @@ void vgmplay_state::machine_start() okim6295_device::static_set_pin7(*m_okim6295, pin7); m_okim6295->set_unscaled_clock(clock); } + if(version >= 0x161 && r32(0xa0)) { + uint32_t clock = r32(0xa0); + m_k054539a->set_unscaled_clock(clock & ~0x40000000); + if (clock & 0x40000000) { + clock &= ~0x40000000; + m_k054539b->set_unscaled_clock(clock); + } + } if(version >= 0x161 && r32(0xac)) { m_k053260->set_unscaled_clock(r32(0xac)); } @@ -1277,39 +1317,41 @@ static ADDRESS_MAP_START( soundchips16_map, AS_IO16, 16, vgmplay_state ) ADDRESS_MAP_END static ADDRESS_MAP_START( soundchips_map, AS_IO, 8, vgmplay_state ) - AM_RANGE(vgmplay_device::REG_SIZE, vgmplay_device::REG_SIZE+3) AM_READ(file_size_r) - AM_RANGE(vgmplay_device::A_YM2612, vgmplay_device::A_YM2612+3) AM_DEVWRITE ("ym2612", ym2612_device, write) - AM_RANGE(vgmplay_device::A_YM2151, vgmplay_device::A_YM2151+1) AM_DEVWRITE ("ym2151", ym2151_device, write) - AM_RANGE(vgmplay_device::A_YM2413, vgmplay_device::A_YM2413+1) AM_DEVWRITE ("ym2413", ym2413_device, write) - AM_RANGE(vgmplay_device::A_YM2203A, vgmplay_device::A_YM2203A+1) AM_DEVWRITE ("ym2203a", ym2203_device, write) - AM_RANGE(vgmplay_device::A_YM2203B, vgmplay_device::A_YM2203B+1) AM_DEVWRITE ("ym2203b", ym2203_device, write) - AM_RANGE(vgmplay_device::A_YM3526, vgmplay_device::A_YM3526+1) AM_DEVWRITE ("ym3526", ym3526_device, write) - AM_RANGE(vgmplay_device::A_YM3812, vgmplay_device::A_YM3812+1) AM_DEVWRITE ("ym3812", ym3812_device, write) - AM_RANGE(vgmplay_device::A_AY8910A, vgmplay_device::A_AY8910A) AM_DEVWRITE ("ay8910a", ay8910_device, data_w) - AM_RANGE(vgmplay_device::A_AY8910A+1, vgmplay_device::A_AY8910A+1) AM_DEVWRITE ("ay8910a", ay8910_device, address_w) - AM_RANGE(vgmplay_device::A_AY8910B, vgmplay_device::A_AY8910B) AM_DEVWRITE ("ay8910b", ay8910_device, data_w) - AM_RANGE(vgmplay_device::A_AY8910B+1, vgmplay_device::A_AY8910B+1) AM_DEVWRITE ("ay8910b", ay8910_device, address_w) -// AM_RANGE(vgmplay_device::A_SN76496+0, vgmplay_device::A_SN76496+0) AM_DEVWRITE ("sn76496", sn76496_device, stereo_w) - AM_RANGE(vgmplay_device::A_SN76496+1, vgmplay_device::A_SN76496+1) AM_DEVWRITE ("sn76496", sn76496_device, write) - AM_RANGE(vgmplay_device::A_K053260, vgmplay_device::A_K053260+0x2f) AM_DEVWRITE ("k053260", k053260_device, write) - AM_RANGE(vgmplay_device::A_C6280, vgmplay_device::A_C6280+0xf) AM_DEVWRITE ("c6280", c6280_device, c6280_w) - AM_RANGE(vgmplay_device::A_OKIM6295, vgmplay_device::A_OKIM6295) AM_DEVWRITE ("okim6295", okim6295_device, write) - AM_RANGE(vgmplay_device::A_SEGAPCM, vgmplay_device::A_SEGAPCM+0x7ff) AM_DEVWRITE ("segapcm", segapcm_device, sega_pcm_w) - AM_RANGE(vgmplay_device::A_GAMEBOY, vgmplay_device::A_GAMEBOY+0x16) AM_DEVWRITE ("dmg", gameboy_sound_device, sound_w) - AM_RANGE(vgmplay_device::A_GAMEBOY+0x20, vgmplay_device::A_GAMEBOY+0x2f) AM_DEVWRITE ("dmg", gameboy_sound_device, wave_w) - AM_RANGE(vgmplay_device::A_NESAPU, vgmplay_device::A_NESAPU+0x1f) AM_DEVWRITE ("nescpu:nesapu", nesapu_device, write) - AM_RANGE(vgmplay_device::A_NESRAM, vgmplay_device::A_NESRAM+0xffff) AM_RAM AM_SHARE("nesapu_ram") - AM_RANGE(vgmplay_device::A_MULTIPCMA, vgmplay_device::A_MULTIPCMA+3) AM_DEVWRITE ("multipcma", multipcm_device, write ) - AM_RANGE(vgmplay_device::A_MULTIPCMA+4, vgmplay_device::A_MULTIPCMA+7) AM_WRITE(multipcm_bank_hi_a_w) - AM_RANGE(vgmplay_device::A_MULTIPCMA+8, vgmplay_device::A_MULTIPCMA+11) AM_WRITE(multipcm_bank_lo_a_w) - AM_RANGE(vgmplay_device::A_MULTIPCMB, vgmplay_device::A_MULTIPCMB+3) AM_DEVWRITE ("multipcmb", multipcm_device, write ) - AM_RANGE(vgmplay_device::A_MULTIPCMB+4, vgmplay_device::A_MULTIPCMB+7) AM_WRITE(multipcm_bank_hi_b_w) - AM_RANGE(vgmplay_device::A_MULTIPCMB+8, vgmplay_device::A_MULTIPCMB+11) AM_WRITE(multipcm_bank_lo_b_w) - AM_RANGE(vgmplay_device::A_POKEYA, vgmplay_device::A_POKEYA+0xf) AM_DEVWRITE ("pokeya", pokey_device, write) - AM_RANGE(vgmplay_device::A_POKEYB, vgmplay_device::A_POKEYB+0xf) AM_DEVWRITE ("pokeyb", pokey_device, write) - AM_RANGE(vgmplay_device::A_YMF271, vgmplay_device::A_YMF271+0xf) AM_DEVWRITE ("ymf271", ymf271_device, write) - AM_RANGE(vgmplay_device::A_YMZ280B, vgmplay_device::A_YMZ280B+0x1) AM_DEVWRITE ("ymz280b", ymz280b_device, write) - AM_RANGE(vgmplay_device::A_YM2608, vgmplay_device::A_YM2608+0x3) AM_DEVWRITE ("ym2608", ym2608_device, write) + AM_RANGE(vgmplay_device::REG_SIZE, vgmplay_device::REG_SIZE+3) AM_READ(file_size_r) + AM_RANGE(vgmplay_device::A_YM2612, vgmplay_device::A_YM2612+3) AM_DEVWRITE ("ym2612", ym2612_device, write) + AM_RANGE(vgmplay_device::A_YM2151, vgmplay_device::A_YM2151+1) AM_DEVWRITE ("ym2151", ym2151_device, write) + AM_RANGE(vgmplay_device::A_YM2413, vgmplay_device::A_YM2413+1) AM_DEVWRITE ("ym2413", ym2413_device, write) + AM_RANGE(vgmplay_device::A_YM2203A, vgmplay_device::A_YM2203A+1) AM_DEVWRITE ("ym2203a", ym2203_device, write) + AM_RANGE(vgmplay_device::A_YM2203B, vgmplay_device::A_YM2203B+1) AM_DEVWRITE ("ym2203b", ym2203_device, write) + AM_RANGE(vgmplay_device::A_YM3526, vgmplay_device::A_YM3526+1) AM_DEVWRITE ("ym3526", ym3526_device, write) + AM_RANGE(vgmplay_device::A_YM3812, vgmplay_device::A_YM3812+1) AM_DEVWRITE ("ym3812", ym3812_device, write) + AM_RANGE(vgmplay_device::A_AY8910A, vgmplay_device::A_AY8910A) AM_DEVWRITE ("ay8910a", ay8910_device, data_w) + AM_RANGE(vgmplay_device::A_AY8910A+1, vgmplay_device::A_AY8910A+1) AM_DEVWRITE ("ay8910a", ay8910_device, address_w) + AM_RANGE(vgmplay_device::A_AY8910B, vgmplay_device::A_AY8910B) AM_DEVWRITE ("ay8910b", ay8910_device, data_w) + AM_RANGE(vgmplay_device::A_AY8910B+1, vgmplay_device::A_AY8910B+1) AM_DEVWRITE ("ay8910b", ay8910_device, address_w) +// AM_RANGE(vgmplay_device::A_SN76496+0, vgmplay_device::A_SN76496+0) AM_DEVWRITE ("sn76496", sn76496_device, stereo_w) + AM_RANGE(vgmplay_device::A_SN76496+1, vgmplay_device::A_SN76496+1) AM_DEVWRITE ("sn76496", sn76496_device, write) + AM_RANGE(vgmplay_device::A_K053260, vgmplay_device::A_K053260+0x2f) AM_DEVWRITE ("k053260", k053260_device, write) + AM_RANGE(vgmplay_device::A_C6280, vgmplay_device::A_C6280+0xf) AM_DEVWRITE ("c6280", c6280_device, c6280_w) + AM_RANGE(vgmplay_device::A_OKIM6295, vgmplay_device::A_OKIM6295) AM_DEVWRITE ("okim6295", okim6295_device, write) + AM_RANGE(vgmplay_device::A_SEGAPCM, vgmplay_device::A_SEGAPCM+0x7ff) AM_DEVWRITE ("segapcm", segapcm_device, sega_pcm_w) + AM_RANGE(vgmplay_device::A_GAMEBOY, vgmplay_device::A_GAMEBOY+0x16) AM_DEVWRITE ("dmg", gameboy_sound_device, sound_w) + AM_RANGE(vgmplay_device::A_GAMEBOY+0x20, vgmplay_device::A_GAMEBOY+0x2f) AM_DEVWRITE ("dmg", gameboy_sound_device, wave_w) + AM_RANGE(vgmplay_device::A_NESAPU, vgmplay_device::A_NESAPU+0x1f) AM_DEVWRITE ("nescpu:nesapu", nesapu_device, write) + AM_RANGE(vgmplay_device::A_NESRAM, vgmplay_device::A_NESRAM+0xffff) AM_RAM AM_SHARE("nesapu_ram") + AM_RANGE(vgmplay_device::A_MULTIPCMA, vgmplay_device::A_MULTIPCMA+3) AM_DEVWRITE ("multipcma", multipcm_device, write ) + AM_RANGE(vgmplay_device::A_MULTIPCMA+4, vgmplay_device::A_MULTIPCMA+7) AM_WRITE(multipcm_bank_hi_a_w) + AM_RANGE(vgmplay_device::A_MULTIPCMA+8, vgmplay_device::A_MULTIPCMA+11) AM_WRITE(multipcm_bank_lo_a_w) + AM_RANGE(vgmplay_device::A_MULTIPCMB, vgmplay_device::A_MULTIPCMB+3) AM_DEVWRITE ("multipcmb", multipcm_device, write ) + AM_RANGE(vgmplay_device::A_MULTIPCMB+4, vgmplay_device::A_MULTIPCMB+7) AM_WRITE(multipcm_bank_hi_b_w) + AM_RANGE(vgmplay_device::A_MULTIPCMB+8, vgmplay_device::A_MULTIPCMB+11) AM_WRITE(multipcm_bank_lo_b_w) + AM_RANGE(vgmplay_device::A_POKEYA, vgmplay_device::A_POKEYA+0xf) AM_DEVWRITE ("pokeya", pokey_device, write) + AM_RANGE(vgmplay_device::A_POKEYB, vgmplay_device::A_POKEYB+0xf) AM_DEVWRITE ("pokeyb", pokey_device, write) + AM_RANGE(vgmplay_device::A_YMF271, vgmplay_device::A_YMF271+0xf) AM_DEVWRITE ("ymf271", ymf271_device, write) + AM_RANGE(vgmplay_device::A_YMZ280B, vgmplay_device::A_YMZ280B+0x1) AM_DEVWRITE ("ymz280b", ymz280b_device, write) + AM_RANGE(vgmplay_device::A_YM2608, vgmplay_device::A_YM2608+0x3) AM_DEVWRITE ("ym2608", ym2608_device, write) + AM_RANGE(vgmplay_device::A_K054539A, vgmplay_device::A_K054539A+0x22f) AM_DEVWRITE ("k054539a", k054539a_device, write) + AM_RANGE(vgmplay_device::A_K054539B, vgmplay_device::A_K054539B+0x22f) AM_DEVWRITE ("k054539b", k054539b_device, write) ADDRESS_MAP_END static ADDRESS_MAP_START( segapcm_map, 0, 8, vgmplay_state ) @@ -1328,6 +1370,14 @@ static ADDRESS_MAP_START( k053260_map, 0, 8, vgmplay_state ) AM_RANGE(0, 0x1fffff) AM_DEVREAD("vgmplay", vgmplay_device, k053260_rom_r) ADDRESS_MAP_END +static ADDRESS_MAP_START( k054539a_map, 0, 8, vgmplay_state ) + AM_RANGE(0, 0x1fffff) AM_DEVREAD("vgmplay", vgmplay_device, k054539a_rom_r) +ADDRESS_MAP_END + +static ADDRESS_MAP_START( k054539b_map, 0, 8, vgmplay_state ) + AM_RANGE(0, 0x1fffff) AM_DEVREAD("vgmplay", vgmplay_device, k054539b_rom_r) +ADDRESS_MAP_END + static ADDRESS_MAP_START( okim6295_map, 0, 8, vgmplay_state ) AM_RANGE(0, 0x3ffff) AM_DEVREAD("vgmplay", vgmplay_device, okim6295_rom_r) ADDRESS_MAP_END @@ -1476,6 +1526,16 @@ MACHINE_CONFIG_START(vgmplay_state::vgmplay) MCFG_SOUND_ROUTE(0, "rspeaker", 0.25) MCFG_SOUND_ROUTE(1, "lspeaker", 0.50) MCFG_SOUND_ROUTE(2, "rspeaker", 0.50) + + MCFG_DEVICE_ADD("k054539a", K054539, XTAL(18'432'000)) + MCFG_DEVICE_ADDRESS_MAP(0, k054539a_map) + MCFG_SOUND_ROUTE(0, "lspeaker", 1) + MCFG_SOUND_ROUTE(1, "rspeaker", 1) + + MCFG_DEVICE_ADD("k054539b", K054539, XTAL(18'432'000)) + MCFG_DEVICE_ADDRESS_MAP(0, k054539b_map) + MCFG_SOUND_ROUTE(0, "lspeaker", 1) + MCFG_SOUND_ROUTE(1, "rspeaker", 1) MACHINE_CONFIG_END ROM_START( vgmplay ) diff --git a/src/mame/drivers/zr107.cpp b/src/mame/drivers/zr107.cpp index 5685932f9d3..321427a41a1 100644 --- a/src/mame/drivers/zr107.cpp +++ b/src/mame/drivers/zr107.cpp @@ -543,6 +543,10 @@ static ADDRESS_MAP_START( sound_memmap, AS_PROGRAM, 16, zr107_state ) AM_RANGE(0x580000, 0x580001) AM_WRITENOP // 'NRES' - D2: K056602 /RESET ADDRESS_MAP_END +static ADDRESS_MAP_START( k054539_map, 0, 8, zr107_state ) + AM_RANGE(0x000000, 0x5fffff) AM_ROM AM_REGION("k054539", 0) +ADDRESS_MAP_END + /*****************************************************************************/ @@ -810,13 +814,13 @@ MACHINE_CONFIG_START(zr107_state::zr107) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000)) - MCFG_K054539_REGION_OVERRRIDE("shared") + MCFG_DEVICE_ADDRESS_MAP(0, k054539_map) MCFG_K054539_TIMER_HANDLER(WRITELINE(zr107_state, k054539_irq_gen)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) MCFG_SOUND_ROUTE(1, "rspeaker", 0.75) MCFG_DEVICE_ADD("k054539_2", K054539, XTAL(18'432'000)) - MCFG_K054539_REGION_OVERRRIDE("shared") + MCFG_DEVICE_ADDRESS_MAP(0, k054539_map) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) MCFG_SOUND_ROUTE(1, "rspeaker", 0.75) @@ -889,13 +893,13 @@ MACHINE_CONFIG_START(zr107_state::jetwave) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000)) - MCFG_K054539_REGION_OVERRRIDE("shared") + MCFG_DEVICE_ADDRESS_MAP(0, k054539_map) MCFG_K054539_TIMER_HANDLER(WRITELINE(zr107_state, k054539_irq_gen)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) MCFG_SOUND_ROUTE(1, "rspeaker", 0.75) MCFG_DEVICE_ADD("k054539_2", K054539, XTAL(18'432'000)) - MCFG_K054539_REGION_OVERRRIDE("shared") + MCFG_DEVICE_ADDRESS_MAP(0, k054539_map) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) MCFG_SOUND_ROUTE(1, "rspeaker", 0.75) @@ -950,7 +954,7 @@ ROM_START( midnrun ) ROM_LOAD32_BYTE( "477a15.5h", 0x000002, 0x200000, CRC(e337fce7) SHA1(c84875f3275efd47273508b340231721f5a631d2) ) ROM_LOAD32_BYTE( "477a16.2h", 0x000003, 0x200000, CRC(2c03ee63) SHA1(6b74d340dddf92bb4e4b1e037f003d58c65d8d9b) ) - ROM_REGION(0x600000, "shared", 0) /* Sound data */ + ROM_REGION(0x600000, "k054539", 0) /* Sound data */ ROM_LOAD( "477a08.5r", 0x000000, 0x200000, CRC(d320dbde) SHA1(eb602cad6ac7c7151c9f29d39b10041d5a354164) ) ROM_LOAD( "477a09.3r", 0x200000, 0x200000, CRC(f431e29f) SHA1(e6082d88f86abb63d02ac34e70873b58f88b0ddc) ) ROM_LOAD( "477a10.5n", 0x400000, 0x200000, CRC(8db31bd4) SHA1(d662d3bb6e8b44a01ffa158f5d7425454aad49a3) ) @@ -976,7 +980,7 @@ ROM_START( midnruna ) ROM_LOAD32_BYTE( "477a15.5h", 0x000002, 0x200000, CRC(e337fce7) SHA1(c84875f3275efd47273508b340231721f5a631d2) ) ROM_LOAD32_BYTE( "477a16.2h", 0x000003, 0x200000, CRC(2c03ee63) SHA1(6b74d340dddf92bb4e4b1e037f003d58c65d8d9b) ) - ROM_REGION(0x600000, "shared", 0) /* Sound data */ + ROM_REGION(0x600000, "k054539", 0) /* Sound data */ ROM_LOAD( "477a08.5r", 0x000000, 0x200000, CRC(d320dbde) SHA1(eb602cad6ac7c7151c9f29d39b10041d5a354164) ) ROM_LOAD( "477a09.3r", 0x200000, 0x200000, CRC(f431e29f) SHA1(e6082d88f86abb63d02ac34e70873b58f88b0ddc) ) ROM_LOAD( "477a10.5n", 0x400000, 0x200000, CRC(8db31bd4) SHA1(d662d3bb6e8b44a01ffa158f5d7425454aad49a3) ) @@ -1002,7 +1006,7 @@ ROM_START( windheat ) ROM_LOAD32_BYTE( "677a15.5h", 0x000002, 0x200000, CRC(62e2c3dd) SHA1(c9127ed70bdff947c3da2908a08974091615a685) ) ROM_LOAD32_BYTE( "677a16.2h", 0x000003, 0x200000, CRC(7cc75539) SHA1(4bd8d88debf7489f30008bd4cbded67cb1a20ab0) ) - ROM_REGION(0x600000, "shared", 0) /* Sound data */ + ROM_REGION(0x600000, "k054539", 0) /* Sound data */ ROM_LOAD( "677a08.5r", 0x000000, 0x200000, CRC(bde38850) SHA1(aaf1bdfc25ecdffc1f6076c9c1b2edbe263171d2) ) ROM_LOAD( "677a09.3r", 0x200000, 0x200000, CRC(4dfc1ea9) SHA1(4ab264c1902b522bc0589766e42f2b6ca276808d) ) ROM_LOAD( "677a10.5n", 0x400000, 0x200000, CRC(d8f77a68) SHA1(ff251863ef096f0864f6cbe6caa43b0aa299d9ee) ) @@ -1028,7 +1032,7 @@ ROM_START( windheatu ) ROM_LOAD32_BYTE( "677a15.5h", 0x000002, 0x200000, CRC(62e2c3dd) SHA1(c9127ed70bdff947c3da2908a08974091615a685) ) ROM_LOAD32_BYTE( "677a16.2h", 0x000003, 0x200000, CRC(7cc75539) SHA1(4bd8d88debf7489f30008bd4cbded67cb1a20ab0) ) - ROM_REGION(0x600000, "shared", 0) /* Sound data */ + ROM_REGION(0x600000, "k054539", 0) /* Sound data */ ROM_LOAD( "677a08.5r", 0x000000, 0x200000, CRC(bde38850) SHA1(aaf1bdfc25ecdffc1f6076c9c1b2edbe263171d2) ) ROM_LOAD( "677a09.3r", 0x200000, 0x200000, CRC(4dfc1ea9) SHA1(4ab264c1902b522bc0589766e42f2b6ca276808d) ) ROM_LOAD( "677a10.5n", 0x400000, 0x200000, CRC(d8f77a68) SHA1(ff251863ef096f0864f6cbe6caa43b0aa299d9ee) ) @@ -1054,7 +1058,7 @@ ROM_START( windheatj ) ROM_LOAD32_BYTE( "677a15.5h", 0x000002, 0x200000, CRC(62e2c3dd) SHA1(c9127ed70bdff947c3da2908a08974091615a685) ) ROM_LOAD32_BYTE( "677a16.2h", 0x000003, 0x200000, CRC(7cc75539) SHA1(4bd8d88debf7489f30008bd4cbded67cb1a20ab0) ) - ROM_REGION(0x600000, "shared", 0) /* Sound data */ + ROM_REGION(0x600000, "k054539", 0) /* Sound data */ ROM_LOAD( "677a08.5r", 0x000000, 0x200000, CRC(bde38850) SHA1(aaf1bdfc25ecdffc1f6076c9c1b2edbe263171d2) ) ROM_LOAD( "677a09.3r", 0x200000, 0x200000, CRC(4dfc1ea9) SHA1(4ab264c1902b522bc0589766e42f2b6ca276808d) ) ROM_LOAD( "677a10.5n", 0x400000, 0x200000, CRC(d8f77a68) SHA1(ff251863ef096f0864f6cbe6caa43b0aa299d9ee) ) @@ -1080,7 +1084,7 @@ ROM_START( windheata ) ROM_LOAD32_BYTE( "677a15.5h", 0x000002, 0x200000, CRC(62e2c3dd) SHA1(c9127ed70bdff947c3da2908a08974091615a685) ) ROM_LOAD32_BYTE( "677a16.2h", 0x000003, 0x200000, CRC(7cc75539) SHA1(4bd8d88debf7489f30008bd4cbded67cb1a20ab0) ) - ROM_REGION(0x600000, "shared", 0) /* Sound data */ + ROM_REGION(0x600000, "k054539", 0) /* Sound data */ ROM_LOAD( "677a08.5r", 0x000000, 0x200000, CRC(bde38850) SHA1(aaf1bdfc25ecdffc1f6076c9c1b2edbe263171d2) ) ROM_LOAD( "677a09.3r", 0x200000, 0x200000, CRC(4dfc1ea9) SHA1(4ab264c1902b522bc0589766e42f2b6ca276808d) ) ROM_LOAD( "677a10.5n", 0x400000, 0x200000, CRC(d8f77a68) SHA1(ff251863ef096f0864f6cbe6caa43b0aa299d9ee) ) @@ -1106,7 +1110,7 @@ ROM_START( jetwave ) ROM_LOAD32_BYTE( "678a15.9d", 0x000002, 0x200000, CRC(58b670f8) SHA1(5d4facb00e34de3ad11ed60c19835918a9cf6cb9) ) ROM_LOAD32_BYTE( "678a16.4d", 0x000003, 0x200000, CRC(137b9bff) SHA1(5052c1fa30cc1d6affd78f48d483415dca89d10b) ) - ROM_REGION(0x600000, "shared", 0) /* Sound data */ + ROM_REGION(0x600000, "k054539", 0) /* Sound data */ ROM_LOAD( "678a08.5r", 0x000000, 0x200000, CRC(4aeb61ad) SHA1(ec6872cb2e4776849963f48c1c245ca7697849e0) ) ROM_LOAD( "678a09.3r", 0x200000, 0x200000, CRC(39baef23) SHA1(9f7bda0f9c06eee94703f9ceb06975c8e28338cc) ) ROM_LOAD( "678a10.5n", 0x400000, 0x200000, CRC(0508280e) SHA1(a36c5dc377b0ba597f131bd9dfc6019e7fc2d243) ) @@ -1132,7 +1136,7 @@ ROM_START( waveshrk ) ROM_LOAD32_BYTE( "678a15.9d", 0x000002, 0x200000, CRC(58b670f8) SHA1(5d4facb00e34de3ad11ed60c19835918a9cf6cb9) ) ROM_LOAD32_BYTE( "678a16.4d", 0x000003, 0x200000, CRC(137b9bff) SHA1(5052c1fa30cc1d6affd78f48d483415dca89d10b) ) - ROM_REGION(0x600000, "shared", 0) /* Sound data */ + ROM_REGION(0x600000, "k054539", 0) /* Sound data */ ROM_LOAD( "678a08.5r", 0x000000, 0x200000, CRC(4aeb61ad) SHA1(ec6872cb2e4776849963f48c1c245ca7697849e0) ) ROM_LOAD( "678a09.3r", 0x200000, 0x200000, CRC(39baef23) SHA1(9f7bda0f9c06eee94703f9ceb06975c8e28338cc) ) ROM_LOAD( "678a10.5n", 0x400000, 0x200000, CRC(0508280e) SHA1(a36c5dc377b0ba597f131bd9dfc6019e7fc2d243) ) @@ -1158,7 +1162,7 @@ ROM_START( jetwavej ) ROM_LOAD32_BYTE( "678a15.9d", 0x000002, 0x200000, CRC(58b670f8) SHA1(5d4facb00e34de3ad11ed60c19835918a9cf6cb9) ) ROM_LOAD32_BYTE( "678a16.4d", 0x000003, 0x200000, CRC(137b9bff) SHA1(5052c1fa30cc1d6affd78f48d483415dca89d10b) ) - ROM_REGION(0x600000, "shared", 0) /* Sound data */ + ROM_REGION(0x600000, "k054539", 0) /* Sound data */ ROM_LOAD( "678a08.5r", 0x000000, 0x200000, CRC(4aeb61ad) SHA1(ec6872cb2e4776849963f48c1c245ca7697849e0) ) ROM_LOAD( "678a09.3r", 0x200000, 0x200000, CRC(39baef23) SHA1(9f7bda0f9c06eee94703f9ceb06975c8e28338cc) ) ROM_LOAD( "678a10.5n", 0x400000, 0x200000, CRC(0508280e) SHA1(a36c5dc377b0ba597f131bd9dfc6019e7fc2d243) ) diff --git a/src/mame/includes/djmain.h b/src/mame/includes/djmain.h index 34c56084d61..3ba3f9270d4 100644 --- a/src/mame/includes/djmain.h +++ b/src/mame/includes/djmain.h @@ -17,12 +17,22 @@ public: m_ata(*this, "ata"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), - m_turntable(*this, {"TT1", "TT2"}) + m_turntable(*this, {"TT1", "TT2"}), + m_sndram(*this, "sndram") { } + + required_shared_ptr m_obj_ram; + required_device m_maincpu; + required_device m_k056832; + required_device m_k055555; + required_device m_ata; + required_device m_gfxdecode; + required_device m_palette; + optional_ioport_array<2> m_turntable; + required_shared_ptr m_sndram; int m_sndram_bank; - uint8_t *m_sndram; int m_turntable_select; uint8_t m_turntable_last_pos[2]; uint16_t m_turntable_pos[2]; @@ -31,7 +41,6 @@ public: uint32_t m_obj_regs[0xa0/4]; const uint8_t *m_ata_user_password; const uint8_t *m_ata_master_password; - required_shared_ptr m_obj_ram; DECLARE_WRITE32_MEMBER(sndram_bank_w); DECLARE_READ32_MEMBER(sndram_r); DECLARE_WRITE32_MEMBER(sndram_w); @@ -67,16 +76,8 @@ public: uint32_t screen_update_djmain(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vb_interrupt); DECLARE_WRITE_LINE_MEMBER(ide_interrupt); - void sndram_set_bank(); void draw_sprites( bitmap_rgb32 &bitmap, const rectangle &cliprect); - required_device m_maincpu; - required_device m_k056832; - required_device m_k055555; - required_device m_ata; - required_device m_gfxdecode; - required_device m_palette; K056832_CB_MEMBER(tile_callback); - optional_ioport_array<2> m_turntable; void djmainj(machine_config &config); void djmainu(machine_config &config); void djmaina(machine_config &config); diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h index 179c3ecbe89..50a0aa68dac 100644 --- a/src/mame/includes/plygonet.h +++ b/src/mame/includes/plygonet.h @@ -6,7 +6,7 @@ #pragma once #include "machine/eepromser.h" -#include "machine/gen_latch.h" +#include "machine/k054321.h" #include "video/k053936.h" #include "cpu/dsp56k/dsp56k.h" @@ -29,9 +29,7 @@ public: m_k053936(*this, "k053936"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), - m_soundlatch(*this, "soundlatch"), - m_soundlatch2(*this, "soundlatch2"), - m_soundlatch3(*this, "soundlatch3"), + m_k054321(*this, "k054321"), m_shared_ram(*this, "shared_ram"), m_dsp56k_p_mirror(*this, "dsp56k_p_mirror"), m_dsp56k_p_8000(*this, "dsp56k_p_8000") @@ -44,9 +42,7 @@ public: required_device m_k053936; required_device m_gfxdecode; required_device m_palette; - required_device m_soundlatch; - required_device m_soundlatch2; - required_device m_soundlatch3; + required_device m_k054321; /* 68k-side shared ram */ required_shared_ptr m_shared_ram; @@ -78,8 +74,6 @@ public: DECLARE_WRITE8_MEMBER(polygonet_sys_w); DECLARE_READ8_MEMBER(polygonet_inputs_r); - DECLARE_READ8_MEMBER(sound_comms_r); - DECLARE_WRITE8_MEMBER(sound_comms_w); DECLARE_WRITE32_MEMBER(sound_irq_w); DECLARE_READ32_MEMBER(dsp_host_interface_r); DECLARE_WRITE32_MEMBER(shared_ram_write); diff --git a/src/mame/includes/qdrmfgp.h b/src/mame/includes/qdrmfgp.h index d266f8ca05e..0ba268f84a0 100644 --- a/src/mame/includes/qdrmfgp.h +++ b/src/mame/includes/qdrmfgp.h @@ -22,7 +22,8 @@ public: m_ata(*this, "ata"), m_inputs_port(*this, "INPUTS"), m_dsw_port(*this, "DSW"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_sndram(*this, "sndram") { } @@ -36,8 +37,8 @@ public: required_ioport m_inputs_port; required_ioport m_dsw_port; required_device m_palette; + required_shared_ptr m_sndram; - uint8_t *m_sndram; uint16_t m_control; int32_t m_gp2_irq_control; int32_t m_pal; -- cgit v1.2.3 From 9fd799618a0f41c21ecb4ed93e02bcd5ba3829a2 Mon Sep 17 00:00:00 2001 From: cam900 Date: Wed, 24 Jan 2018 20:47:57 +0900 Subject: vgmplay : typo --- src/mame/drivers/vgmplay.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp index 159a34eb4eb..4c09edb3057 100644 --- a/src/mame/drivers/vgmplay.cpp +++ b/src/mame/drivers/vgmplay.cpp @@ -78,9 +78,9 @@ public: A_POKEYB = 0x00013030, A_YMF271 = 0x00013040, A_YMZ280B = 0x00013050, - A_YM2608 = 0x00013060 + A_YM2608 = 0x00013060, A_K054539A = 0x00014000, - A_K054539B = 0x00014400, + A_K054539B = 0x00014400 }; enum io16_t -- cgit v1.2.3 From 018edecc0dffa673ac1a397d0c78564158b85346 Mon Sep 17 00:00:00 2001 From: "DESKTOP-LP5JPA4\\dbtlr" Date: Wed, 24 Jan 2018 21:01:26 +0900 Subject: vgmplay : typo --- src/mame/drivers/vgmplay.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp index 4c09edb3057..3126aa658ba 100644 --- a/src/mame/drivers/vgmplay.cpp +++ b/src/mame/drivers/vgmplay.cpp @@ -1371,11 +1371,11 @@ static ADDRESS_MAP_START( k053260_map, 0, 8, vgmplay_state ) ADDRESS_MAP_END static ADDRESS_MAP_START( k054539a_map, 0, 8, vgmplay_state ) - AM_RANGE(0, 0x1fffff) AM_DEVREAD("vgmplay", vgmplay_device, k054539a_rom_r) + AM_RANGE(0, 0xffffff) AM_DEVREAD("vgmplay", vgmplay_device, k054539a_rom_r) ADDRESS_MAP_END static ADDRESS_MAP_START( k054539b_map, 0, 8, vgmplay_state ) - AM_RANGE(0, 0x1fffff) AM_DEVREAD("vgmplay", vgmplay_device, k054539b_rom_r) + AM_RANGE(0, 0xffffff) AM_DEVREAD("vgmplay", vgmplay_device, k054539b_rom_r) ADDRESS_MAP_END static ADDRESS_MAP_START( okim6295_map, 0, 8, vgmplay_state ) -- cgit v1.2.3