Merge branch 'mamedev:master' into softlist-spg

mamedev · Sep 10, 2023 · 68ae9d7 · 68ae9d7
2 parents c5acc25 + 9eab73c
commit 68ae9d7
Show file tree

Hide file tree

Showing 198 changed files with 9,874 additions and 6,221 deletions.
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml
@@ -4,8 +4,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.mamedev.mame"
-      android:versionCode="257"
-      android:versionName="0.257"
+      android:versionCode="258"
+      android:versionName="0.258"
       android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -63,9 +63,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.257'
+version = '0.258'
 # The full version, including alpha/beta/rc tags.
-release = '0.257'
+release = '0.258'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/hash/amigaocs_flop.xml b/hash/amigaocs_flop.xml
@@ -18070,6 +18070,9 @@ ATK test: failed
 		<publisher>Ocean</publisher>
 		<notes><![CDATA[
 ATK test: C:0 H:U 1 Sector Bad
+Copy protected disk, enables 68k trace mode
+a500: Partially boots, draws corrupt title screen and name entry, keyboard don't work reliably, eventually crashes when selecting armament under mission control
+a500p/a1200: crashes after did logo
 ]]></notes>
 		<part name="flop1" interface="floppy_3_5">
 			<feature name="part_id" value="Disk 1" />

diff --git a/hash/bingobear.xml b/hash/bingobear.xml
@@ -7,8 +7,8 @@ license:CC0-1.0
 <!--
 
 Known modules:
-- Doctor Bingo Bear (70511)
-- Space Bingo Bear (70512, TESL 7-130C-1-F)
+- Doctor Bingo Bear (70511, PCB: TESL 7-130C-1-F)
+- Space Bingo Bear (70512, same PCB)
 
 Presumably unreleased:
 - Rock Star Bingo Bear (70514)
@@ -19,6 +19,18 @@ Presumably unreleased:
 
 <softwarelist name="bingobear" description="Bingo Bear modules">
 
+	<software name="doctor">
+		<description>Doctor Bingo Bear</description>
+		<year>1986</year>
+		<publisher>Hasbro / Tiger Electronics</publisher>
+		<info name="serial" value="70511"/>
+		<part name="cart" interface="bingobear">
+			<dataarea name="rom" size="0x4000">
+				<rom name="cm62063.ic101" size="0x4000" crc="d7a12642" sha1="b93c7ef2414d17d20d240b05a960d7ff71b46102" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="space">
 		<description>Space Bingo Bear</description>
 		<year>1986</year>

diff --git a/hash/c64_cart.xml b/hash/c64_cart.xml
@@ -7146,6 +7146,36 @@ license:CC0-1.0
 		</part>
 	</software>
 
+	<software name="tibdd001">
+		<description>Disc Drive DD-001 (v1.1)</description>
+		<year>1991</year>
+		<publisher>TIB</publisher>
+		<part name="cart" interface="c64_cart">
+			<feature name="slot" value="tibdd001" />
+			<feature name="game" value="1" />
+			<feature name="exrom" value="0" />
+
+			<dataarea name="roml" size="0x2000">
+				<rom name="rom_dd001_v1.1.bin" size="0x2000" crc="d266b628" sha1="24d178560dad3d955ebbe15f4274d966e031142d"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="tibdd001a" cloneof="tibdd001">
+		<description>Disc Drive DD-001 (v1.0)</description>
+		<year>1991</year>
+		<publisher>TIB</publisher>
+		<part name="cart" interface="c64_cart">
+			<feature name="slot" value="tibdd001" />
+			<feature name="game" value="1" />
+			<feature name="exrom" value="0" />
+
+			<dataarea name="roml" size="0x2000">
+				<rom name="rom_dd001_v1.0.bin" size="0x2000" crc="58f83983" sha1="f18cfb42c8e2c9152e18b129d01408f702271363"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<!-- Dummy cartridge entries to allow requirement mappings from c64_flop -->
 
 	<software name="cpm">

diff --git a/hash/c64_flop_misc.xml b/hash/c64_flop_misc.xml
@@ -841,6 +841,19 @@ license:CC0-1.0
 		</part>
 	</software>
 
+	<software name="tibdd001">
+		<description>Games and Utility Disc (v1.1)</description>
+		<year>1991</year>
+		<publisher>TIB</publisher>
+		<sharedfeat name="requirement" value="c64_cart:tibdd001"/>
+
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size="737280">
+				<rom name="dd001boot.img" size="737280" crc="a91cabd1" sha1="6a430a246978f9af418e5c6db618e5cb85affd4e"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<!-- Demos -->
 
 	<software name="2ndreal">

diff --git a/hash/mac_cdrom.xml b/hash/mac_cdrom.xml
@@ -15,7 +15,7 @@ PPC603 - PowerPC 603/603E/603EV CPU
 PPC604 - PowerPC 604 CPU
 PPC750 - PowerPC 750 (G3) CPU
 -->
-<softwarelist name="mac_cdrom" description="Mac CD-ROMs">
+<softwarelist name="mac_cdrom" description="Apple Macintosh CD-ROMs">
 	<software name="aplegrec">
 		<description>Apple Legacy Recovery</description>
 		<year>1998</year>

diff --git a/hash/mac_flop.xml b/hash/mac_flop.xml
@@ -3,7 +3,7 @@
 <!--
 license:CC0-1.0
 -->
-<softwarelist name="mac_flop" description="Macintosh 400K/800K Disk images">
+<softwarelist name="mac_flop" description="Apple Macintosh 400K/800K disk images">
 
 	<software name="airborne">
 		<description>Airborne!</description>

diff --git a/hash/mac_flop_clcracked.xml b/hash/mac_flop_clcracked.xml
@@ -3,7 +3,7 @@
 <!--
 license:CC0-1.0
 -->
-<softwarelist name="mac_flop_clcracked" description="Macintosh 400K/800K cleanly cracked disks">
+<softwarelist name="mac_flop_clcracked" description="Apple Macintosh 400K/800K cleanly cracked disks">
 
 	<software name="dlxmuscset10">
 		<description>Deluxe Music Construction Set (version 1.0) (san inc crack)</description>

diff --git a/hash/mac_flop_orig.xml b/hash/mac_flop_orig.xml
@@ -3,7 +3,7 @@
 <!--
 license:CC0-1.0
 -->
-<softwarelist name="mac_flop_orig" description="Macintosh 400K/800K Original disk images">
+<softwarelist name="mac_flop_orig" description="Apple Macintosh 400K/800K original disk images">
 
 	<software name="lodrun10">
 		<description>Lode Runner (version 1.0)</description>

diff --git a/hash/mac_hdd.xml b/hash/mac_hdd.xml
@@ -3,7 +3,7 @@
 <!--
 license:CC0-1.0
 -->
-<softwarelist name="mac_hdd" description="Mac Harddisks">
+<softwarelist name="mac_hdd" description="Apple Macintosh hard disk images">
 	<software name="mac608">
 		<description>System Software 6.0.8</description>
 		<year>1988</year>

diff --git a/hash/mac_hdflop.xml b/hash/mac_hdflop.xml
@@ -3,7 +3,7 @@
 <!--
 license:CC0-1.0
 -->
-<softwarelist name="mac_hdflop" description="Macintosh High Density Disk images">
+<softwarelist name="mac_hdflop" description="Apple Macintosh high density disk images">
 
 <!-- Operating system disks -->