Skip to content

Commit

Permalink
Merge branch 'master' into mbs1_mmu_2
Browse files Browse the repository at this point in the history
  • Loading branch information
@angelosa
angelosa authored Sep 26, 2024
2 parents 35db804 + d7b8d2c commit 37673f5
Show file tree
Hide file tree
Showing 3,596 changed files with 18,628 additions and 18,153 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions android-project/app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame"
android:versionCode="269"
android:versionName="0.269"
android:versionCode="270"
android:versionName="0.270"
android:installLocation="auto">

<!-- OpenGL ES 2.0 -->
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
# built documents.
#
# The short X.Y version.
version = '0.269'
version = '0.270'
# The full version, including alpha/beta/rc tags.
release = '0.269'
release = '0.270'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
66 changes: 42 additions & 24 deletions hash/sat_vccart.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ license:CC0-1.0
-->

<software name="vcd">
<software name="vcd" supported="no">
<description>Video CD Card (Europe, v1.105)</description>
<year>1995</year>
<publisher>Sega</publisher>
Expand All @@ -41,13 +41,13 @@ license:CC0-1.0
<feature name="ic303" value="MPR-17896-H" />
<feature name="ic304" value="HY514260B JC-70" /> <!-- 512k DRAM by Hyundai -->
<feature name="ic401" value="HD814102F" /> <!-- Custom ASIC by Hitachi -->
<dataarea name="rom" size="524288">
<rom name="mpr-17896-h.ic303" size="524288" crc="192e52c2" sha1="2f5ebd434f6d5b82e93d03e5626007bd5380f652" offset="0" />
<dataarea name="rom" size="0x80000">
<rom name="mpr-17896-h.ic303" size="0x80000" crc="192e52c2" sha1="2f5ebd434f6d5b82e93d03e5626007bd5380f652" />
</dataarea>
</part>
</software>

<software name="hivcd2d">
<software name="hivcd2d" supported="no">
<description>Hitachi Video CD Card (Japan, two white dots, v1.011)</description>
<year>1995</year>
<publisher>Hitachi</publisher>
Expand All @@ -58,13 +58,13 @@ license:CC0-1.0
<feature name="ic303" value="MPR-17773D-H, MPR-17773E-T" /> <!-- Verified they have the same content, just different type of ROM chip (44pin PLCC vs 40pin SOP) -->
<feature name="ic304" value="[unpopulated]" /> <!-- This is not present in early PCB -->
<feature name="ic401" value="HD814102F" /> <!-- Custom ASIC by Hitachi -->
<dataarea name="rom" size="524288">
<rom name="mpr-17773e-t.ic303" size="524288" crc="88bcb5ab" sha1="88aa35e48e655540e87ebeae10220413a8feee81" offset="0" />
<dataarea name="rom" size="0x80000">
<rom name="mpr-17773e-t.ic303" size="0x80000" crc="88bcb5ab" sha1="88aa35e48e655540e87ebeae10220413a8feee81" />
</dataarea>
</part>
</software>

<software name="hivcd1d" cloneof="hivcd2d">
<software name="hivcd1d" cloneof="hivcd2d" supported="no">
<description>Hitachi Video CD Card (Japan, one white dot, v1.009)</description>
<year>1995</year>
<publisher>Hitachi</publisher>
Expand All @@ -74,13 +74,13 @@ license:CC0-1.0
<feature name="ic302" value="HY514260B JC-70" /> <!-- 512k DRAM by Hyundai -->
<feature name="ic303" value="MPR-17773C-H" />
<feature name="ic401" value="HD814102F" /> <!-- Custom ASIC by Hitachi -->
<dataarea name="rom" size="524288">
<rom name="mpr-17773c-h.ic303" size="524288" crc="f9ca3180" sha1="40f284e79f205728b72c7d7c0cf0bae0ade38f76" offset="0" />
<dataarea name="rom" size="0x80000">
<rom name="mpr-17773c-h.ic303" size="0x80000" crc="f9ca3180" sha1="40f284e79f205728b72c7d7c0cf0bae0ade38f76" />
</dataarea>
</part>
</software>

