Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Robbbert
Robbbert committed May 21, 2024
2 parents 1fb6af1 + 9ab8903 commit b25a3b3
Show file tree
Hide file tree
Showing 35 changed files with 1,601 additions and 691 deletions.
6 changes: 3 additions & 3 deletions docs/source/techspecs/cpu_device.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ TODO.
~~~~~~~~~~~~~~

An interruptible CPU is defined as a core which is able to suspend the
execution of a instruction at any time, exit execute_run, then at the
next call of ``execute_run`` keep going from where it was. This
includes begin able to abort an issued memory access, quit
execution of one instruction at any time, exit execute_run, then at
the next call of ``execute_run`` keep going from where it was. This
includes being able to abort an issued memory access, quit
execute_run, then upon the next call of execute_run reissue the exact
same access.

Expand Down
4 changes: 2 additions & 2 deletions docs/source/techspecs/memory.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ view can be re-enabled at any time.
3.5 Bus contention handling
~~~~~~~~~~~~~~~~~~~~~~~~~~~

Some specific CPUs have be upgraded to be interruptible which allows
Some specific CPUs have been upgraded to be interruptible which allows
to add bus contention and wait states capabitilites. Being
interruptible means, in practice, that an instruction can be
interrupted at any time and the execute_run method of the core exited.
Expand Down Expand Up @@ -328,7 +328,7 @@ cycle will be aborted for lack of remaining time, and the method will
eventually be called again. It will then give the time of when the
second dma will finish, and all will be well.

It can also allow to reduce said earlier time when circonstances
It can also allow to reduce said earlier time when circumstances
require it. For instance a PIO latch that waits up to 64 cycles that
data arrives can indicate that current time + 64 as a target (which
will trigger a bus error for instance) but if a timer elapses and
Expand Down
14 changes: 13 additions & 1 deletion hash/bkrankp_cart.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Known carts:
<description>J-Pop Blue</description>
<year>2015</year>
<publisher>Bandai</publisher>
<info name="alt_title" value="ジェイポップブルー" />
<info name="serial" value="2315998" />
<part name="cart" interface="bkrankp_cart">
<dataarea name="rom" size="0x400000">
Expand All @@ -46,9 +47,10 @@ Known carts:
</software>

