Skip to content

Commit ed39b22

Browse files
committed
Merge remote-tracking branch 'upstream/master'
# Conflicts: # makefile
2 parents 4e800bb + 9d034a0 commit ed39b22

178 files changed

Lines changed: 6961 additions & 4157 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

android-project/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
-->
55
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
66
package="org.mamedev.mame"
7-
android:versionCode="284"
8-
android:versionName="0.284"
7+
android:versionCode="285"
8+
android:versionName="0.285"
99
android:installLocation="auto">
1010

1111
<!-- OpenGL ES 2.0 -->

hash/gba.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22238,7 +22238,8 @@ Hangs during cutscene after beating Maxim for best ending path (i.e. before real
2223822238
</part>
2223922239
</software>
2224022240

22241-
<software name="metroid0">
22241+
<!-- "Original Metroid" game mode (NES Metroid emulated) has severe graphics issues. -->
22242+
<software name="metroid0" supported="partial">
2224222243
<description>Metroid - Zero Mission (Europe)</description>
2224322244
<year>2004</year>
2224422245
<publisher>Nintendo</publisher>
@@ -22254,7 +22255,7 @@ Hangs during cutscene after beating Maxim for best ending path (i.e. before real
2225422255
</part>
2225522256
</software>
2225622257

22257-
<software name="metroid0p" cloneof="metroid0">
22258+
<software name="metroid0p" cloneof="metroid0" supported="partial">
2225822259
<description>Metroid - Zero Mission (Europe, prototype)</description>
2225922260
<year>2004</year>
2226022261
<publisher>Nintendo</publisher>
@@ -22266,7 +22267,7 @@ Hangs during cutscene after beating Maxim for best ending path (i.e. before real
2226622267
</part>
2226722268
</software>
2226822269

22269-
<software name="metroid0j" cloneof="metroid0">
22270+
<software name="metroid0j" cloneof="metroid0" supported="partial">
2227022271
<description>Metroid - Zero Mission (Japan)</description>
2227122272
<year>2004</year>
2227222273
<publisher>Nintendo</publisher>
@@ -22281,7 +22282,7 @@ Hangs during cutscene after beating Maxim for best ending path (i.e. before real
2228122282
</part>
2228222283
</software>
2228322284

22284-
<software name="metroid0u" cloneof="metroid0">
22285+
<software name="metroid0u" cloneof="metroid0" supported="partial">
2228522286
<description>Metroid - Zero Mission (USA)</description>
2228622287
<year>2004</year>
2228722288
<publisher>Nintendo</publisher>
@@ -22300,7 +22301,7 @@ Hangs during cutscene after beating Maxim for best ending path (i.e. before real
2230022301
</part>
2230122302
</software>
2230222303

22303-
<software name="metroid0up" cloneof="metroid0">
22304+
<software name="metroid0up" cloneof="metroid0" supported="partial">
2230422305
<description>Metroid - Zero Mission (USA, prototype)</description>
2230522306
<year>2004</year>
2230622307
<publisher>Nintendo</publisher>

hash/precur2w_cart.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0"?>
2+
<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
3+
<!--
4+
license:CC0-1.0
5+
-->
6+
<softwarelist name="precur2w_cart" description="Bandai Muscat Cartridges">
7+
8+
<software name="partyup" supported="no">
9+
<description>Delicious Party PreCure Party Up Cover &amp; Okosama Lunch Set (Japan)</description>
10+
<!-- "Muscat PM card 2022 04 20" on PCB -->
11+
<year>2022</year>
12+
<publisher>Bandai</publisher>
13+
<info name="alt_title" value="プリキュア パーティアップカバー&amp;お子さまランチセット"/>
14+
<part name="cart" interface="precur2w_cart">
15+
<dataarea name="rom" size="0x100000">
16+
<rom name="by25q80es.u1" size="0x100000" crc="7ecaf4ee" sha1="ad4162c537c89c2bc7df02830899a3ae3fceb7af" />
17+
</dataarea>
18+
</part>
19+
</software>
20+
21+
</softwarelist>

hash/saturn.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7729,11 +7729,13 @@ Sega logo animation draws offset [VDP2]
77297729
</part>
77307730
</software>
77317731

7732-
<!-- Black screen, [CD-Block] doesn't read root directory properly -->
77337732
<software name="sengblad" supported="no">
77347733
<description>Sengoku Blade - Sengoku Ace Episode II (Japan)</description>
77357734
<year>1996</year>
77367735
<publisher>Atlus</publisher>
7736+
<notes><![CDATA[
7737+
Missing elements during gameplay [VDP2] priorities?
7738+
]]></notes>
77377739
<info name="serial" value="T-14410G"/>
77387740
<info name="release" value="19961122"/>
77397741
<info name="alt_title" value="戦国ブレード"/>
@@ -7750,11 +7752,14 @@ Sega logo animation draws offset [VDP2]
77507752
</part>
77517753
</software>
77527754

7753-
<!-- Black screen, [CD-Block] doesn't read root directory properly -->
77547755
<software name="chaossd" supported="no">
77557756
<description>Senkutsu Katsuryu Taisen - Chaos Seed (Japan, rev A)</description>
77567757
<year>1998</year>
77577758
<publisher>ESP</publisher>
7759+
<notes><![CDATA[
7760+
Black screen after loading of a new game
7761+
[VDP2] Gradation enabled a003
7762+
]]></notes>
77587763
<info name="serial" value="T-30902G"/>
77597764
<info name="release" value="19980129"/>
77607765
<info name="alt_title" value="仙窟活龍大戦 カオスシード"/>
@@ -13107,11 +13112,13 @@ Sega logo animation draws offset [VDP2]
1310713112
</part>
1310813113
</software>
1310913114

13110-
<!-- Black screen, [CD-Block] doesn't read root directory properly -->
1311113115
<software name="sengblada" cloneof="sengblad" supported="no">
1311213116
<description>Sengoku Blade - Sengoku Ace Episode II (Japan, alt)</description>
1311313117
<year>1996</year>
1311413118
<publisher>Atlus</publisher>
13119+
<notes><![CDATA[
13120+
Missing elements during gameplay [VDP2] priorities?
13121+
]]></notes>
1311513122
<info name="serial" value="T-14410G"/>
1311613123
<info name="release" value="19961122"/>
1311713124
<info name="alt_title" value="戦国ブレード"/>

makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
###########################################################################
88

99
BARE_VERS := 0.285
10-
LONG_VERS := $(BARE_VERS).0
10+
LONG_VERS := $(BARE_VERS).x
1111

1212
###########################################################################
1313
################# BEGIN USER-CONFIGURABLE OPTIONS #####################

scripts/genie.lua

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,7 +1014,6 @@ end
10141014
end
10151015
buildoptions {
10161016
"-fdiagnostics-show-note-include-stack",
1017-
"-Wno-error=tautological-compare",
10181017
"-Wno-cast-align",
10191018
"-Wno-constant-logical-operand",
10201019
"-Wno-extern-c-compat",
@@ -1348,7 +1347,6 @@ elseif _OPTIONS["vs"]=="clangcl" then
13481347
"-Wno-unused-private-field",
13491348
"-Wno-xor-used-as-pow",
13501349
"-Wno-error=deprecated-declarations",
1351-
"-Wno-error=tautological-compare",
13521350
}
13531351
if _OPTIONS["DEPRECATED"]=="0" then
13541352
buildoptions {

scripts/src/bus.lua

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6191,6 +6191,14 @@ if BUSES["VME"] then
61916191
MAME_DIR .. "src/devices/bus/vme/tsvme104.cpp",
61926192
MAME_DIR .. "src/devices/bus/vme/tsvme104.h",
61936193
}
6194+
6195+
dependency {
6196+
{ MAME_DIR .. "src/devices/bus/vme/sys68k_cpu1.cpp", GEN_DIR .. "emu/layout/sys68k_cpu1.lh" },
6197+
}
6198+
6199+
custombuildtask {
6200+
layoutbuildtask("emu/layout", "sys68k_cpu1"),
6201+
}
61946202
end
61956203

61966204

src/devices/bus/nscsi/hd.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#define LOG_DATA (1U << 2)
1111
#define LOG_UNSUPPORTED (1U << 3)
1212

13-
#define VERBOSE 3
13+
//#define VERBOSE 3
1414

1515
#include "logmacro.h"
1616

src/devices/bus/nscsi/tape.cpp

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@
1111
#include "util/multibyte.h"
1212
#include "util/tape_file_interface.h"
1313

14+
#include <algorithm>
1415
#include <cassert>
1516
#include <cstring>
1617

1718
// #define VERBOSE LOG_GENERAL
1819
// #define LOG_OUTPUT_FUNC osd_printf_info
1920
#include "logmacro.h"
2021

21-
DEFINE_DEVICE_TYPE(NSCSI_TAPE, nscsi_tape_device, "scsi_tape", "SCSI tape");
22+
namespace {
2223

2324
//////////////////////////////////////////////////////////////////////////////
2425

@@ -29,6 +30,19 @@ static constexpr u32 TAPE_DEFAULT_FIXED_BLOCK_LEN = 512;
2930
static constexpr int TAPE_RW_BUF_ID = 2;
3031
static constexpr int TAPE_PL_BUF_ID = 3;
3132

33+
34+
template <size_t N, typename T>
35+
void clear_response(uint8_t (&buf)[N], T len)
36+
{
37+
assert(std::size(buf) >= len);
38+
std::fill_n(buf, len, 0);
39+
}
40+
41+
} // anonymous namespace
42+
43+
44+
DEFINE_DEVICE_TYPE(NSCSI_TAPE, nscsi_tape_device, "scsi_tape", "SCSI tape");
45+
3246
//////////////////////////////////////////////////////////////////////////////
3347

3448
// construction
@@ -230,8 +244,7 @@ void nscsi_tape_device::handle_inquiry(const u8 lun) // mandatory; SCSI-2 sectio
230244
if (vpd_enable || page_code) // error: we don't support vital product data or pages other than 0
231245
return report_bad_cdb_field();
232246

233-
assert(sizeof(scsi_cmdbuf) >= 36);
234-
memset(scsi_cmdbuf, 0, 36);
247+
clear_response(scsi_cmdbuf, 36);
235248
scsi_cmdbuf[0] = (lun == 0) ? 0x01 : 0x7f; // we support tape device on LUN 0 only, per 7.5.3(a)
236249
scsi_cmdbuf[1] = 0x80; // we support removing tape
237250
scsi_cmdbuf[2] = 0x02; // we're compliant with SCSI-2 only
@@ -365,8 +378,7 @@ void nscsi_tape_device::handle_mode_sense_6() // mandatory; SCSI-2 sections 8.2.
365378
return report_no_saving_params();
366379

367380
const u8 resp_len = bd_disable ? 4 : 12; // response length
368-
assert(sizeof(scsi_cmdbuf) >= resp_len);
369-
memset(scsi_cmdbuf, 0, resp_len);
381+
clear_response(scsi_cmdbuf, resp_len);
370382
scsi_cmdbuf[0] = resp_len - 1; // mode data length does not include itself, per SCSI-2 section 8.3.3
371383
scsi_cmdbuf[2] = (m_has_tape && m_image->get_file()->is_read_only()) ? 0x80 : 0; // device-specific parameter
372384
scsi_cmdbuf[3] = bd_disable ? 0 : 8; // block descriptor length
@@ -612,8 +624,7 @@ void nscsi_tape_device::handle_read_block_limits() // mandatory; SCSI-2 section
612624
if ((scsi_cmdbuf[1] & 0x1f) || scsi_cmdbuf[2] || scsi_cmdbuf[3] || scsi_cmdbuf[4]) // error: reserved bits set
613625
return report_bad_cdb_field();
614626

615-
assert(sizeof(scsi_cmdbuf) >= 6);
616-
memset(scsi_cmdbuf, 0, 6);
627+
clear_response(scsi_cmdbuf, 6);
617628
put_u24be(&scsi_cmdbuf[1], 0xffffff); // 16MB; "maximum block length limit"
618629
put_u16be(&scsi_cmdbuf[4], m_fixed_block_len); // "minimum block length limit"
619630
scsi_data_in(SBUF_MAIN, 6);
@@ -664,8 +675,7 @@ void nscsi_tape_device::handle_read_position() // optional; SCSI-2 section 10.2.
664675
const bool bpu = status == tape_status::UNKNOWN
665676
|| status == tape_status::UNKNOWN_EW
666677
|| status == tape_status::EOM;
667-
assert(sizeof(scsi_cmdbuf) >= 20);
668-
memset(scsi_cmdbuf, 0, 20);
678+
clear_response(scsi_cmdbuf, 20);
669679
scsi_cmdbuf[0] = (bom ? 0x80 : 0) // is position at BOM
670680
| (eom ? 0x40 : 0) // is position between EW and EOM
671681
| (bpu ? 0x04 : 0); // is next block address invalid; "block position unknown"

0 commit comments

Comments
 (0)