<software name="ssmovie">
<software name="ssmovie" supported="no">
<description>SegaSaturn Movie Card (Japan, v1.102)</description>
<year>1995</year>
<publisher>Sega</publisher>
Expand All @@ -91,13 +91,13 @@ license:CC0-1.0
<feature name="ic302" value="HY514260B JC-70" /> <!-- 512k DRAM by Hyundai -->
<feature name="ic303" value="MPR-17610A-H" />
<feature name="ic401" value="HD814102F" /> <!-- Custom ASIC by Hitachi -->
<dataarea name="rom" size="524288">
<rom name="mpr-17610a-h.ic303" size="524288" crc="9688c629" sha1="f7171b2a8f1c464696771941225c32d636b59349" offset="0" />
<dataarea name="rom" size="0x80000">
<rom name="mpr-17610a-h.ic303" size="0x80000" crc="9688c629" sha1="f7171b2a8f1c464696771941225c32d636b59349" />
</dataarea>
</part>
</software>

<software name="jvcvc20">
<software name="jvcvc20" supported="no">
<description>JVC Video CD / Photo CD Decoder (Japan, v3.000)</description>
<year>1996?</year>
<publisher>JVC</publisher>
Expand All @@ -109,13 +109,13 @@ license:CC0-1.0
<feature name="ic303" value="PA32" />
<feature name="ic304" value="HM514260CJ7" /> <!-- 512k DRAM by Hitachi -->
<feature name="ic401" value="HD814102F" /> <!-- Custom ASIC by Hitachi -->
<dataarea name="rom" size="524288">
<rom name="pa32.ic303" size="524288" crc="afe194aa" sha1="bb6459da484864226616c5d45b779d4b1644c527" offset="0" />
<dataarea name="rom" size="0x80000">
<rom name="pa32.ic303" size="0x80000" crc="afe194aa" sha1="bb6459da484864226616c5d45b779d4b1644c527" />
</dataarea>
</part>
</software>

<software name="jvcvc2">
<software name="jvcvc2" supported="no">
<description>Victor Twin Operator Video CD &amp; Photo CD (Japan, v2.001)</description>
<year>1995</year>
<publisher>Victor</publisher>
Expand All @@ -126,13 +126,13 @@ license:CC0-1.0
<feature name="ic302" value="HM514260AJ7" /> <!-- 512k DRAM by Hitachi -->
<feature name="ic303" value="PZE6 (early), PA26 (late)" /> <!-- Verified they have the same content, just different type of ROM chip (HN62444BNC vs HN62454BNC) -->
<feature name="ic401" value="HD814102F" /> <!-- Custom ASIC by Hitachi -->
<dataarea name="rom" size="524288">
<rom name="pa26.ic303" size="524288" crc="badf129d" sha1="286f2c75b1a5bb9d7df23db9f0a381e61b1ac76c" offset="0" />
<dataarea name="rom" size="0x80000">
<rom name="pa26.ic303" size="0x80000" crc="badf129d" sha1="286f2c75b1a5bb9d7df23db9f0a381e61b1ac76c" />
</dataarea>
</part>
</software>

<software name="jvcvc2a" cloneof="jvcvc2">
<software name="jvcvc2a" cloneof="jvcvc2" supported="no">
<description>Victor Twin Operator Video CD &amp; Photo CD (Japan, v2.000)</description>
<year>1995</year>
<publisher>Victor</publisher>
Expand All @@ -143,13 +143,13 @@ license:CC0-1.0
<feature name="ic302" value="HM514260AJ7" /> <!-- 512k DRAM by Hitachi -->
<feature name="ic303" value="PZD9" />
<feature name="ic401" value="HD814102F" /> <!-- Custom ASIC by Hitachi -->
<dataarea name="rom" size="524288">
<rom name="pzd9.ic303" size="524288" crc="f2dde5c7" sha1="567f82a31d5f93676120d699869b3ca64995e167" offset="0" />
<dataarea name="rom" size="0x80000">
<rom name="pzd9.ic303" size="0x80000" crc="f2dde5c7" sha1="567f82a31d5f93676120d699869b3ca64995e167" />
</dataarea>
</part>
</software>