<software name="aikatsu" supported="no">
<description>Aikatsu Ver. Best</description>
<description>Aikatsu! Idol Katsudō!</description>
<year>2015</year>
<publisher>Bandai</publisher>
<info name="alt_title" value="アイカツ！アイドルカツドウ！" />
<info name="serial" value="2315999" />
<part name="cart" interface="bkrankp_cart">
<dataarea name="rom" size="0x800000">
Expand All @@ -61,6 +63,7 @@ Known carts:
<description>J-Pop - Strawberry</description>
<year>2015</year>
<publisher>Bandai</publisher>
<info name="alt_title" value="ジェイポップストロベリー" />
<info name="serial" value="2316073" />
<part name="cart" interface="bkrankp_cart">
<dataarea name="rom" size="0x400000">
Expand All @@ -73,6 +76,7 @@ Known carts:
<description>J-Pop - Green</description>
<year>2015</year>
<publisher>Bandai</publisher>
<info name="alt_title" value="ジェイポップグリーン" />
<info name="serial" value="2316095" />
<part name="cart" interface="bkrankp_cart">
<dataarea name="rom" size="0x400000">
Expand All @@ -85,6 +89,7 @@ Known carts:
<description>J-Pop - Pink</description>
<year>2015</year>
<publisher>Bandai</publisher>
<info name="alt_title" value="ジェイポップピンク" />
<info name="serial" value="2316096" />
<part name="cart" interface="bkrankp_cart">
<dataarea name="rom" size="0x400000">
Expand All @@ -97,6 +102,7 @@ Known carts:
<description>Kid's Pop - Lemon Yellow</description>
<year>2015</year>
<publisher>Bandai</publisher>
<info name="alt_title" value="キッズポップレモンイエロー" />
<info name="serial" value="2316097" />
<part name="cart" interface="bkrankp_cart">
<dataarea name="rom" size="0x400000">
Expand Down Expand Up @@ -160,6 +166,7 @@ Known carts:
<description>Kid's Pop - Red</description>
<year>2015</year>
<publisher>Bandai</publisher>
<info name="alt_title" value="キッズポップレッド" />
<info name="serial" value="2333253" />
<part name="cart" interface="bkrankp_cart">
<dataarea name="rom" size="0x400000">
Expand All @@ -184,6 +191,7 @@ Known carts:
<description>Kid's Pop - Apple Green</description>
<year>2015</year>
<publisher>Bandai</publisher>
<info name="alt_title" value="キッズポップアップルグリーン" />
<info name="serial" value="2336074" />
<part name="cart" interface="bkrankp_cart">
<dataarea name="rom" size="0x400000">
Expand All @@ -196,6 +204,7 @@ Known carts:
<description>J-Pop - Grapefruit</description>
<year>2015</year>
<publisher>Bandai</publisher>
<info name="alt_title" value="ジェイポップグレープフルーツ" />
<info name="serial" value="2336075" />
<part name="cart" interface="bkrankp_cart">
<dataarea name="rom" size="0x400000">
Expand All @@ -209,6 +218,7 @@ Known carts:
<year>2015</year>
<publisher>Bandai</publisher>
<info name="serial" value="2336076" />
<info name="alt_title" value="ディズニードリームヒットソング" />
<part name="cart" interface="bkrankp_cart">
<dataarea name="rom" size="0x800000">
<rom name="Disney_mx25l6406e_c22017.BIN" size="0x800000" crc="777a37de" sha1="27116702adbaed782677b3f64215c4f0f022fa65" />
Expand All @@ -220,6 +230,7 @@ Known carts:
<description>J-Pop - Mint</description>
<year>2015</year>
<publisher>Bandai</publisher>
<info name="alt_title" value="ジェイポップミント" />
<info name="serial" value="2350534" />
<part name="cart" interface="bkrankp_cart">
<dataarea name="rom" size="0x400000">
Expand All @@ -232,6 +243,7 @@ Known carts:
<description>Best Hit Song</description>
<year>2015</year>
<publisher>Bandai</publisher>
<info name="alt_title" value="ベストヒットソング" />
<info name="serial" value="2350535" />
<part name="cart" interface="bkrankp_cart">
<dataarea name="rom" size="0x400000">
Expand Down
34 changes: 20 additions & 14 deletions hash/ekara_cart.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ license:CC0-1.0
Japanese cart listing (by M code) (M-x on cartridge / box, MC in cart identifier code)
M-1 *MC0001-ATM Artist Mini Volume 1 (Aya Matsuura)
M-2 *MC0002-ATM Artist Mini Volume 2 (PIKA☆NCHI, A・RA・SHI／他)
M-2 *MC0002-ATM Artist Mini Volume 2 (PIKA☆NCHI, A·RA·SHI, etc.)
M-3 *MC0003-ATM Artist Mini Volume 3 (Morning Musume)
M-4 *MC0004-ATM Artist Mini Volume 4 (w-inds)
M-5 *MC0005-KSM Kids Song Mini Volume 1 (TV Song)
Expand All @@ -324,7 +324,7 @@ license:CC0-1.0
M-8 *MC0008-KSM Kids Song Mini Volume 3
M-9 *MC0009-JPM J-Pop Mix Mini Volume 1
M-10 *MC0010-ATM Artist Mini Volume 6 (Utada Hikaru)
M-11 *MC0011-KSM Kids Song Mini Volume 4 (Fantastic)
M-11 *MC0011-KSM Kids Song Mini Volume 4 (Micky Mouse March, Hoshi ni Negai O, etc.)
M-12 *MC0012-ATM Artist Mini Volume 7 (Ayumi Hamasaki)
M-13 *MC0013-KSM Kids Song Mini Volume 5
M-14 *MC0014-ATM Artist Mini Volume 8 (BoA)
Expand Down Expand Up @@ -371,7 +371,7 @@ license:CC0-1.0
S-14 *SC0014-SAI Saiten Cartridge Challenge Idol vol.4
S-15 *SC0015-DCS Saiten Cartridge Detective Conan Vol.2
S-16 *SC0016-SAI Saiten Cartridge Nesshō vol. 5
S-17 *SC0017-SAI Kids' Challenge Vol.2
S-17 *SC0017-SAI Kids' Challenge Vol.2 (Te o Tsunagō, Anpanman no March, etc.)
S-18 *SC0018-SAI Saiten Cartridge Challenge Artist Vol.1 (Morning Musume, Tanpopo, Petit Moni, Gotō Maki)
S-19 *SC0019-SAI Saiten Cartridge Nesshō vol. 6
S-20 *SC0020-SAI Saiten Cartridge Challenge Idol vol.5
Expand Down Expand Up @@ -419,7 +419,7 @@ license:CC0-1.0
*KR-1 Kirarin Revolution (comes in kira kara Starter Set bundled with Kirarin Revolution microphone) (inside cart is marked AC0009-KIR)
*BX01-MOR Morning Musume Special (sticker inside cart is marked CS019-004A)
*PR-01 MNG (c)2002 Morning Musume - I'm Here! (single song 'not for sale' cartridge)
*PR-01 MNG (c)2002 Premium Cartridge Koko ni Iru Zee! Morning Musume (single song 'not for sale' cartridge)
PR-02 AYY (c)2003 Aya Matsuura - Prairies Man (single song 'not for sale' cartridge)
*PR-06 Misora Hibari (inside cart is marked AC0009)
Expand Down Expand Up @@ -1791,9 +1791,10 @@ license:CC0-1.0
</software>

