From bedf7d6de416ab8f59e6209b7b472404757b29ab Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 4 Dec 2023 04:14:55 +1100 Subject: -yamaha/ymmu100.cpp: Use mnemonic BIOS tags, reduce copy/pasta -merit/merit3xx.cpp: Use object finders in a couple more places. --- src/mame/merit/merit3xx.cpp | 9 ++++++--- src/mame/yamaha/ymmu100.cpp | 31 +++++++------------------------ 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/src/mame/merit/merit3xx.cpp b/src/mame/merit/merit3xx.cpp index 639f040d337..144847f9b41 100644 --- a/src/mame/merit/merit3xx.cpp +++ b/src/mame/merit/merit3xx.cpp @@ -446,7 +446,7 @@ Dipswitch on CRT-352 MEM is labeled SW1 */ #include "emu.h" -#include "screen.h" + #include "cpu/z80/z80.h" #include "machine/ds1204.h" #include "machine/i8255.h" @@ -457,9 +457,11 @@ Dipswitch on CRT-352 MEM is labeled SW1 #include "video/bt47x.h" #include "video/mc6845.h" +#include "screen.h" #include "speaker.h" #include "tilemap.h" + namespace { class merit3xx_state : public driver_device @@ -482,6 +484,7 @@ public: protected: virtual void machine_start() override; virtual void machine_reset() override; + private: MC6845_UPDATE_ROW(update_row); @@ -566,8 +569,8 @@ void merit3xx_state::io_map(address_map &map) map(0x18, 0x1b).m("ramdac", FUNC(bt476_device::map)); map(0x40, 0x40).rw("crtc", FUNC(hd6845s_device::status_r), FUNC(hd6845s_device::address_w)); map(0x41, 0x41).rw("crtc", FUNC(hd6845s_device::register_r), FUNC(hd6845s_device::register_w)); - map(0x80, 0x80).r("ymsnd", FUNC(ym2149_device::data_r)); - map(0x80, 0x81).w("ymsnd", FUNC(ym2149_device::address_data_w)); + map(0x80, 0x80).r(m_ymsnd, FUNC(ym2149_device::data_r)); + map(0x80, 0x81).w(m_ymsnd, FUNC(ym2149_device::address_data_w)); } void merit3xx_state::crt350_main_map(address_map &map) diff --git a/src/mame/yamaha/ymmu100.cpp b/src/mame/yamaha/ymmu100.cpp index 885627b85c0..64af4fb9320 100644 --- a/src/mame/yamaha/ymmu100.cpp +++ b/src/mame/yamaha/ymmu100.cpp @@ -727,13 +727,14 @@ void mu100_state::mu100(machine_config &config) ROM_START( mu100 ) ROM_REGION( 0x200000, "maincpu", 0 ) - ROM_SYSTEM_BIOS( 0, "bios0", "xu50720 (v1.11, Aug. 3, 1999)" ) + ROM_DEFAULT_BIOS("v111") + ROM_SYSTEM_BIOS( 0, "v111", "xu50720 (v1.11, Aug. 3, 1999)" ) ROM_LOAD16_WORD_SWAP_BIOS( 0, "xu50720.ic11", 0x000000, 0x200000, CRC(1126a8a4) SHA1(e90b8bd9d14297da26ba12f4d9a4f2d22cd7d34a) ) - ROM_SYSTEM_BIOS( 1, "bios1", "xt714h0 (v1.06, Oct. 19, 1997)" ) + ROM_SYSTEM_BIOS( 1, "v106", "xt714h0 (v1.06, Oct. 19, 1997)" ) ROM_LOAD16_WORD_SWAP_BIOS( 1, "xt714h0.ic11", 0x000000, 0x200000, CRC(aa96ab38) SHA1(ec39eeab55d7d55b4f6d2b4b4cac2a01f98db8a0) ) - ROM_SYSTEM_BIOS( 2, "bios2", "xt71420 (v1.05, Sep. 19, 1997)" ) + ROM_SYSTEM_BIOS( 2, "v105", "xt71420 (v1.05, Sep. 19, 1997)" ) ROM_LOAD16_WORD_SWAP_BIOS( 2, "xt71420.ic11", 0x000000, 0x200000, CRC(0e5b3bae) SHA1(3148c5bd59a3d00809d3ab1921216215fe2582c5) ) - ROM_SYSTEM_BIOS( 3, "bios3", "xt714e0 (v1.03, Jul. 25, 1997)" ) + ROM_SYSTEM_BIOS( 3, "v103", "xt714e0 (v1.03, Jul. 25, 1997)" ) ROM_LOAD16_WORD_SWAP_BIOS( 3, "xt714e0.ic11", 0x000000, 0x200000, CRC(2d8cf9fc) SHA1(a81f988a315efe92106f1e7d407cd3626c4f843f) ) ROM_REGION32_LE( 0x1800000, "swp30", ROMREGION_ERASE00 ) @@ -745,26 +746,8 @@ ROM_START( mu100 ) ROM_LOAD32_WORD( "xt463a0.ic38", 0x1000002, 0x400000, CRC(cce5f8d3) SHA1(bdca8c5158f452f2b5535c7d658c9b22c6d66048) ) ROM_END -// Identical to the mu100 -ROM_START( mu100r ) - ROM_REGION( 0x200000, "maincpu", 0 ) - ROM_SYSTEM_BIOS( 0, "bios0", "xu50720 (v1.11, Aug. 3, 1999)" ) - ROM_LOAD16_WORD_SWAP_BIOS( 0, "xu50720.ic11", 0x000000, 0x200000, CRC(1126a8a4) SHA1(e90b8bd9d14297da26ba12f4d9a4f2d22cd7d34a) ) - ROM_SYSTEM_BIOS( 1, "bios1", "xt714h0 (v1.06, Oct. 19, 1997)" ) - ROM_LOAD16_WORD_SWAP_BIOS( 1, "xt714h0.ic11", 0x000000, 0x200000, CRC(aa96ab38) SHA1(ec39eeab55d7d55b4f6d2b4b4cac2a01f98db8a0) ) - ROM_SYSTEM_BIOS( 2, "bios2", "xt71420 (v1.05, Sep. 19, 1997)" ) - ROM_LOAD16_WORD_SWAP_BIOS( 2, "xt71420.ic11", 0x000000, 0x200000, CRC(0e5b3bae) SHA1(3148c5bd59a3d00809d3ab1921216215fe2582c5) ) - ROM_SYSTEM_BIOS( 3, "bios3", "xt714e0 (v1.03, Jul. 25, 1997)" ) - ROM_LOAD16_WORD_SWAP_BIOS( 3, "xt714e0.ic11", 0x000000, 0x200000, CRC(2d8cf9fc) SHA1(a81f988a315efe92106f1e7d407cd3626c4f843f) ) - - ROM_REGION32_LE( 0x1800000, "swp30", ROMREGION_ERASE00 ) - ROM_LOAD32_WORD( "sx518b0.ic34", 0x000000, 0x400000, CRC(2550d44f) SHA1(fd3cce228c7d389a2fde25c808a5b26080588cba) ) - ROM_LOAD32_WORD( "sx743b0.ic35", 0x000002, 0x400000, CRC(a9109a6c) SHA1(a67bb49378a38a2d809bd717d286e18bc6496db0) ) - ROM_LOAD32_WORD( "xt445a0-828.ic36", 0x800000, 0x200000, CRC(225c2280) SHA1(23b5e046fd2e2ac01af3e6dc6357c5c6547b286b) ) - ROM_LOAD32_WORD( "xt461a0-829.ic37", 0x800002, 0x200000, CRC(a1d138a3) SHA1(46a7a7225cd7e1818ba551325d2af5ac1bf5b2bf) ) - ROM_LOAD32_WORD( "xt462a0.ic39", 0x1000000, 0x400000, CRC(2e82cbd4) SHA1(d1f0e2713bf2cca9156c562e23fcce4fa5d7cfb3) ) - ROM_LOAD32_WORD( "xt463a0.ic38", 0x1000002, 0x400000, CRC(cce5f8d3) SHA1(bdca8c5158f452f2b5535c7d658c9b22c6d66048) ) -ROM_END +// mu100r is identical to the mu100 +#define rom_mu100r rom_mu100 ROM_START( mu100b ) ROM_REGION( 0x200000, "maincpu", 0 ) -- cgit v1.2.3