summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author couriersud <couriersud@gmx.org>2020-09-11 23:36:50 +0200
committer couriersud <couriersud@gmx.org>2020-09-11 23:36:50 +0200
commit8f40d2c6b95c706273a137d3bddda69a93a96398 (patch)
treea067f23a14671b703601160a0855c6cd8e99a885
parent0a87476e1a950dd6e51534b25f15f0b00d0cbb2b (diff)
parent8f48f2d062306db604c334228dbca7897c6f249e (diff)
Merge remote-tracking branch 'origin/master' into netlist-generated
-rw-r--r--hash/fmtowns_cd.xml715
-rw-r--r--scripts/target/mame/mess.lua1
-rw-r--r--src/devices/bus/bbc/tube/tube.cpp3
-rw-r--r--src/devices/bus/bbc/tube/tube_32016.cpp65
-rw-r--r--src/devices/bus/bbc/tube/tube_32016.h16
-rw-r--r--src/devices/cpu/m6502/st2205u.cpp523
-rw-r--r--src/devices/cpu/m6502/st2205u.h208
-rw-r--r--src/devices/cpu/m6502/st2xxx.cpp50
-rw-r--r--src/devices/cpu/ns32000/ns32000.cpp195
-rw-r--r--src/devices/cpu/ns32000/ns32000.h4
-rw-r--r--src/devices/machine/generalplus_gpl16250soc.cpp1
-rw-r--r--src/emu/render.cpp191
-rw-r--r--src/emu/render.h89
-rw-r--r--src/emu/rendlay.cpp111
-rw-r--r--src/lib/netlist/devices/nld_4006.cpp2
-rwxr-xr-xsrc/lib/netlist/plib/pmatrix2d.h2
-rw-r--r--src/lib/netlist/plib/pstream.h6
-rw-r--r--src/lib/netlist/plib/pstring.h4
-rw-r--r--src/mame/drivers/8080bw.cpp1
-rw-r--r--src/mame/drivers/att3b2.cpp40
-rw-r--r--src/mame/drivers/bbc.cpp8
-rw-r--r--src/mame/drivers/ddealer.cpp235
-rw-r--r--src/mame/drivers/electron.cpp3
-rw-r--r--src/mame/drivers/generalplus_gpl16250.cpp2
-rw-r--r--src/mame/drivers/generalplus_gpl16250_romram.cpp118
-rw-r--r--src/mame/drivers/generalplus_gpl_unknown.cpp12
-rw-r--r--src/mame/drivers/geniusiq.cpp4
-rw-r--r--src/mame/drivers/hp80.cpp210
-rw-r--r--src/mame/drivers/hunter2.cpp57
-rw-r--r--src/mame/drivers/husky.cpp15
-rw-r--r--src/mame/drivers/informer_207_376.cpp53
-rw-r--r--src/mame/drivers/informer_213ae.cpp45
-rw-r--r--src/mame/drivers/jupace.cpp28
-rw-r--r--src/mame/drivers/mstation.cpp4
-rw-r--r--src/mame/drivers/nascom1.cpp6
-rw-r--r--src/mame/drivers/nes_vt.cpp13
-rw-r--r--src/mame/drivers/novag_cexpert.cpp257
-rw-r--r--src/mame/drivers/novag_cforte.cpp7
-rw-r--r--src/mame/drivers/osbexec.cpp48
-rw-r--r--src/mame/drivers/pgm2.cpp1
-rw-r--r--src/mame/drivers/rfslots8085.cpp10
-rw-r--r--src/mame/drivers/spc1500.cpp10
-rw-r--r--src/mame/drivers/unk6502_st2xxx.cpp17
-rw-r--r--src/mame/drivers/y2.cpp4
-rw-r--r--src/mame/includes/generalplus_gpl16250_romram.h3
-rw-r--r--src/mame/layout/dct11em.lay8
-rw-r--r--src/mame/layout/de2.lay124
-rw-r--r--src/mame/layout/de2a3.lay137
-rw-r--r--src/mame/layout/gts80a_caveman.lay19
-rw-r--r--src/mame/layout/mchess.lay46
-rw-r--r--src/mame/layout/mephisto_academy.lay64
-rw-r--r--src/mame/layout/mephisto_alm16.lay23
-rw-r--r--src/mame/layout/mephisto_alm32.lay23
-rw-r--r--src/mame/layout/mephisto_berlin.lay13
-rw-r--r--src/mame/layout/mephisto_gen32.lay23
-rw-r--r--src/mame/layout/mephisto_milano.lay17
-rw-r--r--src/mame/layout/mephisto_modular_tm.lay7
-rw-r--r--src/mame/layout/novag_cexpert.lay513
-rw-r--r--src/mame/layout/novag_cforte.lay2
-rw-r--r--src/mame/layout/novag_constq.lay2
-rw-r--r--src/mame/layout/novag_diablo68k.lay36
-rw-r--r--src/mame/layout/novag_scorpio68k.lay36
-rw-r--r--src/mame/layout/novag_sexpert.lay36
-rw-r--r--src/mame/layout/novag_sforte.lay16
-rw-r--r--src/mame/layout/novag_supercon.lay14
-rw-r--r--src/mame/layout/saitek_intchess.lay10
-rw-r--r--src/mame/layout/saitek_mark6.lay6
-rw-r--r--src/mame/layout/saitek_renaissance.lay12
-rw-r--r--src/mame/layout/saitek_simultano.lay28
-rw-r--r--src/mame/layout/saitek_ssystem3.lay12
-rw-r--r--src/mame/layout/sda5708.lay2
-rw-r--r--src/mame/layout/splus.lay36
-rw-r--r--src/mame/layout/z80net.lay2
-rw-r--r--src/mame/layout/z80netb.lay2
-rw-r--r--src/mame/layout/z80netf.lay2
-rw-r--r--src/mame/machine/informer_207_376_kbd.cpp18
-rw-r--r--src/mame/mame.cpp2
-rw-r--r--src/mame/mame.lst9
-rw-r--r--src/mame/mess.cpp2
-rw-r--r--src/mame/mess.flt1
80 files changed, 3223 insertions, 1477 deletions
diff --git a/hash/fmtowns_cd.xml b/hash/fmtowns_cd.xml
index f67bd5a1e98..27befb2b6d0 100644
--- a/hash/fmtowns_cd.xml
+++ b/hash/fmtowns_cd.xml
@@ -43,7 +43,6 @@ Aska Word Algo
Band-kun Koei 1991/1 SET(CD+FD)
Battle GAM 1992/10 CD
Bell's Avenue Vol. 3 Wendy Magazine 1995/4 CD
-Bible Master 2: Aglia no Jashin Glodia 1995/1 SET(CD+FD)
Bird Land no Komoriuta Inter Limited Logic 1994/12 CD
Birdy Soft Best Characters Birdy Soft 1995/4 CD
Bohemia no Inori Fujitsu 1993/5 CD
@@ -99,7 +98,6 @@ Daijirin CD-ROM Fujitsu
Daisenkai CD-ROM Fujitsu 1993/11 CD
Debut Shimasu… 3 Ilis Plan 1995/2 CD
Demon City Cocktail Soft 1994/3 CD
-Demonstration CD-ROM '90 Fuyu-gou Fujitsu 1990/11 SET(CD+FD)
Demonstration CD-ROM '90 Haru-gou Fujitsu 1990/3 CD
Demonstration CD-ROM '90 Natsu-gou Fujitsu 1990/7 CD
Demonstration CD-ROM '91 Fuyu-gou Fujitsu 1991/11 CD×01
@@ -176,7 +174,6 @@ Euphony 2 / SCORE V1.1 Fujitsu
Eye of the Beholder 3 Ving 1994/11 CD
Fancy Illust: Hattori Yuki no Wakuwaku Cut-shuu CSK Research Institute (CRI) 1990/3 CD
F-BASIC Compiler V1.1 Fujitsu 1990/12 CD
-F-BASIC386 Compiler V2.1 Fujitsu 1994/9 CD
FIRSTHAND ACCESS(Disc1) DynEd Japan 1994/11 SET(CD+FD)
FIRSTHAND ACCESS(Disc2) DynEd Japan 1994/11 SET(CD+FD)
FlexData Collection Vol. 1 Fujitsu 1993/11 CD
@@ -210,10 +207,8 @@ Gendai Yougo no Kiso Chishiki (1992) Fujitsu
Gendai Yougo no Kiso Chishiki (1993) Fujitsu 1993/9 CD
Gendai Yougo no Kiso Chishiki (1994) Fujitsu 1994/9 CD
Ge-Ten 2 Hokusho 1993/? ?
-Ginga Eiyuu Densetsu 2 DX+ Towns Special Bothtec Soft 1992/5 CD
Ginga Uchuu Odyssey 1 Fujitsu 1991/3 CD
-Ginga Uchuu Odyssey 2 Fujitsu 1992/4 CD
-Ginga Uchuu Odyssey 2 Fujitsu 1991/3 CD
+Ginga Uchuu Odyssey 2 (Marty-compatible) Fujitsu 1992/4 CD
Ginga Yuukyou Densetsu Tobakker Ponytail Soft 1995/11 CD
Gomen ne Angel: Yokohama Monogatari JAST 1992/1 ?
Gram Cats 2 Dot Kikaku ? ?
@@ -249,7 +244,7 @@ Hirou Toshiba EMI
HomeSTUDIO V1.1 Fujitsu 1992/12 SET(CD+FD)
Hot de Art na Barcelona Media Art 1991/9 CD
Hyoutan Shima Kouryaku-ki Nihon Dennou Koubou 1994/? ?
-Hyper Address Ver. 2.0 Datt Japan 1991/4 SET(CD+FD)
+* Hyper Address Ver. 2.0 Datt Japan 1991/4 SET(CD+FD)
Hyper Aquarium Kaisui-hen Inter Limited Logic 1992/4 CD
Hyper Aquarium Tansui-hen Inter Limited Logic 1992/1 CD
Hyper Asobi Meijin Corpus 1989/11 SET(CD+FD)
@@ -371,7 +366,6 @@ Maruanki Eitango: Chuugaku 1-nensei CSK Research Insti
Maruanki Eitango: Chuugaku 2-nensei CSK Research Institute (CRI) 1989/12 SET(CD+FD)
Maruanki Eitango: Chuugaku 3-nensei CSK Research Institute (CRI) 1990/2 SET(CD+FD)
Masuo per Masuo: Ikeda Masuo Hanga-shuu Kazadama Vol. 2 Fujitsu 1994/7 CD
-Megamorph Demo Fujitsu ? CD
Meisou Toshi Tiara 1995/12 CD
Microsoft Windows 95 (Upgrade Package) Fujitsu 1996/6 CD
Mietarou V2.0 Uchida Youkou 1992/12 SET(CD+FD)
@@ -481,8 +475,6 @@ Planet Harmony Datt Japan
Pocky 1-2 & Ponyon Ponytail Soft 1994/6 CD
Populous 2 Expert Imagineer 1993/2 CD
Powers of Ten Datt Japan 1995/10 CD
-Presence Orange House 1992/12 ?
-Presence Sur de Wave 1992/12 CD
Present Orange House 1991/6 ?
Primary Health Care System Raison 1990/9 CD
Princess Danger Janis 1996/4 CD
@@ -569,7 +561,6 @@ Speed Eiyou Check Top Business Syste
Speed Eiyou Check (?) Top Business System 1992/4 SET(CD+FD)
Star Wars: Rebel Assault Victor Entertainment 1994/9 CD
Steepia Fujitsu 1993/6 CD
-Steepia Lite Fujitsu 1993/3 CD
Stingo Monogatari ST-1: Stingo to Gohoubi no Ki Technos Yashima 1995/1 CD
Stingo Monogatari ST-2: Stingo no Atarashii Otomodachi Technos Yashima 1995/1 CD
Stingo Monogatari ST-3: Stingo Umi ni Iku Technos Yashima 1995/1 CD
@@ -651,7 +642,6 @@ TownsVNET V1.1 Fujitsu
TownsVNET V1.1 (Reprint?) Fujitsu 1992/1 CD
Towns-you Chuugakkou Gijutsu Kateika Kyouzai Uchida Youkou 1994/3 CD
Treeclub Fujitsu Parex 1995/7 CD
-Trigger 2 ZyX 1995/9 CD
* True Heart Cocktail Soft 1995/2 SET(CD+FD)
Tsubo Relaxation Fujitsu Personal Computer Systems 1994/9 CD
Twinkle Star Studio Twinkle 1993/7 CD
@@ -1572,21 +1562,39 @@ User/save disks that can be created from the game itself are not included.
<!-- Runs too fast -->
<software name="abel" supported="partial">
<!--
- Origin: Neo Kobe Collection
- <rom name="Abel.ccd" size="4674" crc="d29bcd2e" sha1="1198a235c5463ca6ab1ef72bc89e2f307c9bc48f"/>
- <rom name="Abel.cue" size="1219" crc="652022e2" sha1="ba92aea8595294a0ada64d1060bd1a6cd0186056"/>
- <rom name="Abel.img" size="311764656" crc="c90bd8da" sha1="80e7940930b7c6330098e548a1cadd40bff29be9"/>
- <rom name="Abel.sub" size="12725088" crc="63e70daa" sha1="373a0ebfe67c903c61d04fcbb69f21a1bfcfa450"/>
+ Origin: redump.org
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan) (Track 01).bin" size="46282656" crc="2b409ed9" sha1="99a8bd827fcf1f073dd6e34c6428b5a4b19b84c3"/>
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan) (Track 02).bin" size="11289600" crc="3e3ce7a8" sha1="87963fc8093e7a83074b43d8b84d32c70b535c87"/>
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan) (Track 03).bin" size="31752000" crc="56e17ac8" sha1="0721e3e1fa3b9d3979e824e6b3a94b3991deece3"/>
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan) (Track 04).bin" size="4586400" crc="88935dbe" sha1="1d8d4c8ffbbd926c4d665ad40e872dd8f41621e4"/>
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan) (Track 05).bin" size="7585200" crc="c4d68f93" sha1="3a333a8d87accf20e027a6f6c57a7cfa7a5a5f3e"/>
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan) (Track 06).bin" size="9172800" crc="1481806f" sha1="c2ffe1f50789bcea98e41147e8ad0b99eda5679e"/>
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan) (Track 07).bin" size="10936800" crc="cf9298b9" sha1="eec100e9782a78df7600a6871cd1a7303ca5cb18"/>
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan) (Track 08).bin" size="10231200" crc="f69c2c19" sha1="c422e9637a7b4c202d4436268a60f92b3949a768"/>
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan) (Track 09).bin" size="6879600" crc="9ee49eaa" sha1="937f3ef1feb6c72e4a36f5663f7478dfefcbcf40"/>
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan) (Track 10).bin" size="2293200" crc="fb089e38" sha1="4505bb30740d82169111ee1aef99b324c758e7c5"/>
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan) (Track 11).bin" size="6174000" crc="62008e0b" sha1="f7d84dbf5ea882a575ca62d864914ba241cf78d5"/>
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan) (Track 12).bin" size="2293200" crc="76a56ce7" sha1="c9128ca1b117c0f1cbe5f6fd475328e8600d7ec9"/>
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan) (Track 13).bin" size="2998800" crc="f812cf79" sha1="d730e6f1088ae23a7f6569a488b2b88704b6efa3"/>
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan) (Track 14).bin" size="6879600" crc="e4742283" sha1="7a887867f72478efddc868516ba06d64ace201d5"/>
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan) (Track 15).bin" size="7938000" crc="f13f732b" sha1="d831b737c2d8c1c7fb507bb0bee2a348415895cf"/>
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan) (Track 16).bin" size="35103600" crc="43fd1637" sha1="bbf34e341fca45a4f52dd57ea75a90296bb10e48"/>
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan) (Track 17).bin" size="12524400" crc="3255ebfc" sha1="a9f2c39a6bd1f40c294fc961a028959bef6be4e4"/>
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan) (Track 18).bin" size="28753200" crc="edef3e00" sha1="75052b49405bcad1e615a80570b4f8aa39af4603"/>
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan) (Track 19).bin" size="28224000" crc="1c0c3134" sha1="41654c1e6c17d19801606a5935e94b30bc655c91"/>
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan) (Track 20).bin" size="39866400" crc="18ca0163" sha1="63e767f2c7a3b6cd9c0beb154f5d7c380c9abefa"/>
+ <rom name="Abel - Shin Mokushiroku Taisen (Japan).cue" size="2642" crc="14c54499" sha1="a48b636c35f9fb5055de9f0a7a1c333147289122"/>
-->
<description>Abel - Shin Mokushiroku Taisen</description>
<year>1995</year>
<publisher>ファミリーソフト (Family Soft)</publisher>
+ <info name="serial" value="MTC-1137"/>
<info name="alt_title" value="ABEL 真・黙示録大戦" />
<info name="release" value="199511xx" />
<info name="usage" value="Requires 4 MB RAM"/>
<part name="cdrom" interface="fmt_cdrom">
<diskarea name="cdrom">
- <disk name="abel" sha1="5fb92a84f3d1e7530b6dce9060f9814ec2fa6d2b" />
+ <disk name="abel - shin mokushiroku taisen (japan)" sha1="d4a49a59b582c870bb3ab843ffc3685c29efef86" />
</diskarea>
</part>
</software>
@@ -3074,11 +3082,42 @@ User/save disks that can be created from the game itself are not included.
<software name="bestplay">
<!--
- Origin: Neo Kobe Collection
- <rom name="The Best Play Baseball.ccd" size="7024" crc="a7c14c1b" sha1="fa2f8745e64212605558ec88553cd3c4498f69cd"/>
- <rom name="The Best Play Baseball.cue" size="1398" crc="0eccef35" sha1="28f5fc0b247679c38833d44ec2e02e95b2bd9b78"/>
- <rom name="The Best Play Baseball.img" size="361443600" crc="5e3c3844" sha1="23e6cf7890b1fb294c1b77538578cbb4ab80e724"/>
- <rom name="The Best Play Baseball.sub" size="14752800" crc="d901ca38" sha1="52e4e17b20893997070ce55a90cf7878013e1b05"/>
+ Origin: redump.org
+ <rom name="Best Play Baseball, The (Japan) (Track 01).bin" size="10231200" crc="91560cb7" sha1="243b93cc60d7a16b9ebcce5ea360ce092420c57e"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 02).bin" size="13759200" crc="afd66194" sha1="df5fa530bfe4b3f92b7891fd3bd306ac61c6a762"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 03).bin" size="12700800" crc="b4e68027" sha1="fcdf4f830e9ad9e2a7af28fa80f93f899adb0910"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 04).bin" size="13230000" crc="4461b313" sha1="cc1b226fceb7ac9f2f81f7b7902d766afcb1c07f"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 05).bin" size="14112000" crc="8d007657" sha1="5cf0122db802d7fb99f7cd32fd236aaca75756a3"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 06).bin" size="15170400" crc="8f706068" sha1="d0a2e2e3965fa32b199e15aed5c3c29d7fa33ec4"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 07).bin" size="12171600" crc="6a9b9e9f" sha1="b63635d8c561d352374a875da4bf00222d38884c"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 08).bin" size="2469600" crc="2bf0b244" sha1="00a48419cdde0baf3d208d29d315ca7a843c743a"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 09).bin" size="13759200" crc="d7433ce4" sha1="bd3fc3eac19834002a89ef9a204d73cbea6ca6ab"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 10).bin" size="11995200" crc="419b73a6" sha1="f922d6ada9220d5ae5eb4a2456b90b167bbd3738"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 11).bin" size="13759200" crc="2664ee50" sha1="0ad9e1f6b9162097494ca4bb8c55217749b83b82"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 12).bin" size="12877200" crc="5f0273c5" sha1="485ac92ba309bde04c03fb307dc02a1567f807dd"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 13).bin" size="12700800" crc="3a6751fa" sha1="28973b3b942aa09e70be634fd7f317bc804451ec"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 14).bin" size="12700800" crc="91ac360b" sha1="ed520d8dd619cc6a748a7d11e8e2ac3b265e11dd"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 15).bin" size="2469600" crc="48895b25" sha1="2997c35232aa3d48f0126644aa2eb42a4184623e"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 16).bin" size="3528000" crc="18eaf607" sha1="4a868b9813b6b58465a6109bd9bcfbd41726ed82"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 17).bin" size="11289600" crc="098a2787" sha1="6ba5653f1e86a4d66967aff15350a06b96013785"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 18).bin" size="1587600" crc="ed558a55" sha1="c574c0872fe5a4e4ae3ee76d4439508cd26f777a"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 19).bin" size="1411200" crc="fd67d8f6" sha1="022cadf01c41e7e9a5d578bfd71636f74a30ea1b"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 20).bin" size="5644800" crc="377c4763" sha1="2d85d471a804ab96650a5bd97b69a29c8ad89fda"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 21).bin" size="5115600" crc="69206535" sha1="8efb4c3ec86bc79d9526eba095e98e3a2aa21635"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 22).bin" size="5997600" crc="8546bc50" sha1="17a82a81f7e16b09c42b3d5402860facd1e8e8ce"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 23).bin" size="1234800" crc="3e69c0fc" sha1="0576f5d52a49b152619ba0797859edb0601950ef"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 24).bin" size="1058400" crc="77e0f748" sha1="a4b71b6cea2e62a1bb3ac50293f24f6bd73dd520"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 25).bin" size="705600" crc="4682a764" sha1="323dc66c4ba997e0ca0bd455fc5875fbb3c1ad5c"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 26).bin" size="16581600" crc="a419c0a9" sha1="34126c7e7f1af6510e67143c26c06fa8c8120e4b"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 27).bin" size="2998800" crc="661678cc" sha1="2ebdadc0acfec73b6bc02be08c10bf10191f0aad"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 28).bin" size="2998800" crc="b179d97d" sha1="1fbfdc4edc3fb3c8451f555b77a4efefd581c046"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 29).bin" size="32634000" crc="578b347f" sha1="a17b509ae24488a86da48ec3d05ebee0350ed5bf"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 30).bin" size="2998800" crc="f0695add" sha1="fd8e464ed6a31f73b79b43d391711127ab765e7b"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 31).bin" size="2998800" crc="0988d340" sha1="1ba6e3f7601dc4a001aae588a6f10b750b5f2715"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 32).bin" size="29635200" crc="c02b289f" sha1="7472b91df20972d685af1e8874fd43f618c68c22"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 33).bin" size="26283600" crc="ce4373f3" sha1="5179e20bd306cb1f03a2f469b061318de453fca3"/>
+ <rom name="Best Play Baseball, The (Japan) (Track 34).bin" size="32634000" crc="c4a57ff3" sha1="1b024b083d172e70f79ed1f97c37e53b0a0b98ae"/>
+ <rom name="Best Play Baseball, The (Japan).cue" size="4266" crc="e15e2c5b" sha1="016e0051dd5cb9202d3fef7532ad73ccbd046bc2"/>
-->
<description>The Best Play Baseball</description>
<year>1992</year>
@@ -3089,7 +3128,7 @@ User/save disks that can be created from the game itself are not included.
<info name="usage" value="Requires 2 MB RAM"/>
<part name="cdrom" interface="fmt_cdrom">
<diskarea name="cdrom">
- <disk name="the best play baseball" sha1="11bdce513c48010b272988525ae458ec60c743f6" />
+ <disk name="best play baseball, the (japan)" sha1="3edac55a3610917496413e93315180ff4a71e8de" />
</diskarea>
</part>
</software>
@@ -3795,22 +3834,20 @@ User/save disks that can be created from the game itself are not included.
<!-- Hangs at name entry -->
<software name="cyberia" supported="no">
<!--
- Origin: Neo Kobe Collection
- <rom name="Cyberia.ccd" size="772" crc="a4dc53ce" sha1="bf2f85696f9485834d782b6360a2824d9a2f30c3"/>
- <rom name="Cyberia.cue" size="71" crc="5e540616" sha1="afc016200571e9e64cc5e5572d45a91e49275e4f"/>
- <rom name="Cyberia.img" size="354987360" crc="b48e66ef" sha1="d5e3499d0e69e20a56b4ba4eb73e1215fa8daf93"/>
- <rom name="Cyberia.sub" size="14489280" crc="94614ce5" sha1="ed6fe229ce847b5ffee463d0523cce7430934fac"/>
+ Origin: redump.org
+ <rom name="Cyberia (Japan).bin" size="354987360" crc="b48e66ef" sha1="d5e3499d0e69e20a56b4ba4eb73e1215fa8daf93"/>
+ <rom name="Cyberia (Japan).cue" size="81" crc="279db853" sha1="a263c8b34829f255be6e54f78f8722d32e482f98"/>
-->
<description>Cyberia</description>
<year>1995</year>
<publisher>富士通 (Fujitsu)</publisher>
- <info name="serial" value="HMF-205"/>
+ <info name="serial" value="HMF-205 / A2760620 / TSC530"/>
<info name="alt_title" value="サイベリア" />
<info name="release" value="199505xx" />
<info name="usage" value="Requires HDD installation and 4 MB RAM"/>
<part name="cdrom" interface="fmt_cdrom">
<diskarea name="cdrom">
- <disk name="cyberia" sha1="9b6100154ebe61fe19e17b01a2f037310448a72a" />
+ <disk name="cyberia (japan)" sha1="27ae2fa1cec90c103e05e2ea7101cd828f630f1e" />
</diskarea>
</part>
</software>
@@ -4081,42 +4118,46 @@ User/save disks that can be created from the game itself are not included.
<software name="deadforc">
<!--
- Origin: Neo Kobe Collection
- <rom name="Dead Force.ccd" size="769" crc="a25e1c7b" sha1="f3c2cfc0eb3cf2c238004c26a65f39556c8f259b"/>
- <rom name="Dead Force.cue" size="74" crc="ddf34745" sha1="cae2f3f77b5b925990c3c7e1f621071a617ec727"/>
- <rom name="Dead Force.img" size="5743584" crc="5056aeba" sha1="410f9ce5332deb402a803582e6a672b2615a454a"/>
- <rom name="Dead Force.sub" size="234432" crc="c986024e" sha1="4b6e8f61900ac1daa7a6396537328204f721133e"/>
+ Origin: redump.org
+ <rom name="Shinseki Kouboushi - Dead Force (Japan).bin" size="5743584" crc="5056aeba" sha1="410f9ce5332deb402a803582e6a672b2615a454a"/>
+ <rom name="Shinseki Kouboushi - Dead Force (Japan).cue" size="128" crc="8a4ce91b" sha1="0fdb1378aaba7ca5e628e71839b512016c83428e"/>
-->
- <description>Dead Force</description>
+ <description>Shinseiki Kouboushi - Dead Force</description>
<year>1995</year>
<publisher>風雅システム (Fuga System)</publisher>
- <info name="alt_title" value="デッドフォース" />
+ <info name="alt_title" value="新世紀興亡史 デッド・フォース" />
<info name="release" value="199506xx" />
<part name="cdrom" interface="fmt_cdrom">
<diskarea name="cdrom">
- <disk name="dead force" sha1="737a16b6676808c759130ee78ecad3ca95a9d061" />
+ <disk name="shinseiki kouboushi - dead force (japan)" sha1="163b64c730ffb2c1c7d7d48b042e76cec1a4591a" />
</diskarea>
</part>
</software>
<software name="deadbrn">
<!--
- Origin: Neo Kobe Collection
- <rom name="Dead of the Brain.ccd" size="2272" crc="854e9efe" sha1="7d4be4e3ddd2810c532c88c623c5428e843550a7"/>
- <rom name="Dead of the Brain.cue" size="393" crc="dabb161d" sha1="d39536bb98bdb79d68a5ba3cca1ec86326fd2957"/>
- <rom name="Dead of the Brain.img" size="245901600" crc="c4da98d1" sha1="07bbe1a05e3cfaee9e6f0c4a6e3ba6d6ca9c19ff"/>
- <rom name="Dead of the Brain.sub" size="10036800" crc="d62fbdc9" sha1="1718da7da07e68d650bd345b98deed7c0d919361"/>
+ Origin: redump.org
+ <rom name="Nightmare Collection - Dead of the Brain - Shiryou no Sakebi (Japan) (Track 1).bin" size="10231200" crc="6b477157" sha1="0620e99ebe997d42a85a4e92626e75b92bbbb2e5"/>
+ <rom name="Nightmare Collection - Dead of the Brain - Shiryou no Sakebi (Japan) (Track 2).bin" size="23990400" crc="6bc542fe" sha1="75efa1b4da85db46f4054d18759c9173ec520df0"/>
+ <rom name="Nightmare Collection - Dead of the Brain - Shiryou no Sakebi (Japan) (Track 3).bin" size="41806800" crc="77581570" sha1="1e19a9638fba85a98716d556aee79ff4db903149"/>
+ <rom name="Nightmare Collection - Dead of the Brain - Shiryou no Sakebi (Japan) (Track 4).bin" size="31752000" crc="b6832839" sha1="87247491ca459a702237a8329d038e3722833d8f"/>
+ <rom name="Nightmare Collection - Dead of the Brain - Shiryou no Sakebi (Japan) (Track 5).bin" size="28047600" crc="46accecb" sha1="3866cd6328fc79c0468154c4d2534d35b0294b7a"/>
+ <rom name="Nightmare Collection - Dead of the Brain - Shiryou no Sakebi (Japan) (Track 6).bin" size="21697200" crc="38f29371" sha1="ad62526e42e3c44c90c7d45d68ba2dd8abb17b12"/>
+ <rom name="Nightmare Collection - Dead of the Brain - Shiryou no Sakebi (Japan) (Track 7).bin" size="22932000" crc="043fd42d" sha1="9255a7d1e2d3f4902c4c8e1c8955b299acd2abda"/>
+ <rom name="Nightmare Collection - Dead of the Brain - Shiryou no Sakebi (Japan) (Track 8).bin" size="48510000" crc="c6d161f7" sha1="bee884785db8e0f0f23b495f4e6b113042f1b911"/>
+ <rom name="Nightmare Collection - Dead of the Brain - Shiryou no Sakebi (Japan) (Track 9).bin" size="16934400" crc="457b1412" sha1="482ea6f47e67d2c95d99af4a585e5fe9653a2267"/>
+ <rom name="Nightmare Collection - Dead of the Brain - Shiryou no Sakebi (Japan).cue" size="1440" crc="68454269" sha1="e97ae1c195c68a5bd59942138fada3dce73b0255"/>
-->
- <description>Dead of the Brain</description>
+ <description>Dead of the Brain - Shiryou no Sakebi</description>
<year>1993</year>
<publisher>フェアリーテール (Fairytale)</publisher>
- <info name="serial" value="HME-102"/>
- <info name="alt_title" value="デッド・オブ・ザ・ブレイン" />
+ <info name="serial" value="HME-102 / IDES-004"/>
+ <info name="alt_title" value="デッド・オブ・ザ・ブレイン 死霊の叫び" />
<info name="release" value="199302xx" />
<info name="usage" value="Requires 2 MB RAM"/>
<part name="cdrom" interface="fmt_cdrom">
<diskarea name="cdrom">
- <disk name="dead of the brain" sha1="c8493803f60156504f69d8003624f4caf98831b6" />
+ <disk name="nightmare collection - dead of the brain - shiryou no sakebi (japan)" sha1="b1f04b77c641b343b74e82ceb9982aa5ed3726e5" />
</diskarea>
</part>
</software>
@@ -4197,6 +4238,38 @@ User/save disks that can be created from the game itself are not included.
</part>
</software>
+ <software name="demo90f">
+ <!--
+ Origin: redump.org / wiggy2k
+ <rom name="FM Towns Demonstration CD-ROM '90. Fuyu - The Galaxy of FM Towns (Japan) (Track 1).bin" size="11936400" crc="20b01635" sha1="932231a4ff9859c67e8d5047ad1f247f9192d79f"/>
+ <rom name="FM Towns Demonstration CD-ROM '90. Fuyu - The Galaxy of FM Towns (Japan) (Track 2).bin" size="27523104" crc="bac98b74" sha1="3889d773fc70a8bb527a7f9d24e1fb78742b69c9"/>
+ <rom name="FM Towns Demonstration CD-ROM '90. Fuyu - The Galaxy of FM Towns (Japan) (Track 3).bin" size="24072720" crc="b5bd2a96" sha1="f678c9b204008b2d1d9cdebb3a99ea3911e5c49a"/>
+ <rom name="FM Towns Demonstration CD-ROM '90. Fuyu - The Galaxy of FM Towns (Japan) (Track 4).bin" size="18470256" crc="8d4c9b7c" sha1="7625531f63928035452f5e6f6b497d7f98888e07"/>
+ <rom name="FM Towns Demonstration CD-ROM '90. Fuyu - The Galaxy of FM Towns (Japan) (Track 5).bin" size="24613680" crc="b0676441" sha1="af9c5e247f56a6fd89d2f9df5aa50202e364de1c"/>
+ <rom name="FM Towns Demonstration CD-ROM '90. Fuyu - The Galaxy of FM Towns (Japan) (Track 6).bin" size="21685440" crc="6c38f7a0" sha1="a04b1b7e23a71566b8024ad9a25dd44303c1888d"/>
+ <rom name="FM Towns Demonstration CD-ROM '90. Fuyu - The Galaxy of FM Towns (Japan) (Track 7).bin" size="17404800" crc="b64dc05b" sha1="62c8bf8cea30969ad91a0488f7cf3a1b88411dde"/>
+ <rom name="FM Towns Demonstration CD-ROM '90. Fuyu - The Galaxy of FM Towns (Japan).cue" size="1144" crc="63c8e586" sha1="0ba06739ec59155646ca44b6cc98b7a9988ba60f"/>
+ -->
+ <description>FM Towns Demonstration CD-ROM '90. Fuyu - The Galaxy of FM Towns</description>
+ <year>1990</year>
+ <publisher>富士通 (Fujitsu)</publisher>
+ <info name="serial" value="HMB-214"/>
+ <info name="alt_title" value="FM TOWNS デモンストレーションCD‐ROM ’90.冬" />
+ <info name="release" value="199011xx" />
+ <info name="usage" value="Requires 2 MB RAM"/>
+ <part name="flop1" interface="floppy_3_5">
+ <feature name="part_id" value="Floppy 0" />
+ <dataarea name="flop" size="1261568">
+ <rom name="fm towns demonstration cd-rom '90. fuyu - the galaxy of fm towns (japan) (floppy 0).hdm" size="1261568" crc="256383c4" sha1="1f65a0b58e04ad1c4eb7c5be4bf456defd734c0b" offset="000000" />
+ </dataarea>
+ </part>
+ <part name="cdrom" interface="fmt_cdrom">
+ <diskarea name="cdrom">
+ <disk name="fm towns demonstration cd-rom '90. fuyu - the galaxy of fm towns (japan)" sha1="439713d53fa02b815dfd4e15f0fbab8d1245d8a2" />
+ </diskarea>
+ </part>
+ </software>
+
<software name="denurse">
<!--
Origin: Neo Kobe Collection
@@ -4628,30 +4701,33 @@ User/save disks that can be created from the game itself are not included.
<software name="draghalf">
<!--
- Origin: Neo Kobe Collection
- <rom name="Dragon Half.ccd" size="1399" crc="b056d56f" sha1="946db286305ced1214dba79376c67dcbec163147"/>
- <rom name="Dragon Half.cue" size="372" crc="7d26b4f1" sha1="036bc530b7184909888ca1918b626b8d0b40242f"/>
- <rom name="Dragon Half.img" size="178573248" crc="0b650cc5" sha1="8510c56fe191a6fae2f3bc79dd92fa321d8f7299"/>
- <rom name="Dragon Half.sub" size="7288704" crc="35aa9ad6" sha1="4266a770d295948e10bf63b3bd0f79d746cece2b"/>
+ Origin: redump.org
+ <rom name="Dragon Half (Japan) (Track 1).bin" size="9102240" crc="ab4255e1" sha1="b1245cfd677d9f081bbc62b27ebd9586a75219ee"/>
+ <rom name="Dragon Half (Japan) (Track 2).bin" size="5404896" crc="f1a7b5b3" sha1="919e1c44dae3e006319ab75c0654d7a0741ab77d"/>
+ <rom name="Dragon Half (Japan) (Track 3).bin" size="13091232" crc="b80b78fa" sha1="d27e2d4af78448a6e2dfa95336de7e0eabc2c8ab"/>
+ <rom name="Dragon Half (Japan) (Track 4).bin" size="77164416" crc="25af41c3" sha1="81cb5ac8bdcae7d3cb226db2b1f234e76470f058"/>
+ <rom name="Dragon Half (Japan) (Track 5).bin" size="73810464" crc="656d8616" sha1="b0060120b84795301df0f8cf701e8e843e2ae356"/>
+ <rom name="Dragon Half (Japan).cue" size="570" crc="8f8b9ed8" sha1="3e8764e87c4daec53b37cb2fd3251a7efc9bbdc2"/>
-->
<description>Dragon Half</description>
<year>1994</year>
<publisher>マイクロキャビン (Micro Cabin)</publisher>
+ <info name="serial" value="MTC-1086"/>
<info name="alt_title" value="ドラゴンハーフ" />
<info name="release" value="199404xx" />
<info name="usage" value="Requires 2 MB RAM"/>
<part name="cdrom" interface="fmt_cdrom">
<diskarea name="cdrom">
- <disk name="dragon half" sha1="390d5edd522faaeeda42237ced0856adbb0387ed" />
+ <disk name="dragon half (japan)" sha1="d772fa9f6b648b71a7db0261b1b131c70bf5a954" />
</diskarea>
</part>
</software>
<software name="dknight3">
<!--
- Origin: Neo Kobe Collection
- <rom name="Dragon Knight III.bin" size="12700800" crc="e0390649" sha1="8517065fd9dd2bb6a4bebdffad145626b085b6c1"/>
- <rom name="Dragon Knight III.cue" size="83" crc="6a590cab" sha1="2bd3908ae81aaa5556d1817ef6dd60212a8b856e"/>
+ Origin: redump.org
+ <rom name="Dragon Knight III (Japan).bin" size="12700800" crc="e0390649" sha1="8517065fd9dd2bb6a4bebdffad145626b085b6c1"/>
+ <rom name="Dragon Knight III (Japan).cue" size="114" crc="ca9f00a9" sha1="38f92b3649572f09006641d7edc76629500df8f2"/>
-->
<description>Dragon Knight III</description>
<year>1992</year>
@@ -4662,7 +4738,7 @@ User/save disks that can be created from the game itself are not included.
<info name="usage" value="Requires 2 MB RAM"/>
<part name="cdrom" interface="fmt_cdrom">
<diskarea name="cdrom">
- <disk name="dragon knight iii" sha1="7f1d23ee707023d5058fda1c958c80fb45677489" />
+ <disk name="dragon knight iii (japan)" sha1="536e7ce3481098703e6544371f6bbaf060bd04b0" />
</diskarea>
</part>
</software>
@@ -5059,22 +5135,36 @@ User/save disks that can be created from the game itself are not included.
<software name="elmknigt">
<!--
- Origin: Neo Kobe Collection
- <rom name="Elm Knight.ccd" size="3285" crc="bd4bf3a0" sha1="3f0af5d3b0d9c8a0950fe62f9ca260d8c05473e6"/>
- <rom name="Elm Knight.cue" size="1139" crc="da81c07b" sha1="9044bd3a0267720dccd03054a74d4f146a6ab275"/>
- <rom name="Elm Knight.img" size="504504000" crc="585630e6" sha1="14220511daa03d2f06df2336d0559de7c1686fb7"/>
- <rom name="Elm Knight.sub" size="20592000" crc="97e181cd" sha1="be2b903d21937d303462a0b42f42408acb89f942"/>
+ Origin: redump.org
+ <rom name="Living Body Armor, A - Elm Knight (Japan) (Track 01).bin" size="20815200" crc="b29982af" sha1="30116963214223e0d92797fd536dbbde5a6ffadc"/>
+ <rom name="Living Body Armor, A - Elm Knight (Japan) (Track 02).bin" size="27871200" crc="d28d18b5" sha1="00fe2e1e9cf9cbd1d80592278ad18e946c57aa50"/>
+ <rom name="Living Body Armor, A - Elm Knight (Japan) (Track 03).bin" size="29635200" crc="a1450d21" sha1="ffbe8d2bbfa53281c8753c61b9e3eb64ea370a5b"/>
+ <rom name="Living Body Armor, A - Elm Knight (Japan) (Track 04).bin" size="28400400" crc="42b7e15c" sha1="9f180f474d152e008724da672e6729266325f467"/>
+ <rom name="Living Body Armor, A - Elm Knight (Japan) (Track 05).bin" size="20638800" crc="e205f1dd" sha1="ddada4bc81da627a61b4d85a74e5d2375450f2fa"/>
+ <rom name="Living Body Armor, A - Elm Knight (Japan) (Track 06).bin" size="33516000" crc="492e5f7e" sha1="656c3efe1673a2ddfea4569800254d0625322c50"/>
+ <rom name="Living Body Armor, A - Elm Knight (Japan) (Track 07).bin" size="28400400" crc="27b746c5" sha1="66963c9a4843560f3a3617a15697fbd95275308a"/>
+ <rom name="Living Body Armor, A - Elm Knight (Japan) (Track 08).bin" size="31752000" crc="81831841" sha1="e7cd43e5737deb54e3451461578cd0157975a27c"/>
+ <rom name="Living Body Armor, A - Elm Knight (Japan) (Track 09).bin" size="34398000" crc="28eda659" sha1="1f25537dd63322dc9459c1adb2f0489605f01a5f"/>
+ <rom name="Living Body Armor, A - Elm Knight (Japan) (Track 10).bin" size="40572000" crc="76120e0c" sha1="a6305e017ddeca6c0a0464c7ef31325fa03a09d1"/>
+ <rom name="Living Body Armor, A - Elm Knight (Japan) (Track 11).bin" size="46393200" crc="6f2429a0" sha1="cf8f68fcb2e602a2e5227e112337dd878c8c6321"/>
+ <rom name="Living Body Armor, A - Elm Knight (Japan) (Track 12).bin" size="23461200" crc="064992ce" sha1="4d1a0b51472415d36a69eb8f3a0042530cca6f58"/>
+ <rom name="Living Body Armor, A - Elm Knight (Japan) (Track 13).bin" size="19933200" crc="49a45076" sha1="cbcb2a10ee56690c71d967b1380de8fefdba04cb"/>
+ <rom name="Living Body Armor, A - Elm Knight (Japan) (Track 14).bin" size="23814000" crc="e38285f3" sha1="a2416b64a7fc533a5e1611b5b6ec9fdc7b12d81b"/>
+ <rom name="Living Body Armor, A - Elm Knight (Japan) (Track 15).bin" size="27694800" crc="069dc5b7" sha1="499f40f63aa20b49cc064bf624ed82091c80f313"/>
+ <rom name="Living Body Armor, A - Elm Knight (Japan) (Track 16).bin" size="24166800" crc="cc16db1e" sha1="0f0c3fd2815a67f359c5fa9dd816d3ca98de306b"/>
+ <rom name="Living Body Armor, A - Elm Knight (Japan) (Track 17).bin" size="43041600" crc="5e0f2566" sha1="4365360af2b1d6a0fd1a4e09d10dc6319b8d5500"/>
+ <rom name="Living Body Armor, A - Elm Knight (Japan).cue" size="2317" crc="4e2081b7" sha1="e395b035c6ae9aec348dea9f11b126a7fc43a7ca"/>
-->
<description>Elm Knight - A Living Body Armor</description>
<year>1992</year>
<publisher>マイクロキャビン (Micro Cabin)</publisher>
- <info name="serial" value="HMD-198"/>
+ <info name="serial" value="HMD-198 / MTC-1027"/>
<info name="alt_title" value="エルムナイト" />
<info name="release" value="199211xx" />
<info name="usage" value="Requires 2 MB RAM"/>
<part name="cdrom" interface="fmt_cdrom">
<diskarea name="cdrom">
- <disk name="elm knight" sha1="98ff3cc7c954c1aa98b3c966d420bc72cb7fb423" />
+ <disk name="living body armor, a - elm knight (japan)" sha1="1de311fea7d4f173d5660c2530c585f05f83f6ef" />
</diskarea>
</part>
</software>
@@ -5649,6 +5739,36 @@ User/save disks that can be created from the game itself are not included.
</part>
</software>
+ <software name="fbc2110">
+ <!--
+ Origin: redump.org
+ <rom name="F-BASIC386 Compiler V2.1L10 (Japan) (Track 01).bin" size="263894400" crc="99dd7303" sha1="c15a4e81a7bccb6daf6fee1caa1dcb888644668f"/>
+ <rom name="F-BASIC386 Compiler V2.1L10 (Japan) (Track 02).bin" size="41729184" crc="dfdf5c43" sha1="07c632f89506d3a543ea3fcbfa22a49bd43961ee"/>
+ <rom name="F-BASIC386 Compiler V2.1L10 (Japan) (Track 03).bin" size="15059856" crc="cb66c765" sha1="628f7b773a50a0b9b9011dc8602d8e12436da3fa"/>
+ <rom name="F-BASIC386 Compiler V2.1L10 (Japan) (Track 04).bin" size="24166800" crc="bd9213bc" sha1="006c5fcd90adff06b677b98017c4a69ef464b6de"/>
+ <rom name="F-BASIC386 Compiler V2.1L10 (Japan) (Track 05).bin" size="37330944" crc="5debd853" sha1="23d9e5395780a406cfe3e20210d553d1cf0f7064"/>
+ <rom name="F-BASIC386 Compiler V2.1L10 (Japan) (Track 06).bin" size="9085776" crc="5e39e97a" sha1="72c227ba97d353aefba2431ac8a93c3b4915bebd"/>
+ <rom name="F-BASIC386 Compiler V2.1L10 (Japan) (Track 07).bin" size="5491920" crc="5500d74a" sha1="7274dbf63d2db90579f79f1fadb8a6a7977ae76d"/>
+ <rom name="F-BASIC386 Compiler V2.1L10 (Japan) (Track 08).bin" size="5120304" crc="34a73d87" sha1="2a1cc41bf6b7f528efd77e38b539ea3f5e305780"/>
+ <rom name="F-BASIC386 Compiler V2.1L10 (Japan) (Track 09).bin" size="9478560" crc="547491a0" sha1="acaa5f1933d0cd48f9270520092110d13ae3a80b"/>
+ <rom name="F-BASIC386 Compiler V2.1L10 (Japan) (Track 10).bin" size="4793376" crc="e20371ea" sha1="55af96c06a9dad5c0d77caa8eb8705d3f90cb945"/>
+ <rom name="F-BASIC386 Compiler V2.1L10 (Japan) (Track 11).bin" size="16793280" crc="173b15bf" sha1="743c367f69136fb6e84c459dbce4d66cae7ca2ea"/>
+ <rom name="F-BASIC386 Compiler V2.1L10 (Japan) (Track 12).bin" size="34720224" crc="b51a094d" sha1="bd08476b38823cefc6aa5edcaa07c42ebc889fa5"/>
+ <rom name="F-BASIC386 Compiler V2.1L10 (Japan) (Track 13).bin" size="20963376" crc="7cd41bcc" sha1="1d4334ea7e792d8186972bce90357a4a0055008d"/>
+ <rom name="F-BASIC386 Compiler V2.1L10 (Japan).cue" size="1695" crc="8057d590" sha1="cf0462eea9104661fdaff41f72ea5a3fbb92b18b"/>
+ -->
+ <description>F-BASIC386 Compiler v2.1 L10</description>
+ <year>1992</year>
+ <publisher>富士通 (Fujitsu)</publisher>
+ <info name="serial" value="B276C021"/>
+ <info name="usage" value="Requires 2 MB RAM"/>
+ <part name="cdrom" interface="fmt_cdrom">
+ <diskarea name="cdrom">
+ <disk name="f-basic386 compiler v2.1l10 (japan)" sha1="176537f88c83b2182b6e5f016a5c4b871f0cf1eb" />
+ </diskarea>
+ </part>
+ </software>
+
<software name="finalb">
<!--
Origin: redump.org
@@ -6627,6 +6747,40 @@ User/save disks that can be created from the game itself are not included.
</part>
</software>
+ <software name="ginga2dx">
+ <!--
+ Origin: redump.org
+ <rom name="Ginga Eiyuu Densetsu II DX+ Towns Special (Japan) (Track 01).bin" size="10231200" crc="64b1247b" sha1="c3b35ca96ba954f3f220358d7a65ad999f8560c0"/>
+ <rom name="Ginga Eiyuu Densetsu II DX+ Towns Special (Japan) (Track 02).bin" size="50356320" crc="c0db5e43" sha1="a058b9ea87ce9debf51c4e4c5480320f32c57ac3"/>
+ <rom name="Ginga Eiyuu Densetsu II DX+ Towns Special (Japan) (Track 03).bin" size="31552080" crc="1775e87b" sha1="f5953d5233a687b69d54c436649a6cfc4be49dc1"/>
+ <rom name="Ginga Eiyuu Densetsu II DX+ Towns Special (Japan) (Track 04).bin" size="45080784" crc="d61b0803" sha1="10fd19d62e713d1fd21d81ca807f02cc4251c2ca"/>
+ <rom name="Ginga Eiyuu Densetsu II DX+ Towns Special (Japan) (Track 05).bin" size="33786480" crc="49539fee" sha1="c28eccf2927ad03a698b9b6991bc710aaf5b7478"/>
+ <rom name="Ginga Eiyuu Densetsu II DX+ Towns Special (Japan) (Track 06).bin" size="37349760" crc="7ec37ee2" sha1="17030d9247223f0d13fb9787448181d656542497"/>
+ <rom name="Ginga Eiyuu Densetsu II DX+ Towns Special (Japan) (Track 07).bin" size="24296160" crc="05a3331a" sha1="47a581936409b22a145a66153dd271df030ce270"/>
+ <rom name="Ginga Eiyuu Densetsu II DX+ Towns Special (Japan) (Track 08).bin" size="27553680" crc="d9051f98" sha1="e6b002a54758622015f7b7b3e0281b34a01d9689"/>
+ <rom name="Ginga Eiyuu Densetsu II DX+ Towns Special (Japan) (Track 09).bin" size="21450240" crc="7027f1c1" sha1="eff40189ed417a3d2522b89aba0c55c65aedb5a0"/>
+ <rom name="Ginga Eiyuu Densetsu II DX+ Towns Special (Japan) (Track 10).bin" size="27266736" crc="5deac1bb" sha1="68f2cc9cae0c8735fff41f8812d15a65d2c410db"/>
+ <rom name="Ginga Eiyuu Densetsu II DX+ Towns Special (Japan) (Track 11).bin" size="23548224" crc="43d921be" sha1="b13727aeeb8ae3353325dc506189199afaa292b8"/>
+ <rom name="Ginga Eiyuu Densetsu II DX+ Towns Special (Japan) (Track 12).bin" size="24997056" crc="bda08947" sha1="c7fac888cc908187f3b41e51f2b2e8055d690e27"/>
+ <rom name="Ginga Eiyuu Densetsu II DX+ Towns Special (Japan) (Track 13).bin" size="77286720" crc="6e66f966" sha1="d616cc77836602014473b781bca41f4bf7e7f62f"/>
+ <rom name="Ginga Eiyuu Densetsu II DX+ Towns Special (Japan) (Track 14).bin" size="42046704" crc="33e1ed49" sha1="1e522153b5acad7e27fa7abf03123d98c06637d1"/>
+ <rom name="Ginga Eiyuu Densetsu II DX+ Towns Special (Japan) (Track 15).bin" size="1959216" crc="460945bc" sha1="beaeddb63fc5c944fa4811061b3ada14dca7f24f"/>
+ <rom name="Ginga Eiyuu Densetsu II DX+ Towns Special (Japan).cue" size="2142" crc="bbdaec3d" sha1="b81c8e74aba145d7677720e66323add12474e540"/>
+ -->
+ <description>Ginga Eiyuu Densetsu II DX+ Towns Special</description>
+ <year>1992</year>
+ <publisher>ボーステック (Bothtec)</publisher>
+ <info name="serial" value="HMD-136 / QR-9243"/>
+ <info name="alt_title" value="銀河英雄伝説ⅡDX+ TOWNSスペシャル" />
+ <info name="release" value="199205xx" />
+ <info name="usage" value="Requires 2 MB RAM"/>
+ <part name="cdrom" interface="fmt_cdrom">
+ <diskarea name="cdrom">
+ <disk name="ginga eiyuu densetsu ii dx+ towns special (japan)" sha1="873fddaf81e034d22b502811d9b3c181fd436950" />
+ </diskarea>
+ </part>
+ </software>
+
<software name="ginga3sp">
<!--
Origin: redump.org
@@ -6653,6 +6807,27 @@ User/save disks that can be created from the game itself are not included.
</part>
</software>
+ <software name="gingaod2">
+ <!--
+ Origin: redump.org
+ <rom name="NHK Special - Ginga Uchuu Odyssey Vol. 2 - Choushinsei Bakuhatsu (Japan) (Track 1).bin" size="104958000" crc="0b9ed9c8" sha1="1074426139739a4f17670654f7f561c1d1fff1b4"/>
+ <rom name="NHK Special - Ginga Uchuu Odyssey Vol. 2 - Choushinsei Bakuhatsu (Japan) (Track 2).bin" size="486864000" crc="193500ab" sha1="c1bf3a8068acd6f9543c3a36f4b19be2d289986f"/>
+ <rom name="NHK Special - Ginga Uchuu Odyssey Vol. 2 - Choushinsei Bakuhatsu (Japan).cue" size="314" crc="783ac25f" sha1="5fe389e8c6fdb7c9e9b7cb0e0605f85563965925"/>
+ -->
+ <description>NHK Special - Ginga Uchuu Odyssey Vol. 2 - Choushinsei Bakuhatsu</description>
+ <year>1992</year>
+ <publisher>富士通 (Fujitsu)</publisher>
+ <info name="serial" value="A2760151 / TSC240"/>
+ <info name="alt_title" value="NHKスペシャル 銀河宇宙オデッセイ② 「超新星爆発」" />
+ <info name="release" value="199204xx" />
+ <info name="usage" value="Requires 2 MB RAM"/>
+ <part name="cdrom" interface="fmt_cdrom">
+ <diskarea name="cdrom">
+ <disk name="nhk special - ginga uchuu odyssey vol. 2 - choushinsei bakuhatsu (japan)" sha1="d59248d8aea3611c11bf1be77ecb445f96425617" />
+ </diskarea>
+ </part>
+ </software>
+
<software name="goh2">
<!--
Origin: Neo Kobe Collection
@@ -7349,6 +7524,27 @@ User/save disks that can be created from the game itself are not included.
</part>
</software>
+ <!-- Missing a floppy disk -->
+ <software name="hypraddr2" supported="no">
+ <!--
+ Origin: redump.org
+ <rom name="Hyper Address Ver. 2.0 (Japan) (Track 1).bin" size="31399200" crc="7135813e" sha1="939f5c57bd5b7ddd59cc5b834cf1538fd27e2ef5"/>
+ <rom name="Hyper Address Ver. 2.0 (Japan) (Track 2).bin" size="68541984" crc="1006c964" sha1="bfb743d513d7edd99146d635b3f583d8a1ad76dd"/>
+ <rom name="Hyper Address Ver. 2.0 (Japan) (Track 3).bin" size="24185616" crc="0bae0270" sha1="de67643ff528a277b6b68e1a90114318acc1644d"/>
+ <rom name="Hyper Address Ver. 2.0 (Japan).cue" size="354" crc="49bcf89f" sha1="c39c06e0370a6b436e1aa2afa9130f0e824abefe"/>
+ -->
+ <description>Hyper Address Ver. 2.0</description>
+ <year>1991</year>
+ <publisher>ダットジャパン (Datt Japan)</publisher>
+ <info name="serial" value="HMB-220"/>
+ <info name="release" value="199104xx" />
+ <part name="cdrom" interface="fmt_cdrom">
+ <diskarea name="cdrom">
+ <disk name="hyper address ver. 2.0 (japan)" sha1="00755736bab60abc334487e29fd8317332482b21" />
+ </diskarea>
+ </part>
+ </software>
+
<software name="hypchttv">
<!--
Origin: redump.org
@@ -7785,6 +7981,38 @@ User/save disks that can be created from the game itself are not included.
</part>
</software>
+ <software name="indycrusd">
+ <!--
+ Origin: redump.org
+ <rom name="Indiana Jones and the Last Crusade (Japan) (En,Ja) (Demo) (Track 01).bin" size="20822256" crc="2f7d8d6c" sha1="2ba068440d09626f48c119e3c5fc1584e544206b"/>
+ <rom name="Indiana Jones and the Last Crusade (Japan) (En,Ja) (Demo) (Track 02).bin" size="36688848" crc="27b4fff6" sha1="1ddbbf68d0e847f0542693d15a380f2ac1c00bd1"/>
+ <rom name="Indiana Jones and the Last Crusade (Japan) (En,Ja) (Demo) (Track 03).bin" size="12489120" crc="4203f415" sha1="9c16df4b80d3f448d7f90c2a77b44e4a687fe889"/>
+ <rom name="Indiana Jones and the Last Crusade (Japan) (En,Ja) (Demo) (Track 04).bin" size="20591760" crc="6c9a0625" sha1="15cb7fae3f4cd69608b6e4edd0f88e0c2f19f1bc"/>
+ <rom name="Indiana Jones and the Last Crusade (Japan) (En,Ja) (Demo) (Track 05).bin" size="26010768" crc="98901342" sha1="65ba134a91d42564aa1112e2d2bfc37be9b597c3"/>
+ <rom name="Indiana Jones and the Last Crusade (Japan) (En,Ja) (Demo) (Track 06).bin" size="21438480" crc="48786fc0" sha1="2c99c42fad07301e32124e1405f861a628806a19"/>
+ <rom name="Indiana Jones and the Last Crusade (Japan) (En,Ja) (Demo) (Track 07).bin" size="12606720" crc="0dd7f0ff" sha1="18a8d4d46cfe84bded5f27f04ebf67ec10329a24"/>
+ <rom name="Indiana Jones and the Last Crusade (Japan) (En,Ja) (Demo) (Track 08).bin" size="30608928" crc="eba506d7" sha1="5eda8e752bf39fb1f58270b680afea3499a2782b"/>
+ <rom name="Indiana Jones and the Last Crusade (Japan) (En,Ja) (Demo) (Track 09).bin" size="37272144" crc="e8e43bd5" sha1="4e459b90097917d357e893357e14d850e87772f3"/>
+ <rom name="Indiana Jones and the Last Crusade (Japan) (En,Ja) (Demo) (Track 10).bin" size="27024480" crc="d0da4755" sha1="e9ee9f875e1e14ecd3f45246d2b71e058b61c73f"/>
+ <rom name="Indiana Jones and the Last Crusade (Japan) (En,Ja) (Demo) (Track 11).bin" size="19051200" crc="242553df" sha1="57b0b83b3dd67dbf5611a69237d9f402ebefd24f"/>
+ <rom name="Indiana Jones and the Last Crusade (Japan) (En,Ja) (Demo) (Track 12).bin" size="32149488" crc="42bde95d" sha1="44e4e2e1afadbf3e08b21d3533d2650c6ce74589"/>
+ <rom name="Indiana Jones and the Last Crusade (Japan) (En,Ja) (Demo) (Track 13).bin" size="30893520" crc="2e70f133" sha1="2fadb1f3c1494846d32cc21b158ff37247a345bf"/>
+ <rom name="Indiana Jones and the Last Crusade (Japan) (En,Ja) (Demo) (Track 14).bin" size="6303360" crc="50ed98b1" sha1="8e6bcc8676e54162a0a9aad8d590a17e81a9acbe"/>
+ <rom name="Indiana Jones and the Last Crusade (Japan) (En,Ja) (Demo) (Track 15).bin" size="6903120" crc="482bddb6" sha1="fc14aead3bd8f7e2f555892e1f908bc4af64041b"/>
+ <rom name="Indiana Jones and the Last Crusade (Japan) (En,Ja) (Demo).cue" size="2285" crc="fd98018f" sha1="6402420e2c910d1f62d90312a8cf9e6a047caf22"/>
+ -->
+ <description>Indiana Jones and the Last Crusade (Pre-Release Version)</description>
+ <year>1990</year>
+ <publisher>富士通 (Fujitsu)</publisher>
+ <info name="serial" value="HMB-916"/>
+ <info name="usage" value="Requires 2 MB RAM"/>
+ <part name="cdrom" interface="fmt_cdrom">
+ <diskarea name="cdrom">
+ <disk name="indiana jones and the last crusade (japan) (en,ja) (demo)" sha1="469d1fe1a750ef91efa4423c80cd3efbea22659a" />
+ </diskarea>
+ </part>
+ </software>
+
<software name="indy4">
<!--
Origin: Neo Kobe Collection
@@ -10543,6 +10771,24 @@ User/save disks that can be created from the game itself are not included.
</part>
</software>
+ <software name="mmorphd" supported="no">
+ <!--
+ Origin: redump.org
+ <rom name="MegaMorph (Japan) (Demo).bin" size="73735200" crc="e05bc391" sha1="dbd835be0a52f6f2936ec1711db5f25b0c8ecca1"/>
+ <rom name="MegaMorph (Japan) (Demo).cue" size="90" crc="23936c6b" sha1="fbe2cb706be58fdbcc9d85322f5164a4d1d2081c"/>
+ -->
+ <description>Megamorph (Demo)</description>
+ <year>1994</year>
+ <publisher>富士通 (Fujitsu)</publisher>
+ <info name="serial" value="HMF-921"/>
+ <info name="usage" value="Requires 2 MB RAM"/>
+ <part name="cdrom" interface="fmt_cdrom">
+ <diskarea name="cdrom">
+ <disk name="megamorph (japan) (demo)" sha1="e48d4374ac4b66c5168d6276252151dcdffcd2fa" />
+ </diskarea>
+ </part>
+ </software>
+
<software name="mode7">
<!--
Origin: Neo Kobe Collection
@@ -11659,24 +11905,20 @@ User/save disks that can be created from the game itself are not included.
<software name="ningytsu">
<!--
- Origin: Neo Kobe Collection
- <rom name="Ningyou Tsukai.mdf" size="10648800" crc="29cf6174" sha1="0b85b784f55f2e8484524429e783c73ed3cf4bbe"/>
- <rom name="Ningyou Tsukai.mds" size="486" crc="536f9a49" sha1="086e301d1cf7ed4e7b7d04eb2ae7a636a1fb79e7"/>
-
- *after conversion with IsoBuster+EAC *
- <rom name="ningyou tsukai.bin" size="10231200" crc="24337682" sha1="c1e947259e397f3e7ca1840fd8ac76b217835b96"/>
- <rom name="ningyou tsukai.cue" size="75" crc="a2bb6b88" sha1="3d42988318ee1a6c052c2175242745b08e5b78f8"/>
+ Origin: redump.org
+ <rom name="Ningyou Tsukai (Japan).bin" size="10231200" crc="24337682" sha1="c1e947259e397f3e7ca1840fd8ac76b217835b96"/>
+ <rom name="Ningyou Tsukai (Japan).cue" size="111" crc="4d5625e1" sha1="2b950d5d8ce15d45a9a768e93b877da7bb0ae81f"/>
-->
<description>Ningyou Tsukai</description>
<year>1993</year>
<publisher>フォレスト (Forest)</publisher>
- <info name="serial" value="HME-212"/>
+ <info name="serial" value="HME-212 / MTC-1029"/>
<info name="alt_title" value="人形使い" />
<info name="release" value="199310xx" />
<info name="usage" value="Requires 2 MB RAM"/>
<part name="cdrom" interface="fmt_cdrom">
<diskarea name="cdrom">
- <disk name="ningyou tsukai" sha1="d2e93204d3cc2557f26ee72c07d0ab1109bf5846" />
+ <disk name="ningyou tsukai (japan)" sha1="aac6064bcf6fd1665970017fa59c268ad3044aed" />
</diskarea>
</part>
</software>
@@ -12385,35 +12627,30 @@ User/save disks that can be created from the game itself are not included.
</part>
</software>
- <!--
- It should be possible to recreate the user disk by running the ユーザーディスク作成 program
- on the CD, but it doesn't seem to work. Not sure if it's an emulation issue or
- something else.
-
- The system disk is needed only for installing the game into a hard disk.
- -->
<software name="powdoll">
<!--
- Origin: Neo Kobe Collection
- <rom name="Power Dolls.ccd" size="2663" crc="ab55cc77" sha1="d99f063b36f3a7c0666211d5bcfd4a953f4c4264"/>
- <rom name="Power Dolls.cue" size="467" crc="e7842606" sha1="3ac782b6fdb79c40cc43b2c1ac585bc69081d91d"/>
- <rom name="Power Dolls.img" size="429181200" crc="fd3f758a" sha1="22ec8aa25ad7b2e24769a60545159d98a6fbc590"/>
- <rom name="Power Dolls.sub" size="17517600" crc="6b532f45" sha1="41aae39e4c4d2f616bbdbe534593f35d5d5284c6"/>
- -->
- <description>Power Dolls</description>
+ Origin: redump.org
+ <rom name="Power DoLLS (Japan) (Track 01).bin" size="20815200" crc="995eb06d" sha1="1eb34c59c8cb3d35d17cd389ca8a2904bca0dc2d"/>
+ <rom name="Power DoLLS (Japan) (Track 02).bin" size="68266800" crc="d23eba28" sha1="8cf5ec75f7f83bfb850312f92aeef2c4ccedd138"/>
+ <rom name="Power DoLLS (Japan) (Track 03).bin" size="28753200" crc="8b9a3423" sha1="6ca592b7b6955cedbea1727bd7494e87e0eb694e"/>
+ <rom name="Power DoLLS (Japan) (Track 04).bin" size="34398000" crc="5882602b" sha1="1cb336b1682d8dbc93c5f4edfa0462d2abb37734"/>
+ <rom name="Power DoLLS (Japan) (Track 05).bin" size="47451600" crc="013689e5" sha1="7e2f8faf1f2b89abe7ea8470eb3f4ae068e5ae6a"/>
+ <rom name="Power DoLLS (Japan) (Track 06).bin" size="24696000" crc="0d01424e" sha1="d126267c7b4bb30405278e2001274218449239df"/>
+ <rom name="Power DoLLS (Japan) (Track 07).bin" size="33163200" crc="828cebf2" sha1="9812d1649a03a3f7c0ab73c7d7da38fee6532bac"/>
+ <rom name="Power DoLLS (Japan) (Track 08).bin" size="43923600" crc="3784d20b" sha1="74469704c48ef4c72323123eed6b72af9691cfc0"/>
+ <rom name="Power DoLLS (Japan) (Track 09).bin" size="46569600" crc="88d1d628" sha1="b137a2e68eb6a99d45e67489031b3eb07048b45a"/>
+ <rom name="Power DoLLS (Japan) (Track 10).bin" size="38808000" crc="f27b70b5" sha1="31414c297bffc8fc09600be46c9f7854d1ecb64f"/>
+ <rom name="Power DoLLS (Japan) (Track 11).bin" size="42336000" crc="a689700a" sha1="1d31dcd374dde7eabe1ee8fc4fab8c475a266a4a"/>
+ <rom name="Power DoLLS (Japan).cue" size="1259" crc="77402c57" sha1="1a53f6a68a8ff7d640df632bb8e49797c5a48aa6"/>
+ -->
+ <description>Power DoLLS</description>
<year>1994</year>
<publisher>工画堂 (Kogado)</publisher>
- <info name="serial" value="HMF-151"/>
+ <info name="serial" value="HMF-151 / MTC-1097"/>
<info name="alt_title" value="パワードール" />
<info name="release" value="199407xx" />
- <info name="usage" value="Requires 2 MB RAM"/>
+ <info name="usage" value="Requires 2 MB RAM. The first time running the game, hold both mouse buttons while booting to go to TownsMENU, then run the ユーザーディスク作成 icon to create a bootable user disk."/>
<part name="flop1" interface="floppy_3_5">
- <feature name="part_id" value="User Disk" />
- <dataarea name="flop" size="1261568">
- <rom name="power dolls (user disk).hdm" size="1261568" crc="7b90b036" sha1="8cc2d7cdf2ffde4133cddd039f6620ba17b1e553" offset="000000" />
- </dataarea>
- </part>
- <part name="flop2" interface="floppy_3_5">
<feature name="part_id" value="System Disk" />
<dataarea name="flop" size="1261568">
<rom name="power dolls (system disk).hdm" size="1261568" crc="5f6c44c7" sha1="721dd113dc6bedfb2d212e3a4de15260c41805f7" offset="000000" />
@@ -12421,29 +12658,37 @@ User/save disks that can be created from the game itself are not included.
</part>
<part name="cdrom" interface="fmt_cdrom">
<diskarea name="cdrom">
- <disk name="power dolls" sha1="22c895ef1b29fe4f01b1956d323657fe67a9c832" />
+ <disk name="power dolls (japan)" sha1="879bb700ba35d56112459077e4b44802ead42338" />
</diskarea>
</part>
</software>
<software name="powdoll2">
<!--
- Origin: Neo Kobe Collection
- <rom name="Power Dolls 2.ccd" size="2677" crc="c81560b2" sha1="ace60c9b20a9bb09477bb767d62fad8db3c05f22"/>
- <rom name="Power Dolls 2.cue" size="469" crc="5a2f1ab9" sha1="68867b0c58e456177ab554c3155185696bbd0a5b"/>
- <rom name="Power Dolls 2.img" size="385664496" crc="c3df8690" sha1="f7299ccaf16f4b0c5d69138f8932749aac211015"/>
- <rom name="Power Dolls 2.sub" size="15741408" crc="19698eb9" sha1="c3219d969a89f9e1b00c678fec7a3be845d233d5"/>
- -->
- <description>Power Dolls 2</description>
+ Origin: redump.org
+ <rom name="Power DoLLS 2 (Japan) (Track 01).bin" size="34804896" crc="5e7fdb30" sha1="221012898575070ed5b89e9044aff334a2c3468c"/>
+ <rom name="Power DoLLS 2 (Japan) (Track 02).bin" size="40748400" crc="e7b2896b" sha1="4825386c998e0fbb2363b3a86905e3395fd38968"/>
+ <rom name="Power DoLLS 2 (Japan) (Track 03).bin" size="44100000" crc="ae2504d6" sha1="9313cbf9c0533bb7dd29a3a7a093293f61f22009"/>
+ <rom name="Power DoLLS 2 (Japan) (Track 04).bin" size="34221600" crc="ad12003c" sha1="8f275daa4e6322659388136dae2953145a2323bf"/>
+ <rom name="Power DoLLS 2 (Japan) (Track 05).bin" size="40395600" crc="10f6922d" sha1="6675a6264d503b20983131b6f9c9ad7f87a19d62"/>
+ <rom name="Power DoLLS 2 (Japan) (Track 06).bin" size="34045200" crc="a1596881" sha1="ce47b300cae0146504b7bbb57f7826b2d6f9cf34"/>
+ <rom name="Power DoLLS 2 (Japan) (Track 07).bin" size="24343200" crc="dbadaddf" sha1="9d104674d6afd7fb31078662f9f02d13dfcbd612"/>
+ <rom name="Power DoLLS 2 (Japan) (Track 08).bin" size="26460000" crc="06c51d6b" sha1="7b9f361e725ffdb1a49e17f987534f0baae494e9"/>
+ <rom name="Power DoLLS 2 (Japan) (Track 09).bin" size="35632800" crc="3da8f3c6" sha1="1f0fd7e903d361a53f64332a2159bf8ab9ee7454"/>
+ <rom name="Power DoLLS 2 (Japan) (Track 10).bin" size="31575600" crc="9823a691" sha1="73d199e2c270b0783ce93bd7570a8030602fdd7f"/>
+ <rom name="Power DoLLS 2 (Japan) (Track 11).bin" size="39337200" crc="02a5cce6" sha1="b3f1b7518f46290c6aaf74dd6164147a78a02448"/>
+ <rom name="Power DoLLS 2 (Japan).cue" size="1258" crc="24d953cf" sha1="0ce5efca69c368c48e311d4f061bf2af9dd7cbee"/>
+ -->
+ <description>Power DoLLS 2</description>
<year>1995</year>
<publisher>工画堂 (Kogado)</publisher>
- <info name="serial" value="HMF-152"/>
+ <info name="serial" value="HMF-152 / MTC-1136"/>
<info name="alt_title" value="パワードール2" />
<info name="release" value="199511xx" />
<info name="usage" value="Requires 2 MB RAM"/>
<part name="cdrom" interface="fmt_cdrom">
<diskarea name="cdrom">
- <disk name="power dolls 2" sha1="248ec3f239e8d069490867d437ac0465dbf878b4" />
+ <disk name="power dolls 2 (japan)" sha1="deed55b2d47dc251334c7f5afc1e2bb69718ebff" />
</diskarea>
</part>
</software>
@@ -12523,6 +12768,26 @@ User/save disks that can be created from the game itself are not included.
</part>
</software>
+ <software name="presence">
+ <!--
+ Origin: redump.org
+ <rom name="Presence (Japan) (Track 1).bin" size="52567200" crc="0316ba84" sha1="1cfd93b2f3352429a772be812f5e89b195cacb69"/>
+ <rom name="Presence (Japan) (Track 2).bin" size="23731680" crc="3d96353a" sha1="49e4dfdc72dfe56ced0a98304dc850e12c436154"/>
+ <rom name="Presence (Japan).cue" size="225" crc="134334ca" sha1="6794a75a89615db8f90c25b6053ce468015d7ef0"/>
+ -->
+ <description>Presence</description>
+ <year>1992</year>
+ <publisher>シュールド・ウェーブ (Sur De Wave)</publisher>
+ <info name="serial" value="HMD-204"/>
+ <info name="release" value="199212xx" />
+ <info name="usage" value="Requires 2 MB RAM"/>
+ <part name="cdrom" interface="fmt_cdrom">
+ <diskarea name="cdrom">
+ <disk name="presence (japan)" sha1="2a67dfc67b6b8b93a900bb13d3958a4f95f927b0" />
+ </diskarea>
+ </part>
+ </software>
+
<software name="prostudg">
<!--
Origin: redump.org / wiggy2k
@@ -12702,6 +12967,42 @@ User/save disks that can be created from the game itself are not included.
</part>
</software>
+ <software name="psydet2d">
+ <!--
+ Origin: redump.org
+ <rom name="Psychic Detective Series Vol. 2 - Memories (Japan) (Demo) (Track 01).bin" size="63504000" crc="e898c0db" sha1="d50e2f0d1846d094a37d62d8cdeaef3949e066a2"/>
+ <rom name="Psychic Detective Series Vol. 2 - Memories (Japan) (Demo) (Track 02).bin" size="57635760" crc="6902b4bf" sha1="179e32b22664d5b5d9f2f8b7ec5af6b0245e8e61"/>
+ <rom name="Psychic Detective Series Vol. 2 - Memories (Japan) (Demo) (Track 03).bin" size="11124960" crc="e18f8c09" sha1="809d9d0cfd3db2ad365070c4a47d550613da52f5"/>
+ <rom name="Psychic Detective Series Vol. 2 - Memories (Japan) (Demo) (Track 04).bin" size="29929200" crc="7f4ae24d" sha1="9df4da8f631ae733a0086d26847ee3c1f1b0bd4c"/>
+ <rom name="Psychic Detective Series Vol. 2 - Memories (Japan) (Demo) (Track 05).bin" size="19533360" crc="4ce1dd75" sha1="827fab5766a61b58ad37bb8d46181f40184f3bf2"/>
+ <rom name="Psychic Detective Series Vol. 2 - Memories (Japan) (Demo) (Track 06).bin" size="17004960" crc="38cc42f4" sha1="60435678841850cf0987a6018774ad6bb6c4d672"/>
+ <rom name="Psychic Detective Series Vol. 2 - Memories (Japan) (Demo) (Track 07).bin" size="43547280" crc="caeb3ff7" sha1="8725589b3e8bf71bb9bb6b45a78af5fe001da316"/>
+ <rom name="Psychic Detective Series Vol. 2 - Memories (Japan) (Demo) (Track 08).bin" size="17757600" crc="0ade8aa6" sha1="ab15f1adeb724dbd87f46ff3c356827131514b26"/>
+ <rom name="Psychic Detective Series Vol. 2 - Memories (Japan) (Demo) (Track 09).bin" size="12406800" crc="89d426c3" sha1="fe6de082ef7397045c95fc5be35a9a85f447ec63"/>
+ <rom name="Psychic Detective Series Vol. 2 - Memories (Japan) (Demo) (Track 10).bin" size="10960320" crc="683a41b3" sha1="f9f73ac14cb1dda1d3b7267db989d057acda3509"/>
+ <rom name="Psychic Detective Series Vol. 2 - Memories (Japan) (Demo) (Track 11).bin" size="10337040" crc="6b6ff12d" sha1="3bd5e4fc24637c836af8a45d77d4f7ec50b903d1"/>
+ <rom name="Psychic Detective Series Vol. 2 - Memories (Japan) (Demo) (Track 12).bin" size="13912080" crc="0f66bd26" sha1="c858fd179e5a46ee884804bf6ea2e5ff075d9b0f"/>
+ <rom name="Psychic Detective Series Vol. 2 - Memories (Japan) (Demo) (Track 13).bin" size="35585760" crc="0b94f73d" sha1="a62cabce24a56f22f63f87bf92cb3ccea77ac2c9"/>
+ <rom name="Psychic Detective Series Vol. 2 - Memories (Japan) (Demo) (Track 14).bin" size="67196640" crc="b97e96f5" sha1="00d915afe3ff0c251b96653a5f78b632990a3d3b"/>
+ <rom name="Psychic Detective Series Vol. 2 - Memories (Japan) (Demo) (Track 15).bin" size="11842320" crc="4d7d8bfa" sha1="852dfaba68ccbf32bea3dc78e1b60b604de29826"/>
+ <rom name="Psychic Detective Series Vol. 2 - Memories (Japan) (Demo) (Track 16).bin" size="54295920" crc="56b59927" sha1="6231347976335ddd6d61b898acd9ee9c1862157e"/>
+ <rom name="Psychic Detective Series Vol. 2 - Memories (Japan) (Demo) (Track 17).bin" size="6550320" crc="e3bdf902" sha1="54dc453b2e539caf9fa1e69acf3b04b206e3754e"/>
+ <rom name="Psychic Detective Series Vol. 2 - Memories (Japan) (Demo) (Track 18).bin" size="4233600" crc="4580866a" sha1="aaefaba5020efb03452df764e2897d0f278e3151"/>
+ <rom name="Psychic Detective Series Vol. 2 - Memories (Japan) (Demo).cue" size="2718" crc="c7d46131" sha1="3371a920e62f42b2285e90eba63d272bcd1f3af3"/>
+ -->
+ <description>Psychic Detective Series Vol. 2 - Memories (Demo)</description>
+ <year>1989</year>
+ <publisher>データウエスト (Data West)</publisher>
+ <info name="serial" value="HMA-900"/>
+ <info name="alt_title" value="サイキック・ディテクティヴ・シリーズ Vol.2 メモリーズ" />
+ <info name="usage" value="Requires 2 MB RAM"/>
+ <part name="cdrom" interface="fmt_cdrom">
+ <diskarea name="cdrom">
+ <disk name="psychic detective series vol. 2 - memories (japan) (demo)" sha1="9066c9e1a44fe71db90d435ed1a72a8b4cdc2e4f" />
+ </diskarea>
+ </part>
+ </software>
+
<software name="psydet3">
<!--
Origin: redump.org
@@ -13451,23 +13752,29 @@ User/save disks that can be created from the game itself are not included.
</part>
</software>
+ <!-- Windows / PC-9821 / FM Towns hybrid -->
<software name="rinkan">
<!--
- Origin: P2P
- <rom name="Image.cdm" size="2046" crc="54f0ec1f" sha1="686a7ecc6a53e9b2ede8ff3396ad0c6e38b87e3c"/>
- <rom name="Image.cue" size="340" crc="c0ad3f7d" sha1="6d39c08ccbd98363f1cc7bbc79038baacae268f4"/>
- <rom name="Image.img" size="379859760" crc="fef77566" sha1="fd7569f8c41405fd2898577ffc1806d57e47bd7d"/>
- <rom name="Image.sub" size="15504480" crc="1d0cc31c" sha1="8f56ddae02360a9f22821ba35ae1c7def1462c13"/>
+ Origin: redump.org
+ <rom name="Rinkan Gakkou (Japan) (Track 1).bin" size="189886368" crc="99408606" sha1="08fff78831fbed3bef02bf81f8cc019991120d75"/>
+ <rom name="Rinkan Gakkou (Japan) (Track 2).bin" size="24811248" crc="6488b2eb" sha1="8342c060cb187d84e788f4bec69151e13d84e749"/>
+ <rom name="Rinkan Gakkou (Japan) (Track 3).bin" size="38041248" crc="7d6e820c" sha1="52fae0b8bc659f7d488afe12643b98a33d82850a"/>
+ <rom name="Rinkan Gakkou (Japan) (Track 4).bin" size="40146288" crc="5be3c7cb" sha1="6a64562586c0c54c0420a9c34854f83b39dd841d"/>
+ <rom name="Rinkan Gakkou (Japan) (Track 5).bin" size="9652608" crc="7dc41706" sha1="96a5d812b6e2b1c990b4a157817ff465d10be2de"/>
+ <rom name="Rinkan Gakkou (Japan) (Track 6).bin" size="34158096" crc="8ed52a93" sha1="ce63608dd70441708d0ccf18221fa8f1cb18ed06"/>
+ <rom name="Rinkan Gakkou (Japan) (Track 7).bin" size="43163904" crc="625345df" sha1="6af51fb830e0c0ad23ee80ff64f7c9ce4a02ec3b"/>
+ <rom name="Rinkan Gakkou (Japan).cue" size="672" crc="59e824a1" sha1="6378dba1a7eff4dc9ab178d100d1e587a583702f"/>
-->
<description>Rinkan Gakkou</description>
<year>1996</year>
<publisher>フォスター (Foster)</publisher>
+ <info name="serial" value="CBF-0002"/>
<info name="alt_title" value="林間学校" />
<info name="release" value="199602xx" />
<info name="usage" value="Requires 2 MB RAM"/>
<part name="cdrom" interface="fmt_cdrom">
<diskarea name="cdrom">
- <disk name="rinkan" sha1="2574f07d8495ea197b5a04136f860b5466fa1ad5" />
+ <disk name="rinkan gakkou (japan)" sha1="1cc77c9ca07d7cf8364431442367efd6b1cebc89" />
</diskarea>
</part>
</software>
@@ -14008,6 +14315,25 @@ User/save disks that can be created from the game itself are not included.
</part>
</software>
+ <software name="sherlockd">
+ <!--
+ Origin: redump.org
+ <rom name="Sherlock Holmes - Consulting Detective (Japan) (Demo).bin" size="730836960" crc="31b97a17" sha1="7684a941a2a4c6c3521007597de249511e49f546"/>
+ <rom name="Sherlock Holmes - Consulting Detective (Japan) (Demo).cue" size="119" crc="1b51a0d8" sha1="b6e8ecc1b0903e00e9b194b93aa6b3f58bb0a388"/>
+ -->
+ <description>Sherlock Holmes - Consulting Detective (Demo)</description>
+ <year>1990</year>
+ <publisher>富士通 (Fujitsu)</publisher>
+ <info name="serial" value="HMC-901"/>
+ <info name="alt_title" value="シャーロックホームズの探偵講座" />
+ <info name="usage" value="Requires 2 MB RAM"/>
+ <part name="cdrom" interface="fmt_cdrom">
+ <diskarea name="cdrom">
+ <disk name="sherlock holmes - consulting detective (japan) (demo)" sha1="a0b64d1a73dc43995133191d1a00d564044e8973" />
+ </diskarea>
+ </part>
+ </software>
+
<software name="shinc">
<!--
Origin: Neo Kobe Collection
@@ -15204,13 +15530,37 @@ User/save disks that can be created from the game itself are not included.
</part>
</software>
+ <software name="steepialt">
+ <!--
+ Origin: redump.org
+ <rom name="Steepia Lite (Japan) (Track 1).bin" size="31046400" crc="60663fe9" sha1="200b9a56356710e7614c90109f5d41404fe07bed"/>
+ <rom name="Steepia Lite (Japan) (Track 2).bin" size="43218000" crc="b293ff0f" sha1="d477712a942edf338d9636a2aacea6fdf020c13f"/>
+ <rom name="Steepia Lite (Japan) (Track 3).bin" size="58917600" crc="397a945f" sha1="02a7e2f4fca7d876880a317033b10211684fc0bd"/>
+ <rom name="Steepia Lite (Japan) (Track 4).bin" size="51685200" crc="b7c3b9d9" sha1="4f41184fa1dd26136373d9c2479494bd39c268ad"/>
+ <rom name="Steepia Lite (Japan) (Track 5).bin" size="34574400" crc="f7282eb1" sha1="bb57b1e764b0097d0298172afdad09f0b6fa179d"/>
+ <rom name="Steepia Lite (Japan) (Track 6).bin" size="53449200" crc="e039a537" sha1="3023f550f150078c7c24213d9f1901a650e028c5"/>
+ <rom name="Steepia Lite (Japan) (Track 7).bin" size="31928400" crc="1c8a94e1" sha1="e70de558fd71e68e9df330d39d8c89b3fe74ae0d"/>
+ <rom name="Steepia Lite (Japan).cue" size="780" crc="312dc4c4" sha1="890e42982a0b94c572237001cee585b5a42430c3"/>
+ -->
+ <description>Steepia Lite</description>
+ <year>1993</year>
+ <publisher>富士通 (Fujitsu)</publisher>
+ <info name="serial" value="HME-118 / A2760400 / TSC330"/>
+ <info name="alt_title" value="スティーピア ライト" />
+ <info name="release" value="199303xx" />
+ <info name="usage" value="Requires 2 MB RAM"/>
+ <part name="cdrom" interface="fmt_cdrom">
+ <diskarea name="cdrom">
+ <disk name="steepia lite (japan)" sha1="9622e76e629eeef2676ef2e3b489b7b4610d120f" />
+ </diskarea>
+ </part>
+ </software>
+
<software name="strike">
<!--
- Origin: Neo Kobe Collection
- <rom name="Strike Commander.ccd" size="770" crc="91c09160" sha1="c1b6eb7520ccc118fb806363f08f130d414057fb"/>
- <rom name="Strike Commander.cue" size="80" crc="2aeb3159" sha1="c5aa55eee16773628a5d891961eae748af64122e"/>
- <rom name="Strike Commander.img" size="126321216" crc="58db3c67" sha1="e7c96197ef9252234bbed00a33332b71ed82f5d4"/>
- <rom name="Strike Commander.sub" size="5155968" crc="b1b319dd" sha1="f67a0af1c4e9bf9561f57ded66dbaa1bf46d8bb6"/>
+ Origin: redump.org
+ <rom name="Strike Commander (Japan).bin" size="126321216" crc="58db3c67" sha1="e7c96197ef9252234bbed00a33332b71ed82f5d4"/>
+ <rom name="Strike Commander (Japan).cue" size="113" crc="2a777bfa" sha1="fbb5eafd1ce0f222dcdcc70f7f8ffd446b0688af"/>
-->
<description>Strike Commander</description>
<year>1994</year>
@@ -15218,10 +15568,10 @@ User/save disks that can be created from the game itself are not included.
<info name="serial" value="EFT-7010 / HMDC-1915"/>
<info name="alt_title" value="ストライク・コマンダー" />
<info name="release" value="199408xx" />
- <info name="usage" value="Requires HDD installation and 4 MB RAM"/>
+ <info name="usage" value="Requires HDD installation and 6 MB RAM"/>
<part name="cdrom" interface="fmt_cdrom">
<diskarea name="cdrom">
- <disk name="strike commander" sha1="4ce5635dfe368cedfe0d61fb46a11d8f7fb2c083" />
+ <disk name="strike commander (japan)" sha1="297385db8fc933594b7316d87ff1001849785be8" />
</diskarea>
</part>
</software>
@@ -15239,7 +15589,7 @@ User/save disks that can be created from the game itself are not included.
<publisher>エレクトロニック・アーツ・ビクター (Electronic Arts Victor)</publisher>
<info name="alt_title" value="ストライク・コマンダーPLUS" />
<info name="release" value="199504xx" />
- <info name="usage" value="Requires HDD installation and 4 MB RAM"/>
+ <info name="usage" value="Requires HDD installation and 6 MB RAM"/>
<part name="cdrom" interface="fmt_cdrom">
<diskarea name="cdrom">
<disk name="strike commander plus" sha1="c926c123e3c0c8e439b16c27ecca3b420e1964bb" />
@@ -16177,6 +16527,41 @@ User/save disks that can be created from the game itself are not included.
</part>
</software>
+ <!-- PC-9821 / FM Towns hybrid -->
+ <software name="trigger2">
+ <!--
+ Origin: redump.org
+ <rom name="Trigger 2 (Japan) (Track 01).bin" size="197702064" crc="e23e140b" sha1="29f14f5667e2a3c80320006e202cb2a56b639bd7"/>
+ <rom name="Trigger 2 (Japan) (Track 02).bin" size="29581104" crc="8d228907" sha1="ba1d1612a3b75f9a20750aacd9afab1d09ff7627"/>
+ <rom name="Trigger 2 (Japan) (Track 03).bin" size="28165200" crc="81b2d682" sha1="73e334ef49dd89d65dcfc3a1e929f1defb956593"/>
+ <rom name="Trigger 2 (Japan) (Track 04).bin" size="19864992" crc="feaf1071" sha1="bb139364c23f73612d5d290081b64d44374ceb83"/>
+ <rom name="Trigger 2 (Japan) (Track 05).bin" size="25822608" crc="4b72fd21" sha1="5feeda73ae3d5d8983e495c4e8da413f335f8436"/>
+ <rom name="Trigger 2 (Japan) (Track 06).bin" size="22656816" crc="14104365" sha1="63d0e5bbaa76ade5e6f3c5443aa55e858a54bb38"/>
+ <rom name="Trigger 2 (Japan) (Track 07).bin" size="18855984" crc="c18f7ff8" sha1="9d40b9ff13c04a282c1476bed522a8bb4e25ff7e"/>
+ <rom name="Trigger 2 (Japan) (Track 08).bin" size="22929648" crc="26350032" sha1="1832c4c711ec077912c909049c5b02228765bec9"/>
+ <rom name="Trigger 2 (Japan) (Track 09).bin" size="24152688" crc="84bc2ae5" sha1="892b7d71d71d8fea4f53bb8ed86d7ad7523bc0e7"/>
+ <rom name="Trigger 2 (Japan) (Track 10).bin" size="35992656" crc="162cb2b0" sha1="7f3d0af63af755214676cd8b6340f8c78e504b73"/>
+ <rom name="Trigger 2 (Japan) (Track 11).bin" size="20161344" crc="b5b7f108" sha1="f5e3b18fddc831dbab978d80e5bd74a2f40c4554"/>
+ <rom name="Trigger 2 (Japan) (Track 12).bin" size="21828912" crc="9ff8672f" sha1="8bec717b590b34d65afe66d2e6956c08198c4f2e"/>
+ <rom name="Trigger 2 (Japan) (Track 13).bin" size="25702656" crc="0d199dd8" sha1="818bf0b257761c0d8c82e57185f61cadc765e75f"/>
+ <rom name="Trigger 2 (Japan) (Track 14).bin" size="26081328" crc="b8801a50" sha1="9c0e379cd293f4dff631b71cfa57d6b31007ada8"/>
+ <rom name="Trigger 2 (Japan) (Track 15).bin" size="29679888" crc="571811e0" sha1="1e1d33582c719651da311386fbe1b525f7891a37"/>
+ <rom name="Trigger 2 (Japan).cue" size="1363" crc="f3add79a" sha1="6579b0567611414285f6cecf1c244973d6c93b7f"/>
+ -->
+ <description>Trigger 2</description>
+ <year>1995</year>
+ <publisher>ジックス (ZyX)</publisher>
+ <info name="serial" value="ZYX-0004"/>
+ <info name="alt_title" value="トリガー2" />
+ <info name="release" value="199509xx" />
+ <info name="usage" value="Requires 2 MB RAM"/>
+ <part name="cdrom" interface="fmt_cdrom">
+ <diskarea name="cdrom">
+ <disk name="trigger 2 (japan)" sha1="80e939c23b7ccd2fdb53728a49c450f319feacd8" />
+ </diskarea>
+ </part>
+ </software>
+
<!-- Missing a floppy disk -->
<software name="truheart" supported="no">
<!--
@@ -16623,11 +17008,9 @@ User/save disks that can be created from the game itself are not included.
<software name="viperv6">
<!--
- Origin: Neo Kobe Collection
- <rom name="Viper V6 Turbo RS.ccd" size="750" crc="318ccd71" sha1="a47f5847de0fe5af93fc8d3b19a85800774b5244"/>
- <rom name="Viper V6 Turbo RS.cue" size="99" crc="159b0b0f" sha1="6775947743d352f6608709ca51514474990fac75"/>
- <rom name="Viper V6 Turbo RS.img" size="63151200" crc="307627bb" sha1="832dced51299a3f13ffc4532c76215f1b558c6d0"/>
- <rom name="Viper V6 Turbo RS.sub" size="2577600" crc="b7dcf321" sha1="0993fbd9fcd53cffd0ca231f5180a9d233af319c"/>
+ Origin: redump.org
+ <rom name="Viper-V6 Turbo RS (Japan).bin" size="63151200" crc="307627bb" sha1="832dced51299a3f13ffc4532c76215f1b558c6d0"/>
+ <rom name="Viper-V6 Turbo RS (Japan).cue" size="91" crc="83570136" sha1="3c38166463039365aa9afe31aa888c246edd4dba"/>
-->
<description>Viper-V6 Turbo RS</description>
<year>1995</year>
@@ -16637,7 +17020,7 @@ User/save disks that can be created from the game itself are not included.
<info name="usage" value="Requires 2 MB RAM"/>
<part name="cdrom" interface="fmt_cdrom">
<diskarea name="cdrom">
- <disk name="viper v6 turbo rs" sha1="3ba0afc8b3cfbdae0e37c0e049d8ed6d9dd4e4ff" />
+ <disk name="viper-v6 turbo rs (japan)" sha1="2096b1b585e6460986857f9859ed34525bde38e1" />
</diskarea>
</part>
</software>
@@ -17588,35 +17971,64 @@ User/save disks that can be created from the game itself are not included.
</part>
</software>
+ <!--
+ zan2o boots from the CD and then accesses some files on the floppy disk, while zan2 boots from the floppy, which contains a later version of
+ the ZAN2.EXP executable. This was probably meant as a way of "patching" the game after the original release without having to re-master the CD.
+ -->
<software name="zan2">
<!--
- Origin: Neo Kobe Collection
- <rom name="Zan 2 Towns Special.mdf" size="219771648" crc="b224b08b" sha1="a028d7223c0255cecf26380371ea4c817b683c71"/>
- <rom name="Zan 2 Towns Special.mds" size="750" crc="c834648b" sha1="313182cab9a5ab3b09bd71d83e199f7ab7e2b182"/>
+ Origin: redump.org (CD) / wiggy2k (floppy)
+ <rom name="Zan II - Towns Special (Japan) (Track 1).bin" size="10231200" crc="95767f0f" sha1="efd5a74ed5d8fa5706f0a2886782a642e0cc4822"/>
+ <rom name="Zan II - Towns Special (Japan) (Track 2).bin" size="36164352" crc="20424e3c" sha1="537bce50972256a3ca9c2f4ef787ef801577abca"/>
+ <rom name="Zan II - Towns Special (Japan) (Track 3).bin" size="91198800" crc="a7cd859a" sha1="f32327fa3af8018b5c2e85eb7d8e7cc7cfc0339d"/>
+ <rom name="Zan II - Towns Special (Japan) (Track 4).bin" size="73911600" crc="f6f6deee" sha1="98c0250230a5357986c0bff56e129e29a0a712ef"/>
+ <rom name="Zan II - Towns Special (Japan).cue" size="501" crc="d9f46f20" sha1="c343b917aa4bf6a5b030b6a92eeb99b66b66879d"/>
+ -->
+ <description>Zan II - Towns Special (1992-04-23)</description>
+ <year>1992</year>
+ <publisher>ウルフチーム (WolfTeam)</publisher>
+ <info name="serial" value="HMD-120 / CD-W19-TO"/>
+ <info name="alt_title" value="斬2タウンズスペシャル" />
+ <info name="release" value="199204xx" />
+ <info name="usage" value="Requires 2 MB RAM"/>
+ <part name="flop1" interface="floppy_3_5">
+ <feature name="part_id" value="User Disk" />
+ <dataarea name="flop" size="1261568">
+ <rom name="zan ii towns special (user disk) (1992-04-23).hdm" size="1261568" crc="ef5e668d" sha1="cc7120bd32053775b2916ab24d2edf2312e26cca" offset="000000" />
+ </dataarea>
+ </part>
+ <part name="cdrom" interface="fmt_cdrom">
+ <diskarea name="cdrom">
+ <disk name="zan ii - towns special (japan)" sha1="cd7501fe79be9445704ebb196a6c1921599169e9" />
+ </diskarea>
+ </part>
+ </software>
- *after conversion with IsoBuster+EAC *
- <rom name="track01.bin" size="10231200" crc="95767f0f" sha1="efd5a74ed5d8fa5706f0a2886782a642e0cc4822"/>
- <rom name="track02.bin" size="36164352" crc="459bd0e2" sha1="4ed3f03b812df7222adbf3bb68d4dd3a80ae09ce"/>
- <rom name="track03.bin" size="91198800" crc="d11ea63c" sha1="4fcd026081d3fdd3c49cc61fcbf575accc2b6611"/>
- <rom name="track04.bin" size="73911600" crc="e6694e61" sha1="9c1611325495fdb80e957cc4eb5da819f4a4c10e"/>
- <rom name="zan 2 towns special.cue" size="690" crc="a07806e3" sha1="02cf38214074c540b51eccb3642950957e12a2ef"/>
+ <software name="zan2o" cloneof="zan2">
+ <!--
+ Origin: redump.org (CD) / Neo Kobe Collection (floppy)
+ <rom name="Zan II - Towns Special (Japan) (Track 1).bin" size="10231200" crc="95767f0f" sha1="efd5a74ed5d8fa5706f0a2886782a642e0cc4822"/>
+ <rom name="Zan II - Towns Special (Japan) (Track 2).bin" size="36164352" crc="20424e3c" sha1="537bce50972256a3ca9c2f4ef787ef801577abca"/>
+ <rom name="Zan II - Towns Special (Japan) (Track 3).bin" size="91198800" crc="a7cd859a" sha1="f32327fa3af8018b5c2e85eb7d8e7cc7cfc0339d"/>
+ <rom name="Zan II - Towns Special (Japan) (Track 4).bin" size="73911600" crc="f6f6deee" sha1="98c0250230a5357986c0bff56e129e29a0a712ef"/>
+ <rom name="Zan II - Towns Special (Japan).cue" size="501" crc="d9f46f20" sha1="c343b917aa4bf6a5b030b6a92eeb99b66b66879d"/>
-->
- <description>Zan II - Towns Special</description>
+ <description>Zan II - Towns Special (1992-03-19)</description>
<year>1992</year>
<publisher>ウルフチーム (WolfTeam)</publisher>
- <info name="serial" value="HMD-120"/>
+ <info name="serial" value="HMD-120 / CD-W19-TO"/>
<info name="alt_title" value="斬2タウンズスペシャル" />
<info name="release" value="199204xx" />
<info name="usage" value="Requires 2 MB RAM"/>
<part name="flop1" interface="floppy_3_5">
<feature name="part_id" value="User Disk" />
<dataarea name="flop" size="1261568">
- <rom name="zan 2 towns special (user disk).hdm" size="1261568" crc="863e02e3" sha1="28622691fd1a431055f4c586cfe585e0920a6153" offset="000000" />
+ <rom name="zan ii towns special (user disk) (1992-03-19).hdm" size="1261568" crc="863e02e3" sha1="28622691fd1a431055f4c586cfe585e0920a6153" offset="000000" />
</dataarea>
</part>
<part name="cdrom" interface="fmt_cdrom">
<diskarea name="cdrom">
- <disk name="zan 2 towns special" sha1="e1a85e9691abb531bdef1cdf9373630ffa2338d7" />
+ <disk name="zan ii - towns special (japan)" sha1="cd7501fe79be9445704ebb196a6c1921599169e9" />
</diskarea>
</part>
</software>
@@ -17650,13 +18062,26 @@ User/save disks that can be created from the game itself are not included.
</part>
</software>
+ <!-- PC-9821 / FM Towns hybrid -->
<software name="zatsuon">
<!--
- Origin: Neo Kobe Collection
- <rom name="Zatsuon Ryouiki.ccd" size="3446" crc="10ee6de3" sha1="0c4b1a6601826a41f9f459fcd7582d3453def178"/>
- <rom name="Zatsuon Ryouiki.cue" size="631" crc="529007d8" sha1="db8c3270e3e27577d350dcf9318f53ed3b253ba0"/>
- <rom name="Zatsuon Ryouiki.img" size="552301344" crc="36d5957f" sha1="faf0bb06a3e4bcf7963d2a845cb28ffa1436f2fe"/>
- <rom name="Zatsuon Ryouiki.sub" size="22542912" crc="ab5c6fd4" sha1="f2992eeff16cce212cab087640be7a83d6ce52e2"/>
+ Origin: redump.org
+ <rom name="Zatsuon Ryouiki (Japan) (Track 01).bin" size="90982416" crc="7e7a3e44" sha1="22dfa64d2d419a752428c3bc1be28d99f162ac21"/>
+ <rom name="Zatsuon Ryouiki (Japan) (Track 02).bin" size="18317376" crc="bf109d16" sha1="f9aa0be351b3630ff992a6c89a33ac2095663a4f"/>
+ <rom name="Zatsuon Ryouiki (Japan) (Track 03).bin" size="37827216" crc="13707d14" sha1="80f9b42d8c330469370d806788ce896e14a8211f"/>
+ <rom name="Zatsuon Ryouiki (Japan) (Track 04).bin" size="28734384" crc="c9c335b4" sha1="0a1bc849bf638a899d02714d0a2ee68ca515fea2"/>
+ <rom name="Zatsuon Ryouiki (Japan) (Track 05).bin" size="41486928" crc="eb64b666" sha1="c96ea82fe70c614f62894ed0a4893957a386dae7"/>
+ <rom name="Zatsuon Ryouiki (Japan) (Track 06).bin" size="18931248" crc="b580f111" sha1="60f41692c6fdd89fc15591f72638121a417d8a3d"/>
+ <rom name="Zatsuon Ryouiki (Japan) (Track 07).bin" size="20796384" crc="8c3410d9" sha1="77b2b0b705fad9b7e0a935c98186ee13bc7488a9"/>
+ <rom name="Zatsuon Ryouiki (Japan) (Track 08).bin" size="21845376" crc="0aabfb4c" sha1="9198018cffcd8e4200c7f8e018bb9eada8cefc1e"/>
+ <rom name="Zatsuon Ryouiki (Japan) (Track 09).bin" size="29054256" crc="08a45417" sha1="7ae17c13bb8915291a0cabbb86f61ab79c2e6080"/>
+ <rom name="Zatsuon Ryouiki (Japan) (Track 10).bin" size="42658224" crc="8a905b63" sha1="b381bf233da0dca28e1b5ef2e6ce26d39b17a120"/>
+ <rom name="Zatsuon Ryouiki (Japan) (Track 11).bin" size="36752352" crc="c4944d4c" sha1="52986becf548700b2f647590da86146f286d1e11"/>
+ <rom name="Zatsuon Ryouiki (Japan) (Track 12).bin" size="28734384" crc="1bce59e0" sha1="ab683ac4c718b9861a2140c752f90be14960bbfd"/>
+ <rom name="Zatsuon Ryouiki (Japan) (Track 13).bin" size="54354720" crc="c5c8a56e" sha1="e12110e8413e026e46887e3258d5adc17983a835"/>
+ <rom name="Zatsuon Ryouiki (Japan) (Track 14).bin" size="28365120" crc="3281d02a" sha1="e311908a04cc9688644fa23746712177eca2552d"/>
+ <rom name="Zatsuon Ryouiki (Japan) (Track 15).bin" size="53460960" crc="2e1ed7ba" sha1="eb269208f35d68cde165c302309a3b8c542fb614"/>
+ <rom name="Zatsuon Ryouiki (Japan).cue" size="1453" crc="8ba58399" sha1="589b52c9678ca2d52c4404e03f5ce6d2919266a6"/>
-->
<description>Zatsuon Ryouiki</description>
<year>1995</year>
@@ -17666,7 +18091,7 @@ User/save disks that can be created from the game itself are not included.
<info name="usage" value="Requires 2 MB RAM"/>
<part name="cdrom" interface="fmt_cdrom">
<diskarea name="cdrom">
- <disk name="zatsuon ryouiki" sha1="f61c4277ef4a2ec49f127d6b798e30d9b7b0b3af" />
+ <disk name="zatsuon ryouiki (japan)" sha1="a0fc53f0e69a538300eba1cc4a5d69b722577209" />
</diskarea>
</part>
</software>
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index d92ad24ab4a..cd6242983a0 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -3092,6 +3092,7 @@ files {
createMESSProjects(_target, _subtarget, "novag")
files {
+ MAME_DIR .. "src/mame/drivers/novag_cexpert.cpp",
MAME_DIR .. "src/mame/drivers/novag_cforte.cpp",
MAME_DIR .. "src/mame/drivers/novag_const.cpp",
MAME_DIR .. "src/mame/drivers/novag_diablo.cpp",
diff --git a/src/devices/bus/bbc/tube/tube.cpp b/src/devices/bus/bbc/tube/tube.cpp
index b632f7b5821..582bbdb72ef 100644
--- a/src/devices/bus/bbc/tube/tube.cpp
+++ b/src/devices/bus/bbc/tube/tube.cpp
@@ -113,6 +113,7 @@ void bbc_tube_devices(device_slot_interface &device)
device.option_add("z80", BBC_TUBE_Z80); /* Acorn ANC04 Z80 2nd processor */
device.option_add("z80w", BBC_TUBE_Z80W); /* Acorn ANC04 Z80 2nd processor (Winchester) */
device.option_add("32016", BBC_TUBE_32016); /* Acorn ANC05 32016 2nd processor */
+ device.option_add("32016l", BBC_TUBE_32016L); /* Acorn Large 32016 2nd processor */
device.option_add("arm", BBC_TUBE_ARM); /* Acorn ANC13 ARM Evaluation System */
device.option_add("80286", BBC_TUBE_80286); /* Acorn 80286 2nd Processor */
//device.option_add("a500", BBC_TUBE_A500); /* Acorn A500 2nd Processor */
@@ -142,6 +143,7 @@ void bbc_extube_devices(device_slot_interface &device)
device.option_add("z80", BBC_TUBE_Z80); /* Acorn ANC04 Z80 2nd processor */
device.option_add("z80w", BBC_TUBE_Z80W); /* Acorn ANC04 Z80 2nd processor (Winchester) */
device.option_add("32016", BBC_TUBE_32016); /* Acorn ANC05 32016 2nd processor */
+ device.option_add("32016l", BBC_TUBE_32016L); /* Acorn Large 32016 2nd processor */
device.option_add("arm", BBC_TUBE_ARM); /* Acorn ANC13 ARM Evaluation System */
device.option_add("80286", BBC_TUBE_80286); /* Acorn 80286 2nd Processor */
device.option_add("pcplus", BBC_TUBE_PCPLUS); /* Solidisk PC-Plus co-processor */
@@ -180,6 +182,7 @@ void electron_tube_devices(device_slot_interface &device)
device.option_add("6502", BBC_TUBE_6502); /* Acorn ANC01 6502 2nd processor */
device.option_add("z80", BBC_TUBE_Z80); /* Acorn ANC04 Z80 2nd processor */
device.option_add("32016", BBC_TUBE_32016); /* Acorn ANC05 32016 2nd processor */
+ device.option_add("32016l", BBC_TUBE_32016L); /* Acorn Large 32016 2nd processor */
device.option_add("arm", BBC_TUBE_ARM); /* Acorn ANC13 ARM Evaluation System */
device.option_add("65c102", BBC_TUBE_65C102); /* Acorn ADC06 65C102 co-processor */
device.option_add("80186", BBC_TUBE_80186); /* Acorn ADC08 80186 co-processor */
diff --git a/src/devices/bus/bbc/tube/tube_32016.cpp b/src/devices/bus/bbc/tube/tube_32016.cpp
index 164ab0ff089..6a54665937d 100644
--- a/src/devices/bus/bbc/tube/tube_32016.cpp
+++ b/src/devices/bus/bbc/tube/tube_32016.cpp
@@ -29,6 +29,7 @@
//**************************************************************************
DEFINE_DEVICE_TYPE(BBC_TUBE_32016, bbc_tube_32016_device, "bbc_tube_32016", "Acorn 32016 2nd processor")
+DEFINE_DEVICE_TYPE(BBC_TUBE_32016L, bbc_tube_32016l_device, "bbc_tube_32016l", "Acorn Large 32016 2nd processor")
//-------------------------------------------------
@@ -38,8 +39,9 @@ DEFINE_DEVICE_TYPE(BBC_TUBE_32016, bbc_tube_32016_device, "bbc_tube_32016", "Aco
void bbc_tube_32016_device::tube_32016_mem(address_map &map)
{
map(0x000000, 0xffffff).rw(FUNC(bbc_tube_32016_device::read), FUNC(bbc_tube_32016_device::write));
+ map(0xf00000, 0xf07fff).rom().region("rom", 0).mirror(0x0f8000);
map(0xf90000, 0xf90001).portr("CONFIG");
- map(0xfffff0, 0xffffff).rw("ula", FUNC(tube_device::parasite_r), FUNC(tube_device::parasite_w)).umask32(0x00ff);
+ map(0xfffff0, 0xffffff).rw("ula", FUNC(tube_device::parasite_r), FUNC(tube_device::parasite_w)).umask16(0x00ff);
}
//-------------------------------------------------
@@ -47,18 +49,27 @@ void bbc_tube_32016_device::tube_32016_mem(address_map &map)
//-------------------------------------------------
ROM_START(tube_32016)
- ROM_REGION(0x8000, "rom", 0)
- ROM_DEFAULT_BIOS("200")
+ ROM_REGION16_LE(0x8000, "rom", 0)
ROM_SYSTEM_BIOS(0, "200", "Pandora v2.00")
ROMX_LOAD("pan200lo.rom", 0x0000, 0x4000, CRC(b1980fd0) SHA1(8084f8896cd22953abefbd43c51e1a422b30e28d), ROM_SKIP(1) | ROM_BIOS(0)) // 0201-764-02 Pandora Lo
ROMX_LOAD("pan200hi.rom", 0x0001, 0x4000, CRC(cab98d6b) SHA1(dfad1f4180c50757a74fcfe3a0ee7d7b48eb1bee), ROM_SKIP(1) | ROM_BIOS(0)) // 0201-763-02 Pandora Hi
ROM_SYSTEM_BIOS(1, "100", "Pandora v1.00")
- ROMX_LOAD("pan100.rom", 0x0000, 0x8000, BAD_DUMP CRC(75333006) SHA1(996cd120103039390c9b979b16c327bb95da72e4), ROM_BIOS(1)) // 0201-763-01, 0201-764-01 Pandora
+ ROMX_LOAD("pan100lo.rom", 0x0000, 0x2000, CRC(101e8aca) SHA1(4998e64afe98b2f227df6daa7ae0af512ce8907a), ROM_SKIP(1) | ROM_BIOS(1)) // 0201-764-01 Pandora Lo
+ ROM_RELOAD( 0x4000, 0x2000)
+ ROMX_LOAD("pan100hi.rom", 0x0001, 0x2000, CRC(139de9ed) SHA1(1871e65c9ebd3eac835b0317b0ad8272ff207c4b), ROM_SKIP(1) | ROM_BIOS(1)) // 0201-763-01 Pandora Hi
+ ROM_RELOAD( 0x4001, 0x2000)
ROM_SYSTEM_BIOS(2, "061", "Pandora v0.61")
ROMX_LOAD("pan061lo.rom", 0x0000, 0x4000, CRC(6f801b35) SHA1(ce31f7c10603f3d15a06a8e32bde40df0639e446), ROM_SKIP(1) | ROM_BIOS(2))
ROMX_LOAD("pan061hi.rom", 0x0001, 0x4000, CRC(c00b1ab0) SHA1(e6a705232278c518340ddc69ea51af91965fa332), ROM_SKIP(1) | ROM_BIOS(2))
ROM_END
+ROM_START(tube_32016l)
+ ROM_REGION16_LE(0x8000, "rom", 0)
+ ROM_SYSTEM_BIOS(0, "200", "Pandora v2.00")
+ ROMX_LOAD("pan200lo.rom", 0x0000, 0x4000, CRC(b1980fd0) SHA1(8084f8896cd22953abefbd43c51e1a422b30e28d), ROM_SKIP(1) | ROM_BIOS(0)) // 0201-764-02 Pandora Lo
+ ROMX_LOAD("pan200hi.rom", 0x0001, 0x4000, CRC(cab98d6b) SHA1(dfad1f4180c50757a74fcfe3a0ee7d7b48eb1bee), ROM_SKIP(1) | ROM_BIOS(0)) // 0201-763-02 Pandora Hi
+ROM_END
+
//-------------------------------------------------
// INPUT_PORTS( tube_32016 )
//-------------------------------------------------
@@ -112,12 +123,23 @@ void bbc_tube_32016_device::device_add_mconfig(machine_config &config)
m_ula->pirq_handler().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
/* internal ram */
- RAM(config, m_ram).set_default_size("1M").set_default_value(0);
+ RAM(config, m_ram).set_default_size("1M").set_extra_options("256K");
/* software lists */
SOFTWARE_LIST(config, "flop_ls_32016").set_original("bbc_flop_32016");
}
+
+void bbc_tube_32016l_device::device_add_mconfig(machine_config &config)
+{
+ bbc_tube_32016_device::device_add_mconfig(config);
+
+ m_maincpu->set_clock(16_MHz_XTAL / 2);
+
+ /* internal ram */
+ m_ram->set_default_size("4M");
+}
+
//-------------------------------------------------
// rom_region - device-specific ROM region
//-------------------------------------------------
@@ -127,6 +149,11 @@ const tiny_rom_entry *bbc_tube_32016_device::device_rom_region() const
return ROM_NAME( tube_32016 );
}
+const tiny_rom_entry *bbc_tube_32016l_device::device_rom_region() const
+{
+ return ROM_NAME( tube_32016l );
+}
+
//-------------------------------------------------
// input_ports - device-specific input ports
//-------------------------------------------------
@@ -144,8 +171,8 @@ ioport_constructor bbc_tube_32016_device::device_input_ports() const
// bbc_tube_32016_device - constructor
//-------------------------------------------------
-bbc_tube_32016_device::bbc_tube_32016_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, BBC_TUBE_32016, tag, owner, clock)
+bbc_tube_32016_device::bbc_tube_32016_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
, device_bbc_tube_interface(mconfig, *this)
, m_maincpu(*this, "maincpu")
, m_ula(*this, "ula")
@@ -155,12 +182,23 @@ bbc_tube_32016_device::bbc_tube_32016_device(const machine_config &mconfig, cons
{
}
+bbc_tube_32016_device::bbc_tube_32016_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : bbc_tube_32016_device(mconfig, BBC_TUBE_32016, tag, owner, clock)
+{
+}
+
+bbc_tube_32016l_device::bbc_tube_32016l_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : bbc_tube_32016_device(mconfig, BBC_TUBE_32016L, tag, owner, clock)
+{
+}
+
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
void bbc_tube_32016_device::device_start()
{
+ save_item(NAME(m_rom_enabled));
}
//-------------------------------------------------
@@ -190,12 +228,12 @@ void bbc_tube_32016_device::host_w(offs_t offset, uint8_t data)
uint8_t bbc_tube_32016_device::read(offs_t offset)
{
- uint16_t data = 0xffff;
+ uint16_t data;
if (m_rom_enabled)
- data = m_rom->base()[offset & 0x3fff];
- else if (offset < m_ram->size())
- data = m_ram->pointer()[offset];
+ data = m_rom->base()[offset & 0x7fff];
+ else
+ data = m_ram->pointer()[offset & m_ram->mask()];
return data;
}
@@ -203,8 +241,7 @@ uint8_t bbc_tube_32016_device::read(offs_t offset)
void bbc_tube_32016_device::write(offs_t offset, uint8_t data)
{
/* clear ROM select on first write */
- if (!machine().side_effects_disabled()) m_rom_enabled = false;
+ m_rom_enabled = false;
- if (offset < m_ram->size())
- m_ram->pointer()[offset] = data;
+ m_ram->pointer()[offset & m_ram->mask()] = data;
}
diff --git a/src/devices/bus/bbc/tube/tube_32016.h b/src/devices/bus/bbc/tube/tube_32016.h
index d77a132c64f..7e7753ae5f6 100644
--- a/src/devices/bus/bbc/tube/tube_32016.h
+++ b/src/devices/bus/bbc/tube/tube_32016.h
@@ -36,6 +36,8 @@ public:
bbc_tube_32016_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
+ bbc_tube_32016_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
@@ -48,7 +50,6 @@ protected:
virtual uint8_t host_r(offs_t offset) override;
virtual void host_w(offs_t offset, uint8_t data) override;
-private:
required_device<ns32016_device> m_maincpu;
required_device<tube_device> m_ula;
required_device<ram_device> m_ram;
@@ -63,9 +64,22 @@ private:
};
+class bbc_tube_32016l_device : public bbc_tube_32016_device
+{
+public:
+ bbc_tube_32016l_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+ // optional information overrides
+ virtual void device_add_mconfig(machine_config &config) override;
+ virtual const tiny_rom_entry *device_rom_region() const override;
+};
+
+
// device type definition
DECLARE_DEVICE_TYPE(BBC_TUBE_32016, bbc_tube_32016_device)
+DECLARE_DEVICE_TYPE(BBC_TUBE_32016L, bbc_tube_32016l_device)
#endif /* MAME_BUS_BBC_TUBE_32016_H */
diff --git a/src/devices/cpu/m6502/st2205u.cpp b/src/devices/cpu/m6502/st2205u.cpp
index 45c5f1f9a02..a9417ec2cce 100644
--- a/src/devices/cpu/m6502/st2205u.cpp
+++ b/src/devices/cpu/m6502/st2205u.cpp
@@ -14,7 +14,7 @@
* LCD controller (640x400 B/W, 400x320 4-gray, 160xRGBx120 16-gray)
* Serial peripheral interface
* UART (built-in BRG; RS-232 and IrDA modes)
- * USB 1.1 (separate control and bulk transfer endpoint buffers)
+ * USB 2.0 (separate control and bulk transfer endpoint buffers)
* Direct memory access (2 channels, optional XOR/OR/AND logic)
* NAND/AND Flash memory interface (includes ECC generator)
* Power down modes (WAI-0, WAI-1, STP)
@@ -28,18 +28,22 @@
other ST2XXX MCU is that PRR[0] and IRR[0] are *not* inverted
relative to A14.
+ ST2302U lacks the LCDC, UART and NAND interface and includes only
+ 8K mask ROM, 2K SRAM and 20 GPIO pins, but appears to be broadly
+ similar in other aspects. (The differences, if any, between
+ ST2302U and ST2312U are unclear, but ST2301U and ST2331U omit the
+ PSG.) It also supports a SYSCLK of up to 24 MHz.
+
**********************************************************************/
#include "emu.h"
#include "st2205u.h"
DEFINE_DEVICE_TYPE(ST2205U, st2205u_device, "st2205u", "Sitronix ST2205U Integrated Microcontroller")
+DEFINE_DEVICE_TYPE(ST2302U, st2302u_device, "st2302u", "Sitronix ST2302U Integrated Microcontroller")
-st2205u_device::st2205u_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
- : st2xxx_device(mconfig, ST2205U, tag, owner, clock,
- address_map_constructor(FUNC(st2205u_device::int_map), this),
- 26, // logical; only 23 address lines are brought out
- true)
+st2205u_base_device::st2205u_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, address_map_constructor internal_map, int data_bits, bool has_banked_ram)
+ : st2xxx_device(mconfig, type, tag, owner, clock, internal_map, data_bits, has_banked_ram)
, m_btc(0)
, m_tc_12bit{0}
, m_count_12bit{0}
@@ -54,9 +58,6 @@ st2205u_device::st2205u_device(const machine_config &mconfig, const char *tag, d
, m_psg_on(0)
, m_psg_vol{0}
, m_psg_volm{0}
- , m_lbuf(0)
- , m_lpal_index(0)
- , m_gray_levels{0}
, m_usbcon(0)
, m_usbien(0)
, m_dptr{0}
@@ -66,23 +67,30 @@ st2205u_device::st2205u_device(const machine_config &mconfig, const char *tag, d
, m_dmod{0}
, m_rctr(0)
, m_lvctr(0)
- , m_alt_map(false)
{
}
-void st2205u_device::device_start()
+st2205u_device::st2205u_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ : st2205u_base_device(mconfig, ST2205U, tag, owner, clock,
+ address_map_constructor(FUNC(st2205u_device::int_map), this),
+ 26, // logical; only 23 address lines are brought out
+ true)
+ , m_lbuf(0)
+ , m_lpal_index(0)
+ , m_gray_levels{0}
{
- std::unique_ptr<mi_st2205u> intf = std::make_unique<mi_st2205u>();
- space(AS_DATA).specific(intf->data);
- space(AS_DATA).cache(intf->dcache);
- intf->irr_enable = false;
- intf->irr = 0;
- intf->prr = 0;
- intf->drr = 0;
- intf->brr = 0;
- intf->irq_service = false;
- intf->ram = make_unique_clear<u8[]>(0x8000);
+}
+st2302u_device::st2302u_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ : st2205u_base_device(mconfig, ST2302U, tag, owner, clock,
+ address_map_constructor(FUNC(st2302u_device::int_map), this),
+ 26, // ???
+ false)
+{
+}
+
+void st2205u_base_device::base_init(std::unique_ptr<mi_st2xxx> &&intf)
+{
m_timer_12bit[0] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(st2205u_device::t0_interrupt), this));
m_timer_12bit[1] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(st2205u_device::t1_interrupt), this));
m_timer_12bit[2] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(st2205u_device::t2_interrupt), this));
@@ -104,9 +112,6 @@ void st2205u_device::device_start()
save_item(NAME(m_psg_on));
save_item(NAME(m_psg_vol));
save_item(NAME(m_psg_volm));
- save_item(NAME(m_lbuf));
- save_item(NAME(m_lpal_index));
- save_item(NAME(m_gray_levels));
save_item(NAME(m_usbcon));
save_item(NAME(m_usbien));
save_item(NAME(m_dptr));
@@ -116,12 +121,32 @@ void st2205u_device::device_start()
save_item(NAME(m_dmod));
save_item(NAME(m_rctr));
save_item(NAME(m_lvctr));
- save_item(NAME(intf->brr));
- save_pointer(NAME(intf->ram), 0x8000);
mintf = std::move(intf);
save_common_registers();
init();
+}
+
+void st2205u_device::device_start()
+{
+ std::unique_ptr<mi_st2205u> intf = std::make_unique<mi_st2205u>();
+ space(AS_DATA).specific(intf->data);
+ space(AS_DATA).cache(intf->dcache);
+ intf->irr_enable = false;
+ intf->irr = 0;
+ intf->prr = 0;
+ intf->drr = 0;
+ intf->brr = 0;
+ intf->irq_service = false;
+ intf->ram = make_unique_clear<u8[]>(0x8000);
+
+ save_item(NAME(m_lbuf));
+ save_item(NAME(m_lpal_index));
+ save_item(NAME(m_gray_levels));
+ save_item(NAME(intf->brr));
+ save_pointer(NAME(intf->ram), 0x8000);
+
+ base_init(std::move(intf));
state_add(ST_IRR, "IRR", downcast<mi_st2205u &>(*mintf).irr).mask(0x8fff);
state_add(ST_PRR, "PRR", downcast<mi_st2205u &>(*mintf).prr).mask(0x8fff);
@@ -196,11 +221,73 @@ void st2205u_device::device_start()
state_add(ST_LVCTR, "LVCTR", m_lvctr).mask(0x0f);
}
-void st2205u_device::device_reset()
+void st2302u_device::device_start()
{
- st2xxx_device::device_reset();
+ std::unique_ptr<mi_st2302u> intf = std::make_unique<mi_st2302u>();
+ space(AS_DATA).specific(intf->data);
+ space(AS_DATA).cache(intf->dcache);
+ intf->irr_enable = false;
+ intf->irr = 0;
+ intf->prr = 0;
+ intf->drr = 0;
+ intf->irq_service = false;
- downcast<mi_st2205u &>(*mintf).brr = 0;
+ base_init(std::move(intf));
+
+ state_add(ST_IRR, "IRR", downcast<mi_st2302u &>(*mintf).irr).mask(0x0fff);
+ state_add(ST_PRR, "PRR", downcast<mi_st2302u &>(*mintf).prr).mask(0x0fff);
+ state_add(ST_DRR, "DRR", downcast<mi_st2302u &>(*mintf).drr).mask(0x07ff);
+ state_add(ST_IREQ, "IREQ", m_ireq, [this](u16 data) { m_ireq = data; update_irq_state(); }).mask(st2xxx_ireq_mask());
+ state_add(ST_IENA, "IENA", m_iena, [this](u16 data) { m_iena = data; update_irq_state(); }).mask(st2xxx_ireq_mask());
+ for (int i = 0; i < 6; i++)
+ {
+ state_add(ST_PAOUT + i, string_format("P%cOUT", 'A' + i).c_str(), m_pdata[i]);
+ state_add(ST_PCA + i, string_format("PC%c", 'A' + i).c_str(), m_pctrl[i]);
+ if (i == 2 || i == 4)
+ state_add(ST_PSA + i, string_format("PS%c", 'A' + i).c_str(), m_psel[i]);
+ if (i == 2 || i == 3)
+ state_add(ST_PFC + i - 2, string_format("PF%c", 'A' + i).c_str(), m_pfun[i - 2]).mask(i == 2 ? 0xfe : 0xff);
+ }
+ state_add(ST_PMCR, "PMCR", m_pmcr);
+ state_add(ST_MISC, "MISC", m_misc).mask(st2xxx_misc_mask());
+ state_add(ST_SYS, "SYS", m_sys, [this](u8 data) { sys_w(data); }).mask(0xfe);
+ state_add(ST_PRS, "PRS", m_prs, [this](u8 data) { prs_w(data); }).mask(0x40);
+ state_add(ST_BTEN, "BTEN", m_bten, [this](u8 data) { bten_w(data); });
+ state_add(ST_BTSR, "BTREQ", m_btsr);
+ state_add(ST_BTC, "BTC", m_btc);
+ for (int i = 0; i < 4; i++)
+ state_add(ST_T0C + i, string_format("T%dC", i).c_str(), m_tc_12bit[i]);
+ state_add(ST_T4C, "T4C", m_t4c);
+ state_add(ST_TIEN, "TIEN", m_tien);
+ for (int i = 0; i < 4; i++)
+ state_add(ST_FIFOS0 + i, string_format("FIFOS%d", i).c_str(), m_fifo_filled[i]).mask(0x1f);
+ state_add(ST_PSGC, "PSGC", m_psgc);
+ state_add(ST_PSGM, "PSGM", m_psgm);
+ for (int i = 0; i < 4; i++)
+ state_add(ST_VOL0 + i, string_format("VOL%d", i).c_str(), m_psg_vol[i]).mask(0xbf);
+ state_add(ST_VOLM0, "VOLM0", m_psg_volm[0]).mask(0x3f);
+ state_add(ST_VOLM1, "VOLM1", m_psg_volm[1]).mask(0x7f);
+ state_add(ST_SCTR, "SCTR", m_sctr);
+ state_add(ST_SCKR, "SCKR", m_sckr).mask(0x7f);
+ state_add(ST_SSR, "SSR", m_ssr).mask(0x77);
+ state_add(ST_SMOD, "SMOD", m_smod).mask(0x0f);
+ for (int i = 0; i < 2; i++)
+ {
+ state_add(ST_DMS0 + i, string_format("DMS%d", i).c_str(), m_dptr[i * 2]).mask(0x7fff);
+ state_add(ST_DMD0 + i, string_format("DMD%d", i).c_str(), m_dptr[i * 2 + 1]).mask(0x7fff);
+ state_add(ST_DBKS0 + i, string_format("DBKS%d", i).c_str(), m_dbkr[i * 2]).mask(0x87ff);
+ state_add(ST_DBKD0 + i, string_format("DBKD%d", i).c_str(), m_dbkr[i * 2 + 1]).mask(0x87ff);
+ state_add(ST_DCNT0 + i, string_format("DCNT%d", i).c_str(), m_dcnt[i]).mask(0x7fff);
+ state_add(ST_DMOD0 + i, string_format("DMOD%d", i).c_str(), m_dmod[i]).mask(0x3f);
+ }
+ state_add(ST_DCTR, "DCTR", m_dctr).mask(0x03);
+ state_add(ST_RCTR, "RCTR", m_rctr).mask(0xef);
+ state_add(ST_LVCTR, "LVCTR", m_lvctr).mask(0x0f);
+}
+
+void st2205u_base_device::device_reset()
+{
+ st2xxx_device::device_reset();
m_btc = 0;
@@ -219,10 +306,6 @@ void st2205u_device::device_reset()
std::fill(std::begin(m_psg_vol), std::end(m_psg_vol), 0);
std::fill(std::begin(m_psg_volm), std::end(m_psg_volm), 0);
- m_lbuf = 0;
- m_lpal_index = 0;
- std::fill(std::begin(m_gray_levels), std::end(m_gray_levels), 0);
-
m_usbcon = 0;
m_usbien = 0x20;
@@ -237,6 +320,17 @@ void st2205u_device::device_reset()
m_lvctr = 0;
}
+void st2205u_device::device_reset()
+{
+ st2205u_base_device::device_reset();
+
+ downcast<mi_st2205u &>(*mintf).brr = 0;
+
+ m_lbuf = 0;
+ m_lpal_index = 0;
+ std::fill(std::begin(m_gray_levels), std::end(m_gray_levels), 0);
+}
+
const char *st2205u_device::st2xxx_irq_name(int i) const
{
switch (i)
@@ -260,6 +354,26 @@ const char *st2205u_device::st2xxx_irq_name(int i) const
}
}
+const char *st2302u_device::st2xxx_irq_name(int i) const
+{
+ switch (i)
+ {
+ case 0: return "P?0/1/2/3 edge";
+ case 1: return "Timer 0";
+ case 2: return "Timer 1";
+ case 3: return "Timer 2";
+ case 4: return "Timer 3";
+ case 5: return "PA transition";
+ case 6: return "Base timer";
+ case 8: return "SPI TX empty";
+ case 9: return "SPI RX ready";
+ case 12: return "USB";
+ case 14: return "PCM";
+ case 15: return "RTC";
+ default: return "Reserved";
+ }
+}
+
u8 st2205u_device::mi_st2205u::pread(u16 adr)
{
u16 bank = irq_service && irr_enable ? irr : prr;
@@ -335,6 +449,39 @@ void st2205u_device::mi_st2205u::bwrite(u16 adr, u8 val)
data.write_byte(u32(brr) << 13 | (adr & 0x1fff), val);
}
+u8 st2302u_device::mi_st2302u::pread(u16 adr)
+{
+ u16 bank = irq_service && irr_enable ? irr : prr;
+ return data.read_byte(u32(bank) << 14 | (adr & 0x3fff));
+}
+
+u8 st2302u_device::mi_st2302u::preadc(u16 adr)
+{
+ u16 bank = irq_service && irr_enable ? irr : prr;
+ return dcache.read_byte(u32(bank) << 14 | (adr & 0x3fff));
+}
+
+void st2302u_device::mi_st2302u::pwrite(u16 adr, u8 val)
+{
+ u16 bank = irq_service && irr_enable ? irr : prr;
+ data.write_byte(u32(bank) << 14 | (adr & 0x3fff), val);
+}
+
+u8 st2302u_device::mi_st2302u::dread(u16 adr)
+{
+ return data.read_byte(u32(drr) << 15 | (adr & 0x7fff));
+}
+
+u8 st2302u_device::mi_st2302u::dreadc(u16 adr)
+{
+ return dcache.read_byte(u32(drr) << 15 | (adr & 0x7fff));
+}
+
+void st2302u_device::mi_st2302u::dwrite(u16 adr, u8 val)
+{
+ data.write_byte(u32(drr) << 15 | (adr & 0x7fff), val);
+}
+
u8 st2205u_device::mi_st2205u::read(u16 adr)
{
return program.read_byte(adr);
@@ -360,6 +507,31 @@ void st2205u_device::mi_st2205u::write(u16 adr, u8 val)
program.write_byte(adr, val);
}
+u8 st2302u_device::mi_st2302u::read(u16 adr)
+{
+ return program.read_byte(adr);
+}
+
+u8 st2302u_device::mi_st2302u::read_sync(u16 adr)
+{
+ return BIT(adr, 15) ? dreadc(adr) : BIT(adr, 14) ? preadc(adr) : cprogram.read_byte(adr);
+}
+
+u8 st2302u_device::mi_st2302u::read_arg(u16 adr)
+{
+ return BIT(adr, 15) ? dreadc(adr) : BIT(adr, 14) ? preadc(adr) : cprogram.read_byte(adr);
+}
+
+u8 st2302u_device::mi_st2302u::read_vector(u16 adr)
+{
+ return pread(adr);
+}
+
+void st2302u_device::mi_st2302u::write(u16 adr, u8 val)
+{
+ program.write_byte(adr, val);
+}
+
u8 st2205u_device::brrl_r()
{
return downcast<mi_st2205u &>(*mintf).brr & 0xff;
@@ -382,7 +554,7 @@ void st2205u_device::brrh_w(u8 data)
brr = (data & 0x9f) << 8 | (brr & 0x00ff);
}
-unsigned st2205u_device::st2xxx_bt_divider(int n) const
+unsigned st2205u_base_device::st2xxx_bt_divider(int n) const
{
// 2 Hz
if (n == 0)
@@ -401,17 +573,17 @@ unsigned st2205u_device::st2xxx_bt_divider(int n) const
return 4 * (m_btc != 0 ? m_btc : 256);
}
-u8 st2205u_device::btc_r()
+u8 st2205u_base_device::btc_r()
{
return m_btc;
}
-void st2205u_device::btc_w(u8 data)
+void st2205u_base_device::btc_w(u8 data)
{
m_btc = data;
}
-u8 st2205u_device::psg_r(offs_t offset)
+u8 st2205u_base_device::psg_r(offs_t offset)
{
u8 index = m_fifo_pos[offset >> 1];
if (BIT(offset, 0))
@@ -423,7 +595,7 @@ u8 st2205u_device::psg_r(offs_t offset)
return m_dac_fifo[offset >> 1][index] & 0xff;
}
-void st2205u_device::psg_w(offs_t offset, u8 data)
+void st2205u_base_device::psg_w(offs_t offset, u8 data)
{
if (m_fifo_filled[offset >> 1] < 16)
{
@@ -432,55 +604,55 @@ void st2205u_device::psg_w(offs_t offset, u8 data)
}
}
-u8 st2205u_device::psgc_r()
+u8 st2205u_base_device::psgc_r()
{
return m_psgc;
}
-void st2205u_device::psgc_w(u8 data)
+void st2205u_base_device::psgc_w(u8 data)
{
m_psgc = data;
m_psg_on &= (data & 0xf0) >> 4;
}
-u8 st2205u_device::psgm_r()
+u8 st2205u_base_device::psgm_r()
{
return m_psgm;
}
-void st2205u_device::psgm_w(u8 data)
+void st2205u_base_device::psgm_w(u8 data)
{
m_psgm = data;
}
-u8 st2205u_device::vol_r(offs_t offset)
+u8 st2205u_base_device::vol_r(offs_t offset)
{
return m_psg_vol[offset] | 0x40;
}
-void st2205u_device::vol_w(offs_t offset, u8 data)
+void st2205u_base_device::vol_w(offs_t offset, u8 data)
{
m_psg_vol[offset] = data & 0xbf;
}
-u8 st2205u_device::volm_r(offs_t offset)
+u8 st2205u_base_device::volm_r(offs_t offset)
{
return m_psg_volm[offset] | (offset == 1 ? 0x80 : 0xc0);
}
-void st2205u_device::volm_w(offs_t offset, u8 data)
+void st2205u_base_device::volm_w(offs_t offset, u8 data)
{
m_psg_volm[offset] = data & (offset == 1 ? 0x7f : 0x3f);
}
-void st2205u_device::st2xxx_tclk_start()
+void st2205u_base_device::st2xxx_tclk_start()
{
for (int t = 0; t < 4; t++)
if (BIT(m_tien, t) && (m_tc_12bit[t] & 0x7000) < 0x6000)
timer_start_from_tclk(t);
}
-void st2205u_device::st2xxx_tclk_stop()
+void st2205u_base_device::st2xxx_tclk_stop()
{
for (int t = 0; t < 4; t++)
{
@@ -492,7 +664,7 @@ void st2205u_device::st2xxx_tclk_stop()
}
}
-u32 st2205u_device::tclk_pres_div(u8 mode) const
+u32 st2205u_base_device::tclk_pres_div(u8 mode) const
{
assert(mode < 6);
if (mode < 3)
@@ -505,27 +677,27 @@ u32 st2205u_device::tclk_pres_div(u8 mode) const
return 4096;
}
-TIMER_CALLBACK_MEMBER(st2205u_device::t0_interrupt)
+TIMER_CALLBACK_MEMBER(st2205u_base_device::t0_interrupt)
{
timer_12bit_process(0);
}
-TIMER_CALLBACK_MEMBER(st2205u_device::t1_interrupt)
+TIMER_CALLBACK_MEMBER(st2205u_base_device::t1_interrupt)
{
timer_12bit_process(1);
}
-TIMER_CALLBACK_MEMBER(st2205u_device::t2_interrupt)
+TIMER_CALLBACK_MEMBER(st2205u_base_device::t2_interrupt)
{
timer_12bit_process(2);
}
-TIMER_CALLBACK_MEMBER(st2205u_device::t3_interrupt)
+TIMER_CALLBACK_MEMBER(st2205u_base_device::t3_interrupt)
{
timer_12bit_process(3);
}
-void st2205u_device::timer_12bit_process(int t)
+void st2205u_base_device::timer_12bit_process(int t)
{
if (BIT(m_psgc, t + 4))
{
@@ -566,7 +738,7 @@ void st2205u_device::timer_12bit_process(int t)
// TODO: BGRCK & INTX sources
}
-u16 st2205u_device::timer_12bit_count(int t) const
+u16 st2205u_base_device::timer_12bit_count(int t) const
{
u16 count = m_count_12bit[t];
if (BIT(m_tien, t))
@@ -581,18 +753,18 @@ u16 st2205u_device::timer_12bit_count(int t) const
return count & 0x0fff;
}
-void st2205u_device::timer_start_from_tclk(int t)
+void st2205u_base_device::timer_start_from_tclk(int t)
{
u32 div = tclk_pres_div((m_tc_12bit[t] & 0x7000) >> 12);
m_timer_12bit[t]->adjust(cycles_to_attotime((0x0fff - m_count_12bit[t]) * div + div - (pres_count() & (div - 1))));
}
-void st2205u_device::timer_start_from_oscx(int t)
+void st2205u_base_device::timer_start_from_oscx(int t)
{
m_timer_12bit[t]->adjust(attotime::from_ticks(0x1000 - m_count_12bit[t], 32768));
}
-u8 st2205u_device::tc_12bit_r(offs_t offset)
+u8 st2205u_base_device::tc_12bit_r(offs_t offset)
{
if (BIT(offset, 0))
return (timer_12bit_count(offset >> 1) | (m_tc_12bit[offset >> 1] & 0xf000)) >> 8;
@@ -600,7 +772,7 @@ u8 st2205u_device::tc_12bit_r(offs_t offset)
return timer_12bit_count(offset >> 1) & 0x00ff;
}
-void st2205u_device::tc_12bit_w(offs_t offset, u8 data)
+void st2205u_base_device::tc_12bit_w(offs_t offset, u8 data)
{
if (BIT(offset, 0))
m_tc_12bit[offset >> 1] = (m_tc_12bit[offset >> 1] & 0x00ff) | u16(data) << 8;
@@ -608,22 +780,22 @@ void st2205u_device::tc_12bit_w(offs_t offset, u8 data)
m_tc_12bit[offset >> 1] = (m_tc_12bit[offset >> 1] & 0xff00) | data;
}
-u8 st2205u_device::t4c_r()
+u8 st2205u_base_device::t4c_r()
{
return m_t4c;
}
-void st2205u_device::t4c_w(u8 data)
+void st2205u_base_device::t4c_w(u8 data)
{
m_t4c = data;
}
-u8 st2205u_device::tien_r()
+u8 st2205u_base_device::tien_r()
{
return m_tien;
}
-void st2205u_device::tien_w(u8 data)
+void st2205u_base_device::tien_w(u8 data)
{
for (int t = 0; t < 4; t++)
{
@@ -677,123 +849,123 @@ void st2205u_device::lpal_w(u8 data)
m_gray_levels[index] = data & 0x1f;
}
-u8 st2205u_device::usbcon_r()
+u8 st2205u_base_device::usbcon_r()
{
return m_usbcon | 0x03;
}
-void st2205u_device::usbcon_w(u8 data)
+void st2205u_base_device::usbcon_w(u8 data)
{
m_usbcon = data & 0xfc;
}
-u8 st2205u_device::usbien_r()
+u8 st2205u_base_device::usbien_r()
{
return m_usbien | 0x40;
}
-void st2205u_device::usbien_w(u8 data)
+void st2205u_base_device::usbien_w(u8 data)
{
m_usbien = data & 0xbf;
}
-u8 st2205u_device::dptrl_r()
+u8 st2205u_base_device::dptrl_r()
{
return m_dptr[m_dctr] & 0x00ff;
}
-void st2205u_device::dptrl_w(u8 data)
+void st2205u_base_device::dptrl_w(u8 data)
{
m_dptr[m_dctr] = (m_dptr[m_dctr] & 0x7f00) | data;
}
-u8 st2205u_device::dptrh_r()
+u8 st2205u_base_device::dptrh_r()
{
return (m_dptr[m_dctr] >> 8) | 0x80;
}
-void st2205u_device::dptrh_w(u8 data)
+void st2205u_base_device::dptrh_w(u8 data)
{
m_dptr[m_dctr] = u16(data & 0x7f) << 8 | (m_dptr[m_dctr] & 0x00ff);
}
-u8 st2205u_device::dbkrl_r()
+u8 st2205u_base_device::dbkrl_r()
{
return m_dbkr[m_dctr] & 0x00ff;
}
-void st2205u_device::dbkrl_w(u8 data)
+void st2205u_base_device::dbkrl_w(u8 data)
{
m_dbkr[m_dctr] = (m_dbkr[m_dctr] & 0x8700) | data;
}
-u8 st2205u_device::dbkrh_r()
+u8 st2205u_base_device::dbkrh_r()
{
return (m_dbkr[m_dctr] >> 8) | 0x78;
}
-void st2205u_device::dbkrh_w(u8 data)
+void st2205u_base_device::dbkrh_w(u8 data)
{
m_dbkr[m_dctr] = u16(data & 0x87) << 8 | (m_dbkr[m_dctr] & 0x00ff);
}
-u8 st2205u_device::dcntl_r()
+u8 st2205u_base_device::dcntl_r()
{
return m_dcnt[m_dctr >> 1] & 0x00ff;
}
-void st2205u_device::dcntl_w(u8 data)
+void st2205u_base_device::dcntl_w(u8 data)
{
m_dcnt[m_dctr >> 1] = (m_dcnt[m_dctr >> 1] & 0x7f00) | data;
}
-u8 st2205u_device::dcnth_r()
+u8 st2205u_base_device::dcnth_r()
{
return (m_dcnt[m_dctr >> 1] >> 8) | 0x80;
}
-void st2205u_device::dcnth_w(u8 data)
+void st2205u_base_device::dcnth_w(u8 data)
{
m_dcnt[m_dctr >> 1] = (m_dcnt[m_dctr >> 1] & 0x7f00) | data;
// TODO: start DMA here
}
-u8 st2205u_device::dctr_r()
+u8 st2205u_base_device::dctr_r()
{
return m_dctr | 0xfc;
}
-void st2205u_device::dctr_w(u8 data)
+void st2205u_base_device::dctr_w(u8 data)
{
m_dctr = data & 0x03;
}
-u8 st2205u_device::dmod_r()
+u8 st2205u_base_device::dmod_r()
{
return m_dmod[m_dctr >> 1] | 0xc0;
}
-void st2205u_device::dmod_w(u8 data)
+void st2205u_base_device::dmod_w(u8 data)
{
m_dmod[m_dctr >> 1] = data & 0x3f;
}
-u8 st2205u_device::rctr_r()
+u8 st2205u_base_device::rctr_r()
{
return (m_rctr & 0xe0) | 0x10;
}
-void st2205u_device::rctr_w(u8 data)
+void st2205u_base_device::rctr_w(u8 data)
{
m_rctr = data & 0xef;
}
-u8 st2205u_device::lvctr_r()
+u8 st2205u_base_device::lvctr_r()
{
return m_lvctr | 0x01;
}
-void st2205u_device::lvctr_w(u8 data)
+void st2205u_base_device::lvctr_w(u8 data)
{
m_lvctr = data & 0x0f;
}
@@ -838,91 +1010,97 @@ void st2205u_device::bmem_w(offs_t offset, u8 data)
downcast<mi_st2205u &>(*mintf).bwrite(offset, data);
}
+u8 st2302u_device::pmem_r(offs_t offset)
+{
+ return downcast<mi_st2302u &>(*mintf).pread(offset);
+}
+
+void st2302u_device::pmem_w(offs_t offset, u8 data)
+{
+ downcast<mi_st2302u &>(*mintf).pwrite(offset, data);
+}
+
+u8 st2302u_device::dmem_r(offs_t offset)
+{
+ return downcast<mi_st2302u &>(*mintf).dread(offset);
+}
+
+void st2302u_device::dmem_w(offs_t offset, u8 data)
+{
+ downcast<mi_st2302u &>(*mintf).dwrite(offset, data);
+}
+
+void st2205u_base_device::base_map(address_map &map)
+{
+ map(0x0020, 0x0027).rw(FUNC(st2205u_base_device::tc_12bit_r), FUNC(st2205u_base_device::tc_12bit_w));
+ map(0x0028, 0x0028).rw(FUNC(st2205u_base_device::tien_r), FUNC(st2205u_base_device::tien_w));
+ map(0x0029, 0x0029).rw(FUNC(st2205u_base_device::prs_r), FUNC(st2205u_base_device::prs_w));
+ map(0x002a, 0x002a).rw(FUNC(st2205u_base_device::bten_r), FUNC(st2205u_base_device::bten_w));
+ map(0x002b, 0x002b).rw(FUNC(st2205u_base_device::btsr_r), FUNC(st2205u_base_device::btclr_w));
+ map(0x002c, 0x002c).rw(FUNC(st2205u_base_device::btc_r), FUNC(st2205u_base_device::btc_w));
+ map(0x002d, 0x002d).rw(FUNC(st2205u_base_device::t4c_r), FUNC(st2205u_base_device::t4c_w));
+ map(0x002e, 0x002e).rw(FUNC(st2205u_base_device::rctr_r), FUNC(st2205u_base_device::rctr_w));
+ map(0x0030, 0x0030).rw(FUNC(st2205u_base_device::irrl_r), FUNC(st2205u_base_device::irrl_w));
+ map(0x0031, 0x0031).rw(FUNC(st2205u_base_device::irrh_r), FUNC(st2205u_base_device::irrh_w));
+ map(0x0032, 0x0032).rw(FUNC(st2205u_base_device::prrl_r), FUNC(st2205u_base_device::prrl_w));
+ map(0x0033, 0x0033).rw(FUNC(st2205u_base_device::prrh_r), FUNC(st2205u_base_device::prrh_w));
+ map(0x0034, 0x0034).rw(FUNC(st2205u_base_device::drrl_r), FUNC(st2205u_base_device::drrl_w));
+ map(0x0035, 0x0035).rw(FUNC(st2205u_base_device::drrh_r), FUNC(st2205u_base_device::drrh_w));
+ map(0x0038, 0x0038).rw(FUNC(st2205u_base_device::misc_r), FUNC(st2205u_base_device::misc_w));
+ map(0x0039, 0x0039).rw(FUNC(st2205u_base_device::sys_r), FUNC(st2205u_base_device::sys_w));
+ map(0x003c, 0x003c).rw(FUNC(st2205u_base_device::ireql_r), FUNC(st2205u_base_device::ireql_w));
+ map(0x003d, 0x003d).rw(FUNC(st2205u_base_device::ireqh_r), FUNC(st2205u_base_device::ireqh_w));
+ map(0x003e, 0x003e).rw(FUNC(st2205u_base_device::ienal_r), FUNC(st2205u_base_device::ienal_w));
+ map(0x003f, 0x003f).rw(FUNC(st2205u_base_device::ienah_r), FUNC(st2205u_base_device::ienah_w));
+ map(0x0058, 0x0058).rw(FUNC(st2205u_base_device::dptrl_r), FUNC(st2205u_base_device::dptrl_w));
+ map(0x0059, 0x0059).rw(FUNC(st2205u_base_device::dptrh_r), FUNC(st2205u_base_device::dptrh_w));
+ map(0x005a, 0x005a).rw(FUNC(st2205u_base_device::dbkrl_r), FUNC(st2205u_base_device::dbkrl_w));
+ map(0x005b, 0x005b).rw(FUNC(st2205u_base_device::dbkrh_r), FUNC(st2205u_base_device::dbkrh_w));
+ map(0x005c, 0x005c).rw(FUNC(st2205u_base_device::dcntl_r), FUNC(st2205u_base_device::dcntl_w));
+ map(0x005d, 0x005d).rw(FUNC(st2205u_base_device::dcnth_r), FUNC(st2205u_base_device::dcnth_w));
+ map(0x005e, 0x005e).rw(FUNC(st2205u_base_device::dctr_r), FUNC(st2205u_base_device::dctr_w));
+ map(0x005f, 0x005f).rw(FUNC(st2205u_base_device::dmod_r), FUNC(st2205u_base_device::dmod_w));
+ map(0x0070, 0x0070).rw(FUNC(st2205u_base_device::usbcon_r), FUNC(st2205u_base_device::usbcon_w));
+ map(0x0071, 0x0071).rw(FUNC(st2205u_base_device::usbien_r), FUNC(st2205u_base_device::usbien_w));
+}
+
void st2205u_device::int_map(address_map &map)
{
+ base_map(map);
map(0x0000, 0x0005).rw(FUNC(st2205u_device::pdata_r), FUNC(st2205u_device::pdata_w));
map(0x0006, 0x0006).rw(FUNC(st2205u_device::psc_r), FUNC(st2205u_device::psc_w));
map(0x0007, 0x0007).rw(FUNC(st2205u_device::pse_r), FUNC(st2205u_device::pse_w));
map(0x0008, 0x000d).rw(FUNC(st2205u_device::pctrl_r), FUNC(st2205u_device::pctrl_w));
map(0x000e, 0x000e).rw(FUNC(st2205u_device::pfc_r), FUNC(st2205u_device::pfc_w));
map(0x000f, 0x000f).rw(FUNC(st2205u_device::pfd_r), FUNC(st2205u_device::pfd_w));
- if (m_alt_map)
- {
- map(0x0012, 0x0012).rw(FUNC(st2205u_device::sctr_r), FUNC(st2205u_device::sctr_w));
- map(0x0013, 0x0013).rw(FUNC(st2205u_device::sckr_r), FUNC(st2205u_device::sckr_w));
- map(0x0014, 0x0014).rw(FUNC(st2205u_device::ssr_r), FUNC(st2205u_device::ssr_w));
- map(0x0015, 0x0015).rw(FUNC(st2205u_device::smod_r), FUNC(st2205u_device::smod_w));
- }
- else
- {
- map(0x0010, 0x0017).rw(FUNC(st2205u_device::psg_r), FUNC(st2205u_device::psg_w));
- map(0x0018, 0x001b).rw(FUNC(st2205u_device::vol_r), FUNC(st2205u_device::vol_w));
- map(0x001c, 0x001d).rw(FUNC(st2205u_device::volm_r), FUNC(st2205u_device::volm_w));
- map(0x001e, 0x001e).rw(FUNC(st2205u_device::psgc_r), FUNC(st2205u_device::psgc_w));
- map(0x001f, 0x001f).rw(FUNC(st2205u_device::psgm_r), FUNC(st2205u_device::psgm_w));
- }
- map(0x0020, 0x0027).rw(FUNC(st2205u_device::tc_12bit_r), FUNC(st2205u_device::tc_12bit_w));
- map(0x0028, 0x0028).rw(FUNC(st2205u_device::tien_r), FUNC(st2205u_device::tien_w));
- map(0x0029, 0x0029).rw(FUNC(st2205u_device::prs_r), FUNC(st2205u_device::prs_w));
- map(0x002a, 0x002a).rw(FUNC(st2205u_device::bten_r), FUNC(st2205u_device::bten_w));
- map(0x002b, 0x002b).rw(FUNC(st2205u_device::btsr_r), FUNC(st2205u_device::btclr_w));
- map(0x002c, 0x002c).rw(FUNC(st2205u_device::btc_r), FUNC(st2205u_device::btc_w));
- map(0x002d, 0x002d).rw(FUNC(st2205u_device::t4c_r), FUNC(st2205u_device::t4c_w));
- map(0x002e, 0x002e).rw(FUNC(st2205u_device::rctr_r), FUNC(st2205u_device::rctr_w));
- map(0x0030, 0x0030).rw(FUNC(st2205u_device::irrl_r), FUNC(st2205u_device::irrl_w));
- map(0x0031, 0x0031).rw(FUNC(st2205u_device::irrh_r), FUNC(st2205u_device::irrh_w));
- map(0x0032, 0x0032).rw(FUNC(st2205u_device::prrl_r), FUNC(st2205u_device::prrl_w));
- map(0x0033, 0x0033).rw(FUNC(st2205u_device::prrh_r), FUNC(st2205u_device::prrh_w));
- map(0x0034, 0x0034).rw(FUNC(st2205u_device::drrl_r), FUNC(st2205u_device::drrl_w));
- map(0x0035, 0x0035).rw(FUNC(st2205u_device::drrh_r), FUNC(st2205u_device::drrh_w));
+ map(0x0010, 0x0017).rw(FUNC(st2205u_device::psg_r), FUNC(st2205u_device::psg_w));
+ map(0x0018, 0x001b).rw(FUNC(st2205u_device::vol_r), FUNC(st2205u_device::vol_w));
+ map(0x001c, 0x001d).rw(FUNC(st2205u_device::volm_r), FUNC(st2205u_device::volm_w));
+ map(0x001e, 0x001e).rw(FUNC(st2205u_device::psgc_r), FUNC(st2205u_device::psgc_w));
+ map(0x001f, 0x001f).rw(FUNC(st2205u_device::psgm_r), FUNC(st2205u_device::psgm_w));
map(0x0036, 0x0036).rw(FUNC(st2205u_device::brrl_r), FUNC(st2205u_device::brrl_w));
map(0x0037, 0x0037).rw(FUNC(st2205u_device::brrh_r), FUNC(st2205u_device::brrh_w));
- map(0x0038, 0x0038).rw(FUNC(st2205u_device::misc_r), FUNC(st2205u_device::misc_w));
- map(0x0039, 0x0039).rw(FUNC(st2205u_device::sys_r), FUNC(st2205u_device::sys_w));
map(0x003a, 0x003a).rw(FUNC(st2205u_device::pmcr_r), FUNC(st2205u_device::pmcr_w));
- map(0x003c, 0x003c).rw(FUNC(st2205u_device::ireql_r), FUNC(st2205u_device::ireql_w));
- map(0x003d, 0x003d).rw(FUNC(st2205u_device::ireqh_r), FUNC(st2205u_device::ireqh_w));
- map(0x003e, 0x003e).rw(FUNC(st2205u_device::ienal_r), FUNC(st2205u_device::ienal_w));
- map(0x003f, 0x003f).rw(FUNC(st2205u_device::ienah_r), FUNC(st2205u_device::ienah_w));
- if (m_alt_map)
- {
- map(0x0040, 0x0047).rw(FUNC(st2205u_device::psg_r), FUNC(st2205u_device::psg_w));
- map(0x0048, 0x004b).rw(FUNC(st2205u_device::vol_r), FUNC(st2205u_device::vol_w));
- map(0x004c, 0x004d).rw(FUNC(st2205u_device::volm_r), FUNC(st2205u_device::volm_w));
- map(0x004e, 0x004e).rw(FUNC(st2205u_device::psgc_r), FUNC(st2205u_device::psgc_w));
- map(0x004f, 0x004f).rw(FUNC(st2205u_device::psgm_r), FUNC(st2205u_device::psgm_w));
- }
- else
- {
- map(0x0040, 0x0040).w(FUNC(st2205u_device::lssal_w));
- map(0x0041, 0x0041).w(FUNC(st2205u_device::lssah_w));
- map(0x0042, 0x0042).w(FUNC(st2205u_device::lvpw_w));
- map(0x0043, 0x0043).rw(FUNC(st2205u_device::lxmax_r), FUNC(st2205u_device::lxmax_w));
- map(0x0044, 0x0044).rw(FUNC(st2205u_device::lymax_r), FUNC(st2205u_device::lymax_w));
- map(0x0045, 0x0045).rw(FUNC(st2205u_device::lpan_r), FUNC(st2205u_device::lpan_w));
- map(0x0046, 0x0046).rw(FUNC(st2205u_device::lbuf_r), FUNC(st2205u_device::lbuf_w));
- map(0x0047, 0x0047).rw(FUNC(st2205u_device::lctr_r), FUNC(st2205u_device::lctr_w));
- map(0x0048, 0x0048).w(FUNC(st2205u_device::lckr_w));
- map(0x0049, 0x0049).w(FUNC(st2205u_device::lfra_w));
- map(0x004a, 0x004a).rw(FUNC(st2205u_device::lac_r), FUNC(st2205u_device::lac_w));
- map(0x004b, 0x004b).rw(FUNC(st2205u_device::lpwm_r), FUNC(st2205u_device::lpwm_w));
- map(0x004c, 0x004c).w(FUNC(st2205u_device::lpal_w));
- map(0x004e, 0x004e).rw(FUNC(st2205u_device::pl_r), FUNC(st2205u_device::pl_w));
- map(0x004f, 0x004f).rw(FUNC(st2205u_device::pcl_r), FUNC(st2205u_device::pcl_w));
- map(0x0052, 0x0052).rw(FUNC(st2205u_device::sctr_r), FUNC(st2205u_device::sctr_w));
- map(0x0053, 0x0053).rw(FUNC(st2205u_device::sckr_r), FUNC(st2205u_device::sckr_w));
- map(0x0054, 0x0054).rw(FUNC(st2205u_device::ssr_r), FUNC(st2205u_device::ssr_w));
- map(0x0055, 0x0055).rw(FUNC(st2205u_device::smod_r), FUNC(st2205u_device::smod_w));
- }
+ map(0x0040, 0x0040).w(FUNC(st2205u_device::lssal_w));
+ map(0x0041, 0x0041).w(FUNC(st2205u_device::lssah_w));
+ map(0x0042, 0x0042).w(FUNC(st2205u_device::lvpw_w));
+ map(0x0043, 0x0043).rw(FUNC(st2205u_device::lxmax_r), FUNC(st2205u_device::lxmax_w));
+ map(0x0044, 0x0044).rw(FUNC(st2205u_device::lymax_r), FUNC(st2205u_device::lymax_w));
+ map(0x0045, 0x0045).rw(FUNC(st2205u_device::lpan_r), FUNC(st2205u_device::lpan_w));
+ map(0x0046, 0x0046).rw(FUNC(st2205u_device::lbuf_r), FUNC(st2205u_device::lbuf_w));
+ map(0x0047, 0x0047).rw(FUNC(st2205u_device::lctr_r), FUNC(st2205u_device::lctr_w));
+ map(0x0048, 0x0048).w(FUNC(st2205u_device::lckr_w));
+ map(0x0049, 0x0049).w(FUNC(st2205u_device::lfra_w));
+ map(0x004a, 0x004a).rw(FUNC(st2205u_device::lac_r), FUNC(st2205u_device::lac_w));
+ map(0x004b, 0x004b).rw(FUNC(st2205u_device::lpwm_r), FUNC(st2205u_device::lpwm_w));
+ map(0x004c, 0x004c).w(FUNC(st2205u_device::lpal_w));
+ map(0x004e, 0x004e).rw(FUNC(st2205u_device::pl_r), FUNC(st2205u_device::pl_w));
+ map(0x004f, 0x004f).rw(FUNC(st2205u_device::pcl_r), FUNC(st2205u_device::pcl_w));
+ map(0x0052, 0x0052).rw(FUNC(st2205u_device::sctr_r), FUNC(st2205u_device::sctr_w));
+ map(0x0053, 0x0053).rw(FUNC(st2205u_device::sckr_r), FUNC(st2205u_device::sckr_w));
+ map(0x0054, 0x0054).rw(FUNC(st2205u_device::ssr_r), FUNC(st2205u_device::ssr_w));
+ map(0x0055, 0x0055).rw(FUNC(st2205u_device::smod_r), FUNC(st2205u_device::smod_w));
map(0x0057, 0x0057).rw(FUNC(st2205u_device::lvctr_r), FUNC(st2205u_device::lvctr_w));
- map(0x0058, 0x0058).rw(FUNC(st2205u_device::dptrl_r), FUNC(st2205u_device::dptrl_w));
- map(0x0059, 0x0059).rw(FUNC(st2205u_device::dptrh_r), FUNC(st2205u_device::dptrh_w));
- map(0x005a, 0x005a).rw(FUNC(st2205u_device::dbkrl_r), FUNC(st2205u_device::dbkrl_w));
- map(0x005b, 0x005b).rw(FUNC(st2205u_device::dbkrh_r), FUNC(st2205u_device::dbkrh_w));
- map(0x005c, 0x005c).rw(FUNC(st2205u_device::dcntl_r), FUNC(st2205u_device::dcntl_w));
- map(0x005d, 0x005d).rw(FUNC(st2205u_device::dcnth_r), FUNC(st2205u_device::dcnth_w));
- map(0x005e, 0x005e).rw(FUNC(st2205u_device::dctr_r), FUNC(st2205u_device::dctr_w));
- map(0x005f, 0x005f).rw(FUNC(st2205u_device::dmod_r), FUNC(st2205u_device::dmod_w));
map(0x0060, 0x0060).rw(FUNC(st2205u_device::uctr_r), FUNC(st2205u_device::uctr_w));
map(0x0061, 0x0061).rw(FUNC(st2205u_device::usr_r), FUNC(st2205u_device::usr_clr_w));
map(0x0062, 0x0062).rw(FUNC(st2205u_device::irctr_r), FUNC(st2205u_device::irctr_w));
@@ -930,10 +1108,31 @@ void st2205u_device::int_map(address_map &map)
map(0x0064, 0x0064).rw(FUNC(st2205u_device::udata_r), FUNC(st2205u_device::udata_w));
map(0x0066, 0x0066).rw(FUNC(st2205u_device::brs_r), FUNC(st2205u_device::brs_w));
map(0x0067, 0x0067).rw(FUNC(st2205u_device::bdiv_r), FUNC(st2205u_device::bdiv_w));
- map(0x0070, 0x0070).rw(FUNC(st2205u_device::usbcon_r), FUNC(st2205u_device::usbcon_w));
- map(0x0071, 0x0071).rw(FUNC(st2205u_device::usbien_r), FUNC(st2205u_device::usbien_w));
map(0x0080, 0x1fff).rw(FUNC(st2205u_device::ram_r), FUNC(st2205u_device::ram_w)); // assumed to be shared with banked RAM
map(0x2000, 0x3fff).rw(FUNC(st2205u_device::bmem_r), FUNC(st2205u_device::bmem_w));
map(0x4000, 0x7fff).rw(FUNC(st2205u_device::pmem_r), FUNC(st2205u_device::pmem_w));
map(0x8000, 0xffff).rw(FUNC(st2205u_device::dmem_r), FUNC(st2205u_device::dmem_w));
}
+
+void st2302u_device::int_map(address_map &map)
+{
+ base_map(map);
+ map(0x0000, 0x0005).rw(FUNC(st2302u_device::pdata_r), FUNC(st2302u_device::pdata_w));
+ map(0x0006, 0x0006).rw(FUNC(st2302u_device::psc_r), FUNC(st2302u_device::psc_w));
+ map(0x0008, 0x000d).rw(FUNC(st2302u_device::pctrl_r), FUNC(st2302u_device::pctrl_w));
+ map(0x000e, 0x000e).rw(FUNC(st2302u_device::pfc_r), FUNC(st2302u_device::pfc_w));
+ map(0x000f, 0x000f).rw(FUNC(st2302u_device::pfd_r), FUNC(st2302u_device::pfd_w));
+ map(0x0012, 0x0012).rw(FUNC(st2302u_device::sctr_r), FUNC(st2302u_device::sctr_w));
+ map(0x0013, 0x0013).rw(FUNC(st2302u_device::sckr_r), FUNC(st2302u_device::sckr_w));
+ map(0x0014, 0x0014).rw(FUNC(st2302u_device::ssr_r), FUNC(st2302u_device::ssr_w));
+ map(0x0015, 0x0015).rw(FUNC(st2302u_device::smod_r), FUNC(st2302u_device::smod_w));
+ //map(0x0018, 0x0018).(?);
+ map(0x0040, 0x0047).rw(FUNC(st2302u_device::psg_r), FUNC(st2302u_device::psg_w));
+ map(0x0048, 0x004b).rw(FUNC(st2302u_device::vol_r), FUNC(st2302u_device::vol_w));
+ map(0x004c, 0x004d).rw(FUNC(st2302u_device::volm_r), FUNC(st2302u_device::volm_w));
+ map(0x004e, 0x004e).rw(FUNC(st2302u_device::psgc_r), FUNC(st2302u_device::psgc_w));
+ map(0x004f, 0x004f).rw(FUNC(st2302u_device::psgm_r), FUNC(st2302u_device::psgm_w));
+ map(0x0080, 0x07ff).ram();
+ map(0x4000, 0x7fff).rw(FUNC(st2302u_device::pmem_r), FUNC(st2302u_device::pmem_w));
+ map(0x8000, 0xffff).rw(FUNC(st2302u_device::dmem_r), FUNC(st2302u_device::dmem_w));
+}
diff --git a/src/devices/cpu/m6502/st2205u.h b/src/devices/cpu/m6502/st2205u.h
index 452337da42e..d5bd7f04f03 100644
--- a/src/devices/cpu/m6502/st2205u.h
+++ b/src/devices/cpu/m6502/st2205u.h
@@ -13,7 +13,7 @@
#include "st2xxx.h"
-class st2205u_device : public st2xxx_device
+class st2205u_base_device : public st2xxx_device
{
public:
enum {
@@ -36,8 +36,6 @@ public:
ST_VOL3,
ST_VOLM0,
ST_VOLM1,
- ST_LBUF,
- ST_BRR,
ST_DMS0,
ST_DMS1,
ST_DMD0,
@@ -57,65 +55,19 @@ public:
ST_LVCTR
};
- st2205u_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
-
- void set_alt_map() { m_alt_map = true; }
-
protected:
- virtual void device_start() override;
+ st2205u_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, address_map_constructor internal_map, int data_bits, bool has_banked_ram);
+
virtual void device_reset() override;
- virtual u16 st2xxx_ireq_mask() const override { return 0xdfff; }
- virtual const char *st2xxx_irq_name(int i) const override;
- virtual u8 st2xxx_pmcr_mask() const override { return 0xff; }
virtual unsigned st2xxx_bt_divider(int n) const override;
virtual u8 st2xxx_prs_mask() const override { return 0xc0; }
virtual void st2xxx_tclk_start() override;
virtual void st2xxx_tclk_stop() override;
- virtual u8 st2xxx_sys_mask() const override { return 0xfe; }
- virtual u8 st2xxx_misc_mask() const override { return 0x0f; }
- virtual bool st2xxx_wdten_on_reset() const override { return true; }
virtual bool st2xxx_has_dma() const override { return true; }
- virtual u8 st2xxx_lpan_mask() const override { return 0x0f; }
- virtual u8 st2xxx_lctr_mask() const override { return 0xef; }
- virtual u8 st2xxx_lckr_mask() const override { return 0x3f; }
- virtual u8 st2xxx_lpwm_mask() const override { return 0xff; }
- virtual unsigned st2xxx_lfr_clocks() const override;
- virtual bool st2xxx_has_spi() const override { return true; }
- virtual bool st2xxx_spi_iis() const override { return true; }
- virtual u8 st2xxx_uctr_mask() const override { return 0x3f; }
- virtual u8 st2xxx_bctr_mask() const override { return 0xb7; }
-private:
- class mi_st2205u : public mi_st2xxx {
- public:
- virtual u8 read(u16 adr) override;
- virtual u8 read_sync(u16 adr) override;
- virtual u8 read_arg(u16 adr) override;
- virtual u8 read_vector(u16 adr) override;
- virtual void write(u16 adr, u8 val) override;
-
- u8 pread(u16 adr);
- u8 preadc(u16 adr);
- void pwrite(u16 adr, u8 val);
- u8 dread(u16 adr);
- u8 dreadc(u16 adr);
- void dwrite(u16 adr, u8 val);
- u8 bread(u16 adr);
- u8 breadc(u16 adr);
- void bwrite(u16 adr, u8 val);
-
- u16 brr;
+ void base_init(std::unique_ptr<mi_st2xxx> &&intf);
- std::unique_ptr<u8[]> ram;
- };
-
- template<int N> TIMER_CALLBACK_MEMBER(bt_interrupt);
-
- u8 brrl_r();
- void brrl_w(u8 data);
- u8 brrh_r();
- void brrh_w(u8 data);
u8 btc_r();
void btc_w(u8 data);
u32 tclk_pres_div(u8 mode) const;
@@ -133,6 +85,7 @@ private:
void t4c_w(u8 data);
u8 tien_r();
void tien_w(u8 data);
+
u8 psg_r(offs_t offset);
void psg_w(offs_t offset, u8 data);
u8 psgc_r();
@@ -143,9 +96,7 @@ private:
void vol_w(offs_t offset, u8 data);
u8 volm_r(offs_t offset);
void volm_w(offs_t offset, u8 data);
- u8 lbuf_r();
- void lbuf_w(u8 data);
- void lpal_w(u8 data);
+
u8 usbcon_r();
void usbcon_w(u8 data);
u8 usbien_r();
@@ -166,21 +117,14 @@ private:
void dctr_w(u8 data);
u8 dmod_r();
void dmod_w(u8 data);
+
u8 rctr_r();
void rctr_w(u8 data);
+
u8 lvctr_r();
void lvctr_w(u8 data);
- u8 ram_r(offs_t offset);
- void ram_w(offs_t offset, u8 data);
- u8 pmem_r(offs_t offset);
- void pmem_w(offs_t offset, u8 data);
- u8 dmem_r(offs_t offset);
- void dmem_w(offs_t offset, u8 data);
- u8 bmem_r(offs_t offset);
- void bmem_w(offs_t offset, u8 data);
-
- void int_map(address_map &map);
+ void base_map(address_map &map);
u8 m_btc;
u16 m_tc_12bit[4];
@@ -196,9 +140,6 @@ private:
u8 m_psg_on;
u8 m_psg_vol[4];
u8 m_psg_volm[2];
- u8 m_lbuf;
- u8 m_lpal_index;
- u8 m_gray_levels[16];
u8 m_usbcon;
u8 m_usbien;
u16 m_dptr[4];
@@ -208,10 +149,139 @@ private:
u8 m_dmod[2];
u8 m_rctr;
u8 m_lvctr;
+};
+
+class st2205u_device : public st2205u_base_device
+{
+public:
+ enum {
+ ST_LBUF = ST_LVCTR + 1,
+ ST_BRR
+ };
+
+ st2205u_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+
+protected:
+ virtual void device_start() override;
+ virtual void device_reset() override;
- bool m_alt_map; // hack
+ virtual u16 st2xxx_ireq_mask() const override { return 0xdfff; }
+ virtual const char *st2xxx_irq_name(int i) const override;
+ virtual u8 st2xxx_pmcr_mask() const override { return 0xff; }
+ virtual u8 st2xxx_sys_mask() const override { return 0xfe; }
+ virtual u8 st2xxx_misc_mask() const override { return 0x0f; }
+ virtual bool st2xxx_wdten_on_reset() const override { return true; }
+ virtual u8 st2xxx_lpan_mask() const override { return 0x0f; }
+ virtual u8 st2xxx_lctr_mask() const override { return 0xef; }
+ virtual u8 st2xxx_lckr_mask() const override { return 0x3f; }
+ virtual u8 st2xxx_lpwm_mask() const override { return 0xff; }
+ virtual unsigned st2xxx_lfr_clocks() const override;
+ virtual bool st2xxx_has_spi() const override { return true; }
+ virtual bool st2xxx_spi_iis() const override { return true; }
+ virtual u8 st2xxx_uctr_mask() const override { return 0x3f; }
+ virtual u8 st2xxx_bctr_mask() const override { return 0xb7; }
+
+private:
+ class mi_st2205u : public mi_st2xxx {
+ public:
+ virtual u8 read(u16 adr) override;
+ virtual u8 read_sync(u16 adr) override;
+ virtual u8 read_arg(u16 adr) override;
+ virtual u8 read_vector(u16 adr) override;
+ virtual void write(u16 adr, u8 val) override;
+
+ u8 pread(u16 adr);
+ u8 preadc(u16 adr);
+ void pwrite(u16 adr, u8 val);
+ u8 dread(u16 adr);
+ u8 dreadc(u16 adr);
+ void dwrite(u16 adr, u8 val);
+ u8 bread(u16 adr);
+ u8 breadc(u16 adr);
+ void bwrite(u16 adr, u8 val);
+
+ u16 brr;
+
+ std::unique_ptr<u8[]> ram;
+ };
+
+ u8 brrl_r();
+ void brrl_w(u8 data);
+ u8 brrh_r();
+ void brrh_w(u8 data);
+
+ u8 lbuf_r();
+ void lbuf_w(u8 data);
+ void lpal_w(u8 data);
+
+ u8 ram_r(offs_t offset);
+ void ram_w(offs_t offset, u8 data);
+ u8 pmem_r(offs_t offset);
+ void pmem_w(offs_t offset, u8 data);
+ u8 dmem_r(offs_t offset);
+ void dmem_w(offs_t offset, u8 data);
+ u8 bmem_r(offs_t offset);
+ void bmem_w(offs_t offset, u8 data);
+
+ void int_map(address_map &map);
+
+ u8 m_lbuf;
+ u8 m_lpal_index;
+ u8 m_gray_levels[16];
+};
+
+class st2302u_device : public st2205u_base_device
+{
+public:
+ st2302u_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+
+protected:
+ virtual void device_start() override;
+
+ virtual u16 st2xxx_ireq_mask() const override { return 0xd37f; } // ???
+ virtual const char *st2xxx_irq_name(int i) const override;
+ virtual u8 st2xxx_pmcr_mask() const override { return 0xff; } // ???
+ virtual u8 st2xxx_sys_mask() const override { return 0xfe; } // ???
+ virtual u8 st2xxx_misc_mask() const override { return 0x0f; } // ???
+ virtual bool st2xxx_wdten_on_reset() const override { return true; } // ???
+ virtual u8 st2xxx_lpan_mask() const override { return 0; } // no LCDC
+ virtual u8 st2xxx_lctr_mask() const override { return 0; } // no LCDC
+ virtual u8 st2xxx_lckr_mask() const override { return 0; } // no LCDC
+ virtual u8 st2xxx_lpwm_mask() const override { return 0; } // no LCDC
+ virtual unsigned st2xxx_lfr_clocks() const override { return 0; } // no LCDC
+ virtual bool st2xxx_has_spi() const override { return true; }
+ virtual bool st2xxx_spi_iis() const override { return true; }
+ virtual u8 st2xxx_uctr_mask() const override { return 0; } // no UART
+ virtual u8 st2xxx_bctr_mask() const override { return 0; } // no UART
+
+private:
+ class mi_st2302u : public mi_st2xxx {
+ public:
+ virtual u8 read(u16 adr) override;
+ virtual u8 read_sync(u16 adr) override;
+ virtual u8 read_arg(u16 adr) override;
+ virtual u8 read_vector(u16 adr) override;
+ virtual void write(u16 adr, u8 val) override;
+
+ u8 pread(u16 adr);
+ u8 preadc(u16 adr);
+ void pwrite(u16 adr, u8 val);
+ u8 dread(u16 adr);
+ u8 dreadc(u16 adr);
+ void dwrite(u16 adr, u8 val);
+ };
+
+ u8 ram_r(offs_t offset);
+ void ram_w(offs_t offset, u8 data);
+ u8 pmem_r(offs_t offset);
+ void pmem_w(offs_t offset, u8 data);
+ u8 dmem_r(offs_t offset);
+ void dmem_w(offs_t offset, u8 data);
+
+ void int_map(address_map &map);
};
DECLARE_DEVICE_TYPE(ST2205U, st2205u_device)
+DECLARE_DEVICE_TYPE(ST2302U, st2302u_device)
#endif // MAME_MACHINE_M6502_ST2205U_H
diff --git a/src/devices/cpu/m6502/st2xxx.cpp b/src/devices/cpu/m6502/st2xxx.cpp
index c890ab5ef15..2c24f65f653 100644
--- a/src/devices/cpu/m6502/st2xxx.cpp
+++ b/src/devices/cpu/m6502/st2xxx.cpp
@@ -4,15 +4,19 @@
Sitronix ST2XXX LCD MCUs
- This extended SoC family combines a 65C02 CPU core (including the
- Rockwell bit opcodes) with a wide variety of on-chip peripherals.
- Features common to all besides internal RAM and ROM are parallel
- ports, internal timers, a multi-level interrupt controller, LCD
- controllers (of varying degrees of sophistication), R/C/slow XTAL
- clock generators, power management and PSG channels for speaker
- output. Each MCU also has numerous pins dedicated to LCD segment
- drivers, an external bus addressing several MB of off-chip
- memory using multiple chip select signals, or both.
+ This extended SoC family combines a W65C02S 8-bit CPU core
+ (including the Rockwell bit opcodes) with a wide variety of on-
+ chip peripherals. Common features besides internal RAM and ROM are
+ parallel ports, internal timers, a vectored interrupt controller,
+ LCD controllers (of varying degrees of sophistication), R/C/slow
+ XTAL clock generators, power management and PSG channels for
+ speaker output. Each MCU also has numerous pins dedicated to LCD
+ segment drivers (ST20XX, ST2104, ST2108), an external bus capable
+ of addressing several MB of off-chip memory using multiple chip
+ select signals (ST2100, ST22XX), or both (ST25XX, ST26XX). The
+ later ST23XX series, targeted mostly at digital greeting card
+ applications, eliminated on-chip LCD control but retained other
+ typical ST2XXX features.
On all ST2XXX MCUs but the smallest single-chip ST20XX models,
4000–7FFF (nominally program memory) and 8000–FFFF (nominally
@@ -23,6 +27,9 @@
switch 4000–7FFF to a different bank during interrupt service if
the IRREN bit in the SYS register is set.
+ At some time between 2010 and 2012, Sitronix spun off all of its
+ SoC product line to mCore Technology Corporation.
+
**********************************************************************/
#include "emu.h"
@@ -179,17 +186,20 @@ void st2xxx_device::save_common_registers()
save_item(NAME(m_misc));
save_item(NAME(m_ireq));
save_item(NAME(m_iena));
- save_item(NAME(m_lssa));
- save_item(NAME(m_lvpw));
- save_item(NAME(m_lxmax));
- save_item(NAME(m_lymax));
- if (st2xxx_lpan_mask() != 0)
- save_item(NAME(m_lpan));
- save_item(NAME(m_lctr));
- save_item(NAME(m_lckr));
- save_item(NAME(m_lfra));
- save_item(NAME(m_lac));
- save_item(NAME(m_lpwm));
+ if (st2xxx_lctr_mask() != 0)
+ {
+ save_item(NAME(m_lssa));
+ save_item(NAME(m_lvpw));
+ save_item(NAME(m_lxmax));
+ save_item(NAME(m_lymax));
+ if (st2xxx_lpan_mask() != 0)
+ save_item(NAME(m_lpan));
+ save_item(NAME(m_lctr));
+ save_item(NAME(m_lckr));
+ save_item(NAME(m_lfra));
+ save_item(NAME(m_lac));
+ save_item(NAME(m_lpwm));
+ }
if (st2xxx_has_spi())
{
save_item(NAME(m_sctr));
diff --git a/src/devices/cpu/ns32000/ns32000.cpp b/src/devices/cpu/ns32000/ns32000.cpp
index 41743521755..4b796f8f345 100644
--- a/src/devices/cpu/ns32000/ns32000.cpp
+++ b/src/devices/cpu/ns32000/ns32000.cpp
@@ -18,7 +18,7 @@ DEFINE_DEVICE_TYPE(NS32032, ns32032_device, "ns32032", "National Semiconductor N
* - address translation/abort
* - floating point and other unimplemented instructions
* - format 6: subp,addp
- * - format 7: cmpm, dei
+ * - format 7: cmpm
* - format 8: movus/movsu
* - cascaded interrupts
* - instruction cycles
@@ -240,8 +240,13 @@ void ns32000_device::decode(addr_mode *mode, unsigned imm_size, unsigned &bytes)
case 0x00: case 0x01: case 0x02: case 0x03:
case 0x04: case 0x05: case 0x06: case 0x07:
// register
- mode[i].base = m_r[mode[i].gen];
- mode[i].type = scaled[i] ? MEM : REG;
+ if (scaled[i])
+ {
+ mode[i].base = m_r[mode[i].gen];
+ mode[i].type = MEM;
+ }
+ else
+ mode[i].type = REG;
break;
case 0x08: case 0x09: case 0x0a: case 0x0b:
case 0x0c: case 0x0d: case 0x0e: case 0x0f:
@@ -326,6 +331,10 @@ u32 ns32000_device::ea(addr_mode const mode)
switch (mode.type)
{
+ case REG:
+ base = m_r[mode.gen];
+ break;
+
case IND:
base = m_bus[12].read_dword_unaligned(mode.base);
break;
@@ -343,9 +352,9 @@ u32 ns32000_device::ea(addr_mode const mode)
return base + mode.disp;
}
-u32 ns32000_device::gen_read(addr_mode mode, unsigned size)
+u64 ns32000_device::gen_read(addr_mode mode, unsigned size)
{
- u32 data = 0;
+ u64 data = 0;
switch (mode.type)
{
@@ -354,7 +363,10 @@ u32 ns32000_device::gen_read(addr_mode mode, unsigned size)
break;
case REG:
- data = mode.base + mode.disp;
+ if (size == SIZE_Q)
+ data = (u64(m_r[mode.gen ^ 1]) << 32) | m_r[mode.gen ^ 0];
+ else
+ data = m_r[mode.gen] & size_mask[size];
break;
case TOS:
@@ -371,30 +383,32 @@ u32 ns32000_device::gen_read(addr_mode mode, unsigned size)
break;
default:
- if (size)
- if (size == 3)
- data = space(0).read_dword_unaligned(ea(mode));
- else
- data = space(0).read_word_unaligned(ea(mode));
- else
- data = space(0).read_byte(ea(mode));
+ switch (size)
+ {
+ case SIZE_B: data = space(0).read_byte(ea(mode)); break;
+ case SIZE_W: data = space(0).read_word_unaligned(ea(mode)); break;
+ case SIZE_D: data = space(0).read_dword_unaligned(ea(mode)); break;
+ case SIZE_Q: data = space(0).read_qword_unaligned(ea(mode)); break;
+ }
break;
}
return data;
}
-s32 ns32000_device::gen_read_sx(addr_mode mode, unsigned size)
+s64 ns32000_device::gen_read_sx(addr_mode mode, unsigned size)
{
- u32 const data = gen_read(mode, size);
+ u64 data = gen_read(mode, size);
- if (size)
- if (size == SIZE_D)
- return s32(data);
- else
- return s16(data);
- else
- return s8(data);
+ switch (size)
+ {
+ case SIZE_B: data = s8(data); break;
+ case SIZE_W: data = s16(data); break;
+ case SIZE_D: data = s32(data); break;
+ case SIZE_Q: data = s64(data); break;
+ }
+
+ return data;
}
void ns32000_device::gen_write(addr_mode mode, unsigned size, u64 data)
@@ -402,7 +416,13 @@ void ns32000_device::gen_write(addr_mode mode, unsigned size, u64 data)
switch (mode.type)
{
case REG:
- m_r[mode.gen] = (m_r[mode.gen] & ~size_mask[size]) | (data & size_mask[size]);
+ if (size == SIZE_Q)
+ {
+ m_r[mode.gen ^ 0] = u32(data);
+ m_r[mode.gen ^ 1] = data >> 32;
+ }
+ else
+ m_r[mode.gen] = (m_r[mode.gen] & ~size_mask[size]) | (data & size_mask[size]);
break;
case TOS:
@@ -426,7 +446,6 @@ void ns32000_device::gen_write(addr_mode mode, unsigned size, u64 data)
case SIZE_D: space(0).write_dword_unaligned(ea(mode), data); break;
case SIZE_Q: space(0).write_qword_unaligned(ea(mode), data); break;
}
-
break;
}
}
@@ -846,17 +865,17 @@ void ns32000_device::execute_run()
m_psr &= ~(PSR_N | PSR_Z | PSR_L);
- if ((size == 3 && s32(src1) > s32(src2))
- || ((size == 1 && s16(src1) > s16(src2))
- || ((size == 0 && s8(src1) > s8(src2)))))
+ if ((size == SIZE_D && s32(src1) > s32(src2))
+ || ((size == SIZE_W && s16(src1) > s16(src2))
+ || ((size == SIZE_B && s8(src1) > s8(src2)))))
m_psr |= PSR_N;
- if ((src1 & size_mask[size]) == (src2 & size_mask[size]))
+ if (src1 == src2)
m_psr |= PSR_Z;
- if ((size == 3 && u32(src1) > u32(src2))
- || ((size == 1 && u16(src1) > u16(src2))
- || ((size == 0 && u8(src1) > u8(src2)))))
+ if ((size == SIZE_D && u32(src1) > u32(src2))
+ || ((size == SIZE_W && u16(src1) > u16(src2))
+ || ((size == SIZE_B && u8(src1) > u8(src2)))))
m_psr |= PSR_L;
}
m_pc += bytes;
@@ -950,25 +969,25 @@ void ns32000_device::execute_run()
{
case 0x0: // US
// TODO: user stack pointer?
- m_sp1 = gen_read(mode[0], size) & size_mask[size];
+ m_sp1 = gen_read(mode[0], size);
m_pc += bytes;
break;
case 0x8: // FP
- m_fp = gen_read(mode[0], size) & size_mask[size];
+ m_fp = gen_read(mode[0], size);
m_pc += bytes;
break;
case 0x9: // SP
- SP = gen_read(mode[0], size) & size_mask[size];
+ SP = gen_read(mode[0], size);
m_pc += bytes;
break;
case 0xa: // SB
- m_sb = gen_read(mode[0], size) & size_mask[size];
+ m_sb = gen_read(mode[0], size);
m_pc += bytes;
break;
case 0xd: // PSR
if (!(m_psr & PSR_U))
{
- u32 const src = gen_read(mode[0], size) & size_mask[size];
+ u32 const src = gen_read(mode[0], size);
if (size == 0)
m_psr = (m_psr & 0xff00) | u8(src);
@@ -983,14 +1002,14 @@ void ns32000_device::execute_run()
case 0xe: // INTBASE
if (!(m_psr & PSR_U))
{
- m_intbase = gen_read(mode[0], size) & size_mask[size];
+ m_intbase = gen_read(mode[0], size);
m_pc += bytes;
}
else
interrupt(ILL, m_pc);
break;
case 0xf: // MOD
- m_mod = gen_read(mode[0], size) & size_mask[size];
+ m_mod = gen_read(mode[0], size);
m_pc += bytes;
break;
}
@@ -1140,17 +1159,17 @@ void ns32000_device::execute_run()
m_psr &= ~(PSR_N | PSR_Z | PSR_L);
- if ((size == 3 && s32(src1) > s32(src2))
- || ((size == 1 && s16(src1) > s16(src2))
- || ((size == 0 && s8(src1) > s8(src2)))))
+ if ((size == SIZE_D && s32(src1) > s32(src2))
+ || ((size == SIZE_W && s16(src1) > s16(src2))
+ || ((size == SIZE_B && s8(src1) > s8(src2)))))
m_psr |= PSR_N;
- if ((src1 & size_mask[size]) == (src2 & size_mask[size]))
+ if (src1 == src2)
m_psr |= PSR_Z;
- if ((size == 3 && u32(src1) > u32(src2))
- || ((size == 1 && u16(src1) > u16(src2))
- || ((size == 0 && u8(src1) > u8(src2)))))
+ if ((size == SIZE_D && u32(src1) > u32(src2))
+ || ((size == SIZE_W && u16(src1) > u16(src2))
+ || ((size == SIZE_B && u8(src1) > u8(src2)))))
m_psr |= PSR_L;
}
m_pc += bytes;
@@ -1218,8 +1237,8 @@ void ns32000_device::execute_run()
{
mode[1].rmw();
- u32 const src1 = gen_read(mode[0], size) & size_mask[size];
- u32 const src2 = gen_read(mode[1], size) & size_mask[size];
+ u32 const src1 = gen_read(mode[0], size);
+ u32 const src2 = gen_read(mode[1], size);
u32 const dest = src2 - src1;
flags(src1, src2, dest, size, true);
@@ -1258,8 +1277,8 @@ void ns32000_device::execute_run()
{
mode[1].rmw();
- u32 const src1 = gen_read(mode[0], size) & size_mask[size];
- u32 const src2 = gen_read(mode[1], size) & size_mask[size];
+ u32 const src1 = gen_read(mode[0], size);
+ u32 const src2 = gen_read(mode[1], size);
u32 const dest = src2 - src1 - (m_psr & PSR_C);
flags(src1, src2, dest, size, true);
@@ -1569,7 +1588,7 @@ void ns32000_device::execute_run()
mode[1].rmw();
s32 const count = gen_read_sx(mode[0], SIZE_B);
- u32 const src = gen_read(mode[1], size) & size_mask[size];
+ u32 const src = gen_read(mode[1], size);
u32 const dest = (count < 0) ? (src >> -count) : (src << count);
@@ -1621,20 +1640,20 @@ void ns32000_device::execute_run()
{
u32 const src = gen_read(mode[0], size);
- if (src & size_mask[size])
+ if (src)
m_psr |= PSR_C;
else
m_psr &= ~PSR_C;
if ((src ^ ~(size_mask[size] >> 1)) & size_mask[size])
{
- m_psr |= PSR_F;
- gen_write(mode[1], size, src);
+ m_psr &= ~PSR_F;
+ gen_write(mode[1], size, -src);
}
else
{
- m_psr &= ~PSR_F;
- gen_write(mode[1], size, -src);
+ m_psr |= PSR_F;
+ gen_write(mode[1], size, src);
}
}
m_pc += bytes;
@@ -1845,9 +1864,8 @@ void ns32000_device::execute_run()
// read.[BW],write.D
{
u32 const src = gen_read(mode[0], size);
- u32 const dest = src & size_mask[size];
- gen_write(mode[1], SIZE_D, dest);
+ gen_write(mode[1], SIZE_D, src);
}
m_pc += bytes;
break;
@@ -1885,22 +1903,14 @@ void ns32000_device::execute_run()
// read.i,rmw.2i
{
mode[1].rmw();
+ unsigned const size2 = size * 2 + 1;
u32 const src1 = gen_read(mode[0], size);
u32 const src2 = gen_read(mode[1], size);
- u64 const dest = mulu_32x32(src1 & size_mask[size], src2 & size_mask[size]);
+ u64 const dest = mulu_32x32(src1, src2);
- if (mode[1].type == REG)
- {
- unsigned const lo = mode[1].gen;
- unsigned const hi = lo ^ 1;
-
- m_r[lo] = (m_r[lo] & ~size_mask[size]) | (dest & size_mask[size]);
- m_r[hi] = (m_r[hi] & ~size_mask[size]) | ((dest >> ((size + 1) * 8)) & size_mask[size]);
- }
- else
- gen_write(mode[1], size * 2 + 1, dest);
+ gen_write(mode[1], size2, dest);
}
m_pc += bytes;
break;
@@ -1911,7 +1921,37 @@ void ns32000_device::execute_run()
// DEIi src,dest
// gen,gen
// read.i,rmw.2i
- fatalerror("unimplemented: dei (%s)\n", machine().describe_context());
+ {
+ mode[1].rmw();
+ unsigned const size2 = size * 2 + 1;
+
+ u32 const src1 = gen_read(mode[0], size);
+ if (src1)
+ {
+ u64 const src2 = gen_read(mode[1], size2);
+
+ u32 const quotient = src2 / src1;
+ u32 const remainder = src2 % src1;
+
+ if (mode[1].type == REG)
+ {
+ m_r[mode[1].gen ^ 0] = (m_r[mode[1].gen ^ 0] & ~size_mask[size]) | (remainder & size_mask[size]);
+ m_r[mode[1].gen ^ 1] = (m_r[mode[1].gen ^ 1] & ~size_mask[size]) | (quotient & size_mask[size]);
+ }
+ else
+ gen_write(mode[1], size2, (u64(quotient) << ((size + 1) * 8)) | remainder);
+
+ m_pc += bytes;
+ }
+ else
+ {
+ // restore stack pointer
+ if (mode[0].type == TOS)
+ SP -= size + 1;
+
+ interrupt(DVZ, m_pc);
+ }
+ }
break;
case 0xc:
// QUOi src,dest
@@ -2006,12 +2046,13 @@ void ns32000_device::execute_run()
{
s32 const src2 = gen_read_sx(mode[1], size);
- div_t const dest = std::div(src2, src1);
+ s32 const quotient = src2 / src1;
+ s32 const remainder = src2 % src1;
- if ((dest.quot < 0) && dest.rem)
- gen_write(mode[1], size, dest.quot - 1);
+ if ((quotient < 0) && remainder)
+ gen_write(mode[1], size, quotient - 1);
else
- gen_write(mode[1], size, dest.quot);
+ gen_write(mode[1], size, quotient);
m_pc += bytes;
}
@@ -2093,7 +2134,7 @@ void ns32000_device::execute_run()
s32 const offset = m_r[reg];
s32 const length = displacement(bytes);
- u32 const src = gen_read(mode[0], size) & size_mask[size];
+ u32 const src = gen_read(mode[0], size);
u32 dest;
if (mode[1].type == REG)
@@ -2148,8 +2189,8 @@ void ns32000_device::execute_run()
// reg,gen,gen
// read.i,read.i
{
- u32 const length = gen_read(mode[0], size) & size_mask[size];
- u32 const index = gen_read(mode[1], size) & size_mask[size];
+ u32 const length = gen_read(mode[0], size);
+ u32 const index = gen_read(mode[1], size);
m_r[reg] = m_r[reg] * (length + 1) + index;
}
@@ -2162,7 +2203,7 @@ void ns32000_device::execute_run()
mode[1].rmw();
u32 const base = gen_read(mode[0], size);
- u32 offset = gen_read(mode[1], SIZE_B) & size_mask[size];
+ u32 offset = gen_read(mode[1], SIZE_B);
unsigned const limit = (size + 1) * 8;
m_psr |= PSR_F;
diff --git a/src/devices/cpu/ns32000/ns32000.h b/src/devices/cpu/ns32000/ns32000.h
index dea909cdc68..af5977fe52e 100644
--- a/src/devices/cpu/ns32000/ns32000.h
+++ b/src/devices/cpu/ns32000/ns32000.h
@@ -71,8 +71,8 @@ private:
// operand read/write helpers
u32 ea(addr_mode const mode);
- u32 gen_read(addr_mode mode, unsigned size);
- s32 gen_read_sx(addr_mode mode, unsigned size);
+ u64 gen_read(addr_mode mode, unsigned size);
+ s64 gen_read_sx(addr_mode mode, unsigned size);
void gen_write(addr_mode mode, unsigned size, u64 data);
// other execution helpers
diff --git a/src/devices/machine/generalplus_gpl16250soc.cpp b/src/devices/machine/generalplus_gpl16250soc.cpp
index 60bd40ae33d..ac0c99f480e 100644
--- a/src/devices/machine/generalplus_gpl16250soc.cpp
+++ b/src/devices/machine/generalplus_gpl16250soc.cpp
@@ -188,6 +188,7 @@ void sunplus_gcm394_base_device::trigger_systemm_dma(int channel)
if (mode & 0x2000)
{
write_space(dest, val & 0xFF);
+ dest += destdelta;
write_space(dest, val >> 8);
}
else
diff --git a/src/emu/render.cpp b/src/emu/render.cpp
index 5a22b919e1c..221ce9fc929 100644
--- a/src/emu/render.cpp
+++ b/src/emu/render.cpp
@@ -1447,21 +1447,115 @@ render_primitive_list &render_target::get_primitives()
bool render_target::map_point_container(s32 target_x, s32 target_y, render_container &container, float &container_x, float &container_y)
{
- ioport_port *input_port;
- ioport_value input_mask;
- return map_point_internal(target_x, target_y, &container, container_x, container_y, input_port, input_mask);
+ std::pair<float, float> target_f(map_point_internal(target_x, target_y));
+
+ // explicitly check for the UI container
+ if (&container == &m_manager.ui_container())
+ {
+ // this hit test went against the UI container
+ if ((target_f.first >= 0.0f) && (target_f.first < 1.0f) && (target_f.second >= 0.0f) && (target_f.second < 1.0f))
+ {
+ // this point was successfully mapped
+ container_x = float(target_x) / m_width;
+ container_y = float(target_y) / m_height;
+ return true;
+ }
+ }
+ else
+ {
+ if (m_orientation & ORIENTATION_FLIP_X)
+ target_f.first = 1.0f - target_f.first;
+ if (m_orientation & ORIENTATION_FLIP_Y)
+ target_f.second = 1.0f - target_f.second;
+ if (m_orientation & ORIENTATION_SWAP_XY)
+ std::swap(target_f.first, target_f.second);
+
+ // try to find the right container
+ auto const &items(current_view().screen_items());
+ auto const found(std::find_if(
+ items.begin(),
+ items.end(),
+ [&container] (layout_view::item &item) { return &item.screen()->container() == &container; }));
+ if (items.end() != found)
+ {
+ layout_view::item &item(*found);
+ if (item.bounds().includes(target_f.first, target_f.second))
+ {
+ // point successfully mapped
+ container_x = (target_f.first - item.bounds().x0) / item.bounds().width();
+ container_y = (target_f.second - item.bounds().y0) / item.bounds().height();
+ return true;
+ }
+ }
+ }
+
+ // default to point not mapped
+ container_x = container_y = -1.0f;
+ return false;
}
//-------------------------------------------------
// map_point_input - attempts to map a point on
-// the specified render_target to the specified
-// container, if possible
+// the specified render_target to an input port
+// field, if possible
//-------------------------------------------------
bool render_target::map_point_input(s32 target_x, s32 target_y, ioport_port *&input_port, ioport_value &input_mask, float &input_x, float &input_y)
{
- return map_point_internal(target_x, target_y, nullptr, input_x, input_y, input_port, input_mask);
+ std::pair<float, float> target_f(map_point_internal(target_x, target_y));
+ if (m_orientation & ORIENTATION_FLIP_X)
+ target_f.first = 1.0f - target_f.first;
+ if (m_orientation & ORIENTATION_FLIP_Y)
+ target_f.second = 1.0f - target_f.second;
+ if (m_orientation & ORIENTATION_SWAP_XY)
+ std::swap(target_f.first, target_f.second);
+
+ auto const &items(current_view().interactive_items());
+ m_hit_test.resize(items.size() * 2);
+ std::fill(m_hit_test.begin(), m_hit_test.end(), false);
+
+ for (auto const &edge : current_view().interactive_edges_x())
+ {
+ if ((edge.position() > target_f.first) || ((edge.position() == target_f.first) && edge.trailing()))
+ break;
+ else
+ m_hit_test[edge.index()] = !edge.trailing();
+ }
+
+ for (auto const &edge : current_view().interactive_edges_y())
+ {
+ if ((edge.position() > target_f.second) || ((edge.position() == target_f.second) && edge.trailing()))
+ break;
+ else
+ m_hit_test[items.size() + edge.index()] = !edge.trailing();
+ }
+
+ for (unsigned i = 0; items.size() > i; ++i)
+ {
+ if (m_hit_test[i] && m_hit_test[items.size() + i])
+ {
+ layout_view::item &item(items[i]);
+ if (item.has_input())
+ {
+ // point successfully mapped
+ input_port = item.input_tag_and_mask(input_mask);
+ input_x = (target_f.first - item.bounds().x0) / item.bounds().width();
+ input_y = (target_f.second - item.bounds().y0) / item.bounds().height();
+ return true;
+ }
+ else
+ {
+ break;
+ }
+ }
+ }
+
+ // default to point not mapped
+ input_port = nullptr;
+ input_mask = 0;
+ input_x = input_y = -1.0f;
+ return false;
}
@@ -1528,6 +1622,8 @@ void render_target::resolve_tags()
for (layout_view &view : file.views())
{
view.resolve_tags();
+ if (&current_view() == &view)
+ view.recompute(visibility_mask(), m_layerconfig.zoom_to_screen());
}
}
}
@@ -2468,7 +2564,7 @@ void render_target::add_element_primitives(render_primitive_list &list, const ob
// mapping points
//-------------------------------------------------
-bool render_target::map_point_internal(s32 target_x, s32 target_y, render_container *container, float &mapped_x, float &mapped_y, ioport_port *&mapped_input_port, ioport_value &mapped_input_mask)
+std::pair<float, float> render_target::map_point_internal(s32 target_x, s32 target_y)
{
// compute the visible width/height
s32 viswidth, visheight;
@@ -2476,65 +2572,14 @@ bool render_target::map_point_internal(s32 target_x, s32 target_y, render_contai
// create a root transform for the target
object_transform root_xform;
- root_xform.xoffs = (float)(m_width - viswidth) / 2;
- root_xform.yoffs = (float)(m_height - visheight) / 2;
-
- // default to point not mapped
- mapped_x = -1.0;
- mapped_y = -1.0;
- mapped_input_port = nullptr;
- mapped_input_mask = 0;
+ root_xform.xoffs = float(m_width - viswidth) / 2;
+ root_xform.yoffs = float(m_height - visheight) / 2;
// convert target coordinates to float
- float target_fx = (float)(target_x - root_xform.xoffs) / viswidth;
- float target_fy = (float)(target_y - root_xform.yoffs) / visheight;
- if (m_manager.machine().ui().is_menu_active())
- {
- target_fx = (float)target_x / m_width;
- target_fy = (float)target_y / m_height;
- }
- // explicitly check for the UI container
- if (container != nullptr && container == &m_manager.ui_container())
- {
- // this hit test went against the UI container
- if (target_fx >= 0.0f && target_fx < 1.0f && target_fy >= 0.0f && target_fy < 1.0f)
- {
- // this point was successfully mapped
- mapped_x = (float)target_x / m_width;
- mapped_y = (float)target_y / m_height;
- return true;
- }
- return false;
- }
-
- // iterate over items in the view
- for (layout_view::item &item : current_view().items())
- {
- if ((visibility_mask() & item.visibility_mask()) != item.visibility_mask())
- continue;
-
- bool checkit;
-
- // if we're looking for a particular container, verify that we have the right one
- if (container != nullptr)
- checkit = (item.screen() != nullptr && &item.screen()->container() == container);
-
- // otherwise, assume we're looking for an input
- else
- checkit = item.has_input();
-
- // this target is worth looking at; now check the point
- if (checkit && target_fx >= item.bounds().x0 && target_fx < item.bounds().x1 && target_fy >= item.bounds().y0 && target_fy < item.bounds().y1)
- {
- // point successfully mapped
- mapped_x = (target_fx - item.bounds().x0) / (item.bounds().x1 - item.bounds().x0);
- mapped_y = (target_fy - item.bounds().y0) / (item.bounds().y1 - item.bounds().y0);
- mapped_input_port = item.input_tag_and_mask(mapped_input_mask);
- return true;
- }
- }
-
- return false;
+ if (!m_manager.machine().ui().is_menu_active())
+ return std::make_pair(float(target_x - root_xform.xoffs) / viswidth, float(target_y - root_xform.yoffs) / visheight);
+ else
+ return std::make_pair(float(target_x) / m_width, float(target_y) / m_height);
}
@@ -2556,18 +2601,12 @@ layout_view *render_target::view_by_index(unsigned index)
int render_target::view_index(layout_view &targetview) const
{
- // find the first named match
- int index = 0;
-
- // scan the list of views within each layout, skipping those that don't apply
- for (layout_file const &file : m_filelist)
- for (layout_view const &view : file.views())
- if (!(m_flags & RENDER_CREATE_NO_ART) || !view.has_art())
- {
- if (&targetview == &view)
- return index;
- index++;
- }
+ // return index of view, or zero if not found
+ for (int index = 0; m_views.size() > index; ++index)
+ {
+ if (&m_views[index].first.get() == &targetview)
+ return index;
+ }
return 0;
}
diff --git a/src/emu/render.h b/src/emu/render.h
index 8aff6b73af9..b0d0df82d3c 100644
--- a/src/emu/render.h
+++ b/src/emu/render.h
@@ -55,6 +55,7 @@
#include <memory>
#include <mutex>
#include <string>
+#include <tuple>
#include <unordered_map>
#include <utility>
#include <vector>
@@ -184,6 +185,7 @@ struct render_bounds
constexpr float width() const { return x1 - x0; }
constexpr float height() const { return y1 - y0; }
constexpr float aspect() const { return width() / height(); }
+ constexpr bool includes(float x, float y) const { return (x >= x0) && (x <= x1) && (y >= y0) && (y <= y1); }
};
@@ -738,7 +740,7 @@ public:
using view_environment = emu::render::detail::view_environment;
using element_map = std::unordered_map<std::string, layout_element>;
using group_map = std::unordered_map<std::string, layout_group>;
- using render_screen_list = std::list<std::reference_wrapper<screen_device>>;
+ using screen_ref_vector = std::vector<std::reference_wrapper<screen_device> >;
/// \brief A single item in a view
///
@@ -769,8 +771,11 @@ public:
u32 visibility_mask() const { return m_visibility_mask; }
int orientation() const { return m_orientation; }
render_container *screen_container(running_machine &machine) const;
+
+ // interactivity
bool has_input() const { return bool(m_input_port); }
ioport_port *input_tag_and_mask(ioport_value &mask) const { mask = m_input_mask; return m_input_port; };
+ bool clickthrough() const { return m_clickthrough; }
// fetch state based on configured source
int state() const;
@@ -778,34 +783,37 @@ public:
// resolve tags, if any
void resolve_tags();
- // setters
- void set_blend_mode(int mode) { m_blend_mode = mode; }
-
private:
static layout_element *find_element(view_environment &env, util::xml::data_node const &itemnode, element_map &elemmap);
static render_bounds make_bounds(view_environment &env, util::xml::data_node const &itemnode, layout_group::transform const &trans);
static std::string make_input_tag(view_environment &env, util::xml::data_node const &itemnode);
static int get_blend_mode(view_environment &env, util::xml::data_node const &itemnode);
+ static unsigned get_input_shift(ioport_value mask);
// internal state
layout_element *const m_element; // pointer to the associated element (non-screens only)
output_finder<> m_output; // associated output
bool const m_have_output; // whether we actually have an output
- std::string const m_input_tag; // input tag of this item
ioport_port * m_input_port; // input port of this item
ioport_field const * m_input_field; // input port field of this item
ioport_value const m_input_mask; // input mask of this item
- u8 m_input_shift; // input mask rightshift for raw (trailing 0s)
+ u8 const m_input_shift; // input mask rightshift for raw (trailing 0s)
bool const m_input_raw; // get raw data from input port
+ bool m_clickthrough; // should click pass through to lower elements
screen_device * m_screen; // pointer to screen
int m_orientation; // orientation of this item
render_bounds m_bounds; // bounds of the item
- render_bounds const m_rawbounds; // raw (original) bounds of the item
render_color m_color; // color of the item
int m_blend_mode; // blending mode to use when drawing
u32 m_visibility_mask; // combined mask of parent visibility groups
+
+ // cold items
+ std::string const m_input_tag; // input tag of this item
+ render_bounds const m_rawbounds; // raw (original) bounds of the item
+ bool const m_has_clickthrough; // whether clickthrough was explicitly configured
};
using item_list = std::list<item>;
+ using item_ref_vector = std::vector<std::reference_wrapper<item> >;
/// \brief A subset of items in a view that can be hidden or shown
///
@@ -831,6 +839,36 @@ public:
};
using visibility_toggle_vector = std::vector<visibility_toggle>;
+ /// \brief An edge of an item in a view
+ class edge
+ {
+ public:
+ // construction/destruction
+ constexpr edge(unsigned index, float position, bool trailing)
+ : m_index(index)
+ , m_position(position)
+ , m_trailing(trailing)
+ {
+ }
+
+ // getters
+ constexpr unsigned index() const { return m_index; }
+ constexpr float position() const { return m_position; }
+ constexpr bool trailing() const { return m_trailing; }
+
+ // comparison
+ constexpr bool operator<(edge const &that) const
+ {
+ return std::make_tuple(m_position, m_trailing, m_index) < std::make_tuple(that.m_position, that.m_trailing, that.m_index);
+ }
+
+ private:
+ unsigned m_index; // index of item in some collection
+ float m_position; // position of edge on given axis
+ bool m_trailing; // false for edge at lower position on axis
+ };
+ using edge_vector = std::vector<edge>;
+
// construction/destruction
layout_view(
layout_environment &env,
@@ -842,14 +880,18 @@ public:
// getters
item_list &items() { return m_items; }
const std::string &name() const { return m_name; }
- const render_screen_list &screens() const { return m_screens; }
size_t screen_count() const { return m_screens.size(); }
float effective_aspect() const { return m_effaspect; }
const render_bounds &bounds() const { return m_bounds; }
bool has_screen(screen_device &screen) const;
- bool has_art() const { return m_has_art; }
- u32 default_visibility_mask() const { return m_defvismask; }
+ const item_ref_vector &screen_items() const { return m_screen_items; }
+ const item_ref_vector &interactive_items() const { return m_interactive_items; }
+ const edge_vector &interactive_edges_x() const { return m_interactive_edges_x; }
+ const edge_vector &interactive_edges_y() const { return m_interactive_edges_y; }
+ const screen_ref_vector &screens() const { return m_screens; }
const visibility_toggle_vector &visibility_toggles() const { return m_vistoggles; }
+ u32 default_visibility_mask() const { return m_defvismask; }
+ bool has_art() const { return m_has_art; }
// operations
void recompute(u32 visibility_mask, bool zoom_to_screens);
@@ -877,15 +919,21 @@ private:
static std::string make_name(layout_environment &env, util::xml::data_node const &viewnode);
// internal state
- std::string m_name; // name of the layout
- render_screen_list m_screens; // list screens visible in current configuration
- float m_effaspect; // X/Y of the layout in current configuration
- render_bounds m_bounds; // computed bounds of the view in current configuration
- render_bounds m_expbounds; // explicit bounds of the view
- item_list m_items; // list of layout items
- bool m_has_art; // true if the layout contains non-screen elements
- u32 m_defvismask; // default visibility mask
- visibility_toggle_vector m_vistoggles;
+ std::string m_name; // name of the layout
+ float m_effaspect; // X/Y of the layout in current configuration
+ render_bounds m_bounds; // computed bounds of the view in current configuration
+ item_list m_items; // list of layout items
+ item_ref_vector m_screen_items; // visible items that represent screens to draw
+ item_ref_vector m_interactive_items;// visible items that can accept pointer input
+ edge_vector m_interactive_edges_x;
+ edge_vector m_interactive_edges_y;
+ screen_ref_vector m_screens; // list screens visible in current configuration
+
+ // cold items
+ visibility_toggle_vector m_vistoggles; // collections of items that can be shown/hidden
+ render_bounds m_expbounds; // explicit bounds of the view
+ u32 m_defvismask; // default visibility mask
+ bool m_has_art; // true if the layout contains non-screen elements
};
@@ -1026,7 +1074,7 @@ private:
bool load_layout_file(device_t &device, const char *dirname, util::xml::data_node const &rootnode);
void add_container_primitives(render_primitive_list &list, const object_transform &root_xform, const object_transform &xform, render_container &container, int blendmode);
void add_element_primitives(render_primitive_list &list, const object_transform &xform, layout_element &element, int state, int blendmode);
- bool map_point_internal(s32 target_x, s32 target_y, render_container *container, float &mapped_x, float &mapped_y, ioport_port *&mapped_input_port, ioport_value &mapped_input_mask);
+ std::pair<float, float> map_point_internal(s32 target_x, s32 target_y);
// config callbacks
void config_load(util::xml::data_node const &targetnode);
@@ -1067,6 +1115,7 @@ private:
float m_max_refresh; // maximum refresh rate, 0 or if none
int m_orientation; // orientation
render_layer_config m_layerconfig; // layer configuration
+ std::vector<bool> m_hit_test; // used when mapping points to inputs
layout_view * m_base_view; // the view at the time of first frame
int m_base_orientation; // the orientation at the time of first frame
render_layer_config m_base_layerconfig; // the layer configuration at the time of first frame
diff --git a/src/emu/rendlay.cpp b/src/emu/rendlay.cpp
index 7d9eed28bf3..72c50a3db3b 100644
--- a/src/emu/rendlay.cpp
+++ b/src/emu/rendlay.cpp
@@ -33,8 +33,9 @@
#include <utility>
#define LOG_GROUP_BOUNDS_RESOLUTION (1U << 1)
+#define LOG_INTERACTIVE_ITEMS (1U << 2)
-//#define VERBOSE (LOG_GROUP_BOUNDS_RESOLUTION)
+//#define VERBOSE (LOG_GROUP_BOUNDS_RESOLUTION | LOG_INTERACTIVE_ITEMS)
#define LOG_OUTPUT_FUNC osd_printf_verbose
#include "logmacro.h"
@@ -3060,8 +3061,8 @@ layout_view::layout_view(
: m_name(make_name(env, viewnode))
, m_effaspect(1.0f)
, m_items()
- , m_has_art(false)
, m_defvismask(0U)
+ , m_has_art(false)
{
// parse the layout
m_expbounds.x0 = m_expbounds.y0 = m_expbounds.x1 = m_expbounds.y1 = 0;
@@ -3122,7 +3123,7 @@ layout_view::layout_view(
{
// screens (-1) + overlays (RGB multiply) + backdrop (add) + bezels (alpha) + cpanels (alpha) + marquees (alpha)
for (item &backdrop : layers.backdrops)
- backdrop.set_blend_mode(BLENDMODE_ADD);
+ backdrop.m_blend_mode = BLENDMODE_ADD;
m_items.splice(m_items.end(), layers.screens);
m_items.splice(m_items.end(), layers.overlays);
m_items.splice(m_items.end(), layers.backdrops);
@@ -3137,7 +3138,7 @@ layout_view::layout_view(
for (item &screen : layers.screens)
{
if (screen.blend_mode() == -1)
- screen.set_blend_mode(BLENDMODE_ADD);
+ screen.m_blend_mode = BLENDMODE_ADD;
}
m_items.splice(m_items.end(), layers.backdrops);
m_items.splice(m_items.end(), layers.screens);
@@ -3180,9 +3181,13 @@ bool layout_view::has_screen(screen_device &screen) const
void layout_view::recompute(u32 visibility_mask, bool zoom_to_screen)
{
- // reset the bounds
+ // reset the bounds and collected active items
render_bounds scrbounds{ 0.0f, 0.0f, 0.0f, 0.0f };
m_bounds = scrbounds;
+ m_screen_items.clear();
+ m_interactive_items.clear();
+ m_interactive_edges_x.clear();
+ m_interactive_edges_y.clear();
m_screens.clear();
// loop over items and filter by visibility mask
@@ -3200,7 +3205,7 @@ void layout_view::recompute(u32 visibility_mask, bool zoom_to_screen)
first = false;
// accumulate visible screens and their bounds bounds
- if (curitem.m_screen)
+ if (curitem.screen())
{
if (scrfirst)
scrbounds = curitem.m_rawbounds;
@@ -3208,9 +3213,14 @@ void layout_view::recompute(u32 visibility_mask, bool zoom_to_screen)
union_render_bounds(scrbounds, curitem.m_rawbounds);
scrfirst = false;
- // accumulate the screens in use while we're scanning
- m_screens.emplace_back(*curitem.m_screen);
+ // accumulate active screens
+ m_screen_items.emplace_back(curitem);
+ m_screens.emplace_back(*curitem.screen());
}
+
+ // accumulate interactive elements
+ if (!curitem.clickthrough() || curitem.has_input())
+ m_interactive_items.emplace_back(curitem);
}
}
@@ -3239,8 +3249,8 @@ void layout_view::recompute(u32 visibility_mask, bool zoom_to_screen)
// determine the scale/offset for normalization
float const xoffs = m_bounds.x0;
float const yoffs = m_bounds.y0;
- float const xscale = (target_bounds.x1 - target_bounds.x0) / (m_bounds.x1 - m_bounds.x0);
- float const yscale = (target_bounds.y1 - target_bounds.y0) / (m_bounds.y1 - m_bounds.y0);
+ float const xscale = target_bounds.width() / m_bounds.width();
+ float const yscale = target_bounds.height() / m_bounds.height();
// normalize all the item bounds
for (item &curitem : items())
@@ -3250,6 +3260,32 @@ void layout_view::recompute(u32 visibility_mask, bool zoom_to_screen)
curitem.m_bounds.y0 = target_bounds.y0 + (curitem.m_rawbounds.y0 - yoffs) * yscale;
curitem.m_bounds.y1 = target_bounds.y0 + (curitem.m_rawbounds.y1 - yoffs) * yscale;
}
+
+ // sort edges of interactive items
+ LOGMASKED(LOG_INTERACTIVE_ITEMS, "Recalculated view '%s' with %u interactive items\n",
+ name(), m_interactive_items.size());
+ m_interactive_edges_x.reserve(m_interactive_items.size() * 2);
+ m_interactive_edges_y.reserve(m_interactive_items.size() * 2);
+ for (unsigned i = 0; m_interactive_items.size() > i; ++i)
+ {
+ item &curitem(m_interactive_items[i]);
+ LOGMASKED(LOG_INTERACTIVE_ITEMS, "%u: (%s %s %s %s) hasinput=%s clickthrough=%s\n",
+ i, curitem.bounds().x0, curitem.bounds().y0, curitem.bounds().x1, curitem.bounds().y1, curitem.has_input(), curitem.clickthrough());
+ m_interactive_edges_x.emplace_back(i, curitem.bounds().x0, false);
+ m_interactive_edges_x.emplace_back(i, curitem.bounds().x1, true);
+ m_interactive_edges_y.emplace_back(i, curitem.bounds().y0, false);
+ m_interactive_edges_y.emplace_back(i, curitem.bounds().y1, true);
+ }
+ std::sort(m_interactive_edges_x.begin(), m_interactive_edges_x.end());
+ std::sort(m_interactive_edges_y.begin(), m_interactive_edges_y.end());
+
+ if (VERBOSE & LOG_INTERACTIVE_ITEMS)
+ {
+ for (edge const &e : m_interactive_edges_x)
+ LOGMASKED(LOG_INTERACTIVE_ITEMS, "x=%s %c%u\n", e.position(), e.trailing() ? ']' : '[', e.index());
+ for (edge const &e : m_interactive_edges_y)
+ LOGMASKED(LOG_INTERACTIVE_ITEMS, "y=%s %c%u\n", e.position(), e.trailing() ? ']' : '[', e.index());
+ }
}
@@ -3469,25 +3505,25 @@ layout_view::item::item(
: m_element(find_element(env, itemnode, elemmap))
, m_output(env.device(), env.get_attribute_string(itemnode, "name", ""))
, m_have_output(env.get_attribute_string(itemnode, "name", "")[0])
- , m_input_tag(make_input_tag(env, itemnode))
, m_input_port(nullptr)
, m_input_field(nullptr)
, m_input_mask(env.get_attribute_int(itemnode, "inputmask", 0))
- , m_input_shift(0)
- , m_input_raw(0 != env.get_attribute_int(itemnode, "inputraw", 0))
+ , m_input_shift(get_input_shift(m_input_mask))
+ , m_input_raw(env.get_attribute_bool(itemnode, "inputraw", 0))
+ , m_clickthrough(env.get_attribute_bool(itemnode, "clickthrough", "yes"))
, m_screen(nullptr)
, m_orientation(orientation_add(env.parse_orientation(itemnode.get_child("orientation")), orientation))
- , m_rawbounds(make_bounds(env, itemnode, trans))
, m_color(render_color_multiply(env.parse_color(itemnode.get_child("color")), color))
, m_blend_mode(get_blend_mode(env, itemnode))
, m_visibility_mask(env.visibility_mask())
+ , m_input_tag(make_input_tag(env, itemnode))
+ , m_rawbounds(make_bounds(env, itemnode, trans))
+ , m_has_clickthrough(env.get_attribute_string(itemnode, "clickthrough", "")[0])
{
// fetch common data
int index = env.get_attribute_int(itemnode, "index", -1);
if (index != -1)
m_screen = screen_device_iterator(env.machine().root_device()).byindex(index);
- for (u32 mask = m_input_mask; (mask != 0) && (~mask & 1); mask >>= 1)
- m_input_shift++;
// sanity checks
if (strcmp(itemnode.get_name(), "screen") == 0)
@@ -3544,24 +3580,22 @@ int layout_view::item::state() const
// if configured to track an output, fetch its value
return m_output;
}
- else if (!m_input_tag.empty())
+ else if (m_input_port)
{
// if configured to an input, fetch the input value
- if (m_input_port)
+ if (m_input_raw)
{
- if (m_input_raw)
- {
- return (m_input_port->read() & m_input_mask) >> m_input_shift;
- }
- else
- {
- ioport_field const *const field(m_input_field ? m_input_field : m_input_port->field(m_input_mask));
- if (field)
- return ((m_input_port->read() ^ field->defvalue()) & m_input_mask) ? 1 : 0;
- }
+ return (m_input_port->read() & m_input_mask) >> m_input_shift;
+ }
+ else
+ {
+ ioport_field const *const field(m_input_field ? m_input_field : m_input_port->field(m_input_mask));
+ if (field)
+ return ((m_input_port->read() ^ field->defvalue()) & m_input_mask) ? 1 : 0;
}
}
+ // default to zero
return 0;
}
@@ -3584,6 +3618,7 @@ void layout_view::item::resolve_tags()
m_input_port = m_element->machine().root_device().ioport(m_input_tag);
if (m_input_port)
{
+ // if there's a matching unconditional field, cache it
for (ioport_field &field : m_input_port->fields())
{
if (field.mask() & m_input_mask)
@@ -3593,6 +3628,10 @@ void layout_view::item::resolve_tags()
break;
}
}
+
+ // if clickthrough isn't explicitly configured, having an I/O port implies false
+ if (!m_has_clickthrough)
+ m_clickthrough = false;
}
}
}
@@ -3680,6 +3719,22 @@ int layout_view::item::get_blend_mode(view_environment &env, util::xml::data_nod
}
+//---------------------------------------------
+// get_input_shift - shift to right-align LSB
+//---------------------------------------------
+
+unsigned layout_view::item::get_input_shift(ioport_value mask)
+{
+ unsigned result(0U);
+ while (mask && !BIT(mask, 0))
+ {
+ ++result;
+ mask >>= 1;
+ }
+ return result;
+}
+
+
//**************************************************************************
// LAYOUT VIEW VISIBILITY TOGGLE
diff --git a/src/lib/netlist/devices/nld_4006.cpp b/src/lib/netlist/devices/nld_4006.cpp
index bd036c80bb0..cd0e441c6b5 100644
--- a/src/lib/netlist/devices/nld_4006.cpp
+++ b/src/lib/netlist/devices/nld_4006.cpp
@@ -99,7 +99,7 @@ namespace netlist
auto d = m_supply.VCC()() - m_supply.GND()();
if (d > 0.1) // avoid unrealistic values
{
- m_tp = netlist_time::from_nsec(923.0 / d + 13.0); // calculated from datasheet
+ m_tp = netlist_time::from_nsec(gsl::narrow_cast<unsigned>(923.0 / d + 13.0)); // calculated from datasheet
}
}
diff --git a/src/lib/netlist/plib/pmatrix2d.h b/src/lib/netlist/plib/pmatrix2d.h
index 8cbba5aa410..d0fbac26194 100755
--- a/src/lib/netlist/plib/pmatrix2d.h
+++ b/src/lib/netlist/plib/pmatrix2d.h
@@ -51,6 +51,8 @@ namespace plib
::new(&m_v[i]) T();
}
+ PCOPYASSIGNMOVE(pmatrix2d, delete)
+
~pmatrix2d()
{
if (m_v != nullptr)
diff --git a/src/lib/netlist/plib/pstream.h b/src/lib/netlist/plib/pstream.h
index 4488494e381..65d95293298 100644
--- a/src/lib/netlist/plib/pstream.h
+++ b/src/lib/netlist/plib/pstream.h
@@ -64,13 +64,15 @@ namespace plib {
}
istream_uptr(const istream_uptr &) = delete;
istream_uptr &operator=(const istream_uptr &) = delete;
- istream_uptr(istream_uptr &&rhs) /*noexcept*/
+ istream_uptr(istream_uptr &&rhs)
{
m_strm = std::move(rhs.m_strm);
- m_filename = rhs.m_filename;
+ m_filename = std::move(rhs.m_filename);
}
istream_uptr &operator=(istream_uptr &&) /*noexcept*/ = delete;
+ ~istream_uptr() = default;
+
std::istream * operator ->() noexcept { return m_strm.get(); }
std::istream & operator *() noexcept { return *m_strm; }
pstring filename() { return m_filename; }
diff --git a/src/lib/netlist/plib/pstring.h b/src/lib/netlist/plib/pstring.h
index c9c07ab738d..9a58e75fbd3 100644
--- a/src/lib/netlist/plib/pstring.h
+++ b/src/lib/netlist/plib/pstring.h
@@ -284,7 +284,7 @@ struct putf_traits<1, CT>
static constexpr code_t code(const mem_t *p) noexcept
{
- const auto *p1 = reinterpret_cast<const unsigned char *>(p); // NOLINT(cppcoreguidelines-pro-type-reinterpret)
+ const auto *p1 = reinterpret_cast<const unsigned char *>(p); // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
return ((*p1 & 0x80) == 0x00) ? *p1 : // NOLINT
((*p1 & 0xE0) == 0xC0) ? static_cast<code_t>(((p1[0] & 0x3f) << 6) | (p1[1] & 0x3f)) : // NOLINT
((*p1 & 0xF0) == 0xE0) ? static_cast<code_t>(((p1[0] & 0x1f) << 12) | ((p1[1] & 0x3f) << 6) | ((p1[2] & 0x3f) << 0)) : // NOLINT
@@ -463,7 +463,7 @@ pstring_t<F>::pstring_t(C *string)
{
m_str.clear();
putf8string utf8(string);
- for (auto &c : utf8)
+ for (const auto &c : utf8)
*this += c;
}
diff --git a/src/mame/drivers/8080bw.cpp b/src/mame/drivers/8080bw.cpp
index 63f69dabdf5..fce3ba4df08 100644
--- a/src/mame/drivers/8080bw.cpp
+++ b/src/mame/drivers/8080bw.cpp
@@ -5310,6 +5310,7 @@ ROM_END
ROM_START( polariso )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "ps01.ic71", 0x0000, 0x0800, CRC(c04ce5a9) SHA1(62cc9b3b682ebecfb7600393862c65e26ff5263f) )
+ ROM_LOAD( "ps02.ic70", 0x0800, 0x0800, CRC(18648e4f) SHA1(9f672e108177d5d9bc004b41eec00dc4d19269ff) )
ROM_LOAD( "ps03.ic69", 0x1000, 0x0800, CRC(8680d7ea) SHA1(7fd4b8a415666c36842fed80d2798b48f8b29d0d) )
ROM_LOAD( "ps04.ic62", 0x1800, 0x0800, CRC(65694948) SHA1(de92a7f3e3ef732b573254baa60df60f8e068a5d) )
ROM_LOAD( "ps05.ic61", 0x4000, 0x0800, CRC(772e31f3) SHA1(fa0b866b6df1a9217e286ca880b3bb3fb0644bf3) )
diff --git a/src/mame/drivers/att3b2.cpp b/src/mame/drivers/att3b2.cpp
index 845f33aeb40..ba081e2e23a 100644
--- a/src/mame/drivers/att3b2.cpp
+++ b/src/mame/drivers/att3b2.cpp
@@ -23,8 +23,8 @@ public:
{
}
- void att3b2(machine_config &config);
- void att3b26(machine_config &config);
+ void att3b2v2(machine_config &config);
+ void att3b2v3(machine_config &config);
private:
void mem_map_300(address_map &map);
@@ -36,30 +36,40 @@ private:
void att3b2_state::mem_map_300(address_map &map)
{
+ map.global_mask(0x07ffffff); // 27-bit physical addresses
map(0x00000000, 0x00007fff).rom().region("bootstrap", 0);
map(0x00042000, 0x0004200f).rw("pit", FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask32(0x000000ff);
+ //map(0x00042013, 0x00042013).r(FUNC(att3b2_state::clear_csr6_r));
+ //map(0x00043000, 0x00043fff).rw(FUNC(att3b2_state::nvram_nibble_r), FUNC(att3b2_state::nvram_nibble_w)).umask32(0x00ff00ff);
+ //map(0x00044000, 0x0004403f).w(FUNC(att3b2_state::csr_w)).umask32(0x000000ff);
+ //map(0x00044002, 0x00044003).r(FUNC(att3b2_state::csr_r));
+ //map(0x00045003, 0x00045003).w(FUNC(att3b2_state::hard_disk_page_w));
map(0x00048000, 0x0004800f).rw("dmac", FUNC(am9517a_device::read), FUNC(am9517a_device::write));
map(0x00049000, 0x0004900f).rw("duart", FUNC(scn2681_device::read), FUNC(scn2681_device::write));
//map(0x0004a000, 0x0004a001).rw("hdc", FUNC(upd7261_device::read), FUNC(upd7261_device::write));
+ //map(0x0004c003, 0x0004c003).r(FUNC(att3b2_state::dpdram_size_r));
map(0x0004d000, 0x0004d003).rw("fdc", FUNC(wd2797_device::read), FUNC(wd2797_device::write));
- map(0x02000000, 0x02003fff).ram();
+ map(0x02000000, 0x0203ffff).ram();
}
void att3b2_state::mem_map_600(address_map &map)
{
map(0x00000000, 0x0001ffff).rom().region("bootstrap", 0);
- map(0x00041000, 0x0004100f).rw("pit", FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask32(0x000000ff);
+ //map(0x00040003, 0x00040003).w(FUNC(att3b2_state::floppy_control_w));
+ map(0x00041000, 0x0004100f).rw("pit", FUNC(pit8254_device::read), FUNC(pit8254_device::write)).umask32(0x000000ff);
+ //map(0x00042000, 0x00043fff).rw(FUNC(att3b2_state::nvram_byte_r), FUNC(att3b2_state::nvram_byte_w)).umask32(0x00ff00ff);
+ //map(0x00045002, 0x00045003).w(FUNC(att3b2_state::floppy_page_12bit_w));
map(0x00048000, 0x0004800f).rw("dmac", FUNC(am9517a_device::read), FUNC(am9517a_device::write));
map(0x00049000, 0x0004900f).rw("duart", FUNC(scn2681_device::read), FUNC(scn2681_device::write));
- map(0x0004a000, 0x0004a003).rw("fdc", FUNC(wd2797_device::read), FUNC(wd2797_device::write));
- map(0x02000000, 0x02003fff).mirror(0x1000000).ram();
+ map(0x0004a000, 0x0004a003).rw("fdc", FUNC(fd1793_device::read), FUNC(fd1793_device::write));
+ map(0x02000000, 0x0203ffff).mirror(0x1000000).ram();
}
static INPUT_PORTS_START(att3b2)
INPUT_PORTS_END
-void att3b2_state::att3b2(machine_config &config)
+void att3b2_state::att3b2v2(machine_config &config)
{
WE32100(config, m_maincpu, 10_MHz_XTAL); // special WE32102 XTAL runs at 1x or 2x speed
m_maincpu->set_addrmap(AS_PROGRAM, &att3b2_state::mem_map_300);
@@ -77,11 +87,15 @@ void att3b2_state::att3b2(machine_config &config)
// TODO: RTC (MM58174AN)
}
-void att3b2_state::att3b26(machine_config &config)
+void att3b2_state::att3b2v3(machine_config &config)
{
- att3b2(config);
+ att3b2v2(config);
m_maincpu->set_clock(18'000'000);
m_maincpu->set_addrmap(AS_PROGRAM, &att3b2_state::mem_map_600);
+
+ PIT8254(config.replace(), "pit"); // Intel 82C54
+
+ FD1793(config.replace(), "fdc", 1'000'000); // FD 1793-02
}
ROM_START(3b2_300)
@@ -116,7 +130,7 @@ ROM_START(3b2_600)
ROM_LOAD32_BYTE("abtrt.bin", 0x0003, 0x8000, CRC(0f075161) SHA1(b67c9c4549dc789df33b5a38e4b35fe26fdfbea6))
ROM_END
-COMP(1985, 3b2_300, 0, 0, att3b2, att3b2, att3b2_state, empty_init, "AT&T", "3B2/300", MACHINE_IS_SKELETON)
-COMP(198?, 3b2_310, 3b2_300, 0, att3b2, att3b2, att3b2_state, empty_init, "AT&T", "3B2/310", MACHINE_IS_SKELETON)
-COMP(198?, 3b2_400, 3b2_300, 0, att3b2, att3b2, att3b2_state, empty_init, "AT&T", "3B2/400", MACHINE_IS_SKELETON)
-COMP(198?, 3b2_600, 0, 0, att3b26, att3b2, att3b2_state, empty_init, "AT&T", "3B2/600", MACHINE_IS_SKELETON)
+COMP(1984, 3b2_300, 0, 0, att3b2v2, att3b2, att3b2_state, empty_init, "AT&T", "3B2/300", MACHINE_IS_SKELETON)
+COMP(1985, 3b2_310, 3b2_300, 0, att3b2v2, att3b2, att3b2_state, empty_init, "AT&T", "3B2/310", MACHINE_IS_SKELETON)
+COMP(1985, 3b2_400, 3b2_300, 0, att3b2v2, att3b2, att3b2_state, empty_init, "AT&T", "3B2/400", MACHINE_IS_SKELETON)
+COMP(1987, 3b2_600, 0, 0, att3b2v3, att3b2, att3b2_state, empty_init, "AT&T", "3B2/600", MACHINE_IS_SKELETON)
diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp
index 9e3e0bb3da6..ce3ab361072 100644
--- a/src/mame/drivers/bbc.cpp
+++ b/src/mame/drivers/bbc.cpp
@@ -1190,7 +1190,7 @@ void bbc_state::bbcb(machine_config &config)
/* printer */
centronics_device &centronics(CENTRONICS(config, "printer", centronics_devices, "printer"));
- centronics.ack_handler().set(m_via6522_1, FUNC(via6522_device::write_ca1)).invert(); // ack seems to be inverted?
+ centronics.ack_handler().set(m_via6522_1, FUNC(via6522_device::write_ca1));
output_latch_device &latch(OUTPUT_LATCH(config, "cent_data_out"));
centronics.set_output_latch(latch);
@@ -1433,8 +1433,8 @@ void bbcbp_state::acw443(machine_config &config)
m_wd_fdc->subdevice<floppy_connector>("1")->set_default_option(nullptr);
/* 32016 co-processor */
- //m_tube->set_default_option("32016");
- //m_tube->set_fixed(true);
+ m_tube->set_default_option("32016l");
+ m_tube->set_fixed(true);
/* Acorn Winchester Disc 20MB */
m_1mhzbus->set_default_option("awhd");
@@ -1608,7 +1608,7 @@ void bbcm_state::bbcm(machine_config &config)
/* printer */
centronics_device &centronics(CENTRONICS(config, "printer", centronics_devices, "printer"));
- centronics.ack_handler().set(m_via6522_1, FUNC(via6522_device::write_ca1)).invert(); // ack seems to be inverted?
+ centronics.ack_handler().set(m_via6522_1, FUNC(via6522_device::write_ca1));
output_latch_device &latch(OUTPUT_LATCH(config, "cent_data_out"));
centronics.set_output_latch(latch);
diff --git a/src/mame/drivers/ddealer.cpp b/src/mame/drivers/ddealer.cpp
index 680d8f555e2..97e1b1fffdb 100644
--- a/src/mame/drivers/ddealer.cpp
+++ b/src/mame/drivers/ddealer.cpp
@@ -128,13 +128,11 @@ public:
ddealer_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_vregs(*this, "vregs"),
- m_left_fg_vram_top(*this, "left_fg_vratop"),
- m_right_fg_vram_top(*this, "right_fg_vratop"),
- m_left_fg_vram_bottom(*this, "left_fg_vrabot"),
- m_right_fg_vram_bottom(*this, "right_fg_vrabot"),
m_back_vram(*this, "back_vram"),
+ m_fg_vram(*this, "fg_vram"),
m_work_ram(*this, "work_ram"),
m_mcu_shared_ram(*this, "mcu_shared_ram"),
+ m_in0_io(*this, "IN0"),
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette")
@@ -145,14 +143,18 @@ public:
void init_ddealer();
private:
- void flipscreen_w(uint16_t data);
- void back_vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
- void mcu_shared_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
- uint16_t mcu_r();
+ void flipscreen_w(u16 data);
+ void back_vram_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void fg_vram_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void mcu_shared_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u16 mcu_r();
TILE_GET_INFO_MEMBER(get_back_tile_info);
- void draw_video_layer(uint16_t* vreg_base, uint16_t* top, uint16_t* bottom, bitmap_ind16 &bitmap, const rectangle &cliprect, int flipy);
- uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ TILE_GET_INFO_MEMBER(get_fg_tile_info);
+ template<unsigned Offset> TILE_GET_INFO_MEMBER(get_fg_splitted_tile_info);
+ TILEMAP_MAPPER_MEMBER(scan_fg);
+ void draw_video_layer(u16* vreg_base, tilemap_t *tmap, screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(mcu_sim);
@@ -163,14 +165,12 @@ private:
virtual void video_start() override;
// memory pointers
- required_shared_ptr<uint16_t> m_vregs;
- required_shared_ptr<uint16_t> m_left_fg_vram_top;
- required_shared_ptr<uint16_t> m_right_fg_vram_top;
- required_shared_ptr<uint16_t> m_left_fg_vram_bottom;
- required_shared_ptr<uint16_t> m_right_fg_vram_bottom;
- required_shared_ptr<uint16_t> m_back_vram;
- required_shared_ptr<uint16_t> m_work_ram;
- required_shared_ptr<uint16_t> m_mcu_shared_ram;
+ required_shared_ptr<u16> m_vregs;
+ required_shared_ptr<u16> m_back_vram;
+ required_shared_ptr<u16> m_fg_vram;
+ required_shared_ptr<u16> m_work_ram;
+ required_shared_ptr<u16> m_mcu_shared_ram;
+ required_ioport m_in0_io;
// devices
required_device<cpu_device> m_maincpu;
@@ -179,119 +179,109 @@ private:
// video-related
tilemap_t *m_back_tilemap;
+ tilemap_t *m_fg_tilemap; // overall foreground
+ // splitted foreground area
+ tilemap_t *m_fg_tilemap_left;
+ tilemap_t *m_fg_tilemap_right;
// MCU sim related
- int m_respcount;
- uint8_t m_input_pressed;
- uint16_t m_coin_input;
+ int m_respcount;
+ u8 m_input_pressed;
+ u16 m_coin_input;
};
-void ddealer_state::flipscreen_w(uint16_t data)
+void ddealer_state::flipscreen_w(u16 data)
{
flip_screen_set(data & 0x01);
}
+static inline void get_tile_info(u16 src, u32 &code, u32 &color)
+{
+ code = src & 0xfff;
+ color = (src >> 12) & 0xf;
+}
+
TILE_GET_INFO_MEMBER(ddealer_state::get_back_tile_info)
{
- int code = m_back_vram[tile_index];
+ u32 code, color;
+ get_tile_info(m_back_vram[tile_index], code, color);
tileinfo.set(0,
- code & 0xfff,
- code >> 12,
+ code,
+ color,
+ 0);
+}
+
+TILE_GET_INFO_MEMBER(ddealer_state::get_fg_tile_info)
+{
+ u32 code, color;
+ get_tile_info(m_fg_vram[tile_index], code, color);
+ tileinfo.set(1,
+ code,
+ color,
+ 0);
+}
+
+template<unsigned Offset>
+TILE_GET_INFO_MEMBER(ddealer_state::get_fg_splitted_tile_info)
+{
+ u32 code, color;
+ get_tile_info(m_fg_vram[Offset + (tile_index & 0x17ff)], code, color);
+ tileinfo.set(1,
+ code,
+ color,
0);
}
+TILEMAP_MAPPER_MEMBER(ddealer_state::scan_fg)
+{
+ return (row & 0x0f) | ((col & 0xff) << 4) | ((row & 0x10) << 8);
+}
+
void ddealer_state::video_start()
{
m_back_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(ddealer_state::get_back_tile_info)), TILEMAP_SCAN_COLS, 8, 8, 64, 32);
+ m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode,
+ tilemap_get_info_delegate(*this, FUNC(ddealer_state::get_fg_tile_info)),
+ tilemap_mapper_delegate(*this, FUNC(ddealer_state::scan_fg)),
+ 16, 16, 256, 32);
+ m_fg_tilemap_left = &machine().tilemap().create(*m_gfxdecode,
+ tilemap_get_info_delegate(*this, FUNC(ddealer_state::get_fg_splitted_tile_info<0>)),
+ tilemap_mapper_delegate(*this, FUNC(ddealer_state::scan_fg)),
+ 16, 16, 128, 32);
+ m_fg_tilemap_right = &machine().tilemap().create(*m_gfxdecode,
+ tilemap_get_info_delegate(*this, FUNC(ddealer_state::get_fg_splitted_tile_info<0x800>)),
+ tilemap_mapper_delegate(*this, FUNC(ddealer_state::scan_fg)),
+ 16, 16, 128, 32);
+
+ m_fg_tilemap->set_transparent_pen(15);
+ m_fg_tilemap_left->set_transparent_pen(15);
+ m_fg_tilemap_right->set_transparent_pen(15);
+
m_back_tilemap->set_scrolldx(64,64);
+ m_fg_tilemap->set_scrolldx(64,64);
+ m_fg_tilemap_left->set_scrolldx(64,64);
+ m_fg_tilemap_right->set_scrolldx(64,64);
}
-void ddealer_state::draw_video_layer(uint16_t* vreg_base, uint16_t* top, uint16_t* bottom, bitmap_ind16 &bitmap, const rectangle &cliprect, int flipy)
+void ddealer_state::draw_video_layer(u16* vreg_base, tilemap_t *tmap, screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- gfx_element *gfx = m_gfxdecode->gfx(1);
-
- int16_t sx, sy;
- int x,y, count;
- uint16_t* src;
+ int sx, sy;
sx = ((vreg_base[0x4 / 2] & 0xff));
sx |= ((vreg_base[0x2 / 2] & 0xff) << 8);
- sx &= 0x7ff;
- if (sx & 0x400) sx -= 0x800;
-
sy = ((vreg_base[0x8 / 2] & 0xff));
sy |= ((vreg_base[0x6 / 2] & 0xff) << 8);
- if (!flipy)
- {
- sx -= 64; // video shift
-
- /* the tilemaps seems to be split into top / bottom pieces */
- count = 0;
- src = top;
- for (x = 0; x < 128; x++)
- {
- for (y = 0; y < 16; y++)
- {
- uint16_t tile = (src[count] & 0x0fff);
- uint16_t colr = (src[count] & 0xf000) >> 12;
- count++;
- gfx->transpen(bitmap,cliprect, tile, colr, 0, flipy, (x * 16) - sx, (y * 16) - sy, 15);
- }
- }
- count = 0;
- src = bottom;
- sy -= 256;
- for (x = 0; x < 128; x++)
- {
- for (y = 0; y < 16; y++)
- {
- uint16_t tile = (src[count] & 0x0fff);
- uint16_t colr = (src[count] & 0xf000) >> 12;
- count++;
- gfx->transpen(bitmap,cliprect, tile, colr, 0, flipy, (x * 16) - sx, (y * 16) - sy, 15);
- }
- }
- }
- else
- {
- sx -= 0x6d0;
- sy -= 16;
-
- /* the tilemaps seems to be split into top / bottom pieces */
- count = 0;
- src = top;
- for (x = 128; x > 0; x--)
- {
- for (y = 16; y > 0; y--)
- {
- uint16_t tile = (src[count] & 0x0fff);
- uint16_t colr = (src[count] & 0xf000) >> 12;
- count++;
- gfx->transpen(bitmap,cliprect, tile, colr, flipy, flipy, (x * 16) + sx, (y * 16) + sy, 15);
- }
- }
- count = 0;
- src = bottom;
- sy -= 256;
- for (x = 128; x > 0; x--)
- {
- for (y = 16; y > 0; y--)
- {
- uint16_t tile = (src[count] & 0x0fff);
- uint16_t colr = (src[count] & 0xf000) >> 12;
- count++;
- gfx->transpen(bitmap,cliprect, tile, colr, flipy, flipy, (x * 16) + sx, (y * 16) + sy, 15);
- }
- }
- }
+ tmap->set_scrollx(sx);
+ tmap->set_scrolly(sy);
+ tmap->draw(screen, bitmap, cliprect, 0, 0);
}
-uint32_t ddealer_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+u32 ddealer_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_back_tilemap->draw(screen, bitmap, cliprect, 0, 0);
@@ -306,26 +296,25 @@ uint32_t ddealer_state::screen_update(screen_device &screen, bitmap_ind16 &bitma
{
if (m_vregs[0xcc / 2] & 0x80)
{
- draw_video_layer(&m_vregs[0x1e0 / 2], m_left_fg_vram_top, m_left_fg_vram_bottom, bitmap, cliprect, flip);
- draw_video_layer(&m_vregs[0xcc / 2], m_right_fg_vram_top, m_right_fg_vram_bottom, bitmap, cliprect, flip);
+ draw_video_layer(&m_vregs[0x1e0 / 2], m_fg_tilemap_left, screen, bitmap, cliprect);
+ draw_video_layer(&m_vregs[0xcc / 2], m_fg_tilemap_right, screen, bitmap, cliprect);
}
else
{
- draw_video_layer(&m_vregs[0x1e0 / 2], m_left_fg_vram_top, m_left_fg_vram_bottom, bitmap, cliprect, flip);
+ draw_video_layer(&m_vregs[0x1e0 / 2], m_fg_tilemap, screen, bitmap, cliprect);
}
}
else
{
if (m_vregs[0xcc / 2] & 0x80)
{
- draw_video_layer(&m_vregs[0xcc / 2], m_left_fg_vram_top, m_left_fg_vram_bottom, bitmap, cliprect, flip);
- draw_video_layer(&m_vregs[0x1e0 / 2], m_right_fg_vram_top, m_right_fg_vram_bottom, bitmap, cliprect, flip);
+ draw_video_layer(&m_vregs[0xcc / 2], m_fg_tilemap_left, screen, bitmap, cliprect);
+ draw_video_layer(&m_vregs[0x1e0 / 2], m_fg_tilemap_right, screen, bitmap, cliprect);
}
else
{
- draw_video_layer(&m_vregs[0x1e0 / 2], m_left_fg_vram_top, m_left_fg_vram_bottom, bitmap, cliprect, flip);
+ draw_video_layer(&m_vregs[0x1e0 / 2], m_fg_tilemap, screen, bitmap, cliprect);
}
-
}
return 0;
@@ -340,7 +329,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(ddealer_state::mcu_sim)
/*$fe002 is used,might be for multiple coins for one credit settings.*/
// TODO: I'm not bothering with coin/credit settings until this actually work properly
// (game is currently hardwired to free play)
- m_coin_input = (~(ioport("IN0")->read()));
+ m_coin_input = (~(m_in0_io->read()));
if (m_coin_input & 0x01)//coin 1
{
@@ -401,12 +390,22 @@ TIMER_DEVICE_CALLBACK_MEMBER(ddealer_state::mcu_sim)
-void ddealer_state::back_vram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+void ddealer_state::back_vram_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_back_vram[offset]);
m_back_tilemap->mark_tile_dirty(offset);
}
+void ddealer_state::fg_vram_w(offs_t offset, u16 data, u16 mem_mask)
+{
+ COMBINE_DATA(&m_fg_vram[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset);
+ if (offset & 0x800)
+ m_fg_tilemap_right->mark_tile_dirty(offset & 0x17ff);
+ else
+ m_fg_tilemap_left->mark_tile_dirty(offset & 0x17ff);
+}
+
/******************************************************************************************************
@@ -429,7 +428,7 @@ Protection handling, identical to Hacha Mecha Fighter / Thunder Dragon with diff
m_mcu_shared_ram[_protinput_+1] = (_input_ & 0x0000ffff);\
}
-void ddealer_state::mcu_shared_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+void ddealer_state::mcu_shared_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_mcu_shared_ram[offset]);
@@ -499,10 +498,7 @@ void ddealer_state::ddealer_map(address_map &map)
/* this might actually be 1 tilemap with some funky rowscroll / columnscroll enabled, I'm not sure */
// certainly seems derivative of the design used in Urashima Mahjong (jalmah.cpp), not identical tho
- map(0x090000, 0x090fff).ram().share("left_fg_vratop");
- map(0x091000, 0x091fff).ram().share("right_fg_vratop");
- map(0x092000, 0x092fff).ram().share("left_fg_vrabot");
- map(0x093000, 0x093fff).ram().share("right_fg_vrabot");
+ map(0x090000, 0x093fff).ram().w(FUNC(ddealer_state::fg_vram_w)).share("fg_vram"); // fg tilemap
// map(0x094000, 0x094001).noprw(); // Set at POST via clr.w, unused afterwards
map(0x098000, 0x098001).w(FUNC(ddealer_state::flipscreen_w));
map(0x09c000, 0x09cfff).ram().w(FUNC(ddealer_state::back_vram_w)).share("back_vram"); // bg tilemap
@@ -587,8 +583,8 @@ static INPUT_PORTS_START( ddealer )
INPUT_PORTS_END
static GFXDECODE_START( gfx_ddealer )
- GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_packed_msb, 0x000, 16 )
- GFXDECODE_ENTRY( "gfx2", 0, gfx_8x8x4_col_2x2_group_packed_msb, 0x100, 16 )
+ GFXDECODE_ENTRY( "bgrom", 0, gfx_8x8x4_packed_msb, 0x000, 16 )
+ GFXDECODE_ENTRY( "fgrom", 0, gfx_8x8x4_col_2x2_group_packed_msb, 0x100, 16 )
GFXDECODE_END
void ddealer_state::machine_start()
@@ -634,7 +630,7 @@ void ddealer_state::ddealer(machine_config &config)
-uint16_t ddealer_state::mcu_r()
+u16 ddealer_state::mcu_r()
{
static const int resp[] =
{
@@ -648,7 +644,10 @@ uint16_t ddealer_state::mcu_r()
int res;
- res = resp[m_respcount++];
+ res = resp[m_respcount];
+ if (!machine().side_effects_disabled())
+ m_respcount++;
+
if (resp[m_respcount] < 0)
m_respcount = 0;
@@ -668,10 +667,10 @@ ROM_START( ddealer )
ROM_REGION( 0x40000, "mcu", 0 ) /* M50747? MCU Code */
ROM_LOAD( "mcu", 0x0000, 0x1000, NO_DUMP ) // might be NMK-110 8131 chip
- ROM_REGION( 0x20000, "gfx1", 0 ) /* BG0 */
+ ROM_REGION( 0x20000, "bgrom", 0 ) /* BG */
ROM_LOAD( "4.ic65", 0x00000, 0x20000, CRC(4939ff1b) SHA1(af2f2feeef5520d775731a58cbfc8fcc913b7348) )
- ROM_REGION( 0x80000, "gfx2", 0 ) /* BG1 */
+ ROM_REGION( 0x80000, "fgrom", 0 ) /* FG */
ROM_LOAD( "3.ic64", 0x00000, 0x80000, CRC(660e367c) SHA1(54827a8998c58c578c594126d5efc18a92363eaa))
ROM_REGION( 0x200, "user1", 0 ) /* Proms */
diff --git a/src/mame/drivers/electron.cpp b/src/mame/drivers/electron.cpp
index 4e0f88eef8d..83764b30a6d 100644
--- a/src/mame/drivers/electron.cpp
+++ b/src/mame/drivers/electron.cpp
@@ -121,7 +121,7 @@ void electron_state::electron64_opcodes(address_map &map)
INPUT_CHANGED_MEMBER(electron_state::trigger_reset)
{
m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE);
- if (!newval)
+ if (newval)
{
m_exp->reset();
}
@@ -251,6 +251,7 @@ void electron_state::electron(machine_config &config)
{
M6502(config, m_maincpu, 16_MHz_XTAL / 8);
m_maincpu->set_addrmap(AS_PROGRAM, &electron_state::electron_mem);
+ config.set_perfect_quantum(m_maincpu);
INPUT_MERGER_ANY_HIGH(config, m_irqs).output_handler().set_inputline(m_maincpu, M6502_IRQ_LINE);
diff --git a/src/mame/drivers/generalplus_gpl16250.cpp b/src/mame/drivers/generalplus_gpl16250.cpp
index edbe9be0262..03b81821bfe 100644
--- a/src/mame/drivers/generalplus_gpl16250.cpp
+++ b/src/mame/drivers/generalplus_gpl16250.cpp
@@ -136,7 +136,7 @@ void gcm394_game_state::porta_w(uint16_t data)
void gcm394_game_state::base(machine_config &config)
{
- GCM394(config, m_maincpu, 96000000/2, m_screen);
+ GCM394(config, m_maincpu, 96000000, m_screen);
m_maincpu->porta_in().set(FUNC(gcm394_game_state::porta_r));
m_maincpu->portb_in().set(FUNC(gcm394_game_state::portb_r));
m_maincpu->portc_in().set(FUNC(gcm394_game_state::portc_r));
diff --git a/src/mame/drivers/generalplus_gpl16250_romram.cpp b/src/mame/drivers/generalplus_gpl16250_romram.cpp
index fa26a3ca73f..b3d4215d5e7 100644
--- a/src/mame/drivers/generalplus_gpl16250_romram.cpp
+++ b/src/mame/drivers/generalplus_gpl16250_romram.cpp
@@ -191,7 +191,96 @@ static INPUT_PORTS_START( paccon ) // for Test Mode hold buttons 1+2 until the s
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
INPUT_PORTS_END
+static INPUT_PORTS_START( jak_ths )
+ PORT_START("IN0")
+ PORT_DIPNAME( 0x0001, 0x0001, "IN0" )
+ PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0004, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0008, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0010, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0020, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0040, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
+ PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
+ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
+ PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
+ PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("A")
+ PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("B")
+ PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x4000, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 )
+ PORT_START("IN1")
+ PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
+
+ PORT_START("IN2")
+ PORT_DIPNAME( 0x0001, 0x0001, "IN2" )
+ PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0004, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0008, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0010, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0020, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0040, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0200, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0400, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0800, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x1000, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x2000, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x4000, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+INPUT_PORTS_END
uint16_t wrlshunt_game_state::cs0_r(offs_t offset)
{
@@ -241,18 +330,11 @@ void wrlshunt_game_state::init_ths()
m_sdram.resize(0x400000); // 0x400000 words, 0x800000 bytes (verify)
}
-void wrlshunt_game_state::wrlshunt(machine_config &config)
+void wrlshunt_game_state::gpl16250_romram(machine_config &config)
{
gcm394_game_state::base(config);
}
-void wrlshunt_game_state::paccon(machine_config &config)
-{
- gcm394_game_state::base(config);
-
- m_maincpu->set_clock(96000000); // needs to be somewhere in this region or the emulator running on the SunPlus is too slow
-}
-
uint16_t wrlshunt_game_state::porta_r()
{
uint16_t data = m_io[0]->read();
@@ -534,17 +616,17 @@ which is also found in the Wireless Air 60 ROM.
// also sold as "Pac-Man Connect & Play 35th Anniversary" (same ROM?)
-CONS(2012, paccon, 0, 0, paccon, paccon, paccon_game_state, init_wrlshunt, "Bandai", "Pac-Man Connect & Play (Feb 14 2012 10:46:23)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+CONS(2012, paccon, 0, 0, gpl16250_romram, paccon, paccon_game_state, init_wrlshunt, "Bandai", "Pac-Man Connect & Play (Feb 14 2012 10:46:23)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-CONS(2008, lazertag, 0, 0, wrlshunt, jak_s500, lazertag_game_state, init_wrlshunt, "Tiger Electronics", "Lazer Tag Video Game Module", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+CONS(2008, lazertag, 0, 0, gpl16250_romram, jak_s500, lazertag_game_state, init_wrlshunt, "Tiger Electronics", "Lazer Tag Video Game Module", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-CONS(2009, jak_s500, 0, 0, wrlshunt, jak_s500, jak_s500_game_state, init_wrlshunt, "JAKKS Pacific Inc / HotGen Ltd", "SpongeBob SquarePants Bikini Bottom 500 (JAKKS Pacific TV Motion Game)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-CONS(2009, jak_smwm, 0, 0, wrlshunt, jak_s500, jak_s500_game_state, init_wrlshunt, "JAKKS Pacific Inc / HotGen Ltd", "Spider-Man Web Master (JAKKS Pacific TV Motion Game)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-CONS(2010, jak_pf, 0, 0, wrlshunt, jak_s500, jak_pf_game_state, init_wrlshunt, "JAKKS Pacific Inc / HotGen Ltd", "Phineas and Ferb: Best Game Ever! (JAKKS Pacific TV Motion Game)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND) // build date is 2009, but onscreen display is 2010
-CONS(200?, jak_totm, 0, 0, wrlshunt, jak_s500, jak_s500_game_state, init_wrlshunt, "JAKKS Pacific Inc / HotGen Ltd", "Toy Story - Toys on the Move (JAKKS Pacific TV Motion Game)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND) // Toys on the Move has ISSI 404A
-CONS(2009, jak_prft, 0, 0, wrlshunt, jak_s500, jak_prft_game_state, init_wrlshunt, "JAKKS Pacific Inc / Santa Cruz Games", "Power Rangers Force In Time (JAKKS Pacific TV Motion Game)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-CONS(2009, jak_tink, 0, 0, wrlshunt, jak_s500, jak_prft_game_state, init_wrlshunt, "JAKKS Pacific Inc / Santa Cruz Games", "Tinker Bell and the Lost Treasure (JAKKS Pacific TV Motion Game)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-CONS(2009, jak_ths, 0, 0, wrlshunt, jak_s500, jak_s500_game_state, init_ths, "JAKKS Pacific Inc / Super Happy Fun Fun", "Triple Header Sports (JAKKS Pacific TV Motion Game)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+CONS(2009, jak_s500, 0, 0, gpl16250_romram, jak_s500, jak_s500_game_state, init_wrlshunt, "JAKKS Pacific Inc / HotGen Ltd", "SpongeBob SquarePants Bikini Bottom 500 (JAKKS Pacific TV Motion Game)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+CONS(2009, jak_smwm, 0, 0, gpl16250_romram, jak_s500, jak_s500_game_state, init_wrlshunt, "JAKKS Pacific Inc / HotGen Ltd", "Spider-Man Web Master (JAKKS Pacific TV Motion Game)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+CONS(2010, jak_pf, 0, 0, gpl16250_romram, jak_s500, jak_pf_game_state, init_wrlshunt, "JAKKS Pacific Inc / HotGen Ltd", "Phineas and Ferb: Best Game Ever! (JAKKS Pacific TV Motion Game)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND) // build date is 2009, but onscreen display is 2010
+CONS(200?, jak_totm, 0, 0, gpl16250_romram, jak_s500, jak_s500_game_state, init_wrlshunt, "JAKKS Pacific Inc / HotGen Ltd", "Toy Story - Toys on the Move (JAKKS Pacific TV Motion Game)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND) // Toys on the Move has ISSI 404A
+CONS(2009, jak_prft, 0, 0, gpl16250_romram, jak_s500, jak_prft_game_state, init_wrlshunt, "JAKKS Pacific Inc / Santa Cruz Games", "Power Rangers Force In Time (JAKKS Pacific TV Motion Game)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+CONS(2009, jak_tink, 0, 0, gpl16250_romram, jak_s500, jak_prft_game_state, init_wrlshunt, "JAKKS Pacific Inc / Santa Cruz Games", "Tinker Bell and the Lost Treasure (JAKKS Pacific TV Motion Game)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+CONS(2009, jak_ths, 0, 0, gpl16250_romram, jak_ths, jak_s500_game_state, init_ths, "JAKKS Pacific Inc / Super Happy Fun Fun", "Triple Header Sports (JAKKS Pacific TV Motion Game)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-CONS(2011, wrlshunt, 0, 0, wrlshunt, wrlshunt, wrlshunt_game_state, init_wrlshunt, "Hamy / Kids Station Toys Inc", "Wireless Hunting Video Game System", MACHINE_NO_SOUND | MACHINE_NOT_WORKING)
+CONS(2011, wrlshunt, 0, 0, gpl16250_romram, wrlshunt, wrlshunt_game_state, init_wrlshunt, "Hamy / Kids Station Toys Inc", "Wireless Hunting Video Game System", MACHINE_NO_SOUND | MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/generalplus_gpl_unknown.cpp b/src/mame/drivers/generalplus_gpl_unknown.cpp
index 5d2dfa7d39f..7560eddf55b 100644
--- a/src/mame/drivers/generalplus_gpl_unknown.cpp
+++ b/src/mame/drivers/generalplus_gpl_unknown.cpp
@@ -3,8 +3,10 @@
// these contain the similar game selections to the games in unk6502_st2xxx.cpp but on updated hardware
-// These use SPI ROMs and unSP2.0 instructions, so will be GeneralPlus branded parts, not SunPlus
-// possibly the framebuffer based video ones rather than the ones with tile layers
+/* These use SPI ROMs and unSP2.0 instructions, so will be GeneralPlus branded parts, not SunPlus
+ this might just be a GPL16250 with the video features bypassed as the sprite/palette banking is still
+ used, but the RAM treated as work buffers
+*/
/*
@@ -317,9 +319,7 @@ static INPUT_PORTS_START( pcp8718 )
PORT_DIPSETTING( 0x8000, "8000" )
PORT_START("IN1")
- PORT_DIPNAME( 0x0001, 0x0001, "P2:0001" )
- PORT_DIPSETTING( 0x0000, "0000" )
- PORT_DIPSETTING( 0x0001, "0001" )
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_UNUSED ) // causes lag if state is inverted, investigate
PORT_DIPNAME( 0x0002, 0x0002, "P2:0002" )
PORT_DIPSETTING( 0x0000, "0000" )
PORT_DIPSETTING( 0x0002, "0002" )
@@ -1101,7 +1101,7 @@ WRITE_LINE_MEMBER(pcp8718_state::screen_vblank)
void pcp8718_state::pcp8718(machine_config &config)
{
- UNSP_20(config, m_maincpu, 100000000); // unknown CPU, unsp20 based, must be clocked ~100Mhz, maybe higher (or cycles per instruction needs to be lower for unSP 2.0)
+ UNSP_20(config, m_maincpu, 96000000); // unknown CPU, unsp20 based, 96Mhz is listed as the maximum for most unSP2.0 chips, and appears correct here
m_maincpu->set_addrmap(AS_PROGRAM, &pcp8718_state::map);
SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
diff --git a/src/mame/drivers/geniusiq.cpp b/src/mame/drivers/geniusiq.cpp
index 0790fb0428c..9350d3c4989 100644
--- a/src/mame/drivers/geniusiq.cpp
+++ b/src/mame/drivers/geniusiq.cpp
@@ -487,7 +487,7 @@ static INPUT_PORTS_START( geniusiq )
PORT_START( "IN2" )
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE( KEYCODE_0 ) PORT_CHAR(0x00e0) PORT_CHAR('0') PORT_CHANGED_MEMBER( DEVICE_SELF, geniusiq_state, send_input, 0x20 )
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Return") PORT_CODE( KEYCODE_ENTER ) PORT_CHAR(13) PORT_CHANGED_MEMBER( DEVICE_SELF, geniusiq_state, send_input, 0x21 )
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Backspace") PORT_CODE( KEYCODE_BACKSPACE ) PORT_CHAR(UCHAR_MAMEKEY(BACKSPACE)) PORT_CHANGED_MEMBER( DEVICE_SELF, geniusiq_state, send_input, 0x22 )
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Backspace") PORT_CODE( KEYCODE_BACKSPACE ) PORT_CHAR(8) PORT_CHANGED_MEMBER( DEVICE_SELF, geniusiq_state, send_input, 0x22 )
PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE( KEYCODE_L ) PORT_CHAR('l') PORT_CHAR('L') PORT_CHANGED_MEMBER( DEVICE_SELF, geniusiq_state, send_input, 0x23 )
PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE( KEYCODE_O ) PORT_CHAR('o') PORT_CHAR('O') PORT_CHANGED_MEMBER( DEVICE_SELF, geniusiq_state, send_input, 0x24 )
PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE( KEYCODE_9 ) PORT_CHAR(0x00e7) PORT_CHAR('9') PORT_CHANGED_MEMBER( DEVICE_SELF, geniusiq_state, send_input, 0x25 )
@@ -610,7 +610,7 @@ static INPUT_PORTS_START( geniusiq_de )
PORT_MODIFY( "IN1" )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE( KEYCODE_QUOTE ) PORT_CHAR('^') PORT_CHAR(0x00b0) PORT_CHANGED_MEMBER( DEVICE_SELF, geniusiq_state, send_input, 0x17 )
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE( KEYCODE_BACKSLASH ) PORT_CHAR('+') PORT_CHAR('*') PORT_CHANGED_MEMBER( DEVICE_SELF, geniusiq_state, send_input, 0x18 )
- PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE( KEYCODE_EQUALS ) PORT_CHAR('{') PORT_CHAR('}') PORT_CHANGED_MEMBER( DEVICE_SELF, geniusiq_state, send_input, 0x19 )
+ PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE( KEYCODE_EQUALS ) PORT_CHAR('}') PORT_CHAR('{') PORT_CHANGED_MEMBER( DEVICE_SELF, geniusiq_state, send_input, 0x19 )
PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE( KEYCODE_CLOSEBRACE ) PORT_CHAR(0x00b0) PORT_CHAR('?') PORT_CHANGED_MEMBER( DEVICE_SELF, geniusiq_state, send_input, 0x1a )
PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE( KEYCODE_OPENBRACE ) PORT_CHAR(0x00e4) PORT_CHAR(0x00c4) PORT_CHANGED_MEMBER( DEVICE_SELF, geniusiq_state, send_input, 0x1b )
PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE( KEYCODE_SLASH ) PORT_CHAR(0x00fc) PORT_CHAR(0x00dc) PORT_CHANGED_MEMBER( DEVICE_SELF, geniusiq_state, send_input, 0x1c )
diff --git a/src/mame/drivers/hp80.cpp b/src/mame/drivers/hp80.cpp
index 57196acec6c..e4b67eaab56 100644
--- a/src/mame/drivers/hp80.cpp
+++ b/src/mame/drivers/hp80.cpp
@@ -1468,50 +1468,50 @@ static INPUT_PORTS_START(hp85)
PORT_BIT(IOP_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#') // 1,5: 3
PORT_BIT(IOP_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('@') // 1,6: 2
PORT_BIT(IOP_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!') // 1,7: 1
- PORT_BIT(IOP_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I') // 2,0: I
- PORT_BIT(IOP_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U') // 2,1: U
- PORT_BIT(IOP_MASK(18) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y') // 2,2: Y
- PORT_BIT(IOP_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T') // 2,3: T
- PORT_BIT(IOP_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R') // 2,4: R
- PORT_BIT(IOP_MASK(21) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E') // 2,5: E
- PORT_BIT(IOP_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W') // 2,6: W
- PORT_BIT(IOP_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q') // 2,7: Q
- PORT_BIT(IOP_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K') // 3,0: K
- PORT_BIT(IOP_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J') // 3,1: J
- PORT_BIT(IOP_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H') // 3,2: H
- PORT_BIT(IOP_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G') // 3,3: G
- PORT_BIT(IOP_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F') // 3,4: F
- PORT_BIT(IOP_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D') // 3,5: D
- PORT_BIT(IOP_MASK(30) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S') // 3,6: S
- PORT_BIT(IOP_MASK(31) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A') // 3,7: A
+ PORT_BIT(IOP_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('I') PORT_CHAR('i') // 2,0: I
+ PORT_BIT(IOP_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('U') PORT_CHAR('u') // 2,1: U
+ PORT_BIT(IOP_MASK(18) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y') PORT_CHAR('y') // 2,2: Y
+ PORT_BIT(IOP_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('T') PORT_CHAR('t') // 2,3: T
+ PORT_BIT(IOP_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('R') PORT_CHAR('r') // 2,4: R
+ PORT_BIT(IOP_MASK(21) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('E') PORT_CHAR('e') // 2,5: E
+ PORT_BIT(IOP_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('W') PORT_CHAR('w') // 2,6: W
+ PORT_BIT(IOP_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q') PORT_CHAR('q') // 2,7: Q
+ PORT_BIT(IOP_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('K') PORT_CHAR('k') // 3,0: K
+ PORT_BIT(IOP_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('J') PORT_CHAR('j') // 3,1: J
+ PORT_BIT(IOP_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('H') PORT_CHAR('h') // 3,2: H
+ PORT_BIT(IOP_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('G') PORT_CHAR('g') // 3,3: G
+ PORT_BIT(IOP_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('F') PORT_CHAR('f') // 3,4: F
+ PORT_BIT(IOP_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('D') PORT_CHAR('d') // 3,5: D
+ PORT_BIT(IOP_MASK(30) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('S') PORT_CHAR('s') // 3,6: S
+ PORT_BIT(IOP_MASK(31) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('A') PORT_CHAR('a') // 3,7: A
PORT_START("KEY1")
- PORT_BIT(IOP_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M') // 4,0: M
- PORT_BIT(IOP_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N') // 4,1: N
- PORT_BIT(IOP_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B') // 4,2: B
- PORT_BIT(IOP_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V') // 4,3: V
- PORT_BIT(IOP_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C') // 4,4: C
- PORT_BIT(IOP_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X') // 4,5: X
- PORT_BIT(IOP_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z') // 4,6: Z
+ PORT_BIT(IOP_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('M') PORT_CHAR('m') // 4,0: M
+ PORT_BIT(IOP_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('N') PORT_CHAR('n') // 4,1: N
+ PORT_BIT(IOP_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('B') PORT_CHAR('b') // 4,2: B
+ PORT_BIT(IOP_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('V') PORT_CHAR('v') // 4,3: V
+ PORT_BIT(IOP_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('C') PORT_CHAR('c') // 4,4: C
+ PORT_BIT(IOP_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('X') PORT_CHAR('x') // 4,5: X
+ PORT_BIT(IOP_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') PORT_CHAR('z') // 4,6: Z
PORT_BIT(IOP_MASK(7) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') // 4,7: Space
PORT_BIT(IOP_MASK(8) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<') // 5,0: ,
PORT_BIT(IOP_MASK(9) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>') // 5,1: .
PORT_BIT(IOP_MASK(10) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?') // 5,2: / ?
PORT_BIT(IOP_MASK(11) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_NAME("PAUSE STEP") // 5,3: PAUSE / STEP
PORT_BIT(IOP_MASK(12) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_NAME("RUN") // 5,4: RUN
- PORT_BIT(IOP_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_PLUS_PAD) PORT_CHAR(UCHAR_MAMEKEY(PLUS_PAD)) PORT_NAME("KP +") // 5,5: KP +
- PORT_BIT(IOP_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS_PAD) PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD)) PORT_NAME("KP -") // 5,6: KP -
- PORT_BIT(IOP_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_ASTERISK) PORT_CHAR(UCHAR_MAMEKEY(ASTERISK)) PORT_NAME("KP *") // 5,7: KP * (not sure)
- PORT_BIT(IOP_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L') // 6,0: L
+ PORT_BIT(IOP_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_PLUS_PAD) PORT_NAME("KP +") // 5,5: KP +
+ PORT_BIT(IOP_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS_PAD) PORT_NAME("KP -") // 5,6: KP -
+ PORT_BIT(IOP_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_ASTERISK) PORT_NAME("KP *") // 5,7: KP * (not sure)
+ PORT_BIT(IOP_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('L') PORT_CHAR('l') // 6,0: L
PORT_BIT(IOP_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR(':') // 6,1: ;
PORT_BIT(IOP_MASK(18) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR('\'') PORT_CHAR('"') // 6,2: ' "
PORT_BIT(IOP_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) PORT_NAME("END LINE") // 6,3: END LINE
PORT_BIT(IOP_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_NAME("LIST P LST") // 6,4: LIST / P LST
PORT_BIT(IOP_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED) // 6,5: N/U
PORT_BIT(IOP_MASK(22) , IP_ACTIVE_HIGH , IPT_UNUSED) // 6,6: N/U
- PORT_BIT(IOP_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH_PAD) PORT_CHAR(UCHAR_MAMEKEY(SLASH_PAD)) PORT_NAME("KP /") // 6,7: KP /
- PORT_BIT(IOP_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O') // 7,0: O
- PORT_BIT(IOP_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P') // 7,1: P
+ PORT_BIT(IOP_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH_PAD) PORT_NAME("KP /") // 6,7: KP /
+ PORT_BIT(IOP_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('O') PORT_CHAR('o') // 7,0: O
+ PORT_BIT(IOP_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('P') PORT_CHAR('p') // 7,1: P
PORT_BIT(IOP_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('(') PORT_CHAR('[') // 7,2: ( [
PORT_BIT(IOP_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(')') PORT_CHAR(']') // 7,3: ) ]
PORT_BIT(IOP_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_NAME("CONT SCRATCH") // 7,4: CONT / SCRATCH
@@ -1520,8 +1520,8 @@ static INPUT_PORTS_START(hp85)
PORT_BIT(IOP_MASK(31) , IP_ACTIVE_HIGH , IPT_UNUSED) // 7,7: N/U
PORT_START("KEY2")
- PORT_BIT(IOP_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR('(') // 8,0: 9
- PORT_BIT(IOP_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR(')') // 8,1: 0
+ PORT_BIT(IOP_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') // 8,0: 9
+ PORT_BIT(IOP_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') // 8,1: 0
PORT_BIT(IOP_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('_') // 8,2: - _
PORT_BIT(IOP_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('=') PORT_CHAR('+') // 8,3: = +
PORT_BIT(IOP_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE) PORT_CHAR('\\') PORT_CHAR('|') // 8,4: \ |
@@ -2141,50 +2141,50 @@ static INPUT_PORTS_START(hp86)
PORT_BIT(IOP_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#') // 1,5: 3
PORT_BIT(IOP_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('@') // 1,6: 2
PORT_BIT(IOP_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!') // 1,7: 1
- PORT_BIT(IOP_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I') // 2,0: I
- PORT_BIT(IOP_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U') // 2,1: U
- PORT_BIT(IOP_MASK(18) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y') // 2,2: Y
- PORT_BIT(IOP_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T') // 2,3: T
- PORT_BIT(IOP_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R') // 2,4: R
- PORT_BIT(IOP_MASK(21) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E') // 2,5: E
- PORT_BIT(IOP_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W') // 2,6: W
- PORT_BIT(IOP_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q') // 2,7: Q
- PORT_BIT(IOP_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K') // 3,0: K
- PORT_BIT(IOP_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J') // 3,1: J
- PORT_BIT(IOP_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H') // 3,2: H
- PORT_BIT(IOP_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G') // 3,3: G
- PORT_BIT(IOP_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F') // 3,4: F
- PORT_BIT(IOP_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D') // 3,5: D
- PORT_BIT(IOP_MASK(30) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S') // 3,6: S
- PORT_BIT(IOP_MASK(31) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A') // 3,7: A
+ PORT_BIT(IOP_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('I') PORT_CHAR('i') // 2,0: I
+ PORT_BIT(IOP_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('U') PORT_CHAR('u') // 2,1: U
+ PORT_BIT(IOP_MASK(18) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y') PORT_CHAR('y') // 2,2: Y
+ PORT_BIT(IOP_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('T') PORT_CHAR('t') // 2,3: T
+ PORT_BIT(IOP_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('R') PORT_CHAR('r') // 2,4: R
+ PORT_BIT(IOP_MASK(21) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('E') PORT_CHAR('e') // 2,5: E
+ PORT_BIT(IOP_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('W') PORT_CHAR('w') // 2,6: W
+ PORT_BIT(IOP_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q') PORT_CHAR('q') // 2,7: Q
+ PORT_BIT(IOP_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('K') PORT_CHAR('k') // 3,0: K
+ PORT_BIT(IOP_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('J') PORT_CHAR('j') // 3,1: J
+ PORT_BIT(IOP_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('H') PORT_CHAR('h') // 3,2: H
+ PORT_BIT(IOP_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('G') PORT_CHAR('g') // 3,3: G
+ PORT_BIT(IOP_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('F') PORT_CHAR('f') // 3,4: F
+ PORT_BIT(IOP_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('D') PORT_CHAR('d') // 3,5: D
+ PORT_BIT(IOP_MASK(30) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('S') PORT_CHAR('s') // 3,6: S
+ PORT_BIT(IOP_MASK(31) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('A') PORT_CHAR('a') // 3,7: A
PORT_START("KEY1")
- PORT_BIT(IOP_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M') // 4,0: M
- PORT_BIT(IOP_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N') // 4,1: N
- PORT_BIT(IOP_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B') // 4,2: B
- PORT_BIT(IOP_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V') // 4,3: V
- PORT_BIT(IOP_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C') // 4,4: C
- PORT_BIT(IOP_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X') // 4,5: X
- PORT_BIT(IOP_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z') // 4,6: Z
+ PORT_BIT(IOP_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('M') PORT_CHAR('m') // 4,0: M
+ PORT_BIT(IOP_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('N') PORT_CHAR('n') // 4,1: N
+ PORT_BIT(IOP_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('B') PORT_CHAR('b') // 4,2: B
+ PORT_BIT(IOP_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('V') PORT_CHAR('v') // 4,3: V
+ PORT_BIT(IOP_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('C') PORT_CHAR('c') // 4,4: C
+ PORT_BIT(IOP_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('X') PORT_CHAR('x') // 4,5: X
+ PORT_BIT(IOP_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') PORT_CHAR('z') // 4,6: Z
PORT_BIT(IOP_MASK(7) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') // 4,7: Space
PORT_BIT(IOP_MASK(8) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<') // 5,0: ,
PORT_BIT(IOP_MASK(9) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>') // 5,1: .
PORT_BIT(IOP_MASK(10) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?') // 5,2: / ?
PORT_BIT(IOP_MASK(11) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_NAME("PAUSE STEP") // 5,3: PAUSE / STEP
PORT_BIT(IOP_MASK(12) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_NAME("RUN") // 5,4: RUN
- PORT_BIT(IOP_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_PLUS_PAD) PORT_CHAR(UCHAR_MAMEKEY(PLUS_PAD)) PORT_NAME("KP +") // 5,5: KP +
- PORT_BIT(IOP_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS_PAD) PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD)) PORT_NAME("KP -") // 5,6: KP -
+ PORT_BIT(IOP_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_PLUS_PAD) PORT_NAME("KP +") // 5,5: KP +
+ PORT_BIT(IOP_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS_PAD) PORT_NAME("KP -") // 5,6: KP -
PORT_BIT(IOP_MASK(15) , IP_ACTIVE_HIGH , IPT_UNUSED) // 5,7: N/U
- PORT_BIT(IOP_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L') // 6,0: L
+ PORT_BIT(IOP_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('L') PORT_CHAR('l') // 6,0: L
PORT_BIT(IOP_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR(':') // 6,1: ;
PORT_BIT(IOP_MASK(18) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR('\'') PORT_CHAR('"') // 6,2: ' "
PORT_BIT(IOP_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) PORT_NAME("END LINE") // 6,3: END LINE
PORT_BIT(IOP_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_NAME("LIST P LST") // 6,4: LIST / P LST
PORT_BIT(IOP_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED) // 6,5: N/U
- PORT_BIT(IOP_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_ASTERISK) PORT_CHAR(UCHAR_MAMEKEY(ASTERISK)) PORT_NAME("KP *") // 6,6: KP *
- PORT_BIT(IOP_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH_PAD) PORT_CHAR(UCHAR_MAMEKEY(SLASH_PAD)) PORT_NAME("KP /") // 6,7: KP /
- PORT_BIT(IOP_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O') // 7,0: O
- PORT_BIT(IOP_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P') // 7,1: P
+ PORT_BIT(IOP_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_ASTERISK) PORT_NAME("KP *") // 6,6: KP *
+ PORT_BIT(IOP_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH_PAD) PORT_NAME("KP /") // 6,7: KP /
+ PORT_BIT(IOP_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('O') PORT_CHAR('o') // 7,0: O
+ PORT_BIT(IOP_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('P') PORT_CHAR('p') // 7,1: P
PORT_BIT(IOP_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('(') PORT_CHAR('[') // 7,2: ( [
PORT_BIT(IOP_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(')') PORT_CHAR(']') // 7,3: ) ]
PORT_BIT(IOP_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_NAME("CONT TR/NORM") // 7,4: CONT / TR/NORM
@@ -2193,8 +2193,8 @@ static INPUT_PORTS_START(hp86)
PORT_BIT(IOP_MASK(31) , IP_ACTIVE_HIGH , IPT_UNUSED) // 7,7: N/U
PORT_START("KEY2")
- PORT_BIT(IOP_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR('(') // 8,0: 9
- PORT_BIT(IOP_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR(')') // 8,1: 0
+ PORT_BIT(IOP_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') // 8,0: 9
+ PORT_BIT(IOP_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') // 8,1: 0
PORT_BIT(IOP_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('_') // 8,2: - _
PORT_BIT(IOP_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('=') PORT_CHAR('+') // 8,3: = +
PORT_BIT(IOP_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE) PORT_CHAR('\\') PORT_CHAR('|') // 8,4: \ |
@@ -2273,14 +2273,14 @@ static INPUT_PORTS_START(hp86_int)
// n = r / 4
// b = (r % 4) * 8 + c
PORT_START("KEY0")
- PORT_BIT(IOP_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K') // 0,0: K
- PORT_BIT(IOP_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M') // 0,1: M
- PORT_BIT(IOP_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N') // 0,2: N
- PORT_BIT(IOP_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B') // 0,3: B
- PORT_BIT(IOP_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V') // 0,4: V
- PORT_BIT(IOP_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z') // 0,5: Z
- PORT_BIT(IOP_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X') // 0,6: X
- PORT_BIT(IOP_MASK(7) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C') // 0,7: C
+ PORT_BIT(IOP_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('K') PORT_CHAR('k') // 0,0: K
+ PORT_BIT(IOP_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('M') PORT_CHAR('m') // 0,1: M
+ PORT_BIT(IOP_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('N') PORT_CHAR('n') // 0,2: N
+ PORT_BIT(IOP_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('B') PORT_CHAR('b') // 0,3: B
+ PORT_BIT(IOP_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('V') PORT_CHAR('v') // 0,4: V
+ PORT_BIT(IOP_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') PORT_CHAR('z') // 0,5: Z
+ PORT_BIT(IOP_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('X') PORT_CHAR('x') // 0,6: X
+ PORT_BIT(IOP_MASK(7) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('C') PORT_CHAR('c') // 0,7: C
PORT_BIT(IOP_MASK(8) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR('(') // 1,0: 9
PORT_BIT(IOP_MASK(9) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F5) PORT_CHAR(UCHAR_MAMEKEY(F5)) PORT_NAME("k5 k12") // 1,1: k5 / k12
PORT_BIT(IOP_MASK(10) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F4) PORT_CHAR(UCHAR_MAMEKEY(F4)) PORT_NAME("k4 k11") // 1,2: k4 / k11
@@ -2289,22 +2289,22 @@ static INPUT_PORTS_START(hp86_int)
PORT_BIT(IOP_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_CAPSLOCK) PORT_NAME("Caps") // 1,5: Caps
PORT_BIT(IOP_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_NAME("LABEL KEY") // 1,6: LABEL KEY
PORT_BIT(IOP_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1)) PORT_NAME("k1 k8") // 1,7: k1 / k8
- PORT_BIT(IOP_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I') // 2,0: I
- PORT_BIT(IOP_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J') // 2,1: J
- PORT_BIT(IOP_MASK(18) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H') // 2,2: H
- PORT_BIT(IOP_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G') // 2,3: G
- PORT_BIT(IOP_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F') // 2,4: F
- PORT_BIT(IOP_MASK(21) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A') // 2,5: A
- PORT_BIT(IOP_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S') // 2,6: S
- PORT_BIT(IOP_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D') // 2,7: D
+ PORT_BIT(IOP_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('I') PORT_CHAR('i') // 2,0: I
+ PORT_BIT(IOP_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('J') PORT_CHAR('j') // 2,1: J
+ PORT_BIT(IOP_MASK(18) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('H') PORT_CHAR('h') // 2,2: H
+ PORT_BIT(IOP_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('G') PORT_CHAR('g') // 2,3: G
+ PORT_BIT(IOP_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('F') PORT_CHAR('f') // 2,4: F
+ PORT_BIT(IOP_MASK(21) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('A') PORT_CHAR('a') // 2,5: A
+ PORT_BIT(IOP_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('S') PORT_CHAR('s') // 2,6: S
+ PORT_BIT(IOP_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('D') PORT_CHAR('d') // 2,7: D
PORT_BIT(IOP_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('*') // 3,0: 8
- PORT_BIT(IOP_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U') // 3,1: U
- PORT_BIT(IOP_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y') // 3,2: Y
- PORT_BIT(IOP_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T') // 3,3: T
- PORT_BIT(IOP_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R') // 3,4: R
- PORT_BIT(IOP_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q') // 3,5: Q
- PORT_BIT(IOP_MASK(30) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W') // 3,6: W
- PORT_BIT(IOP_MASK(31) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E') // 3,7: E
+ PORT_BIT(IOP_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('U') PORT_CHAR('u') // 3,1: U
+ PORT_BIT(IOP_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y') PORT_CHAR('y') // 3,2: Y
+ PORT_BIT(IOP_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('T') PORT_CHAR('t') // 3,3: T
+ PORT_BIT(IOP_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('R') PORT_CHAR('r') // 3,4: R
+ PORT_BIT(IOP_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q') PORT_CHAR('q') // 3,5: Q
+ PORT_BIT(IOP_MASK(30) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('W') PORT_CHAR('w') // 3,6: W
+ PORT_BIT(IOP_MASK(31) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('E') PORT_CHAR('e') // 3,7: E
PORT_START("KEY1")
PORT_BIT(IOP_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR(')') // 4,0: 0
@@ -2315,23 +2315,23 @@ static INPUT_PORTS_START(hp86_int)
PORT_BIT(IOP_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_NAME("^ RESLT") // 4,5: KP ^ / RESLT
PORT_BIT(IOP_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_NAME(") INIT") // 4,6: KP ) / INIT
PORT_BIT(IOP_MASK(7) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_NAME("( RESET") // 4,7: KP ( / RESET
- PORT_BIT(IOP_MASK(8) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P') // 5,0: P
+ PORT_BIT(IOP_MASK(8) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('P') PORT_CHAR('p') // 5,0: P
PORT_BIT(IOP_MASK(9) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR(':') // 5,1: ; :
PORT_BIT(IOP_MASK(10) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR('\'') PORT_CHAR('"') // 5,2: ' "
PORT_BIT(IOP_MASK(11) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) PORT_NAME("END LINE") // 5,3: END LINE
- PORT_BIT(IOP_MASK(12) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_4_PAD) PORT_CHAR(UCHAR_MAMEKEY(4_PAD)) PORT_CHAR('$') // 5,4: KP 4
- PORT_BIT(IOP_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_ASTERISK) PORT_CHAR(UCHAR_MAMEKEY(ASTERISK)) PORT_NAME("KP *") // 5,5: KP *
- PORT_BIT(IOP_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_6_PAD) PORT_CHAR(UCHAR_MAMEKEY(6_PAD)) PORT_CHAR('^') // 5,6: KP 6
- PORT_BIT(IOP_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_5_PAD) PORT_CHAR(UCHAR_MAMEKEY(5_PAD)) PORT_CHAR('%') // 5,7: KP 5
- PORT_BIT(IOP_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L') // 6,0: L
+ PORT_BIT(IOP_MASK(12) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_4_PAD) // 5,4: KP 4
+ PORT_BIT(IOP_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_ASTERISK) PORT_NAME("KP *") // 5,5: KP *
+ PORT_BIT(IOP_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_6_PAD) PORT_CHAR('^') // 5,6: KP 6
+ PORT_BIT(IOP_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_5_PAD) PORT_CHAR('%') // 5,7: KP 5
+ PORT_BIT(IOP_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('L') PORT_CHAR('l') // 6,0: L
PORT_BIT(IOP_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>') // 6,1: .
PORT_BIT(IOP_MASK(18) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?') // 6,2: / ?
PORT_BIT(IOP_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_NAME("LIST P LST") // 6,3: LIST / P LST
- PORT_BIT(IOP_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_1_PAD) PORT_CHAR(UCHAR_MAMEKEY(1_PAD)) PORT_CHAR('!') // 6,4: KP 1
- PORT_BIT(IOP_MASK(21) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS_PAD) PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD)) PORT_NAME("KP -") // 6,5: KP -
- PORT_BIT(IOP_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_3_PAD) PORT_CHAR(UCHAR_MAMEKEY(3_PAD)) PORT_CHAR('#') // 6,6: KP 3
- PORT_BIT(IOP_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_2_PAD) PORT_CHAR(UCHAR_MAMEKEY(2_PAD)) PORT_CHAR('@') // 6,7: KP 2
- PORT_BIT(IOP_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O') // 7,0: O
+ PORT_BIT(IOP_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_1_PAD) // 6,4: KP 1
+ PORT_BIT(IOP_MASK(21) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS_PAD) PORT_NAME("KP -") // 6,5: KP -
+ PORT_BIT(IOP_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_3_PAD) // 6,6: KP 3
+ PORT_BIT(IOP_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_2_PAD) // 6,7: KP 2
+ PORT_BIT(IOP_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('O') PORT_CHAR('o') // 7,0: O
PORT_BIT(IOP_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('&') // 7,1: 7
PORT_BIT(IOP_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('^') // 7,2: 6
PORT_BIT(IOP_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%') // 7,3: 5
@@ -2345,17 +2345,17 @@ static INPUT_PORTS_START(hp86_int)
PORT_BIT(IOP_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('(') PORT_CHAR('[') // 8,1: ( [
PORT_BIT(IOP_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(')') PORT_CHAR(']') // 8,2: ) ]
PORT_BIT(IOP_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_NAME("CONT TR/NORM") // 8,3: CONT / TR/NORM
- PORT_BIT(IOP_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_7_PAD) PORT_CHAR(UCHAR_MAMEKEY(7_PAD)) PORT_CHAR('&') // 8,4: KP 7
- PORT_BIT(IOP_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH_PAD) PORT_CHAR(UCHAR_MAMEKEY(SLASH_PAD)) PORT_NAME("KP /") // 8,5: KP /
- PORT_BIT(IOP_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_9_PAD) PORT_CHAR(UCHAR_MAMEKEY(9_PAD)) PORT_CHAR('(') // 8,6: KP 9
- PORT_BIT(IOP_MASK(7) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_8_PAD) PORT_CHAR(UCHAR_MAMEKEY(8_PAD)) PORT_CHAR('*') // 8,7: KP 8
+ PORT_BIT(IOP_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_7_PAD) // 8,4: KP 7
+ PORT_BIT(IOP_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH_PAD) PORT_NAME("KP /") // 8,5: KP /
+ PORT_BIT(IOP_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_9_PAD) // 8,6: KP 9
+ PORT_BIT(IOP_MASK(7) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_8_PAD) // 8,7: KP 8
PORT_BIT(IOP_MASK(8) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<') // 9,0: ,
PORT_BIT(IOP_MASK(9) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') // 9,1: Space
PORT_BIT(IOP_MASK(10) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_NAME("PAUSE STEP") // 9,2: PAUSE / STEP
PORT_BIT(IOP_MASK(11) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_NAME("RUN") // 9,3: RUN
- PORT_BIT(IOP_MASK(12) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_0_PAD) PORT_CHAR(UCHAR_MAMEKEY(0_PAD)) PORT_CHAR(')') // 9,4: KP 0
- PORT_BIT(IOP_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_PLUS_PAD) PORT_CHAR(UCHAR_MAMEKEY(PLUS_PAD)) PORT_NAME("KP +") // 9,5: KP +
- PORT_BIT(IOP_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA_PAD) PORT_CHAR(UCHAR_MAMEKEY(COMMA_PAD)) PORT_CHAR('<') // 9,6: KP ,
+ PORT_BIT(IOP_MASK(12) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_0_PAD) // 9,4: KP 0
+ PORT_BIT(IOP_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_PLUS_PAD) PORT_NAME("KP +") // 9,5: KP +
+ PORT_BIT(IOP_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA_PAD) // 9,6: KP ,
PORT_BIT(IOP_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CHAR('.') PORT_CHAR('>') PORT_NAME("KP .") // 9,7: KP .
PORT_BIT(IOP_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F6) PORT_CHAR(UCHAR_MAMEKEY(F6)) PORT_NAME("k6 k13") // 10,0: k6 / k13
PORT_BIT(IOP_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F7) PORT_CHAR(UCHAR_MAMEKEY(F7)) PORT_NAME("k7 k14") // 10,1: k7 / k14
diff --git a/src/mame/drivers/hunter2.cpp b/src/mame/drivers/hunter2.cpp
index 2b4a220feea..f5b6b017ecc 100644
--- a/src/mame/drivers/hunter2.cpp
+++ b/src/mame/drivers/hunter2.cpp
@@ -17,13 +17,16 @@
though only 48K of this is ever paged in.
Usage:
- The RAMdisk must first be formatted using 'format'.
+ The RAMdisk must first be formatted using 'format' (but you'll lose the inbuilt apps).
+ The function keys labels at the bottom of the screen are accessed by Ctrl 1 through 8.
TODO:
- Add ports 83 and 85
- Need software
- Add whatever image devices existed
- Probably lots of other stuff
+ - DIR command can go crazy
+ - Clock doesn't advance
****************************************************************************/
@@ -139,30 +142,30 @@ static INPUT_PORTS_START( hunter2 )
PORT_START("X0")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('^')
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%')
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y') PORT_CHAR('y')
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('T') PORT_CHAR('t')
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('G') PORT_CHAR('g')
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('F') PORT_CHAR('f')
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('B') PORT_CHAR('b')
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('V') PORT_CHAR('v')
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y')
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T')
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G')
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F')
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B')
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V')
PORT_START("X1")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('*')
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('&')
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('I') PORT_CHAR('i')
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('U') PORT_CHAR('u')
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('J') PORT_CHAR('j')
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('H') PORT_CHAR('h')
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('M') PORT_CHAR('m')
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('N') PORT_CHAR('n')
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I')
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U')
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J')
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H')
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M')
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N')
PORT_START("X2")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR(')')
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR('(')
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('P') PORT_CHAR('p')
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('O') PORT_CHAR('o')
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('L') PORT_CHAR('l')
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('K') PORT_CHAR('k')
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P')
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O')
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L')
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K')
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<')
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
@@ -189,22 +192,22 @@ static INPUT_PORTS_START( hunter2 )
PORT_START("X5")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('@')
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('W') PORT_CHAR('w')
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q') PORT_CHAR('q')
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('A') PORT_CHAR('a')
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W')
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q')
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A')
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ctl/Fn") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL)
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') PORT_CHAR('z')
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z')
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
PORT_START("X6")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('R') PORT_CHAR('r')
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('E') PORT_CHAR('e')
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('D') PORT_CHAR('d')
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('S') PORT_CHAR('s')
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('C') PORT_CHAR('c')
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('X') PORT_CHAR('x')
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R')
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E')
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D')
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S')
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C')
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X')
PORT_START("BATTERY")
PORT_CONFNAME(0x04, 0x00, "Battery")
diff --git a/src/mame/drivers/husky.cpp b/src/mame/drivers/husky.cpp
index c5837ae1c9a..ba63742e0a2 100644
--- a/src/mame/drivers/husky.cpp
+++ b/src/mame/drivers/husky.cpp
@@ -14,6 +14,7 @@
TODO:
- implement power button
- test rs232 port
+ - Break key doesn't work?
****************************************************************************/
@@ -163,7 +164,7 @@ static INPUT_PORTS_START(husky)
PORT_BIT(0x0200, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('H') PORT_CHAR('#')
PORT_BIT(0x0400, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('J') PORT_CHAR('*')
PORT_BIT(0x0800, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('K') PORT_CHAR('=')
- PORT_BIT(0x1000, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('L') PORT_NAME("L Esc")
+ PORT_BIT(0x1000, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('L') PORT_CHAR(27) PORT_NAME("L Esc")
PORT_BIT(0x2000, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Power on/off")
PORT_START("X2")
@@ -173,10 +174,10 @@ static INPUT_PORTS_START(husky)
PORT_BIT(0x0040, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') PORT_CHAR('<')
PORT_BIT(0x0080, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('X') PORT_CHAR('$')
PORT_BIT(0x0100, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('C') PORT_CHAR('%')
- PORT_BIT(0x0200, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('V') PORT_NAME("V Insert")
+ PORT_BIT(0x0200, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('V') PORT_CHAR(UCHAR_MAMEKEY(INSERT)) PORT_NAME("V Insert")
PORT_BIT(0x0400, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('B') PORT_CHAR('-')
- PORT_BIT(0x0800, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('N') PORT_NAME("N Left")
- PORT_BIT(0x1000, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('M') PORT_NAME("M Right")
+ PORT_BIT(0x0800, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('N') PORT_CHAR(UCHAR_MAMEKEY(LEFT)) PORT_NAME("N Left")
+ PORT_BIT(0x1000, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('M') PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_NAME("M Right")
PORT_BIT(0x2000, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
PORT_START("X3")
@@ -188,9 +189,9 @@ static INPUT_PORTS_START(husky)
PORT_BIT(0x0100, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_NAME("5 Control")
PORT_BIT(0x0200, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('.')
PORT_BIT(0x0400, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('+')
- PORT_BIT(0x0800, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_NAME("8 Down")
- PORT_BIT(0x1000, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_NAME("9 Up")
- PORT_BIT(0x2000, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_NAME("0 Del")
+ PORT_BIT(0x0800, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_NAME("8 Down")
+ PORT_BIT(0x1000, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(UCHAR_MAMEKEY(UP)) PORT_NAME("9 Up")
+ PORT_BIT(0x2000, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR(UCHAR_MAMEKEY(DEL)) PORT_NAME("0 Del")
PORT_START("BATTERY")
PORT_CONFNAME(0x04, 0x04, "Battery")
diff --git a/src/mame/drivers/informer_207_376.cpp b/src/mame/drivers/informer_207_376.cpp
index a8eb6500334..964363dc0e8 100644
--- a/src/mame/drivers/informer_207_376.cpp
+++ b/src/mame/drivers/informer_207_376.cpp
@@ -30,16 +30,19 @@
#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "machine/6850acia.h"
+#include "machine/pit8253.h"
#include "machine/clock.h"
#include "machine/input_merger.h"
#include "machine/nvram.h"
#include "machine/z80scc.h"
#include "video/mc6845.h"
+#include "sound/beep.h"
#include "bus/rs232/rs232.h"
#include "bus/rs232/printer.h"
#include "machine/informer_207_376_kbd.h"
#include "emupal.h"
#include "screen.h"
+#include "speaker.h"
//**************************************************************************
@@ -55,8 +58,10 @@ public:
m_crtc(*this, "crtc"),
m_screen(*this, "screen"),
m_palette(*this, "palette"),
+ m_pit(*this, "pit"),
m_scc(*this, "scc"),
m_acia(*this, "acia%u", 0U),
+ m_beep(*this, "beep"),
m_ram(*this, "ram"),
m_chargen(*this, "chargen"),
m_nmi_enabled(false)
@@ -73,8 +78,10 @@ private:
required_device<mc6845_device> m_crtc;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
+ required_device<pit8253_device> m_pit;
required_device<scc85c30_device> m_scc;
required_device_array<acia6850_device, 2> m_acia;
+ required_device<beep_device> m_beep;
required_shared_ptr<uint8_t> m_ram;
required_region_ptr<uint8_t> m_chargen;
@@ -84,6 +91,7 @@ private:
void vsync_w(int state);
void nmi_control_w(uint8_t data);
+ void unk_8400_w(uint8_t data);
bool m_nmi_enabled;
};
@@ -98,10 +106,11 @@ void informer_207_376_state::mem_map(address_map &map)
map(0x0000, 0x7fff).ram().share("ram");
map(0x8000, 0x8000).rw(m_crtc, FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w));
map(0x8001, 0x8001).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
- map(0x8400, 0x8400).lr8(NAME([] () { return 0xff; })).nopw(); // ?
+ map(0x8400, 0x8400).lr8(NAME([] () { return 0xff; })).w(FUNC(informer_207_376_state::unk_8400_w)); // ?
map(0x8802, 0x8803).rw(m_acia[0], FUNC(acia6850_device::read), FUNC(acia6850_device::write));
map(0x8804, 0x8805).rw(m_acia[1], FUNC(acia6850_device::read), FUNC(acia6850_device::write));
map(0x8c00, 0x8c00).w(FUNC(informer_207_376_state::nmi_control_w));
+ map(0x9000, 0x9003).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write));
map(0x9400, 0x9403).rw(m_scc, FUNC(scc85c30_device::ab_dc_r), FUNC(scc85c30_device::ab_dc_w));
map(0x9c00, 0x9cff).ram().share("nvram");
map(0xa000, 0xffff).rom().region("maincpu", 0);
@@ -182,6 +191,16 @@ void informer_207_376_state::nmi_control_w(uint8_t data)
m_nmi_enabled = bool(data & 0x06);
}
+void informer_207_376_state::unk_8400_w(uint8_t data)
+{
+ // 7------- beeper
+ // -6------ unknown
+ // --5----- 1=internal modem, 0=host rs232
+ // ---43210 unknown
+
+ m_beep->set_state(BIT(data, 7));
+}
+
void informer_207_376_state::machine_start()
{
// register for save states
@@ -213,7 +232,15 @@ void informer_207_376_state::informer_207_376(machine_config &config)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); // 2x X2212P
- SCC85C30(config, m_scc, 0); // unknown clock
+ PIT8253(config, m_pit);
+ m_pit->set_clk<0>(4915200 / 2);
+ m_pit->out_handler<0>().set(m_acia[1], FUNC(acia6850_device::write_txc));
+ m_pit->out_handler<0>().append(m_acia[1], FUNC(acia6850_device::write_rxc));
+ m_pit->set_clk<1>(4915200 / 2);
+ m_pit->out_handler<1>().set(m_acia[0], FUNC(acia6850_device::write_txc));
+ m_pit->out_handler<1>().append(m_acia[0], FUNC(acia6850_device::write_rxc));
+
+ SCC85C30(config, m_scc, 4915200);
m_scc->out_txda_callback().set("com1", FUNC(rs232_port_device::write_txd));
m_scc->out_dtra_callback().set("com1", FUNC(rs232_port_device::write_dtr));
m_scc->out_rtsa_callback().set("com1", FUNC(rs232_port_device::write_rts));
@@ -229,12 +256,6 @@ void informer_207_376_state::informer_207_376(machine_config &config)
ACIA6850(config, m_acia[1], 0); // unknown clock
m_acia[1]->txd_handler().set("printer", FUNC(rs232_port_device::write_txd));
- clock_device &acia_clock(CLOCK(config, "acia_clock", 153600)); // source?
- acia_clock.signal_handler().set(m_acia[0], FUNC(acia6850_device::write_txc));
- acia_clock.signal_handler().append(m_acia[0], FUNC(acia6850_device::write_rxc));
- acia_clock.signal_handler().append(m_acia[1], FUNC(acia6850_device::write_txc));
- acia_clock.signal_handler().append(m_acia[1], FUNC(acia6850_device::write_rxc));
-
rs232_port_device &com1(RS232_PORT(config, "com1", default_rs232_devices, nullptr));
com1.rxd_handler().set(m_scc, FUNC(scc85c30_device::rxa_w));
com1.dcd_handler().set(m_scc, FUNC(scc85c30_device::dcda_w));
@@ -266,6 +287,10 @@ void informer_207_376_state::informer_207_376(machine_config &config)
m_crtc->set_char_width(8);
m_crtc->set_update_row_callback(FUNC(informer_207_376_state::crtc_update_row));
m_crtc->out_vsync_callback().set(FUNC(informer_207_376_state::vsync_w));
+
+ // sound
+ SPEAKER(config, "mono").front_center();
+ BEEP(config, "beep", 500).add_route(ALL_OUTPUTS, "mono", 0.50); // frequency unknown
}
@@ -275,13 +300,17 @@ void informer_207_376_state::informer_207_376(machine_config &config)
ROM_START( in207376 )
ROM_REGION(0x6000, "maincpu", 0)
+ // M2764A F1
// 79590-023 376SNA V1.00 201C 7224 (our checksum: 7264)
- ROM_LOAD("79590-023.bin", 0x0000, 0x2000, BAD_DUMP CRC(ed4ff488) SHA1(fdd95c520d0288ea483b5d2e8e6c8eecb04063c1))
+ ROM_LOAD("79590-023.z37", 0x0000, 0x2000, BAD_DUMP CRC(ed4ff488) SHA1(fdd95c520d0288ea483b5d2e8e6c8eecb04063c1))
+ // M27128AF1
// 79589-023 376 SNAV1.00 201C E86F (checksum matches)
- ROM_LOAD("79589-023.bin", 0x2000, 0x4000, CRC(cdfaf629) SHA1(1f21ef6848020726ef3d7ab05166ac8590d58476))
+ ROM_LOAD("79589-023.z36", 0x2000, 0x4000, CRC(cdfaf629) SHA1(1f21ef6848020726ef3d7ab05166ac8590d58476))
ROM_REGION(0x1000, "chargen", 0)
- ROM_LOAD("chargen.bin", 0x0000, 0x1000, BAD_DUMP CRC(819e4b4e) SHA1(4937e49b2d91af993e8f65f5df1d6f729e775fc4))
+ // TMS2732AGL-25
+ // 79573-001 V1.00 376/8 CHAR. GEN.
+ ROM_LOAD("79573-001.z6", 0x0000, 0x1000, CRC(f704b827) SHA1(bcc56eeb8681c2bebe3a9f4b6b78c0373c06d875))
ROM_END
@@ -290,4 +319,4 @@ ROM_END
//**************************************************************************
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
-COMP( 1986, in207376, 0, 0, informer_207_376, informer_207_376, informer_207_376_state, empty_init, "Informer", "Informer 207/376", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+COMP( 1986, in207376, 0, 0, informer_207_376, informer_207_376, informer_207_376_state, empty_init, "Informer", "Informer 207/376", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/informer_213ae.cpp b/src/mame/drivers/informer_213ae.cpp
index b1cd95d17ef..80faaaa2a63 100644
--- a/src/mame/drivers/informer_213ae.cpp
+++ b/src/mame/drivers/informer_213ae.cpp
@@ -16,6 +16,10 @@
TODO:
- Figure out the ASIC and how it's connected
+ Notes:
+ - Debug tricks: "b@42=ff" after startup to show setup screen 1
+ "bp 81a1" then "b@42=ff" and "a=02" after the break to show screen 2
+
***************************************************************************/
#include "emu.h"
@@ -71,6 +75,7 @@ private:
void informer_213ae_state::mem_map(address_map &map)
{
map(0x0000, 0x1fff).ram();
+ map(0x2000, 0x3fff).ram();
map(0x6000, 0x6fff).ram().share("vram");
map(0x7000, 0x7fff).ram().share("aram");
map(0x8000, 0xffff).rom().region("maincpu", 0);
@@ -91,27 +96,33 @@ INPUT_PORTS_END
uint32_t informer_213ae_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- for (int y = 0; y < 51; y++)
+ for (int y = 0; y < 26; y++)
{
for (int x = 0; x < 80; x++)
{
- uint8_t code = m_vram[y * 80 + x];
-// uint8_t attr = m_aram[y * 80 + x];
+ // screen memory starts at 0x6820
+ uint8_t code = m_vram[26 * 80 + y * 80 + x];
+// uint8_t attr = m_aram[26 * 80 + y * 80 + x];
+
+ // but status line is at top of vram
+ if (y > 23)
+ {
+ code = m_vram[(y - 24) * 80 + x];
+// attr = m_aram[(y - 24) * 80 + x];
+ }
// draw 9 lines
for (int i = 0; i < 9; i++)
{
uint8_t data = m_chargen[0x2000 | ((code << 4) + i)];
- // 8 pixels of the character
- bitmap.pix32(y * 9 + i, x * 8 + 0) = BIT(data, 7) ? rgb_t::white() : rgb_t::black();
- bitmap.pix32(y * 9 + i, x * 8 + 1) = BIT(data, 6) ? rgb_t::white() : rgb_t::black();
- bitmap.pix32(y * 9 + i, x * 8 + 2) = BIT(data, 5) ? rgb_t::white() : rgb_t::black();
- bitmap.pix32(y * 9 + i, x * 8 + 3) = BIT(data, 4) ? rgb_t::white() : rgb_t::black();
- bitmap.pix32(y * 9 + i, x * 8 + 4) = BIT(data, 3) ? rgb_t::white() : rgb_t::black();
- bitmap.pix32(y * 9 + i, x * 8 + 5) = BIT(data, 2) ? rgb_t::white() : rgb_t::black();
- bitmap.pix32(y * 9 + i, x * 8 + 6) = BIT(data, 1) ? rgb_t::white() : rgb_t::black();
- bitmap.pix32(y * 9 + i, x * 8 + 7) = BIT(data, 0) ? rgb_t::white() : rgb_t::black();
+ // 6 pixels of the character
+ bitmap.pix32(y * 9 + i, x * 6 + 0) = BIT(data, 7) ? rgb_t::white() : rgb_t::black();
+ bitmap.pix32(y * 9 + i, x * 6 + 1) = BIT(data, 6) ? rgb_t::white() : rgb_t::black();
+ bitmap.pix32(y * 9 + i, x * 6 + 2) = BIT(data, 5) ? rgb_t::white() : rgb_t::black();
+ bitmap.pix32(y * 9 + i, x * 6 + 3) = BIT(data, 4) ? rgb_t::white() : rgb_t::black();
+ bitmap.pix32(y * 9 + i, x * 6 + 4) = BIT(data, 3) ? rgb_t::white() : rgb_t::black();
+ bitmap.pix32(y * 9 + i, x * 6 + 5) = BIT(data, 2) ? rgb_t::white() : rgb_t::black();
}
}
}
@@ -121,11 +132,11 @@ uint32_t informer_213ae_state::screen_update(screen_device &screen, bitmap_rgb32
static const gfx_layout char_layout =
{
- 8,9,
+ 6,9,
RGN_FRAC(1,1),
1,
{ 0 },
- { 0, 1, 2, 3, 4, 5, 6, 7 },
+ { 0, 1, 2, 3, 4, 5 },
{ 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8, 8*8 },
8*16
};
@@ -160,9 +171,9 @@ void informer_213ae_state::informer_213ae(machine_config &config)
SCC8530N(config, m_scc, 0); // unknown clock
// video
- SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
- m_screen->set_color(rgb_t::green());
- m_screen->set_size(640, 480);
+ SCREEN(config, m_screen, SCREEN_TYPE_LCD);
+ m_screen->set_color(rgb_t::amber());
+ m_screen->set_size(480, 234);
m_screen->set_visarea_full();
m_screen->set_refresh_hz(60);
// m_screen->set_raw(18.432_MHz_XTAL, 0, 0, 0, 0, 0, 0);
diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp
index 97a71dbdcb3..9c1d55bf969 100644
--- a/src/mame/drivers/jupace.cpp
+++ b/src/mame/drivers/jupace.cpp
@@ -457,8 +457,8 @@ void ace_state::ace_io(address_map &map)
static INPUT_PORTS_START( ace )
PORT_START("A8")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Symbol Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_2)
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Symbol Shift") PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z') PORT_CHAR(':')
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X') PORT_CHAR(0xA3)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C') PORT_CHAR('?')
@@ -481,19 +481,19 @@ static INPUT_PORTS_START( ace )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START("A11")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('@')
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!') // DELETE LINE
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('@') // CAPS LOCK
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5) PORT_CODE(KEYCODE_LEFT) PORT_CHAR('5') PORT_CHAR('%')
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$') // INVERSE VIDEO
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5) PORT_CODE(KEYCODE_LEFT) PORT_CHAR('5') PORT_CHAR('%') PORT_CHAR(UCHAR_MAMEKEY(LEFT))
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START("A12")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR('_')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR('8') PORT_CHAR('(')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7) PORT_CODE(KEYCODE_DOWN) PORT_CHAR('7') PORT_CHAR('\'')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6) PORT_CODE(KEYCODE_UP) PORT_CHAR('6') PORT_CHAR('&')
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR('_') // DELETE
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')') // GRAPHICS
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR('8') PORT_CHAR('(') PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7) PORT_CODE(KEYCODE_DOWN) PORT_CHAR('7') PORT_CHAR('\'') PORT_CHAR(UCHAR_MAMEKEY(DOWN))
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6) PORT_CODE(KEYCODE_UP) PORT_CHAR('6') PORT_CHAR('&') PORT_CHAR(UCHAR_MAMEKEY(UP))
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START("A13")
@@ -509,11 +509,11 @@ static INPUT_PORTS_START( ace )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L') PORT_CHAR('=')
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K') PORT_CHAR('+')
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J') PORT_CHAR('-')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("h H \xE2\x86\x91") PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H')
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("h H \xE2\x86\x91") PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H') PORT_CHAR('^')
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START("A15")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') // BREAK
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M') PORT_CHAR('.')
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N') PORT_CHAR(',')
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B') PORT_CHAR('*')
@@ -847,4 +847,4 @@ ROM_END
//**************************************************************************
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
-COMP( 1981, jupace, 0, 0, ace, ace, ace_state, empty_init, "Jupiter Cantab", "Jupiter Ace", 0 )
+COMP( 1981, jupace, 0, 0, ace, ace, ace_state, empty_init, "Jupiter Cantab", "Jupiter Ace", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mstation.cpp b/src/mame/drivers/mstation.cpp
index b23bffee035..517300b2ee5 100644
--- a/src/mame/drivers/mstation.cpp
+++ b/src/mame/drivers/mstation.cpp
@@ -330,7 +330,7 @@ static INPUT_PORTS_START( mstation )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE( KEYCODE_0 ) PORT_CHAR('0') PORT_CHAR(')')
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE( KEYCODE_MINUS ) PORT_CHAR('-') PORT_CHAR('_')
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE( KEYCODE_EQUALS ) PORT_CHAR('=') PORT_CHAR('+')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Backspace") PORT_CODE( KEYCODE_BACKSPACE ) PORT_CHAR(UCHAR_MAMEKEY(BACKSPACE))
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Backspace") PORT_CODE( KEYCODE_BACKSPACE ) PORT_CHAR(8)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE( KEYCODE_BACKSLASH ) PORT_CHAR('\\') PORT_CHAR('|')
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("PG Down") PORT_CODE( KEYCODE_PGDN ) PORT_CHAR(UCHAR_MAMEKEY(PGDN))
@@ -352,7 +352,7 @@ static INPUT_PORTS_START( mstation )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE( KEYCODE_CLOSEBRACE ) PORT_CHAR(']') PORT_CHAR('}')
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE( KEYCODE_COLON ) PORT_CHAR(';') PORT_CHAR(':')
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE( KEYCODE_QUOTE ) PORT_CHAR('\'') PORT_CHAR('\"')
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Enter") PORT_CODE( KEYCODE_ENTER ) PORT_CHAR(UCHAR_MAMEKEY(ENTER))
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Enter") PORT_CODE( KEYCODE_ENTER ) PORT_CHAR(13)
PORT_START( "LINE.6" )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("CapsLock") PORT_CODE( KEYCODE_CAPSLOCK ) PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK))
diff --git a/src/mame/drivers/nascom1.cpp b/src/mame/drivers/nascom1.cpp
index 30eb112a519..c1c6282f77b 100644
--- a/src/mame/drivers/nascom1.cpp
+++ b/src/mame/drivers/nascom1.cpp
@@ -630,7 +630,7 @@ static INPUT_PORTS_START( nascom1 )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("New Line") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=')
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('@')
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR(0xff) PORT_CHAR('@') // have to press shift to get @
PORT_BIT(0x48, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_START("KEY.1")
@@ -671,7 +671,7 @@ static INPUT_PORTS_START( nascom1 )
PORT_START("KEY.5")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('+')
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>')
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>') // > nascom2 only
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')')
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR(0xA3)
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q') PORT_CHAR('q')
@@ -681,7 +681,7 @@ static INPUT_PORTS_START( nascom1 )
PORT_START("KEY.6")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(':') PORT_CHAR('*')
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?')
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0')
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR('^')
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('\"')
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('P') PORT_CHAR('p')
diff --git a/src/mame/drivers/nes_vt.cpp b/src/mame/drivers/nes_vt.cpp
index 422c395de40..5b529698010 100644
--- a/src/mame/drivers/nes_vt.cpp
+++ b/src/mame/drivers/nes_vt.cpp
@@ -1578,10 +1578,15 @@ ROM_START( vtboxing )
ROM_END
ROM_START( msiwwe )
- ROM_REGION( 0x200000, "mainrom", 0 )
+ ROM_REGION( 0x200000, "mainrom", 0 ) // the first half of this ROM is unused code from the Ms. Pac-Man game!
ROM_LOAD( "wrestlemania_es29lv160fb_004a2249.bin", 0x00000, 0x200000, CRC(f524382d) SHA1(0c8d1c29c76e3e3c58018354f1eca9445c9ab945) )
ROM_END
+ROM_START( msiwwea )
+ ROM_REGION( 0x100000, "mainrom", 0 )
+ ROM_LOAD( "wrestlemania_en29lv800bb_007f225b.bin", 0x00000, 0x100000, CRC(52102de3) SHA1(f858ad18e05d3de24dfab4c98798efb4d30e2987) )
+ROM_END
+
ROM_START( msidd )
ROM_REGION( 0x200000, "mainrom", 0 )
ROM_LOAD( "doubledragon_m29w160eb_00202249.bin", 0x00000, 0x200000, CRC(44df5bb6) SHA1(a984aa1644d2d313d4263afdfed1cd64009f1137) )
@@ -2116,8 +2121,10 @@ CONS( 200?, vtboxing, 0, 0, nes_vt_512kb, nes_vt, nes_vt_state, empty_init
// MSI Entertainment games (MSI previously operated as Majesco Entertainment)
// There are meant to be multiple revisions of this software, some with theme tunes for the new wrestlers, some without. This one appears to lack them.
-// 2 box variations exist, one with Randy Savage in purple attire, the other with him in green, it is unknown if that is any indication of software revision. This was dumped from a unit with purple on the box.
-CONS( 2017, msiwwe, 0, 0, nes_vt_2mb_baddma, nes_vt_msi, nes_vt_state, empty_init, "MSI", "WWE Wrestlemania Steel Cage Challenge (Plug & Play)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+// 2 box variations exist, one with Randy Savage in purple attire and another with green, this was dumped from a unit with purple on the box.
+CONS( 2017, msiwwe, 0, 0, nes_vt_2mb_baddma, nes_vt_msi, nes_vt_state, empty_init, "MSI", "WWE Wrestlemania Steel Cage Challenge (Plug & Play) (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+// this one was dumped from the version with Randy Savage in green, the box was much larger than the other one. This one also has new theme music for the adjusted roster.
+CONS( 2017, msiwwea, msiwwe, 0, nes_vt_1mb_baddma, nes_vt_msi, nes_vt_state, empty_init, "MSI", "WWE Wrestlemania Steel Cage Challenge (Plug & Play) (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
CONS( 2017, msidd, 0, 0, nes_vt_2mb_baddma, nes_vt_msi, nes_vt_state, empty_init, "MSI / Arc System Works", "Double Dragon - 30 Years Anniversary (Plug & Play)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/novag_cexpert.cpp b/src/mame/drivers/novag_cexpert.cpp
new file mode 100644
index 00000000000..610014ef150
--- /dev/null
+++ b/src/mame/drivers/novag_cexpert.cpp
@@ -0,0 +1,257 @@
+// license:BSD-3-Clause
+// copyright-holders:hap
+// thanks-to:Berger
+/******************************************************************************
+
+Novag Constellation Expert (model 853)
+
+The u3 ROM contains the following message (it's David Kittinger's company):
+Copyright (c) 1985, Intelligent Heuristic Programming, Inc
+
+Hardware notes:
+- R65C02P4 @ 5MHz (10MHz XTAL)
+- 2*2KB RAM(NEC D449C-3), 2*32KB ROM
+- 64+8 leds, magnet sensors chessboard
+- ports for optional printer and chess clock
+
+I/O is again similar to supercon
+
+******************************************************************************/
+
+#include "emu.h"
+
+#include "cpu/m6502/r65c02.h"
+#include "machine/sensorboard.h"
+#include "machine/nvram.h"
+#include "machine/timer.h"
+#include "sound/beep.h"
+#include "video/pwm.h"
+#include "speaker.h"
+
+// internal artwork
+#include "novag_cexpert.lh" // clickable
+
+
+namespace {
+
+class cexpert_state : public driver_device
+{
+public:
+ cexpert_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
+ m_maincpu(*this, "maincpu"),
+ m_irq_on(*this, "irq_on"),
+ m_display(*this, "display"),
+ m_board(*this, "board"),
+ m_beeper(*this, "beeper"),
+ m_inputs(*this, "IN.%u", 0)
+ { }
+
+ // machine configs
+ void cexpert(machine_config &config);
+
+protected:
+ virtual void machine_start() override;
+
+private:
+ // devices/pointers
+ required_device<cpu_device> m_maincpu;
+ required_device<timer_device> m_irq_on;
+ required_device<pwm_display_device> m_display;
+ required_device<sensorboard_device> m_board;
+ required_device<beep_device> m_beeper;
+ required_ioport_array<8> m_inputs;
+
+ // address maps
+ void main_map(address_map &map);
+
+ // periodic interrupts
+ template<int Line> TIMER_DEVICE_CALLBACK_MEMBER(irq_on) { m_maincpu->set_input_line(Line, ASSERT_LINE); }
+ template<int Line> TIMER_DEVICE_CALLBACK_MEMBER(irq_off) { m_maincpu->set_input_line(Line, CLEAR_LINE); }
+
+ // I/O handlers
+ void update_display();
+ void mux_w(u8 data);
+ void control_w(u8 data);
+ u8 input1_r();
+ u8 input2_r();
+
+ u8 m_inp_mux = 0;
+ u8 m_led_select = 0;
+};
+
+void cexpert_state::machine_start()
+{
+ // register for savestates
+ save_item(NAME(m_inp_mux));
+ save_item(NAME(m_led_select));
+}
+
+
+
+/******************************************************************************
+ I/O
+******************************************************************************/
+
+void cexpert_state::update_display()
+{
+ m_display->matrix(1 << m_led_select, m_inp_mux);
+}
+
+void cexpert_state::mux_w(u8 data)
+{
+ // d0-d7: input mux, led data
+ m_inp_mux = data;
+ update_display();
+}
+
+void cexpert_state::control_w(u8 data)
+{
+ // d0-d2: clock/printer?
+
+ // d3: enable beeper
+ m_beeper->set_state(data >> 3 & 1);
+
+ // d4-d7: 74145 to led select
+ m_led_select = data >> 4 & 0xf;
+ update_display();
+}
+
+u8 cexpert_state::input1_r()
+{
+ u8 data = 0;
+
+ // d0-d7: multiplexed inputs (chessboard squares)
+ for (int i = 0; i < 8; i++)
+ if (BIT(m_inp_mux, i))
+ data |= m_board->read_rank(i ^ 7, true);
+
+ return ~data;
+}
+
+u8 cexpert_state::input2_r()
+{
+ u8 data = 0;
+
+ // d6,d7: multiplexed inputs (side panel)
+ for (int i = 0; i < 8; i++)
+ if (BIT(m_inp_mux, i))
+ data |= m_inputs[i]->read() << 6;
+
+ // other: ?
+
+ return ~data;
+}
+
+
+
+/******************************************************************************
+ Address Maps
+******************************************************************************/
+
+void cexpert_state::main_map(address_map &map)
+{
+ map(0x0000, 0x0fff).ram().share("nvram");
+ map(0x1000, 0x1000).nopw(); // accessory?
+ map(0x1100, 0x1100).nopw(); // "
+ map(0x1200, 0x1200).rw(FUNC(cexpert_state::input2_r), FUNC(cexpert_state::mux_w));
+ map(0x1300, 0x1300).rw(FUNC(cexpert_state::input1_r), FUNC(cexpert_state::control_w));
+ map(0x1800, 0xffff).rom();
+}
+
+
+
+/******************************************************************************
+ Input Ports
+******************************************************************************/
+
+static INPUT_PORTS_START( cexpert )
+ PORT_START("IN.0")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_I) PORT_NAME("New Game")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_8) PORT_NAME("Player/Player / Gambit Book / King")
+
+ PORT_START("IN.1")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_U) PORT_NAME("Verify / Set Up")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_7) PORT_NAME("Best Move/Random / Training Level / Queen")
+
+ PORT_START("IN.2")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_Y) PORT_NAME("Change Color")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_6) PORT_NAME("Sound / Depth Search / Bishop")
+
+ PORT_START("IN.3")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_T) PORT_NAME("Clear Board / Tournament Book")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_5) PORT_NAME("Solve Mate / Infinite / Knight")
+
+ PORT_START("IN.4")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_R) PORT_NAME("Print Moves / Print Evaluations")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_4) PORT_NAME("Print Board / Interface / Rook")
+
+ PORT_START("IN.5")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_E) PORT_NAME("Trace Forward / Auto Play")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_3) PORT_NAME("Print List / Acc. Time / Pawn")
+
+ PORT_START("IN.6")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_W) PORT_NAME("Hint / Next Best")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_2) PORT_NAME("Set Level")
+
+ PORT_START("IN.7")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_Q) PORT_NAME("Go")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_1) PORT_NAME("Take Back / Restore")
+INPUT_PORTS_END
+
+
+
+/******************************************************************************
+ Machine Configs
+******************************************************************************/
+
+void cexpert_state::cexpert(machine_config &config)
+{
+ /* basic machine hardware */
+ R65C02(config, m_maincpu, 10_MHz_XTAL/2);
+ m_maincpu->set_addrmap(AS_PROGRAM, &cexpert_state::main_map);
+
+ const attotime irq_period = attotime::from_hz(15440 / 32.0); // 555 timer (measured), to 4020
+ TIMER(config, m_irq_on).configure_periodic(FUNC(cexpert_state::irq_on<M6502_IRQ_LINE>), irq_period);
+ m_irq_on->set_start_delay(irq_period - attotime::from_nsec(15200)); // active for 15.2us
+ TIMER(config, "irq_off").configure_periodic(FUNC(cexpert_state::irq_off<M6502_IRQ_LINE>), irq_period);
+
+ NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
+
+ SENSORBOARD(config, m_board).set_type(sensorboard_device::MAGNETS);
+ m_board->init_cb().set(m_board, FUNC(sensorboard_device::preset_chess));
+ m_board->set_delay(attotime::from_msec(200));
+ m_board->set_nvram_enable(true);
+
+ /* video hardware */
+ PWM_DISPLAY(config, m_display).set_size(9, 8);
+ config.set_default_layout(layout_novag_cexpert);
+
+ /* sound hardware */
+ SPEAKER(config, "mono").front_center();
+ BEEP(config, m_beeper, 15440 / 16); // 965Hz
+ m_beeper->add_route(ALL_OUTPUTS, "mono", 0.25);
+}
+
+
+
+/******************************************************************************
+ ROM Definitions
+******************************************************************************/
+
+ROM_START( cexpert )
+ ROM_REGION( 0x10000, "maincpu", 0 )
+ ROM_LOAD("novag_8533-503.u3", 0x0000, 0x8000, CRC(e384de2f) SHA1(13b56e2870e3755073e7a7cc63bae995cd468562) )
+ ROM_LOAD("novag_8532-502.u2", 0x8000, 0x8000, CRC(c2c367b5) SHA1(e000871c93a5e0fc2f8b29f3d2fec0607a91559b) )
+ROM_END
+
+} // anonymous namespace
+
+
+
+/******************************************************************************
+ Drivers
+******************************************************************************/
+
+// YEAR NAME PARENT CMP MACHINE INPUT STATE INIT COMPANY, FULLNAME, FLAGS
+CONS( 1985, cexpert, 0, 0, cexpert, cexpert, cexpert_state, empty_init, "Novag", "Constellation Expert", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
diff --git a/src/mame/drivers/novag_cforte.cpp b/src/mame/drivers/novag_cforte.cpp
index 67e499cc57a..b291bc6480b 100644
--- a/src/mame/drivers/novag_cforte.cpp
+++ b/src/mame/drivers/novag_cforte.cpp
@@ -172,12 +172,13 @@ u8 cforte_state::input2_r()
{
u8 data = 0;
- // d0-d5: ?
// d6,d7: multiplexed inputs (side panel)
for (int i = 0; i < 8; i++)
if (BIT(m_inp_mux, i))
data |= m_inputs[i]->read() << 6;
+ // other: ?
+
return ~data;
}
@@ -190,8 +191,8 @@ u8 cforte_state::input2_r()
void cforte_state::main_map(address_map &map)
{
map(0x0000, 0x0fff).ram().share("nvram");
- map(0x1c00, 0x1c00).nopw(); // printer?
- map(0x1d00, 0x1d00).nopw(); // printer?
+ map(0x1c00, 0x1c00).nopw(); // accessory?
+ map(0x1d00, 0x1d00).nopw(); // "
map(0x1e00, 0x1e00).rw(FUNC(cforte_state::input2_r), FUNC(cforte_state::mux_w));
map(0x1f00, 0x1f00).rw(FUNC(cforte_state::input1_r), FUNC(cforte_state::control_w));
map(0x2000, 0xffff).rom();
diff --git a/src/mame/drivers/osbexec.cpp b/src/mame/drivers/osbexec.cpp
index 754e838651e..467ab3c0b7d 100644
--- a/src/mame/drivers/osbexec.cpp
+++ b/src/mame/drivers/osbexec.cpp
@@ -241,38 +241,38 @@ static INPUT_PORTS_START( osbexec )
PORT_START("ROW2")
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I')
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U')
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y')
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T')
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R')
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E')
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W')
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q')
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U') PORT_CHAR(21)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y') PORT_CHAR(25)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T') PORT_CHAR(20)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R') PORT_CHAR(18)
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E') PORT_CHAR(5)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W') PORT_CHAR(23)
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q') PORT_CHAR(17)
PORT_START("ROW3")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K')
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J')
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H')
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G')
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F')
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D')
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S')
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A')
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K') PORT_CHAR(11)
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J') PORT_CHAR(10)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H') PORT_CHAR(8)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G') PORT_CHAR(7)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F') PORT_CHAR(6)
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D') PORT_CHAR(4)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S') PORT_CHAR(19)
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A') PORT_CHAR(1)
PORT_START("ROW4")
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<')
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M')
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N')
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B')
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V')
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C')
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X')
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z')
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N') PORT_CHAR(14)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B') PORT_CHAR(2)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V') PORT_CHAR(22)
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C') PORT_CHAR(3)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X') PORT_CHAR(24)
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z') PORT_CHAR(26)
PORT_START("ROW5")
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR('(')
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O')
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P')
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O') PORT_CHAR(15)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P') PORT_CHAR(16)
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>')
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR(')')
@@ -281,7 +281,7 @@ static INPUT_PORTS_START( osbexec )
PORT_START("ROW6")
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('=') PORT_CHAR('+')
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L')
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L') PORT_CHAR(12)
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('\\') PORT_CHAR('|')
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR(':')
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?')
diff --git a/src/mame/drivers/pgm2.cpp b/src/mame/drivers/pgm2.cpp
index 72cf0583f85..4cecf239972 100644
--- a/src/mame/drivers/pgm2.cpp
+++ b/src/mame/drivers/pgm2.cpp
@@ -793,6 +793,7 @@ void pgm2_state::pgm2(machine_config &config)
void pgm2_state::pgm2_lores(machine_config &config)
{
pgm2(config);
+ m_screen->set_refresh(HZ_TO_ATTOSECONDS(15625.0/264.0)); // not verified
m_screen->set_visarea(0, 320-1, 0, 240-1);
}
diff --git a/src/mame/drivers/rfslots8085.cpp b/src/mame/drivers/rfslots8085.cpp
index 47c0ef44cc4..94eae5ecc82 100644
--- a/src/mame/drivers/rfslots8085.cpp
+++ b/src/mame/drivers/rfslots8085.cpp
@@ -16,6 +16,16 @@
IC39 = AY-3-8910A
IC38 = AY-3-8910A
+Recreativos Franco used this hardware from 1987 to 1992 on several machines, including:
+ -Baby & Bombo
+ -Baby Formula
+ -Limon y Baby
+ -Limon y Baby 100
+ -Baby Afrojin Dakar 3
+ -El Tren
+ -Baby Derby
+ Etc.
+
***************************************************************************/
#include "emu.h"
diff --git a/src/mame/drivers/spc1500.cpp b/src/mame/drivers/spc1500.cpp
index ad67dfe7242..c6732deed1f 100644
--- a/src/mame/drivers/spc1500.cpp
+++ b/src/mame/drivers/spc1500.cpp
@@ -713,7 +713,7 @@ static INPUT_PORTS_START( spc1500 )
PORT_START("LINE.1")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("= +") PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('=') PORT_CHAR('+')
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Right") PORT_CODE(KEYCODE_RIGHT)
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Right") PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Space") PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Return") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C') PORT_CHAR(0x03)
@@ -723,7 +723,7 @@ static INPUT_PORTS_START( spc1500 )
PORT_START("LINE.2")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Caps") PORT_CODE(KEYCODE_CAPSLOCK)
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Left") PORT_CODE(KEYCODE_LEFT)
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Left") PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT))
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Z") PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z') PORT_CHAR(0x1a)
PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("] }") PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']') PORT_CHAR('}') PORT_CHAR(0x1d)
PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("V") PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V') PORT_CHAR(0x16)
@@ -732,8 +732,8 @@ static INPUT_PORTS_START( spc1500 )
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("2 @") PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('@')
PORT_START("LINE.3")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Backspace") PORT_CODE(KEYCODE_BACKSPACE) PORT_CODE(KEYCODE_INSERT) PORT_CHAR(UCHAR_MAMEKEY(INSERT))
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(UTF8_UP) PORT_CODE(KEYCODE_UP)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Backspace") PORT_CODE(KEYCODE_BACKSPACE) PORT_CODE(KEYCODE_INSERT) PORT_CHAR(8) PORT_CHAR(UCHAR_MAMEKEY(INSERT))
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(UTF8_UP) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP))
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("ESC") PORT_CODE(KEYCODE_ESC) PORT_CHAR(0x1b)
PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("` ~") PORT_CODE(KEYCODE_TILDE) PORT_CHAR('`') PORT_CHAR('~')
PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("B") PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B') PORT_CHAR(0x02)
@@ -743,7 +743,7 @@ static INPUT_PORTS_START( spc1500 )
PORT_START("LINE.4")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Del Ins") PORT_CODE(KEYCODE_DEL_PAD) PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD)) PORT_CHAR(8)
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Down") PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN))
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Tab") PORT_CODE(KEYCODE_TAB) PORT_CHAR('\t')
PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Home") PORT_CODE(KEYCODE_HOME)
PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("N") PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N') PORT_CHAR(0x0e)
diff --git a/src/mame/drivers/unk6502_st2xxx.cpp b/src/mame/drivers/unk6502_st2xxx.cpp
index bf1bbf25dca..ffccdd32033 100644
--- a/src/mame/drivers/unk6502_st2xxx.cpp
+++ b/src/mame/drivers/unk6502_st2xxx.cpp
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
-// unknown 6502 based handhelds, possibly ST2205U architecture
+// unknown 6502 based handhelds, ST2205U or ST23XX architecture
// the BBL 380 - 180 in 1 features similar menus / presentation / games to the 'ORB Gaming Retro Arcade Pocket Handheld Games Console with 153 Games' (eg has Matchstick Man, Gang Tie III etc.)
// https://www.youtube.com/watch?v=NacY2WHd-CY
@@ -50,7 +50,7 @@ private:
void bbl380_map(address_map &map);
- required_device<st2205u_device> m_maincpu;
+ required_device<st2xxx_device> m_maincpu;
required_device<palette_device> m_palette;
required_device<screen_device> m_screen;
};
@@ -97,9 +97,8 @@ INPUT_PORTS_END
void bbl380_state::bbl380(machine_config &config)
{
- ST2205U(config, m_maincpu, 8000000); // unknown clock; type close but not quite correct?
+ ST2302U(config, m_maincpu, 8000000); // unknown clock; type not confirmed
m_maincpu->set_addrmap(AS_DATA, &bbl380_state::bbl380_map);
- m_maincpu->set_alt_map();
SCREEN(config, m_screen, SCREEN_TYPE_LCD); // TFT color LCD
m_screen->set_refresh_hz(60);
@@ -125,6 +124,13 @@ ROM_START( bbl380 )
// 0x0022XX, 0x0026XX, 0x002AXX, 0x002CXX, 0x002DXX, 0x0031XX, 0x0036XX, etc. should not be FF fill
ROM_END
+ROM_START( rhhc152 )
+ ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASEFF )
+ ROM_LOAD( "st2x_internal.bin", 0x002000, 0x002000, BAD_DUMP CRC(f4dc1fc2) SHA1(bbc11539c48eb612ebae50da45e03b6fde440941) ) // internal OTPROM BIOS, dumped from dgun2953 PCB, 6000-7fff range
+
+ ROM_REGION( 0x800000, "spi", ROMREGION_ERASEFF )
+ ROM_LOAD( "152_mk25q32amg_ef4016.bin", 0x000000, 0x400000, CRC(5f553895) SHA1(cd21c6ff225e0455531f6b1d9f1c66a284948516) )
+ROM_END
ROM_START( ragc153 )
ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASEFF )
@@ -166,7 +172,8 @@ void bbl380_state::init_ragc153()
}
CONS( 200?, bbl380, 0, 0, bbl380, bbl380, bbl380_state, empty_init, "BaoBaoLong", "BBL380 - 180 in 1", MACHINE_IS_SKELETON )
-CONS( 200?, ragc153, 0, 0, bbl380, bbl380, bbl380_state, init_ragc153, "Orb", "Retro Arcade Game Controller 153-in-1", MACHINE_IS_SKELETON )
+CONS( 200?, rhhc152, 0, 0, bbl380, bbl380, bbl380_state, init_ragc153, "Orb", "Retro Handheld Console 152-in-1", MACHINE_IS_SKELETON ) // looks like a mini GameBoy - 'Over 150 games' on box
+CONS( 200?, ragc153, 0, 0, bbl380, bbl380, bbl380_state, init_ragc153, "Orb", "Retro Arcade Game Controller 153-in-1", MACHINE_IS_SKELETON ) // looks like a Game & Watch
CONS( 200?, dphh8630, 0, 0, bbl380, bbl380, bbl380_state, init_ragc153, "PCP", "PCP 8630 - 230-in-1 - Digital Pocket Hand Held System", MACHINE_IS_SKELETON ) // PCP isn't mentioned on packaging
CONS( 200?, dgun2953, 0, 0, bbl380, bbl380, bbl380_state, init_ragc153, "dreamGEAR", "My Arcade Gamer Mini 160-in-1 (DGUN-2953)", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/y2.cpp b/src/mame/drivers/y2.cpp
index 2f36fa1227b..2cde3ca22bd 100644
--- a/src/mame/drivers/y2.cpp
+++ b/src/mame/drivers/y2.cpp
@@ -107,3 +107,7 @@ ROM_END
There is a PS2 version with the Unlimited Match title screen, but unless it's used for a different region the arcade doesn't show that title, only announces it. */
GAME( 2009, kof2002um, 0, system_board_y2, system_board_y2, system_board_y2_state, empty_init, ROT0, "SNK Playmore / New Channel", "The King of Fighters - Fuchou Zhi Lu/Road to Revenge / The King of Fighters 2002 Unlimited Match (China)", MACHINE_IS_SKELETON ) // also Export?
GAME( 2009, kof2002umj, kof2002um, system_board_y2, system_board_y2, system_board_y2_state, empty_init, ROT0, "SNK Playmore", "The King of Fighters 2002 Unlimited Match (Japan)", MACHINE_IS_SKELETON )
+
+//ひぐらしの哭く頃に 雀/Higurashi no naku koro ni Jan
+//エヌアイン完全世界/En-Eins Perfektewelt
+//上海 臥龍天昇/Shanghai Ga ryū tenshō
diff --git a/src/mame/includes/generalplus_gpl16250_romram.h b/src/mame/includes/generalplus_gpl16250_romram.h
index e89e006b61b..c1b6fd7f972 100644
--- a/src/mame/includes/generalplus_gpl16250_romram.h
+++ b/src/mame/includes/generalplus_gpl16250_romram.h
@@ -23,8 +23,7 @@ public:
{
}
- void wrlshunt(machine_config &config);
- void paccon(machine_config &config);
+ void gpl16250_romram(machine_config &config);
void init_wrlshunt();
void init_ths();
diff --git a/src/mame/layout/dct11em.lay b/src/mame/layout/dct11em.lay
index b00982d72da..dc2dd3d67c3 100644
--- a/src/mame/layout/dct11em.lay
+++ b/src/mame/layout/dct11em.lay
@@ -19,10 +19,10 @@ license:CC0
</element>
<view name="Default Layout">
- <bounds left="0" top="0" right="274" bottom="350" />
+ <bounds left="0" top="0" right="320" bottom="328" />
<screen index="0">
- <bounds x="0" y="0" width="362" height="262" />
+ <bounds x="0" y="0" width="320" height="240" />
</screen>
<element name="led0" ref="a_led">
@@ -31,10 +31,10 @@ license:CC0
<repeat count="2">
<param name="s" start="11" increment="-6" />
- <param name="y" start="267" increment="40" />
+ <param name="y" start="245" increment="40" />
<repeat count="6">
<param name="n" start="~s~" increment="-1" />
- <param name="x" start="10" increment="44" />
+ <param name="x" start="33" increment="44" />
<element name="digit~n~" ref="digit">
<bounds x="~x~" y="~y~" width="34" height="38" />
</element>
diff --git a/src/mame/layout/de2.lay b/src/mame/layout/de2.lay
index c8b20749332..a4162aa9005 100644
--- a/src/mame/layout/de2.lay
+++ b/src/mame/layout/de2.lay
@@ -16,115 +16,53 @@ copyright-holders:Barry Rodewald
<color red="1.0" green="0.0" blue="0.0" />
</led7seg>
</element>
- <element name="diagled" defstate="0">
- <disk>
- <color red="1.0" green="0.0" blue="0.0" />
- </disk>
- </element>
<element name="P3"><text string="Player 1"><color red="1.0" green="1.0" blue="1.0" /></text></element>
<element name="P4"><text string="Player 2"><color red="1.0" green="1.0" blue="1.0" /></text></element>
<element name="P5"><text string="Player 3"><color red="1.0" green="1.0" blue="1.0" /></text></element>
<element name="P6"><text string="Player 4"><color red="1.0" green="1.0" blue="1.0" /></text></element>
- <view name="Default Layout">
+ <group name="score">
+ <repeat count="7">
+ <param name="n" start="~s~" increment="1" />
+ <param name="x" start="0" increment="24" />
+ <element name="digit~n~" ref="~e~">
+ <bounds x="~x~" y="0" width="24" height="39" />
+ </element>
+ </repeat>
+ </group>
- <!-- Background -->
- <bounds left="0" top="20" right="318" bottom="394" />
+ <view name="Default Layout">
+ <bounds left="0" top="20" right="364" bottom="149" />
<!-- LEDs -->
<!-- Player 1 Score -->
-
- <element name="digit1" ref="digit">
- <bounds left="10" top="45" right="30" bottom="84" />
- </element>
- <element name="digit2" ref="digit">
- <bounds left="34" top="45" right="54" bottom="84" />
- </element>
- <element name="digit3" ref="digit">
- <bounds left="58" top="45" right="78" bottom="84" />
- </element>
- <element name="digit4" ref="digit">
- <bounds left="82" top="45" right="102" bottom="84" />
- </element>
- <element name="digit5" ref="digit">
- <bounds left="106" top="45" right="126" bottom="84" />
- </element>
- <element name="digit6" ref="digit">
- <bounds left="130" top="45" right="150" bottom="84" />
- </element>
- <element name="digit7" ref="digit">
- <bounds left="154" top="45" right="174" bottom="84" />
- </element>
+ <param name="e" value="digit" />
+ <param name="s" value="1" />
+ <group ref="score">
+ <bounds left="10" top="45" right="174" bottom="84" />
+ </group>
<!-- Player 2 Score -->
- <element name="digit9" ref="digit">
- <bounds left="190" top="45" right="210" bottom="84" />
- </element>
- <element name="digit10" ref="digit">
- <bounds left="214" top="45" right="234" bottom="84" />
- </element>
- <element name="digit11" ref="digit">
- <bounds left="238" top="45" right="258" bottom="84" />
- </element>
- <element name="digit12" ref="digit">
- <bounds left="262" top="45" right="282" bottom="84" />
- </element>
- <element name="digit13" ref="digit">
- <bounds left="286" top="45" right="306" bottom="84" />
- </element>
- <element name="digit14" ref="digit">
- <bounds left="310" top="45" right="330" bottom="84" />
- </element>
- <element name="digit15" ref="digit">
- <bounds left="334" top="45" right="354" bottom="84" />
- </element>
+ <param name="e" value="digit" />
+ <param name="s" value="9" />
+ <group ref="score">
+ <bounds left="190" top="45" right="354" bottom="84" />
+ </group>
<!-- Player 3 Score -->
- <element name="digit17" ref="ldigit">
- <bounds left="10" top="100" right="30" bottom="139" />
- </element>
- <element name="digit18" ref="ldigit">
- <bounds left="34" top="100" right="54" bottom="139" />
- </element>
- <element name="digit19" ref="ldigit">
- <bounds left="58" top="100" right="78" bottom="139" />
- </element>
- <element name="digit20" ref="ldigit">
- <bounds left="82" top="100" right="102" bottom="139" />
- </element>
- <element name="digit21" ref="ldigit">
- <bounds left="106" top="100" right="126" bottom="139" />
- </element>
- <element name="digit22" ref="ldigit">
- <bounds left="130" top="100" right="150" bottom="139" />
- </element>
- <element name="digit23" ref="ldigit">
- <bounds left="154" top="100" right="174" bottom="139" />
- </element>
+ <param name="e" value="ldigit" />
+ <param name="s" value="17" />
+ <group ref="score">
+ <bounds left="10" top="100" right="174" bottom="139" />
+ </group>
<!-- Player 4 Score -->
- <element name="digit25" ref="ldigit">
- <bounds left="190" top="100" right="210" bottom="139" />
- </element>
- <element name="digit26" ref="ldigit">
- <bounds left="214" top="100" right="234" bottom="139" />
- </element>
- <element name="digit27" ref="ldigit">
- <bounds left="238" top="100" right="258" bottom="139" />
- </element>
- <element name="digit28" ref="ldigit">
- <bounds left="262" top="100" right="282" bottom="139" />
- </element>
- <element name="digit29" ref="ldigit">
- <bounds left="286" top="100" right="306" bottom="139" />
- </element>
- <element name="digit30" ref="ldigit">
- <bounds left="310" top="100" right="330" bottom="139" />
- </element>
- <element name="digit31" ref="ldigit">
- <bounds left="334" top="100" right="354" bottom="139" />
- </element>
+ <param name="e" value="ldigit" />
+ <param name="s" value="25" />
+ <group ref="score">
+ <bounds left="190" top="100" right="354" bottom="139" />
+ </group>
<element ref="P3"><bounds left="10" right="174" top="30" bottom="42" /></element>
<element ref="P4"><bounds left="190" right="354" top="30" bottom="42" /></element>
diff --git a/src/mame/layout/de2a3.lay b/src/mame/layout/de2a3.lay
index f94ea1ef186..c220a85aa70 100644
--- a/src/mame/layout/de2a3.lay
+++ b/src/mame/layout/de2a3.lay
@@ -13,132 +13,49 @@ Data East Alphanumeric Display Type 3
<color red="1.0" green="0.0" blue="0.0" />
</led14segsc>
</element>
- <element name="ldigit" defstate="0">
- <led7seg>
- <color red="1.0" green="0.0" blue="0.0" />
- </led7seg>
- </element>
- <element name="diagled" defstate="0">
- <disk>
- <color red="1.0" green="0.0" blue="0.0" />
- </disk>
- </element>
<element name="P3"><text string="Player 1"><color red="1.0" green="1.0" blue="1.0" /></text></element>
<element name="P4"><text string="Player 2"><color red="1.0" green="1.0" blue="1.0" /></text></element>
<element name="P5"><text string="Player 3"><color red="1.0" green="1.0" blue="1.0" /></text></element>
<element name="P6"><text string="Player 4"><color red="1.0" green="1.0" blue="1.0" /></text></element>
- <view name="Default Layout">
+ <group name="score">
+ <repeat count="8">
+ <param name="n" start="~s~" increment="1" />
+ <param name="x" start="0" increment="24" />
+ <element name="digit~n~" ref="digit">
+ <bounds x="~x~" y="0" width="24" height="39" />
+ </element>
+ </repeat>
+ </group>
- <!-- Background -->
- <bounds left="0" top="20" right="318" bottom="394" />
+ <view name="Default Layout">
+ <bounds left="0" top="20" right="400" bottom="149" />
<!-- LEDs -->
<!-- Player 1 Score -->
-
- <element name="digit0" ref="digit">
- <bounds left="10" top="45" right="30" bottom="84" />
- </element>
- <element name="digit1" ref="digit">
- <bounds left="34" top="45" right="54" bottom="84" />
- </element>
- <element name="digit2" ref="digit">
- <bounds left="58" top="45" right="78" bottom="84" />
- </element>
- <element name="digit3" ref="digit">
- <bounds left="82" top="45" right="102" bottom="84" />
- </element>
- <element name="digit4" ref="digit">
- <bounds left="106" top="45" right="126" bottom="84" />
- </element>
- <element name="digit5" ref="digit">
- <bounds left="130" top="45" right="150" bottom="84" />
- </element>
- <element name="digit6" ref="digit">
- <bounds left="154" top="45" right="174" bottom="84" />
- </element>
- <element name="digit7" ref="digit">
- <bounds left="178" top="45" right="198" bottom="84" />
- </element>
+ <param name="s" value="0" />
+ <group ref="score">
+ <bounds left="10" top="45" right="198" bottom="84" />
+ </group>
<!-- Player 2 Score -->
- <element name="digit8" ref="digit">
- <bounds left="202" top="45" right="222" bottom="84" />
- </element>
- <element name="digit9" ref="digit">
- <bounds left="226" top="45" right="246" bottom="84" />
- </element>
- <element name="digit10" ref="digit">
- <bounds left="250" top="45" right="270" bottom="84" />
- </element>
- <element name="digit11" ref="digit">
- <bounds left="274" top="45" right="294" bottom="84" />
- </element>
- <element name="digit12" ref="digit">
- <bounds left="298" top="45" right="318" bottom="84" />
- </element>
- <element name="digit13" ref="digit">
- <bounds left="322" top="45" right="342" bottom="84" />
- </element>
- <element name="digit14" ref="digit">
- <bounds left="346" top="45" right="366" bottom="84" />
- </element>
- <element name="digit15" ref="digit">
- <bounds left="370" top="45" right="390" bottom="84" />
- </element>
+ <param name="s" value="8" />
+ <group ref="score">
+ <bounds left="202" top="45" right="390" bottom="84" />
+ </group>
<!-- Player 3 Score -->
- <element name="digit16" ref="digit">
- <bounds left="10" top="100" right="30" bottom="139" />
- </element>
- <element name="digit17" ref="digit">
- <bounds left="34" top="100" right="54" bottom="139" />
- </element>
- <element name="digit18" ref="digit">
- <bounds left="58" top="100" right="78" bottom="139" />
- </element>
- <element name="digit19" ref="digit">
- <bounds left="82" top="100" right="102" bottom="139" />
- </element>
- <element name="digit20" ref="digit">
- <bounds left="106" top="100" right="126" bottom="139" />
- </element>
- <element name="digit21" ref="digit">
- <bounds left="130" top="100" right="150" bottom="139" />
- </element>
- <element name="digit22" ref="digit">
- <bounds left="154" top="100" right="174" bottom="139" />
- </element>
- <element name="digit23" ref="digit">
- <bounds left="178" top="100" right="198" bottom="139" />
- </element>
+ <param name="s" value="16" />
+ <group ref="score">
+ <bounds left="10" top="100" right="198" bottom="139" />
+ </group>
<!-- Player 4 Score -->
- <element name="digit24" ref="digit">
- <bounds left="202" top="100" right="222" bottom="139" />
- </element>
- <element name="digit25" ref="digit">
- <bounds left="226" top="100" right="246" bottom="139" />
- </element>
- <element name="digit26" ref="digit">
- <bounds left="250" top="100" right="270" bottom="139" />
- </element>
- <element name="digit27" ref="digit">
- <bounds left="274" top="100" right="294" bottom="139" />
- </element>
- <element name="digit28" ref="digit">
- <bounds left="298" top="100" right="318" bottom="139" />
- </element>
- <element name="digit29" ref="digit">
- <bounds left="322" top="100" right="342" bottom="139" />
- </element>
- <element name="digit30" ref="digit">
- <bounds left="346" top="100" right="366" bottom="139" />
- </element>
- <element name="digit31" ref="digit">
- <bounds left="370" top="100" right="390" bottom="139" />
- </element>
+ <param name="s" value="24" />
+ <group ref="score">
+ <bounds left="202" top="100" right="390" bottom="139" />
+ </group>
<element ref="P3"><bounds left="10" right="174" top="30" bottom="42" /></element>
<element ref="P4"><bounds left="190" right="354" top="30" bottom="42" /></element>
diff --git a/src/mame/layout/gts80a_caveman.lay b/src/mame/layout/gts80a_caveman.lay
index d8180a76584..ea39780fc8f 100644
--- a/src/mame/layout/gts80a_caveman.lay
+++ b/src/mame/layout/gts80a_caveman.lay
@@ -26,9 +26,7 @@ copyright-holders:Robbbert
<element name="P5"><text string="Player 3"><color red="1.0" green="1.0" blue="1.0" /></text></element>
<element name="P6"><text string="Player 4"><color red="1.0" green="1.0" blue="1.0" /></text></element>
- <view name="Default Layout">
- <bounds left="0" top="20" right="318" bottom="394" />
-
+ <group name="backglass">
<!-- LEDs -->
<!-- Player 1 Score -->
@@ -143,9 +141,22 @@ copyright-holders:Robbbert
<element name="text2" ref="P4"><bounds left="100" right="180" top="90" bottom="102" /></element>
<element name="text1" ref="P5"><bounds left="100" right="180" top="150" bottom="162" /></element>
<element name="text0" ref="P6"><bounds left="100" right="180" top="210" bottom="222" /></element>
+ </group>
+
+ <view name="Backglass and Screen">
+ <bounds left="0" top="20" right="817" bottom="394" />
+
+ <group ref="backglass" />
<screen index="0">
- <bounds x="320" y="0" width="320" height="240" />
+ <bounds x="318" y="20" width="499" height="374" />
</screen>
</view>
+
+ <view name="Backglass Only">
+ <bounds left="0" top="20" right="318" bottom="394" />
+
+ <group ref="backglass" />
+ </view>
+
</mamelayout>
diff --git a/src/mame/layout/mchess.lay b/src/mame/layout/mchess.lay
index aac18738a07..67d63fcd660 100644
--- a/src/mame/layout/mchess.lay
+++ b/src/mame/layout/mchess.lay
@@ -59,37 +59,31 @@ license:CC0
<!-- groups -->
<group name="display">
- <collection name="Bezel">
- <element ref="cb_border"><bounds left="-3" right="83" top="-3" bottom="91.434" /></element>
- </collection>
-
+ <element ref="cb_border"><bounds left="-3" right="83" top="-3" bottom="91.434" /></element>
<screen index="0"><bounds left="0" right="80" top="0" bottom="88.434" /></screen>
-
- <collection name="Overlay">
- <element ref="cb_overlay" blend="multiply"><bounds left="0" right="80" top="0" bottom="88.434" /></element>
+ <element ref="cb_overlay" blend="multiply"><bounds left="0" right="80" top="0" bottom="88.434" /></element>
+ <element ref="blackb"><bounds left="79.9" right="80.1" top="-0.1" bottom="88.6" /></element>
+ <element ref="blackb"><bounds left="-0.1" right="80.1" top="88.1" bottom="88.534" /></element>
+ <element ref="blackb"><bounds x="-0.1" y="79.4" width="80.2" height="0.8" /></element>
+
+ <repeat count="4">
+ <param name="left" start="0" increment="20" />
+ <param name="right" start="10" increment="20" />
<repeat count="4">
- <param name="left" start="0" increment="20" />
- <param name="right" start="10" increment="20" />
- <repeat count="4">
- <param name="top" start="9.96" increment="19.92" />
- <param name="bottom" start="19.92" increment="19.92" />
- <element ref="cb_mask" blend="multiply"><bounds left="~left~" right="~right~" top="~top~" bottom="~bottom~" /></element>
- </repeat>
+ <param name="top" start="9.96" increment="19.92" />
+ <param name="bottom" start="19.92" increment="19.92" />
+ <element ref="cb_mask" blend="multiply"><bounds left="~left~" right="~right~" top="~top~" bottom="~bottom~" /></element>
</repeat>
+ </repeat>
+ <repeat count="4">
+ <param name="left" start="70" increment="-20" />
+ <param name="right" start="80" increment="-20" />
<repeat count="4">
- <param name="left" start="70" increment="-20" />
- <param name="right" start="80" increment="-20" />
- <repeat count="4">
- <param name="top" start="0" increment="19.92" />
- <param name="bottom" start="9.96" increment="19.92" />
- <element ref="cb_mask" blend="multiply"><bounds left="~left~" right="~right~" top="~top~" bottom="~bottom~" /></element>
- </repeat>
+ <param name="top" start="0" increment="19.92" />
+ <param name="bottom" start="9.96" increment="19.92" />
+ <element ref="cb_mask" blend="multiply"><bounds left="~left~" right="~right~" top="~top~" bottom="~bottom~" /></element>
</repeat>
-
- <element ref="blackb"><bounds left="79.9" right="80.1" top="-0.1" bottom="88.6" /></element>
- <element ref="blackb"><bounds left="-0.1" right="80.1" top="88.1" bottom="88.534" /></element>
- <element ref="blackb"><bounds x="-0.1" y="79.4" width="80.2" height="0.8" /></element>
- </collection>
+ </repeat>
</group>
<group name="buttons">
diff --git a/src/mame/layout/mephisto_academy.lay b/src/mame/layout/mephisto_academy.lay
index daa8c2cc991..ccc26cc986b 100644
--- a/src/mame/layout/mephisto_academy.lay
+++ b/src/mame/layout/mephisto_academy.lay
@@ -404,36 +404,9 @@ license:CC0
<group name="panel">
<bounds left="0" right="100" top="0" bottom="10" />
- <group ref="lcd"><bounds x="1" y="0" width="23.55" height="6.25" /></group>
-
- <element ref="ledo"><bounds x="31.1" y="0.1" width="1.3" height="1.3" /></element>
- <element ref="ledo"><bounds x="37.1" y="0.1" width="1.3" height="1.3" /></element>
- <element ref="ledo"><bounds x="43.1" y="0.1" width="1.3" height="1.3" /></element>
- <element ref="ledo"><bounds x="49.1" y="0.1" width="1.3" height="1.3" /></element>
- <element ref="ledo"><bounds x="55.1" y="0.1" width="1.3" height="1.3" /></element>
- <element ref="ledo"><bounds x="61.1" y="0.1" width="1.3" height="1.3" /></element>
- <element ref="ledo"><bounds x="69.1" y="0.1" width="1.3" height="1.3" /></element>
- <element ref="ledo"><bounds x="75.1" y="0.1" width="1.3" height="1.3" /></element>
-
- <element name="0.0" ref="ledr" blend="add"><bounds x="31.1" y="0.1" width="1.3" height="1.3" /></element>
- <element name="1.0" ref="ledr" blend="add"><bounds x="37.1" y="0.1" width="1.3" height="1.3" /></element>
- <element name="2.0" ref="ledr" blend="add"><bounds x="43.1" y="0.1" width="1.3" height="1.3" /></element>
- <element name="3.0" ref="ledr" blend="add"><bounds x="49.1" y="0.1" width="1.3" height="1.3" /></element>
- <element name="0.2" ref="ledr" blend="add"><bounds x="55.1" y="0.1" width="1.3" height="1.3" /></element>
- <element name="1.2" ref="ledr" blend="add"><bounds x="61.1" y="0.1" width="1.3" height="1.3" /></element>
- <element name="2.2" ref="ledr" blend="add"><bounds x="69.1" y="0.1" width="1.3" height="1.3" /></element>
- <element name="3.2" ref="ledr" blend="add"><bounds x="75.1" y="0.1" width="1.3" height="1.3" /></element>
-
- <element name="0.1" ref="ledg" blend="add"><bounds x="31.1" y="0.1" width="1.3" height="1.3" /></element>
- <element name="1.1" ref="ledg" blend="add"><bounds x="37.1" y="0.1" width="1.3" height="1.3" /></element>
- <element name="2.1" ref="ledg" blend="add"><bounds x="43.1" y="0.1" width="1.3" height="1.3" /></element>
- <element name="3.1" ref="ledg" blend="add"><bounds x="49.1" y="0.1" width="1.3" height="1.3" /></element>
- <element name="0.3" ref="ledg" blend="add"><bounds x="55.1" y="0.1" width="1.3" height="1.3" /></element>
- <element name="1.3" ref="ledg" blend="add"><bounds x="61.1" y="0.1" width="1.3" height="1.3" /></element>
- <element name="2.3" ref="ledg" blend="add"><bounds x="69.1" y="0.1" width="1.3" height="1.3" /></element>
- <element name="3.3" ref="ledg" blend="add"><bounds x="75.1" y="0.1" width="1.3" height="1.3" /></element>
<element ref="text_lcd"><bounds x="1" y="6.5" width="24" height="1.7" /></element>
+ <group ref="lcd"><bounds x="1" y="0" width="23.55" height="6.25" /></group>
<element ref="text_train"> <bounds x="29.25" y="2" width="5" height="1.5" /> </element>
<element ref="text_info"> <bounds x="35.25" y="2" width="5" height="1.5" /> </element>
@@ -462,6 +435,33 @@ license:CC0
<element ref="hlb" inputtag="KEY" inputmask="0x20"> <bounds x="61" y="3.75" width="1.5" height="2.5" /> </element>
<element ref="hlbr" inputtag="KEY" inputmask="0x40"> <bounds x="69" y="3.75" width="1.5" height="2.5" /> </element>
<element ref="hlbr" inputtag="KEY" inputmask="0x80"> <bounds x="75" y="3.75" width="1.5" height="2.5" /> </element>
+
+ <element ref="ledo"><bounds x="31.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element ref="ledo"><bounds x="37.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element ref="ledo"><bounds x="43.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element ref="ledo"><bounds x="49.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element ref="ledo"><bounds x="55.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element ref="ledo"><bounds x="61.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element ref="ledo"><bounds x="69.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element ref="ledo"><bounds x="75.1" y="0.1" width="1.3" height="1.3" /></element>
+
+ <element name="0.0" ref="ledr" blend="add"><bounds x="31.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element name="1.0" ref="ledr" blend="add"><bounds x="37.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element name="2.0" ref="ledr" blend="add"><bounds x="43.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element name="3.0" ref="ledr" blend="add"><bounds x="49.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element name="0.2" ref="ledr" blend="add"><bounds x="55.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element name="1.2" ref="ledr" blend="add"><bounds x="61.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element name="2.2" ref="ledr" blend="add"><bounds x="69.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element name="3.2" ref="ledr" blend="add"><bounds x="75.1" y="0.1" width="1.3" height="1.3" /></element>
+
+ <element name="0.1" ref="ledg" blend="add"><bounds x="31.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element name="1.1" ref="ledg" blend="add"><bounds x="37.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element name="2.1" ref="ledg" blend="add"><bounds x="43.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element name="3.1" ref="ledg" blend="add"><bounds x="49.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element name="0.3" ref="ledg" blend="add"><bounds x="55.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element name="1.3" ref="ledg" blend="add"><bounds x="61.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element name="2.3" ref="ledg" blend="add"><bounds x="69.1" y="0.1" width="1.3" height="1.3" /></element>
+ <element name="3.3" ref="ledg" blend="add"><bounds x="75.1" y="0.1" width="1.3" height="1.3" /></element>
</group>
@@ -469,10 +469,8 @@ license:CC0
<view name="Internal Layout">
<bounds left="0" right="100" top="0" bottom="98" />
- <element ref="background"><bounds x="13" y="0" width="87" height="98" /></element>
- <!-- LCD panel -->
- <group ref="panel"><bounds x="18" y="88" width="100" height="10" /></group>
+ <element ref="background"><bounds x="13" y="0" width="87" height="98" /></element>
<!-- chessboard coords -->
<element ref="white"><bounds x="16.5" y="2.5" width="81" height="81" /></element>
@@ -496,5 +494,9 @@ license:CC0
<group ref="sb_board"><bounds x="17" y="3" width="80" height="80" /></group>
<group ref="sb_ui"><bounds x="1.5" y="3" width="10" height="80" /></group>
+
+ <!-- LCD panel -->
+ <group ref="panel"><bounds x="18" y="88" width="100" height="10" /></group>
+
</view>
</mamelayout>
diff --git a/src/mame/layout/mephisto_alm16.lay b/src/mame/layout/mephisto_alm16.lay
index 7484a9eb13a..ec968e41698 100644
--- a/src/mame/layout/mephisto_alm16.lay
+++ b/src/mame/layout/mephisto_alm16.lay
@@ -292,15 +292,6 @@ license:CC0
<group name="sb_ui">
<bounds x="0" y="0" width="10" height="81" />
- <element ref="cwhite"><bounds x="1" y="48" width="8" height="4" /></element>
- <element name="piece_ui13" ref="piece"><bounds x="1" y="48" width="4" height="4" /></element>
- <element name="piece_ui14" ref="piece"><bounds x="5" y="48" width="4" height="4" /></element>
- <element ref="hlub" inputtag="board:board:SPAWN" inputmask="0x1000"><bounds x="1" y="48" width="4" height="4" /><color alpha="0.25" /></element>
- <element ref="hlub" inputtag="board:board:SPAWN" inputmask="0x2000"><bounds x="5" y="48" width="4" height="4" /><color alpha="0.25" /></element>
- <element ref="wmask1" inputtag="FAKE" inputmask="1" inputraw="1"><bounds x="1" y="48" width="4" height="4" /></element>
- <element ref="wmask1" inputtag="FAKE" inputmask="1" inputraw="1"><bounds x="5" y="48" width="4" height="4" /></element>
- <element ref="wmask2" blend="multiply"><bounds x="1" y="48" width="8" height="4" /></element>
-
<!-- can click here to change board type -->
<element ref="hlub" inputtag="FAKE" inputmask="0x01" inputraw="1"><bounds x="0" y="1.5" width="10" height="5" /></element>
@@ -352,6 +343,15 @@ license:CC0
<element ref="hlub" inputtag="board:board:SPAWN" inputmask="0x0400"><bounds x="5" y="39" width="4" height="4" /><color alpha="0.25" /></element>
<element ref="hlub" inputtag="board:board:SPAWN" inputmask="0x0800"><bounds x="5" y="43" width="4" height="4" /><color alpha="0.25" /></element>
+ <element ref="cwhite"><bounds x="1" y="48" width="8" height="4" /></element>
+ <element name="piece_ui13" ref="piece"><bounds x="1" y="48" width="4" height="4" /></element>
+ <element name="piece_ui14" ref="piece"><bounds x="5" y="48" width="4" height="4" /></element>
+ <element ref="hlub" inputtag="board:board:SPAWN" inputmask="0x1000"><bounds x="1" y="48" width="4" height="4" /><color alpha="0.25" /></element>
+ <element ref="hlub" inputtag="board:board:SPAWN" inputmask="0x2000"><bounds x="5" y="48" width="4" height="4" /><color alpha="0.25" /></element>
+ <element ref="wmask1" inputtag="FAKE" inputmask="1" inputraw="1"><bounds x="1" y="48" width="4" height="4" /></element>
+ <element ref="wmask1" inputtag="FAKE" inputmask="1" inputraw="1"><bounds x="5" y="48" width="4" height="4" /></element>
+ <element ref="wmask2" blend="multiply"><bounds x="1" y="48" width="8" height="4" /></element>
+
<!-- hand -->
<element ref="text_uih1"><bounds x="0" y="54" width="10" height="2" /></element>
<element ref="cblack"><bounds x="1" y="56.5" width="8" height="6" /></element>
@@ -457,18 +457,17 @@ license:CC0
<view name="Internal Layout">
<bounds left="0" right="102" top="-2" bottom="103" />
- <group ref="panel"><bounds x="47.5" y="91.8" width="24.5" height="6.5" /></group>
<element ref="cblack"><bounds x="13" y="-2" width="89" height="89" /></element>
<element ref="cwhite"><bounds x="17" y="2" width="81" height="81" /></element>
<element ref="text_lcd"><bounds x="47.5" y="89" width="24.5" height="2" /></element>
+ <group ref="panel"><bounds x="47.5" y="91.8" width="24.5" height="6.5" /></group>
<group ref="buttons"><bounds x="77.5" y="88.5" width="13" height="13" /></group>
<group ref="sb_board"><bounds x="17.5" y="2.5" width="80" height="80" /></group>
<group ref="sb_ui"><bounds x="1.5" y="2" width="10" height="81" /></group>
- <!-- chessboard coords -->
-
+ <!-- chessboard coords -->
<element ref="text_8"><bounds x="14.2" y="6.5" width="2" height="2" /></element>
<element ref="text_7"><bounds x="14.2" y="16.5" width="2" height="2" /></element>
<element ref="text_6"><bounds x="14.2" y="26.5" width="2" height="2" /></element>
diff --git a/src/mame/layout/mephisto_alm32.lay b/src/mame/layout/mephisto_alm32.lay
index 3f6faed7a5f..6fecadda389 100644
--- a/src/mame/layout/mephisto_alm32.lay
+++ b/src/mame/layout/mephisto_alm32.lay
@@ -292,15 +292,6 @@ license:CC0
<group name="sb_ui">
<bounds x="0" y="0" width="10" height="81" />
- <element ref="cwhite"><bounds x="1" y="48" width="8" height="4" /></element>
- <element name="piece_ui13" ref="piece"><bounds x="1" y="48" width="4" height="4" /></element>
- <element name="piece_ui14" ref="piece"><bounds x="5" y="48" width="4" height="4" /></element>
- <element ref="hlub" inputtag="board:board:SPAWN" inputmask="0x1000"><bounds x="1" y="48" width="4" height="4" /><color alpha="0.25" /></element>
- <element ref="hlub" inputtag="board:board:SPAWN" inputmask="0x2000"><bounds x="5" y="48" width="4" height="4" /><color alpha="0.25" /></element>
- <element ref="wmask1" inputtag="FAKE" inputmask="1" inputraw="1"><bounds x="1" y="48" width="4" height="4" /></element>
- <element ref="wmask1" inputtag="FAKE" inputmask="1" inputraw="1"><bounds x="5" y="48" width="4" height="4" /></element>
- <element ref="wmask2" blend="multiply"><bounds x="1" y="48" width="8" height="4" /></element>
-
<!-- can click here to change board type -->
<element ref="hlub" inputtag="FAKE" inputmask="0x01" inputraw="1"><bounds x="0" y="1.5" width="10" height="5" /></element>
@@ -361,6 +352,15 @@ license:CC0
<element ref="text_uih2"><bounds x="1.5" y="63.75" width="7" height="2" /></element>
<element ref="hlub" inputtag="board:board:UI" inputmask="0x08"><bounds x="1" y="63.5" width="8" height="2.5" /><color alpha="0.25" /></element>
+ <element ref="cwhite"><bounds x="1" y="48" width="8" height="4" /></element>
+ <element name="piece_ui13" ref="piece"><bounds x="1" y="48" width="4" height="4" /></element>
+ <element name="piece_ui14" ref="piece"><bounds x="5" y="48" width="4" height="4" /></element>
+ <element ref="hlub" inputtag="board:board:SPAWN" inputmask="0x1000"><bounds x="1" y="48" width="4" height="4" /><color alpha="0.25" /></element>
+ <element ref="hlub" inputtag="board:board:SPAWN" inputmask="0x2000"><bounds x="5" y="48" width="4" height="4" /><color alpha="0.25" /></element>
+ <element ref="wmask1" inputtag="FAKE" inputmask="1" inputraw="1"><bounds x="1" y="48" width="4" height="4" /></element>
+ <element ref="wmask1" inputtag="FAKE" inputmask="1" inputraw="1"><bounds x="5" y="48" width="4" height="4" /></element>
+ <element ref="wmask2" blend="multiply"><bounds x="1" y="48" width="8" height="4" /></element>
+
<!-- undo -->
<element ref="text_uiu1"><bounds x="0" y="68" width="10" height="2" /></element>
<element ref="cwhite"><bounds x="1" y="70.5" width="1.7" height="6" /></element>
@@ -457,18 +457,17 @@ license:CC0
<view name="Internal Layout">
<bounds left="0" right="102" top="-2" bottom="103" />
- <group ref="panel"><bounds x="47.5" y="91.8" width="24.5" height="6.5" /></group>
<element ref="cblack"><bounds x="13" y="-2" width="89" height="89" /></element>
<element ref="cwhite"><bounds x="17" y="2" width="81" height="81" /></element>
<element ref="text_lcd"><bounds x="47.5" y="89" width="24.5" height="2" /></element>
+ <group ref="panel"><bounds x="47.5" y="91.8" width="24.5" height="6.5" /></group>
<group ref="buttons"><bounds x="77.5" y="88.5" width="13" height="13" /></group>
<group ref="sb_board"><bounds x="17.5" y="2.5" width="80" height="80" /></group>
<group ref="sb_ui"><bounds x="1.5" y="2" width="10" height="81" /></group>
- <!-- chessboard coords -->
-
+ <!-- chessboard coords -->
<element ref="text_8"><bounds x="14.2" y="6.5" width="2" height="2" /></element>
<element ref="text_7"><bounds x="14.2" y="16.5" width="2" height="2" /></element>
<element ref="text_6"><bounds x="14.2" y="26.5" width="2" height="2" /></element>
diff --git a/src/mame/layout/mephisto_berlin.lay b/src/mame/layout/mephisto_berlin.lay
index 13fc8d8c276..6c869ed0ff3 100644
--- a/src/mame/layout/mephisto_berlin.lay
+++ b/src/mame/layout/mephisto_berlin.lay
@@ -392,10 +392,9 @@ license:CC0
<view name="Internal Layout">
<bounds left="2" right="129" top="0.5" bottom="89" />
- <group ref="panel1"><bounds x="103.5" y="56.9" width="23" height="6.1" /></group>
-
- <!-- chessboard coords -->
+ <element ref="cwhite"><bounds x="19.5" y="2.5" width="81" height="81" /></element>
+ <!-- chessboard coords -->
<element ref="text_8"><bounds x="15.7" y="7" width="2" height="2" /></element>
<element ref="text_7"><bounds x="15.7" y="17" width="2" height="2" /></element>
<element ref="text_6"><bounds x="15.7" y="27" width="2" height="2" /></element>
@@ -413,12 +412,12 @@ license:CC0
<element ref="text_g"><bounds x="84" y="85.5" width="2" height="2" /></element>
<element ref="text_h"><bounds x="94" y="85.5" width="2" height="2" /></element>
- <element ref="cwhite"><bounds x="19.5" y="2.5" width="81" height="81" /></element>
+ <group ref="sb_board"><bounds x="20" y="3" width="80" height="80" /></group>
+ <group ref="sb_ui"><bounds x="3.5" y="3" width="10" height="80" /></group>
- <!-- LCD panel -->
+ <!-- LCD panel -->
+ <group ref="panel1"><bounds x="103.5" y="56.9" width="23" height="6.1" /></group>
<group ref="panel2"><bounds x="103" y="72" width="24" height="13" /></group>
- <group ref="sb_board"><bounds x="20" y="3" width="80" height="80" /></group>
- <group ref="sb_ui"><bounds x="3.5" y="3" width="10" height="80" /></group>
</view>
</mamelayout>
diff --git a/src/mame/layout/mephisto_gen32.lay b/src/mame/layout/mephisto_gen32.lay
index 62b3a801700..59f748e9858 100644
--- a/src/mame/layout/mephisto_gen32.lay
+++ b/src/mame/layout/mephisto_gen32.lay
@@ -292,15 +292,6 @@ license:CC0
<group name="sb_ui">
<bounds x="0" y="0" width="10" height="81" />
- <element ref="cwhite"><bounds x="1" y="48" width="8" height="4" /></element>
- <element name="piece_ui13" ref="piece"><bounds x="1" y="48" width="4" height="4" /></element>
- <element name="piece_ui14" ref="piece"><bounds x="5" y="48" width="4" height="4" /></element>
- <element ref="hlub" inputtag="board:board:SPAWN" inputmask="0x1000"><bounds x="1" y="48" width="4" height="4" /><color alpha="0.25" /></element>
- <element ref="hlub" inputtag="board:board:SPAWN" inputmask="0x2000"><bounds x="5" y="48" width="4" height="4" /><color alpha="0.25" /></element>
- <element ref="wmask1" inputtag="FAKE" inputmask="1" inputraw="1"><bounds x="1" y="48" width="4" height="4" /></element>
- <element ref="wmask1" inputtag="FAKE" inputmask="1" inputraw="1"><bounds x="5" y="48" width="4" height="4" /></element>
- <element ref="wmask2" blend="multiply"><bounds x="1" y="48" width="8" height="4" /></element>
-
<!-- can click here to change board type -->
<element ref="hlub" inputtag="FAKE" inputmask="0x01" inputraw="1"><bounds x="0" y="1.5" width="10" height="5" /></element>
@@ -352,6 +343,15 @@ license:CC0
<element ref="hlub" inputtag="board:board:SPAWN" inputmask="0x0400"><bounds x="5" y="39" width="4" height="4" /><color alpha="0.25" /></element>
<element ref="hlub" inputtag="board:board:SPAWN" inputmask="0x0800"><bounds x="5" y="43" width="4" height="4" /><color alpha="0.25" /></element>
+ <element ref="cwhite"><bounds x="1" y="48" width="8" height="4" /></element>
+ <element name="piece_ui13" ref="piece"><bounds x="1" y="48" width="4" height="4" /></element>
+ <element name="piece_ui14" ref="piece"><bounds x="5" y="48" width="4" height="4" /></element>
+ <element ref="hlub" inputtag="board:board:SPAWN" inputmask="0x1000"><bounds x="1" y="48" width="4" height="4" /><color alpha="0.25" /></element>
+ <element ref="hlub" inputtag="board:board:SPAWN" inputmask="0x2000"><bounds x="5" y="48" width="4" height="4" /><color alpha="0.25" /></element>
+ <element ref="wmask1" inputtag="FAKE" inputmask="1" inputraw="1"><bounds x="1" y="48" width="4" height="4" /></element>
+ <element ref="wmask1" inputtag="FAKE" inputmask="1" inputraw="1"><bounds x="5" y="48" width="4" height="4" /></element>
+ <element ref="wmask2" blend="multiply"><bounds x="1" y="48" width="8" height="4" /></element>
+
<!-- hand -->
<element ref="text_uih1"><bounds x="0" y="54" width="10" height="2" /></element>
<element ref="cblack"><bounds x="1" y="56.5" width="8" height="6" /></element>
@@ -457,18 +457,17 @@ license:CC0
<view name="Internal Layout">
<bounds left="0" right="102" top="-2" bottom="103" />
- <group ref="panel"><bounds x="47.5" y="91.8" width="24.5" height="6.5" /></group>
<element ref="cblack"><bounds x="13" y="-2" width="89" height="89" /></element>
<element ref="cwhite"><bounds x="17" y="2" width="81" height="81" /></element>
<element ref="text_lcd"><bounds x="47.5" y="89" width="24.5" height="2" /></element>
+ <group ref="panel"><bounds x="47.5" y="91.8" width="24.5" height="6.5" /></group>
<group ref="buttons"><bounds x="77.5" y="88.5" width="13" height="13" /></group>
<group ref="sb_board"><bounds x="17.5" y="2.5" width="80" height="80" /></group>
<group ref="sb_ui"><bounds x="1.5" y="2" width="10" height="81" /></group>
- <!-- chessboard coords -->
-
+ <!-- chessboard coords -->
<element ref="text_8"><bounds x="14.2" y="6.5" width="2" height="2" /></element>
<element ref="text_7"><bounds x="14.2" y="16.5" width="2" height="2" /></element>
<element ref="text_6"><bounds x="14.2" y="26.5" width="2" height="2" /></element>
diff --git a/src/mame/layout/mephisto_milano.lay b/src/mame/layout/mephisto_milano.lay
index a19a538e3da..ef62ac65966 100644
--- a/src/mame/layout/mephisto_milano.lay
+++ b/src/mame/layout/mephisto_milano.lay
@@ -408,10 +408,9 @@ license:CC0
<view name="Internal Layout">
<bounds left="1" right="129" top="0.5" bottom="90" />
- <group ref="panel1"><bounds x="103.5" y="56.9" width="23" height="6.1" /></group>
-
- <!-- chessboard coords -->
+ <element ref="cwhite"><bounds x="19.5" y="2.5" width="81" height="81" /></element>
+ <!-- chessboard coords -->
<element ref="text_8"><bounds x="14.2" y="7" width="2" height="2" /></element>
<element ref="text_7"><bounds x="14.2" y="17" width="2" height="2" /></element>
<element ref="text_6"><bounds x="14.2" y="27" width="2" height="2" /></element>
@@ -430,9 +429,7 @@ license:CC0
<element ref="text_g"><bounds x="84" y="86.5" width="2" height="2" /></element>
<element ref="text_h"><bounds x="94" y="86.5" width="2" height="2" /></element>
- <element ref="cwhite"><bounds x="19.5" y="2.5" width="81" height="81" /></element>
-
- <!-- chessboard leds -->
+ <!-- chessboard leds -->
<element name="led0" ref="ledr"><bounds x="24" y="85" width="2" height="1" /></element>
<element name="led1" ref="ledr"><bounds x="34" y="85" width="2" height="1" /></element>
<element name="led2" ref="ledr"><bounds x="44" y="85" width="2" height="1" /></element>
@@ -450,10 +447,12 @@ license:CC0
<element name="led14" ref="ledr"><bounds x="16.5" y="17.5" width="2" height="1" /></element>
<element name="led15" ref="ledr"><bounds x="16.5" y="7.5" width="2" height="1" /></element>
- <!-- LCD panel -->
- <group ref="panel2"><bounds x="103" y="69" width="24" height="17" /></group>
-
<group ref="sb_board"><bounds x="20" y="3" width="80" height="80" /></group>
<group ref="sb_ui"><bounds x="2.5" y="3" width="10" height="80" /></group>
+
+ <!-- LCD panel -->
+ <group ref="panel1"><bounds x="103.5" y="56.9" width="23" height="6.1" /></group>
+ <group ref="panel2"><bounds x="103" y="69" width="24" height="17" /></group>
+
</view>
</mamelayout>
diff --git a/src/mame/layout/mephisto_modular_tm.lay b/src/mame/layout/mephisto_modular_tm.lay
index 83a08a0f749..53f2b236ad6 100644
--- a/src/mame/layout/mephisto_modular_tm.lay
+++ b/src/mame/layout/mephisto_modular_tm.lay
@@ -408,20 +408,17 @@ license:CC0
<view name="Internal Layout">
<bounds left="0" right="102" top="-2" bottom="103" />
-
- <group ref="panel"><bounds x="47.5" y="91.8" width="24.5" height="6.5" /></group>
-
<element ref="cblack"><bounds x="13" y="-2" width="89" height="89" /></element>
<element ref="cwhite"><bounds x="17" y="2" width="81" height="81" /></element>
<element ref="text_lcd"><bounds x="47.5" y="89" width="24.5" height="2" /></element>
+ <group ref="panel"><bounds x="47.5" y="91.8" width="24.5" height="6.5" /></group>
<group ref="buttons"><bounds x="77.5" y="88.5" width="13" height="13" /></group>
<group ref="sb_board"><bounds x="17.5" y="2.5" width="80" height="80" /></group>
<group ref="sb_ui"><bounds x="1.5" y="3" width="10" height="80" /></group>
- <!-- chessboard coords -->
-
+ <!-- chessboard coords -->
<element ref="text_8"><bounds x="14.2" y="6.5" width="2" height="2" /></element>
<element ref="text_7"><bounds x="14.2" y="16.5" width="2" height="2" /></element>
<element ref="text_6"><bounds x="14.2" y="26.5" width="2" height="2" /></element>
diff --git a/src/mame/layout/novag_cexpert.lay b/src/mame/layout/novag_cexpert.lay
new file mode 100644
index 00000000000..8c9f84755e3
--- /dev/null
+++ b/src/mame/layout/novag_cexpert.lay
@@ -0,0 +1,513 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+-->
+<mamelayout version="2">
+
+<!-- define elements -->
+
+ <element name="gray"><rect><color red="0.51" green="0.5" blue="0.49" /></rect></element>
+
+ <element name="led" defstate="0">
+ <disk state="1"><color red="1.0" green="0.1" blue="0.15" /></disk>
+ <disk state="0"><color red="0.1" green="0.01" blue="0.015" /></disk>
+ </element>
+ <element name="led2" defstate="0">
+ <disk state="1"><color red="1.0" green="0.1" blue="0.15" /></disk>
+ <disk state="0"><color red="0.14" green="0.014" blue="0.02" /></disk>
+ </element>
+
+ <element name="but" defstate="0">
+ <disk state="0"><color red="0.17" green="0.15" blue="0.15" /></disk>
+ <disk state="1"><color red="0.34" green="0.3" blue="0.3" /></disk>
+ </element>
+
+ <element name="text_1"><text string="1"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+ <element name="text_2"><text string="2"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+ <element name="text_3"><text string="3"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+ <element name="text_4"><text string="4"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+ <element name="text_5"><text string="5"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+ <element name="text_6"><text string="6"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+ <element name="text_7"><text string="7"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+ <element name="text_8"><text string="8"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+
+ <element name="text_a"><text string="A"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+ <element name="text_b"><text string="B"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+ <element name="text_c"><text string="C"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+ <element name="text_d"><text string="D"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+ <element name="text_e"><text string="E"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+ <element name="text_f"><text string="F"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+ <element name="text_g"><text string="G"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+ <element name="text_h"><text string="H"><color red="0.9" green="0.9" blue="0.9" /></text></element>
+
+ <element name="text_l1ax"><text string="Player/"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_l1a"><text string="Player"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_l1b"><text string="Gambit Book"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_l2ax"><text string="Best Move/"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_l2a"><text string="Random"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_l2b"><text string="Training Level"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_l3a"><text string="Sound"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_l3b"><text string="Depth Search"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_l4a"><text string="Solve Mate"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_l4b"><text string="Infinite"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_l5a"><text string="Print Board"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_l5b"><text string="Interface"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_l6a"><text string="Print List"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_l6b"><text string="Acc. Time"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_l7a"><text string="Set Level"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_l7b"><text string=" "><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_l8a"><text string="Take Back"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_l8b"><text string="Restore"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+
+ <element name="text_m1a"><text string="New Game"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_m1b"><text string=" "><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_m2a"><text string="Verify"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_m2b"><text string="Set Up"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_m3a"><text string="Change Color"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_m3b"><text string=" "><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_m4a"><text string="Clear Board"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_m4b"><text string="Tournament"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_m4bx"><text string="Book"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_m5a"><text string="Print Moves"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_m5b"><text string="Print"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_m5bx"><text string="Evaluations"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_m6a"><text string="Trace Forward"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_m6b"><text string="AutoPlay"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_m7a"><text string="Hint"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_m7b"><text string="Next Best"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_m8a"><text string="Go"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_m8b"><text string=" "><color red="0.51" green="0.5" blue="0.49" /></text></element>
+
+ <element name="text_rx"><text string="C o m p u t i n g"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_r1"><text string="Error"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_r2"><text string="Verify"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_r3"><text string="Set Up"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_r4"><text string="Check"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_r5"><text string="Mate"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_r6"><text string="Draw"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_r7"><text string="Black"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+ <element name="text_r8"><text string="White"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+
+ <element name="text_p1"><image file="chess/wk.png"></image></element>
+ <element name="text_p2"><image file="chess/wq.png"></image></element>
+ <element name="text_p3"><image file="chess/wr.png"></image></element>
+ <element name="text_p4"><image file="chess/wb.png"></image></element>
+ <element name="text_p5"><image file="chess/wn.png"></image></element>
+ <element name="text_p6"><image file="chess/wp.png"></image></element>
+
+
+<!-- sb board -->
+
+ <element name="cblack"><rect><color red="0.56" green="0.33" blue="0.12" /></rect></element>
+ <element name="cwhite"><rect><color red="0.84" green="0.75" blue="0.50" /></rect></element>
+
+ <element name="hlbb" defstate="0">
+ <text string=" "><bounds x="0" y="0" width="1" height="1" /></text>
+ <disk state="1">
+ <bounds x="0.12" y="0.12" width="0.76" height="0.76" />
+ <color red="0" green="0" blue="0" />
+ </disk>
+ </element>
+
+ <element name="piece" defstate="0">
+ <image file="chess/wp.png" state="1"/>
+ <image file="chess/wn.png" state="2"/>
+ <image file="chess/wb.png" state="3"/>
+ <image file="chess/wr.png" state="4"/>
+ <image file="chess/wq.png" state="5"/>
+ <image file="chess/wk.png" state="6"/>
+
+ <image file="chess/bp.png" state="7"/>
+ <image file="chess/bn.png" state="8"/>
+ <image file="chess/bb.png" state="9"/>
+ <image file="chess/br.png" state="10"/>
+ <image file="chess/bq.png" state="11"/>
+ <image file="chess/bk.png" state="12"/>
+
+ <!-- selected pieces -->
+ <image file="chess/wp.png" state="13"><color alpha="0.5" /></image>
+ <image file="chess/wn.png" state="14"><color alpha="0.5" /></image>
+ <image file="chess/wb.png" state="15"><color alpha="0.5" /></image>
+ <image file="chess/wr.png" state="16"><color alpha="0.5" /></image>
+ <image file="chess/wq.png" state="17"><color alpha="0.5" /></image>
+ <image file="chess/wk.png" state="18"><color alpha="0.5" /></image>
+
+ <image file="chess/bp.png" state="19"><color alpha="0.5" /></image>
+ <image file="chess/bn.png" state="20"><color alpha="0.5" /></image>
+ <image file="chess/bb.png" state="21"><color alpha="0.5" /></image>
+ <image file="chess/br.png" state="22"><color alpha="0.5" /></image>
+ <image file="chess/bq.png" state="23"><color alpha="0.5" /></image>
+ <image file="chess/bk.png" state="24"><color alpha="0.5" /></image>
+ </element>
+
+ <group name="sb_board">
+ <bounds x="0" y="0" width="80" height="80" />
+
+ <!-- squares (avoid seams) -->
+ <element ref="cwhite"><bounds x="0" y="0" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="10" y="0" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="20" y="0" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="30" y="0" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="40" y="0" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="50" y="0" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="60" y="0" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="70" y="0" width="10" height="11" /></element>
+
+ <element ref="cblack"><bounds x="0" y="10" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="10" y="10" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="20" y="10" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="30" y="10" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="40" y="10" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="50" y="10" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="60" y="10" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="70" y="10" width="10" height="11" /></element>
+
+ <element ref="cwhite"><bounds x="0" y="20" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="10" y="20" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="20" y="20" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="30" y="20" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="40" y="20" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="50" y="20" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="60" y="20" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="70" y="20" width="10" height="11" /></element>
+
+ <element ref="cblack"><bounds x="0" y="30" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="10" y="30" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="20" y="30" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="30" y="30" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="40" y="30" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="50" y="30" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="60" y="30" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="70" y="30" width="10" height="11" /></element>
+
+ <element ref="cwhite"><bounds x="0" y="40" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="10" y="40" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="20" y="40" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="30" y="40" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="40" y="40" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="50" y="40" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="60" y="40" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="70" y="40" width="10" height="11" /></element>
+
+ <element ref="cblack"><bounds x="0" y="50" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="10" y="50" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="20" y="50" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="30" y="50" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="40" y="50" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="50" y="50" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="60" y="50" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="70" y="50" width="10" height="11" /></element>
+
+ <element ref="cwhite"><bounds x="0" y="60" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="10" y="60" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="20" y="60" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="30" y="60" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="40" y="60" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="50" y="60" width="11" height="11" /></element>
+ <element ref="cwhite"><bounds x="60" y="60" width="11" height="11" /></element>
+ <element ref="cblack"><bounds x="70" y="60" width="10" height="11" /></element>
+
+ <element ref="cblack"><bounds x="0" y="70" width="11" height="10" /></element>
+ <element ref="cwhite"><bounds x="10" y="70" width="11" height="10" /></element>
+ <element ref="cblack"><bounds x="20" y="70" width="11" height="10" /></element>
+ <element ref="cwhite"><bounds x="30" y="70" width="11" height="10" /></element>
+ <element ref="cblack"><bounds x="40" y="70" width="11" height="10" /></element>
+ <element ref="cwhite"><bounds x="50" y="70" width="11" height="10" /></element>
+ <element ref="cblack"><bounds x="60" y="70" width="11" height="10" /></element>
+ <element ref="cwhite"><bounds x="70" y="70" width="10" height="10" /></element>
+
+ <!-- leds -->
+ <repeat count="8">
+ <param name="y" start="8.3" increment="10" />
+ <param name="i1" start="0" increment="1" />
+
+ <repeat count="8">
+ <param name="x" start="0.2" increment="10" />
+ <param name="i2" start="0" increment="1" />
+ <element name="~i2~.~i1~" ref="led"><bounds x="~x~" y="~y~" width="1.5" height="1.5" /></element>
+ </repeat>
+ </repeat>
+
+ <!-- sensors, pieces -->
+ <repeat count="8">
+ <param name="y" start="0" increment="10" />
+ <param name="i" start="8" increment="-1" />
+
+ <element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x01"><bounds x="0" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
+ <element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x02"><bounds x="10" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
+ <element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x04"><bounds x="20" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
+ <element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x08"><bounds x="30" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
+ <element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x10"><bounds x="40" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
+ <element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x20"><bounds x="50" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
+ <element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x40"><bounds x="60" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
+ <element ref="hlbb" inputtag="board:RANK.~i~" inputmask="0x80"><bounds x="70" y="~y~" width="10" height="10" /><color alpha="0.04" /></element>
+
+ <element name="piece_a~i~" ref="piece"><bounds x="0" y="~y~" width="10" height="10" /></element>
+ <element name="piece_b~i~" ref="piece"><bounds x="10" y="~y~" width="10" height="10" /></element>
+ <element name="piece_c~i~" ref="piece"><bounds x="20" y="~y~" width="10" height="10" /></element>
+ <element name="piece_d~i~" ref="piece"><bounds x="30" y="~y~" width="10" height="10" /></element>
+ <element name="piece_e~i~" ref="piece"><bounds x="40" y="~y~" width="10" height="10" /></element>
+ <element name="piece_f~i~" ref="piece"><bounds x="50" y="~y~" width="10" height="10" /></element>
+ <element name="piece_g~i~" ref="piece"><bounds x="60" y="~y~" width="10" height="10" /></element>
+ <element name="piece_h~i~" ref="piece"><bounds x="70" y="~y~" width="10" height="10" /></element>
+ </repeat>
+ </group>
+
+
+<!-- sb ui -->
+
+ <element name="hlub" defstate="0">
+ <rect state="1"><color red="0" green="0" blue="0" /></rect>
+ </element>
+
+ <element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+ <element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+ <element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+ <element name="text_uib2">
+ <rect><color red="0.84" green="0.75" blue="0.50" /></rect>
+ <text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
+ </element>
+ <element name="text_uib3">
+ <rect><color red="0.84" green="0.75" blue="0.50" /></rect>
+ <text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
+ </element>
+ <element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+ <element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+ <element name="text_uih2">
+ <rect><color red="0.84" green="0.75" blue="0.50" /></rect>
+ <text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
+ </element>
+ <element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+ <element name="text_uiu2a">
+ <rect><color red="0.84" green="0.75" blue="0.50" /></rect>
+ <text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
+ </element>
+ <element name="text_uiu2b">
+ <rect><color red="0.84" green="0.75" blue="0.50" /></rect>
+ <text string=" &lt; "><color red="0.01" green="0.01" blue="0.01" /></text>
+ </element>
+ <element name="text_uiu2c">
+ <rect><color red="0.84" green="0.75" blue="0.50" /></rect>
+ <text string=" &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
+ </element>
+ <element name="text_uiu2d">
+ <rect><color red="0.84" green="0.75" blue="0.50" /></rect>
+ <text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
+ </element>
+ <element name="text_uiu3a" defstate="0">
+ <simplecounter maxstate="999" digits="1" align="2">
+ <color red="0.81" green="0.8" blue="0.79" />
+ </simplecounter>
+ </element>
+ <element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+ <element name="text_uiu3c" defstate="0">
+ <simplecounter maxstate="999" digits="1" align="1">
+ <color red="0.81" green="0.8" blue="0.79" />
+ </simplecounter>
+ </element>
+
+ <group name="sb_ui">
+ <bounds x="0" y="0" width="10" height="80" />
+ <element ref="cblack"><bounds x="0" y="0" width="10" height="1" /></element>
+ <element ref="cblack"><bounds x="0" y="7" width="10" height="1" /></element>
+ <element ref="cblack"><bounds x="0" y="79" width="10" height="1" /></element>
+ <element ref="text_uit1"><bounds x="0" y="2" width="10" height="2" /></element>
+ <element ref="text_uit2"><bounds x="0" y="4" width="10" height="2" /></element>
+
+ <!-- board -->
+ <element ref="text_uib1"><bounds x="0" y="9" width="10" height="2" /></element>
+ <element ref="cwhite"><bounds x="1" y="11.5" width="8" height="2.5" /></element>
+ <element ref="cwhite"><bounds x="1" y="15" width="8" height="2.5" /></element>
+
+ <element ref="text_uib2"><bounds x="1.5" y="11.75" width="7" height="2" /></element>
+ <element ref="text_uib3"><bounds x="1.5" y="15.25" width="7" height="2" /></element>
+
+ <element ref="hlub" inputtag="board:UI" inputmask="0x200"><bounds x="1" y="11.5" width="8" height="2.5" /><color alpha="0.25" /></element>
+ <element ref="hlub" inputtag="board:UI" inputmask="0x100"><bounds x="1" y="15" width="8" height="2.5" /><color alpha="0.25" /></element>
+
+ <!-- spawn -->
+ <element ref="text_uis1"><bounds x="0" y="20.5" width="10" height="2" /></element>
+ <element ref="cwhite"><bounds x="1" y="23" width="8" height="12" /></element>
+ <element ref="cwhite"><bounds x="1" y="36" width="8" height="12" /></element>
+
+ <element name="piece_ui1" ref="piece"><bounds x="1" y="23" width="4" height="4" /></element>
+ <element name="piece_ui2" ref="piece"><bounds x="1" y="27" width="4" height="4" /></element>
+ <element name="piece_ui3" ref="piece"><bounds x="1" y="31" width="4" height="4" /></element>
+ <element name="piece_ui4" ref="piece"><bounds x="5" y="23" width="4" height="4" /></element>
+ <element name="piece_ui5" ref="piece"><bounds x="5" y="27" width="4" height="4" /></element>
+ <element name="piece_ui6" ref="piece"><bounds x="5" y="31" width="4" height="4" /></element>
+ <element name="piece_ui7" ref="piece"><bounds x="1" y="36" width="4" height="4" /></element>
+ <element name="piece_ui8" ref="piece"><bounds x="1" y="40" width="4" height="4" /></element>
+ <element name="piece_ui9" ref="piece"><bounds x="1" y="44" width="4" height="4" /></element>
+ <element name="piece_ui10" ref="piece"><bounds x="5" y="36" width="4" height="4" /></element>
+ <element name="piece_ui11" ref="piece"><bounds x="5" y="40" width="4" height="4" /></element>
+ <element name="piece_ui12" ref="piece"><bounds x="5" y="44" width="4" height="4" /></element>
+
+ <element ref="hlub" inputtag="board:SPAWN" inputmask="0x0001"><bounds x="1" y="23" width="4" height="4" /><color alpha="0.25" /></element>
+ <element ref="hlub" inputtag="board:SPAWN" inputmask="0x0002"><bounds x="1" y="27" width="4" height="4" /><color alpha="0.25" /></element>
+ <element ref="hlub" inputtag="board:SPAWN" inputmask="0x0004"><bounds x="1" y="31" width="4" height="4" /><color alpha="0.25" /></element>
+ <element ref="hlub" inputtag="board:SPAWN" inputmask="0x0008"><bounds x="5" y="23" width="4" height="4" /><color alpha="0.25" /></element>
+ <element ref="hlub" inputtag="board:SPAWN" inputmask="0x0010"><bounds x="5" y="27" width="4" height="4" /><color alpha="0.25" /></element>
+ <element ref="hlub" inputtag="board:SPAWN" inputmask="0x0020"><bounds x="5" y="31" width="4" height="4" /><color alpha="0.25" /></element>
+ <element ref="hlub" inputtag="board:SPAWN" inputmask="0x0040"><bounds x="1" y="36" width="4" height="4" /><color alpha="0.25" /></element>
+ <element ref="hlub" inputtag="board:SPAWN" inputmask="0x0080"><bounds x="1" y="40" width="4" height="4" /><color alpha="0.25" /></element>
+ <element ref="hlub" inputtag="board:SPAWN" inputmask="0x0100"><bounds x="1" y="44" width="4" height="4" /><color alpha="0.25" /></element>
+ <element ref="hlub" inputtag="board:SPAWN" inputmask="0x0200"><bounds x="5" y="36" width="4" height="4" /><color alpha="0.25" /></element>
+ <element ref="hlub" inputtag="board:SPAWN" inputmask="0x0400"><bounds x="5" y="40" width="4" height="4" /><color alpha="0.25" /></element>
+ <element ref="hlub" inputtag="board:SPAWN" inputmask="0x0800"><bounds x="5" y="44" width="4" height="4" /><color alpha="0.25" /></element>
+
+ <!-- hand -->
+ <element ref="text_uih1"><bounds x="0" y="51" width="10" height="2" /></element>
+ <element ref="cblack"><bounds x="1" y="53.5" width="8" height="6" /></element>
+ <element name="piece_ui0" ref="piece"><bounds x="2" y="53.5" width="6" height="6" /></element>
+
+ <element ref="cwhite"><bounds x="1" y="60.5" width="8" height="2.5" /></element>
+ <element ref="text_uih2"><bounds x="1.5" y="60.75" width="7" height="2" /></element>
+ <element ref="hlub" inputtag="board:UI" inputmask="0x08"><bounds x="1" y="60.5" width="8" height="2.5" /><color alpha="0.25" /></element>
+
+ <!-- undo -->
+ <element ref="text_uiu1"><bounds x="0" y="66" width="10" height="2" /></element>
+ <element ref="cwhite"><bounds x="1" y="68.5" width="1.7" height="6" /></element>
+ <element ref="cwhite"><bounds x="3.1" y="68.5" width="1.7" height="6" /></element>
+ <element ref="cwhite"><bounds x="5.2" y="68.5" width="1.7" height="6" /></element>
+ <element ref="cwhite"><bounds x="7.3" y="68.5" width="1.7" height="6" /></element>
+ <element ref="text_uiu2a"><bounds x="1" y="69.5" width="1.7" height="4" /></element>
+ <element ref="text_uiu2b"><bounds x="3.1" y="69.5" width="1.7" height="4" /></element>
+ <element ref="text_uiu2c"><bounds x="5.2" y="69.5" width="1.7" height="4" /></element>
+ <element ref="text_uiu2d"><bounds x="7.3" y="69.5" width="1.7" height="4" /></element>
+
+ <element ref="hlub" inputtag="board:UI" inputmask="0x10"><bounds x="1" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></element>
+ <element ref="hlub" inputtag="board:UI" inputmask="0x20"><bounds x="3.1" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></element>
+ <element ref="hlub" inputtag="board:UI" inputmask="0x40"><bounds x="5.2" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></element>
+ <element ref="hlub" inputtag="board:UI" inputmask="0x80"><bounds x="7.3" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></element>
+
+ <element name="count_ui0" ref="text_uiu3a"><bounds x="0" y="75" width="4" height="2" /></element>
+ <element name="count_ui1" ref="text_uiu3c"><bounds x="6" y="75" width="4" height="2" /></element>
+ <element ref="text_uiu3b"><bounds x="4" y="75" width="2" height="2" /></element>
+ </group>
+
+
+<!-- build screen -->
+
+ <view name="Internal Layout">
+ <bounds left="-2.5" right="119" top="-1" bottom="88" />
+
+ <group ref="sb_board"><bounds x="13" y="3" width="80" height="80" /></group>
+ <group ref="sb_ui"><bounds x="-1" y="3" width="10" height="80" /></group>
+
+ <!-- chessboard coords -->
+
+ <element ref="text_8"><bounds x="10.2" y="7" width="2" height="2" /></element>
+ <element ref="text_7"><bounds x="10.2" y="17" width="2" height="2" /></element>
+ <element ref="text_6"><bounds x="10.2" y="27" width="2" height="2" /></element>
+ <element ref="text_5"><bounds x="10.2" y="37" width="2" height="2" /></element>
+ <element ref="text_4"><bounds x="10.2" y="47" width="2" height="2" /></element>
+ <element ref="text_3"><bounds x="10.2" y="57" width="2" height="2" /></element>
+ <element ref="text_2"><bounds x="10.2" y="67" width="2" height="2" /></element>
+ <element ref="text_1"><bounds x="10.2" y="77" width="2" height="2" /></element>
+
+ <element ref="text_a"><bounds x="17" y="84" width="2" height="2" /></element>
+ <element ref="text_b"><bounds x="27" y="84" width="2" height="2" /></element>
+ <element ref="text_c"><bounds x="37" y="84" width="2" height="2" /></element>
+ <element ref="text_d"><bounds x="47" y="84" width="2" height="2" /></element>
+ <element ref="text_e"><bounds x="57" y="84" width="2" height="2" /></element>
+ <element ref="text_f"><bounds x="67" y="84" width="2" height="2" /></element>
+ <element ref="text_g"><bounds x="77" y="84" width="2" height="2" /></element>
+ <element ref="text_h"><bounds x="87" y="84" width="2" height="2" /></element>
+
+ <!-- right side buttons -->
+
+ <element ref="text_p1"><bounds x="94.6" y="24.10" width="2.2" height="2.2" /></element>
+ <element ref="text_p2"><bounds x="94.6" y="31.81" width="2.2" height="2.2" /></element>
+ <element ref="text_p4"><bounds x="94.6" y="39.53" width="2.2" height="2.2" /></element>
+ <element ref="text_p5"><bounds x="94.6" y="47.24" width="2.2" height="2.2" /></element>
+ <element ref="text_p3"><bounds x="94.6" y="54.96" width="2.2" height="2.2" /></element>
+ <element ref="text_p6"><bounds x="94.6" y="62.67" width="2.2" height="2.2" /></element>
+
+ <element ref="text_p1"><bounds x="113.15" y="26.10" width="2.2" height="2.2" /></element>
+ <element ref="text_p2"><bounds x="113.15" y="33.81" width="2.2" height="2.2" /></element>
+ <element ref="text_p3"><bounds x="113.15" y="41.53" width="2.2" height="2.2" /></element>
+ <element ref="text_p4"><bounds x="113.15" y="49.24" width="2.2" height="2.2" /></element>
+ <element ref="text_p5"><bounds x="113.15" y="56.96" width="2.2" height="2.2" /></element>
+ <element ref="text_p6"><bounds x="113.15" y="64.67" width="2.2" height="2.2" /></element>
+
+ <element ref="gray" blend="multiply"><bounds x="94.5" y="20" width="22" height="60" /></element>
+
+ <element ref="but" inputtag="IN.0" inputmask="0x02"><bounds x="97.38" y="24.00" width="2.5" height="2.5" /></element>
+ <element ref="but" inputtag="IN.1" inputmask="0x02"><bounds x="97.38" y="31.71" width="2.5" height="2.5" /></element>
+ <element ref="but" inputtag="IN.2" inputmask="0x02"><bounds x="97.38" y="39.43" width="2.5" height="2.5" /></element>
+ <element ref="but" inputtag="IN.3" inputmask="0x02"><bounds x="97.38" y="47.14" width="2.5" height="2.5" /></element>
+ <element ref="but" inputtag="IN.4" inputmask="0x02"><bounds x="97.38" y="54.86" width="2.5" height="2.5" /></element>
+ <element ref="but" inputtag="IN.5" inputmask="0x02"><bounds x="97.38" y="62.57" width="2.5" height="2.5" /></element>
+ <element ref="but" inputtag="IN.6" inputmask="0x02"><bounds x="97.38" y="70.29" width="2.5" height="2.5" /></element>
+ <element ref="but" inputtag="IN.7" inputmask="0x02"><bounds x="97.38" y="78.00" width="2.5" height="2.5" /></element>
+
+ <element ref="but" inputtag="IN.0" inputmask="0x01"><bounds x="107.00" y="24.00" width="2.5" height="2.5" /></element>
+ <element ref="but" inputtag="IN.1" inputmask="0x01"><bounds x="107.00" y="31.71" width="2.5" height="2.5" /></element>
+ <element ref="but" inputtag="IN.2" inputmask="0x01"><bounds x="107.00" y="39.43" width="2.5" height="2.5" /></element>
+ <element ref="but" inputtag="IN.3" inputmask="0x01"><bounds x="107.00" y="47.14" width="2.5" height="2.5" /></element>
+ <element ref="but" inputtag="IN.4" inputmask="0x01"><bounds x="107.00" y="54.86" width="2.5" height="2.5" /></element>
+ <element ref="but" inputtag="IN.5" inputmask="0x01"><bounds x="107.00" y="62.57" width="2.5" height="2.5" /></element>
+ <element ref="but" inputtag="IN.6" inputmask="0x01"><bounds x="107.00" y="70.29" width="2.5" height="2.5" /></element>
+ <element ref="but" inputtag="IN.7" inputmask="0x01"><bounds x="107.00" y="78.00" width="2.5" height="2.5" /></element>
+
+ <element ref="text_l1ax"><bounds x="91.63" y="20.95" width="14" height="1.4" /></element>
+ <element ref="text_l1a"><bounds x="91.63" y="22.35" width="14" height="1.4" /></element>
+ <element ref="text_l1b"><bounds x="91.63" y="26.70" width="14" height="1.4" /></element>
+ <element ref="text_l2ax"><bounds x="91.63" y="28.66" width="14" height="1.4" /></element>
+ <element ref="text_l2a"><bounds x="91.63" y="30.06" width="14" height="1.4" /></element>
+ <element ref="text_l2b"><bounds x="91.63" y="34.41" width="14" height="1.4" /></element>
+ <element ref="text_l3a"><bounds x="91.63" y="37.78" width="14" height="1.4" /></element>
+ <element ref="text_l3b"><bounds x="91.63" y="42.13" width="14" height="1.4" /></element>
+ <element ref="text_l4a"><bounds x="91.63" y="45.49" width="14" height="1.4" /></element>
+ <element ref="text_l4b"><bounds x="91.63" y="49.84" width="14" height="1.4" /></element>
+ <element ref="text_l5a"><bounds x="91.63" y="53.21" width="14" height="1.4" /></element>
+ <element ref="text_l5b"><bounds x="91.63" y="57.56" width="14" height="1.4" /></element>
+ <element ref="text_l6a"><bounds x="91.63" y="60.92" width="14" height="1.4" /></element>
+ <element ref="text_l6b"><bounds x="91.63" y="65.27" width="14" height="1.4" /></element>
+ <element ref="text_l7a"><bounds x="91.63" y="68.64" width="14" height="1.4" /></element>
+ <element ref="text_l7b"><bounds x="91.63" y="72.99" width="14" height="1.4" /></element>
+ <element ref="text_l8a"><bounds x="91.63" y="76.35" width="14" height="1.4" /></element>
+ <element ref="text_l8b"><bounds x="91.63" y="80.70" width="14" height="1.4" /></element>
+
+ <element ref="text_m1a"><bounds x="101.25" y="22.35" width="14" height="1.4" /></element>
+ <element ref="text_m1b"><bounds x="101.25" y="26.70" width="14" height="1.4" /></element>
+ <element ref="text_m2a"><bounds x="101.25" y="30.06" width="14" height="1.4" /></element>
+ <element ref="text_m2b"><bounds x="101.25" y="34.41" width="14" height="1.4" /></element>
+ <element ref="text_m3a"><bounds x="101.25" y="37.78" width="14" height="1.4" /></element>
+ <element ref="text_m3b"><bounds x="101.25" y="42.13" width="14" height="1.4" /></element>
+ <element ref="text_m4a"><bounds x="101.25" y="45.49" width="14" height="1.4" /></element>
+ <element ref="text_m4b"><bounds x="101.25" y="49.84" width="14" height="1.4" /></element>
+ <element ref="text_m4bx"><bounds x="101.25" y="51.24" width="14" height="1.4" /></element>
+ <element ref="text_m5a"><bounds x="101.25" y="53.21" width="14" height="1.4" /></element>
+ <element ref="text_m5b"><bounds x="101.25" y="57.56" width="14" height="1.4" /></element>
+ <element ref="text_m5bx"><bounds x="101.25" y="58.96" width="14" height="1.4" /></element>
+ <element ref="text_m6a"><bounds x="101.25" y="60.92" width="14" height="1.4" /></element>
+ <element ref="text_m6b"><bounds x="101.25" y="65.27" width="14" height="1.4" /></element>
+ <element ref="text_m7a"><bounds x="101.25" y="68.64" width="14" height="1.4" /></element>
+ <element ref="text_m7b"><bounds x="101.25" y="72.99" width="14" height="1.4" /></element>
+ <element ref="text_m8a"><bounds x="101.25" y="76.35" width="14" height="1.4" /></element>
+ <element ref="text_m8b"><bounds x="101.25" y="80.70" width="14" height="1.4" /></element>
+
+ <element ref="text_r1"><bounds x="110.5" y="22.85" width="7.5" height="1.4" /></element>
+ <element ref="text_r2"><bounds x="110.5" y="30.56" width="7.5" height="1.4" /></element>
+ <element ref="text_r3"><bounds x="110.5" y="38.28" width="7.5" height="1.4" /></element>
+ <element ref="text_r4"><bounds x="110.5" y="45.99" width="7.5" height="1.4" /></element>
+ <element ref="text_r5"><bounds x="110.5" y="53.71" width="7.5" height="1.4" /></element>
+ <element ref="text_r6"><bounds x="110.5" y="61.42" width="7.5" height="1.4" /></element>
+ <element ref="text_r7"><bounds x="110.5" y="69.04" width="7.5" height="1.4" /></element>
+ <element ref="text_r8"><bounds x="110.5" y="76.85" width="7.5" height="1.4" /></element>
+
+ <element ref="text_rx"><bounds x="116.3" y="24.2" width="1.4" height="10" /><orientation rotate="90" /></element>
+
+ <element name="8.0" ref="led2"><bounds x="113.5" y="24.50" width="1.5" height="1.5" /></element>
+ <element name="8.1" ref="led2"><bounds x="113.5" y="32.21" width="1.5" height="1.5" /></element>
+ <element name="8.2" ref="led2"><bounds x="113.5" y="39.93" width="1.5" height="1.5" /></element>
+ <element name="8.3" ref="led2"><bounds x="113.5" y="47.64" width="1.5" height="1.5" /></element>
+ <element name="8.4" ref="led2"><bounds x="113.5" y="55.36" width="1.5" height="1.5" /></element>
+ <element name="8.5" ref="led2"><bounds x="113.5" y="63.07" width="1.5" height="1.5" /></element>
+ <element name="8.6" ref="led2"><bounds x="113.5" y="70.79" width="1.5" height="1.5" /></element>
+ <element name="8.7" ref="led2"><bounds x="113.5" y="78.50" width="1.5" height="1.5" /></element>
+
+ </view>
+</mamelayout>
diff --git a/src/mame/layout/novag_cforte.lay b/src/mame/layout/novag_cforte.lay
index 030aa238223..8c3b0252054 100644
--- a/src/mame/layout/novag_cforte.lay
+++ b/src/mame/layout/novag_cforte.lay
@@ -432,7 +432,7 @@ license:CC0
<!-- build screen -->
<view name="Internal Layout">
- <bounds left="-12" right="111" top="-1" bottom="88" />
+ <bounds left="-12.5" right="111" top="-1" bottom="88" />
<group ref="sb_board"><bounds x="4" y="3" width="80" height="80" /></group>
<group ref="sb_ui"><bounds x="-11" y="3" width="10" height="80" /></group>
diff --git a/src/mame/layout/novag_constq.lay b/src/mame/layout/novag_constq.lay
index 33cc6604fde..d61872e14e2 100644
--- a/src/mame/layout/novag_constq.lay
+++ b/src/mame/layout/novag_constq.lay
@@ -381,7 +381,7 @@ license:CC0
<!-- build screen -->
<view name="Internal Layout">
- <bounds left="-12" right="109.5" top="-1" bottom="88" />
+ <bounds left="-12.5" right="109.5" top="-1" bottom="88" />
<group ref="sb_board"><bounds x="4" y="3" width="80" height="80" /></group>
<group ref="sb_ui"><bounds x="-11" y="3" width="10" height="80" /></group>
diff --git a/src/mame/layout/novag_diablo68k.lay b/src/mame/layout/novag_diablo68k.lay
index 1a3c531d462..43691c8eb82 100644
--- a/src/mame/layout/novag_diablo68k.lay
+++ b/src/mame/layout/novag_diablo68k.lay
@@ -397,24 +397,7 @@ license:CC0
<!-- build screen -->
<view name="Internal Layout">
- <bounds left="-11" right="114" top="-1" bottom="88" />
-
- <!-- lcd panel -->
-
- <element ref="lcdw"><bounds x="86" y="8" width="25.25" height="5" /></element>
- <screen tag="screen"><bounds x="86.5" y="9" width="24.25" height="3" /></screen>
- <element ref="lcdm" blend="multiply"><bounds x="86" y="8" width="25.25" height="5" /></element>
- <element ref="lcda" blend="add"><bounds x="86" y="8" width="25.25" height="5" /></element>
-
- <!-- right side buttons -->
-
- <element ref="text_p1"><bounds x="100.4" y="24.10" width="2.2" height="2.2" /></element>
- <element ref="text_p2"><bounds x="100.4" y="31.81" width="2.2" height="2.2" /></element>
- <element ref="text_p4"><bounds x="100.4" y="39.53" width="2.2" height="2.2" /></element>
- <element ref="text_p5"><bounds x="100.4" y="47.24" width="2.2" height="2.2" /></element>
- <element ref="text_p3"><bounds x="100.4" y="54.96" width="2.2" height="2.2" /></element>
- <element ref="text_p6"><bounds x="100.4" y="62.67" width="2.2" height="2.2" /></element>
- <element ref="gray" blend="multiply"><bounds x="100" y="20" width="4" height="60" /></element>
+ <bounds left="-11.5" right="114" top="-1" bottom="88" />
<group ref="sb_board"><bounds x="4" y="3" width="80" height="80" /></group>
<group ref="sb_ui"><bounds x="-10" y="3" width="10" height="80" /></group>
@@ -439,6 +422,23 @@ license:CC0
<element ref="text_g"><bounds x="68" y="84" width="2" height="2" /></element>
<element ref="text_h"><bounds x="78" y="84" width="2" height="2" /></element>
+ <!-- lcd panel -->
+
+ <element ref="lcdw"><bounds x="86" y="8" width="25.25" height="5" /></element>
+ <screen tag="screen"><bounds x="86.5" y="9" width="24.25" height="3" /></screen>
+ <element ref="lcdm" blend="multiply"><bounds x="86" y="8" width="25.25" height="5" /></element>
+ <element ref="lcda" blend="add"><bounds x="86" y="8" width="25.25" height="5" /></element>
+
+ <!-- right side buttons -->
+
+ <element ref="text_p1"><bounds x="100.4" y="24.10" width="2.2" height="2.2" /></element>
+ <element ref="text_p2"><bounds x="100.4" y="31.81" width="2.2" height="2.2" /></element>
+ <element ref="text_p4"><bounds x="100.4" y="39.53" width="2.2" height="2.2" /></element>
+ <element ref="text_p5"><bounds x="100.4" y="47.24" width="2.2" height="2.2" /></element>
+ <element ref="text_p3"><bounds x="100.4" y="54.96" width="2.2" height="2.2" /></element>
+ <element ref="text_p6"><bounds x="100.4" y="62.67" width="2.2" height="2.2" /></element>
+ <element ref="gray" blend="multiply"><bounds x="100" y="20" width="4" height="60" /></element>
+
<element ref="but" inputtag="IN.7" inputmask="0x04"><bounds x="87.75" y="24.00" width="2.5" height="2.5" /></element>
<element ref="but" inputtag="IN.6" inputmask="0x04"><bounds x="87.75" y="31.71" width="2.5" height="2.5" /></element>
<element ref="but" inputtag="IN.5" inputmask="0x04"><bounds x="87.75" y="39.43" width="2.5" height="2.5" /></element>
diff --git a/src/mame/layout/novag_scorpio68k.lay b/src/mame/layout/novag_scorpio68k.lay
index 2944ae57852..8217a397d4f 100644
--- a/src/mame/layout/novag_scorpio68k.lay
+++ b/src/mame/layout/novag_scorpio68k.lay
@@ -387,24 +387,7 @@ license:CC0
<!-- build screen -->
<view name="Internal Layout">
- <bounds left="-12" right="114" top="-1" bottom="98" />
-
- <!-- lcd panel -->
-
- <element ref="lcdw"><bounds x="47.75" y="89.5" width="25.25" height="5" /></element>
- <screen tag="screen"><bounds x="48.25" y="90.5" width="24.25" height="3" /></screen>
- <element ref="lcdm" blend="multiply"><bounds x="47.75" y="89.5" width="25.25" height="5" /></element>
- <element ref="lcda" blend="add"><bounds x="47.75" y="89.5" width="25.25" height="5" /></element>
-
- <!-- right side buttons -->
-
- <element ref="text_p1"><bounds x="95.4" y="18.00" width="1.6" height="1.6" /></element>
- <element ref="text_p2"><bounds x="95.4" y="25.71" width="1.6" height="1.6" /></element>
- <element ref="text_p4"><bounds x="95.4" y="33.43" width="1.6" height="1.6" /></element>
- <element ref="text_p5"><bounds x="95.4" y="41.14" width="1.6" height="1.6" /></element>
- <element ref="text_p3"><bounds x="95.4" y="48.86" width="1.6" height="1.6" /></element>
- <element ref="text_p6"><bounds x="95.4" y="56.57" width="1.6" height="1.6" /></element>
- <element ref="cyan" blend="multiply"><bounds x="95" y="17" width="4" height="60" /></element>
+ <bounds left="-12.5" right="114" top="-1" bottom="98" />
<group ref="sb_board"><bounds x="4" y="3" width="80" height="80" /></group>
<group ref="sb_ui"><bounds x="-11" y="3" width="10" height="80" /></group>
@@ -449,6 +432,23 @@ license:CC0
<element name="1.8" ref="ledr"><bounds x="68" y="84" width="2" height="1" /></element>
<element name="0.8" ref="ledr"><bounds x="78" y="84" width="2" height="1" /></element>
+ <!-- lcd panel -->
+
+ <element ref="lcdw"><bounds x="47.75" y="89.5" width="25.25" height="5" /></element>
+ <screen tag="screen"><bounds x="48.25" y="90.5" width="24.25" height="3" /></screen>
+ <element ref="lcdm" blend="multiply"><bounds x="47.75" y="89.5" width="25.25" height="5" /></element>
+ <element ref="lcda" blend="add"><bounds x="47.75" y="89.5" width="25.25" height="5" /></element>
+
+ <!-- right side buttons -->
+
+ <element ref="text_p1"><bounds x="95.4" y="18.00" width="1.6" height="1.6" /></element>
+ <element ref="text_p2"><bounds x="95.4" y="25.71" width="1.6" height="1.6" /></element>
+ <element ref="text_p4"><bounds x="95.4" y="33.43" width="1.6" height="1.6" /></element>
+ <element ref="text_p5"><bounds x="95.4" y="41.14" width="1.6" height="1.6" /></element>
+ <element ref="text_p3"><bounds x="95.4" y="48.86" width="1.6" height="1.6" /></element>
+ <element ref="text_p6"><bounds x="95.4" y="56.57" width="1.6" height="1.6" /></element>
+ <element ref="cyan" blend="multiply"><bounds x="95" y="17" width="4" height="60" /></element>
+
<element ref="black"><bounds x="86" y="14.00" width="6" height="4" /></element>
<element ref="black"><bounds x="86" y="21.71" width="6" height="4" /></element>
<element ref="black"><bounds x="86" y="29.43" width="6" height="4" /></element>
diff --git a/src/mame/layout/novag_sexpert.lay b/src/mame/layout/novag_sexpert.lay
index 1a3c531d462..43691c8eb82 100644
--- a/src/mame/layout/novag_sexpert.lay
+++ b/src/mame/layout/novag_sexpert.lay
@@ -397,24 +397,7 @@ license:CC0
<!-- build screen -->
<view name="Internal Layout">
- <bounds left="-11" right="114" top="-1" bottom="88" />
-
- <!-- lcd panel -->
-
- <element ref="lcdw"><bounds x="86" y="8" width="25.25" height="5" /></element>
- <screen tag="screen"><bounds x="86.5" y="9" width="24.25" height="3" /></screen>
- <element ref="lcdm" blend="multiply"><bounds x="86" y="8" width="25.25" height="5" /></element>
- <element ref="lcda" blend="add"><bounds x="86" y="8" width="25.25" height="5" /></element>
-
- <!-- right side buttons -->
-
- <element ref="text_p1"><bounds x="100.4" y="24.10" width="2.2" height="2.2" /></element>
- <element ref="text_p2"><bounds x="100.4" y="31.81" width="2.2" height="2.2" /></element>
- <element ref="text_p4"><bounds x="100.4" y="39.53" width="2.2" height="2.2" /></element>
- <element ref="text_p5"><bounds x="100.4" y="47.24" width="2.2" height="2.2" /></element>
- <element ref="text_p3"><bounds x="100.4" y="54.96" width="2.2" height="2.2" /></element>
- <element ref="text_p6"><bounds x="100.4" y="62.67" width="2.2" height="2.2" /></element>
- <element ref="gray" blend="multiply"><bounds x="100" y="20" width="4" height="60" /></element>
+ <bounds left="-11.5" right="114" top="-1" bottom="88" />
<group ref="sb_board"><bounds x="4" y="3" width="80" height="80" /></group>
<group ref="sb_ui"><bounds x="-10" y="3" width="10" height="80" /></group>
@@ -439,6 +422,23 @@ license:CC0
<element ref="text_g"><bounds x="68" y="84" width="2" height="2" /></element>
<element ref="text_h"><bounds x="78" y="84" width="2" height="2" /></element>
+ <!-- lcd panel -->
+
+ <element ref="lcdw"><bounds x="86" y="8" width="25.25" height="5" /></element>
+ <screen tag="screen"><bounds x="86.5" y="9" width="24.25" height="3" /></screen>
+ <element ref="lcdm" blend="multiply"><bounds x="86" y="8" width="25.25" height="5" /></element>
+ <element ref="lcda" blend="add"><bounds x="86" y="8" width="25.25" height="5" /></element>
+
+ <!-- right side buttons -->
+
+ <element ref="text_p1"><bounds x="100.4" y="24.10" width="2.2" height="2.2" /></element>
+ <element ref="text_p2"><bounds x="100.4" y="31.81" width="2.2" height="2.2" /></element>
+ <element ref="text_p4"><bounds x="100.4" y="39.53" width="2.2" height="2.2" /></element>
+ <element ref="text_p5"><bounds x="100.4" y="47.24" width="2.2" height="2.2" /></element>
+ <element ref="text_p3"><bounds x="100.4" y="54.96" width="2.2" height="2.2" /></element>
+ <element ref="text_p6"><bounds x="100.4" y="62.67" width="2.2" height="2.2" /></element>
+ <element ref="gray" blend="multiply"><bounds x="100" y="20" width="4" height="60" /></element>
+
<element ref="but" inputtag="IN.7" inputmask="0x04"><bounds x="87.75" y="24.00" width="2.5" height="2.5" /></element>
<element ref="but" inputtag="IN.6" inputmask="0x04"><bounds x="87.75" y="31.71" width="2.5" height="2.5" /></element>
<element ref="but" inputtag="IN.5" inputmask="0x04"><bounds x="87.75" y="39.43" width="2.5" height="2.5" /></element>
diff --git a/src/mame/layout/novag_sforte.lay b/src/mame/layout/novag_sforte.lay
index f091e86427a..348c9849114 100644
--- a/src/mame/layout/novag_sforte.lay
+++ b/src/mame/layout/novag_sforte.lay
@@ -391,14 +391,7 @@ license:CC0
<!-- build screen -->
<view name="Internal Layout">
- <bounds left="-12" right="114" top="-1" bottom="88" />
-
- <!-- lcd panel -->
-
- <element ref="lcdw"><bounds x="86" y="8" width="25.25" height="5" /></element>
- <screen tag="screen"><bounds x="86.5" y="9" width="24.25" height="3" /></screen>
- <element ref="lcdm" blend="multiply"><bounds x="86" y="8" width="25.25" height="5" /></element>
- <element ref="lcda" blend="add"><bounds x="86" y="8" width="25.25" height="5" /></element>
+ <bounds left="-12.5" right="114" top="-1" bottom="88" />
<group ref="sb_board"><bounds x="4" y="3" width="80" height="80" /></group>
<group ref="sb_ui"><bounds x="-11" y="3" width="10" height="80" /></group>
@@ -443,6 +436,13 @@ license:CC0
<element name="1.1" ref="ledr"><bounds x="68.5" y="84" width="1" height="2" /></element>
<element name="0.1" ref="ledr"><bounds x="78.5" y="84" width="1" height="2" /></element>
+ <!-- lcd panel -->
+
+ <element ref="lcdw"><bounds x="86" y="8" width="25.25" height="5" /></element>
+ <screen tag="screen"><bounds x="86.5" y="9" width="24.25" height="3" /></screen>
+ <element ref="lcdm" blend="multiply"><bounds x="86" y="8" width="25.25" height="5" /></element>
+ <element ref="lcda" blend="add"><bounds x="86" y="8" width="25.25" height="5" /></element>
+
<!-- right side buttons -->
<element ref="red"><bounds x="86" y="24.00" width="6" height="4" /></element>
diff --git a/src/mame/layout/novag_supercon.lay b/src/mame/layout/novag_supercon.lay
index f314e53e628..3d45f8e75c4 100644
--- a/src/mame/layout/novag_supercon.lay
+++ b/src/mame/layout/novag_supercon.lay
@@ -423,7 +423,7 @@ license:CC0
<!-- default view -->
<group name="default">
- <bounds left="-19.5" right="116" top="-0.5" bottom="88.5" />
+ <bounds left="-19" right="116" top="-0.5" bottom="88.5" />
<element ref="cblack"><bounds x="2.5" y="2.5" width="80.5" height="81" /></element>
<group ref="sb_board"><bounds x="3" y="3" width="80" height="80" /></group>
@@ -596,7 +596,7 @@ license:CC0
<!-- programmable openings keypad overlay sheet -->
<group name="overlay">
- <bounds left="-19.5" right="116" top="-0.5" bottom="88.5" />
+ <bounds left="-19" right="116" top="-0.5" bottom="88.5" />
<!-- block buttons -->
<element ref="hlb" inputtag="IN.1" inputmask="0x00" inputraw="1"><bounds x="88" y="16" width="6" height="4" /></element>
@@ -609,7 +609,7 @@ license:CC0
<element ref="hlb" inputtag="IN.5" inputmask="0x00" inputraw="1"><bounds x="97" y="56" width="6" height="4" /></element>
<element ref="hlb" inputtag="IN.6" inputmask="0x00" inputraw="1"><bounds x="97" y="66" width="6" height="4" /></element>
- <group ref="default"><bounds left="-19.5" right="116" top="-0.5" bottom="88.5" /></group>
+ <group ref="default"><bounds left="-19" right="116" top="-0.5" bottom="88.5" /></group>
<!-- erase -->
<element ref="blackb"><bounds x="86" y="0" width="1" height="88" /></element>
@@ -641,13 +641,13 @@ license:CC0
<!-- build screen -->
<view name="Internal Layout (Default)">
- <bounds left="-19.5" right="116" top="-0.5" bottom="88.5" />
- <group ref="default"><bounds left="-19.5" right="116" top="-0.5" bottom="88.5" /></group>
+ <bounds left="-19" right="116" top="-0.5" bottom="88.5" />
+ <group ref="default"><bounds left="-19" right="116" top="-0.5" bottom="88.5" /></group>
</view>
<view name="Internal Layout (P.O. Overlay)">
- <bounds left="-19.5" right="116" top="-0.5" bottom="88.5" />
- <group ref="overlay"><bounds left="-19.5" right="116" top="-0.5" bottom="88.5" /></group>
+ <bounds left="-19" right="116" top="-0.5" bottom="88.5" />
+ <group ref="overlay"><bounds left="-19" right="116" top="-0.5" bottom="88.5" /></group>
</view>
</mamelayout>
diff --git a/src/mame/layout/saitek_intchess.lay b/src/mame/layout/saitek_intchess.lay
index b257059a1eb..ebe801d7f52 100644
--- a/src/mame/layout/saitek_intchess.lay
+++ b/src/mame/layout/saitek_intchess.lay
@@ -69,6 +69,11 @@ license:CC0
<group name="main">
<bounds left="-2" right="48" top="46.5" bottom="124" />
+ <element name="digit0" ref="digit"><bounds x="15" y="88" width="4" height="6" /></element>
+ <element name="digit1" ref="digit"><bounds x="19" y="88" width="4" height="6" /></element>
+ <element name="digit2" ref="digit"><bounds x="23" y="88" width="4" height="6" /></element>
+ <element name="digit3" ref="digit"><bounds x="27" y="88" width="4" height="6" /></element>
+
<!-- buttons -->
<element ref="orange"><bounds x="0" y="100" width="4" height="4" /></element>
<element ref="orange"><bounds x="6" y="100" width="4" height="4" /></element>
@@ -140,11 +145,6 @@ license:CC0
<element ref="whitem"><bounds x="42" y="90" width="4" height="4" /></element>
<element ref="hl" blend="multiply" inputtag="RESET" inputmask="0x01"><bounds x="42" y="90" width="4" height="4" /></element>
- <element name="digit0" ref="digit"><bounds x="15" y="88" width="4" height="6" /></element>
- <element name="digit1" ref="digit"><bounds x="19" y="88" width="4" height="6" /></element>
- <element name="digit2" ref="digit"><bounds x="23" y="88" width="4" height="6" /></element>
- <element name="digit3" ref="digit"><bounds x="27" y="88" width="4" height="6" /></element>
-
<!-- labels -->
<element ref="text_a"><bounds x="0" y="114.5" width="4" height="1.9" /></element>
<element ref="text_b"><bounds x="6" y="114.5" width="4" height="1.9" /></element>
diff --git a/src/mame/layout/saitek_mark6.lay b/src/mame/layout/saitek_mark6.lay
index a2127a73a1c..47741a91cf0 100644
--- a/src/mame/layout/saitek_mark6.lay
+++ b/src/mame/layout/saitek_mark6.lay
@@ -799,6 +799,9 @@ license:CC0
<view name="Internal Layout (Board)">
<bounds left="21.5" right="100.5" top="18.5" bottom="88" />
+ <group ref="sb_board"><bounds x="33.5" y="21" width="64.5" height="64.5" /></group>
+ <group ref="sb_ui"><bounds x="22.5" y="21" width="8.06" height="64.5" /></group>
+
<repeat count="8">
<param name="x" start="33.5" increment="8.0625" />
<param name="i" start="1" increment="1" />
@@ -809,9 +812,6 @@ license:CC0
<param name="i" start="8" increment="-1" />
<element ref="text_hn~i~"><bounds x="31.3" y="~y~" width="2" height="1.6125" /></element>
</repeat>
-
- <group ref="sb_board"><bounds x="33.5" y="21" width="64.5" height="64.5" /></group>
- <group ref="sb_ui"><bounds x="22.5" y="21" width="8.06" height="64.5" /></group>
</view>
</mamelayout>
diff --git a/src/mame/layout/saitek_renaissance.lay b/src/mame/layout/saitek_renaissance.lay
index 7949c5ad670..04fd3174c45 100644
--- a/src/mame/layout/saitek_renaissance.lay
+++ b/src/mame/layout/saitek_renaissance.lay
@@ -448,18 +448,14 @@ license:CC0
<view name="Internal Layout">
<bounds left="-13" right="88" top="-1.5" bottom="123" />
- <group ref="display"><bounds x="33" y="90" width="23.6" height="30" /></group>
-
- <element ref="ledro"><bounds x="8" y="90" width="2" height="1" /></element>
- <element name="9.4" ref="ledrr" blend="add"><bounds x="8" y="90" width="2" height="1" /></element>
- <element name="9.5" ref="ledrg" blend="add"><bounds x="8" y="90" width="2" height="1" /></element>
-
<element ref="cblack"><bounds x="-1" y="-1.5" width="89" height="89" /></element>
<element ref="black"><bounds x="3" y="2.5" width="81" height="81" /></element>
<group ref="sb_board"><bounds x="3" y="2.5" width="81" height="81" /></group>
<group ref="sb_ui"><bounds x="-12" y="3" width="10" height="80" /></group>
+ <group ref="display"><bounds x="33" y="90" width="23.6" height="30" /></group>
+
<!-- chessboard coords -->
<element ref="text_8"><bounds x="0.2" y="7" width="2" height="2" /></element>
<element ref="text_7"><bounds x="0.2" y="17" width="2" height="2" /></element>
@@ -483,6 +479,10 @@ license:CC0
<element name="9.0" ref="ledr"><bounds x="0" y="90" width="2" height="1" /></element>
<element name="9.1" ref="ledr"><bounds x="4" y="90" width="2" height="1" /></element>
+ <element ref="ledro"><bounds x="8" y="90" width="2" height="1" /></element>
+ <element name="9.4" ref="ledrr" blend="add"><bounds x="8" y="90" width="2" height="1" /></element>
+ <element name="9.5" ref="ledrg" blend="add"><bounds x="8" y="90" width="2" height="1" /></element>
+
<element name="9.2" ref="ledr"><bounds x="12" y="90" width="2" height="1" /></element>
<element name="9.3" ref="ledr"><bounds x="16" y="90" width="2" height="1" /></element>
diff --git a/src/mame/layout/saitek_simultano.lay b/src/mame/layout/saitek_simultano.lay
index 281527afe62..4e99fd5eef6 100644
--- a/src/mame/layout/saitek_simultano.lay
+++ b/src/mame/layout/saitek_simultano.lay
@@ -413,20 +413,6 @@ license:CC0
<view name="Internal Layout (Full)">
<bounds left="-13.5" right="132.5" top="-1" bottom="90" />
- <group ref="display"><bounds x="96.5" y="13" width="23.6" height="30" /></group>
-
- <element ref="ledro"><bounds x="88.5" y="34.5" width="2" height="1" /></element>
- <element name="2.1" ref="ledrr" blend="add"><bounds x="88.5" y="34.5" width="2" height="1" /></element>
- <element name="3.1" ref="ledrg" blend="add"><bounds x="88.5" y="34.5" width="2" height="1" /></element>
-
- <element ref="text_p1"><bounds x="90.083" y="69.9" width="3" height="3" /></element>
- <element ref="text_p2"><bounds x="96.749" y="69.9" width="3" height="3" /></element>
- <element ref="text_p3"><bounds x="103.415" y="69.9" width="3" height="3" /></element>
- <element ref="text_p4"><bounds x="110.081" y="69.9" width="3" height="3" /></element>
- <element ref="text_p5"><bounds x="116.747" y="69.9" width="3" height="3" /></element>
- <element ref="text_p6"><bounds x="123.413" y="69.9" width="3" height="3" /></element>
- <element ref="cwhite" blend="multiply"><bounds x="90.083" y="69.9" width="40" height="3" /></element>
-
<group ref="sb_board"><bounds x="4" y="3" width="80" height="80" /></group>
<group ref="sb_ui"><bounds x="-12" y="3" width="10" height="80" /></group>
@@ -472,9 +458,15 @@ license:CC0
<!-- right side -->
+ <group ref="display"><bounds x="96.5" y="13" width="23.6" height="30" /></group>
+
<element name="2.0" ref="ledr"><bounds x="88.5" y="20.5" width="2" height="1" /></element>
<element name="3.0" ref="ledr"><bounds x="88.5" y="27.5" width="2" height="1" /></element>
+ <element ref="ledro"><bounds x="88.5" y="34.5" width="2" height="1" /></element>
+ <element name="2.1" ref="ledrr" blend="add"><bounds x="88.5" y="34.5" width="2" height="1" /></element>
+ <element name="3.1" ref="ledrg" blend="add"><bounds x="88.5" y="34.5" width="2" height="1" /></element>
+
<element ref="text_r1"><bounds x="91" y="20.2" width="7" height="1.5" /></element>
<element ref="text_r2"><bounds x="91" y="27.2" width="7" height="1.5" /></element>
<element ref="text_r3"><bounds x="91" y="34.2" width="7" height="1.5" /></element>
@@ -497,6 +489,14 @@ license:CC0
<element ref="text_b14"><bounds x="112.5" y="62.6" width="7.5" height="2.1" /></element>
<element ref="text_b15"><bounds x="120.5" y="63" width="7.5" height="1.5" /></element>
+ <element ref="text_p1"><bounds x="90.083" y="69.9" width="3" height="3" /></element>
+ <element ref="text_p2"><bounds x="96.749" y="69.9" width="3" height="3" /></element>
+ <element ref="text_p3"><bounds x="103.415" y="69.9" width="3" height="3" /></element>
+ <element ref="text_p4"><bounds x="110.081" y="69.9" width="3" height="3" /></element>
+ <element ref="text_p5"><bounds x="116.747" y="69.9" width="3" height="3" /></element>
+ <element ref="text_p6"><bounds x="123.413" y="69.9" width="3" height="3" /></element>
+ <element ref="cwhite" blend="multiply"><bounds x="90.083" y="69.9" width="40" height="3" /></element>
+
<element ref="button" inputtag="RESET" inputmask="0x01"><bounds x="88.5" y="48.25" width="7.5" height="3" /></element>
<element ref="button" inputtag="IN.1" inputmask="0x02"><bounds x="96.5" y="48.25" width="7.5" height="3" /></element>
<element ref="button" inputtag="IN.0" inputmask="0x02"><bounds x="104.5" y="48.25" width="7.5" height="3" /></element>
diff --git a/src/mame/layout/saitek_ssystem3.lay b/src/mame/layout/saitek_ssystem3.lay
index d4841ed072d..07dce2f931d 100644
--- a/src/mame/layout/saitek_ssystem3.lay
+++ b/src/mame/layout/saitek_ssystem3.lay
@@ -357,8 +357,14 @@ license:CC0
<view name="Internal Layout (Full)">
<bounds left="26" right="100" top="0" bottom="30" />
+ <group ref="main"><bounds x="50" y="0" width="50" height="30" /></group>
+
<group ref="lcd2"><bounds x="29.3" y="0.35" width="17.37" height="17.3" /></group>
+ <element ref="brown"><bounds x="26" y="0" width="2" height="30" /></element>
+ <element ref="brown"><bounds x="48" y="0" width="2" height="30" /></element>
+ <element ref="brown"><bounds x="49" y="10" width="2" height="6" /></element>
+
<repeat count="8">
<param name="y" start="1.75" increment="1.93" />
<param name="i" start="0" increment="1" />
@@ -370,12 +376,6 @@ license:CC0
<element ref="text_a~i~"><bounds x="~x~" y="17.2" width="1.5" height="0.9" /></element>
</repeat>
- <group ref="main"><bounds x="50" y="0" width="50" height="30" /></group>
-
- <element ref="brown"><bounds x="26" y="0" width="2" height="30" /></element>
- <element ref="brown"><bounds x="48" y="0" width="2" height="30" /></element>
- <element ref="brown"><bounds x="49" y="10" width="2" height="6" /></element>
-
<element ref="switch2" inputtag="IN.6" inputmask="0x01" inputraw="1"><bounds x="36" y="24" width="4" height="5" /></element>
<element ref="switch2" inputtag="IN.4" inputmask="0x04" inputraw="1"><bounds x="42" y="24" width="4" height="5" /></element>
diff --git a/src/mame/layout/sda5708.lay b/src/mame/layout/sda5708.lay
index 223434d99c7..57388936ee7 100644
--- a/src/mame/layout/sda5708.lay
+++ b/src/mame/layout/sda5708.lay
@@ -44,8 +44,6 @@ license:CC0
</element>
<view name="Default Layout">
- <bounds left="0" top="0" right="150" bottom="20" />
-
<!-- generated with mechanical data from the data sheet -->
<repeat count="8"> <!-- 8 digits -->
<param name="digitno" start="1" increment="1" />
diff --git a/src/mame/layout/splus.lay b/src/mame/layout/splus.lay
index 5a9324caf39..7bb8e27b087 100644
--- a/src/mame/layout/splus.lay
+++ b/src/mame/layout/splus.lay
@@ -90,57 +90,57 @@ license:CC0
</element>
<view name="Buttons">
- <bounds left="0" top="0" right="340" bottom="310" />
+ <bounds left="0" top="0" right="360" bottom="420" />
<screen index="0">
- <bounds left="10" top="40" right="330" bottom="240" />
+ <bounds left="0" top="0" right="360" bottom="270" />
</screen>
<element name="s_bnk41" ref="insertcoin">
- <bounds x="160" y="170" width="74" height="20" />
+ <bounds x="160" y="280" width="74" height="20" />
</element>
<element name="s_bnk46" ref="cashout">
- <bounds x="10" y="280" width="74" height="20" />
+ <bounds x="10" y="390" width="74" height="20" />
</element>
<element name="s_bnk45" ref="bet1">
- <bounds x="92" y="280" width="74" height="20" />
+ <bounds x="92" y="390" width="74" height="20" />
</element>
<element name="s_bnk44" ref="betmax">
- <bounds x="174" y="280" width="74" height="20" />
+ <bounds x="174" y="390" width="74" height="20" />
</element>
<element name="wp" ref="winnerpaid">
- <bounds x="10" y="190" width="120" height="40" />
+ <bounds x="10" y="300" width="120" height="40" />
</element>
<element name="digit0" ref="digit">
- <bounds x="10" y="230" width="25" height="40" />
+ <bounds x="10" y="340" width="25" height="40" />
</element>
<element name="digit1" ref="digit">
- <bounds x="35" y="230" width="25" height="40" />
+ <bounds x="35" y="340" width="25" height="40" />
</element>
<element name="digit2" ref="digit">
- <bounds x="60" y="230" width="25" height="40" />
+ <bounds x="60" y="340" width="25" height="40" />
</element>
<element name="digit3" ref="digit">
- <bounds x="85" y="230" width="25" height="40" />
+ <bounds x="85" y="340" width="25" height="40" />
</element>
<element name="cr" ref="credits">
- <bounds x="160" y="190" width="80" height="40" />
+ <bounds x="160" y="300" width="80" height="40" />
</element>
<element name="digit4" ref="digit">
- <bounds x="130" y="230" width="25" height="40" />
+ <bounds x="130" y="340" width="25" height="40" />
</element>
<element name="digit5" ref="digit">
- <bounds x="155" y="230" width="25" height="40" />
+ <bounds x="155" y="340" width="25" height="40" />
</element>
<element name="digit6" ref="digit">
- <bounds x="180" y="230" width="25" height="40" />
+ <bounds x="180" y="340" width="25" height="40" />
</element>
<element name="digit7" ref="digit">
- <bounds x="205" y="230" width="25" height="40" />
+ <bounds x="205" y="340" width="25" height="40" />
</element>
<element name="cr" ref="played">
- <bounds x="270" y="190" width="80" height="40" />
+ <bounds x="270" y="300" width="80" height="40" />
</element>
<element name="digit8" ref="digit">
- <bounds x="290" y="230" width="25" height="40" />
+ <bounds x="290" y="340" width="25" height="40" />
</element>
</view>
</mamelayout>
diff --git a/src/mame/layout/z80net.lay b/src/mame/layout/z80net.lay
index d2fe5034d00..40df2bc5f41 100644
--- a/src/mame/layout/z80net.lay
+++ b/src/mame/layout/z80net.lay
@@ -504,7 +504,7 @@ copyright-holders:Roberto Lavarone
<bounds x="724" y="74" width="375" height="480" />
</element>
- <screen index="0">
+ <screen index="0" blend="add">
<bounds x="65" y="74" width="640" height="480" />
</screen>
diff --git a/src/mame/layout/z80netb.lay b/src/mame/layout/z80netb.lay
index e2084802570..4a91011d01a 100644
--- a/src/mame/layout/z80netb.lay
+++ b/src/mame/layout/z80netb.lay
@@ -47,7 +47,7 @@ copyright-holders:Roberto Lavarone
<bounds x="65" y="74" width="640" height="480" />
</element>
- <screen index="0">
+ <screen index="0" blend="add">
<bounds x="65" y="74" width="640" height="480" />
</screen>
diff --git a/src/mame/layout/z80netf.lay b/src/mame/layout/z80netf.lay
index 463e6d80fbd..ac150d51a4b 100644
--- a/src/mame/layout/z80netf.lay
+++ b/src/mame/layout/z80netf.lay
@@ -530,7 +530,7 @@ copyright-holders:Roberto Lavarone
<bounds x="724" y="74" width="375" height="330" />
</element>
- <screen index="0">
+ <screen index="0" blend="add">
<bounds x="65" y="74" width="640" height="480" />
</screen>
diff --git a/src/mame/machine/informer_207_376_kbd.cpp b/src/mame/machine/informer_207_376_kbd.cpp
index 8bbe4e62ac3..5c36eb4c2b4 100644
--- a/src/mame/machine/informer_207_376_kbd.cpp
+++ b/src/mame/machine/informer_207_376_kbd.cpp
@@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(INFORMER_207_376_KBD_HLE, informer_207_376_kbd_hle_device, "i
// keys not mapped yet:
//
// PF13 PF14 PF15 PF16 PF17 PF18 PF19 PF20 PF21 PF22 PF23 (PF24 = cursor up?)
-// ATTN CLICK_KEY
+// ATTN
static INPUT_PORTS_START( keyboard )
PORT_START("row_0")
@@ -55,7 +55,7 @@ static INPUT_PORTS_START( keyboard )
PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 15 */ PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('\\') PORT_NAME(u8"\\ ¦")
PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 16 */ PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) PORT_NAME("\xe2\x86\x90")
PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_UNKNOWN) /* 17 */
- PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 18 */ PORT_CODE(KEYCODE_F1) PORT_NAME("Enter") // but should be the same as the setup key?
+ PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 18 */ PORT_CODE(KEYCODE_ENTER_PAD) PORT_NAME("Enter Set Up")
PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_UNKNOWN) /* 19 */
PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 1a */ PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_NAME("\xe2\x86\x92")
PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 1b */ PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR(0) PORT_CHAR('!') PORT_NAME(u8"¢ !")
@@ -87,7 +87,7 @@ static INPUT_PORTS_START( keyboard )
PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 31 */ PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(0x08)
PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 32 */ PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') // same as 0x4b?
PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 33 */ PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') // same as 0x49?
- PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 34 */ PORT_CODE(KEYCODE_ESC) PORT_NAME("Reset")
+ PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 34 */ PORT_CODE(KEYCODE_ESC) PORT_NAME("Reset Dev Cncl")
PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 35 */ PORT_CODE(KEYCODE_TAB) PORT_NAME("Tab or Back-Tab")
PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 36 */ PORT_CODE(KEYCODE_HOME) PORT_NAME("Tab or Back-Tab")
PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_UNKNOWN) /* 37 */
@@ -110,23 +110,23 @@ static INPUT_PORTS_START( keyboard )
PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_UNKNOWN) /* 46 */ // 1
PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_UNKNOWN) /* 47 */ // 2
PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_UNKNOWN) /* 48 */ // 3
- PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 49 */ PORT_CODE(KEYCODE_F2) // ,
+ PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 49 */ PORT_CODE(KEYCODE_F5) // ,
PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_UNKNOWN) /* 4a */ // 0
- PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 4b */ PORT_CODE(KEYCODE_F3) // . with alt key unknown function
+ PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 4b */ PORT_CODE(KEYCODE_F6) // . with alt key unknown function
PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 4c */ PORT_CODE(KEYCODE_CAPSLOCK) PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) PORT_NAME("Lock")
PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 4d */ PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1) PORT_NAME("Left Shift") // or right?
PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 4e */ PORT_CODE(KEYCODE_RSHIFT) PORT_NAME("Right Shift") // or left?
PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 4f */ PORT_CODE(KEYCODE_LALT) PORT_CHAR(UCHAR_SHIFT_2) PORT_NAME("Alt")
PORT_START("row_5")
- PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 50 */ PORT_CODE(KEYCODE_F4) PORT_NAME("Cursor Sel Clear")
- PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 51 */ PORT_CODE(KEYCODE_F5) // X + human?
+ PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 50 */ PORT_CODE(KEYCODE_F2) PORT_NAME("Cursor Sel Clear")
+ PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 51 */ PORT_CODE(KEYCODE_F1) // X + human? ATTN?
PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_UNKNOWN) /* 52 */
PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_UNKNOWN) /* 53 */
- PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 54 */ PORT_CODE(KEYCODE_F6) PORT_NAME("Cursor Blink Alt Cursor")
+ PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 54 */ PORT_CODE(KEYCODE_F3) PORT_NAME("Cursor Blink Alt Cursor")
PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 55 */ PORT_CODE(KEYCODE_END) PORT_NAME("Erase EOF")
PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 56 */ PORT_CODE(KEYCODE_PRTSCR) PORT_NAME("Print")
- PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 57 */ PORT_CODE(KEYCODE_ENTER_PAD) PORT_NAME("Setup (with Alt)") // but should be the same as the enter key?
+ PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 57 */ PORT_CODE(KEYCODE_F4) PORT_NAME("Keyclick Test")
PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_UNKNOWN) /* 58 */
PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_UNKNOWN) /* 59 */
PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_UNKNOWN) /* 5a */
diff --git a/src/mame/mame.cpp b/src/mame/mame.cpp
index 9dc8d96c382..d40869d53fe 100644
--- a/src/mame/mame.cpp
+++ b/src/mame/mame.cpp
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles
/***************************************************************************
- mame.c
+ mame.cpp
Specific (per target) constants
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 36a482b90a9..4924eccd9f1 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -32141,6 +32141,7 @@ vtpinball // From V.R. Technology VT SDK
vtsndtest // From V.R. Technology VT SDK
vtboxing // From V.R. Technology VT SDK
msiwwe
+msiwwea
msidd
msimpac
msisinv
@@ -32518,9 +32519,12 @@ pkunwarj // UPL-????? (c) 1985 (Arcade Game TV List - P.9
raiders5 // UPL-85004 (c) 1985
raiders5t // UPL-85004 (c) 1985 Taito license
+@source:novag_cexpert.cpp
+cexpert
+
@source:novag_cforte.cpp
-cfortea //
-cforteb //
+cfortea
+cforteb
@source:novag_const.cpp
const
@@ -40848,6 +40852,7 @@ uts20 //
@source:unk6502_st2xxx.cpp
bbl380
+rhhc152
ragc153
dphh8630
dgun2953
diff --git a/src/mame/mess.cpp b/src/mame/mess.cpp
index 160f777c044..06e49420e3b 100644
--- a/src/mame/mess.cpp
+++ b/src/mame/mess.cpp
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles
/***************************************************************************
- mess.c
+ mess.cpp
Specific (per target) constants
diff --git a/src/mame/mess.flt b/src/mame/mess.flt
index 6e0eafa6e56..5bc0b7d10c1 100644
--- a/src/mame/mess.flt
+++ b/src/mame/mess.flt
@@ -653,6 +653,7 @@ ngen.cpp
ngp.cpp
nokia_3310.cpp
notetaker.cpp
+novag_cexpert.cpp
novag_cforte.cpp
novag_const.cpp
novag_diablo.cpp