<software name="dc0004">
<description>Dream Cartridge: TV Pop Junior Vol.8 (Japan) (DC0004-TPJ)</description>
<description>Dream Cartridge: TV Pop Junior Vol.8 (Happy Lucky - Onegai Mirmo, mini-moni - Telephone! Ring Ring Ring, etc.) (Japan) (DC0004-TPJ)</description>
<year>2004</year>
<publisher>Takara</publisher>
<info name="alt_title" value="ドリームカートリッジ TVPOPジュニア Vol.8 (ハッピー♥ラッキー～お願いミルモ～／ミニモニ。テレフォン！リンリンリン／他)"/> <!-- from cover art -->
<sharedfeat name="compatibility" value="EKARA,POPIRA,TAIKO"/>
<part name="cart" interface="ekara_cart">
<feature name="slot" value="rom_24lc02"/>
Expand Down Expand Up @@ -1849,10 +1850,10 @@ license:CC0-1.0
</software>

<software name="dc0009">
<description>Dream Cartridge: TV Pop Junior Vol.10 (Japan) (DC0009-TPJ)</description>
<description>Dream Cartridge: TV Pop Junior Vol.10 (Bon Voyage!, Kimi to Yakusoku Shita Yasashī Ano Basho Made, etc.) (Japan) (DC0009-TPJ)</description>
<year>2004</year>
<publisher>Takara</publisher>
<info name="alt_title" value="ドリームカートリッジ TVPOPジュニア"/> <!-- from cover art -->
<info name="alt_title" value="ドリームカートリッジ TVPOPジュニア (BON VOYAGE!／君と約束した優しいあの場所まで／他)"/> <!-- from cover art -->
<info name="alt_title" value="TV POPジュニアvol.10"/> <!-- shown on-screen when run on Popira -->
<sharedfeat name="compatibility" value="EKARA,POPIRA,TAIKO"/>
<part name="cart" interface="ekara_cart">
Expand Down Expand Up @@ -2297,9 +2298,10 @@ license:CC0-1.0
</software>

<software name="mc0002">
<description>Artist Mini Volume 2 (PIKA☆NCHI, A・RA・SHI／他) (Japan) (MC0002-ATM)</description>
<description>Artist Mini Volume 2 (PIKA☆NCHI, A·RA·SHI, etc.) (Japan) (MC0002-ATM)</description>
<year>2003</year>
<publisher>Takara</publisher>
<info name="alt_title" value="アーティストミニ mini vol.2 (PIKA☆NCHI／A·RA·SHI／他)"/>
<sharedfeat name="compatibility" value="EKARA"/>
<part name="cart" interface="ekara_cart">
<dataarea name="rom" size="0x080000">
Expand Down Expand Up @@ -2413,9 +2415,10 @@ license:CC0-1.0
</software>

<software name="mc0011">
<description>Kids Song Mini Volume 4 (Fantastic) (Japan) (MC0011-KSM)</description>
<description>Kids Song Mini Volume 4 (Micky Mouse March, Hoshi ni Negai O, etc.) (Japan) (MC0011-KSM)</description>
<year>2003</year>
<publisher>Takara</publisher>
<info name="alt_title" value="アーティストミニ mini vol.4 (ミッキーマウス・マーチ／星に願いを／他)"/>
<sharedfeat name="compatibility" value="EKARA"/>
<part name="cart" interface="ekara_cart">
<dataarea name="rom" size="0x080000">
Expand Down Expand Up @@ -2722,9 +2725,10 @@ license:CC0-1.0
</software>

