Merge branch 'master' into pci_virge-fifo

mamedev · Mar 6, 2024 · 8689582 · 8689582
2 parents 489dcb4 + 38b78c0
commit 8689582
Show file tree

Hide file tree

Showing 420 changed files with 18,078 additions and 8,281 deletions.
diff --git a/COPYING b/COPYING
@@ -11,7 +11,7 @@ distributions.
 
 
 MAME
-Copyright (c) 1997-2023 MAMEdev and contributors
+Copyright (c) 1997-2024 MAMEdev and contributors
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License version 2, as provided

diff --git a/README.md b/README.md
@@ -102,7 +102,7 @@ is required to use the "MAME" name, logo, or wordmark.
 <img align="right" src="http://opensource.org/trademarks/opensource/OSI-Approved-License-100x137.png">
 </a>
 
-    Copyright (C) 1997-2021  MAMEDev and contributors
+    Copyright (c) 1997-2024  MAMEdev and contributors
 
     This program is free software; you can redistribute it and/or modify it
     under the terms of the GNU General Public License version 2, as provided in

diff --git a/android-project/LICENSE b/android-project/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 1997-2023, MAMEdev and contributors
+Copyright (c) 1997-2024, MAMEdev and contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

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="262"
-      android:versionName="0.262"
+      android:versionCode="263"
+      android:versionName="0.263"
       android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -56,16 +56,16 @@
 
 # General information about the project.
 project = u'MAME Documentation'
-copyright = u'1997-2023, MAMEdev and contributors'
+copyright = u'1997-2024, MAMEdev and contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.262'
+version = '0.263'
 # The full version, including alpha/beta/rc tags.
-release = '0.262'
+release = '0.263'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/source/initialsetup/compilingmame.rst b/docs/source/initialsetup/compilingmame.rst
@@ -559,6 +559,9 @@ Optional features
 TOOLS
     Set to **1** to build additional tools along with the emulator, including
     **unidasm**, **chdman**, **romcmp**, and **srcclean**.
+EMULATOR
+    Set to **0** along with **TOOLS=1** to build *only* the tools and not the
+    main MAME emulator itself.
 NO_OPENGL
     Set to **1** to disable building the OpenGL video output module.
 NO_USE_PORTAUDIO

diff --git a/docs/source/license.rst b/docs/source/license.rst
@@ -12,7 +12,7 @@ would encourage new contributors to distribute files under this license.
 Please note that MAME is a registered trademark of Gregory Ember, and permission
 is required to use the “MAME” name, logo, or wordmark.
 
-    Copyright (C) 1997-2023  MAMEDev and contributors
+    Copyright (c) 1997-2024  MAMEDev and contributors
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/docs/source/whatis.rst b/docs/source/whatis.rst
@@ -19,7 +19,7 @@ that were its initial focus.
 
 |
 | **MAME®**
-| **Copyright © 1997-2023 MAMEdev and contributors**
+| **Copyright © 1997-2024 MAMEdev and contributors**
 | **MAME is a registered trademark of Gregory Ember**
 |
 

diff --git a/hash/apple2_flop_misc.xml b/hash/apple2_flop_misc.xml
@@ -789,7 +789,8 @@ Generated by SLIST 0.2.1
 		<year>2019</year>
 		<publisher>4AM</publisher>
 		<info name="usage" value="Defective disk image format, but is worked around by MAME's detection." />
-		<info name="release" value="2019-03-11"/>
+		<info name="version" value="1.0"/>
+		<info name="release" value="20190311"/>
 		<!--
 		* Initial release supports these games:
 		Beer Run (Sirius)
@@ -840,7 +841,8 @@ Generated by SLIST 0.2.1
 		<year>2019</year>
 		<publisher>4AM</publisher>
 		<info name="usage" value="Defective disk image format, but is worked around by MAME's detection." />
-		<info name="release" value="2019-03-16"/>
+		<info name="version" value="1.1"/>
+		<info name="release" value="20190316"/>
 		<!--
 		* Support booting 13-sector disks
 		* Support booting disks on Apple //c and IIgs which would otherwise
@@ -868,7 +870,8 @@ Generated by SLIST 0.2.1
 		<year>2019</year>
 		<publisher>4AM</publisher>
 		<info name="usage" value="Defective disk image format can't be properly detected in MAME due to non-ProDOS bootloader." />
-		<info name="release" value="2019-03-24"/>
+		<info name="version" value="1.2"/>
+		<info name="release" value="20190324"/>
 		<!--
 		* Support booting ProDOS on clones
 		* Additional patches for "Star Thief"