<software name="jvcvc1">
<software name="jvcvc1" supported="no">
<description>Victor Video CD Decoder (Japan, v1.003)</description>
<year>1995</year>
<publisher>Victor</publisher>
Expand All @@ -160,8 +160,26 @@ license:CC0-1.0
<feature name="ic302" value="HM514260AJ7" /> <!-- 512k DRAM by Hitachi -->
<feature name="ic303" value="PZA6" />
<feature name="ic401" value="HD814102F" /> <!-- Custom ASIC by Hitachi -->
<dataarea name="rom" size="524288">
<rom name="pza6.ic303" size="524288" crc="ef9d13ef" sha1="eaac576b8b5e79e7df5e3efd70275b220ff70d78" offset="0" />
<dataarea name="rom" size="0x80000">
<rom name="pza6.ic303" size="0x80000" crc="ef9d13ef" sha1="eaac576b8b5e79e7df5e3efd70275b220ff70d78" />
</dataarea>
</part>
</software>

<software name="jvcvc3" supported="no">
<description>Victor Twin Operator Video CD &amp; Photo CD (Japan, v4.000)</description>
<year>1997</year>
<publisher>Victor</publisher>
<info name="serial" value="RG-VC3" />
<part name="cart" interface="sat_vcd_cart">
<feature name="pcb" value="171-7027B PC BD MPEG" />
<feature name="ic301" value="315-5745 / HD814101FE" /> <!-- Custom ASIC by Sega/Hitachi -->
<feature name="ic302" value="HM514260AJ7" /> <!-- 512k DRAM by Hitachi -->
<feature name="ic303" value="62454BNC" />
<feature name="ic304" value="HY514260B JC-70" /> <!-- 512k DRAM by Hyundai -->
<feature name="ic401" value="HD814102F" /> <!-- Custom ASIC by Hitachi -->
<dataarea name="rom" size="0x80000">
<rom name="62454bnc.ic303" size="0x80000" crc="7826f82c" sha1="2b070ecd1c10e9dd94454797395a57c6e53fd16c" />
</dataarea>
</part>
</software>
Expand Down
83 changes: 54 additions & 29 deletions hash/supracan.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,17 @@
<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
<!--
license:CC0-1.0
All known released games are dumped.
Unreleased Super A'can carts:
- Dinosaur Wars
- City Escape
- Quick Fighting Attack
- Journey to the Center of the Earth
-->

<softwarelist name="supracan" description="Funtech Super A'Can cartridges">
<software name="formduel" supported="no">
<description>Formosa Duel ~ Formosa Da Dui Jue</description>
Expand All @@ -16,7 +26,7 @@ game over screen uses a RNG register for rain scroll (verify)
<info name="alt_title" value="福爾摩沙大對決" />
<part name="cart" interface="superacan_cart">
<dataarea name="rom" width="16" endianness="big" size="0x100000">
<rom loadflag="load16_word_swap" name="Formosa Duel (Taiwan).bin" size="0x100000" crc="b2bf31dc" sha1="8d0680e1322af21b20d5cee2c100b05cf4217815" offset="0" />
<rom loadflag="load16_word_swap" name="Formosa Duel (Taiwan).bin" size="0x100000" crc="b2bf31dc" sha1="8d0680e1322af21b20d5cee2c100b05cf4217815" />
</dataarea>
</part>
</software>
Expand All @@ -35,8 +45,8 @@ game over screen uses a RNG register for rain scroll (verify)
<info name="serial" value="F002" />
<info name="alt_title" value="三國志 武將爭霸" />
<part name="cart" interface="superacan_cart">
<dataarea name="rom" width="16" endianness="big" size="3145728">
<rom loadflag="load16_word_swap" name="sangofgt.bin" size="3145728" crc="a4de6dde" sha1="f4bed63775130a75eb9c50b32e0cf50d1a7b8f50" offset="0" />
<dataarea name="rom" width="16" endianness="big" size="0x300000">
<rom loadflag="load16_word_swap" name="sangofgt.bin" size="0x300000" crc="a4de6dde" sha1="f4bed63775130a75eb9c50b32e0cf50d1a7b8f50" />
</dataarea>
</part>
</software>
Expand All @@ -55,9 +65,10 @@ Broken [video] during intro, uses bitmap mode with ROZ layer
<info name="serial" value="F003" />
<info name="alt_title" value="邪惡之子" />
<part name="cart" interface="superacan_cart">
<dataarea name="rom" width="16" endianness="big" size="2097152">
<rom loadflag="load16_word_swap" name="16005.cu5" size="2097152" crc="9f6119a7" sha1="67ae9e7f99e1c3054ea54d53dbbba7792ef45134" offset="0" />
<dataarea name="rom" width="16" endianness="big" size="0x200000">
<rom loadflag="load16_word_swap" name="16005.cu5" size="0x200000" crc="9f6119a7" sha1="67ae9e7f99e1c3054ea54d53dbbba7792ef45134" />
</dataarea>