<software name="sc0013">
<description>Saiten Cartridge Nesshō vol. 4 (Japan) (SC0013-SAI)</description>
<description>Saiten Cartridge Nesshō vol. 4 (Naminori Johnny, Kanashimi wa Yuki no Yō Ni, etc.) (Japan) (SC0013-SAI)</description>
<year>2001</year>
<publisher>Takara</publisher>
<info name="alt_title" value="採点カートリッジ 熱唱 vol. 4 (波乗りジョニー／悲しみは雪のように／他)"/>
<sharedfeat name="compatibility" value="EKARA"/>
<part name="cart" interface="ekara_cart">
<dataarea name="rom" size="0x100000">
Expand Down Expand Up @@ -2773,9 +2777,10 @@ license:CC0-1.0
</software>

<software name="sc0017">
<description>Kids' Challenge Vol.2 (Japan) (SC0017-SAI)</description>
<description>Kids' Challenge Vol.2 (Te o Tsunagō, Anpanman no March, etc.) (Japan) (SC0017-SAI)</description>
<year>2001</year>
<publisher>Takara</publisher>
<info name="alt_title" value="採点カートリッジ キッズチャレンジ Vol.2 (てをつなごう／アンパンマンのマーチ／他)"/>
<sharedfeat name="compatibility" value="EKARA"/>
<part name="cart" interface="ekara_cart">
<dataarea name="rom" size="0x100000">
Expand Down Expand Up @@ -2952,9 +2957,10 @@ license:CC0-1.0
</software>

<software name="pr01">
<description>PR-01 Morning Musume - I'm Here! (Not for Sale, Japan)</description>
<description>PR-01 Premium Cartridge Koko ni Iru Zee! Morning Musume (Not for Sale, Japan)</description>
<year>2002</year>
<publisher>Takara</publisher>
<info name="alt_title" value="プレミアムカートリッジ ここにいるぜえ！ モーニング娘。" />
<sharedfeat name="compatibility" value="EKARA"/>
<part name="cart" interface="ekara_cart">
<dataarea name="rom" size="0x80000">
Expand Down Expand Up @@ -2993,10 +2999,10 @@ license:CC0-1.0
</software>

<software name="gs1">
<description>Natsukashi no Meikyoku-shū (Japan)</description>
<description>Natsukashi no Meikyoku-shū (Akatonbo, Haru ga Kita, etc.) (Japan)</description>
<year>2002</year>
<publisher>Takara</publisher>
<info name="alt_title" value="懐かしの名曲集" />
<info name="alt_title" value="懐かしの名曲集 (赤蜻蛉／春が来た／他)" />
<sharedfeat name="compatibility" value="EKARA,POPIRA"/>
<part name="cart" interface="ekara_cart">
<dataarea name="rom" size="0x100000">
Expand Down
21 changes: 14 additions & 7 deletions hash/hikara.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ license:CC0-1.0
-->

<!-- this one has some songs programmed into it:
キューティーハニー 倖田來未 Cutie Honey Kōda Kumi
KissHug aiko KissHug aiko
さくらんぼ 大塚愛 Sakuranbo Ōtsuka Ai
Dream Fighter Perfume Dream Fighter Perfume
ポリリズム Perfume Polyrhythm Perfume -->
キューティーハニー 倖田來未 Cutie Honey Kōda Kumi
KissHug aiko KissHug aiko
さくらんぼ 大塚愛 Sakuranbo Ōtsuka Ai
Dream Fighter Perfume Dream Fighter Perfume
ポリリズム Perfume Polyrhythm Perfume -->
<software name="user5" supported="no">
<description>Hi-kara 5-song capacity user cartridge (used, with 5 songs) (Japan)</description>
<year>2008</year>
Expand All @@ -80,6 +80,11 @@ license:CC0-1.0
</part>
</software>

<!-- this one has some songs programmed into it:
崖の上のポニョ 藤岡藤巻と大橋のぞみ Gake no Ue no Ponyo Fujioka Fujimaki & Ōhashi Nozomi
タンタンターン！ MilkyWay Tan Tan Tān! MilkyWay
ハートのエースが出てこない キャンディーズ Heart no Ace ga Detekonai Candies
プリキュア5、スマイル go go! 工藤真由 PreCure 5, Smile Go Go! Kudō Mari -->
<software name="user5a" cloneof="user5" supported="no">
<description>Hi-kara 5-song capacity user cartridge (used, with 4 songs) (Japan)</description>
<year>2008</year>
Expand Down Expand Up @@ -232,9 +237,10 @@ license:CC0-1.0
</software>