@@ -886,7 +889,8 @@ Generated by SLIST 0.2.1
 		<description>Anti-M (version 1.3)</description>
 		<year>2019</year>
 		<publisher>4AM</publisher>
-		<info name="release" value="2019-04-12"/>
+		<info name="version" value="1.3"/>
+		<info name="release" value="20190412"/>
 		<!--
 		* Support booting from drive 2
 		* Fix booting on MAME (See version 1.2 usage tag for details)
@@ -903,7 +907,8 @@ Generated by SLIST 0.2.1
 		<description>Anti-M (version 1.4)</description>
 		<year>2019</year>
 		<publisher>4AM</publisher>
-		<info name="release" value="2019-05-24"/>
+		<info name="version" value="1.4"/>
+		<info name="release" value="20190524"/>
 		<!--
 		* Support "Computer Foosball"
 		* Fix a crash when booting early Spinnaker Software disks
@@ -922,7 +927,8 @@ Generated by SLIST 0.2.1
 		<description>Anti-M (version 1.5)</description>
 		<year>2019</year>
 		<publisher>4AM</publisher>
-		<info name="release" value="2019-05-24"/>
+		<info name="version" value="1.5"/>
+		<info name="release" value="20190524"/>
 		<!--
 		* Support "Lady Tut"
 		-->
@@ -938,7 +944,8 @@ Generated by SLIST 0.2.1
 		<description>Anti-M (version 1.6)</description>
 		<year>2019</year>
 		<publisher>4AM</publisher>
-		<info name="release" value="2019-11-09"/>
+		<info name="version" value="1.6"/>
+		<info name="release" value="20191109"/>
 		<!--
 		* Support Personal Software 13-sector disks
 		("MicroChess 2.0," "Checker King," "Gammon Gambler")
@@ -955,7 +962,8 @@ Generated by SLIST 0.2.1
 		<description>Anti-M (version 1.7)</description>
 		<year>2020</year>
 		<publisher>4AM</publisher>
-		<info name="release" value="2020-08-11"/>
+		<info name="version" value="1.7"/>
+		<info name="release" value="20200811"/>
 		<!--
 		* 1.7 adds support for "Odin" and fixes some bugs.
 		-->
@@ -967,11 +975,12 @@ Generated by SLIST 0.2.1
 		</part>
 	</software>
 
-	<software name="antim">
+	<software name="antim18" cloneof="antim">
 		<description>Anti-M (version 1.8)</description>
 		<year>2020</year>
 		<publisher>4AM</publisher>
