From 01b97e2222c31223996efdf4e7b042410e985957 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 21 Apr 2024 04:11:53 +1000 Subject: [PATCH] srcclean and cleanup: * makefile: srcclean batches of twenty files - improves performance when process creation or filesystem walk is expensive. * midway/midtunit.cpp: Removed a few unnecessary lines. --- makefile | 10 +++++----- src/devices/bus/ti99/peb/bwg.cpp | 4 ++-- src/devices/bus/ti99/peb/myarcfdc.cpp | 4 ++-- src/devices/bus/ti99/peb/ti_fdc.cpp | 8 ++++---- src/devices/sound/swx00.cpp | 4 ++-- src/mame/funworld/4roses.cpp | 8 ++++---- src/mame/itech/itech32.cpp | 22 +++++++++++----------- src/mame/konami/konamim2.cpp | 4 ++-- src/mame/midway/midtunit.cpp | 9 ++++----- src/mame/midway/midtunit_v.cpp | 6 +++--- src/mame/midway/midwunit.cpp | 6 +++--- src/mame/midway/midyunit.h | 2 +- src/mame/midway/midyunit_m.cpp | 2 +- src/mame/misc/calomega.cpp | 2 +- src/mame/namco/namcops2.cpp | 2 +- src/mame/pacman/pacman.cpp | 4 ++-- 16 files changed, 48 insertions(+), 49 deletions(-) diff --git a/makefile b/makefile index 3a886bbf6bb..f50500fbc5d 100644 --- a/makefile +++ b/makefile @@ -1638,11 +1638,11 @@ ifeq (posix,$(SHELLTYPE)) -name \*.mm -o \ -name \*.lay -o \ -name \*.lst \ - \) -exec ./srcclean {} \; >&2 - $(SILENT) find hash \( -name \*.hsi -o -name \*.xml \) -exec ./srcclean {} \; >&2 - $(SILENT) find bgfx \( -name \*.json \) -exec ./srcclean {} \; >&2 - $(SILENT) find plugins \( -name \*.lua -o -name \*.json \) -exec ./srcclean {} \; >&2 - $(SILENT) find scripts \( -name \*.lua \) -exec ./srcclean {} \; >&2 + \) -print0 | xargs -0 -n 20 ./srcclean >&2 + $(SILENT) find hash \( -name \*.hsi -o -name \*.xml \) -print0 | xargs -0 -n 20 ./srcclean >&2 + $(SILENT) find bgfx \( -name \*.json \) -print0 | xargs -0 -n 20 ./srcclean >&2 + $(SILENT) find plugins \( -name \*.lua -o -name \*.json \) -print0 | xargs -0 -n 20 ./srcclean >&2 + $(SILENT) find scripts \( -name \*.lua \) -print0 | xargs -0 -n 20 ./srcclean >&2 else $(shell for /r src %%i in (*.c, *.cpp, *.h, *.hpp, *.hxx, *.ipp, *.mm, *.lay, *.lst) do srcclean %%i >&2 ) $(shell for /r hash %%i in (*.hsi, *.xml) do srcclean %%i >&2 ) diff --git a/src/devices/bus/ti99/peb/bwg.cpp b/src/devices/bus/ti99/peb/bwg.cpp index 3f6d21a293b..25472b0ed12 100644 --- a/src/devices/bus/ti99/peb/bwg.cpp +++ b/src/devices/bus/ti99/peb/bwg.cpp @@ -503,7 +503,7 @@ void snug_bwg_device::motorona_w(int state) // Set all motors for (auto & elem : m_floppy) - if (elem->get_device() != nullptr) + if (elem->get_device() != nullptr) elem->get_device()->mon_w((state==ASSERT_LINE)? 0 : 1); // The motor-on line also connects to the wait state logic @@ -543,7 +543,7 @@ void snug_bwg_device::device_reset() m_address = 0; m_WDsel = false; m_WDsel0 = false; - + for (auto &flop : m_floppy) { if (flop->get_device() != nullptr) diff --git a/src/devices/bus/ti99/peb/myarcfdc.cpp b/src/devices/bus/ti99/peb/myarcfdc.cpp index 6d96c9587c1..de8d98962db 100644 --- a/src/devices/bus/ti99/peb/myarcfdc.cpp +++ b/src/devices/bus/ti99/peb/myarcfdc.cpp @@ -364,14 +364,14 @@ void myarc_fdc_device::device_reset() else LOGMASKED(LOG_CONFIG, "Connector %d has no floppy attached\n", flop->basetag()); } - + if (ioport("CONTROLLER")->read()==0) m_wdc = m_wd1770; else m_wdc = m_wd1772; m_dec_high = (ioport("AMADECODE")->read()!=0); - + m_pal->set_board(this); } diff --git a/src/devices/bus/ti99/peb/ti_fdc.cpp b/src/devices/bus/ti99/peb/ti_fdc.cpp index 2bb69dfbca6..3daeb24d41f 100644 --- a/src/devices/bus/ti99/peb/ti_fdc.cpp +++ b/src/devices/bus/ti99/peb/ti_fdc.cpp @@ -256,7 +256,7 @@ void ti_fdc_device::dvena_w(int state) // Set all motors for (auto & elem : m_floppy) - if (elem->get_device() != nullptr) + if (elem->get_device() != nullptr) elem->get_device()->mon_w((state==ASSERT_LINE)? 0 : 1); // The motor-on line also connects to the wait state logic @@ -326,7 +326,7 @@ void ti_fdc_device::select_drive(int n, int state) { LOGMASKED(LOG_WARN, "Warning: DSK%d selected while DSK%d not yet unselected\n", n, m_sel_floppy); } - + if (m_floppy[n-1]->get_device() != nullptr) { m_sel_floppy = n; @@ -360,7 +360,7 @@ void ti_fdc_device::device_reset() m_selected = false; m_inDsrArea = false; m_WDsel = false; - + for (auto &flop : m_floppy) { if (flop->get_device() != nullptr) @@ -368,7 +368,7 @@ void ti_fdc_device::device_reset() else LOGMASKED(LOG_CONFIG, "Connector %d has no floppy attached\n", flop->basetag()); } - + m_sel_floppy = 0; } diff --git a/src/devices/sound/swx00.cpp b/src/devices/sound/swx00.cpp index 5ce1ee79d57..26800471268 100644 --- a/src/devices/sound/swx00.cpp +++ b/src/devices/sound/swx00.cpp @@ -565,7 +565,7 @@ void swx00_sound_device::sound_stream_update(sound_stream &stream, std::vector> 2)*3; switch(spos & 3) { @@ -601,7 +601,7 @@ void swx00_sound_device::sound_stream_update(sound_stream &stream, std::vector> 1); if(spos & 1) { diff --git a/src/mame/funworld/4roses.cpp b/src/mame/funworld/4roses.cpp index 9c9f0493c11..30c368fa0c1 100644 --- a/src/mame/funworld/4roses.cpp +++ b/src/mame/funworld/4roses.cpp @@ -50,8 +50,8 @@ - The color palettes are stored in a normal ROM. - - The code initializes a couple of inexistent PIAs 6821 that handle the I/O, so surely - these are emulated/simulated. However, set Rugby has both physical PIAs in the PCB. + - The code initializes a couple of inexistent PIAs 6821 that handle the I/O, so surely + these are emulated/simulated. However, set Rugby has both physical PIAs in the PCB. *********************************************************************************** @@ -434,10 +434,10 @@ static const gfx_layout charlayout = 4, 8, 0x1000, -// RGN_FRAC(1,2), +// RGN_FRAC(1,2), 4, { 0, 4, 0x8000*8, 0x8000*8+4 }, -// { RGN_FRAC(0,2), RGN_FRAC(0,2) + 4, RGN_FRAC(1,2), RGN_FRAC(1,2) + 4 }, +// { RGN_FRAC(0,2), RGN_FRAC(0,2) + 4, RGN_FRAC(1,2), RGN_FRAC(1,2) + 4 }, { 3, 2, 1, 0 }, { 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 }, 8*4*2 diff --git a/src/mame/itech/itech32.cpp b/src/mame/itech/itech32.cpp index be0f3ecd92c..24ea102e505 100644 --- a/src/mame/itech/itech32.cpp +++ b/src/mame/itech/itech32.cpp @@ -3223,7 +3223,7 @@ ROM_END // There is known to exist a PCB with hand written labels shown as V1.23 -ROM_START( sftmj114 ) // Version 1.14N (Japan), P/N 1064 REV 1 Mainboard, P/N 1073 REV 0 ROM board, P/N 1066 REV 2 Sound board +ROM_START( sftmj114 ) // Version 1.14N (Japan), P/N 1064 REV 1 Mainboard, P/N 1073 REV 0 ROM board, P/N 1066 REV 2 Sound board ROM_REGION32_BE( CODE_SIZE, "maindata", 0 ) ROM_LOAD32_BYTE( "sfmn_prom0_v1.14.prom0", 0x00000, 0x40000, CRC(2a0c0bb7) SHA1(5722a399ed5dff55d47e096fb04a5d5b16de2f9a) ) ROM_LOAD32_BYTE( "sfmn_prom1_v1.14.prom1", 0x00001, 0x40000, CRC(088aa12c) SHA1(3c488068edea7ee726b7b837fedeeb0374a7b1ac) ) @@ -3258,7 +3258,7 @@ ROM_START( sftmj114 ) // Version 1.14N (Japan), P/N 1064 REV 1 Mainboard, P/N ROM_LOAD16_BYTE( "sfm_srom3.srom3", 0x000000, 0x080000, CRC(4f181534) SHA1(e858a33b22558665427146ec79dfba48edc20c2c) ) ROM_END -ROM_START( sftmj112 ) // Version 1.12N (Japan), P/N 1064 REV 1 Mainboard, P/N 1073 REV 0 ROM board, P/N 1066 REV 2 Sound board +ROM_START( sftmj112 ) // Version 1.12N (Japan), P/N 1064 REV 1 Mainboard, P/N 1073 REV 0 ROM board, P/N 1066 REV 2 Sound board ROM_REGION32_BE( CODE_SIZE, "maindata", 0 ) ROM_LOAD32_BYTE( "sfmn_prom0_v1.12.prom0", 0x00000, 0x40000, CRC(640a04a8) SHA1(adc7f5880962cbcc5f9f28e72a84070da6e2ec36) ) // CAPCOM labels ROM_LOAD32_BYTE( "sfmn_prom1_v1.12.prom1", 0x00001, 0x40000, CRC(2a27b690) SHA1(f63c3665ec030ecc2d7a10ead182941ade1c79d0) ) @@ -3293,7 +3293,7 @@ ROM_START( sftmj112 ) // Version 1.12N (Japan), P/N 1064 REV 1 Mainboard, P/N ROM_LOAD16_BYTE( "sfm_srom3.srom3", 0x000000, 0x080000, CRC(4f181534) SHA1(e858a33b22558665427146ec79dfba48edc20c2c) ) ROM_END -ROM_START( sftmk112 ) // Version 1.12K (Korea), P/N 1064 REV 1 Mainboard, P/N 1073 REV 0 ROM board, P/N 1066 REV 2 Sound board +ROM_START( sftmk112 ) // Version 1.12K (Korea), P/N 1064 REV 1 Mainboard, P/N 1073 REV 0 ROM board, P/N 1066 REV 2 Sound board ROM_REGION32_BE( CODE_SIZE, "maindata", 0 ) ROM_LOAD32_BYTE( "sfmk_prom0_v1.12.prom0", 0x00000, 0x40000, CRC(1864ca77) SHA1(44702d69a5ee6a11328281943e04bd64b12b02a1) ) // CAPCOM labels ROM_LOAD32_BYTE( "sfmk_prom1_v1.12.prom1", 0x00001, 0x40000, CRC(a93c52aa) SHA1(51539e79cfe8a2826f77b09ec8beeb94c2bb0767) ) @@ -3465,7 +3465,7 @@ ROM_START( shufshot137 ) // Version 1.37 (PCB P/N 1083 Rev 2) ROM_LOAD16_BYTE( "shf_srom1.srom1", 0x200000, 0x80000, CRC(8c89948a) SHA1(1054eca5de352c17f34f31ef16297ba6177a37ba) ) ROM_END -ROM_START( shufshot135 ) // Version 1.35 (PCB P/N 1083 Rev 2) - Not offically released? - found on dev CD +ROM_START( shufshot135 ) // Version 1.35 (PCB P/N 1083 Rev 2) - Not offically released? - found on dev CD ROM_REGION32_BE( CODE_SIZE, "maindata", 0 ) ROM_LOAD32_BYTE( "shot_prom0_v1.35.prom0", 0x00000, 0x20000, CRC(1a1d510c) SHA1(b1919beee499fb4e213a987ad796742dbfbd540b) ) ROM_LOAD32_BYTE( "shot_prom1_v1.35.prom1", 0x00001, 0x20000, CRC(5d7d5017) SHA1(8330339bd45c30066650a2a6cc7e12f365c91608) ) @@ -4035,7 +4035,7 @@ ROM_START( gt97s121 ) // Version 1.21S for the 3 tier type PCB with short ROM bo ROM_REGION16_BE( 0x400000, "ensoniq.2", ROMREGION_ERASE00 ) ROM_LOAD16_BYTE( "gtg3_srom1_nr++.srom1", 0x000000, 0x100000, CRC(44983bd7) SHA1(a6ac966ec113b079434d7f871e4ce7266206d234) ) // actually labeled "GTG3 SROM1 NR**" - ROM_LOAD16_BYTE( "gtg3_srom2_nr+.srom2", 0x200000, 0x080000, CRC(1b3f18b6) SHA1(3b65de6a90c5ede183b5f8ca1875736bc1425772) ) // actually labeled "GTG3 SROM2 NR*" + ROM_LOAD16_BYTE( "gtg3_srom2_nr+.srom2", 0x200000, 0x080000, CRC(1b3f18b6) SHA1(3b65de6a90c5ede183b5f8ca1875736bc1425772) ) // actually labeled "GTG3 SROM2 NR*" ROM_END ROM_START( gt97v120 ) // Version 1.20 @@ -4246,7 +4246,7 @@ ROM_START( gt98s100 ) // Version 1.00S for the 3 tier type PCB with short ROM bo ROM_REGION16_BE( 0x400000, "ensoniq.2", ROMREGION_ERASE00 ) ROM_LOAD16_BYTE( "gtg3_srom1_nr++.srom1", 0x000000, 0x100000, CRC(44983bd7) SHA1(a6ac966ec113b079434d7f871e4ce7266206d234) ) // actually labeled "GTG3 SROM1 NR**" - ROM_LOAD16_BYTE( "gtg3_srom2_nr+.srom2", 0x200000, 0x080000, CRC(1b3f18b6) SHA1(3b65de6a90c5ede183b5f8ca1875736bc1425772) ) // actually labeled "GTG3 SROM2 NR*" + ROM_LOAD16_BYTE( "gtg3_srom2_nr+.srom2", 0x200000, 0x080000, CRC(1b3f18b6) SHA1(3b65de6a90c5ede183b5f8ca1875736bc1425772) ) // actually labeled "GTG3 SROM2 NR*" ROM_END ROM_START( gt98t303 ) // Version 3.03 Tournament Edition (PCB P/N 1083 Rev 2) @@ -4406,7 +4406,7 @@ ROM_START( gt99s100 ) // Version 1.00S for the 3 tier type PCB with short ROM ROM_REGION16_BE( 0x400000, "ensoniq.2", ROMREGION_ERASE00 ) ROM_LOAD16_BYTE( "gtg3_srom1_nr++.srom1", 0x000000, 0x100000, CRC(44983bd7) SHA1(a6ac966ec113b079434d7f871e4ce7266206d234) ) // actually labeled "GTG3 SROM1 NR**" - ROM_LOAD16_BYTE( "gtg3_srom2_nr+.srom2", 0x200000, 0x080000, CRC(1b3f18b6) SHA1(3b65de6a90c5ede183b5f8ca1875736bc1425772) ) // actually labeled "GTG3 SROM2 NR*" + ROM_LOAD16_BYTE( "gtg3_srom2_nr+.srom2", 0x200000, 0x080000, CRC(1b3f18b6) SHA1(3b65de6a90c5ede183b5f8ca1875736bc1425772) ) // actually labeled "GTG3 SROM2 NR*" ROM_END ROM_START( gt99t400 ) // Version 4.00 Tournament Edition (PCB P/N 1083 Rev 2) @@ -4572,7 +4572,7 @@ ROM_START( gt2ks100 ) // Version 1.00S for the 3 tier type PCB with short ROM ROM_REGION16_BE( 0x400000, "ensoniq.2", ROMREGION_ERASE00 ) ROM_LOAD16_BYTE( "gtg3_srom1_nr++.srom1", 0x000000, 0x100000, CRC(44983bd7) SHA1(a6ac966ec113b079434d7f871e4ce7266206d234) ) // actually labeled "GTG3 SROM1 NR**" - ROM_LOAD16_BYTE( "gtg3_srom2_nr+.srom2", 0x200000, 0x080000, CRC(1b3f18b6) SHA1(3b65de6a90c5ede183b5f8ca1875736bc1425772) ) // actually labeled "GTG3 SROM2 NR*" + ROM_LOAD16_BYTE( "gtg3_srom2_nr+.srom2", 0x200000, 0x080000, CRC(1b3f18b6) SHA1(3b65de6a90c5ede183b5f8ca1875736bc1425772) ) // actually labeled "GTG3 SROM2 NR*" ROM_END ROM_START( gt2kt500 ) // Version 5.00 Tournament Edition (PCB P/N 1083 Rev 2) @@ -4630,7 +4630,7 @@ ROM_START( gtsupreme ) // Version 5.10T ELC S (Tournament Edition, PCB P/N 1083 ROM_LOAD32_BYTE( "gt2k_grom1_3.grm1_3", 0x200003, 0x80000, CRC(59f48688) SHA1(37b2c84e487f4f3a9145bef34c573a3716b4a6a7) ) // GT99, GT2K & GT Classic all share the above listed 8 graphics ROMs and may be labeled GT99, GT2K or GTClassic - // The Euro version has different GROM2_x compared to the standard US versions. GT Supreme PCBs have been seen + // The Euro version has different GROM2_x compared to the standard US versions. GT Supreme PCBs have been seen // with GT 2K mask ROMs as well as all GROMs labeled "GT SUPREME" ROM_LOAD32_BYTE( "gt_supreme_grom2_0.grm2_0", 0x400000, 0x80000, CRC(33998a3e) SHA1(53832e37c42155eb9c774eb33b8b36fe387fa162) ) @@ -4740,7 +4740,7 @@ ROM_START( gtclasscs ) // Version 1.00S for the 3 tier type PCB with short ROM ROM_REGION16_BE( 0x400000, "ensoniq.2", ROMREGION_ERASE00 ) ROM_LOAD16_BYTE( "gtg3_srom1_nr++.srom1", 0x000000, 0x100000, CRC(44983bd7) SHA1(a6ac966ec113b079434d7f871e4ce7266206d234) ) // actually labeled "GTG3 SROM1 NR**" - ROM_LOAD16_BYTE( "gtg3_srom2_nr+.srom2", 0x200000, 0x080000, CRC(1b3f18b6) SHA1(3b65de6a90c5ede183b5f8ca1875736bc1425772) ) // actually labeled "GTG3 SROM2 NR*" + ROM_LOAD16_BYTE( "gtg3_srom2_nr+.srom2", 0x200000, 0x080000, CRC(1b3f18b6) SHA1(3b65de6a90c5ede183b5f8ca1875736bc1425772) ) // actually labeled "GTG3 SROM2 NR*" ROM_END /*************************************************************************** @@ -5266,7 +5266,7 @@ GAME( 2002, gtsupreme, gt2k, tourny, gt98s, itech32_state, init_aamat, R GAME( 2001, gtclassc, 0, sftm, aama, itech32_state, init_aama, ROT0, "Incredible Technologies", "Golden Tee Classic (v1.00)" , MACHINE_SUPPORTS_SAVE ) // PIC 16C54 labeled as ITGFCL GAME( 2001, gtclasscp, gtclassc, sftm, aama, itech32_state, init_gtclasscp, ROT0, "Incredible Technologies", "Golden Tee Classic (v1.00) (alt protection)" , MACHINE_SUPPORTS_SAVE ) // PIC 16C54 labeled as ITGFCL -GAME( 2001, gtclasscs, gtclassc, sftm, s_ver, itech32_state, init_s_ver, ROT0, "Incredible Technologies", "Golden Tee Classic (v1.00S)" , MACHINE_SUPPORTS_SAVE ) // PIC 16C54 labeled as ITGFCL-M +GAME( 2001, gtclasscs, gtclassc, sftm, s_ver, itech32_state, init_s_ver, ROT0, "Incredible Technologies", "Golden Tee Classic (v1.00S)" , MACHINE_SUPPORTS_SAVE ) // PIC 16C54 labeled as ITGFCL-M GAME( 199?, shoottv, 0, shoottv, shoottv, shoottv_state, empty_init, ROT0, "Incredible Technologies", "Must Shoot TV (prototype)" , MACHINE_SUPPORTS_SAVE ) GAME( 1996, pubball, 0, pubball, pubball, itech32_state, init_pubball,ROT0, "Midway / Incredible Technologies", "Power Up Baseball (prototype)" , MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/konami/konamim2.cpp b/src/mame/konami/konamim2.cpp index 64eecd17820..f9097f74303 100644 --- a/src/mame/konami/konamim2.cpp +++ b/src/mame/konami/konamim2.cpp @@ -1268,8 +1268,8 @@ ROM_START( heatof11 ) DISK_REGION( "ata:0:cr589" ) /* Ring codes found on the disc: - 703EAA02 PN.0000046809 1 + + + + + IFPI L251 - IFPI 42MO */ + 703EAA02 PN.0000046809 1 + + + + + IFPI L251 + IFPI 42MO */ DISK_IMAGE_READONLY( "703eaa02", 0, SHA1(f8a87eacfdbbd22659f39c7a72e3895f0a7697b7) ) ROM_END diff --git a/src/mame/midway/midtunit.cpp b/src/mame/midway/midtunit.cpp index bfae5563054..74183b6a013 100644 --- a/src/mame/midway/midtunit.cpp +++ b/src/mame/midway/midtunit.cpp @@ -64,16 +64,16 @@ void midtunit_base_state::main_map(address_map &map) void midtunit_adpcm_state::main_adpcm_map(address_map &map) { - midtunit_base_state::main_map(map); - map.unmap_value_high(); + main_map(map); + map(0x01d00000, 0x01d0001f).r(FUNC(midtunit_adpcm_state::sound_state_r)); map(0x01d01020, 0x01d0103f).rw(FUNC(midtunit_adpcm_state::sound_r), FUNC(midtunit_adpcm_state::sound_w)); } void mk2_state::mk2_map(address_map &map) { - midtunit_base_state::main_map(map); - map.unmap_value_high(); + main_map(map); + map(0x01d00000, 0x01d0001f).r(FUNC(mk2_state::dcs_state_r)); map(0x01d01020, 0x01d0103f).rw(FUNC(mk2_state::dcs_r), FUNC(mk2_state::dcs_w)); } @@ -610,7 +610,6 @@ void midtunit_base_state::tunit_core(machine_config &config) // basic machine hardware TMS34010(config, m_maincpu, CPU_CLOCK); - m_maincpu->set_addrmap(AS_PROGRAM, &midtunit_base_state::main_map); m_maincpu->set_halt_on_reset(false); // halt on reset m_maincpu->set_pixel_clock(PIXEL_CLOCK); // pixel clock m_maincpu->set_pixels_per_clock(2); // pixels per clock diff --git a/src/mame/midway/midtunit_v.cpp b/src/mame/midway/midtunit_v.cpp index aac74efe2ae..0983d5bc354 100644 --- a/src/mame/midway/midtunit_v.cpp +++ b/src/mame/midway/midtunit_v.cpp @@ -781,10 +781,10 @@ void midtunit_video_device::dma_w(offs_t offset, uint16_t data, uint16_t mem_mas } // there seems to be two types of behavior for the DMA chip - // for MK1 and MK2, the upper byte of the LRSKIP is the - // starting skip value, and the lower byte is the ending + // for MK1 and MK2, the upper byte of the LRSKIP is the + // starting skip value, and the lower byte is the ending // skip value; for the NBA Jam, Hangtime, and Open Ice, the - // full word seems to be the starting skip value. + // full word seems to be the starting skip value. if (command & 0x40) { m_dma_state.startskip = m_dma_register[DMA_LRSKIP] & 0xff; diff --git a/src/mame/midway/midwunit.cpp b/src/mame/midway/midwunit.cpp index 53f8a726532..79b4132ea49 100644 --- a/src/mame/midway/midwunit.cpp +++ b/src/mame/midway/midwunit.cpp @@ -898,7 +898,7 @@ ROM_START( umk3 ) ROM_LOAD32_BYTE( "l1_mortal_kombat_3_u122_game_rom.u122", 0x0800003, 0x100000, CRC(9b87cdac) SHA1(a5f8db559293978f23e6f105543d8b2e170a2e0d) ) ROM_LOAD32_BYTE( "umk-u121.bin", 0x0c00000, 0x100000, CRC(cc4b95db) SHA1(3d53180eec649e9616c4b87db55573f12d9bfee3) ) // PCB pictures show EPROMs labeled as: - ROM_LOAD32_BYTE( "umk-u120.bin", 0x0c00001, 0x100000, CRC(1c8144cd) SHA1(77cdc1eaf630ccb7233f5532f8b08191d00f0816) ) // L2.0 MORTAL KOMBAT 3 Uxxx ULTIMATE + ROM_LOAD32_BYTE( "umk-u120.bin", 0x0c00001, 0x100000, CRC(1c8144cd) SHA1(77cdc1eaf630ccb7233f5532f8b08191d00f0816) ) // L2.0 MORTAL KOMBAT 3 Uxxx ULTIMATE ROM_LOAD32_BYTE( "umk-u119.bin", 0x0c00002, 0x100000, CRC(5f10c543) SHA1(24dc83b7aa531ebd399258ffa7b2e028f1c4a28e) ) // currently unverified if these are the same as for v1.0 & v1.1 UMK3 ROM_LOAD32_BYTE( "umk-u118.bin", 0x0c00003, 0x100000, CRC(de0c4488) SHA1(227cab34798c440b2a45223567113df5f17d913f) ) @@ -941,7 +941,7 @@ ROM_START( umk3r11 ) ROM_LOAD32_BYTE( "l1_mortal_kombat_3_u123_game_rom.u123", 0x0800002, 0x100000, CRC(f0ab88a8) SHA1(cdc9dc12e162255845c6627b1e35182b7e8502d0) ) ROM_LOAD32_BYTE( "l1_mortal_kombat_3_u122_game_rom.u122", 0x0800003, 0x100000, CRC(9b87cdac) SHA1(a5f8db559293978f23e6f105543d8b2e170a2e0d) ) - ROM_LOAD32_BYTE( "mortal_kombat_iii_ultimate_u121_video_image.u121", 0x0c00000, 0x100000, CRC(cc4b95db) SHA1(3d53180eec649e9616c4b87db55573f12d9bfee3) ) // Both v1.0 & v1.1 have been found with mask roms + ROM_LOAD32_BYTE( "mortal_kombat_iii_ultimate_u121_video_image.u121", 0x0c00000, 0x100000, CRC(cc4b95db) SHA1(3d53180eec649e9616c4b87db55573f12d9bfee3) ) // Both v1.0 & v1.1 have been found with mask roms ROM_LOAD32_BYTE( "mortal_kombat_iii_ultimate_u120_video_image.u120", 0x0c00001, 0x100000, CRC(1c8144cd) SHA1(77cdc1eaf630ccb7233f5532f8b08191d00f0816) ) ROM_LOAD32_BYTE( "mortal_kombat_iii_ultimate_u119_video_image.u119", 0x0c00002, 0x100000, CRC(5f10c543) SHA1(24dc83b7aa531ebd399258ffa7b2e028f1c4a28e) ) ROM_LOAD32_BYTE( "mortal_kombat_iii_ultimate_u118_video_image.u118", 0x0c00003, 0x100000, CRC(de0c4488) SHA1(227cab34798c440b2a45223567113df5f17d913f) ) @@ -985,7 +985,7 @@ ROM_START( umk3r10 ) ROM_LOAD32_BYTE( "l1_mortal_kombat_3_u123_game_rom.u123", 0x0800002, 0x100000, CRC(f0ab88a8) SHA1(cdc9dc12e162255845c6627b1e35182b7e8502d0) ) ROM_LOAD32_BYTE( "l1_mortal_kombat_3_u122_game_rom.u122", 0x0800003, 0x100000, CRC(9b87cdac) SHA1(a5f8db559293978f23e6f105543d8b2e170a2e0d) ) - ROM_LOAD32_BYTE( "mortal_kombat_iii_ultimate_u121_video_image.u121", 0x0c00000, 0x100000, CRC(cc4b95db) SHA1(3d53180eec649e9616c4b87db55573f12d9bfee3) ) // Both v1.0 & v1.1 have been found with mask roms + ROM_LOAD32_BYTE( "mortal_kombat_iii_ultimate_u121_video_image.u121", 0x0c00000, 0x100000, CRC(cc4b95db) SHA1(3d53180eec649e9616c4b87db55573f12d9bfee3) ) // Both v1.0 & v1.1 have been found with mask roms ROM_LOAD32_BYTE( "mortal_kombat_iii_ultimate_u120_video_image.u120", 0x0c00001, 0x100000, CRC(1c8144cd) SHA1(77cdc1eaf630ccb7233f5532f8b08191d00f0816) ) ROM_LOAD32_BYTE( "mortal_kombat_iii_ultimate_u119_video_image.u119", 0x0c00002, 0x100000, CRC(5f10c543) SHA1(24dc83b7aa531ebd399258ffa7b2e028f1c4a28e) ) ROM_LOAD32_BYTE( "mortal_kombat_iii_ultimate_u118_video_image.u118", 0x0c00003, 0x100000, CRC(de0c4488) SHA1(227cab34798c440b2a45223567113df5f17d913f) ) diff --git a/src/mame/midway/midyunit.h b/src/mame/midway/midyunit.h index 897a85d5be0..20765b98636 100644 --- a/src/mame/midway/midyunit.h +++ b/src/mame/midway/midyunit.h @@ -177,7 +177,7 @@ protected: private: required_device m_adc; - + output_finder<4> m_left_flash; output_finder<4> m_right_flash; output_finder<> m_left_gun_recoil; diff --git a/src/mame/midway/midyunit_m.cpp b/src/mame/midway/midyunit_m.cpp index 298dd881378..785dae37048 100644 --- a/src/mame/midway/midyunit_m.cpp +++ b/src/mame/midway/midyunit_m.cpp @@ -248,7 +248,7 @@ void midyunit_state::cvsd_protection_w(offs_t offset, uint8_t data) { // because the entire CVSD ROM is banked, we have to make sure that writes // go to the proper location (i.e., bank 0); currently bank 0 always lives - // in the 0x10000-0x17fff space, so we just need to add 0x8000 to get the + // in the 0x10000-0x17fff space, so we just need to add 0x8000 to get the // proper offset m_cvsd_protection_base[offset] = data; } diff --git a/src/mame/misc/calomega.cpp b/src/mame/misc/calomega.cpp index ba570b4092e..265bf736932 100644 --- a/src/mame/misc/calomega.cpp +++ b/src/mame/misc/calomega.cpp @@ -5733,7 +5733,7 @@ ROM_END /* CEI 906III POKER V60.04 1989 906III board - + Jumper 8,9 EPR 1-5 2764 CG's 2764 diff --git a/src/mame/namco/namcops2.cpp b/src/mame/namco/namcops2.cpp index eeb05427bda..29a5c25cd7d 100644 --- a/src/mame/namco/namcops2.cpp +++ b/src/mame/namco/namcops2.cpp @@ -30,7 +30,7 @@ Battle Gear 3 (Japan)........................... XX34XXX M9005793A VER.2.04J H Battle Gear 3 (Export).......................... XX34XXX M9005793A VER.2.04J HDD (20GB) NM00010 *B3900068A(?) Taito 2002 | All require Taito JVS Universal I/O board K91X0951A otherwise no boot-up; dongle selects region using same HDDs Battle Gear 3 (US).............................. ------X *? HDD (20GB) NM00010? *? Taito 2002 | 2004 Betson release; contrary to flyer, does *not* remove Honda cars (contrast sidebs2u/batlgear) Battle Gear 3 Tuned (Japan)..................... XX34XXX M9006066A VER.2.03J HDD (30GB) NM00015 *B3900074B Taito 2003 | HDD: Maxtor Fireball 3 30GB 2F030L0 -Battle Gear 3 Tuned (Export).................... XX34XXX M9006066A VER.2.03J HDD (30GB) NM00015 B3900074C Taito 2003 / +Battle Gear 3 Tuned (Export).................... XX34XXX M9006066A VER.2.03J HDD (30GB) NM00015 B3900074C Taito 2003 / Bloody Roar 3................................... 1234XXX BRT1-A CD NM00002 BRT1 Ver.A Namco/8ing/Raizing 2000 Capcom Fighting Jam/Capcom Fighting Evolution... XXXX56X JAM1 DVD0 DVD NM00018 JAM1 Ver.A Capcom 2004 Cobra The Arcade................................ XXXX56X CBR1-HA HDD (40GB) NM00021 CBR1 Ver.B Namco 2004 Requires RAYS I/O PCB and IR guns and IR sensors. HDD: Maxtor DiamondMax Plus 8 40GB 6E040L0 diff --git a/src/mame/pacman/pacman.cpp b/src/mame/pacman/pacman.cpp index f83662e2745..74e11e3c01f 100644 --- a/src/mame/pacman/pacman.cpp +++ b/src/mame/pacman/pacman.cpp @@ -4799,7 +4799,7 @@ ROM_START( mspacmanhnc ) ROM_COPY( "bigeprom", 0x3000, 0x9000, 0x0800 ) // copy segment to 9000-97ff ROM_REGION( 0x2000, "gfx1", 0 ) -// ROM_COPY( "bigeprom", 0x4000, 0x0000, 0x2000 ) // copy segments to 0000-1fff, same GFX set of the GFX EPROMs +// ROM_COPY( "bigeprom", 0x4000, 0x0000, 0x2000 ) // copy segments to 0000-1fff, same GFX set of the GFX EPROMs ROM_LOAD( "5e.bin", 0x0000, 0x0800, CRC(93933d1d) SHA1(fa38d2cb87e872bb9a3158a4df98f38360dc85ec) ) ROM_LOAD( "5h.bin", 0x0800, 0x0800, CRC(7409fbec) SHA1(f440f08ba026ae6172666e1bdc0894ce33bba420) ) ROM_LOAD( "5f.bin", 0x1000, 0x0800, CRC(22b0188a) SHA1(a9ed9ca8b36a60081fd364abc9bc23963932cc0b) ) @@ -5199,7 +5199,7 @@ ROM_END | | '-----------------------------------------------' - + The SUSILU PCB soldered below the Z80 socket, is exactly the same documented above, containing a Z80 CPU, a M27256 EPROM, a 74LS254 and an unknown DIL40 IC.