<software name="pokemon" supported="no">
<description>Pocket Monsters Special</description>
<description>Utatte Asonde! Best Hit Pokémon</description>
<year>2008</year>
<publisher>Takara Tomy</publisher>
<info name="alt_title" value="うたってあそんで！ベストヒットポケモン"/>
<part name="cart" interface="ekara_cart">
<dataarea name="rom" size="0x200000">
<rom name="r-08b0541.u1" size="0x200000" crc="8b6a6d4b" sha1="5f264bff2deedbd61d844c4f8ba4421ac598636c"/>
Expand All @@ -243,9 +249,10 @@ license:CC0-1.0
</software>

<software name="ciao" supported="no">
<description>Ciao Special</description>
<description>Ciao Best Hit Cartridge</description>
<year>2009</year>
<publisher>Takara Tomy</publisher>
<info name="alt_title" value="ちゃお ベストヒットカートリッジ"/>
<part name="cart" interface="ekara_cart">
<dataarea name="rom" size="0x200000">
<rom name="cc0907001.u1" size="0x200000" crc="45f6b2a3" sha1="b3b1b3f269b128a2b09aa932f77d53da53f6130f"/>
Expand Down
4 changes: 2 additions & 2 deletions hash/neogeo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11815,8 +11815,8 @@ Four player adapter not supported
<dataarea name="fixed" size="0x20000">
<rom name="202-s1.bin" offset="0x000000" size="0x20000" crc="a545b593" sha1="09077b63595eebb7dddd55e041e7786164df0ead" />
</dataarea>
<dataarea name="audiocpu" size="0x100000">
<rom name="202-m1.bin" offset="0x000000" size="0x100000" crc="2037dc19" sha1="c88588d07fc63aeed828a87f0f633c7badafeb3e" />
<dataarea name="audiocpu" size="0x010000">
<rom name="202-m1.bin" offset="0x000000" size="0x010000" crc="2037dc19" sha1="c88588d07fc63aeed828a87f0f633c7badafeb3e" />
</dataarea>
<dataarea name="ymsnd:adpcma" size="0x900000">
<rom name="202-v1.bin" offset="0x000000" size="0x100000" crc="3ac066e1" sha1="cab7f04fbce0db685f5fa0d22923f7b7ca37a804" />
Expand Down
14 changes: 13 additions & 1 deletion hash/saitek_egr.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ license:CC0-1.0
</software>

<software name="egr2" cloneof="egr">
<description>Endgame ROM (ver. 2)</description>
<description>Endgame ROM (ver. 2, set 1)</description>
<year>1988</year>
<publisher>Saitek</publisher>
<sharedfeat name="compatibility" value="egr2"/>
Expand All @@ -45,4 +45,16 @@ license:CC0-1.0
</part>
</software>

<software name="egr2a" cloneof="egr">
<description>Endgame ROM (ver. 2, set 2)</description>
<year>1988</year>
<publisher>Saitek</publisher>
<sharedfeat name="compatibility" value="egr2"/>
<part name="extrom" interface="saitek_egr">
<dataarea name="rom" size="0x8000">
<rom name="egrii_a20" size="0x8000" crc="502ebf3e" sha1="e0662f76f2f3d62fed3087de3c673b37426049bf" />
</dataarea>
</part>
</software>

</softwarelist>
11 changes: 11 additions & 0 deletions scripts/src/machine.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1560,6 +1560,17 @@ if (MACHINES["1MB5"]~=null) then
}
end

---------------------------------------------------
--@src/devices/machine/i2cmem.h,MACHINES["I2CHLE"] = true
---------------------------------------------------

if (MACHINES["I2CHLE"]~=null) then
files {
MAME_DIR .. "src/devices/machine/i2chle.cpp",
MAME_DIR .. "src/devices/machine/i2chle.h",
}
end

---------------------------------------------------
--
--@src/devices/machine/i2cmem.h,MACHINES["I2CMEM"] = true
Expand Down
Loading

0 comments on commit b25a3b3

Please sign in to comment.