<!-- TODO: unconfirmed size -->
<dataarea name="nvram" size="0x8000">
</dataarea>
Expand All @@ -77,8 +88,8 @@ Broken [video] during intro, uses bitmap mode with ROZ layer
<info name="serial" value="F004" />
<info name="alt_title" value="音速飛龍" />
<part name="cart" interface="superacan_cart">
<dataarea name="rom" width="16" endianness="big" size="2097152">
<rom loadflag="load16_word_swap" name="speedydgn.bin" size="2097152" crc="f631383c" sha1="fbd62b5d287aa82ef27f400ab2a6b3da0308192a" offset="0" />
<dataarea name="rom" width="16" endianness="big" size="0x200000">
<rom loadflag="load16_word_swap" name="speedydgn.bin" size="0x200000" crc="f631383c" sha1="fbd62b5d287aa82ef27f400ab2a6b3da0308192a" />
</dataarea>
</part>
</software>
Expand All @@ -96,8 +107,8 @@ Broken [video] during intro, uses bitmap mode with ROZ layer
<info name="serial" value="F005" />
<info name="alt_title" value="超級中華職棒聯盟" />
<part name="cart" interface="superacan_cart">
<dataarea name="rom" width="16" endianness="big" size="2097152">
<rom loadflag="load16_word_swap" name="16005.0" size="2097152" crc="ccf6829b" sha1="17a413803d8749fbe9643ca56d703afd64569b9f" offset="0" />
<dataarea name="rom" width="16" endianness="big" size="0x200000">
<rom loadflag="load16_word_swap" name="16005.0" size="0x200000" crc="ccf6829b" sha1="17a413803d8749fbe9643ca56d703afd64569b9f" />
</dataarea>
<!-- TODO: unconfirmed size -->
<dataarea name="nvram" size="0x8000">
Expand All @@ -117,8 +128,8 @@ Broken [video] during intro, uses bitmap mode with ROZ layer
<info name="serial" value="F006" />
<info name="alt_title" value="嘻遊記" />
<part name="cart" interface="superacan_cart">
<dataarea name="rom" width="16" endianness="big" size="2097152">
<rom loadflag="load16_word_swap" name="16002.cu2" size="2097152" crc="cee25eea" sha1="fc82fc3a7d55571494cd62d8807160e22cf437bc" offset="0" />
<dataarea name="rom" width="16" endianness="big" size="0x200000">
<rom loadflag="load16_word_swap" name="16002.cu2" size="0x200000" crc="cee25eea" sha1="fc82fc3a7d55571494cd62d8807160e22cf437bc" />
</dataarea>
</part>
</software>
Expand All @@ -133,9 +144,9 @@ Broken [video] during intro, uses bitmap mode with ROZ layer
<info name="serial" value="F007" />
<info name="alt_title" value="超級光明戰史" />
<part name="cart" interface="superacan_cart">
<dataarea name="rom" width="16" endianness="big" size="3145728">
<rom loadflag="load16_word_swap" name="16007.0" size="2097152" crc="56c1c3fb" sha1="249e2ad6d8d40ecd31eda5a1bd5e5d0f47174a27" offset="000000" />
<rom loadflag="load16_word_swap" name="08007.1" size="1048576" crc="fc79f05f" sha1="7ce2e23ea3fd25764935708be4d47bf1a9843938" offset="0x200000" />
<dataarea name="rom" width="16" endianness="big" size="0x300000">
<rom loadflag="load16_word_swap" name="16007.0" offset="0x000000" size="0x200000" crc="56c1c3fb" sha1="249e2ad6d8d40ecd31eda5a1bd5e5d0f47174a27" />
<rom loadflag="load16_word_swap" name="08007.1" offset="0x200000" size="0x100000" crc="fc79f05f" sha1="7ce2e23ea3fd25764935708be4d47bf1a9843938" />
</dataarea>