-		<info name="release" value="2020-08-11"/>
+		<info name="version" value="1.8"/>
+		<info name="release" value="20200811"/>
 		<!--
 		* support "Sensible Speller" and "Typing Tutor"
 		* add some compatibility fixes for Virtual ][
@@ -984,6 +993,75 @@ Generated by SLIST 0.2.1
 		</part>
 	</software>
 
+	<software name="antim19" cloneof="antim">
+		<description>Anti-M (version 1.9)</description>
+		<year>2023</year>
+		<publisher>4AM</publisher>
+		<info name="version" value="1.9"/>
+		<info name="release" value="20230515"/>
+		<!--
+		* support "Disk Recovery" and "Space Adventure"
+		* fix drive 2 detection
+		-->
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="anti-m-v1.9-2023-05-15.dsk" size="143360" crc="236a355f" sha1="bb2b9f8133d81f5b62010798dd549acc2675a0ed" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="antim20" cloneof="antim">
+		<description>Anti-M (version 2.0)</description>
+		<year>2023</year>
+		<publisher>4AM</publisher>
+		<info name="version" value="2.0"/>
+		<info name="release" value="20230918"/>
+		<!--
+		* fix a crash when booting "Story Maker" and "Micro League Baseball"
+		* further drive 2 fixes for AppleWin
+		-->
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="anti-m-v2.0-2023-09-18" size="143360" crc="7f6482e7" sha1="07407e718588799a527b0fce9f8cb9363fd07230" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="antim21" cloneof="antim">
+		<description>Anti-M (version 2.1)</description>
+		<year>2024</year>
+		<publisher>4AM</publisher>
+		<info name="version" value="2.1"/>
+		<info name="release" value="20240223"/>
+		<!--
+		* fix detection of 13-sector disks (thanks John A. for the report)
+		-->
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="anti-m-v2.1-2024-02-23.dsk" size="143360" crc="c31f82db" sha1="f12437333f02b849de0063b92e4c8f2fdef5dda3" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="antim">
+		<description>Anti-M (version 2.2)</description>
+		<year>2024</year>
+		<publisher>4AM</publisher>
+		<info name="version" value="2.2"/>
+		<info name="release" value="20240227"/>
+		<!--
+		* add support for ABM
+		-->
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="anti-m-v2.2-2024-02-27.dsk" size="143360" crc="ba668a1b" sha1="82b6126414c6f8411310db7f61bd3e76d2c112ce" />
+			</dataarea>
+		</part>
+	</software>
 
 	<software name="ankh">
 		<description>Ankh</description>

diff --git a/hash/bbc_rom.xml b/hash/bbc_rom.xml
@@ -497,7 +497,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="adt177c" cloneof="adt">
-		<description>Advanced Disc Toolkit 1.77 [cracked]</description>
+		<description>Advanced Disc Toolkit 1.77 (cracked)</description>
 		<year>1986</year>
 		<publisher>Advanced Computer Products</publisher>
 		<part name="rom" interface="bbc_rom">
@@ -2057,7 +2057,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="beebfonta" cloneof="beebfont">
-		<description>BeebFont [alt]</description>
+		<description>BeebFont (alt)</description>
 		<year>1984</year>
 		<publisher>Watford Electronics</publisher>
 		<part name="rom1" interface="bbc_rom">
@@ -3903,7 +3903,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="digitisra">
-		<description>Digitiser 1.00 [alt]</description>
+		<description>Digitiser 1.00 (alt)</description>
 		<year>1985</year>
 		<publisher>Watford Electronics</publisher>
 		<part name="rom1" interface="bbc_rom">
@@ -6169,7 +6169,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="iwordh" cloneof="iword">
-		<description>Inter-Word 1.02 [hack]</description>
+		<description>Inter-Word 1.02 (hack)</description>
 		<year>1986</year>
 		<publisher>Computer Concepts</publisher>
 		<part name="rom1" interface="bbc_rom">
@@ -6185,7 +6185,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="iworda1" cloneof="iword">
-		<description>Inter-Word 1.O2 [alt1]</description>
+		<description>Inter-Word 1.O2 (alt 1)</description>
 		<year>1986</year>
 		<publisher>Computer Concepts</publisher>
 		<part name="rom1" interface="bbc_rom">
@@ -6197,7 +6197,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="iworda2" cloneof="iword">
-		<description>Inter-Word 1.O2 [alt2]</description>
+		<description>Inter-Word 1.O2 (alt 2)</description>
 		<year>1986</year>
 		<publisher>Computer Concepts</publisher>
 		<part name="rom1" interface="bbc_rom">
@@ -7057,7 +7057,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="metaasm2ra" cloneof="metaasm2">
-		<description>Meta Assembler 2.13R [alt]</description>
+		<description>Meta Assembler 2.13R (alt)</description>
 		<year>1985</year>
 		<publisher>Crash Barrier</publisher>
 		<part name="rom1" interface="bbc_rom">
@@ -7681,7 +7681,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="mforth83a" cloneof="mforth83">
-		<description>Multi-FORTH 83 [alt]</description>
+		<description>Multi-FORTH 83 (alt)</description>
 		<year>1984</year>
 		<publisher>Skywave</publisher>
 		<info name="usage" value="*FORTH-83" />
@@ -8967,7 +8967,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="ramrodma" cloneof="ramrod">
-		<description>Ramrod MS4.00c [alt]</description>
+		<description>Ramrod MS4.00c (alt)</description>
 		<year>1987</year>
 		<publisher>Clares</publisher>
 		<sharedfeat name="compatibility" value="M"/>
@@ -10561,7 +10561,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="stldfs22k2">
-		<description>Solidisk DFS 2.2k Issue 2 [hack]</description>
+		<description>Solidisk DFS 2.2k Issue 2 (hack)</description>
 		<year>1986</year>
 		<publisher>Solidisk</publisher>
 		<info name="usage" value="Requires Solidisk 1770 DDFS Issue 2 FDC" />

diff --git a/hash/coco_cart.xml b/hash/coco_cart.xml
@@ -1119,7 +1119,7 @@ Laggy keyboard presses (verify)
 		<part name="cart" interface="coco_cart">
 			<feature name="slot" value="banked_16k" />
 			<dataarea name="rom" size="65536">
-				<rom name="predator (1989) (26-3165) (activision).rom" size="65536" crc="a9680ede" sha1="551d8d95fd310b2d72b1e22028a517c325fe9ab4"/>
+				<rom name="predator (1989) (26-3165) (activision).rom" size="65536" crc="bf4ad8f8" sha1="d181e74428003549282dd0ef167ee2280c760525"/>
 			</dataarea>
 		</part>
 	</software>