Skip to content

Commit f915e9f

Browse files
holubholub
committed
Merge branch 'master' of https://github.com/mamedev/mame into spectrum-dma
2 parents 7d25f7b + 154a58f commit f915e9f

File tree

6,914 files changed

+83102
-51971
lines changed

Some content is hidden

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

6,914 files changed

+83102
-51971
lines changed

Diff for: ‎.github/workflows/ci-linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
ARCHOPTS: ${{ matrix.archopts }}
5959
SUBTARGET: ${{ matrix.subtarget }}
6060
TOOLS: 1
61-
run: make -j2
61+
run: make -j3
6262
- name: Validate
6363
run: ./${{ matrix.executable }} -validate
6464
- name: Reconcile driver list

Diff for: ‎.github/workflows/ci-windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
ARCHOPTS: "-fuse-ld=lld"
5757
SUBTARGET: ${{ matrix.subtarget }}
5858
TOOLS: 1
59-
run: make -j2
59+
run: make -j3
6060
- name: Validate
6161
run: ./${{ matrix.executable }}.exe -validate
6262
- uses: actions/upload-artifact@master

Diff for: ‎android-project/app/src/main/AndroidManifest.xml

+2-2
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="268"
8-
android:versionName="0.268"
7+
android:versionCode="270"
8+
android:versionName="0.270"
99
android:installLocation="auto">
1010

1111
<!-- OpenGL ES 2.0 -->

Diff for: ‎docs/source/commandline/commandline-all.rst

+19-3
Original file line numberDiff line numberDiff line change
@@ -3677,8 +3677,9 @@ Debugging Options
36773677
Acts as a remote debugging server for the GNU debugger (GDB). Only a
36783678
small subset of the CPUs emulated by MAME are supported. Use the
36793679
:ref:`debugger_port <mame-commandline-debuggerport>` option to set the
3680-
listening port on the loopback interface. Supported on all platforms
3681-
with TCP socket support.
3680+
listening port and the
3681+
:ref:`debugger_host <mame-commandline-debuggerhost>` option to set the
3682+
address to bind to. Supported on all platforms with TCP socket support.
36823683
36833684
Example:
36843685
.. code-block:: bash
@@ -3732,11 +3733,26 @@ Debugging Options
37323733
37333734
mame ibm_5150 -watchdog 30
37343735
3736+
.. _mame-commandline-debuggerhost:
3737+
3738+
**-debugger_host** *<address>*
3739+
3740+
Set the IP address to listen on to accept GDB connections when using the
3741+
GDB stub debugger module (see the
3742+
:ref:`debugger <mame-commandline-debugger>` option).
3743+
3744+
The default is ``localhost``.
3745+
3746+
Example:
3747+
.. code-block:: bash
3748+
3749+
mame rfjet -debug -debugger gdbstub -debugger_host 0.0.0.0
3750+
37353751
.. _mame-commandline-debuggerport:
37363752
37373753
**-debugger_port** *<port>*
37383754
3739-
Set the TCP port number to listen on for GDB connections when using the GDB
3755+
Set the TCP port number to accept GDB connections on when using the GDB
37403756
stub debugger module (see the :ref:`debugger <mame-commandline-debugger>`
37413757
option).
37423758

Diff for: ‎docs/source/commandline/commandline-index.rst

+1
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ Core Debugging Options
298298
| :ref:`debugscript <mame-commandline-debugscript>`
299299
| :ref:`[no]update_in_pause <mame-commandline-updateinpause>`
300300
| :ref:`watchdog <mame-commandline-watchdog>`
301+
| :ref:`debugger_host <mame-commandline-debuggerhost>`
301302
| :ref:`debugger_port <mame-commandline-debuggerport>`
302303
| :ref:`debugger_font <mame-commandline-debuggerfont>`
303304
| :ref:`debugger_font_size <mame-commandline-debuggerfontsize>`

Diff for: ‎docs/source/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
# built documents.
6464
#
6565
# The short X.Y version.
66-
version = '0.268'
66+
version = '0.270'
6767
# The full version, including alpha/beta/rc tags.
68-
release = '0.268'
68+
release = '0.270'
6969

7070
# The language for content autogenerated by Sphinx. Refer to documentation
7171
# for a list of supported languages.

Diff for: ‎hash/a2600.xml

+28-17
Original file line numberDiff line numberDiff line change
@@ -5129,26 +5129,48 @@ MOS Atari-made game NTSC ROMs had a CO16xxx number and PAL ROMs had CO17xxx numb
51295129
<description>Dig Dug</description>
51305130
<year>1983</year>
51315131
<publisher>Atari</publisher>
5132+
<info name="serial" value="CX2677" />
5133+
<info name="programmer" value="Douglas B. Macrae" />
5134+
<sharedfeat name="compatibility" value="NTSC" />
5135+
<part name="cart" interface="a2600_cart">
5136+
<!-- SuperChip CO20231-01 -->
5137+
<feature name="slot" value="a26_f6" />
5138+
<dataarea name="rom" size="16384">
5139+
<rom name="co25077-22.bin" size="16384" crc="ee7b80d1" sha1="79e746524520da546249149c33614fc23a4f2a51"/>
5140+
</dataarea>
5141+
<dataarea name="ram" size="128">
5142+
</dataarea>
5143+
</part>
5144+
</software>
5145+
5146+
<software name="digduge" cloneof="digdug">
5147+
<description>Dig Dug (PAL)</description>
5148+
<year>1983</year>
5149+
<publisher>Atari</publisher>
51325150
<part name="cart" interface="a2600_cart">
51335151
<!-- SuperChip -->
51345152
<feature name="slot" value="a26_f6" />
51355153
<dataarea name="rom" size="16384">
5136-
<rom name="dig dug (1983) (atari - gcc, douglas b. macrae) (cx2677).bin" size="16384" crc="ee7b80d1" sha1="79e746524520da546249149c33614fc23a4f2a51"/>
5154+
<rom name="dig dug (1983) (atari - gcc, douglas b. macrae) (cx2677, cx2677p) (pal).bin" size="16384" crc="de5c5553" sha1="816abcef9cc8fca5007cc400534e84d00285f199"/>
51375155
</dataarea>
51385156
<dataarea name="ram" size="128">
51395157
</dataarea>
51405158
</part>
51415159
</software>
51425160

