Merge remote-tracking branch 'upstream/release0270' into rel270

mahlemiut · Sep 21, 2024 · fbf23c7 · fbf23c7
2 parents f623d02 + 698e1d8
commit fbf23c7
Show file tree

Hide file tree

Showing 1,049 changed files with 35,141 additions and 14,050 deletions.
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -58,7 +58,7 @@ jobs:
         ARCHOPTS: ${{ matrix.archopts }}
         SUBTARGET: ${{ matrix.subtarget }}
         TOOLS: 1
-      run: make -j2
+      run: make -j3
     - name: Validate
       run: ./${{ matrix.executable }} -validate
     - name: Reconcile driver list

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
@@ -56,7 +56,7 @@ jobs:
         ARCHOPTS: "-fuse-ld=lld"
         SUBTARGET: ${{ matrix.subtarget }}
         TOOLS: 1
-      run: make -j2
+      run: make -j3
     - name: Validate
       run: ./${{ matrix.executable }}.exe -validate
     - uses: actions/upload-artifact@master

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="268"
-      android:versionName="0.268"
+      android:versionCode="269"
+      android:versionName="0.269"
       android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->

diff --git a/docs/source/commandline/commandline-all.rst b/docs/source/commandline/commandline-all.rst
@@ -3677,8 +3677,9 @@ Debugging Options
         Acts as a remote debugging server for the GNU debugger (GDB).  Only a
         small subset of the CPUs emulated by MAME are supported.  Use the
         :ref:`debugger_port <mame-commandline-debuggerport>` option to set the
-        listening port on the loopback interface.  Supported on all platforms
-        with TCP socket support.
+        listening port and the
+        :ref:`debugger_host <mame-commandline-debuggerhost>` option to set the
+        address to bind to.  Supported on all platforms with TCP socket support.
 
     Example:
         .. code-block:: bash
@@ -3732,11 +3733,26 @@ Debugging Options
 
             mame ibm_5150 -watchdog 30
 
+.. _mame-commandline-debuggerhost:
+
+**-debugger_host** *<address>*
+
+    Set the IP address to listen on to accept GDB connections when using the
+    GDB stub debugger module (see the
+    :ref:`debugger <mame-commandline-debugger>` option).
+
+    The default is ``localhost``.
+
+    Example:
+        .. code-block:: bash
+
+            mame rfjet -debug -debugger gdbstub -debugger_host 0.0.0.0
+
 .. _mame-commandline-debuggerport:
 
 **-debugger_port** *<port>*
 
-    Set the TCP port number to listen on for GDB connections when using the GDB
+    Set the TCP port number to accept GDB connections on when using the GDB
     stub debugger module (see the :ref:`debugger <mame-commandline-debugger>`
     option).
 

diff --git a/docs/source/commandline/commandline-index.rst b/docs/source/commandline/commandline-index.rst
@@ -298,6 +298,7 @@ Core Debugging Options
 | :ref:`debugscript <mame-commandline-debugscript>`
 | :ref:`[no]update_in_pause <mame-commandline-updateinpause>`
 | :ref:`watchdog <mame-commandline-watchdog>`
+| :ref:`debugger_host <mame-commandline-debuggerhost>`
 | :ref:`debugger_port <mame-commandline-debuggerport>`
 | :ref:`debugger_font <mame-commandline-debuggerfont>`
 | :ref:`debugger_font_size <mame-commandline-debuggerfontsize>`

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.268'
+version = '0.269'
 # The full version, including alpha/beta/rc tags.
-release = '0.268'
+release = '0.269'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/hash/attache.xml b/hash/attache.xml
@@ -3,7 +3,7 @@
 <!--
 license:CC0-1.0
 -->
-<softwarelist name="attache" description="Otrona Attache disk images">
+<softwarelist name="attache" description="Otrona Attaché disk images">
 
 	<software name="cpm">
 		<description>CP/M 2.2.5</description>