<!-- TODO: unconfirmed size -->
Expand All @@ -151,8 +162,8 @@ Broken [video] during intro, uses bitmap mode with ROZ layer
<info name="serial" value="F008" />
<info name="alt_title" value="非洲探險" />
<part name="cart" interface="superacan_cart">
<dataarea name="rom" width="16" endianness="big" size="1048576">
<rom loadflag="load16_word_swap" name="08003.bin" size="1048576" crc="dc3b7b84" sha1="6dcbd7923203da7892915595d65ee668afbf0339" offset="0" />
<dataarea name="rom" width="16" endianness="big" size="0x100000">
<rom loadflag="load16_word_swap" name="08003.bin" size="0x100000" crc="dc3b7b84" sha1="6dcbd7923203da7892915595d65ee668afbf0339" />
</dataarea>

<!-- TODO: unconfirmed size -->
Expand All @@ -174,8 +185,8 @@ few [video] missing/glitched tiles in gameplay, likely related to above.
<info name="serial" value="F009" />
<info name="alt_title" value="賭霸" />
<part name="cart" interface="superacan_cart">
<dataarea name="rom" width="16" endianness="big" size="2097152">
<rom loadflag="load16_word_swap" name="16006.bin" size="2097152" crc="ac4fa721" sha1="0fda223817f0b50f0ce9687076d29df3d1b86960" offset="0" />
<dataarea name="rom" width="16" endianness="big" size="0x200000">
<rom loadflag="load16_word_swap" name="16006.bin" size="0x200000" crc="ac4fa721" sha1="0fda223817f0b50f0ce9687076d29df3d1b86960" />
</dataarea>

<!-- TODO: unconfirmed size and actual presence -->
Expand All @@ -200,8 +211,8 @@ Erratic gameplay speed, controls [irq 3] as FRC
<info name="serial" value="F010" />
<info name="alt_title" value="魔棒撞球" />
<part name="cart" interface="superacan_cart">
<dataarea name="rom" width="16" endianness="big" size="2097152">
<rom loadflag="load16_word_swap" name="08004.bin" size="2097152" crc="aed4e4f8" sha1="6be79db9006c46ea21f5dbe1add755ce2e413796" offset="0" />
<dataarea name="rom" width="16" endianness="big" size="0x200000">
<rom loadflag="load16_word_swap" name="08004.bin" size="0x200000" crc="aed4e4f8" sha1="6be79db9006c46ea21f5dbe1add755ce2e413796" />
</dataarea>
</part>
</software>
Expand All @@ -212,23 +223,37 @@ Erratic gameplay speed, controls [irq 3] as FRC
<publisher>Funtech</publisher>
<notes><![CDATA[
Uses [video] clipping for layer 1 during intro
Should use unemulated [video] interlace (verify on HW)
]]></notes>
<info name="serial" value="F011" />
<info name="alt_title" value="爆爆動物園" />
<part name="cart" interface="superacan_cart">
<dataarea name="rom" width="16" endianness="big" size="524288">
<rom loadflag="load16_word_swap" name="boomzoo.bin" size="524288" crc="6099bb44" sha1="0b5fbe2117bb77a827453c5489b3af691e5c7ade" offset="0" />
<dataarea name="rom" width="16" endianness="big" size="0x80000">
<rom loadflag="load16_word_swap" name="boomzoo.bin" size="0x80000" crc="6099bb44" sha1="0b5fbe2117bb77a827453c5489b3af691e5c7ade" />
</dataarea>
</part>
</software>