5143-
<software name="digduge" cloneof="digdug">
5144-
<description>Dig Dug (PAL)</description>
5161+
<software name="digdugea" cloneof="digdug">
5162+
<description>Dig Dug (PAL, alt)</description>
51455163
<year>1983</year>
51465164
<publisher>Atari</publisher>
5165+
<info name="serial" value="2677" />
5166+
<!-- Actual silver label only has 2677 and end label has DIG DUG TM P" -->
5167+
<info name="programmer" value="Douglas B. Macrae" />
5168+
<sharedfeat name="compatibility" value="PAL" />
51475169
<part name="cart" interface="a2600_cart">
5148-
<!-- SuperChip -->
5149-
<feature name="slot" value="a26_f6" />
5170+
<!-- SuperChip CO20231-01 -->
5171+
<feature name="slot" value="a26_f6" />
51505172
<dataarea name="rom" size="16384">
5151-
<rom name="dig dug (1983) (atari - gcc, douglas b. macrae) (cx2677, cx2677p) (pal).bin" size="16384" crc="de5c5553" sha1="816abcef9cc8fca5007cc400534e84d00285f199"/>
5173+
<rom name="co26077-29(pal).bin" size="16384" crc="8c550791" sha1="8d991206e286aa781433c68a56eea6b2f97bab2d"/>
51525174
</dataarea>
51535175
<dataarea name="ram" size="128">
51545176
</dataarea>
@@ -17720,17 +17742,6 @@ MOS Atari-made game NTSC ROMs had a CO16xxx number and PAL ROMs had CO17xxx numb
1772017742
</part>
1772117743
</software>
1772217744

17723-
<software name="unkact2">
17724-
<description>Unknown Activision Game #2 (prototype)</description>
17725-
<year>1983</year>
17726-
<publisher>Activision</publisher>
17727-
<part name="cart" interface="a2600_cart">
17728-
<dataarea name="rom" size="4096">
17729-
<rom name="unknown activision game #2 (1983) (activision) (prototype).bin" size="4096" crc="5c009ea0" sha1="a25c4b33e1c86895cb63635bd6ca5b8379a206b3"/>
17730-
</dataarea>
17731-
</part>
17732-
</software>
17733-
1773417745
<software name="unkuniv">
1773517746
<description>Unknown Universal Game (prototype)</description>
1773617747
<year>1983</year>

Diff for: ‎hash/apple2_cass.xml

+19-2
Original file line numberDiff line numberDiff line change
@@ -611,13 +611,13 @@ To load and run a tape:
611611
<part name="cass1" interface="apple2_cass">
612612
<feature name="part_id" value="Breakout" />
613613
<dataarea name="cass" size="1127548">
614-
<rom name="color graphics (1978)(apple computer).wav" size="1127548" crc="f829f060" sha1="e1b5b432ad2bf1974c934ac57d08a625181e6b9c"/>
614+
<rom name="breakout (1978)(apple computer).wav" size="1127548" crc="f829f060" sha1="e1b5b432ad2bf1974c934ac57d08a625181e6b9c"/>
615615
</dataarea>
616616
</part>
617617
<part name="cass2" interface="apple2_cass">
618618
<feature name="part_id" value="Color Graphics" />
619619
<dataarea name="cass" size="1544236">
620-
<rom name="breakout (1978)(apple computer).wav" size="1544236" crc="64441f07" sha1="37da93d0a057a718031395f6c83c57c9a8d3daf0"/>
620+
<rom name="color graphics (1978)(apple computer).wav" size="1544236" crc="64441f07" sha1="37da93d0a057a718031395f6c83c57c9a8d3daf0"/>
621621
</dataarea>
622622
</part>
623623
</software>
@@ -2983,4 +2983,21 @@ To load and run a tape:
29832983
</part>
29842984
</software>
29852985

2986+
<software name="wheeldeal" supported="no">
2987+
<description>Wheeler Dealers</description>
2988+
<year>1978</year>
2989+
<publisher>Speakeasy Software</publisher>
2990+
<info name="programmer" value="Danielle Bunten Berry" />
2991+
<info name="usage" value="Requires a 16K Apple ][ or later. Shipped with special hardware controllers, but joystick or paddeles can be used by defining directional movement (not button press) to each player." />
2992+
<sharedfeat name="compatibility" value="A2,A2P,A2E,A2EE,A2C,A2GS" />
2993+
<!--Dump released: 2024-05-09-->
2994+
<!--simulation game-->
2995+
<part name="cass" interface="apple2_cass">
2996+
<feature name="part_id" value="Wheeler Dealers" />
2997+
<dataarea name="cass" size="6462138">
2998+
<rom name="wheeler dealers (1978) (speakeasy software, ltd.).wav" size="6462138" crc="83abeab4" sha1="5af05f91a712d5e2ccaa03606d269574405fecfa" />
2999+
</dataarea>
3000+
</part>
3001+
</software>
3002+
29863003
</softwarelist>

0 commit comments

Comments
 (0)