diff options
author | 2021-12-29 12:06:22 +1100 | |
---|---|---|
committer | 2021-12-29 12:06:22 +1100 | |
commit | cb181beb62496e644018e072987a1169ea35d4b4 (patch) | |
tree | ff9acfa9bc9a2feb3c72ad409efce099266344ba /docs/release/src | |
parent | db478134d9918219eb1b53c29ddc6a6cb7c8bc9b (diff) |
0.239 filestag239
Diffstat (limited to 'docs/release/src')
-rw-r--r-- | docs/release/src/emu/romload.cpp | 2 | ||||
-rw-r--r-- | docs/release/src/emu/validity.cpp | 22 | ||||
-rw-r--r-- | docs/release/src/emu/video.cpp | 2 | ||||
-rw-r--r-- | docs/release/src/hbmame/drivers/cps2mis.cpp | 76 | ||||
-rw-r--r-- | docs/release/src/hbmame/drivers/cv1k.cpp | 15 | ||||
-rw-r--r-- | docs/release/src/hbmame/drivers/neogeohb.cpp | 19 | ||||
-rw-r--r-- | docs/release/src/hbmame/hbmame.lst | 4 | ||||
-rw-r--r-- | docs/release/src/mame/drivers/cinemat.cpp | 39 | ||||
-rw-r--r-- | docs/release/src/mame/drivers/konamigx.cpp | 2 | ||||
-rw-r--r-- | docs/release/src/mame/drivers/model2.cpp | 90 | ||||
-rw-r--r-- | docs/release/src/osd/winui/treeview.cpp | 2 | ||||
-rw-r--r-- | docs/release/src/version.cpp | 2 |
12 files changed, 175 insertions, 100 deletions
diff --git a/docs/release/src/emu/romload.cpp b/docs/release/src/emu/romload.cpp index 97fa85b4487..73bbd5b62c9 100644 --- a/docs/release/src/emu/romload.cpp +++ b/docs/release/src/emu/romload.cpp @@ -1200,7 +1200,7 @@ void rom_load_manager::normalize_flags_for_device(std::string_view rgntag, u8 &w /*------------------------------------------------- load_software_part_region - load a software part - This is used by MESS when loading a piece of + This is used by MAME when loading a piece of software. The code should be merged with process_region_list or updated to use a slight more general process_region_list. diff --git a/docs/release/src/emu/validity.cpp b/docs/release/src/emu/validity.cpp index 590f4faccac..28870ac67d7 100644 --- a/docs/release/src/emu/validity.cpp +++ b/docs/release/src/emu/validity.cpp @@ -2292,8 +2292,9 @@ void validity_checker::validate_analog_input_field(const ioport_field &field) void validity_checker::validate_dip_settings(const ioport_field &field) { - const char *demo_sounds = ioport_string_from_index(INPUT_STRING_Demo_Sounds); - const char *flipscreen = ioport_string_from_index(INPUT_STRING_Flip_Screen); + char const *const demo_sounds = ioport_string_from_index(INPUT_STRING_Demo_Sounds); + char const *const flipscreen = ioport_string_from_index(INPUT_STRING_Flip_Screen); + char const *const name = field.specific_name(); u8 coin_list[__input_string_coinage_end + 1 - __input_string_coinage_start] = { 0 }; bool coin_error = false; @@ -2306,15 +2307,15 @@ void validity_checker::validate_dip_settings(const ioport_field &field) coin_list[strindex - __input_string_coinage_start] = 1; // make sure demo sounds default to on - if (field.name() == demo_sounds && strindex == INPUT_STRING_On && field.defvalue() != setting->value()) + if (name == demo_sounds && strindex == INPUT_STRING_On && field.defvalue() != setting->value()) osd_printf_error("Demo Sounds must default to On\n"); // check for bad demo sounds options - if (field.name() == demo_sounds && (strindex == INPUT_STRING_Yes || strindex == INPUT_STRING_No)) + if (name == demo_sounds && (strindex == INPUT_STRING_Yes || strindex == INPUT_STRING_No)) osd_printf_error("Demo Sounds option must be Off/On, not %s\n", setting->name()); // check for bad flip screen options - if (field.name() == flipscreen && (strindex == INPUT_STRING_Yes || strindex == INPUT_STRING_No)) + if (name == flipscreen && (strindex == INPUT_STRING_Yes || strindex == INPUT_STRING_No)) osd_printf_error("Flip Screen option must be Off/On, not %s\n", setting->name()); // if we have a neighbor, compare ourselves to him @@ -2324,21 +2325,21 @@ void validity_checker::validate_dip_settings(const ioport_field &field) // check for inverted off/on DIP switch order int next_strindex = get_defstr_index(nextsetting->name(), true); if (strindex == INPUT_STRING_On && next_strindex == INPUT_STRING_Off) - osd_printf_error("%s option must have Off/On options in the order: Off, On\n", field.name()); + osd_printf_error("%s option must have Off/On options in the order: Off, On\n", name); // check for inverted yes/no DIP switch order else if (strindex == INPUT_STRING_Yes && next_strindex == INPUT_STRING_No) - osd_printf_error("%s option must have Yes/No options in the order: No, Yes\n", field.name()); + osd_printf_error("%s option must have Yes/No options in the order: No, Yes\n", name); // check for inverted upright/cocktail DIP switch order else if (strindex == INPUT_STRING_Cocktail && next_strindex == INPUT_STRING_Upright) - osd_printf_error("%s option must have Upright/Cocktail options in the order: Upright, Cocktail\n", field.name()); + osd_printf_error("%s option must have Upright/Cocktail options in the order: Upright, Cocktail\n", name); // check for proper coin ordering else if (strindex >= __input_string_coinage_start && strindex <= __input_string_coinage_end && next_strindex >= __input_string_coinage_start && next_strindex <= __input_string_coinage_end && strindex >= next_strindex && setting->condition() == nextsetting->condition()) { - osd_printf_error("%s option has unsorted coinage %s > %s\n", field.name(), setting->name(), nextsetting->name()); + osd_printf_error("%s option has unsorted coinage %s > %s\n", name, setting->name(), nextsetting->name()); coin_error = true; } } @@ -2467,9 +2468,6 @@ void validity_checker::validate_inputs(device_t &root) // check for invalid UTF-8 if (!utf8_is_valid_string(name)) osd_printf_error("Field '%s' has invalid characters\n", name); - - // look up the string and print an error if default strings are not used - /*strindex =get_defstr_index(defstr_map, name, driver, &error);*/ } // verify conditions on the field diff --git a/docs/release/src/emu/video.cpp b/docs/release/src/emu/video.cpp index 652272f680b..5cb21b3f849 100644 --- a/docs/release/src/emu/video.cpp +++ b/docs/release/src/emu/video.cpp @@ -1129,7 +1129,7 @@ std::error_condition video_manager::open_next(emu_file &file, const char *extens if (pos_time != -1) { - char t_str[15]; + char t_str[16]; const std::time_t cur_time = std::time(nullptr); strftime(t_str, sizeof(t_str), "%Y%m%d_%H%M%S", std::localtime(&cur_time)); strreplace(snapstr, "%t", t_str); diff --git a/docs/release/src/hbmame/drivers/cps2mis.cpp b/docs/release/src/hbmame/drivers/cps2mis.cpp index e01dcfb2d69..8bd156e4e21 100644 --- a/docs/release/src/hbmame/drivers/cps2mis.cpp +++ b/docs/release/src/hbmame/drivers/cps2mis.cpp @@ -839,6 +839,40 @@ ROM_START( sfa3br ) ROM_LOAD( "sfa3u.key", 0x00, 0x14, CRC(4a8f98c1) SHA1(11953de12ed8fbb6f60ad03b1ba5e22a429b7cfa) ) ROM_END +ROM_START( sfa3ce ) // https://github.com/originalgrego/sfa3ce + ROM_REGION( CODE_SIZE, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "sfa3ce.03", 0x000000, 0x80000, CRC(e6a3c330) SHA1(39c5c9219e9c974b861c1bc083e142b2db811d25) ) + ROM_LOAD16_WORD_SWAP( "sfz3ce.04", 0x080000, 0x80000, CRC(78650280) SHA1(d9c2a4a8f4dc076d5a8b6db612270e6d30618f6f) ) + ROM_LOAD16_WORD_SWAP( "sz3.05c", 0x100000, 0x80000, CRC(57fd0a40) SHA1(bc2d5f4d57117bbf58b1adb088e00424ef489e92) ) + ROM_LOAD16_WORD_SWAP( "sz3.06c", 0x180000, 0x80000, CRC(f6305f8b) SHA1(3fd1ebdbad96103aca604e950b488e52460a71ec) ) + ROM_LOAD16_WORD_SWAP( "sz3.07c", 0x200000, 0x80000, CRC(6eab0f6f) SHA1(f8d093dda65cf4e8a3000dc1b96355bb03dcb495) ) + ROM_LOAD16_WORD_SWAP( "sz3.08c", 0x280000, 0x80000, CRC(910c4a3b) SHA1(dbd41280f9b16ad6a5b8f12092549970349395f1) ) + ROM_LOAD16_WORD_SWAP( "sz3ce.09c", 0x300000, 0x80000, CRC(8353dae0) SHA1(b6fd70d95ed5180e4fa953b30f3668b64a24343a) ) + ROM_LOAD16_WORD_SWAP( "sz3.10b", 0x380000, 0x80000, CRC(deb2ff52) SHA1(0aa4722aad68a04164946c78bf05752f947b4322) ) + + ROM_REGION( 0x2000000, "gfx", 0 ) + ROMX_LOAD( "sz3ce.13m", 0x0000000, 0x400000, CRC(d941f463) SHA1(fae09d5d29ef3d9650440e589ac574c98f20b899) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "sz3ce.15m", 0x0000002, 0x400000, CRC(d25f4fbf) SHA1(dee478f694c11f2ab17821f471ed2ed270d5d113) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "sz3ce.17m", 0x0000004, 0x400000, CRC(5c210d31) SHA1(27e6f75640f1a8b06e23b820fdfcb22728d517cc) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "sz3ce.19m", 0x0000006, 0x400000, CRC(a0b6f359) SHA1(4e053f29fda3211d7356d3af8005ad195b199c2f) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "sz3.14m", 0x1000000, 0x400000, CRC(5ff98297) SHA1(9e0ce43380b776c7a03872bafd4856f6fa60bda7) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "sz3.16m", 0x1000002, 0x400000, CRC(52b5bdee) SHA1(7918204dc457f7a146d8fb8cf7242dfed3109fd8) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "sz3.18m", 0x1000004, 0x400000, CRC(40631ed5) SHA1(c18c56822b90a71ca5fbdf3440eb2671011f3d8f) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "sz3.20m", 0x1000006, 0x400000, CRC(763409b4) SHA1(af60a5116c1ca9050366a35ea29128921867f3cc) , ROM_GROUPWORD | ROM_SKIP(6) ) + + ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) + ROM_LOAD( "sz3.01", 0x00000, 0x08000, CRC(de810084) SHA1(fd0b969b732921ed8b40c16fbfa30ee09c7a7cbd) ) + ROM_CONTINUE( 0x10000, 0x18000 ) + ROM_LOAD( "sz3.02", 0x28000, 0x20000, CRC(72445dc4) SHA1(14fca7596ac45ba655016eef5b6120f9f9671c23) ) + + ROM_REGION( 0x800000, "qsound", 0 ) + ROM_LOAD16_WORD_SWAP( "sz3.11m", 0x000000, 0x400000, CRC(1c89eed1) SHA1(649a0b0a3eb72e2e69e9fb1ac51a58b70daa39f3) ) + ROM_LOAD16_WORD_SWAP( "sz3.12m", 0x400000, 0x400000, CRC(f392b13a) SHA1(fa04ce0370144a49bd1d5acd873eef87b0dc9d15) ) + + ROM_REGION( 0x20, "key", 0 ) + ROM_LOAD( "sfa3u.key", 0x00, 0x14, CRC(4a8f98c1) SHA1(11953de12ed8fbb6f60ad03b1ba5e22a429b7cfa) ) +ROM_END + ROM_START( sfa3dp ) ROM_REGION( CODE_SIZE, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "sfa3dp.03", 0x000000, 0x80000, CRC(9411ced4) SHA1(45c963125242eb78992d7d13c3f773f00115ba97) ) @@ -1265,6 +1299,40 @@ ROM_START( sfz2jyh ) ROM_LOAD( "sfz2j.key", 0x00, 0x14, CRC(455bd098) SHA1(6a928a2d44f416ccdb0c09a8dd7466ac12f38110) ) ROM_END +ROM_START( sfz3ce ) + ROM_REGION( CODE_SIZE, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "sfz3ce.03", 0x000000, 0x80000, CRC(1e369ac2) SHA1(a07df805c49953316d5d9d180eff249d194cf097) ) + ROM_LOAD16_WORD_SWAP( "sfz3ce.04", 0x080000, 0x80000, CRC(78650280) SHA1(d9c2a4a8f4dc076d5a8b6db612270e6d30618f6f) ) + ROM_LOAD16_WORD_SWAP( "sz3.05c", 0x100000, 0x80000, CRC(57fd0a40) SHA1(bc2d5f4d57117bbf58b1adb088e00424ef489e92) ) + ROM_LOAD16_WORD_SWAP( "sz3.06c", 0x180000, 0x80000, CRC(f6305f8b) SHA1(3fd1ebdbad96103aca604e950b488e52460a71ec) ) + ROM_LOAD16_WORD_SWAP( "sz3.07c", 0x200000, 0x80000, CRC(6eab0f6f) SHA1(f8d093dda65cf4e8a3000dc1b96355bb03dcb495) ) + ROM_LOAD16_WORD_SWAP( "sz3.08c", 0x280000, 0x80000, CRC(910c4a3b) SHA1(dbd41280f9b16ad6a5b8f12092549970349395f1) ) + ROM_LOAD16_WORD_SWAP( "sz3ce.09c", 0x300000, 0x80000, CRC(8353dae0) SHA1(b6fd70d95ed5180e4fa953b30f3668b64a24343a) ) + ROM_LOAD16_WORD_SWAP( "sz3.10b", 0x380000, 0x80000, CRC(deb2ff52) SHA1(0aa4722aad68a04164946c78bf05752f947b4322) ) + + ROM_REGION( 0x2000000, "gfx", 0 ) + ROMX_LOAD( "sz3ce.13m", 0x0000000, 0x400000, CRC(d941f463) SHA1(fae09d5d29ef3d9650440e589ac574c98f20b899) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "sz3ce.15m", 0x0000002, 0x400000, CRC(d25f4fbf) SHA1(dee478f694c11f2ab17821f471ed2ed270d5d113) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "sz3ce.17m", 0x0000004, 0x400000, CRC(5c210d31) SHA1(27e6f75640f1a8b06e23b820fdfcb22728d517cc) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "sz3ce.19m", 0x0000006, 0x400000, CRC(a0b6f359) SHA1(4e053f29fda3211d7356d3af8005ad195b199c2f) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "sz3.14m", 0x1000000, 0x400000, CRC(5ff98297) SHA1(9e0ce43380b776c7a03872bafd4856f6fa60bda7) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "sz3.16m", 0x1000002, 0x400000, CRC(52b5bdee) SHA1(7918204dc457f7a146d8fb8cf7242dfed3109fd8) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "sz3.18m", 0x1000004, 0x400000, CRC(40631ed5) SHA1(c18c56822b90a71ca5fbdf3440eb2671011f3d8f) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "sz3.20m", 0x1000006, 0x400000, CRC(763409b4) SHA1(af60a5116c1ca9050366a35ea29128921867f3cc) , ROM_GROUPWORD | ROM_SKIP(6) ) + + ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) + ROM_LOAD( "sz3.01", 0x00000, 0x08000, CRC(de810084) SHA1(fd0b969b732921ed8b40c16fbfa30ee09c7a7cbd) ) + ROM_CONTINUE( 0x10000, 0x18000 ) + ROM_LOAD( "sz3.02", 0x28000, 0x20000, CRC(72445dc4) SHA1(14fca7596ac45ba655016eef5b6120f9f9671c23) ) + + ROM_REGION( 0x800000, "qsound", 0 ) + ROM_LOAD16_WORD_SWAP( "sz3.11m", 0x000000, 0x400000, CRC(1c89eed1) SHA1(649a0b0a3eb72e2e69e9fb1ac51a58b70daa39f3) ) + ROM_LOAD16_WORD_SWAP( "sz3.12m", 0x400000, 0x400000, CRC(f392b13a) SHA1(fa04ce0370144a49bd1d5acd873eef87b0dc9d15) ) + + ROM_REGION( 0x20, "key", 0 ) + ROM_LOAD( "sfa3u.key", 0x00, 0x14, CRC(4a8f98c1) SHA1(11953de12ed8fbb6f60ad03b1ba5e22a429b7cfa) ) +ROM_END + ROM_START( sfz3jb ) ROM_REGION( CODE_SIZE, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "sfz3jb.03", 0x000000, 0x80000, CRC(d7eca311) SHA1(cb2156bb5b545782bf4c0387ba6995136d14452d) ) @@ -2271,6 +2339,7 @@ GAME( 2014, pfghtjrm, sgemf, cps2, cps2_2p3b, cps2_state, init_cps2, R GAME( 2001, pzloop2jd, pzloop2, dead_cps2, pzloop2, cps2_state, init_pzloop2, ROT0, "Razoola", "Puzz Loop 2 (Japan 010226 Phoenix Edition)", MACHINE_SUPPORTS_SAVE ) GAME( 1996, sfa2h, sfa2, cps2, cps2_2p6b, cps2_state, init_cps2, ROT0, "Pipi899", "Street Fighter Alpha 2 (Enable Hidden Characters)", MACHINE_SUPPORTS_SAVE ) GAME( 2005, sfa3br, sfa3, cps2, cps2_2p6bt,cps2_state, init_cps2, ROT0, "BisonSAS & Alan Yagami", "Street Fighter Alpha 3 (Brasil translation)", MACHINE_SUPPORTS_SAVE ) +GAME( 2021, sfa3ce, sfa3, cps2, cps2_2p6b, cps2_state, init_cps2, ROT0, "Grego and Gnawtor", "Street Fighter Alpha 3 Challenger's Edition", MACHINE_SUPPORTS_SAVE ) GAME( 2009, sfa3dp, sfa3, cps2, cps2_2p6bt,cps2_state, init_cps2, ROT0, "Pipi899", "Street Fighter Alpha 3 (Xiang Long edition 2009-05-10)", MACHINE_SUPPORTS_SAVE ) GAME( 2009, sfa3nc, sfa3, cps2, cps2_2p6bt,cps2_state, init_cps2, ROT0, "shiro", "Street Fighter Alpha 3 (Edition Nude Cammy)", MACHINE_SUPPORTS_SAVE ) GAME( 2009, sfa3nch, sfa3, cps2, cps2_2p6bt,cps2_state, init_cps2, ROT0, "hack", "Street Fighter Alpha 3 (Edition Nude Chunli)", MACHINE_SUPPORTS_SAVE ) @@ -2284,6 +2353,7 @@ GAME( 2008, sfz2ajhp, sfz2al, cps2, cps2_2p6b, cps2_state, init_cps2, R GAME( 2009, sfz2aldp, sfz2al, cps2, cps2_2p6b, cps2_state, init_cps2, ROT0, "Pipi899", "Street Fighter Zero 2 Alpha (Dragon Edition v1.0 2009-03-17)", MACHINE_SUPPORTS_SAVE ) GAME( 2009, sfz2aldp2, sfz2al, cps2, cps2_2p6b, cps2_state, init_cps2, ROT0, "Pipi899", "Street Fighter Zero 2 Alpha (Dragon Edition v2.0 2009-04-24)", MACHINE_SUPPORTS_SAVE ) GAME( 1996, sfz2jyh, sfa2, cps2, cps2_2p6b, cps2_state, init_cps2, ROT0, "Yumeji", "Street Fighter Zero 2 (Boss hack)", MACHINE_SUPPORTS_SAVE ) +GAME( 2021, sfz3ce, sfa3, cps2, cps2_2p6b, cps2_state, init_cps2, ROT0, "Grego and Gnawtor", "Street Fighter Zero 3 Challenger's Edition", MACHINE_SUPPORTS_SAVE ) GAME( 1998, sfz3jb, sfa3, cps2, cps2_2p6b, cps2_state, init_cps2, ROT0, "Yumeji", "Street Fighter Zero 3 (Enable hidden characters)", MACHINE_SUPPORTS_SAVE ) GAME( 2009, sfz3jemb, sfa3, cps2, cps2_2p6b, cps2_state, init_cps2, ROT0, "Blacheart", "Street Fighter Zero 3 (Easy Moves)(2009-05-01)", MACHINE_SUPPORTS_SAVE ) GAME( 2007, sfz3jhp, sfa3, cps2, cps2_2p6b, cps2_state, init_cps2, ROT0, "Pipi899", "Street Fighter Zero 3 (Moves hack 2017-03-11)", MACHINE_SUPPORTS_SAVE ) @@ -2315,12 +2385,6 @@ GAME( 2009, xmvsfrm, xmvsf, cps2, cps2_2p6b, cps2_state, init_cps2, R GAME( 1996, xmvsfryh, xmvsf, cps2, cps2_2p6b, cps2_state, init_cps2, ROT0, "Ydmis", "X-Men Vs. Street Fighter (Change character in battle)", MACHINE_SUPPORTS_SAVE ) -//PSmame (c) gaston90 used with permission - - /**************************************************** - Proyecto Shadows Mame Build Plus -*****************************************************/ - /**************************** 19XX The War Against Destiny *******************************/ diff --git a/docs/release/src/hbmame/drivers/cv1k.cpp b/docs/release/src/hbmame/drivers/cv1k.cpp index f06474e3a90..bcf17f91a00 100644 --- a/docs/release/src/hbmame/drivers/cv1k.cpp +++ b/docs/release/src/hbmame/drivers/cv1k.cpp @@ -19,3 +19,18 @@ ROM_END // CA017 Deathsmiles GAME( 2007, deathsmlh01, deathsml, cv1k, cv1k, cv1k_state, init_deathsml, ROT0, "Cave (AMI license)", "Death Smiles (Hidden elements full open + character enhancement)", 0 ) +// Cavedwellers hack +ROM_START( sdojak ) + ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) + ROM_LOAD16_WORD_SWAP( "sdojak.u4", 0x000000, 0x400000, CRC(a878ff4c) SHA1(cf5f2f987a775099992009c376466c44170e0e3f) ) + + ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) + ROM_LOAD( "sdojak.u2", 0x000000, 0x8400000, CRC(54353425) SHA1(5c749cd2e93a1b51bfdf1a0d4fd436b4d17acf9f) ) + + ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) + ROM_LOAD16_WORD_SWAP( "sdojak.u23", 0x000000, 0x400000, CRC(32b91544) SHA1(49e914bfdf33a328fbfa7efb42c5b89915e37643) ) + ROM_LOAD16_WORD_SWAP( "sdojak.u24", 0x400000, 0x400000, CRC(7b9e749f) SHA1(374085a60098cc62501abae4d148bfd88c88149f) ) +ROM_END + +GAME( 2021, sdojak, 0, cv1k_d, cv1k, cv1k_state, init_ddpdfk, ROT270, "CaveDwellers", "DoDonPachi SaiDaiOuJou & Knuckles (2021/12/01)", 0 ) + diff --git a/docs/release/src/hbmame/drivers/neogeohb.cpp b/docs/release/src/hbmame/drivers/neogeohb.cpp index 7022cee5b7a..c30ada9154f 100644 --- a/docs/release/src/hbmame/drivers/neogeohb.cpp +++ b/docs/release/src/hbmame/drivers/neogeohb.cpp @@ -249,7 +249,7 @@ NUM GAME YEAR COMPANY TITLE 807* 2013 Neobitz Knight's Chance 808* 2014 NG:DEV.Team Razion 809* 2015 NG:DEV.Team Kraut Buster -810* 2018 Bitmap Bureau Xeno Crisis +810 BB01 2019 Bitmap Bureau Xeno Crisis *********************************************************************************************************/ @@ -2759,6 +2759,22 @@ ROM_START( lhbb ) // Last Hope with Blue Bullets ROM_LOAD16_BYTE( "802.c4", 0x800001, 0x400000, CRC(8486ad9e) SHA1(19a2a73c825687e0cb9fd62bde00db91b5409529) ) ROM_END +ROM_START( xeno ) + ROM_REGION( 0x200000, "maincpu", ROMREGION_ERASEFF ) + ROM_LOAD16_WORD_SWAP( "810.p1", 0x000000, 0x100000, CRC(637605a6) SHA1(179ebcdeaac3e561fd7acb72022eda8c3c74cb8a) ) + ROM_LOAD16_WORD_SWAP( "810.p2", 0x100000, 0x100000, CRC(84838145) SHA1(c1f48d333dfc85b9371f811dd449a42d8cdecf3f) ) + + NEO_SFIX_128K( "810.s1", CRC(7537ea79) SHA1(b7242a6dd7b2ad8ccf7a223c08d626abf013f366) ) + + NEO_BIOS_AUDIO_64K( "810.m1", CRC(28c13ed9) SHA1(a3c8cf36906293a24f1ed49376c9d561560d2730) ) + + ROM_REGION( 0x1000000, "ymsnd:adpcma", 0 ) + ROM_LOAD( "810.v1", 0x000000, 0x1000000, CRC(60d57867) SHA1(e1f3f759b4af4404f19dd5b75135e6968b6be3c5) ) + + ROM_REGION( 0x400000, "sprites", 0 ) + ROM_LOAD16_BYTE( "810.c1", 0x000000, 0x200000, CRC(ae51ef89) SHA1(da82214263a99520364a2b7ab8140bdc68940f6d) ) + ROM_LOAD16_BYTE( "810.c2", 0x000001, 0x200000, CRC(a8610100) SHA1(aded6eaa17a518a8f4af9c3779c41ef8dd32a316) ) +ROM_END GAME( 1996, crswd2bl, neogeo, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "Razoola", "Crossed Swords 2 (CD conversion)", MACHINE_SUPPORTS_SAVE ) GAME( 1995, csw2, crswd2bl, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "hack", "Crossed Swords 2", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) @@ -2878,6 +2894,7 @@ GAME( 2015, twister, neogeo, neogeo_noslot, neogeo, neogeo_state, init GAME( 2019, venuswars, neogeo, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "Vasily Familiya", "Venus Wars demo", MACHINE_IS_INCOMPLETE | MACHINE_SUPPORTS_SAVE ) GAME( 2018, vlad2000, neogeo, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "Vasily Familiya", "Vladivostok 2000 demo", MACHINE_IS_INCOMPLETE | MACHINE_SUPPORTS_SAVE ) GAME( 2001, ww2demo, neogeo, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "Rastersoft", "WW2demo", MACHINE_IS_INCOMPLETE | MACHINE_SUPPORTS_SAVE ) +GAME( 2019, xeno, neogeo, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "Bitmap Bureau", "Xeno Crisis v1.0.0", MACHINE_SUPPORTS_SAVE ) GAME( 2016, xmas2017, neogeo, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "Blastar", "Xmas/Happy New Year 2017 demo", MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/hbmame.lst b/docs/release/src/hbmame/hbmame.lst index db04234fa4b..e903fb2266b 100644 --- a/docs/release/src/hbmame/hbmame.lst +++ b/docs/release/src/hbmame/hbmame.lst @@ -1221,6 +1221,7 @@ suicide /* Razoola */ suicide2 /* Razoola */ sfa2h sfa3br +sfa3ce sfa3dp sfa3nc sfa3nch @@ -1233,6 +1234,7 @@ sfz2ajhp sfz2aldp sfz2aldp2 sfz2jyh +sfz3ce sfz3jb sfz3jemb sfz3jhp @@ -1484,6 +1486,7 @@ sfiii3ns14 @source:cv1k.cpp deathsml //parent deathsmlh01 +sdojak @source:ddragon.cpp ddragon2 @@ -5970,6 +5973,7 @@ twister // Blastar 2015 //venuswars vlad2000 ww2demo +xeno xmas2017 zintrckbh zintrkcd /* 211 (c) 1996 ADK / SNK */ diff --git a/docs/release/src/mame/drivers/cinemat.cpp b/docs/release/src/mame/drivers/cinemat.cpp index d322dbecdd9..5c193c8abde 100644 --- a/docs/release/src/mame/drivers/cinemat.cpp +++ b/docs/release/src/mame/drivers/cinemat.cpp @@ -371,15 +371,13 @@ static INPUT_PORTS_START( spacewar ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state,coin_inserted, 0) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reset Playfield") PORT_CODE(KEYCODE_R) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state, coin_inserted, 0) INPUT_PORTS_END static INPUT_PORTS_START( spaceshp ) - PORT_INCLUDE(spacewar ) + PORT_INCLUDE( spacewar ) PORT_MODIFY("SWITCHES") PORT_DIPNAME( 0x03, 0x00, "Time" ) PORT_DIPLOCATION("SW1:!4,!3") @@ -387,9 +385,6 @@ static INPUT_PORTS_START( spaceshp ) PORT_DIPSETTING( 0x01, "1:30/coin" ) PORT_DIPSETTING( 0x02, "2:00/coin" ) PORT_DIPSETTING( 0x03, "2:30/coin" ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW1:!1" ) - PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW1:!2" ) INPUT_PORTS_END @@ -434,7 +429,7 @@ static INPUT_PORTS_START( barrier ) PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state,coin_inserted, 0) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state, coin_inserted, 0) INPUT_PORTS_END @@ -467,7 +462,7 @@ static INPUT_PORTS_START( speedfrk ) PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state,coin_inserted, 0) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state, coin_inserted, 0) PORT_START("WHEEL") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_RESET @@ -515,7 +510,7 @@ static INPUT_PORTS_START( starhawk ) PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state,coin_inserted, 0) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state, coin_inserted, 0) INPUT_PORTS_END @@ -559,7 +554,7 @@ static INPUT_PORTS_START( sundance ) PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state,coin_inserted, 0) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state, coin_inserted, 0) PORT_START("PAD1") PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 Pad 1") PORT_CODE(KEYCODE_7_PAD) PORT_PLAYER(1) @@ -615,7 +610,7 @@ static INPUT_PORTS_START( tailg ) PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state,coin_inserted, 0) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state, coin_inserted, 0) PORT_START("ANALOGX") PORT_BIT( 0xfff, 0x800, IPT_AD_STICK_X ) PORT_MINMAX(0x200,0xe00) PORT_SENSITIVITY(100) PORT_KEYDELTA(50) @@ -653,7 +648,7 @@ static INPUT_PORTS_START( warrior ) PORT_DIPUNUSED_DIPLOC( 0x10, IP_ACTIVE_HIGH, "SW1:!5" ) PORT_DIPUNUSED_DIPLOC( 0x20, IP_ACTIVE_HIGH, "SW1:!6" ) PORT_DIPUNUSED_DIPLOC( 0x40, IP_ACTIVE_HIGH, "SW1:!7" ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state,coin_inserted, 0) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state, coin_inserted, 0) INPUT_PORTS_END @@ -689,7 +684,7 @@ static INPUT_PORTS_START( armora ) PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_SERVICE( 0x40, IP_ACTIVE_HIGH ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state,coin_inserted, 0) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state, coin_inserted, 0) INPUT_PORTS_END @@ -725,7 +720,7 @@ static INPUT_PORTS_START( ripoff ) PORT_DIPSETTING( 0x00, "Individual" ) PORT_DIPSETTING( 0x20, "Combined" ) PORT_SERVICE( 0x40, IP_ACTIVE_LOW ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state,coin_inserted, 0) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state, coin_inserted, 0) INPUT_PORTS_END @@ -762,7 +757,7 @@ static INPUT_PORTS_START( starcas ) PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_SERVICE( 0x40, IP_ACTIVE_HIGH ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state,coin_inserted, 0) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state, coin_inserted, 0) INPUT_PORTS_END static INPUT_PORTS_START( starcasc ) @@ -829,7 +824,7 @@ static INPUT_PORTS_START( solarq ) PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_SERVICE( 0x40, IP_ACTIVE_HIGH ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state,coin_inserted, 0) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state, coin_inserted, 0) INPUT_PORTS_END @@ -863,7 +858,7 @@ static INPUT_PORTS_START( boxingb ) PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_SERVICE( 0x40, IP_ACTIVE_LOW ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state,coin_inserted, 0) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state, coin_inserted, 0) PORT_START("DIAL") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_REVERSE PORT_SENSITIVITY(100) PORT_KEYDELTA(5) @@ -905,7 +900,7 @@ static INPUT_PORTS_START( wotw ) PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_SERVICE( 0x40, IP_ACTIVE_LOW ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state,coin_inserted, 0) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state, coin_inserted, 0) INPUT_PORTS_END @@ -947,7 +942,7 @@ static INPUT_PORTS_START( demon ) PORT_DIPNAME( 0x40, 0x40, DEF_STR( Free_Play ) ) PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state,coin_inserted, 0) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state, coin_inserted, 0) INPUT_PORTS_END @@ -993,7 +988,7 @@ static INPUT_PORTS_START( qb3 ) PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_SERVICE( 0x40, IP_ACTIVE_LOW ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state,coin_inserted, 0) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, cinemat_state, coin_inserted, 0) INPUT_PORTS_END diff --git a/docs/release/src/mame/drivers/konamigx.cpp b/docs/release/src/mame/drivers/konamigx.cpp index e5c659bc1df..6a1ec93ccbb 100644 --- a/docs/release/src/mame/drivers/konamigx.cpp +++ b/docs/release/src/mame/drivers/konamigx.cpp @@ -345,7 +345,7 @@ void konamigx_state::sexyparo_esc(address_space &space, uint32_t p1, uint32_t p2 { // The d20000 should probably be p3 // TODO: debugging bootcamp, remove once finished -#ifdef UNUSED_FUNCTION +#if 0 if (p1 != 0) { logerror("sexyparo_esc P1 param: %02x\n", p1); diff --git a/docs/release/src/mame/drivers/model2.cpp b/docs/release/src/mame/drivers/model2.cpp index 0954af07853..2c68ccaf6d5 100644 --- a/docs/release/src/mame/drivers/model2.cpp +++ b/docs/release/src/mame/drivers/model2.cpp @@ -111,8 +111,6 @@ /* Timers - these count down at 25 MHz and pull IRQ2 when they hit 0 */ u32 model2_state::timers_r(offs_t offset) { - m_maincpu->i960_noburst(); - // if timer is running, calculate current value if (m_timerrun[offset]) { @@ -129,8 +127,6 @@ u32 model2_state::timers_r(offs_t offset) void model2_state::timers_w(offs_t offset, u32 data, u32 mem_mask) { attotime period; - - m_maincpu->i960_noburst(); COMBINE_DATA(&m_timervals[offset]); m_timerorig[offset] = m_timervals[offset]; @@ -603,13 +599,11 @@ void model2_tgp_state::copro_boot() u32 model2_tgp_state::copro_fifo_r() { - m_maincpu->i960_noburst(); return m_copro_fifo_out->pop(); } void model2_tgp_state::copro_fifo_w(u32 data) { - m_maincpu->i960_noburst(); if (m_coproctl & 0x80000000) { m_copro_tgp_program[m_coprocnt] = data; @@ -652,13 +646,11 @@ void model2b_state::copro_boot() u32 model2b_state::copro_fifo_r() { - m_maincpu->i960_noburst(); return m_copro_fifo_out->pop(); } void model2b_state::copro_fifo_w(u32 data) { - m_maincpu->i960_noburst(); if (m_coproctl & 0x80000000) { m_copro_adsp->external_dma_write(m_coprocnt, data & 0xffff); @@ -732,13 +724,11 @@ void model2c_state::copro_boot() u32 model2c_state::copro_fifo_r() { - m_maincpu->i960_noburst(); return m_copro_fifo_out->pop(); } void model2c_state::copro_fifo_w(u32 data) { - m_maincpu->i960_noburst(); if (m_coproctl & 0x80000000) { if (m_coprocnt & 1) @@ -931,22 +921,16 @@ void model2_state::geo_w(offs_t offset, u32 data) u32 model2_state::irq_request_r() { - m_maincpu->i960_noburst(); - return m_intreq; } u32 model2_state::irq_enable_r() { - m_maincpu->i960_noburst(); - return m_intena; } void model2_state::irq_ack_w(u32 data) { - m_maincpu->i960_noburst(); - m_intreq &= data; model2_check_irqack_state(data ^ 0xffffffff); @@ -954,8 +938,6 @@ void model2_state::irq_ack_w(u32 data) void model2_state::irq_enable_w(offs_t offset, u32 data, u32 mem_mask) { - m_maincpu->i960_noburst(); - COMBINE_DATA(&m_intena); model2_check_irq_state(); } @@ -1121,9 +1103,9 @@ void model2_state::fbvram_bankB_w(offs_t offset, u16 data, u16 mem_mask) { COMBI /* common map for all Model 2 versions */ void model2_state::model2_base_mem(address_map &map) { - map(0x00000000, 0x001fffff).rom().nopw(); + map(0x00000000, 0x001fffff).rom().nopw().flags(i960_cpu_device::BURST);; - map(0x00500000, 0x005fffff).ram().share("workram"); + map(0x00500000, 0x005fffff).ram().share("workram").flags(i960_cpu_device::BURST); map(0x00800000, 0x00803fff).rw(FUNC(model2_state::geo_r), FUNC(model2_state::geo_w)); //map(0x00800010, 0x00800013).nopw(); @@ -1132,7 +1114,7 @@ void model2_state::model2_base_mem(address_map &map) //map(0x00880000, 0x00883fff).w(FUNC(model2_state::copro_w)); - map(0x00900000, 0x0091ffff).mirror(0x60000).ram().share("bufferram"); + map(0x00900000, 0x0091ffff).mirror(0x60000).ram().share("bufferram").flags(i960_cpu_device::BURST); map(0x00980004, 0x00980007).r(FUNC(model2_state::fifo_control_2a_r)); map(0x0098000c, 0x0098000f).rw(FUNC(model2_state::videoctl_r), FUNC(model2_state::videoctl_w)); @@ -1144,24 +1126,24 @@ void model2_state::model2_base_mem(address_map &map) map(0x00f00000, 0x00f0000f).rw(FUNC(model2_state::timers_r), FUNC(model2_state::timers_w)); - map(0x01000000, 0x0100ffff).rw("tile", FUNC(segas24_tile_device::tile_r), FUNC(segas24_tile_device::tile_w)).mirror(0x110000); - map(0x01020000, 0x01020003).nopw().mirror(0x100000); // ABSEL, always 0 + map(0x01000000, 0x0100ffff).rw("tile", FUNC(segas24_tile_device::tile_r), FUNC(segas24_tile_device::tile_w)).mirror(0x110000).flags(i960_cpu_device::BURST); + map(0x01020000, 0x01020003).nopw().mirror(0x100000).flags(i960_cpu_device::BURST); // ABSEL, always 0 map(0x01040000, 0x01040001).w("tile", FUNC(segas24_tile_device::xhout_w)).mirror(0x100000); // Horizontal synchronization register map(0x01060000, 0x01060001).w("tile", FUNC(segas24_tile_device::xvout_w)).mirror(0x100000); // Vertical synchronization register map(0x01070000, 0x01070003).nopw().mirror(0x100000); // Video synchronization switch - map(0x01080000, 0x010fffff).rw("tile", FUNC(segas24_tile_device::char_r), FUNC(segas24_tile_device::char_w)).mirror(0x100000); + map(0x01080000, 0x010fffff).rw("tile", FUNC(segas24_tile_device::char_r), FUNC(segas24_tile_device::char_w)).mirror(0x100000).flags(i960_cpu_device::BURST); - map(0x01800000, 0x01803fff).rw(FUNC(model2_state::palette_r), FUNC(model2_state::palette_w)); - map(0x01810000, 0x0181bfff).rw(FUNC(model2_state::colorxlat_r), FUNC(model2_state::colorxlat_w)); + map(0x01800000, 0x01803fff).rw(FUNC(model2_state::palette_r), FUNC(model2_state::palette_w)).flags(i960_cpu_device::BURST); + map(0x01810000, 0x0181bfff).rw(FUNC(model2_state::colorxlat_r), FUNC(model2_state::colorxlat_w)).flags(i960_cpu_device::BURST); map(0x0181c000, 0x0181c003).w(FUNC(model2_state::model2_3d_zclip_w)); - map(0x01a00000, 0x01a03fff).rw(m_m2comm, FUNC(m2comm_device::share_r), FUNC(m2comm_device::share_w)).mirror(0x10000); // Power Sled access comm.board at 0x01A0XXXX, not sure if really a mirror, or slightly different comm.device + map(0x01a00000, 0x01a03fff).rw(m_m2comm, FUNC(m2comm_device::share_r), FUNC(m2comm_device::share_w)).mirror(0x10000).flags(i960_cpu_device::BURST); // Power Sled access comm.board at 0x01A0XXXX, not sure if really a mirror, or slightly different comm.device map(0x01a04000, 0x01a04000).rw(m_m2comm, FUNC(m2comm_device::cn_r), FUNC(m2comm_device::cn_w)).mirror(0x10000); map(0x01a04002, 0x01a04002).rw(m_m2comm, FUNC(m2comm_device::fg_r), FUNC(m2comm_device::fg_w)).mirror(0x10000); - map(0x01d00000, 0x01d03fff).ram().share("backup1"); // Backup sram - map(0x02000000, 0x03ffffff).rom().region("main_data", 0); + map(0x01d00000, 0x01d03fff).ram().share("backup1").flags(i960_cpu_device::BURST); // Backup sram + map(0x02000000, 0x03ffffff).rom().region("main_data", 0).flags(i960_cpu_device::BURST); // "extra" data - map(0x06000000, 0x06ffffff).rom().region("main_data", 0x1000000); + map(0x06000000, 0x06ffffff).rom().region("main_data", 0x1000000).flags(i960_cpu_device::BURST); map(0x10000000, 0x101fffff).rw(FUNC(model2_state::render_mode_r), FUNC(model2_state::render_mode_w)); // map(0x10200000, 0x103fffff) renderer status register @@ -1172,16 +1154,16 @@ void model2_state::model2_base_mem(address_map &map) // map(0x10c00000, 0x10dfffff) fill memory pong // format is xGGGGGRRRRRBBBBB (512x400) - map(0x11600000, 0x1167ffff).rw(FUNC(model2_state::fbvram_bankA_r), FUNC(model2_state::fbvram_bankA_w)); // framebuffer A (last bronx title screen) - map(0x11680000, 0x116fffff).rw(FUNC(model2_state::fbvram_bankB_r), FUNC(model2_state::fbvram_bankB_w)); // framebuffer B + map(0x11600000, 0x1167ffff).rw(FUNC(model2_state::fbvram_bankA_r), FUNC(model2_state::fbvram_bankA_w)).flags(i960_cpu_device::BURST); // framebuffer A (last bronx title screen) + map(0x11680000, 0x116fffff).rw(FUNC(model2_state::fbvram_bankB_r), FUNC(model2_state::fbvram_bankB_w)).flags(i960_cpu_device::BURST); // framebuffer B - map(0x12800000, 0x1281ffff).rw(FUNC(model2_state::lumaram_r), FUNC(model2_state::lumaram_w)).umask32(0x0000ffff); // polygon "luma" RAM + map(0x12800000, 0x1281ffff).rw(FUNC(model2_state::lumaram_r), FUNC(model2_state::lumaram_w)).umask32(0x0000ffff).flags(i960_cpu_device::BURST); // polygon "luma" RAM } /* common map for 5881 protection */ void model2_state::model2_5881_mem(address_map &map) { - map(0x01d80000, 0x01d8ffff).ram(); + map(0x01d80000, 0x01d8ffff).ram().flags(i960_cpu_device::BURST); map(0x01d90000, 0x01d9ffff).m(m_cryptdevice, FUNC(sega_315_5881_crypt_device::iomap_le)); } @@ -1304,16 +1286,16 @@ void model2_tgp_state::model2_tgp_mem(address_map &map) { model2_base_mem(map); - map(0x00804000, 0x00807fff).rw(FUNC(model2_tgp_state::geo_prg_r), FUNC(model2_tgp_state::geo_prg_w)); - map(0x00880000, 0x00883fff).w(FUNC(model2_tgp_state::copro_function_port_w)); + map(0x00804000, 0x00807fff).rw(FUNC(model2_tgp_state::geo_prg_r), FUNC(model2_tgp_state::geo_prg_w)).flags(i960_cpu_device::BURST); + map(0x00880000, 0x00883fff).w(FUNC(model2_tgp_state::copro_function_port_w)).flags(i960_cpu_device::BURST); map(0x00884000, 0x00887fff).rw(FUNC(model2_tgp_state::copro_fifo_r), FUNC(model2_tgp_state::copro_fifo_w)); map(0x00980000, 0x00980003).rw(FUNC(model2_tgp_state::copro_ctl1_r), FUNC(model2_tgp_state::copro_ctl1_w)); map(0x00980008, 0x0098000b).w(FUNC(model2_tgp_state::geo_ctl1_w)); map(0x009c0000, 0x009cffff).rw(FUNC(model2_tgp_state::model2_serial_r), FUNC(model2_tgp_state::model2_serial_w)); - map(0x12000000, 0x121fffff).ram().w(FUNC(model2o_state::tex0_w)).mirror(0x200000).share("textureram0"); // texture RAM 0 - map(0x12400000, 0x125fffff).ram().w(FUNC(model2o_state::tex1_w)).mirror(0x200000).share("textureram1"); // texture RAM 1 + map(0x12000000, 0x121fffff).ram().w(FUNC(model2o_state::tex0_w)).mirror(0x200000).share("textureram0").flags(i960_cpu_device::BURST); // texture RAM 0 + map(0x12400000, 0x125fffff).ram().w(FUNC(model2o_state::tex1_w)).mirror(0x200000).share("textureram1").flags(i960_cpu_device::BURST); // texture RAM 1 } /* original Model 2 overrides */ @@ -1321,8 +1303,8 @@ void model2o_state::model2o_mem(address_map &map) { model2_tgp_mem(map); - map(0x00200000, 0x0021ffff).ram(); - map(0x00220000, 0x0023ffff).rom().region("maincpu", 0x20000); + map(0x00200000, 0x0021ffff).ram().flags(i960_cpu_device::BURST); + map(0x00220000, 0x0023ffff).rom().region("maincpu", 0x20000).flags(i960_cpu_device::BURST); map(0x00980004, 0x00980007).r(FUNC(model2o_state::fifo_control_2o_r)); map(0x01c00000, 0x01c00fff).rw("dpram", FUNC(mb8421_device::right_r), FUNC(mb8421_device::right_w)).umask32(0x00ff00ff); // 2k*8-bit dual port ram map(0x01c80000, 0x01c80003).rw(FUNC(model2o_state::model2_serial_r), FUNC(model2o_state::model2_serial_w)); @@ -1393,7 +1375,7 @@ u8 model2o_gtx_state::gtx_r(offs_t offset) void model2o_gtx_state::model2o_gtx_mem(address_map &map) { model2o_mem(map); - map(0x02c00000,0x02cfffff).r(FUNC(model2o_gtx_state::gtx_r)); + map(0x02c00000,0x02cfffff).r(FUNC(model2o_gtx_state::gtx_r)).flags(i960_cpu_device::BURST); } /* TODO: read by Sonic the Fighters (bit 1), unknown purpose */ @@ -1410,7 +1392,7 @@ void model2a_state::model2a_crx_mem(address_map &map) { model2_tgp_mem(map); - map(0x00200000, 0x0023ffff).ram(); + map(0x00200000, 0x0023ffff).ram().flags(i960_cpu_device::BURST); map(0x01c00000, 0x01c0001f).rw("io", FUNC(sega_315_5649_device::read), FUNC(sega_315_5649_device::write)).umask32(0x00ff00ff); map(0x01c00040, 0x01c00043).nopw(); map(0x01c80000, 0x01c80003).rw(FUNC(model2a_state::model2_serial_r), FUNC(model2a_state::model2_serial_w)); @@ -1433,7 +1415,7 @@ void model2b_state::model2b_crx_mem(address_map &map) { model2_base_mem(map); - map(0x00200000, 0x0023ffff).ram(); + map(0x00200000, 0x0023ffff).ram().flags(i960_cpu_device::BURST); map(0x00804000, 0x00807fff).rw(FUNC(model2b_state::geo_prg_r), FUNC(model2b_state::geo_prg_w)); //map(0x00804000, 0x00807fff).rw(FUNC(model2b_state::geo_sharc_fifo_r), FUNC(model2b_state::geo_sharc_fifo_w)); @@ -1450,12 +1432,12 @@ void model2b_state::model2b_crx_mem(address_map &map) map(0x009c0000, 0x009cffff).rw(FUNC(model2b_state::model2_serial_r), FUNC(model2b_state::model2_serial_w)); - map(0x11000000, 0x110fffff).ram().share("textureram0"); // texture RAM 0 (2b/2c) - map(0x11100000, 0x111fffff).ram().share("textureram0"); // texture RAM 0 (2b/2c) - map(0x11200000, 0x112fffff).ram().share("textureram1"); // texture RAM 1 (2b/2c) - map(0x11300000, 0x113fffff).ram().share("textureram1"); // texture RAM 1 (2b/2c) - map(0x11400000, 0x1140ffff).rw(FUNC(model2b_state::lumaram_r), FUNC(model2b_state::lumaram_w)); // polygon "luma" RAM (2b/2c) - map(0x12800000, 0x1281ffff).rw(FUNC(model2b_state::lumaram_r), FUNC(model2b_state::lumaram_w)).umask32(0x0000ffff); // polygon "luma" RAM + map(0x11000000, 0x110fffff).ram().share("textureram0").flags(i960_cpu_device::BURST); // texture RAM 0 (2b/2c) + map(0x11100000, 0x111fffff).ram().share("textureram0").flags(i960_cpu_device::BURST); // texture RAM 0 (2b/2c) + map(0x11200000, 0x112fffff).ram().share("textureram1").flags(i960_cpu_device::BURST); // texture RAM 1 (2b/2c) + map(0x11300000, 0x113fffff).ram().share("textureram1").flags(i960_cpu_device::BURST); // texture RAM 1 (2b/2c) + map(0x11400000, 0x1140ffff).rw(FUNC(model2b_state::lumaram_r), FUNC(model2b_state::lumaram_w)).flags(i960_cpu_device::BURST); // polygon "luma" RAM (2b/2c) + map(0x12800000, 0x1281ffff).rw(FUNC(model2b_state::lumaram_r), FUNC(model2b_state::lumaram_w)).umask32(0x0000ffff).flags(i960_cpu_device::BURST); // polygon "luma" RAM map(0x01c00000, 0x01c0001f).rw("io", FUNC(sega_315_5649_device::read), FUNC(sega_315_5649_device::write)).umask32(0x00ff00ff); map(0x01c00040, 0x01c00043).nopw(); @@ -1479,7 +1461,7 @@ void model2c_state::model2c_crx_mem(address_map &map) { model2_base_mem(map); - map(0x00200000, 0x0023ffff).ram(); + map(0x00200000, 0x0023ffff).ram().flags(i960_cpu_device::BURST); map(0x00804000, 0x00807fff).rw(FUNC(model2c_state::geo_prg_r), FUNC(model2c_state::geo_prg_w)); map(0x00880000, 0x00883fff).w(FUNC(model2c_state::copro_function_port_w)); @@ -1490,10 +1472,10 @@ void model2c_state::model2c_crx_mem(address_map &map) map(0x00980014, 0x00980017).r(FUNC(model2c_state::copro_status_r)); map(0x009c0000, 0x009cffff).rw(FUNC(model2c_state::model2_serial_r), FUNC(model2c_state::model2_serial_w)); - map(0x11000000, 0x111fffff).ram().share("textureram0"); // texture RAM 0 (2b/2c) - map(0x11200000, 0x113fffff).ram().share("textureram1"); // texture RAM 1 (2b/2c) - map(0x11400000, 0x1140ffff).rw(FUNC(model2c_state::lumaram_r), FUNC(model2c_state::lumaram_w)); // polygon "luma" RAM (2b/2c) - map(0x12800000, 0x1281ffff).rw(FUNC(model2c_state::lumaram_r), FUNC(model2c_state::lumaram_w)).umask32(0x0000ffff); // polygon "luma" RAM + map(0x11000000, 0x111fffff).ram().share("textureram0").flags(i960_cpu_device::BURST); // texture RAM 0 (2b/2c) + map(0x11200000, 0x113fffff).ram().share("textureram1").flags(i960_cpu_device::BURST); // texture RAM 1 (2b/2c) + map(0x11400000, 0x1140ffff).rw(FUNC(model2c_state::lumaram_r), FUNC(model2c_state::lumaram_w)).flags(i960_cpu_device::BURST); // polygon "luma" RAM (2b/2c) + map(0x12800000, 0x1281ffff).rw(FUNC(model2c_state::lumaram_r), FUNC(model2c_state::lumaram_w)).umask32(0x0000ffff).flags(i960_cpu_device::BURST); // polygon "luma" RAM map(0x01c00000, 0x01c0001f).rw("io", FUNC(sega_315_5649_device::read), FUNC(sega_315_5649_device::write)).umask32(0x00ff00ff); map(0x01c80000, 0x01c80003).rw(FUNC(model2c_state::model2_serial_r), FUNC(model2c_state::model2_serial_w)); diff --git a/docs/release/src/osd/winui/treeview.cpp b/docs/release/src/osd/winui/treeview.cpp index d5b5a06ecc1..c28ede76e1d 100644 --- a/docs/release/src/osd/winui/treeview.cpp +++ b/docs/release/src/osd/winui/treeview.cpp @@ -199,7 +199,7 @@ void FreeFolders(void) /* Reset folder filters */ void ResetFilters(void) { - if (treeFolders > 0) + if (treeFolders) for (int i = 0; i < (int)numFolders; i++) treeFolders[i]->m_dwFlags &= ~F_MASK; } diff --git a/docs/release/src/version.cpp b/docs/release/src/version.cpp index c3f1472b69c..34184062855 100644 --- a/docs/release/src/version.cpp +++ b/docs/release/src/version.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ -#define BARE_BUILD_VERSION "0.238" +#define BARE_BUILD_VERSION "0.239" extern const char bare_build_version[]; extern const char build_version[]; |