<!-- F012 - Rebel Star / 叛星 -->
<!-- presumably uses blending during gameplay -->
<software name="rebelst" supported="no">
<description>Rebel Star ~ Pàn Xīng</description>
<year>1996</year>
<publisher>Horng Shen Information Co., Ltd</publisher>
<notes><![CDATA[
[video] ROZ layer is concealed on intro.
[video] ROZ layer should blend hex grids, draws solid squares.
[video] select attack screens should blend as well (uses sprites)
]]></notes>
<info name="serial" value="F012" />
<info name="alt_title" value="叛星" />
<part name="cart" interface="superacan_cart">
<dataarea name="rom" width="16" endianness="big" size="0x200000">
<rom name="f012 - rebel star.bin" size="0x200000" crc="a3469172" sha1="3a1b093d7aee6d5b1f260723499d4c283a2a0169" />
</dataarea>

<!-- Unreleased Super A'can carts -->
<!-- Dinosaur Wars -->
<!-- City Escape -->
<!-- Quick Fighting Attack -->
<!-- Journey to the Center of the Earth -->
<!-- TODO: unconfirmed size -->
<dataarea name="nvram" size="0x8000">
</dataarea>
</part>
</software>

</softwarelist>
12 changes: 7 additions & 5 deletions hash/thinkpad8xx.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ license:CC0-1.0
<publisher>IBM</publisher>
<sharedfeat name="compatibility" value="800,820,850" />
<part name="cdrom1" interface="cdrom">
<feature name="part_id" value="AIX 4 Volume 1 of 2" />
<diskarea name="cdrom">
<disk name="aix_4.1.5_disc_01" sha1="4c49c8190e33c2c7f13a74d7332d384edd6b3042" />
</diskarea>
</part>
<part name="cdrom2" interface="cdrom">
<feature name="part_id" value="AIX 4 Volume 2 of 2" />
<diskarea name="cdrom">
<disk name="aix_4.1.5_disc_01" sha1="228afedd90619e89c6b466b4970bda0e5a3e9a13" />
<disk name="aix_4.1.5_disc_02" sha1="228afedd90619e89c6b466b4970bda0e5a3e9a13" />
</diskarea>
</part>
</software>
Expand Down Expand Up @@ -53,8 +55,8 @@ license:CC0-1.0
<part name="flop" interface="floppy">
<feature name="part_id" value="Solaris MDB Boot 2.5.1 Release PowerPC Platform Edition (IBM Hardware Platform)"/>
<feature name="part_number" value="702-4348-06"/>
<dataarea name="flop" size="168000">
<rom name="solaris_2_5_1_mdb_boot_ppc_ibm.img" size="168000" crc="b45832e2" sha1="be9e11364816ab5f3362396ed0f457d4a2e61188" />
<dataarea name="flop" size="1474560">
<rom name="solaris_2_5_1_mdb_boot_ppc_ibm.img" size="1474560" crc="b45832e2" sha1="be9e11364816ab5f3362396ed0f457d4a2e61188" />
</dataarea>
</part>
<part name="cdrom1" interface="cdrom">
Expand All @@ -79,8 +81,8 @@ license:CC0-1.0
<sharedfeat name="compatibility" value="800,820,850" />
<part name="flop" interface="floppy">
<feature name="part_id" value="Windows NT ARC Boot Firmware v1.51"/>
<dataarea name="flop" size="168000">
<rom name="winnt_arc_151.img" size="168000" crc="98db8c77" sha1="56be119ce7a0020bf4caabd099d2eae8e249305c" />
<dataarea name="flop" size="1474560">
<rom name="winnt_arc_151.img" size="1474560" crc="98db8c77" sha1="56be119ce7a0020bf4caabd099d2eae8e249305c" />
</dataarea>
</part>
<part name="cdrom" interface="cdrom">
Expand Down
Loading

0 comments on commit 37673f5

Please sign in to comment.