diff --git a/hash/bmjr_cass.xml b/hash/bmjr_cass.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
+<!--
+license:CC0-1.0
+-->
+<softwarelist name="bmjr_cass" description="Hitachi Basic Master Jr. cassettes">
+
+	<!-- TODO: compatible with Basic Master LV2 too -->
+	<software name="wilwesp" supported="yes">
+		<!-- Capitalized as WILWESP on Micom Basic printout, wILwESP in-game -->
+		<description>Wilwesp</description>
+		<year>1984</year>
+		<publisher>Micom BASIC</publisher>
+		<info name="usage" value="LOAD WILWSP then RUN" />
+		<info name="author" value="Orange Juice"/>
+		<part name="cass" interface="bmjr_cass">
+			<dataarea name="cass" size="23584812">
+				<rom name="wilwesp.wav" size="23584812" crc="d46d46e6" sha1="32494926110bdb015e85d18dff2ea7b2f6d58580"/>
+			</dataarea>
+		</part>
+	</software>
+</softwarelist>
diff --git a/hash/bml3_cass.xml b/hash/bml3_cass.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
+<!--
+license:CC0-1.0
+-->
+<softwarelist name="bml3_cass" description="Hitachi Basic Master Level 3 cassettes">
+
+	<software name="bmtetris" supported="yes">
+		<description>BM Tetris</description>
+		<year>1990</year>
+		<publisher>Sakn Soft</publisher>
+		<info name="usage" value="LOAD, press play on tape then RUN. Requires bml3mk5 (uses IG)." />
+		<part name="cass" interface="bml3_cass">
+			<dataarea name="cass" size="5106615">
+				<!-- NOTE: the original .wav won't mount on MAME, this .flac does -->
+				<rom name="tetris_all.flac" size="5106615" crc="696ce3a4" sha1="ba94ad716c7ecbf4434b67e1b79cd0e1012caecb"/>
+			</dataarea>
+		</part>
+	</software>
+</softwarelist>
diff --git a/hash/bml3_flop.xml b/hash/bml3_flop.xml
@@ -3,7 +3,7 @@
 <!--
 license:CC0-1.0
 
-Compaibility flags:
+Compatibility flags:
 3: needs MP1805 fdc
 5: needs MP1802 fdc
 
@@ -40,20 +40,23 @@ Compaibility flags:
 		</part>
 	</software>
 
-	<software name="ma5370" supported="no"><!-- mame crashes in the floppy subsystem -->
-		<description>MA5370</description>
+	<software name="ma5370" supported="no">
+		<description>MA-5370 Disk BASIC (Version 1.1)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<notes><![CDATA[
+"Device I/O Error" when FILES is issued.
+]]></notes>
 		<sharedfeat name="compatibility" value="3" />
 		<part name="disk" interface="floppy_3">
 			<dataarea name="flop" size="0x2d2b0">
-				<rom name="ma5370.d88" size="0x2d2b0" crc="04bfeb8a" sha1="e273c53286144d2cbdc1a9616945bf2c2f5267d5" />
+				<rom name="ma5370.d88" size="0x2d2b0" crc="ebbd9f99" sha1="052d942af0d5ae97a838f4df96a4d6cf10cc7553" status="baddump" /><!-- all tracks hacked to single density -->
 			</dataarea>
 		</part>
 	</software>
 
 	<software name="dbu">
-		<description>Disk Basic and Utilities</description>
+		<description>Disk BASIC and Utilities</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<sharedfeat name="compatibility" value="5" />
@@ -64,10 +67,14 @@ Compaibility flags:
 		</part>
 	</software>
 
-	<software name="fcg6890">
-		<description>FCG6890</description><!-- some kind of graphics package -->
+	<software name="fcg6890" supported="partial">
+		<!-- TODO: find actual title, "Font Character Generator 6890"? -->
+		<description>FCG6890</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<notes><![CDATA[
+Assume optional light pen or mouse support
+]]></notes>
 		<sharedfeat name="compatibility" value="5" />
 		<part name="disk" interface="floppy_5_25">
 			<dataarea name="flop" size="0x54ab0">
@@ -107,7 +114,7 @@ Compaibility flags:
 		<sharedfeat name="compatibility" value="5" />
 		<part name="disk" interface="floppy_5_25">
 			<dataarea name="flop" size="0x54ab0">
-				<rom name="tetris.d88" size="0x54ab0" crc="484cf520" sha1="adb4d687e8ace9e35b7bc9f9a20a9cc5c5cf6ae7" />
+				<rom name="subtreas.d88" size="0x54ab0" crc="484cf520" sha1="adb4d687e8ace9e35b7bc9f9a20a9cc5c5cf6ae7" />
 			</dataarea>
 		</part>
 	</software>