summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2015-12-30 08:18:51 +0100
committerGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2015-12-30 08:18:51 +0100
commit4afd75e2fd0fc40ae0e47ab6063e6228cd7eaabe (patch)
treea30d36789b6148002e09f8e65ff6266e21790396
parent3b0d814b9b9f890eb2ca1edc3f37c775be76ea88 (diff)
Cleanups and version bumpmame0169
-rw-r--r--hash/bbc_torch_flop.xml2
-rw-r--r--hash/bbca_cass.xml10
-rw-r--r--hash/bbcb_cass.xml4
-rw-r--r--hash/bbcb_de_cass.xml10
-rw-r--r--hash/bbcm_flop.xml2
-rw-r--r--hash/gmaster.xml2
-rw-r--r--hash/h21.xml58
-rw-r--r--hash/pico.xml16
-rw-r--r--hash/pv1000.xml2
-rw-r--r--hash/r9751.xml22
-rw-r--r--hash/saturn.xml6
-rw-r--r--hash/supracan.xml10
-rw-r--r--hash/tutor.xml14
-rw-r--r--src/devices/bus/cbm2/hrg.h2
-rw-r--r--src/devices/bus/centronics/epson_ex800.h2
-rw-r--r--src/devices/bus/gameboy/rom.h2
-rw-r--r--src/devices/bus/pet/hsg.h2
-rw-r--r--src/devices/bus/ql/cst_q_plus4.h2
-rw-r--r--src/devices/bus/ql/cst_qdisc.h2
-rw-r--r--src/devices/bus/ql/cumana_fdi.h2
-rw-r--r--src/devices/bus/ql/kempston_di.h2
-rw-r--r--src/devices/bus/ql/miracle_gold_card.h2
-rw-r--r--src/devices/bus/ql/miracle_hd.h2
-rw-r--r--src/devices/bus/ql/mp_fdi.h2
-rw-r--r--src/devices/bus/ql/opd_basic_master.h2
-rw-r--r--src/devices/bus/ql/pcml_qdisk.h2
-rw-r--r--src/devices/bus/ql/qubide.h2
-rw-r--r--src/devices/cpu/avr8/avr8.cpp4
-rw-r--r--src/devices/cpu/drcuml.cpp2
-rw-r--r--src/devices/cpu/hphybrid/hphybrid.cpp1337
-rw-r--r--src/devices/cpu/hphybrid/hphybrid.h266
-rw-r--r--src/devices/cpu/hphybrid/hphybrid_dasm.cpp377
-rw-r--r--src/devices/cpu/m68000/m68kfpu.inc2
-rw-r--r--src/devices/cpu/m6805/m6805.h2
-rw-r--r--src/devices/cpu/patinhofeio/patinho_feio.cpp935
-rw-r--r--src/devices/cpu/patinhofeio/patinho_feio.h108
-rw-r--r--src/devices/cpu/patinhofeio/patinho_feio_dasm.cpp308
-rw-r--r--src/devices/cpu/tms32051/32051ops.inc4
-rw-r--r--src/devices/cpu/tms32051/tms32051.cpp10
-rw-r--r--src/devices/cpu/tms32082/dis_mp.cpp4
-rw-r--r--src/devices/cpu/x86log.h106
-rw-r--r--src/devices/machine/i8271.cpp1
-rw-r--r--src/devices/machine/k053252.cpp12
-rw-r--r--src/devices/machine/k053252.h10
-rw-r--r--src/devices/machine/laserdsc.cpp2
-rw-r--r--src/devices/machine/pdc.cpp194
-rw-r--r--src/devices/machine/pdc.h20
-rw-r--r--src/devices/machine/pla.cpp2
-rw-r--r--src/devices/machine/tms6100.cpp2
-rw-r--r--src/devices/machine/upd765.cpp1
-rw-r--r--src/devices/machine/z80ctc.cpp2
-rw-r--r--src/devices/machine/z80scc.h2
-rw-r--r--src/devices/sound/k053260.cpp1
-rw-r--r--src/devices/sound/qs1000.cpp2
-rw-r--r--src/devices/video/315_5313.h2
-rw-r--r--src/devices/video/ef9365.cpp163
-rw-r--r--src/devices/video/ef9365.h4
-rw-r--r--src/emu/clifront.cpp2
-rw-r--r--src/emu/debug/dvmemory.cpp2
-rw-r--r--src/emu/debug/dvmemory.h4
-rw-r--r--src/emu/drivenum.h2
-rw-r--r--src/emu/input.cpp2
-rw-r--r--src/emu/ioport.cpp2
-rw-r--r--src/emu/render.cpp2
-rw-r--r--src/emu/sound.cpp4
-rw-r--r--src/lib/formats/ipf_dsk.cpp2
-rw-r--r--src/mame/arcade.lst44
-rw-r--r--src/mame/drivers/age_candy.cpp11
-rw-r--r--src/mame/drivers/amerihok.cpp11
-rw-r--r--src/mame/drivers/aquarium.cpp8
-rw-r--r--src/mame/drivers/aristmk6.cpp2
-rw-r--r--src/mame/drivers/battlera.cpp10
-rw-r--r--src/mame/drivers/cdi.cpp12
-rw-r--r--src/mame/drivers/cischeat.cpp68
-rw-r--r--src/mame/drivers/clowndwn.cpp11
-rw-r--r--src/mame/drivers/cps1.cpp2
-rw-r--r--src/mame/drivers/cps2.cpp2
-rw-r--r--src/mame/drivers/ddragon.cpp4
-rw-r--r--src/mame/drivers/dec0.cpp62
-rw-r--r--src/mame/drivers/dooyong.cpp2
-rw-r--r--src/mame/drivers/fastinvaders.cpp5
-rw-r--r--src/mame/drivers/galaxian.cpp18
-rw-r--r--src/mame/drivers/gameking.cpp40
-rw-r--r--src/mame/drivers/goldnpkr.cpp16
-rw-r--r--src/mame/drivers/hh_tms1k.cpp2
-rw-r--r--src/mame/drivers/hp9845.cpp598
-rw-r--r--src/mame/drivers/ice_bozopail.cpp11
-rw-r--r--src/mame/drivers/indigo.cpp4
-rw-r--r--src/mame/drivers/jalmah.cpp2
-rw-r--r--src/mame/drivers/klax.cpp10
-rw-r--r--src/mame/drivers/konamigx.cpp36
-rw-r--r--src/mame/drivers/laz_aftrshok.cpp15
-rw-r--r--src/mame/drivers/laz_awetoss.cpp13
-rw-r--r--src/mame/drivers/laz_ribrac.cpp11
-rw-r--r--src/mame/drivers/lethal.cpp2
-rw-r--r--src/mame/drivers/mac.cpp8
-rw-r--r--src/mame/drivers/megadriv.cpp4
-rw-r--r--src/mame/drivers/megasys1.cpp6
-rw-r--r--src/mame/drivers/namcops2.cpp6
-rw-r--r--src/mame/drivers/pacman.cpp8
-rw-r--r--src/mame/drivers/patinho_feio.cpp136
-rw-r--r--src/mame/drivers/peplus.cpp20
-rw-r--r--src/mame/drivers/pirates.cpp2
-rw-r--r--src/mame/drivers/r9751.cpp30
-rw-r--r--src/mame/drivers/rollext.cpp22
-rw-r--r--src/mame/drivers/rungun.cpp42
-rw-r--r--src/mame/drivers/sansa_fuze.cpp4
-rw-r--r--src/mame/drivers/scm_500.cpp4
-rw-r--r--src/mame/drivers/segajw.cpp8
-rw-r--r--src/mame/drivers/snesb.cpp2
-rw-r--r--src/mame/drivers/spc1000.cpp4
-rw-r--r--src/mame/drivers/squale.cpp2
-rw-r--r--src/mame/drivers/sslam.cpp2
-rw-r--r--src/mame/drivers/st17xx.cpp38
-rw-r--r--src/mame/drivers/subsino2.cpp4
-rw-r--r--src/mame/drivers/sun3.cpp4
-rw-r--r--src/mame/drivers/taitopjc.cpp32
-rw-r--r--src/mame/drivers/tasman.cpp26
-rw-r--r--src/mame/drivers/tekxp33x.cpp46
-rw-r--r--src/mame/drivers/tispellb.cpp22
-rw-r--r--src/mame/drivers/tvcapcom.cpp7
-rw-r--r--src/mame/drivers/wecleman.cpp4
-rw-r--r--src/mame/etc/template_driver.cpp4
-rw-r--r--src/mame/includes/aquarium.h2
-rw-r--r--src/mame/includes/cclimber.h2
-rw-r--r--src/mame/includes/cps1.h14
-rw-r--r--src/mame/includes/namcos22.h2
-rw-r--r--src/mame/includes/rungun.h24
-rw-r--r--src/mame/includes/tnzs.h2
-rw-r--r--src/mame/layout/captflag.lay180
-rw-r--r--src/mame/layout/rungun_dual.lay34
-rw-r--r--src/mame/machine/315-5881_crypt.cpp2
-rw-r--r--src/mame/machine/amstrad.cpp2
-rw-r--r--src/mame/machine/fd1094.cpp1
-rw-r--r--src/mame/machine/gdrom.cpp126
-rw-r--r--src/mame/machine/mac.cpp8
-rw-r--r--src/mame/machine/naomigd.cpp2
-rw-r--r--src/mame/machine/playch10.cpp2
-rw-r--r--src/mame/machine/scramble.cpp2
-rw-r--r--src/mame/mess.lst2
-rw-r--r--src/mame/video/aquarium.cpp2
-rw-r--r--src/mame/video/cischeat.cpp2
-rw-r--r--src/mame/video/dooyong.cpp10
-rw-r--r--src/mame/video/galastrm.cpp12
-rw-r--r--src/mame/video/gime.h2
-rw-r--r--src/mame/video/k001604.cpp2
-rw-r--r--src/mame/video/k053936.cpp2
-rw-r--r--src/mame/video/k055555.cpp2
-rw-r--r--src/mame/video/konamigx.cpp12
-rw-r--r--src/mame/video/legionna.cpp4
-rw-r--r--src/mame/video/megasys1.cpp18
-rw-r--r--src/mame/video/rungun.cpp12
-rw-r--r--src/mame/video/segaybd.cpp4
-rw-r--r--src/mame/video/seibu_crtc.h6
-rw-r--r--src/mame/video/tc0780fpa.cpp16
-rw-r--r--src/mame/video/tc0780fpa.h2
-rw-r--r--src/mame/video/tecmo_mix.cpp4
-rw-r--r--src/osd/modules/debugger/debugint.cpp28
-rw-r--r--src/osd/modules/render/d3d/d3dhlsl.cpp2
-rw-r--r--src/tools/chdman.cpp1
-rw-r--r--src/version.cpp2
161 files changed, 3071 insertions, 3103 deletions
diff --git a/hash/bbc_torch_flop.xml b/hash/bbc_torch_flop.xml
index 814ea9b21aa..dbb14dcf101 100644
--- a/hash/bbc_torch_flop.xml
+++ b/hash/bbc_torch_flop.xml
@@ -89,7 +89,7 @@
</dataarea>
</part>
</software>
-
+
<software name="perfect" supported="no">
<description>Perfect Software Suite</description>
<year>1983</year>
diff --git a/hash/bbca_cass.xml b/hash/bbca_cass.xml
index 9cef00350d2..7f4c30586e5 100644
--- a/hash/bbca_cass.xml
+++ b/hash/bbca_cass.xml
@@ -343,7 +343,7 @@
</dataarea>
</part>
</software>
-
+
<software name="zombies">
<description>Zombies</description>
<year>1982</year>
@@ -356,7 +356,7 @@
</software>
<!-- Business -->
-
+
<software name="dskdiary">
<description>Desk Diary</description>
<year>1982</year>
@@ -408,7 +408,7 @@
</software>
<!-- Languages -->
-
+
<software name="lisp">
<description>LISP</description>
<year>1982</year>
@@ -422,7 +422,7 @@
</software>
<!-- Graphics and other -->
-
+
<software name="crgraph">
<description>Creative Graphics</description>
<year>1982</year>
@@ -434,5 +434,5 @@
</dataarea>
</part>
</software>
-
+
</softwarelist>
diff --git a/hash/bbcb_cass.xml b/hash/bbcb_cass.xml
index 9a376b30c82..7cce513ba03 100644
--- a/hash/bbcb_cass.xml
+++ b/hash/bbcb_cass.xml
@@ -1295,7 +1295,7 @@
</dataarea>
</part>
</software>
-
+
<software name="bcbill">
<description>BC Bill</description>
<year>1984</year>
@@ -2334,7 +2334,7 @@
</dataarea>
</part>
</software>
-
+
<software name="chessmp">
<description>Chess (Micro Power)</description>
<year>198?</year>
diff --git a/hash/bbcb_de_cass.xml b/hash/bbcb_de_cass.xml
index 39154837980..e790c50f313 100644
--- a/hash/bbcb_de_cass.xml
+++ b/hash/bbcb_de_cass.xml
@@ -138,7 +138,7 @@
</dataarea>
</part>
</software>
-
+
<software name="busgames">
<description>Managementspiele (Ger)</description>
<year>1982</year>
@@ -150,7 +150,7 @@
</dataarea>
</part>
</software>
-
+
<software name="missigns">
<description>Fehlende Zeichen (Ger)</description>
<year>1983</year>
@@ -162,7 +162,7 @@
</dataarea>
</part>
</software>
-
+
<software name="numberbg">
<description>Zahlenwaage (Ger)</description>
<year>198?</year>
@@ -221,7 +221,7 @@
</dataarea>
</part>
</software>
-
+
<software name="wordseqg">
<description>Wortsalat (Ger)</description>
<year>1983</year>
@@ -233,5 +233,5 @@
</dataarea>
</part>
</software>
-
+
</softwarelist>
diff --git a/hash/bbcm_flop.xml b/hash/bbcm_flop.xml
index 81040941d2f..d020fbcfc17 100644
--- a/hash/bbcm_flop.xml
+++ b/hash/bbcm_flop.xml
@@ -37,7 +37,7 @@
</dataarea>
</part>
</software>
-
+
<software name="fsdd">
<description>FileStore Dealer Test Disc</description>
<year>1986</year>
diff --git a/hash/gmaster.xml b/hash/gmaster.xml
index dcb6d1539da..cdec418a14a 100644
--- a/hash/gmaster.xml
+++ b/hash/gmaster.xml
@@ -54,7 +54,7 @@ Undumped:
</part>
</software>
- <software name="fussball" supported ="partial"> <!-- some gfx corruption -->
+ <software name="fussball" supported ="partial"> <!-- some gfx corruption -->
<description>3-on-3 Soccer (Fuss-ball)</description>
<year>1990</year>
<publisher>Hartung</publisher>
diff --git a/hash/h21.xml b/hash/h21.xml
index 41cb66d746f..d3a57f82e5c 100644
--- a/hash/h21.xml
+++ b/hash/h21.xml
@@ -4,21 +4,21 @@
<softwarelist name="h21" description="TRQ Video Computer H-21 cartridges">
<!--
-
+
TRQ distributed a total of 24 games for this system. The only exclusive title
appears to be "Come frutas", the rest of the games are copies of the respective
VC-4000 games.
-
+
TODO: Verify and add the rest of the games.
- 1 Millón electrónico
- 2 Guerra de tanques y aviones
- 3 Batalla aero-naval
- 4 Invasores
- 5 Guerra de las galaxias
- 6 Circo
-
- -->
+ 1 Millón electrónico
+ 2 Guerra de tanques y aviones
+ 3 Batalla aero-naval
+ 4 Invasores
+ 5 Guerra de las galaxias
+ 6 Circo
+
+ -->
<software name="comefrut" supported="no">
<description>Come frutas</description>
@@ -34,25 +34,25 @@
</software>
<!--
-
- 8 En busca del tesoro / Memoria
- 9 Caza
- 10 Othello
- 11 Super-Sport 60
- 12 Fútbol
- 13 Carrera de caballos
- 14 Las 4 en raya
- 15 Master-Mind (Código Secreto)
- 16 Carreras de coches
- 17 Laberinto
- 18 Boxeo
- 19 Juego de cartas / Black Jack
- 20 Órgano musical / Simon
- 21 Golf
- 22 Matemáticas I
- 23 Matemáticas II
- 24 Crazy Spider. La araña loca
-
+
+ 8 En busca del tesoro / Memoria
+ 9 Caza
+ 10 Othello
+ 11 Super-Sport 60
+ 12 Fútbol
+ 13 Carrera de caballos
+ 14 Las 4 en raya
+ 15 Master-Mind (Código Secreto)
+ 16 Carreras de coches
+ 17 Laberinto
+ 18 Boxeo
+ 19 Juego de cartas / Black Jack
+ 20 Órgano musical / Simon
+ 21 Golf
+ 22 Matemáticas I
+ 23 Matemáticas II
+ 24 Crazy Spider. La araña loca
+
-->
</softwarelist>
diff --git a/hash/pico.xml b/hash/pico.xml
index 0c142f437f3..71ba190c791 100644
--- a/hash/pico.xml
+++ b/hash/pico.xml
@@ -1813,18 +1813,18 @@ Published by Others (T-yyy*** serial codes, for yyy depending on the publisher)
</part>
</software>
- <software name="heiseiky">
+ <software name="heiseiky">
<description>Heisei Kyouiku Iinkai Jr. Mezase Yuutousei (Jpn)</description>
<year>1995</year>
<publisher>Imagineer</publisher>
<part name="cart" interface="pico_cart">
- <feature name="pcb" value="171-6882A" />
+ <feature name="pcb" value="171-6882A" />
<dataarea name="rom" size="524288">
<rom name="mpr-18565-t.ic1" size="524288" crc="8ba23bbe" sha1="85e6ed98f5e7bfa04c1b099bba79ddd34ccdd40e" offset="000000" loadflag="load16_word_swap" />
</dataarea>
</part>
- </software>
-
+ </software>
+
<software name="hellokcs">
<description>Hello Kitty no Castelo (Bra)</description>
<year>19??</year>
@@ -4628,7 +4628,7 @@ But how do later protos fit with this theory? Maybe the later protos were from t
</part>
</software>
- <software name="tomicarp">
+ <software name="tomicarp">
<description>Tomica Pico Rescue Parking ~Shokai-Tomica Fuzoku~ (Jpn)</description>
<year>2002</year>
<publisher>Sega Toys</publisher>
@@ -4637,8 +4637,8 @@ But how do later protos fit with this theory? Maybe the later protos were from t
<rom name="9v1-0014ar2" size="2097152" crc="3e53c515" sha1="fff0d70882c10adab3065bebe4ce07aee690f674" offset="000000" loadflag="load16_word_swap" />
</dataarea>
</part>
- </software>
-
+ </software>
+
<software name="hamtnaka">
<description>Tottoko Hamtaro - Haru-Natsu-Aki-Fuyu - Tottoko Nakayoshi! Ham Chance! (Jpn)</description>
<year>2001</year>
@@ -5102,7 +5102,7 @@ But how do later protos fit with this theory? Maybe the later protos were from t
</dataarea>
</part>
</software>
-
+
<software name="hucklowlp" cloneof="hucklowl">
<description>Huckle and Lowly's Busiest Day Ever (Prototype, 19941004)</description>
<year>1994</year>
diff --git a/hash/pv1000.xml b/hash/pv1000.xml
index 1355fa63d72..bd1e69893c2 100644
--- a/hash/pv1000.xml
+++ b/hash/pv1000.xml
@@ -115,7 +115,7 @@ Undumped carts:
</dataarea>
</part>
</software>
-
+
<software name="fightbug" supported="no">
<description>Fighting Bug</description>
<year>1982</year>
diff --git a/hash/r9751.xml b/hash/r9751.xml
index 1294f24f19b..efbe745b455 100644
--- a/hash/r9751.xml
+++ b/hash/r9751.xml
@@ -1,20 +1,20 @@
<?xml version="1.0"?>
<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
<!--
- ROLM 9751 CBX Software
+ ROLM 9751 CBX Software
- Releases known: 9004, 9005
+ Releases known: 9004, 9005
- 9005.6.84 - Last software release (1998)
- Install disks (7)
- Disktool
- Mini Patch Volume MPV4-84
- Additional fixes up to year 2000
- RPDN Loadware
+ 9005.6.84 - Last software release (1998)
+ Install disks (7)
+ Disktool
+ Mini Patch Volume MPV4-84
+ Additional fixes up to year 2000
+ RPDN Loadware
+
+ 9005.6.82 (1995)
- 9005.6.82 (1995)
-
-->
<softwarelist name="r9751" description="ROLM CBX 9751 floppy disk images">
<software name="cbxr5684">
@@ -37,7 +37,7 @@
<feature name="part_id" value="Disk 3" />
<dataarea name="flop" size="1474560">
<rom name="Siemens.9751.CBX.Release.9005.6.84.Disk3.img" size="1474560" crc="2c0226e2" sha1="08fca05de78e6325881deb3f062235a7bcc4ea10" offset="0" />
- </dataarea>
+ </dataarea>
</part>
<part name="flop4" interface="floppy_3_5">
<feature name="part_id" value="Disk 4" />
diff --git a/hash/saturn.xml b/hash/saturn.xml
index dc4cdda9cde..c7fed414bbe 100644
--- a/hash/saturn.xml
+++ b/hash/saturn.xml
@@ -38970,9 +38970,9 @@ Olympic Soccer (Fra) T-7904H-09
</part>
</software>
- <!-- input / output cue/bin verified identical as of CHDMAN change made around 28th Dec 2015, except for
- the 'ISRC 904002100272' metadata line after 'TRACK 24 AUDIO' being ommitted from the cuesheet, we don't
- store that information -->
+ <!-- input / output cue/bin verified identical as of CHDMAN change made around 28th Dec 2015, except for
+ the 'ISRC 904002100272' metadata line after 'TRACK 24 AUDIO' being ommitted from the cuesheet, we don't
+ store that information -->
<software name="raymanp" supported="no"> <!-- the header lists 19950424, but elsewhere there are date stamps of 19950720 -->
<description>Rayman (Prototype 19950720)</description>
<year>1995</year>
diff --git a/hash/supracan.xml b/hash/supracan.xml
index 80b0c347744..1b78e31a3de 100644
--- a/hash/supracan.xml
+++ b/hash/supracan.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
<softwarelist name="supracan" description="Funtech Super A'Can cartridges">
-
-
- <!-- appears to work, but gameplay logic is broken, attack pieces don't drop down, game can get stuck, can sometimes rotate pieces through other pieces too! -->
- <software name="formduel" supported="no"> <!-- F001 - 福爾摩沙大對決 (Formosa Da Dui Jue) - aka Formosa Duel -->
+
+
+ <!-- appears to work, but gameplay logic is broken, attack pieces don't drop down, game can get stuck, can sometimes rotate pieces through other pieces too! -->
+ <software name="formduel" supported="no"> <!-- F001 - 福爾摩沙大對決 (Formosa Da Dui Jue) - aka Formosa Duel -->
<description>Formosa Duel</description>
<year>1995</year>
<publisher>AV Artisan Corp.</publisher>
@@ -15,7 +15,7 @@
</dataarea>
</part>
</software>
-
+
<software name="sangofgt">
<description>Sango Fighter ~ Wu Jiang Zheng Ba - San Guo Zhi</description>
<year>1995</year>
diff --git a/hash/tutor.xml b/hash/tutor.xml
index ffe1da2ec6e..703aa282658 100644
--- a/hash/tutor.xml
+++ b/hash/tutor.xml
@@ -88,11 +88,11 @@ Battlefighter (Original) (Unreleased - Prototype Stage)
<info name="serial" value="021E"/>
<part name="cart" interface="tutor_cart">
<dataarea name="rom" size="0x4000">
- <rom name="Yonnin Majan.bin" size="0x4000" crc="1c2eb2f0" sha1="4e9a0ce55f479c4b1a5fee9320561ce93765c4d7" offset="0" /> <!-- needs splitting into 2 files? there are 2 roms, marked 1 and 2 in the cart?? -->
+ <rom name="Yonnin Majan.bin" size="0x4000" crc="1c2eb2f0" sha1="4e9a0ce55f479c4b1a5fee9320561ce93765c4d7" offset="0" /> <!-- needs splitting into 2 files? there are 2 roms, marked 1 and 2 in the cart?? -->
</dataarea>
</part>
</software>
-
+
<software name="baseball">
<description>Baseball (Jpn)</description>
<year>1984</year>
@@ -105,7 +105,7 @@ Battlefighter (Original) (Unreleased - Prototype Stage)
</dataarea>
</part>
</software>
-
+
<software name="bombman">
<description>Bombman (Jpn)</description>
<year>1982</year>
@@ -131,7 +131,7 @@ Battlefighter (Original) (Unreleased - Prototype Stage)
</part>
</software>
- <!-- Crawlers and Maze Patrol are confirmed as using the exact same ROM data -->
+ <!-- Crawlers and Maze Patrol are confirmed as using the exact same ROM data -->
<software name="crawlers">
<!-- Stock No: 8100, Clone of Maze Patrol (Japanese 017E)-->
<description>Cave Crawlers (USA) / Maze Patrol (Jpn)</description>
@@ -145,7 +145,7 @@ Battlefighter (Original) (Unreleased - Prototype Stage)
</dataarea>
</part>
</software>
-
+
<software name="deepsix" cloneof="marinadv">
<description>Deep Six (USA)</description>
<year>1983</year>
@@ -375,7 +375,7 @@ Battlefighter (Original) (Unreleased - Prototype Stage)
</part>
</software>
- <!-- Torpedo and Bermuda Triangle are confirmed as using the exact same ROM data -->
+ <!-- Torpedo and Bermuda Triangle are confirmed as using the exact same ROM data -->
<software name="torpedo">
<!-- Stock No: 8101, Clone of Bermuda Triangle (Japanese 020E)-->
<description>Torpedo Terror (USA) / Bermuda Triangle (Jpn)</description>
@@ -389,7 +389,7 @@ Battlefighter (Original) (Unreleased - Prototype Stage)
</dataarea>
</part>
</software>
-
+
<software name="trafjam">
<!-- Stock No: 8103, (Japanese 010E)-->
<description>Traffic Jam (Jpn)</description>
diff --git a/src/devices/bus/cbm2/hrg.h b/src/devices/bus/cbm2/hrg.h
index 25f68a5c7a2..61773cbc559 100644
--- a/src/devices/bus/cbm2/hrg.h
+++ b/src/devices/bus/cbm2/hrg.h
@@ -28,7 +28,7 @@ class cbm2_graphic_cartridge_device : public device_t,
public:
// construction/destruction
cbm2_graphic_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
-
+
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/centronics/epson_ex800.h b/src/devices/bus/centronics/epson_ex800.h
index 26d862cf098..2b28229c0df 100644
--- a/src/devices/bus/centronics/epson_ex800.h
+++ b/src/devices/bus/centronics/epson_ex800.h
@@ -30,7 +30,7 @@ class epson_ex800_t : public device_t,
public:
// construction/destruction
epson_ex800_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/gameboy/rom.h b/src/devices/bus/gameboy/rom.h
index 80fedd7a838..343d30195b0 100644
--- a/src/devices/bus/gameboy/rom.h
+++ b/src/devices/bus/gameboy/rom.h
@@ -44,7 +44,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_rom) override;
virtual DECLARE_READ8_MEMBER(read_ram) override;
virtual DECLARE_WRITE8_MEMBER(write_ram) override;
-
+
UINT16 m_tama5_data, m_tama5_addr, m_tama5_cmd;
UINT8 m_regs[32];
UINT8 m_rtc_reg;
diff --git a/src/devices/bus/pet/hsg.h b/src/devices/bus/pet/hsg.h
index 30f958f74b1..1562eadedd3 100644
--- a/src/devices/bus/pet/hsg.h
+++ b/src/devices/bus/pet/hsg.h
@@ -28,7 +28,7 @@ class cbm8000_hsg_t : public device_t,
public:
// construction/destruction
cbm8000_hsg_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
-
+
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ql/cst_q_plus4.h b/src/devices/bus/ql/cst_q_plus4.h
index 03ba20bef06..eba0f3ac712 100644
--- a/src/devices/bus/ql/cst_q_plus4.h
+++ b/src/devices/bus/ql/cst_q_plus4.h
@@ -28,7 +28,7 @@ class cst_q_plus4_t : public device_t,
public:
// construction/destruction
cst_q_plus4_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/ql/cst_qdisc.h b/src/devices/bus/ql/cst_qdisc.h
index 35fe9f6e257..d2ddae10b2e 100644
--- a/src/devices/bus/ql/cst_qdisc.h
+++ b/src/devices/bus/ql/cst_qdisc.h
@@ -27,7 +27,7 @@ class cst_ql_disc_interface_t : public device_t,
public:
// construction/destruction
cst_ql_disc_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ql/cumana_fdi.h b/src/devices/bus/ql/cumana_fdi.h
index eb9c75f991e..9ac1b9ba01e 100644
--- a/src/devices/bus/ql/cumana_fdi.h
+++ b/src/devices/bus/ql/cumana_fdi.h
@@ -27,7 +27,7 @@ class cumana_floppy_disk_interface_t : public device_t,
public:
// construction/destruction
cumana_floppy_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ql/kempston_di.h b/src/devices/bus/ql/kempston_di.h
index 97082e1a68e..041bdc65544 100644
--- a/src/devices/bus/ql/kempston_di.h
+++ b/src/devices/bus/ql/kempston_di.h
@@ -27,7 +27,7 @@ class kempston_disk_interface_t : public device_t,
public:
// construction/destruction
kempston_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ql/miracle_gold_card.h b/src/devices/bus/ql/miracle_gold_card.h
index c60f490c6d9..176f7556fdf 100644
--- a/src/devices/bus/ql/miracle_gold_card.h
+++ b/src/devices/bus/ql/miracle_gold_card.h
@@ -27,7 +27,7 @@ class miracle_gold_card_t : public device_t,
public:
// construction/destruction
miracle_gold_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ql/miracle_hd.h b/src/devices/bus/ql/miracle_hd.h
index 7c24af7aa95..c4aeaa6d74b 100644
--- a/src/devices/bus/ql/miracle_hd.h
+++ b/src/devices/bus/ql/miracle_hd.h
@@ -27,7 +27,7 @@ class miracle_hard_disk_t : public device_t,
public:
// construction/destruction
miracle_hard_disk_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ql/mp_fdi.h b/src/devices/bus/ql/mp_fdi.h
index a064ffcff86..57681f30d28 100644
--- a/src/devices/bus/ql/mp_fdi.h
+++ b/src/devices/bus/ql/mp_fdi.h
@@ -27,7 +27,7 @@ class micro_peripherals_floppy_disk_interface_t : public device_t,
public:
// construction/destruction
micro_peripherals_floppy_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ql/opd_basic_master.h b/src/devices/bus/ql/opd_basic_master.h
index 793bfeb9370..16608210cf2 100644
--- a/src/devices/bus/ql/opd_basic_master.h
+++ b/src/devices/bus/ql/opd_basic_master.h
@@ -27,7 +27,7 @@ class opd_basic_master_t : public device_t,
public:
// construction/destruction
opd_basic_master_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ql/pcml_qdisk.h b/src/devices/bus/ql/pcml_qdisk.h
index 47cbe4ab85e..29a011b7455 100644
--- a/src/devices/bus/ql/pcml_qdisk.h
+++ b/src/devices/bus/ql/pcml_qdisk.h
@@ -27,7 +27,7 @@ class pcml_q_disk_interface_t : public device_t,
public:
// construction/destruction
pcml_q_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ql/qubide.h b/src/devices/bus/ql/qubide.h
index d64b05cf742..f8a363b55a2 100644
--- a/src/devices/bus/ql/qubide.h
+++ b/src/devices/bus/ql/qubide.h
@@ -28,7 +28,7 @@ class qubide_t : public device_t,
public:
// construction/destruction
qubide_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/cpu/avr8/avr8.cpp b/src/devices/cpu/avr8/avr8.cpp
index 085700da53f..f8f357a2a9b 100644
--- a/src/devices/cpu/avr8/avr8.cpp
+++ b/src/devices/cpu/avr8/avr8.cpp
@@ -1316,7 +1316,7 @@ void avr8_device::timer1_tick()
//UINT8 compare_mode[2] = { (m_r[AVR8_REGIDX_TCCR1A] & AVR8_TCCR1A_COM1A_MASK) >> AVR8_TCCR1A_COM1A_SHIFT,
//(m_r[AVR8_REGIDX_TCCR1A] & AVR8_TCCR1A_COM1B_MASK) >> AVR8_TCCR1A_COM1B_SHIFT };
UINT16 ocr1[2] = { static_cast<UINT16>((m_r[AVR8_REGIDX_OCR1AH] << 8) | m_r[AVR8_REGIDX_OCR1AL]),
- static_cast<UINT16>((m_r[AVR8_REGIDX_OCR1BH] << 8) | m_r[AVR8_REGIDX_OCR1BL]) };
+ static_cast<UINT16>((m_r[AVR8_REGIDX_OCR1BH] << 8) | m_r[AVR8_REGIDX_OCR1BL]) };
UINT8 ocf1[2] = { (1 << AVR8_TIFR1_OCF1A_SHIFT), (1 << AVR8_TIFR1_OCF1B_SHIFT) };
UINT8 int1[2] = { AVR8_INTIDX_OCF1A, AVR8_INTIDX_OCF1B };
INT32 increment = m_timer_increment[1];
@@ -1712,7 +1712,7 @@ void avr8_device::timer4_tick()
//UINT8 compare_mode[2] = { (m_r[AVR8_REGIDX_TCCR1A] & AVR8_TCCR1A_COM1A_MASK) >> AVR8_TCCR1A_COM1A_SHIFT,
//(m_r[AVR8_REGIDX_TCCR1A] & AVR8_TCCR1A_COM1B_MASK) >> AVR8_TCCR1A_COM1B_SHIFT };
UINT16 ocr4[2] = { static_cast<UINT16>((m_r[AVR8_REGIDX_OCR4AH] << 8) | m_r[AVR8_REGIDX_OCR4AL]),
- static_cast<UINT16>((m_r[AVR8_REGIDX_OCR4BH] << 8) | m_r[AVR8_REGIDX_OCR4BL]) };
+ static_cast<UINT16>((m_r[AVR8_REGIDX_OCR4BH] << 8) | m_r[AVR8_REGIDX_OCR4BL]) };
//TODO UINT8 ocf4[2] = { (1 << AVR8_TIFR4_OCF4A_SHIFT), (1 << AVR8_TIFR4_OCF4B_SHIFT) };
//TODO UINT8 int4[2] = { AVR8_INTIDX_OCF4A, AVR8_INTIDX_OCF4B };
INT32 increment = m_timer_increment[4];
diff --git a/src/devices/cpu/drcuml.cpp b/src/devices/cpu/drcuml.cpp
index 921d09d30bd..4cf2fc981c0 100644
--- a/src/devices/cpu/drcuml.cpp
+++ b/src/devices/cpu/drcuml.cpp
@@ -126,7 +126,7 @@ drcuml_state::drcuml_state(device_t &device, drc_cache &cache, UINT32 flags, int
std::unique_ptr<drcbe_interface>{ std::make_unique<drcbe_native>(*this, device, cache, flags, modes, addrbits, ignorebits) }),
m_beintf(*m_drcbe_interface.get()),
m_umllog(nullptr)
-{
+{
// if we're to log, create the logfile
if (device.machine().options().drc_log_uml())
{
diff --git a/src/devices/cpu/hphybrid/hphybrid.cpp b/src/devices/cpu/hphybrid/hphybrid.cpp
index ddfd740d90b..855931b59ee 100644
--- a/src/devices/cpu/hphybrid/hphybrid.cpp
+++ b/src/devices/cpu/hphybrid/hphybrid.cpp
@@ -18,21 +18,21 @@ enum {
HPHYBRID_DMAMA,
HPHYBRID_DMAC,
HPHYBRID_I,
- HPHYBRID_W,
- HPHYBRID_AR2,
- HPHYBRID_AR2_2,
- HPHYBRID_AR2_3,
- HPHYBRID_AR2_4,
- HPHYBRID_SE,
- HPHYBRID_R25,
- HPHYBRID_R26,
- HPHYBRID_R27,
- HPHYBRID_R32,
- HPHYBRID_R33,
- HPHYBRID_R34,
- HPHYBRID_R35,
- HPHYBRID_R36,
- HPHYBRID_R37
+ HPHYBRID_W,
+ HPHYBRID_AR2,
+ HPHYBRID_AR2_2,
+ HPHYBRID_AR2_3,
+ HPHYBRID_AR2_4,
+ HPHYBRID_SE,
+ HPHYBRID_R25,
+ HPHYBRID_R26,
+ HPHYBRID_R27,
+ HPHYBRID_R32,
+ HPHYBRID_R33,
+ HPHYBRID_R34,
+ HPHYBRID_R35,
+ HPHYBRID_R36,
+ HPHYBRID_R37
};
#define BIT_MASK(n) (1U << (n))
@@ -84,36 +84,36 @@ WRITE_LINE_MEMBER(hp_hybrid_cpu_device::dmar_w)
WRITE_LINE_MEMBER(hp_hybrid_cpu_device::halt_w)
{
- if (state) {
- BIT_SET(m_flags , HPHYBRID_HALT_BIT);
- } else {
- BIT_CLR(m_flags , HPHYBRID_HALT_BIT);
- }
+ if (state) {
+ BIT_SET(m_flags , HPHYBRID_HALT_BIT);
+ } else {
+ BIT_CLR(m_flags , HPHYBRID_HALT_BIT);
+ }
}
WRITE_LINE_MEMBER(hp_hybrid_cpu_device::status_w)
{
- if (state) {
- BIT_SET(m_flags , HPHYBRID_STS_BIT);
- } else {
- BIT_CLR(m_flags , HPHYBRID_STS_BIT);
- }
+ if (state) {
+ BIT_SET(m_flags , HPHYBRID_STS_BIT);
+ } else {
+ BIT_CLR(m_flags , HPHYBRID_STS_BIT);
+ }
}
WRITE_LINE_MEMBER(hp_hybrid_cpu_device::flag_w)
{
- if (state) {
- BIT_SET(m_flags , HPHYBRID_FLG_BIT);
- } else {
- BIT_CLR(m_flags , HPHYBRID_FLG_BIT);
- }
+ if (state) {
+ BIT_SET(m_flags , HPHYBRID_FLG_BIT);
+ } else {
+ BIT_CLR(m_flags , HPHYBRID_FLG_BIT);
+ }
}
hp_hybrid_cpu_device::hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname , UINT8 addrwidth)
- : cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
- m_pa_changed_func(*this),
- m_program_config("program", ENDIANNESS_BIG, 16, addrwidth, -1),
- m_io_config("io", ENDIANNESS_BIG, 16, 6, -1)
+ : cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
+ m_pa_changed_func(*this),
+ m_program_config("program", ENDIANNESS_BIG, 16, addrwidth, -1),
+ m_io_config("io", ENDIANNESS_BIG, 16, 6, -1)
{
}
@@ -129,13 +129,13 @@ void hp_hybrid_cpu_device::device_start()
m_reg_PA[ 0 ] = 0;
m_reg_PA[ 1 ] = 0;
m_reg_PA[ 2 ] = 0;
- m_reg_W = 0;
+ m_reg_W = 0;
m_flags = 0;
m_dmapa = 0;
m_dmama = 0;
m_dmac = 0;
m_reg_I = 0;
- m_forced_bsc_25 = false;
+ m_forced_bsc_25 = false;
{
state_add(HPHYBRID_A, "A", m_reg_A);
@@ -148,7 +148,7 @@ void hp_hybrid_cpu_device::device_start()
state_add(STATE_GENSP, "GENSP", m_reg_R).noshow();
state_add(HPHYBRID_IV, "IV", m_reg_IV);
state_add(HPHYBRID_PA, "PA", m_reg_PA[ 0 ]);
- state_add(HPHYBRID_W, "W", m_reg_W).noshow();
+ state_add(HPHYBRID_W, "W", m_reg_W).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).noshow().formatstr("%9s");
state_add(HPHYBRID_DMAPA , "DMAPA" , m_dmapa).noshow();
state_add(HPHYBRID_DMAMA , "DMAMA" , m_dmama).noshow();
@@ -170,17 +170,17 @@ void hp_hybrid_cpu_device::device_start()
save_item(NAME(m_reg_PA[0]));
save_item(NAME(m_reg_PA[1]));
save_item(NAME(m_reg_PA[2]));
- save_item(NAME(m_reg_W));
+ save_item(NAME(m_reg_W));
save_item(NAME(m_flags));
save_item(NAME(m_dmapa));
save_item(NAME(m_dmama));
save_item(NAME(m_dmac));
save_item(NAME(m_reg_I));
- save_item(NAME(m_forced_bsc_25));
+ save_item(NAME(m_forced_bsc_25));
m_icountptr = &m_icount;
- m_pa_changed_func.resolve_safe();
+ m_pa_changed_func.resolve_safe();
}
void hp_hybrid_cpu_device::device_reset()
@@ -506,11 +506,11 @@ UINT16 hp_hybrid_cpu_device::execute_one_sub(UINT16 opcode)
if (BIT(m_flags , HPHYBRID_IRH_SVC_BIT)) {
BIT_CLR(m_flags , HPHYBRID_IRH_SVC_BIT);
memmove(&m_reg_PA[ 0 ] , &m_reg_PA[ 1 ] , HPHYBRID_INT_LVLS);
- m_pa_changed_func((UINT8)CURRENT_PA);
+ m_pa_changed_func((UINT8)CURRENT_PA);
} else if (BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) {
BIT_CLR(m_flags , HPHYBRID_IRL_SVC_BIT);
memmove(&m_reg_PA[ 0 ] , &m_reg_PA[ 1 ] , HPHYBRID_INT_LVLS);
- m_pa_changed_func((UINT8)CURRENT_PA);
+ m_pa_changed_func((UINT8)CURRENT_PA);
}
}
tmp = RM(AEC_CASE_C , m_reg_R--) + (opcode & 0x1f);
@@ -604,14 +604,14 @@ UINT16 hp_hybrid_cpu_device::execute_one_sub(UINT16 opcode)
break;
default:
- // Unrecognized instruction: pass it on for further processing (by EMC if present)
- return execute_no_bpc_ioc(opcode);
- }
- }
- }
- }
- }
- }
+ // Unrecognized instruction: pass it on for further processing (by EMC if present)
+ return execute_no_bpc_ioc(opcode);
+ }
+ }
+ }
+ }
+ }
+ }
return m_reg_P + 1;
}
@@ -635,204 +635,204 @@ offs_t hp_hybrid_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const U
UINT16 hp_hybrid_cpu_device::remove_mae(UINT32 addr)
{
- return (UINT16)(addr & 0xffff);
+ return (UINT16)(addr & 0xffff);
}
UINT16 hp_hybrid_cpu_device::RM(aec_cases_t aec_case , UINT16 addr)
{
- return RM(add_mae(aec_case , addr));
+ return RM(add_mae(aec_case , addr));
}
UINT16 hp_hybrid_cpu_device::RM(UINT32 addr)
{
- UINT16 tmp;
- UINT16 addr_wo_bsc = remove_mae(addr);
-
- if (addr_wo_bsc <= HP_REG_LAST_ADDR) {
- // Any access to internal registers removes forcing of BSC 2x
- m_forced_bsc_25 = false;
-
- // Memory mapped registers that are present in both 3001 & 3011
- switch (addr_wo_bsc) {
- case HP_REG_A_ADDR:
- return m_reg_A;
-
- case HP_REG_B_ADDR:
- return m_reg_B;
-
- case HP_REG_P_ADDR:
- return m_reg_P;
-
- case HP_REG_R_ADDR:
- return m_reg_R;
-
- case HP_REG_R4_ADDR:
- case HP_REG_R5_ADDR:
- case HP_REG_R6_ADDR:
- case HP_REG_R7_ADDR:
- return RIO(CURRENT_PA , addr_wo_bsc - HP_REG_R4_ADDR);
-
- case HP_REG_IV_ADDR:
- // Correct?
- if (!BIT(m_flags , HPHYBRID_IRH_SVC_BIT) && !BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) {
- return m_reg_IV;
- } else {
- return m_reg_IV | CURRENT_PA;
- }
-
- case HP_REG_PA_ADDR:
- return CURRENT_PA;
-
- case HP_REG_W_ADDR:
- return m_reg_W;
-
- case HP_REG_DMAPA_ADDR:
- tmp = m_dmapa & HP_REG_PA_MASK;
- if (BIT(m_flags , HPHYBRID_CB_BIT)) {
- BIT_SET(tmp , 15);
- }
- if (BIT(m_flags , HPHYBRID_DB_BIT)) {
- BIT_SET(tmp , 14);
- }
- return tmp;
-
- case HP_REG_DMAMA_ADDR:
- return m_dmama;
-
- case HP_REG_DMAC_ADDR:
- return m_dmac;
-
- case HP_REG_C_ADDR:
- return m_reg_C;
-
- case HP_REG_D_ADDR:
- return m_reg_D;
-
- default:
- return read_non_common_reg(addr_wo_bsc);
- }
- } else {
- return m_direct->read_word(addr << 1);
- }
+ UINT16 tmp;
+ UINT16 addr_wo_bsc = remove_mae(addr);
+
+ if (addr_wo_bsc <= HP_REG_LAST_ADDR) {
+ // Any access to internal registers removes forcing of BSC 2x
+ m_forced_bsc_25 = false;
+
+ // Memory mapped registers that are present in both 3001 & 3011
+ switch (addr_wo_bsc) {
+ case HP_REG_A_ADDR:
+ return m_reg_A;
+
+ case HP_REG_B_ADDR:
+ return m_reg_B;
+
+ case HP_REG_P_ADDR:
+ return m_reg_P;
+
+ case HP_REG_R_ADDR:
+ return m_reg_R;
+
+ case HP_REG_R4_ADDR:
+ case HP_REG_R5_ADDR:
+ case HP_REG_R6_ADDR:
+ case HP_REG_R7_ADDR:
+ return RIO(CURRENT_PA , addr_wo_bsc - HP_REG_R4_ADDR);
+
+ case HP_REG_IV_ADDR:
+ // Correct?
+ if (!BIT(m_flags , HPHYBRID_IRH_SVC_BIT) && !BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) {
+ return m_reg_IV;
+ } else {
+ return m_reg_IV | CURRENT_PA;
+ }
+
+ case HP_REG_PA_ADDR:
+ return CURRENT_PA;
+
+ case HP_REG_W_ADDR:
+ return m_reg_W;
+
+ case HP_REG_DMAPA_ADDR:
+ tmp = m_dmapa & HP_REG_PA_MASK;
+ if (BIT(m_flags , HPHYBRID_CB_BIT)) {
+ BIT_SET(tmp , 15);
+ }
+ if (BIT(m_flags , HPHYBRID_DB_BIT)) {
+ BIT_SET(tmp , 14);
+ }
+ return tmp;
+
+ case HP_REG_DMAMA_ADDR:
+ return m_dmama;
+
+ case HP_REG_DMAC_ADDR:
+ return m_dmac;
+
+ case HP_REG_C_ADDR:
+ return m_reg_C;
+
+ case HP_REG_D_ADDR:
+ return m_reg_D;
+
+ default:
+ return read_non_common_reg(addr_wo_bsc);
+ }
+ } else {
+ return m_direct->read_word(addr << 1);
+ }
}
void hp_hybrid_cpu_device::WM(aec_cases_t aec_case , UINT16 addr , UINT16 v)
{
- WM(add_mae(aec_case , addr) , v);
+ WM(add_mae(aec_case , addr) , v);
}
void hp_hybrid_cpu_device::WM(UINT32 addr , UINT16 v)
{
- UINT16 addr_wo_bsc = remove_mae(addr);
-
- if (addr_wo_bsc <= HP_REG_LAST_ADDR) {
- // Any access to internal registers removes forcing of BSC 2x
- m_forced_bsc_25 = false;
-
- // Memory mapped registers
- switch (addr_wo_bsc) {
- case HP_REG_A_ADDR:
- m_reg_A = v;
- break;
-
- case HP_REG_B_ADDR:
- m_reg_B = v;
- break;
-
- case HP_REG_P_ADDR:
- m_reg_P = v;
- break;
-
- case HP_REG_R_ADDR:
- m_reg_R = v;
- break;
-
- case HP_REG_R4_ADDR:
- case HP_REG_R5_ADDR:
- case HP_REG_R6_ADDR:
- case HP_REG_R7_ADDR:
- WIO(CURRENT_PA , addr_wo_bsc - HP_REG_R4_ADDR , v);
- break;
-
- case HP_REG_IV_ADDR:
- m_reg_IV = v & HP_REG_IV_MASK;
- break;
-
- case HP_REG_PA_ADDR:
- CURRENT_PA = v & HP_REG_PA_MASK;
- m_pa_changed_func((UINT8)CURRENT_PA);
- break;
-
- case HP_REG_W_ADDR:
- m_reg_W = v;
- break;
-
- case HP_REG_DMAPA_ADDR:
- m_dmapa = v & HP_REG_PA_MASK;
- break;
-
- case HP_REG_DMAMA_ADDR:
- m_dmama = v;
- break;
-
- case HP_REG_DMAC_ADDR:
- m_dmac = v;
- break;
-
- case HP_REG_C_ADDR:
- m_reg_C = v;
- break;
-
- case HP_REG_D_ADDR:
- m_reg_D = v;
- break;
-
- default:
- write_non_common_reg(addr_wo_bsc , v);
- break;
- }
- } else {
- m_program->write_word(addr << 1 , v);
- }
+ UINT16 addr_wo_bsc = remove_mae(addr);
+
+ if (addr_wo_bsc <= HP_REG_LAST_ADDR) {
+ // Any access to internal registers removes forcing of BSC 2x
+ m_forced_bsc_25 = false;
+
+ // Memory mapped registers
+ switch (addr_wo_bsc) {
+ case HP_REG_A_ADDR:
+ m_reg_A = v;
+ break;
+
+ case HP_REG_B_ADDR:
+ m_reg_B = v;
+ break;
+
+ case HP_REG_P_ADDR:
+ m_reg_P = v;
+ break;
+
+ case HP_REG_R_ADDR:
+ m_reg_R = v;
+ break;
+
+ case HP_REG_R4_ADDR:
+ case HP_REG_R5_ADDR:
+ case HP_REG_R6_ADDR:
+ case HP_REG_R7_ADDR:
+ WIO(CURRENT_PA , addr_wo_bsc - HP_REG_R4_ADDR , v);
+ break;
+
+ case HP_REG_IV_ADDR:
+ m_reg_IV = v & HP_REG_IV_MASK;
+ break;
+
+ case HP_REG_PA_ADDR:
+ CURRENT_PA = v & HP_REG_PA_MASK;
+ m_pa_changed_func((UINT8)CURRENT_PA);
+ break;
+
+ case HP_REG_W_ADDR:
+ m_reg_W = v;
+ break;
+
+ case HP_REG_DMAPA_ADDR:
+ m_dmapa = v & HP_REG_PA_MASK;
+ break;
+
+ case HP_REG_DMAMA_ADDR:
+ m_dmama = v;
+ break;
+
+ case HP_REG_DMAC_ADDR:
+ m_dmac = v;
+ break;
+
+ case HP_REG_C_ADDR:
+ m_reg_C = v;
+ break;
+
+ case HP_REG_D_ADDR:
+ m_reg_D = v;
+ break;
+
+ default:
+ write_non_common_reg(addr_wo_bsc , v);
+ break;
+ }
+ } else {
+ m_program->write_word(addr << 1 , v);
+ }
}
UINT16 hp_hybrid_cpu_device::fetch(void)
{
- m_genpc = add_mae(AEC_CASE_A , m_reg_P);
- return RM(m_genpc);
+ m_genpc = add_mae(AEC_CASE_A , m_reg_P);
+ return RM(m_genpc);
}
UINT32 hp_hybrid_cpu_device::get_ea(UINT16 opcode)
{
- UINT16 base;
- UINT16 off;
- aec_cases_t aec;
-
- if (BIT(opcode , 10)) {
- // Current page
- base = m_reg_P;
- aec = AEC_CASE_A;
- } else {
- // Base page
- base = 0;
- aec = AEC_CASE_B;
- }
-
- off = opcode & 0x3ff;
- if (off & 0x200) {
- off -= 0x400;
- }
-
- base += off;
-
- if (BIT(opcode , 15)) {
- // Indirect addressing
- m_icount -= 6;
- return add_mae(AEC_CASE_C , RM(aec , base));
- } else {
- // Direct addressing
- return add_mae(aec , base);
- }
+ UINT16 base;
+ UINT16 off;
+ aec_cases_t aec;
+
+ if (BIT(opcode , 10)) {
+ // Current page
+ base = m_reg_P;
+ aec = AEC_CASE_A;
+ } else {
+ // Base page
+ base = 0;
+ aec = AEC_CASE_B;
+ }
+
+ off = opcode & 0x3ff;
+ if (off & 0x200) {
+ off -= 0x400;
+ }
+
+ base += off;
+
+ if (BIT(opcode , 15)) {
+ // Indirect addressing
+ m_icount -= 6;
+ return add_mae(AEC_CASE_C , RM(aec , base));
+ } else {
+ // Direct addressing
+ return add_mae(aec , base);
+ }
}
void hp_hybrid_cpu_device::do_add(UINT16& addend1 , UINT16 addend2)
@@ -949,22 +949,22 @@ void hp_hybrid_cpu_device::do_pw(UINT16 opcode)
if (m_flags & b_mask) {
tmp_addr |= 0x10000;
}
- if (tmp_addr <= (HP_REG_LAST_ADDR * 2 + 1)) {
- // Single bytes can be written to registers.
- // The addressed register gets the written byte in the proper position
- // and a 0 in the other byte because access to registers is always done in
- // 16 bits units.
- if (BIT(tmp_addr , 0)) {
- tmp &= 0xff;
- } else {
- tmp <<= 8;
- }
- WM(tmp_addr >> 1 , tmp);
- } else {
- // Extend address, preserve LSB & form byte address
- tmp_addr = (add_mae(AEC_CASE_C , tmp_addr >> 1) << 1) | (tmp_addr & 1);
- m_program->write_byte(tmp_addr , (UINT8)tmp);
- }
+ if (tmp_addr <= (HP_REG_LAST_ADDR * 2 + 1)) {
+ // Single bytes can be written to registers.
+ // The addressed register gets the written byte in the proper position
+ // and a 0 in the other byte because access to registers is always done in
+ // 16 bits units.
+ if (BIT(tmp_addr , 0)) {
+ tmp &= 0xff;
+ } else {
+ tmp <<= 8;
+ }
+ WM(tmp_addr >> 1 , tmp);
+ } else {
+ // Extend address, preserve LSB & form byte address
+ tmp_addr = (add_mae(AEC_CASE_C , tmp_addr >> 1) << 1) | (tmp_addr & 1);
+ m_program->write_byte(tmp_addr , (UINT8)tmp);
+ }
} else {
// Word
WM(AEC_CASE_C , *ptr_reg , tmp);
@@ -1013,7 +1013,7 @@ void hp_hybrid_cpu_device::check_for_interrupts(void)
CURRENT_PA = new_PA;
- m_pa_changed_func((UINT8)CURRENT_PA);
+ m_pa_changed_func((UINT8)CURRENT_PA);
// Is this correct? Patent @ pg 210 suggests that the whole interrupt recognition sequence
// lasts for 32 cycles (6 are already accounted for in get_ea for one indirection)
@@ -1033,7 +1033,7 @@ void hp_hybrid_cpu_device::handle_dma(void)
if (BIT(m_flags , HPHYBRID_DMADIR_BIT)) {
// "Outward" DMA: memory -> peripheral
- tmp = RM(AEC_CASE_D , m_dmama++);
+ tmp = RM(AEC_CASE_D , m_dmama++);
WIO(m_dmapa , tc ? 2 : 0 , tmp);
m_icount -= 10;
} else {
@@ -1062,545 +1062,544 @@ void hp_hybrid_cpu_device::WIO(UINT8 pa , UINT8 ic , UINT16 v)
}
hp_5061_3001_cpu_device::hp_5061_3001_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : hp_hybrid_cpu_device(mconfig, HP_5061_3001, "HP-5061-3001", tag, owner, clock, "5061-3001", 22),
- m_boot_mode(false)
+ : hp_hybrid_cpu_device(mconfig, HP_5061_3001, "HP-5061-3001", tag, owner, clock, "5061-3001", 22),
+ m_boot_mode(false)
{
}
void hp_5061_3001_cpu_device::device_start()
{
- hp_hybrid_cpu_device::device_start();
-
- state_add(HPHYBRID_AR2, "Ar2" , m_reg_ar2[ 0 ]);
- state_add(HPHYBRID_AR2_2, "Ar2_2" , m_reg_ar2[ 1 ]);
- state_add(HPHYBRID_AR2_3, "Ar2_3" , m_reg_ar2[ 2 ]);
- state_add(HPHYBRID_AR2_4, "Ar2_4" , m_reg_ar2[ 3 ]);
- state_add(HPHYBRID_SE, "SE" , m_reg_se);
- state_add(HPHYBRID_R25, "R25" , m_reg_r25).noshow();
- state_add(HPHYBRID_R26, "R26" , m_reg_r26).noshow();
- state_add(HPHYBRID_R27, "R27" , m_reg_r27).noshow();
- state_add(HPHYBRID_R32, "R32" , m_reg_aec[ 0 ]);
- state_add(HPHYBRID_R33, "R33" , m_reg_aec[ 1 ]);
- state_add(HPHYBRID_R34, "R34" , m_reg_aec[ 2 ]);
- state_add(HPHYBRID_R35, "R35" , m_reg_aec[ 3 ]);
- state_add(HPHYBRID_R36, "R36" , m_reg_aec[ 4 ]);
- state_add(HPHYBRID_R37, "R37" , m_reg_aec[ 5 ]);
-
- save_item(NAME(m_reg_ar2[ 0 ]));
- save_item(NAME(m_reg_ar2[ 1 ]));
- save_item(NAME(m_reg_ar2[ 2 ]));
- save_item(NAME(m_reg_ar2[ 3 ]));
- save_item(NAME(m_reg_se));
- save_item(NAME(m_reg_r25));
- save_item(NAME(m_reg_r26));
- save_item(NAME(m_reg_r27));
- save_item(NAME(m_reg_aec[ 0 ]));
- save_item(NAME(m_reg_aec[ 1 ]));
- save_item(NAME(m_reg_aec[ 2 ]));
- save_item(NAME(m_reg_aec[ 3 ]));
- save_item(NAME(m_reg_aec[ 4 ]));
- save_item(NAME(m_reg_aec[ 5 ]));
+ hp_hybrid_cpu_device::device_start();
+
+ state_add(HPHYBRID_AR2, "Ar2" , m_reg_ar2[ 0 ]);
+ state_add(HPHYBRID_AR2_2, "Ar2_2" , m_reg_ar2[ 1 ]);
+ state_add(HPHYBRID_AR2_3, "Ar2_3" , m_reg_ar2[ 2 ]);
+ state_add(HPHYBRID_AR2_4, "Ar2_4" , m_reg_ar2[ 3 ]);
+ state_add(HPHYBRID_SE, "SE" , m_reg_se);
+ state_add(HPHYBRID_R25, "R25" , m_reg_r25).noshow();
+ state_add(HPHYBRID_R26, "R26" , m_reg_r26).noshow();
+ state_add(HPHYBRID_R27, "R27" , m_reg_r27).noshow();
+ state_add(HPHYBRID_R32, "R32" , m_reg_aec[ 0 ]);
+ state_add(HPHYBRID_R33, "R33" , m_reg_aec[ 1 ]);
+ state_add(HPHYBRID_R34, "R34" , m_reg_aec[ 2 ]);
+ state_add(HPHYBRID_R35, "R35" , m_reg_aec[ 3 ]);
+ state_add(HPHYBRID_R36, "R36" , m_reg_aec[ 4 ]);
+ state_add(HPHYBRID_R37, "R37" , m_reg_aec[ 5 ]);
+
+ save_item(NAME(m_reg_ar2[ 0 ]));
+ save_item(NAME(m_reg_ar2[ 1 ]));
+ save_item(NAME(m_reg_ar2[ 2 ]));
+ save_item(NAME(m_reg_ar2[ 3 ]));
+ save_item(NAME(m_reg_se));
+ save_item(NAME(m_reg_r25));
+ save_item(NAME(m_reg_r26));
+ save_item(NAME(m_reg_r27));
+ save_item(NAME(m_reg_aec[ 0 ]));
+ save_item(NAME(m_reg_aec[ 1 ]));
+ save_item(NAME(m_reg_aec[ 2 ]));
+ save_item(NAME(m_reg_aec[ 3 ]));
+ save_item(NAME(m_reg_aec[ 4 ]));
+ save_item(NAME(m_reg_aec[ 5 ]));
}
void hp_5061_3001_cpu_device::device_reset()
{
- // Initial state of AEC registers:
- // R32 0
- // R33 5
- // R34 0
- // R35 0
- // R36 0
- // R37 0
- m_reg_aec[ 0 ] = 0;
- m_reg_aec[ 1 ] = 5;
- m_reg_aec[ 2 ] = 0;
- m_reg_aec[ 3 ] = 0;
- m_reg_aec[ 4 ] = 0;
- m_reg_aec[ 5 ] = 0;
-
- m_forced_bsc_25 = m_boot_mode;
-
- hp_hybrid_cpu_device::device_reset();
+ // Initial state of AEC registers:
+ // R32 0
+ // R33 5
+ // R34 0
+ // R35 0
+ // R36 0
+ // R37 0
+ m_reg_aec[ 0 ] = 0;
+ m_reg_aec[ 1 ] = 5;
+ m_reg_aec[ 2 ] = 0;
+ m_reg_aec[ 3 ] = 0;
+ m_reg_aec[ 4 ] = 0;
+ m_reg_aec[ 5 ] = 0;
+
+ m_forced_bsc_25 = m_boot_mode;
+
+ hp_hybrid_cpu_device::device_reset();
}
UINT8 hp_5061_3001_cpu_device::do_dec_shift_r(UINT8 d1 , UINT64& mantissa)
{
- UINT8 d12 = (UINT8)(mantissa & 0xf);
+ UINT8 d12 = (UINT8)(mantissa & 0xf);
- mantissa = (mantissa >> 4) | ((UINT64)d1 << 44);
+ mantissa = (mantissa >> 4) | ((UINT64)d1 << 44);
- return d12;
+ return d12;
}
UINT8 hp_5061_3001_cpu_device::do_dec_shift_l(UINT8 d12 , UINT64& mantissa)
{
- UINT8 d1 = (UINT8)((mantissa >> 44) & 0xf);
+ UINT8 d1 = (UINT8)((mantissa >> 44) & 0xf);
- mantissa = (mantissa << 4) | ((UINT64)d12);
- mantissa &= 0xffffffffffffULL;
+ mantissa = (mantissa << 4) | ((UINT64)d12);
+ mantissa &= 0xffffffffffffULL;
- return d1;
+ return d1;
}
UINT64 hp_5061_3001_cpu_device::get_ar1(void)
{
- UINT32 addr;
- UINT64 tmp;
+ UINT32 addr;
+ UINT64 tmp;
- addr = add_mae(AEC_CASE_B , HP_REG_AR1_ADDR + 1);
- tmp = (UINT64)RM(addr++);
- tmp <<= 16;
- tmp |= (UINT64)RM(addr++);
- tmp <<= 16;
- tmp |= (UINT64)RM(addr);
+ addr = add_mae(AEC_CASE_B , HP_REG_AR1_ADDR + 1);
+ tmp = (UINT64)RM(addr++);
+ tmp <<= 16;
+ tmp |= (UINT64)RM(addr++);
+ tmp <<= 16;
+ tmp |= (UINT64)RM(addr);
- return tmp;
+ return tmp;
}
void hp_5061_3001_cpu_device::set_ar1(UINT64 v)
{
- UINT32 addr;
-
- addr = add_mae(AEC_CASE_B , HP_REG_AR1_ADDR + 3);
- WM(addr-- , (UINT16)(v & 0xffff));
- v >>= 16;
- WM(addr-- , (UINT16)(v & 0xffff));
- v >>= 16;
- WM(addr , (UINT16)(v & 0xffff));
+ UINT32 addr;
+
+ addr = add_mae(AEC_CASE_B , HP_REG_AR1_ADDR + 3);
+ WM(addr-- , (UINT16)(v & 0xffff));
+ v >>= 16;
+ WM(addr-- , (UINT16)(v & 0xffff));
+ v >>= 16;
+ WM(addr , (UINT16)(v & 0xffff));
}
UINT64 hp_5061_3001_cpu_device::get_ar2(void) const
{
- UINT64 tmp;
+ UINT64 tmp;
- tmp = (UINT64)m_reg_ar2[ 1 ];
- tmp <<= 16;
- tmp |= (UINT64)m_reg_ar2[ 2 ];
- tmp <<= 16;
- tmp |= (UINT64)m_reg_ar2[ 3 ];
+ tmp = (UINT64)m_reg_ar2[ 1 ];
+ tmp <<= 16;
+ tmp |= (UINT64)m_reg_ar2[ 2 ];
+ tmp <<= 16;
+ tmp |= (UINT64)m_reg_ar2[ 3 ];
- return tmp;
+ return tmp;
}
void hp_5061_3001_cpu_device::set_ar2(UINT64 v)
{
- m_reg_ar2[ 3 ] = (UINT16)(v & 0xffff);
- v >>= 16;
- m_reg_ar2[ 2 ] = (UINT16)(v & 0xffff);
- v >>= 16;
- m_reg_ar2[ 1 ] = (UINT16)(v & 0xffff);
+ m_reg_ar2[ 3 ] = (UINT16)(v & 0xffff);
+ v >>= 16;
+ m_reg_ar2[ 2 ] = (UINT16)(v & 0xffff);
+ v >>= 16;
+ m_reg_ar2[ 1 ] = (UINT16)(v & 0xffff);
}
UINT64 hp_5061_3001_cpu_device::do_mrxy(UINT64 ar)
{
- UINT8 n;
-
- n = m_reg_B & 0xf;
- m_reg_A &= 0xf;
- m_reg_se = m_reg_A;
- while (n--) {
- m_reg_se = do_dec_shift_r(m_reg_A , ar);
- m_reg_A = 0;
- m_icount -= 4;
- }
- m_reg_A = m_reg_se;
- BIT_CLR(m_flags , HPHYBRID_DC_BIT);
-
- return ar;
+ UINT8 n;
+
+ n = m_reg_B & 0xf;
+ m_reg_A &= 0xf;
+ m_reg_se = m_reg_A;
+ while (n--) {
+ m_reg_se = do_dec_shift_r(m_reg_A , ar);
+ m_reg_A = 0;
+ m_icount -= 4;
+ }
+ m_reg_A = m_reg_se;
+ BIT_CLR(m_flags , HPHYBRID_DC_BIT);
+
+ return ar;
}
bool hp_5061_3001_cpu_device::do_dec_add(bool carry_in , UINT64& a , UINT64 b)
{
- UINT64 tmp = 0;
- unsigned i;
- UINT8 digit_a , digit_b;
+ UINT64 tmp = 0;
+ unsigned i;
+ UINT8 digit_a , digit_b;
- for (i = 0; i < 12; i++) {
- digit_a = (UINT8)(a & 0xf);
- digit_b = (UINT8)(b & 0xf);
+ for (i = 0; i < 12; i++) {
+ digit_a = (UINT8)(a & 0xf);
+ digit_b = (UINT8)(b & 0xf);
- if (carry_in) {
- digit_a++;
- }
+ if (carry_in) {
+ digit_a++;
+ }
- digit_a += digit_b;
+ digit_a += digit_b;
- carry_in = digit_a >= 10;
+ carry_in = digit_a >= 10;
- if (carry_in) {
- digit_a = (digit_a - 10) & 0xf;
- }
+ if (carry_in) {
+ digit_a = (digit_a - 10) & 0xf;
+ }
- tmp |= (UINT64)digit_a << (4 * i);
+ tmp |= (UINT64)digit_a << (4 * i);
- a >>= 4;
- b >>= 4;
- }
+ a >>= 4;
+ b >>= 4;
+ }
- a = tmp;
+ a = tmp;
- return carry_in;
+ return carry_in;
}
void hp_5061_3001_cpu_device::do_mpy(void)
{
- INT32 a = (INT16)m_reg_A;
- INT32 b = (INT16)m_reg_B;
- INT32 p = a * b;
+ INT32 a = (INT16)m_reg_A;
+ INT32 b = (INT16)m_reg_B;
+ INT32 p = a * b;
- m_reg_A = (UINT16)(p & 0xffff);
- m_reg_B = (UINT16)((p >> 16) & 0xffff);
+ m_reg_A = (UINT16)(p & 0xffff);
+ m_reg_B = (UINT16)((p >> 16) & 0xffff);
- // Not entirely correct, timing depends on initial content of A register
- m_icount -= 65;
+ // Not entirely correct, timing depends on initial content of A register
+ m_icount -= 65;
}
UINT16 hp_5061_3001_cpu_device::execute_no_bpc_ioc(UINT16 opcode)
{
- // EMC instructions
- UINT8 n;
- UINT16 tmp1;
- UINT16 tmp2;
- UINT64 tmp_ar;
- UINT64 tmp_ar2;
- bool carry;
-
- switch (opcode & 0xfff0) {
- case 0x7300:
- // XFR
- tmp1 = m_reg_A;
- tmp2 = m_reg_B;
- n = (opcode & 0xf) + 1;
- m_icount -= 21;
- while (n--) {
- m_icount -= 12;
- WM(AEC_CASE_C , tmp2 , RM(AEC_CASE_C , tmp1));
- tmp1++;
- tmp2++;
- }
- break;
-
- case 0x7380:
- // CLR
- tmp1 = m_reg_A;
- n = (opcode & 0xf) + 1;
- m_icount -= 16;
- while (n--) {
- m_icount -= 6;
- WM(AEC_CASE_C , tmp1 , 0);
- tmp1++;
- }
- break;
-
- default:
- switch (opcode) {
- case 0x7200:
- // MWA
- m_icount -= 28;
- tmp_ar2 = get_ar2();
- carry = do_dec_add(BIT(m_flags , HPHYBRID_DC_BIT) , tmp_ar2 , m_reg_B);
- set_ar2(tmp_ar2);
- if (carry) {
- BIT_SET(m_flags, HPHYBRID_DC_BIT);
- } else {
- BIT_CLR(m_flags, HPHYBRID_DC_BIT);
- }
- break;
-
- case 0x7220:
- // CMY
- m_icount -= 23;
- tmp_ar2 = get_ar2();
- tmp_ar2 = 0x999999999999ULL - tmp_ar2;
- do_dec_add(true , tmp_ar2 , 0);
- set_ar2(tmp_ar2);
- BIT_CLR(m_flags , HPHYBRID_DC_BIT);
- break;
-
- case 0x7260:
- // CMX
- m_icount -= 59;
- tmp_ar = get_ar1();
- tmp_ar = 0x999999999999ULL - tmp_ar;
- do_dec_add(true , tmp_ar , 0);
- set_ar1(tmp_ar);
- BIT_CLR(m_flags , HPHYBRID_DC_BIT);
- break;
-
- case 0x7280:
- // FXA
- m_icount -= 40;
- tmp_ar2 = get_ar2();
- carry = do_dec_add(BIT(m_flags , HPHYBRID_DC_BIT) , tmp_ar2 , get_ar1());
- set_ar2(tmp_ar2);
- if (carry) {
- BIT_SET(m_flags, HPHYBRID_DC_BIT);
- } else {
- BIT_CLR(m_flags, HPHYBRID_DC_BIT);
- }
- break;
-
- case 0x7340:
- // NRM
- tmp_ar2 = get_ar2();
- m_icount -= 23;
- for (n = 0; n < 12 && (tmp_ar2 & 0xf00000000000ULL) == 0; n++) {
- do_dec_shift_l(0 , tmp_ar2);
- m_icount--;
- }
- m_reg_B = n;
- if (n < 12) {
- BIT_CLR(m_flags , HPHYBRID_DC_BIT);
- set_ar2(tmp_ar2);
- } else {
- BIT_SET(m_flags , HPHYBRID_DC_BIT);
- // When ar2 is 0, total time is 69 cycles
- // (salcazzo che cosa fa per altri 34 cicli)
- m_icount -= 34;
- }
- break;
-
- case 0x73c0:
- // CDC
- m_icount -= 11;
- BIT_CLR(m_flags , HPHYBRID_DC_BIT);
- break;
-
- case 0x7a00:
- // FMP
- m_icount -= 42;
- m_reg_A = 0;
- tmp_ar = get_ar1();
- tmp_ar2 = get_ar2();
- for (n = m_reg_B & 0xf; n > 0; n--) {
- m_icount -= 13;
- if (do_dec_add(BIT(m_flags , HPHYBRID_DC_BIT) , tmp_ar2 , tmp_ar)) {
- m_reg_A++;
- }
- BIT_CLR(m_flags , HPHYBRID_DC_BIT);
- }
- set_ar2(tmp_ar2);
- break;
-
- case 0x7a21:
- // FDV
- // No doc mentions any limit on the iterations done by this instruction.
- // Here we stop at 15 (after all there are only 4 bits in the loop counter). But is it correct?
- m_icount -= 37;
- m_reg_B = 0;
- tmp_ar = get_ar1();
- tmp_ar2 = get_ar2();
- while (m_reg_B < 15 && !do_dec_add(BIT(m_flags , HPHYBRID_DC_BIT) , tmp_ar2 , tmp_ar)) {
- m_icount -= 13;
- BIT_CLR(m_flags , HPHYBRID_DC_BIT);
- m_reg_B++;
- }
- set_ar2(tmp_ar2);
- break;
-
- case 0x7b00:
- // MRX
- set_ar1(do_mrxy(get_ar1()));
- m_icount -= 62;
- break;
-
- case 0x7b21:
- // DRS
- tmp_ar = get_ar1();
- m_icount -= 56;
- m_reg_A = m_reg_se = do_dec_shift_r(0 , tmp_ar);
- set_ar1(tmp_ar);
- BIT_CLR(m_flags , HPHYBRID_DC_BIT);
- break;
-
- case 0x7b40:
- // MRY
- set_ar2(do_mrxy(get_ar2()));
- m_icount -= 33;
- break;
-
- case 0x7b61:
- // MLY
- tmp_ar2 = get_ar2();
- m_icount -= 32;
- m_reg_A = m_reg_se = do_dec_shift_l(m_reg_A & 0xf , tmp_ar2);
- set_ar2(tmp_ar2);
- BIT_CLR(m_flags , HPHYBRID_DC_BIT);
- break;
-
- case 0x7b8f:
- // MPY
- do_mpy();
- break;
-
- default:
- if ((opcode & 0xfec0) == 0x74c0) {
- // SDS
- // SDC
- m_icount -= 14;
- return get_skip_addr(opcode , !BIT(m_flags , HPHYBRID_DC_BIT));
- } else {
- // Unrecognized instructions: NOP
- // Execution time is fictional
- logerror("hp-5061-3001: unknown opcode %04x @ %06x\n" , opcode , m_genpc);
- m_icount -= 6;
- }
- break;
- }
- }
-
- return m_reg_P + 1;
+ // EMC instructions
+ UINT8 n;
+ UINT16 tmp1;
+ UINT16 tmp2;
+ UINT64 tmp_ar;
+ UINT64 tmp_ar2;
+ bool carry;
+
+ switch (opcode & 0xfff0) {
+ case 0x7300:
+ // XFR
+ tmp1 = m_reg_A;
+ tmp2 = m_reg_B;
+ n = (opcode & 0xf) + 1;
+ m_icount -= 21;
+ while (n--) {
+ m_icount -= 12;
+ WM(AEC_CASE_C , tmp2 , RM(AEC_CASE_C , tmp1));
+ tmp1++;
+ tmp2++;
+ }
+ break;
+
+ case 0x7380:
+ // CLR
+ tmp1 = m_reg_A;
+ n = (opcode & 0xf) + 1;
+ m_icount -= 16;
+ while (n--) {
+ m_icount -= 6;
+ WM(AEC_CASE_C , tmp1 , 0);
+ tmp1++;
+ }
+ break;
+
+ default:
+ switch (opcode) {
+ case 0x7200:
+ // MWA
+ m_icount -= 28;
+ tmp_ar2 = get_ar2();
+ carry = do_dec_add(BIT(m_flags , HPHYBRID_DC_BIT) , tmp_ar2 , m_reg_B);
+ set_ar2(tmp_ar2);
+ if (carry) {
+ BIT_SET(m_flags, HPHYBRID_DC_BIT);
+ } else {
+ BIT_CLR(m_flags, HPHYBRID_DC_BIT);
+ }
+ break;
+
+ case 0x7220:
+ // CMY
+ m_icount -= 23;
+ tmp_ar2 = get_ar2();
+ tmp_ar2 = 0x999999999999ULL - tmp_ar2;
+ do_dec_add(true , tmp_ar2 , 0);
+ set_ar2(tmp_ar2);
+ BIT_CLR(m_flags , HPHYBRID_DC_BIT);
+ break;
+
+ case 0x7260:
+ // CMX
+ m_icount -= 59;
+ tmp_ar = get_ar1();
+ tmp_ar = 0x999999999999ULL - tmp_ar;
+ do_dec_add(true , tmp_ar , 0);
+ set_ar1(tmp_ar);
+ BIT_CLR(m_flags , HPHYBRID_DC_BIT);
+ break;
+
+ case 0x7280:
+ // FXA
+ m_icount -= 40;
+ tmp_ar2 = get_ar2();
+ carry = do_dec_add(BIT(m_flags , HPHYBRID_DC_BIT) , tmp_ar2 , get_ar1());
+ set_ar2(tmp_ar2);
+ if (carry) {
+ BIT_SET(m_flags, HPHYBRID_DC_BIT);
+ } else {
+ BIT_CLR(m_flags, HPHYBRID_DC_BIT);
+ }
+ break;
+
+ case 0x7340:
+ // NRM
+ tmp_ar2 = get_ar2();
+ m_icount -= 23;
+ for (n = 0; n < 12 && (tmp_ar2 & 0xf00000000000ULL) == 0; n++) {
+ do_dec_shift_l(0 , tmp_ar2);
+ m_icount--;
+ }
+ m_reg_B = n;
+ if (n < 12) {
+ BIT_CLR(m_flags , HPHYBRID_DC_BIT);
+ set_ar2(tmp_ar2);
+ } else {
+ BIT_SET(m_flags , HPHYBRID_DC_BIT);
+ // When ar2 is 0, total time is 69 cycles
+ // (salcazzo che cosa fa per altri 34 cicli)
+ m_icount -= 34;
+ }
+ break;
+
+ case 0x73c0:
+ // CDC
+ m_icount -= 11;
+ BIT_CLR(m_flags , HPHYBRID_DC_BIT);
+ break;
+
+ case 0x7a00:
+ // FMP
+ m_icount -= 42;
+ m_reg_A = 0;
+ tmp_ar = get_ar1();
+ tmp_ar2 = get_ar2();
+ for (n = m_reg_B & 0xf; n > 0; n--) {
+ m_icount -= 13;
+ if (do_dec_add(BIT(m_flags , HPHYBRID_DC_BIT) , tmp_ar2 , tmp_ar)) {
+ m_reg_A++;
+ }
+ BIT_CLR(m_flags , HPHYBRID_DC_BIT);
+ }
+ set_ar2(tmp_ar2);
+ break;
+
+ case 0x7a21:
+ // FDV
+ // No doc mentions any limit on the iterations done by this instruction.
+ // Here we stop at 15 (after all there are only 4 bits in the loop counter). But is it correct?
+ m_icount -= 37;
+ m_reg_B = 0;
+ tmp_ar = get_ar1();
+ tmp_ar2 = get_ar2();
+ while (m_reg_B < 15 && !do_dec_add(BIT(m_flags , HPHYBRID_DC_BIT) , tmp_ar2 , tmp_ar)) {
+ m_icount -= 13;
+ BIT_CLR(m_flags , HPHYBRID_DC_BIT);
+ m_reg_B++;
+ }
+ set_ar2(tmp_ar2);
+ break;
+
+ case 0x7b00:
+ // MRX
+ set_ar1(do_mrxy(get_ar1()));
+ m_icount -= 62;
+ break;
+
+ case 0x7b21:
+ // DRS
+ tmp_ar = get_ar1();
+ m_icount -= 56;
+ m_reg_A = m_reg_se = do_dec_shift_r(0 , tmp_ar);
+ set_ar1(tmp_ar);
+ BIT_CLR(m_flags , HPHYBRID_DC_BIT);
+ break;
+
+ case 0x7b40:
+ // MRY
+ set_ar2(do_mrxy(get_ar2()));
+ m_icount -= 33;
+ break;
+
+ case 0x7b61:
+ // MLY
+ tmp_ar2 = get_ar2();
+ m_icount -= 32;
+ m_reg_A = m_reg_se = do_dec_shift_l(m_reg_A & 0xf , tmp_ar2);
+ set_ar2(tmp_ar2);
+ BIT_CLR(m_flags , HPHYBRID_DC_BIT);
+ break;
+
+ case 0x7b8f:
+ // MPY
+ do_mpy();
+ break;
+
+ default:
+ if ((opcode & 0xfec0) == 0x74c0) {
+ // SDS
+ // SDC
+ m_icount -= 14;
+ return get_skip_addr(opcode , !BIT(m_flags , HPHYBRID_DC_BIT));
+ } else {
+ // Unrecognized instructions: NOP
+ // Execution time is fictional
+ logerror("hp-5061-3001: unknown opcode %04x @ %06x\n" , opcode , m_genpc);
+ m_icount -= 6;
+ }
+ break;
+ }
+ }
+
+ return m_reg_P + 1;
}
offs_t hp_5061_3001_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options)
{
- extern CPU_DISASSEMBLE(hp_5061_3001);
- return CPU_DISASSEMBLE_NAME(hp_5061_3001)(this, buffer, pc, oprom, opram, options);
+ extern CPU_DISASSEMBLE(hp_5061_3001);
+ return CPU_DISASSEMBLE_NAME(hp_5061_3001)(this, buffer, pc, oprom, opram, options);
}
UINT32 hp_5061_3001_cpu_device::add_mae(aec_cases_t aec_case , UINT16 addr)
{
- UINT16 bsc_reg;
- bool top_half = BIT(addr , 15) != 0;
+ UINT16 bsc_reg;
+ bool top_half = BIT(addr , 15) != 0;
- // Detect accesses to top half of base page
- if (aec_case == AEC_CASE_C && (addr & 0xfe00) == 0xfe00) {
- aec_case = AEC_CASE_B;
- }
+ // Detect accesses to top half of base page
+ if (aec_case == AEC_CASE_C && (addr & 0xfe00) == 0xfe00) {
+ aec_case = AEC_CASE_B;
+ }
- switch (aec_case) {
- case AEC_CASE_A:
- bsc_reg = top_half ? HP_REG_R34_ADDR : HP_REG_R33_ADDR;
- break;
+ switch (aec_case) {
+ case AEC_CASE_A:
+ bsc_reg = top_half ? HP_REG_R34_ADDR : HP_REG_R33_ADDR;
+ break;
- case AEC_CASE_B:
- bsc_reg = top_half ? HP_REG_R36_ADDR : HP_REG_R33_ADDR;
- break;
+ case AEC_CASE_B:
+ bsc_reg = top_half ? HP_REG_R36_ADDR : HP_REG_R33_ADDR;
+ break;
- case AEC_CASE_C:
- bsc_reg = top_half ? HP_REG_R32_ADDR : HP_REG_R35_ADDR;
- break;
+ case AEC_CASE_C:
+ bsc_reg = top_half ? HP_REG_R32_ADDR : HP_REG_R35_ADDR;
+ break;
- case AEC_CASE_D:
- bsc_reg = HP_REG_R37_ADDR;
- break;
+ case AEC_CASE_D:
+ bsc_reg = HP_REG_R37_ADDR;
+ break;
- default:
- logerror("hphybrid: aec_case=%d\n" , aec_case);
- return 0;
- }
+ default:
+ logerror("hphybrid: aec_case=%d\n" , aec_case);
+ return 0;
+ }
- UINT16 aec_reg = m_reg_aec[ bsc_reg - HP_REG_R32_ADDR ] & BSC_REG_MASK;
+ UINT16 aec_reg = m_reg_aec[ bsc_reg - HP_REG_R32_ADDR ] & BSC_REG_MASK;
- if (m_forced_bsc_25) {
- aec_reg = (aec_reg & 0xf) | 0x20;
- }
+ if (m_forced_bsc_25) {
+ aec_reg = (aec_reg & 0xf) | 0x20;
+ }
- return (UINT32)addr | ((UINT32)aec_reg << 16);
+ return (UINT32)addr | ((UINT32)aec_reg << 16);
}
UINT16 hp_5061_3001_cpu_device::read_non_common_reg(UINT16 addr)
{
- switch (addr) {
- case HP_REG_AR2_ADDR:
- case HP_REG_AR2_ADDR + 1:
- case HP_REG_AR2_ADDR + 2:
- case HP_REG_AR2_ADDR + 3:
- return m_reg_ar2[ addr - HP_REG_AR2_ADDR ];
-
- case HP_REG_SE_ADDR:
- return m_reg_se;
-
- case HP_REG_R25_ADDR:
- return m_reg_r25;
-
- case HP_REG_R26_ADDR:
- return m_reg_r26;
-
- case HP_REG_R27_ADDR:
- return m_reg_r27;
-
- case HP_REG_R32_ADDR:
- case HP_REG_R33_ADDR:
- case HP_REG_R34_ADDR:
- case HP_REG_R35_ADDR:
- case HP_REG_R36_ADDR:
- case HP_REG_R37_ADDR:
- return m_reg_aec[ addr - HP_REG_R32_ADDR ];
-
- default:
- return 0;
- }
+ switch (addr) {
+ case HP_REG_AR2_ADDR:
+ case HP_REG_AR2_ADDR + 1:
+ case HP_REG_AR2_ADDR + 2:
+ case HP_REG_AR2_ADDR + 3:
+ return m_reg_ar2[ addr - HP_REG_AR2_ADDR ];
+
+ case HP_REG_SE_ADDR:
+ return m_reg_se;
+
+ case HP_REG_R25_ADDR:
+ return m_reg_r25;
+
+ case HP_REG_R26_ADDR:
+ return m_reg_r26;
+
+ case HP_REG_R27_ADDR:
+ return m_reg_r27;
+
+ case HP_REG_R32_ADDR:
+ case HP_REG_R33_ADDR:
+ case HP_REG_R34_ADDR:
+ case HP_REG_R35_ADDR:
+ case HP_REG_R36_ADDR:
+ case HP_REG_R37_ADDR:
+ return m_reg_aec[ addr - HP_REG_R32_ADDR ];
+
+ default:
+ return 0;
+ }
}
void hp_5061_3001_cpu_device::write_non_common_reg(UINT16 addr , UINT16 v)
{
- switch (addr) {
- case HP_REG_AR2_ADDR:
- case HP_REG_AR2_ADDR + 1:
- case HP_REG_AR2_ADDR + 2:
- case HP_REG_AR2_ADDR + 3:
- m_reg_ar2[ addr - HP_REG_AR2_ADDR ] = v;
- break;
-
- case HP_REG_SE_ADDR:
- m_reg_se = v & HP_REG_SE_MASK;
- break;
-
- case HP_REG_R25_ADDR:
- m_reg_r25 = v;
- break;
-
- case HP_REG_R26_ADDR:
- m_reg_r26 = v;
- break;
-
- case HP_REG_R27_ADDR:
- m_reg_r27 = v;
- break;
-
- case HP_REG_R32_ADDR:
- case HP_REG_R33_ADDR:
- case HP_REG_R34_ADDR:
- case HP_REG_R35_ADDR:
- case HP_REG_R36_ADDR:
- case HP_REG_R37_ADDR:
- m_reg_aec[ addr - HP_REG_R32_ADDR ] = v;
- break;
-
- default:
- break;
- }
+ switch (addr) {
+ case HP_REG_AR2_ADDR:
+ case HP_REG_AR2_ADDR + 1:
+ case HP_REG_AR2_ADDR + 2:
+ case HP_REG_AR2_ADDR + 3:
+ m_reg_ar2[ addr - HP_REG_AR2_ADDR ] = v;
+ break;
+
+ case HP_REG_SE_ADDR:
+ m_reg_se = v & HP_REG_SE_MASK;
+ break;
+
+ case HP_REG_R25_ADDR:
+ m_reg_r25 = v;
+ break;
+
+ case HP_REG_R26_ADDR:
+ m_reg_r26 = v;
+ break;
+
+ case HP_REG_R27_ADDR:
+ m_reg_r27 = v;
+ break;
+
+ case HP_REG_R32_ADDR:
+ case HP_REG_R33_ADDR:
+ case HP_REG_R34_ADDR:
+ case HP_REG_R35_ADDR:
+ case HP_REG_R36_ADDR:
+ case HP_REG_R37_ADDR:
+ m_reg_aec[ addr - HP_REG_R32_ADDR ] = v;
+ break;
+
+ default:
+ break;
+ }
}
hp_5061_3011_cpu_device::hp_5061_3011_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : hp_hybrid_cpu_device(mconfig, HP_5061_3011, "HP-5061-3011", tag, owner, clock, "5061-3011", 16)
+ : hp_hybrid_cpu_device(mconfig, HP_5061_3011, "HP-5061-3011", tag, owner, clock, "5061-3011", 16)
{
}
UINT16 hp_5061_3011_cpu_device::execute_no_bpc_ioc(UINT16 opcode)
{
- // Unrecognized instructions: NOP
- // Execution time is fictional
- m_icount -= 6;
+ // Unrecognized instructions: NOP
+ // Execution time is fictional
+ m_icount -= 6;
- return m_reg_P + 1;
+ return m_reg_P + 1;
}
UINT32 hp_5061_3011_cpu_device::add_mae(aec_cases_t aec_case , UINT16 addr)
{
- // No MAE on 3011
- return addr;
+ // No MAE on 3011
+ return addr;
}
UINT16 hp_5061_3011_cpu_device::read_non_common_reg(UINT16 addr)
{
- // Non-existing registers are returned as 0
- return 0;
+ // Non-existing registers are returned as 0
+ return 0;
}
void hp_5061_3011_cpu_device::write_non_common_reg(UINT16 addr , UINT16 v)
{
- // Non-existing registers are silently discarded
+ // Non-existing registers are silently discarded
}
-
diff --git a/src/devices/cpu/hphybrid/hphybrid.h b/src/devices/cpu/hphybrid/hphybrid.h
index 6526b87020d..57609e24e63 100644
--- a/src/devices/cpu/hphybrid/hphybrid.h
+++ b/src/devices/cpu/hphybrid/hphybrid.h
@@ -77,166 +77,166 @@
// PA changed callback
#define MCFG_HPHYBRID_PA_CHANGED(_devcb) \
- hp_hybrid_cpu_device::set_pa_changed_func(*device , DEVCB_##_devcb);
+ hp_hybrid_cpu_device::set_pa_changed_func(*device , DEVCB_##_devcb);
class hp_hybrid_cpu_device : public cpu_device
{
public:
- DECLARE_WRITE_LINE_MEMBER(dmar_w);
- DECLARE_WRITE_LINE_MEMBER(halt_w);
- DECLARE_WRITE_LINE_MEMBER(status_w);
- DECLARE_WRITE_LINE_MEMBER(flag_w);
+ DECLARE_WRITE_LINE_MEMBER(dmar_w);
+ DECLARE_WRITE_LINE_MEMBER(halt_w);
+ DECLARE_WRITE_LINE_MEMBER(status_w);
+ DECLARE_WRITE_LINE_MEMBER(flag_w);
- template<class _Object> static devcb_base &set_pa_changed_func(device_t &device, _Object object) { return downcast<hp_hybrid_cpu_device &>(device).m_pa_changed_func.set_callback(object); }
+ template<class _Object> static devcb_base &set_pa_changed_func(device_t &device, _Object object) { return downcast<hp_hybrid_cpu_device &>(device).m_pa_changed_func.set_callback(object); }
protected:
- hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname , UINT8 addrwidth);
-
- // device-level overrides
- virtual void device_start() override;
- virtual void device_reset() override;
-
- // device_execute_interface overrides
- virtual UINT32 execute_min_cycles() const override { return 6; }
- virtual UINT32 execute_input_lines() const override { return 2; }
- virtual UINT32 execute_default_irq_vector() const override { return 0xffff; }
- virtual void execute_run() override;
- virtual void execute_set_input(int inputnum, int state) override;
-
- UINT16 execute_one(UINT16 opcode);
- UINT16 execute_one_sub(UINT16 opcode);
- // Execute an instruction that doesn't belong to either BPC or IOC
- virtual UINT16 execute_no_bpc_ioc(UINT16 opcode) = 0;
-
- // device_memory_interface overrides
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ); }
-
- // device_state_interface overrides
- void state_string_export(const device_state_entry &entry, std::string &str) override;
-
- // device_disasm_interface overrides
- virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }
- virtual UINT32 disasm_max_opcode_bytes() const override { return 2; }
- virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override;
-
- // Different cases of memory access
- // See patent @ pg 361
- typedef enum {
- AEC_CASE_A, // Instr. fetches, non-base page fetches of link pointers, BPC direct non-base page accesses
- AEC_CASE_B, // Base page fetches of link pointers, BPC direct base page accesses
- AEC_CASE_C, // IOC, EMC & BPC indirect final destination accesses
- AEC_CASE_D // DMA accesses
- } aec_cases_t;
-
- // do memory address extension
- virtual UINT32 add_mae(aec_cases_t aec_case , UINT16 addr) = 0;
-
- UINT16 remove_mae(UINT32 addr);
-
- UINT16 RM(aec_cases_t aec_case , UINT16 addr);
- UINT16 RM(UINT32 addr);
- virtual UINT16 read_non_common_reg(UINT16 addr) = 0;
-
- void WM(aec_cases_t aec_case , UINT16 addr , UINT16 v);
- void WM(UINT32 addr , UINT16 v);
- virtual void write_non_common_reg(UINT16 addr , UINT16 v) = 0;
-
- UINT16 fetch(void);
-
- UINT16 get_skip_addr(UINT16 opcode , bool condition) const;
-
- devcb_write8 m_pa_changed_func;
-
- int m_icount;
- bool m_forced_bsc_25;
-
- // State of processor
- UINT16 m_reg_A; // Register A
- UINT16 m_reg_B; // Register B
- UINT16 m_reg_P; // Register P
- UINT16 m_reg_R; // Register R
- UINT16 m_reg_C; // Register C
- UINT16 m_reg_D; // Register D
- UINT16 m_reg_IV; // Register IV
- UINT16 m_reg_W; // Register W
- UINT8 m_reg_PA[ HPHYBRID_INT_LVLS + 1 ]; // Stack of register PA (4 bit-long)
- UINT16 m_flags; // Flags
- UINT8 m_dmapa; // DMA peripheral address (4 bits)
- UINT16 m_dmama; // DMA address
- UINT16 m_dmac; // DMA counter
- UINT16 m_reg_I; // Instruction register
- UINT32 m_genpc; // Full PC
+ hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname , UINT8 addrwidth);
+
+ // device-level overrides
+ virtual void device_start() override;
+ virtual void device_reset() override;
+
+ // device_execute_interface overrides
+ virtual UINT32 execute_min_cycles() const override { return 6; }
+ virtual UINT32 execute_input_lines() const override { return 2; }
+ virtual UINT32 execute_default_irq_vector() const override { return 0xffff; }
+ virtual void execute_run() override;
+ virtual void execute_set_input(int inputnum, int state) override;
+
+ UINT16 execute_one(UINT16 opcode);
+ UINT16 execute_one_sub(UINT16 opcode);
+ // Execute an instruction that doesn't belong to either BPC or IOC
+ virtual UINT16 execute_no_bpc_ioc(UINT16 opcode) = 0;
+
+ // device_memory_interface overrides
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ); }
+
+ // device_state_interface overrides
+ void state_string_export(const device_state_entry &entry, std::string &str) override;
+
+ // device_disasm_interface overrides
+ virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }
+ virtual UINT32 disasm_max_opcode_bytes() const override { return 2; }
+ virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override;
+
+ // Different cases of memory access
+ // See patent @ pg 361
+ typedef enum {
+ AEC_CASE_A, // Instr. fetches, non-base page fetches of link pointers, BPC direct non-base page accesses
+ AEC_CASE_B, // Base page fetches of link pointers, BPC direct base page accesses
+ AEC_CASE_C, // IOC, EMC & BPC indirect final destination accesses
+ AEC_CASE_D // DMA accesses
+ } aec_cases_t;
+
+ // do memory address extension
+ virtual UINT32 add_mae(aec_cases_t aec_case , UINT16 addr) = 0;
+
+ UINT16 remove_mae(UINT32 addr);
+
+ UINT16 RM(aec_cases_t aec_case , UINT16 addr);
+ UINT16 RM(UINT32 addr);
+ virtual UINT16 read_non_common_reg(UINT16 addr) = 0;
+
+ void WM(aec_cases_t aec_case , UINT16 addr , UINT16 v);
+ void WM(UINT32 addr , UINT16 v);
+ virtual void write_non_common_reg(UINT16 addr , UINT16 v) = 0;
+
+ UINT16 fetch(void);
+
+ UINT16 get_skip_addr(UINT16 opcode , bool condition) const;
+
+ devcb_write8 m_pa_changed_func;
+
+ int m_icount;
+ bool m_forced_bsc_25;
+
+ // State of processor
+ UINT16 m_reg_A; // Register A
+ UINT16 m_reg_B; // Register B
+ UINT16 m_reg_P; // Register P
+ UINT16 m_reg_R; // Register R
+ UINT16 m_reg_C; // Register C
+ UINT16 m_reg_D; // Register D
+ UINT16 m_reg_IV; // Register IV
+ UINT16 m_reg_W; // Register W
+ UINT8 m_reg_PA[ HPHYBRID_INT_LVLS + 1 ]; // Stack of register PA (4 bit-long)
+ UINT16 m_flags; // Flags
+ UINT8 m_dmapa; // DMA peripheral address (4 bits)
+ UINT16 m_dmama; // DMA address
+ UINT16 m_dmac; // DMA counter
+ UINT16 m_reg_I; // Instruction register
+ UINT32 m_genpc; // Full PC
private:
- address_space_config m_program_config;
- address_space_config m_io_config;
-
- address_space *m_program;
- direct_read_data *m_direct;
- address_space *m_io;
-
- UINT32 get_ea(UINT16 opcode);
- void do_add(UINT16& addend1 , UINT16 addend2);
- UINT16 get_skip_addr_sc(UINT16 opcode , UINT16& v , unsigned n);
- void do_pw(UINT16 opcode);
- void check_for_interrupts(void);
- void handle_dma(void);
-
- UINT16 RIO(UINT8 pa , UINT8 ic);
- void WIO(UINT8 pa , UINT8 ic , UINT16 v);
+ address_space_config m_program_config;
+ address_space_config m_io_config;
+
+ address_space *m_program;
+ direct_read_data *m_direct;
+ address_space *m_io;
+
+ UINT32 get_ea(UINT16 opcode);
+ void do_add(UINT16& addend1 , UINT16 addend2);
+ UINT16 get_skip_addr_sc(UINT16 opcode , UINT16& v , unsigned n);
+ void do_pw(UINT16 opcode);
+ void check_for_interrupts(void);
+ void handle_dma(void);
+
+ UINT16 RIO(UINT8 pa , UINT8 ic);
+ void WIO(UINT8 pa , UINT8 ic , UINT16 v);
};
class hp_5061_3001_cpu_device : public hp_hybrid_cpu_device
{
public:
- hp_5061_3001_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hp_5061_3001_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void set_boot_mode_static(device_t &device, bool mode) { downcast<hp_5061_3001_cpu_device &>(device).m_boot_mode = mode; }
protected:
- virtual void device_start() override;
- virtual void device_reset() override;
- virtual UINT32 execute_max_cycles() const override { return 237; } // FMP 15
-
- static UINT8 do_dec_shift_r(UINT8 d1 , UINT64& mantissa);
- static UINT8 do_dec_shift_l(UINT8 d12 , UINT64& mantissa);
- UINT64 get_ar1(void);
- void set_ar1(UINT64 v);
- UINT64 get_ar2(void) const;
- void set_ar2(UINT64 v);
- UINT64 do_mrxy(UINT64 ar);
- bool do_dec_add(bool carry_in , UINT64& a , UINT64 b);
- void do_mpy(void);
-
- virtual UINT16 execute_no_bpc_ioc(UINT16 opcode) override;
- virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override;
- virtual UINT32 add_mae(aec_cases_t aec_case , UINT16 addr) override;
- virtual UINT16 read_non_common_reg(UINT16 addr) override;
- virtual void write_non_common_reg(UINT16 addr , UINT16 v) override;
+ virtual void device_start() override;
+ virtual void device_reset() override;
+ virtual UINT32 execute_max_cycles() const override { return 237; } // FMP 15
+
+ static UINT8 do_dec_shift_r(UINT8 d1 , UINT64& mantissa);
+ static UINT8 do_dec_shift_l(UINT8 d12 , UINT64& mantissa);
+ UINT64 get_ar1(void);
+ void set_ar1(UINT64 v);
+ UINT64 get_ar2(void) const;
+ void set_ar2(UINT64 v);
+ UINT64 do_mrxy(UINT64 ar);
+ bool do_dec_add(bool carry_in , UINT64& a , UINT64 b);
+ void do_mpy(void);
+
+ virtual UINT16 execute_no_bpc_ioc(UINT16 opcode) override;
+ virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override;
+ virtual UINT32 add_mae(aec_cases_t aec_case , UINT16 addr) override;
+ virtual UINT16 read_non_common_reg(UINT16 addr) override;
+ virtual void write_non_common_reg(UINT16 addr , UINT16 v) override;
private:
- bool m_boot_mode;
-
- // Additional state of processor
- UINT16 m_reg_ar2[ 4 ]; // AR2 register
- UINT16 m_reg_se; // SE register (4 bits)
- UINT16 m_reg_r25; // R25 register
- UINT16 m_reg_r26; // R26 register
- UINT16 m_reg_r27; // R27 register
- UINT16 m_reg_aec[ HP_REG_R37_ADDR - HP_REG_R32_ADDR + 1 ]; // AEC registers R32-R37
+ bool m_boot_mode;
+
+ // Additional state of processor
+ UINT16 m_reg_ar2[ 4 ]; // AR2 register
+ UINT16 m_reg_se; // SE register (4 bits)
+ UINT16 m_reg_r25; // R25 register
+ UINT16 m_reg_r26; // R26 register
+ UINT16 m_reg_r27; // R27 register
+ UINT16 m_reg_aec[ HP_REG_R37_ADDR - HP_REG_R32_ADDR + 1 ]; // AEC registers R32-R37
};
class hp_5061_3011_cpu_device : public hp_hybrid_cpu_device
{
public:
- hp_5061_3011_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hp_5061_3011_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
- virtual UINT32 execute_max_cycles() const override { return 25; }
- virtual UINT16 execute_no_bpc_ioc(UINT16 opcode) override;
- virtual UINT32 add_mae(aec_cases_t aec_case , UINT16 addr) override;
- virtual UINT16 read_non_common_reg(UINT16 addr) override;
- virtual void write_non_common_reg(UINT16 addr , UINT16 v) override;
+ virtual UINT32 execute_max_cycles() const override { return 25; }
+ virtual UINT16 execute_no_bpc_ioc(UINT16 opcode) override;
+ virtual UINT32 add_mae(aec_cases_t aec_case , UINT16 addr) override;
+ virtual UINT16 read_non_common_reg(UINT16 addr) override;
+ virtual void write_non_common_reg(UINT16 addr , UINT16 v) override;
};
diff --git a/src/devices/cpu/hphybrid/hphybrid_dasm.cpp b/src/devices/cpu/hphybrid/hphybrid_dasm.cpp
index 3c6efb68f58..48b03b4afb4 100644
--- a/src/devices/cpu/hphybrid/hphybrid_dasm.cpp
+++ b/src/devices/cpu/hphybrid/hphybrid_dasm.cpp
@@ -20,151 +20,151 @@ typedef struct {
static void addr_2_str(char *buffer , UINT16 addr , bool indirect , bool is_3001)
{
- char *s = buffer + strlen(buffer);
+ char *s = buffer + strlen(buffer);
- s += sprintf(s , "$%04x" , addr);
-
- if (is_3001) {
- switch (addr) {
- case HP_REG_AR1_ADDR:
- strcpy(s , "(Ar1)");
- break;
+ s += sprintf(s , "$%04x" , addr);
- case HP_REG_AR1_ADDR + 1:
- strcpy(s , "(Ar1_2)");
- break;
+ if (is_3001) {
+ switch (addr) {
+ case HP_REG_AR1_ADDR:
+ strcpy(s , "(Ar1)");
+ break;
- case HP_REG_AR1_ADDR + 2:
- strcpy(s , "(Ar1_3)");
- break;
+ case HP_REG_AR1_ADDR + 1:
+ strcpy(s , "(Ar1_2)");
+ break;
- case HP_REG_AR1_ADDR + 3:
- strcpy(s , "(Ar1_4)");
- break;
+ case HP_REG_AR1_ADDR + 2:
+ strcpy(s , "(Ar1_3)");
+ break;
- case HP_REG_AR2_ADDR:
- strcpy(s , "(Ar2)");
- break;
+ case HP_REG_AR1_ADDR + 3:
+ strcpy(s , "(Ar1_4)");
+ break;
- case HP_REG_AR2_ADDR + 1:
- strcpy(s , "(Ar2_2)");
- break;
+ case HP_REG_AR2_ADDR:
+ strcpy(s , "(Ar2)");
+ break;
- case HP_REG_AR2_ADDR + 2:
- strcpy(s , "(Ar2_3)");
- break;
+ case HP_REG_AR2_ADDR + 1:
+ strcpy(s , "(Ar2_2)");
+ break;
- case HP_REG_AR2_ADDR + 3:
- strcpy(s , "(Ar2_4)");
- break;
+ case HP_REG_AR2_ADDR + 2:
+ strcpy(s , "(Ar2_3)");
+ break;
- case HP_REG_SE_ADDR:
- strcpy(s , "(SE)");
- break;
+ case HP_REG_AR2_ADDR + 3:
+ strcpy(s , "(Ar2_4)");
+ break;
- case HP_REG_R25_ADDR:
- strcpy(s , "(R25)");
- break;
-
- case HP_REG_R26_ADDR:
- strcpy(s , "(R26)");
- break;
-
- case HP_REG_R27_ADDR:
- strcpy(s , "(R27)");
- break;
-
- case HP_REG_R32_ADDR:
- strcpy(s , "(R32)");
- break;
-
- case HP_REG_R33_ADDR:
- strcpy(s , "(R33)");
- break;
-
- case HP_REG_R34_ADDR:
- strcpy(s , "(R34)");
- break;
-
- case HP_REG_R35_ADDR:
- strcpy(s , "(R35)");
- break;
-
- case HP_REG_R36_ADDR:
- strcpy(s , "(R36)");
- break;
-
- case HP_REG_R37_ADDR:
- strcpy(s , "(R37)");
- break;
- }
- }
-
- switch (addr) {
- case HP_REG_A_ADDR:
- strcpy(s , "(A)");
- break;
-
- case HP_REG_B_ADDR:
- strcpy(s , "(B)");
- break;
-
- case HP_REG_P_ADDR:
- strcpy(s , "(P)");
- break;
-
- case HP_REG_R_ADDR:
- strcpy(s , "(R)");
- break;
-
- case HP_REG_R4_ADDR:
- strcpy(s , "(R4)");
- break;
-
- case HP_REG_R5_ADDR:
- strcpy(s , "(R5)");
- break;
-
- case HP_REG_R6_ADDR:
- strcpy(s , "(R6)");
- break;
-
- case HP_REG_R7_ADDR:
- strcpy(s , "(R7)");
- break;
-
- case HP_REG_IV_ADDR:
- strcpy(s , "(IV)");
- break;
-
- case HP_REG_PA_ADDR:
- strcpy(s , "(PA)");
- break;
-
- case HP_REG_DMAPA_ADDR:
- strcpy(s , "(DMAPA)");
- break;
-
- case HP_REG_DMAMA_ADDR:
- strcpy(s , "(DMAMA)");
- break;
-
- case HP_REG_DMAC_ADDR:
- strcpy(s , "(DMAC)");
- break;
-
- case HP_REG_C_ADDR:
- strcpy(s , "(C)");
- break;
-
- case HP_REG_D_ADDR:
- strcpy(s , "(D)");
- break;
- }
-
- if (indirect) {
- strcat(s , ",I");
- }
+ case HP_REG_SE_ADDR:
+ strcpy(s , "(SE)");
+ break;
+
+ case HP_REG_R25_ADDR:
+ strcpy(s , "(R25)");
+ break;
+
+ case HP_REG_R26_ADDR:
+ strcpy(s , "(R26)");
+ break;
+
+ case HP_REG_R27_ADDR:
+ strcpy(s , "(R27)");
+ break;
+
+ case HP_REG_R32_ADDR:
+ strcpy(s , "(R32)");
+ break;
+
+ case HP_REG_R33_ADDR:
+ strcpy(s , "(R33)");
+ break;
+
+ case HP_REG_R34_ADDR:
+ strcpy(s , "(R34)");
+ break;
+
+ case HP_REG_R35_ADDR:
+ strcpy(s , "(R35)");
+ break;
+
+ case HP_REG_R36_ADDR:
+ strcpy(s , "(R36)");
+ break;
+
+ case HP_REG_R37_ADDR:
+ strcpy(s , "(R37)");
+ break;
+ }
+ }
+
+ switch (addr) {
+ case HP_REG_A_ADDR:
+ strcpy(s , "(A)");
+ break;
+
+ case HP_REG_B_ADDR:
+ strcpy(s , "(B)");
+ break;
+
+ case HP_REG_P_ADDR:
+ strcpy(s , "(P)");
+ break;
+
+ case HP_REG_R_ADDR:
+ strcpy(s , "(R)");
+ break;
+
+ case HP_REG_R4_ADDR:
+ strcpy(s , "(R4)");
+ break;
+
+ case HP_REG_R5_ADDR:
+ strcpy(s , "(R5)");
+ break;
+
+ case HP_REG_R6_ADDR:
+ strcpy(s , "(R6)");
+ break;
+
+ case HP_REG_R7_ADDR:
+ strcpy(s , "(R7)");
+ break;
+
+ case HP_REG_IV_ADDR:
+ strcpy(s , "(IV)");
+ break;
+
+ case HP_REG_PA_ADDR:
+ strcpy(s , "(PA)");
+ break;
+
+ case HP_REG_DMAPA_ADDR:
+ strcpy(s , "(DMAPA)");
+ break;
+
+ case HP_REG_DMAMA_ADDR:
+ strcpy(s , "(DMAMA)");
+ break;
+
+ case HP_REG_DMAC_ADDR:
+ strcpy(s , "(DMAC)");
+ break;
+
+ case HP_REG_C_ADDR:
+ strcpy(s , "(C)");
+ break;
+
+ case HP_REG_D_ADDR:
+ strcpy(s , "(D)");
+ break;
+ }
+
+ if (indirect) {
+ strcat(s , ",I");
+ }
}
static void param_none(char *buffer , offs_t pc , UINT16 opcode , bool is_3001)
@@ -337,77 +337,76 @@ static const dis_entry_t dis_table[] = {
};
static const dis_entry_t dis_table_emc[] = {
- // *** EMC Instructions ***
- {0xffff , 0x7200 , "MWA" , param_none , 0 },
- {0xffff , 0x7220 , "CMY" , param_none , 0 },
- {0xffff , 0x7260 , "CMX" , param_none , 0 },
- {0xffff , 0x7280 , "FXA" , param_none , 0 },
- {0xfff0 , 0x7300 , "XFR" , param_n16 , 0 },
- {0xffff , 0x7340 , "NRM" , param_none , 0 },
- {0xfff0 , 0x7380 , "CLR" , param_n16 , 0 },
- {0xffff , 0x73c0 , "CDC" , param_none , 0 },
- {0xffc0 , 0x74c0 , "SDS" , param_skip , 0 },
- {0xffc0 , 0x75c0 , "SDC" , param_skip , 0 },
- {0xffff , 0x7a00 , "FMP" , param_none , 0 },
- {0xffff , 0x7a21 , "FDV" , param_none , 0 },
- {0xffff , 0x7b00 , "MRX" , param_none , 0 },
- {0xffff , 0x7b21 , "DRS" , param_none , 0 },
- {0xffff , 0x7b40 , "MRY" , param_none , 0 },
- {0xffff , 0x7b61 , "MLY" , param_none , 0 },
- {0xffff , 0x7b8f , "MPY" , param_none , 0 },
- // *** END ***
- {0 , 0 , nullptr , nullptr , 0 }
+ // *** EMC Instructions ***
+ {0xffff , 0x7200 , "MWA" , param_none , 0 },
+ {0xffff , 0x7220 , "CMY" , param_none , 0 },
+ {0xffff , 0x7260 , "CMX" , param_none , 0 },
+ {0xffff , 0x7280 , "FXA" , param_none , 0 },
+ {0xfff0 , 0x7300 , "XFR" , param_n16 , 0 },
+ {0xffff , 0x7340 , "NRM" , param_none , 0 },
+ {0xfff0 , 0x7380 , "CLR" , param_n16 , 0 },
+ {0xffff , 0x73c0 , "CDC" , param_none , 0 },
+ {0xffc0 , 0x74c0 , "SDS" , param_skip , 0 },
+ {0xffc0 , 0x75c0 , "SDC" , param_skip , 0 },
+ {0xffff , 0x7a00 , "FMP" , param_none , 0 },
+ {0xffff , 0x7a21 , "FDV" , param_none , 0 },
+ {0xffff , 0x7b00 , "MRX" , param_none , 0 },
+ {0xffff , 0x7b21 , "DRS" , param_none , 0 },
+ {0xffff , 0x7b40 , "MRY" , param_none , 0 },
+ {0xffff , 0x7b61 , "MLY" , param_none , 0 },
+ {0xffff , 0x7b8f , "MPY" , param_none , 0 },
+ // *** END ***
+ {0 , 0 , nullptr , nullptr , 0 }
};
static offs_t disassemble_table(UINT16 opcode , offs_t pc , const dis_entry_t *table , bool is_3001 , char *buffer)
{
- const dis_entry_t *p;
-
- for (p = table; p->m_op_mask; p++) {
- if ((opcode & p->m_op_mask) == p->m_opcode) {
- strcpy(buffer , p->m_mnemonic);
- strcat(buffer , " ");
- p->m_param_fn(buffer , pc , opcode , is_3001);
- return 1 | p->m_dasm_flags | DASMFLAG_SUPPORTED;
- }
- }
-
- return 0;
+ const dis_entry_t *p;
+
+ for (p = table; p->m_op_mask; p++) {
+ if ((opcode & p->m_op_mask) == p->m_opcode) {
+ strcpy(buffer , p->m_mnemonic);
+ strcat(buffer , " ");
+ p->m_param_fn(buffer , pc , opcode , is_3001);
+ return 1 | p->m_dasm_flags | DASMFLAG_SUPPORTED;
+ }
+ }
+
+ return 0;
}
CPU_DISASSEMBLE(hp_hybrid)
{
- UINT16 opcode = ((UINT16)oprom[ 0 ] << 8) | oprom[ 1 ];
- offs_t res;
+ UINT16 opcode = ((UINT16)oprom[ 0 ] << 8) | oprom[ 1 ];
+ offs_t res;
- res = disassemble_table(opcode , pc , dis_table , false , buffer);
+ res = disassemble_table(opcode , pc , dis_table , false , buffer);
- if (res == 0) {
- // Unknown opcode
- strcpy(buffer , "???");
- res = 1 | DASMFLAG_SUPPORTED;
- }
+ if (res == 0) {
+ // Unknown opcode
+ strcpy(buffer , "???");
+ res = 1 | DASMFLAG_SUPPORTED;
+ }
- return res;
+ return res;
}
CPU_DISASSEMBLE(hp_5061_3001)
{
- UINT16 opcode = ((UINT16)oprom[ 0 ] << 8) | oprom[ 1 ];
- offs_t res;
+ UINT16 opcode = ((UINT16)oprom[ 0 ] << 8) | oprom[ 1 ];
+ offs_t res;
- res = disassemble_table(opcode , pc , dis_table_emc , true , buffer);
+ res = disassemble_table(opcode , pc , dis_table_emc , true , buffer);
- if (res == 0) {
- res = disassemble_table(opcode , pc , dis_table , true , buffer);
- }
+ if (res == 0) {
+ res = disassemble_table(opcode , pc , dis_table , true , buffer);
+ }
- if (res == 0) {
- // Unknown opcode
- strcpy(buffer , "???");
- res = 1 | DASMFLAG_SUPPORTED;
- }
+ if (res == 0) {
+ // Unknown opcode
+ strcpy(buffer , "???");
+ res = 1 | DASMFLAG_SUPPORTED;
+ }
- return res;
+ return res;
}
-
diff --git a/src/devices/cpu/m68000/m68kfpu.inc b/src/devices/cpu/m68000/m68kfpu.inc
index 133bb898e84..b5275bd314a 100644
--- a/src/devices/cpu/m68000/m68kfpu.inc
+++ b/src/devices/cpu/m68000/m68kfpu.inc
@@ -1681,7 +1681,7 @@ static void fmove_fpcr(m68000_base_device *m68k, UINT16 w2)
int rnd = (REG_FPCR(m68k) >> 4) & 3;
int prec = (REG_FPCR(m68k) >> 6) & 3;
-// m68k->logerror("m68k_fpsp:fmove_fpcr fpcr=%04x prec=%d rnd=%d\n", REG_FPCR(m68k), prec, rnd);
+// m68k->logerror("m68k_fpsp:fmove_fpcr fpcr=%04x prec=%d rnd=%d\n", REG_FPCR(m68k), prec, rnd);
#ifdef FLOATX80
switch (prec)
diff --git a/src/devices/cpu/m6805/m6805.h b/src/devices/cpu/m6805/m6805.h
index a56443f1880..063fe0f4689 100644
--- a/src/devices/cpu/m6805/m6805.h
+++ b/src/devices/cpu/m6805/m6805.h
@@ -119,7 +119,7 @@ protected:
void rorx();
void asrx();
void aslx();
-// void lslx();
+// void lslx();
void rolx();
void decx();
void incx();
diff --git a/src/devices/cpu/patinhofeio/patinho_feio.cpp b/src/devices/cpu/patinhofeio/patinho_feio.cpp
index 9377ad259f8..78fc92a8270 100644
--- a/src/devices/cpu/patinhofeio/patinho_feio.cpp
+++ b/src/devices/cpu/patinhofeio/patinho_feio.cpp
@@ -28,14 +28,14 @@
#define INCREMENT_PC_4K (PC = (PC+1) & ADDRESS_MASK_4K)
unsigned int patinho_feio_cpu_device::compute_effective_address(unsigned int addr){
- unsigned int retval = addr;
- if (m_indirect_addressing){
- retval = READ_WORD_PATINHO(addr);
- if (retval & 0x1000)
- return compute_effective_address(retval & 0xFFF);
- }
-
- return retval;
+ unsigned int retval = addr;
+ if (m_indirect_addressing){
+ retval = READ_WORD_PATINHO(addr);
+ if (retval & 0x1000)
+ return compute_effective_address(retval & 0xFFF);
+ }
+
+ return retval;
}
const device_type PATINHO_FEIO = &device_creator<patinho_feio_cpu_device>;
@@ -43,494 +43,493 @@ const device_type PATINHO_FEIO = &device_creator<patinho_feio_cpu_device>;
//Internal 4kbytes of RAM
static ADDRESS_MAP_START(prog_8bit, AS_PROGRAM, 8, patinho_feio_cpu_device)
- AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("internalram")
+ AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("internalram")
ADDRESS_MAP_END
patinho_feio_cpu_device::patinho_feio_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : cpu_device(mconfig, PATINHO_FEIO, "PATINHO FEIO", tag, owner, clock, "patinho_feio_cpu", __FILE__),
- m_program_config("program", ENDIANNESS_LITTLE, 8, 12, 0, ADDRESS_MAP_NAME(prog_8bit)),
- m_icount(0),
- m_rc_read_cb(*this)
+ : cpu_device(mconfig, PATINHO_FEIO, "PATINHO FEIO", tag, owner, clock, "patinho_feio_cpu", __FILE__),
+ m_program_config("program", ENDIANNESS_LITTLE, 8, 12, 0, ADDRESS_MAP_NAME(prog_8bit)),
+ m_icount(0),
+ m_rc_read_cb(*this)
{
}
UINT16 patinho_feio_cpu_device::read_panel_keys_register(){
- if (!m_rc_read_cb.isnull())
- m_rc = m_rc_read_cb(0);
- else
- m_rc = 0;
+ if (!m_rc_read_cb.isnull())
+ m_rc = m_rc_read_cb(0);
+ else
+ m_rc = 0;
- return m_rc;
+ return m_rc;
}
void patinho_feio_cpu_device::device_start()
{
- m_program = &space(AS_PROGRAM);
-
- save_item(NAME(m_pc));
- save_item(NAME(m_acc));
- save_item(NAME(m_rc));
- save_item(NAME(m_idx));
- save_item(NAME(m_flags));
-
- // Register state for debugger
- state_add( PATINHO_FEIO_CI, "CI", m_pc ).mask(0xFFF);
- state_add( PATINHO_FEIO_RC, "RC", m_rc ).mask(0xFFF);
- state_add( PATINHO_FEIO_ACC, "ACC", m_acc ).mask(0xFF);
- state_add( PATINHO_FEIO_IDX, "IDX", m_idx ).mask(0xFF);
- state_add(STATE_GENPC, "GENPC", m_pc).formatstr("0%06O").noshow();
- state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).noshow().formatstr("%8s");
-
- if (m_rc_read_cb.isnull()){
- fatalerror("Panel keys register not found!");
- } else {
- m_rc_read_cb.resolve();
- }
-
- m_icountptr = &m_icount;
+ m_program = &space(AS_PROGRAM);
+
+ save_item(NAME(m_pc));
+ save_item(NAME(m_acc));
+ save_item(NAME(m_rc));
+ save_item(NAME(m_idx));
+ save_item(NAME(m_flags));
+
+ // Register state for debugger
+ state_add( PATINHO_FEIO_CI, "CI", m_pc ).mask(0xFFF);
+ state_add( PATINHO_FEIO_RC, "RC", m_rc ).mask(0xFFF);
+ state_add( PATINHO_FEIO_ACC, "ACC", m_acc ).mask(0xFF);
+ state_add( PATINHO_FEIO_IDX, "IDX", m_idx ).mask(0xFF);
+ state_add(STATE_GENPC, "GENPC", m_pc).formatstr("0%06O").noshow();
+ state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).noshow().formatstr("%8s");
+
+ if (m_rc_read_cb.isnull()){
+ fatalerror("Panel keys register not found!");
+ } else {
+ m_rc_read_cb.resolve();
+ }
+
+ m_icountptr = &m_icount;
}
void patinho_feio_cpu_device::device_reset()
{
- m_pc = 0x006;
- m_acc = 0;
- m_rc = 0;
- m_idx = READ_INDEX_REG();
- m_flags = 0;
- m_run = true;
- m_scheduled_IND_bit_reset = false;
- m_indirect_addressing = false;
+ m_pc = 0x006;
+ m_acc = 0;
+ m_rc = 0;
+ m_idx = READ_INDEX_REG();
+ m_flags = 0;
+ m_run = true;
+ m_scheduled_IND_bit_reset = false;
+ m_indirect_addressing = false;
}
/* execute instructions on this CPU until icount expires */
void patinho_feio_cpu_device::execute_run()
{
- do
- {
- if ((! m_run)){
- m_icount = 0; /* if processor is stopped, just burn cycles */
- } else {
- m_idx = READ_INDEX_REG();
- read_panel_keys_register();
-
- execute_instruction();
- m_icount --;
- }
- }
- while (m_icount > 0);
+ do
+ {
+ if ((! m_run)){
+ m_icount = 0; /* if processor is stopped, just burn cycles */
+ } else {
+ m_idx = READ_INDEX_REG();
+ read_panel_keys_register();
+
+ execute_instruction();
+ m_icount --;
+ }
+ }
+ while (m_icount > 0);
}
/* execute one instruction */
void patinho_feio_cpu_device::execute_instruction()
{
- debugger_instruction_hook(this, PC);
- offs_t addr;
- bool skip;
- unsigned int tmp;
- unsigned char value, channel, function;
- unsigned char opcode = READ_BYTE_PATINHO(PC);
- INCREMENT_PC_4K;
-
- if (m_scheduled_IND_bit_reset)
- m_indirect_addressing = false;
-
- if (m_indirect_addressing)
- m_scheduled_IND_bit_reset = true;
-
- switch (opcode){
- case 0xD2:
- //XOR: Computes the bitwise XOR of an immediate into the accumulator
- ACC ^= READ_BYTE_PATINHO(PC);
- INCREMENT_PC_4K;
- //TODO: update T and V flags
- return;
- case 0xD4:
- //NAND: Computes the bitwise XOR of an immediate into the accumulator
- ACC = ~(ACC & READ_BYTE_PATINHO(PC));
- INCREMENT_PC_4K;
- //TODO: update T and V flags
- return;
- case 0xD8:
- //SOMI="Soma Imediato":
- // Add an immediate into the accumulator
- ACC += READ_BYTE_PATINHO(PC);
- INCREMENT_PC_4K;
- //TODO: update T and V flags
- return;
- case 0xDA:
- //CARI="Carrega Imediato":
- // Load an immediate into the accumulator
- ACC = READ_BYTE_PATINHO(PC);
- INCREMENT_PC_4K;
- return;
- case 0x80:
- //LIMPO:
- // Clear accumulator and flags
- ACC = 0;
- FLAGS = 0;
- return;
- case 0x81:
- //UM="One":
- // Load 1 into accumulator
- // and clear the flags
- ACC = 1;
- FLAGS = 0;
- return;
- case 0x82:
- //CMP1:
- // Compute One's complement of the accumulator
- // and clear the flags
- ACC = ~ACC;
- FLAGS = 0;
- return;
- case 0x83:
- //CMP2:
- // Compute Two's complement of the accumulator
- // and updates flags according to the result of the operation
- ACC = ~ACC + 1;
- FLAGS = 0; //TODO: fix-me (I'm not sure yet how to compute the flags here)
- return;
- case 0x84:
- //LIM="Limpa":
- // Clear flags
- FLAGS = 0;
- return;
- case 0x85:
- //INC:
- // Increment accumulator
- ACC++;
- FLAGS = 0; //TODO: fix-me (I'm not sure yet how to compute the flags here)
- return;
- case 0x86:
- //UNEG="Um Negativo":
- // Load -1 into accumulator and clear flags
- ACC = -1;
- FLAGS = 0;
- return;
- case 0x87:
- //LIMP1:
- // Clear accumulator, reset T and set V
- ACC = 0;
- FLAGS = V;
- return;
- case 0x88:
- //PNL 0:
- ACC = (RC & 0xFF);
- FLAGS = 0;
- return;
- case 0x89:
- //PNL 1:
- ACC = (RC & 0xFF) + 1;
- //TODO: FLAGS = ?;
- return;
- case 0x8A:
- //PNL 2:
- ACC = (RC & 0xFF) - ACC - 1;
- //TODO: FLAGS = ?;
- return;
- case 0x8B:
- //PNL 3:
- ACC = (RC & 0xFF) - ACC;
- //TODO: FLAGS = ?;
- return;
- case 0x8C:
- //PNL 4:
- ACC = (RC & 0xFF) + ACC;
- //TODO: FLAGS = ?;
- return;
- case 0x8D:
- //PNL 5:
- ACC = (RC & 0xFF) + ACC + 1;
- //TODO: FLAGS = ?;
- return;
- case 0x8E:
- //PNL 6:
- ACC = (RC & 0xFF) - 1;
- //TODO: FLAGS = ?;
- return;
- case 0x8F:
- //PNL 7:
- ACC = (RC & 0xFF);
- FLAGS = V;
- return;
- case 0x9A:
- //INIB="Inibe"
- // disables interrupts
- m_interrupts_enabled = false;
- return;
- case 0x9B:
- //PERM="Permite"
- // enables interrupts
- m_interrupts_enabled = true;
- return;
- case 0x9C:
- //ESP="Espera":
- // Holds execution and waits for an interrupt to occur.
- m_run = false;
- m_wait_for_interrupt = true;
- return;
- case 0x9D:
- //PARE="Pare":
- // Holds execution. This can only be recovered by
- // manually triggering execution again by
- // pressing the "Partida" (start) button in the panel
- m_run = false;
- m_wait_for_interrupt = false;
- return;
- case 0x9E:
- //TRI="Troca com Indexador":
- // Exchange the value of the accumulator with the index register
- value = ACC;
- ACC = READ_INDEX_REG();
- WRITE_INDEX_REG(value);
- return;
- case 0x9F:
- //IND="Enderecamento indireto":
- // Sets memory addressing for the next instruction to be indirect.
- m_indirect_addressing = true;
- m_scheduled_IND_bit_reset = false; //the next instruction execution will schedule it.
- return;
- case 0xD1:
- //Bit-Shift/Bit-Rotate instructions
- value = READ_BYTE_PATINHO(PC);
- INCREMENT_PC_4K;
- for (int i=0; i<4; i++){
- if (value & (1<<i)){
- /* The number of shifts or rotations is determined by the
- ammount of 1 bits in the lower 4 bits of 'value' */
- switch(value & 0xF0)
- {
- case 0x00:
- //DD="Deslocamento para a Direita"
- // Shift right
- FLAGS &= ~V;
- if (ACC & 1)
- FLAGS |= V;
-
- ACC >>= 1;
- break;
- case 0x20:
- //GD="Giro para a Direita"
- // Rotate right
- FLAGS &= ~V;
- if (ACC & 1)
- FLAGS |= V;
-
- ACC = ((ACC & 1) << 7) | (ACC >> 1);
- break;
- case 0x10: //DDV="Deslocamento para a Direita com Vai-um"
- // Shift right with Carry
- case 0x30: //GDV="Giro para a Direita com Vai-um"
- // Rotate right with Carry
-
- //both instructions are equivalent
- if (FLAGS & V)
- tmp = 0x100 | ACC;
- else
- tmp = ACC;
-
- FLAGS &= ~V;
- if (ACC & 1)
- FLAGS |= V;
-
- ACC = tmp >> 1;
- break;
- case 0x40: //DE="Deslocamento para a Esquerda"
- // Shift left
- FLAGS &= ~V;
- if (ACC & (1<<7))
- FLAGS |= V;
-
- ACC <<= 1;
- break;
- case 0x60: //GE="Giro para a Esquerda"
- // Rotate left
- FLAGS &= ~V;
- if (ACC & (1<<7))
- FLAGS |= V;
-
- ACC = (ACC << 1) | ((ACC >> 7) & 1);
- break;
- case 0x50: //DEV="Deslocamento para a Esquerda com Vai-um"
- // Shift left with Carry
- case 0x70: //GEV="Giro para a Esquerda com Vai-um"
- // Rotate left with Carry
-
- //both instructions are equivalent
- if (FLAGS & V)
- tmp = (ACC << 1) | 1;
- else
- tmp = (ACC << 1);
-
- FLAGS &= ~V;
- if (tmp & (1<<8))
- FLAGS |= V;
-
- ACC = tmp & 0xFF;
- break;
- case 0x80: //DDS="Deslocamento para a Direita com duplicacao de Sinal"
- // Rotate right with signal duplication
- FLAGS &= ~V;
- if (ACC & 1)
- FLAGS |= V;
-
- ACC = (ACC & (1 << 7)) | ACC >> 1;
- break;
- default:
- printf("Illegal instruction: %02X %02X\n", opcode, value);
- return;
- }
- }
- }
- return;
- }
-
- switch (opcode & 0xF0){
- case 0x00:
- //PLA = "Pula": Jump to address
- addr = compute_effective_address((opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC));
- INCREMENT_PC_4K;
- PC = addr;
- return;
- case 0x10:
- //PLAX = "Pula indexado": Jump to indexed address
- tmp = (opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC);
- INCREMENT_PC_4K;
- m_idx = READ_INDEX_REG();
- PC = compute_effective_address(m_idx + tmp);
- return;
- case 0x20:
- //ARM = "Armazena": Store the value of the accumulator into a given memory position
- addr = compute_effective_address((opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC));
- INCREMENT_PC_4K;
- WRITE_BYTE_PATINHO(addr, ACC);
- return;
- case 0x30:
- //ARMX = "Armazena indexado": Store the value of the accumulator into a given indexed memory position
- tmp = (opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC);
- INCREMENT_PC_4K;
- m_idx = READ_INDEX_REG();
- addr = compute_effective_address(m_idx + tmp);
- WRITE_BYTE_PATINHO(addr, ACC);
- return;
- case 0x40:
- //CAR = "Carrega": Load a value from a given memory position into the accumulator
- addr = compute_effective_address((opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC));
- INCREMENT_PC_4K;
- ACC = READ_BYTE_PATINHO(addr);
- return;
- case 0x50:
- //CARX = "Carga indexada": Load a value from a given indexed memory position into the accumulator
- tmp = (opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC);
- INCREMENT_PC_4K;
- m_idx = READ_INDEX_REG();
- addr = compute_effective_address(m_idx + tmp);
- ACC = READ_BYTE_PATINHO(addr);
- return;
- case 0x60:
- //SOM = "Soma": Add a value from a given memory position into the accumulator
- addr = compute_effective_address((opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC));
- INCREMENT_PC_4K;
- ACC += READ_BYTE_PATINHO(addr);
- //TODO: update V and T flags
- return;
- case 0x70:
- //SOMX = "Soma indexada": Add a value from a given indexed memory position into the accumulator
- tmp = (opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC);
- INCREMENT_PC_4K;
- m_idx = READ_INDEX_REG();
- addr = compute_effective_address(m_idx + tmp);
- ACC += READ_BYTE_PATINHO(addr);
- //TODO: update V and T flags
- return;
- case 0xA0:
- //PLAN = "Pula se ACC negativo": Jump to a given address if ACC is negative
- addr = compute_effective_address((opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC));
- INCREMENT_PC_4K;
- if ((signed char) ACC < 0)
- PC = addr;
- return;
- case 0xB0:
- //PLAZ = "Pula se ACC for zero": Jump to a given address if ACC is zero
- addr = compute_effective_address((opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC));
- INCREMENT_PC_4K;
- if (ACC == 0)
- PC = addr;
- return;
- case 0xC0:
- //Executes I/O functions
- //TODO: Implement-me!
- value = READ_BYTE_PATINHO(PC);
- INCREMENT_PC_4K;
- channel = opcode & 0x0F;
- function = value & 0x0F;
- switch(value & 0xF0){
- case 0x10:
- printf("Unimplemented FNC /%X%X instruction\n", channel, function);
- break;
- case 0x20:
- //SAL="Salta"
- // Skips a couple bytes if a condition is met
- skip = false;
- switch(function)
- {
- case 1:
- if (m_peripherals[channel].io_status == DEVICE_READY)
- skip = true;
- break;
- case 2:
- if (m_peripherals[channel].device_is_ok)
- skip = true;
- break;
- case 4:
- if (m_peripherals[channel].IRQ_request == true)
- skip = true;
- break;
- }
-
- if (skip){
- INCREMENT_PC_4K;
- INCREMENT_PC_4K;
- }
- break;
- case 0x40:
- printf("Unimplemented ENTR /%X0 instruction\n", channel);
- break;
- case 0x80:
- printf("Unimplemented SAI /%X0 instruction (ACC = 0x%02X '%c')\n", channel, ACC, ACC);
- break;
- }
- return;
- case 0xE0:
- //SUS = "Subtrai um ou Salta": Subtract one from the data in the given address
- // or, if the data is zero, then simply skip a couple bytes.
- addr = compute_effective_address((opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC));
- INCREMENT_PC_4K;
- value = READ_BYTE_PATINHO(addr);
- if (value > 0){
- WRITE_BYTE_PATINHO(addr, value-1);
- } else {
- INCREMENT_PC_4K;
- INCREMENT_PC_4K;
- }
- return;
- case 0xF0:
- //PUG = "Pula e guarda": Jump and store.
- // It stores the return address to addr and addr+1
- // And then jumps to addr+2
- addr = compute_effective_address((opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC));
- INCREMENT_PC_4K;
- WRITE_BYTE_PATINHO(addr, (PC >> 8) & 0x0F);
- WRITE_BYTE_PATINHO(addr+1, PC & 0xFF);
- PC = addr+2;
- return;
- }
- printf("unimplemented opcode: 0x%02X\n", opcode);
+ debugger_instruction_hook(this, PC);
+ offs_t addr;
+ bool skip;
+ unsigned int tmp;
+ unsigned char value, channel, function;
+ unsigned char opcode = READ_BYTE_PATINHO(PC);
+ INCREMENT_PC_4K;
+
+ if (m_scheduled_IND_bit_reset)
+ m_indirect_addressing = false;
+
+ if (m_indirect_addressing)
+ m_scheduled_IND_bit_reset = true;
+
+ switch (opcode){
+ case 0xD2:
+ //XOR: Computes the bitwise XOR of an immediate into the accumulator
+ ACC ^= READ_BYTE_PATINHO(PC);
+ INCREMENT_PC_4K;
+ //TODO: update T and V flags
+ return;
+ case 0xD4:
+ //NAND: Computes the bitwise XOR of an immediate into the accumulator
+ ACC = ~(ACC & READ_BYTE_PATINHO(PC));
+ INCREMENT_PC_4K;
+ //TODO: update T and V flags
+ return;
+ case 0xD8:
+ //SOMI="Soma Imediato":
+ // Add an immediate into the accumulator
+ ACC += READ_BYTE_PATINHO(PC);
+ INCREMENT_PC_4K;
+ //TODO: update T and V flags
+ return;
+ case 0xDA:
+ //CARI="Carrega Imediato":
+ // Load an immediate into the accumulator
+ ACC = READ_BYTE_PATINHO(PC);
+ INCREMENT_PC_4K;
+ return;
+ case 0x80:
+ //LIMPO:
+ // Clear accumulator and flags
+ ACC = 0;
+ FLAGS = 0;
+ return;
+ case 0x81:
+ //UM="One":
+ // Load 1 into accumulator
+ // and clear the flags
+ ACC = 1;
+ FLAGS = 0;
+ return;
+ case 0x82:
+ //CMP1:
+ // Compute One's complement of the accumulator
+ // and clear the flags
+ ACC = ~ACC;
+ FLAGS = 0;
+ return;
+ case 0x83:
+ //CMP2:
+ // Compute Two's complement of the accumulator
+ // and updates flags according to the result of the operation
+ ACC = ~ACC + 1;
+ FLAGS = 0; //TODO: fix-me (I'm not sure yet how to compute the flags here)
+ return;
+ case 0x84:
+ //LIM="Limpa":
+ // Clear flags
+ FLAGS = 0;
+ return;
+ case 0x85:
+ //INC:
+ // Increment accumulator
+ ACC++;
+ FLAGS = 0; //TODO: fix-me (I'm not sure yet how to compute the flags here)
+ return;
+ case 0x86:
+ //UNEG="Um Negativo":
+ // Load -1 into accumulator and clear flags
+ ACC = -1;
+ FLAGS = 0;
+ return;
+ case 0x87:
+ //LIMP1:
+ // Clear accumulator, reset T and set V
+ ACC = 0;
+ FLAGS = V;
+ return;
+ case 0x88:
+ //PNL 0:
+ ACC = (RC & 0xFF);
+ FLAGS = 0;
+ return;
+ case 0x89:
+ //PNL 1:
+ ACC = (RC & 0xFF) + 1;
+ //TODO: FLAGS = ?;
+ return;
+ case 0x8A:
+ //PNL 2:
+ ACC = (RC & 0xFF) - ACC - 1;
+ //TODO: FLAGS = ?;
+ return;
+ case 0x8B:
+ //PNL 3:
+ ACC = (RC & 0xFF) - ACC;
+ //TODO: FLAGS = ?;
+ return;
+ case 0x8C:
+ //PNL 4:
+ ACC = (RC & 0xFF) + ACC;
+ //TODO: FLAGS = ?;
+ return;
+ case 0x8D:
+ //PNL 5:
+ ACC = (RC & 0xFF) + ACC + 1;
+ //TODO: FLAGS = ?;
+ return;
+ case 0x8E:
+ //PNL 6:
+ ACC = (RC & 0xFF) - 1;
+ //TODO: FLAGS = ?;
+ return;
+ case 0x8F:
+ //PNL 7:
+ ACC = (RC & 0xFF);
+ FLAGS = V;
+ return;
+ case 0x9A:
+ //INIB="Inibe"
+ // disables interrupts
+ m_interrupts_enabled = false;
+ return;
+ case 0x9B:
+ //PERM="Permite"
+ // enables interrupts
+ m_interrupts_enabled = true;
+ return;
+ case 0x9C:
+ //ESP="Espera":
+ // Holds execution and waits for an interrupt to occur.
+ m_run = false;
+ m_wait_for_interrupt = true;
+ return;
+ case 0x9D:
+ //PARE="Pare":
+ // Holds execution. This can only be recovered by
+ // manually triggering execution again by
+ // pressing the "Partida" (start) button in the panel
+ m_run = false;
+ m_wait_for_interrupt = false;
+ return;
+ case 0x9E:
+ //TRI="Troca com Indexador":
+ // Exchange the value of the accumulator with the index register
+ value = ACC;
+ ACC = READ_INDEX_REG();
+ WRITE_INDEX_REG(value);
+ return;
+ case 0x9F:
+ //IND="Enderecamento indireto":
+ // Sets memory addressing for the next instruction to be indirect.
+ m_indirect_addressing = true;
+ m_scheduled_IND_bit_reset = false; //the next instruction execution will schedule it.
+ return;
+ case 0xD1:
+ //Bit-Shift/Bit-Rotate instructions
+ value = READ_BYTE_PATINHO(PC);
+ INCREMENT_PC_4K;
+ for (int i=0; i<4; i++){
+ if (value & (1<<i)){
+ /* The number of shifts or rotations is determined by the
+ ammount of 1 bits in the lower 4 bits of 'value' */
+ switch(value & 0xF0)
+ {
+ case 0x00:
+ //DD="Deslocamento para a Direita"
+ // Shift right
+ FLAGS &= ~V;
+ if (ACC & 1)
+ FLAGS |= V;
+
+ ACC >>= 1;
+ break;
+ case 0x20:
+ //GD="Giro para a Direita"
+ // Rotate right
+ FLAGS &= ~V;
+ if (ACC & 1)
+ FLAGS |= V;
+
+ ACC = ((ACC & 1) << 7) | (ACC >> 1);
+ break;
+ case 0x10: //DDV="Deslocamento para a Direita com Vai-um"
+ // Shift right with Carry
+ case 0x30: //GDV="Giro para a Direita com Vai-um"
+ // Rotate right with Carry
+
+ //both instructions are equivalent
+ if (FLAGS & V)
+ tmp = 0x100 | ACC;
+ else
+ tmp = ACC;
+
+ FLAGS &= ~V;
+ if (ACC & 1)
+ FLAGS |= V;
+
+ ACC = tmp >> 1;
+ break;
+ case 0x40: //DE="Deslocamento para a Esquerda"
+ // Shift left
+ FLAGS &= ~V;
+ if (ACC & (1<<7))
+ FLAGS |= V;
+
+ ACC <<= 1;
+ break;
+ case 0x60: //GE="Giro para a Esquerda"
+ // Rotate left
+ FLAGS &= ~V;
+ if (ACC & (1<<7))
+ FLAGS |= V;
+
+ ACC = (ACC << 1) | ((ACC >> 7) & 1);
+ break;
+ case 0x50: //DEV="Deslocamento para a Esquerda com Vai-um"
+ // Shift left with Carry
+ case 0x70: //GEV="Giro para a Esquerda com Vai-um"
+ // Rotate left with Carry
+
+ //both instructions are equivalent
+ if (FLAGS & V)
+ tmp = (ACC << 1) | 1;
+ else
+ tmp = (ACC << 1);
+
+ FLAGS &= ~V;
+ if (tmp & (1<<8))
+ FLAGS |= V;
+
+ ACC = tmp & 0xFF;
+ break;
+ case 0x80: //DDS="Deslocamento para a Direita com duplicacao de Sinal"
+ // Rotate right with signal duplication
+ FLAGS &= ~V;
+ if (ACC & 1)
+ FLAGS |= V;
+
+ ACC = (ACC & (1 << 7)) | ACC >> 1;
+ break;
+ default:
+ printf("Illegal instruction: %02X %02X\n", opcode, value);
+ return;
+ }
+ }
+ }
+ return;
+ }
+
+ switch (opcode & 0xF0){
+ case 0x00:
+ //PLA = "Pula": Jump to address
+ addr = compute_effective_address((opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC));
+ INCREMENT_PC_4K;
+ PC = addr;
+ return;
+ case 0x10:
+ //PLAX = "Pula indexado": Jump to indexed address
+ tmp = (opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC);
+ INCREMENT_PC_4K;
+ m_idx = READ_INDEX_REG();
+ PC = compute_effective_address(m_idx + tmp);
+ return;
+ case 0x20:
+ //ARM = "Armazena": Store the value of the accumulator into a given memory position
+ addr = compute_effective_address((opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC));
+ INCREMENT_PC_4K;
+ WRITE_BYTE_PATINHO(addr, ACC);
+ return;
+ case 0x30:
+ //ARMX = "Armazena indexado": Store the value of the accumulator into a given indexed memory position
+ tmp = (opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC);
+ INCREMENT_PC_4K;
+ m_idx = READ_INDEX_REG();
+ addr = compute_effective_address(m_idx + tmp);
+ WRITE_BYTE_PATINHO(addr, ACC);
+ return;
+ case 0x40:
+ //CAR = "Carrega": Load a value from a given memory position into the accumulator
+ addr = compute_effective_address((opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC));
+ INCREMENT_PC_4K;
+ ACC = READ_BYTE_PATINHO(addr);
+ return;
+ case 0x50:
+ //CARX = "Carga indexada": Load a value from a given indexed memory position into the accumulator
+ tmp = (opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC);
+ INCREMENT_PC_4K;
+ m_idx = READ_INDEX_REG();
+ addr = compute_effective_address(m_idx + tmp);
+ ACC = READ_BYTE_PATINHO(addr);
+ return;
+ case 0x60:
+ //SOM = "Soma": Add a value from a given memory position into the accumulator
+ addr = compute_effective_address((opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC));
+ INCREMENT_PC_4K;
+ ACC += READ_BYTE_PATINHO(addr);
+ //TODO: update V and T flags
+ return;
+ case 0x70:
+ //SOMX = "Soma indexada": Add a value from a given indexed memory position into the accumulator
+ tmp = (opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC);
+ INCREMENT_PC_4K;
+ m_idx = READ_INDEX_REG();
+ addr = compute_effective_address(m_idx + tmp);
+ ACC += READ_BYTE_PATINHO(addr);
+ //TODO: update V and T flags
+ return;
+ case 0xA0:
+ //PLAN = "Pula se ACC negativo": Jump to a given address if ACC is negative
+ addr = compute_effective_address((opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC));
+ INCREMENT_PC_4K;
+ if ((signed char) ACC < 0)
+ PC = addr;
+ return;
+ case 0xB0:
+ //PLAZ = "Pula se ACC for zero": Jump to a given address if ACC is zero
+ addr = compute_effective_address((opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC));
+ INCREMENT_PC_4K;
+ if (ACC == 0)
+ PC = addr;
+ return;
+ case 0xC0:
+ //Executes I/O functions
+ //TODO: Implement-me!
+ value = READ_BYTE_PATINHO(PC);
+ INCREMENT_PC_4K;
+ channel = opcode & 0x0F;
+ function = value & 0x0F;
+ switch(value & 0xF0){
+ case 0x10:
+ printf("Unimplemented FNC /%X%X instruction\n", channel, function);
+ break;
+ case 0x20:
+ //SAL="Salta"
+ // Skips a couple bytes if a condition is met
+ skip = false;
+ switch(function)
+ {
+ case 1:
+ if (m_peripherals[channel].io_status == DEVICE_READY)
+ skip = true;
+ break;
+ case 2:
+ if (m_peripherals[channel].device_is_ok)
+ skip = true;
+ break;
+ case 4:
+ if (m_peripherals[channel].IRQ_request == true)
+ skip = true;
+ break;
+ }
+
+ if (skip){
+ INCREMENT_PC_4K;
+ INCREMENT_PC_4K;
+ }
+ break;
+ case 0x40:
+ printf("Unimplemented ENTR /%X0 instruction\n", channel);
+ break;
+ case 0x80:
+ printf("Unimplemented SAI /%X0 instruction (ACC = 0x%02X '%c')\n", channel, ACC, ACC);
+ break;
+ }
+ return;
+ case 0xE0:
+ //SUS = "Subtrai um ou Salta": Subtract one from the data in the given address
+ // or, if the data is zero, then simply skip a couple bytes.
+ addr = compute_effective_address((opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC));
+ INCREMENT_PC_4K;
+ value = READ_BYTE_PATINHO(addr);
+ if (value > 0){
+ WRITE_BYTE_PATINHO(addr, value-1);
+ } else {
+ INCREMENT_PC_4K;
+ INCREMENT_PC_4K;
+ }
+ return;
+ case 0xF0:
+ //PUG = "Pula e guarda": Jump and store.
+ // It stores the return address to addr and addr+1
+ // And then jumps to addr+2
+ addr = compute_effective_address((opcode & 0x0F) << 8 | READ_BYTE_PATINHO(PC));
+ INCREMENT_PC_4K;
+ WRITE_BYTE_PATINHO(addr, (PC >> 8) & 0x0F);
+ WRITE_BYTE_PATINHO(addr+1, PC & 0xFF);
+ PC = addr+2;
+ return;
+ }
+ printf("unimplemented opcode: 0x%02X\n", opcode);
}
offs_t patinho_feio_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options)
{
- extern CPU_DISASSEMBLE( patinho_feio );
- return CPU_DISASSEMBLE_NAME(patinho_feio)(this, buffer, pc, oprom, opram, options);
+ extern CPU_DISASSEMBLE( patinho_feio );
+ return CPU_DISASSEMBLE_NAME(patinho_feio)(this, buffer, pc, oprom, opram, options);
}
-
diff --git a/src/devices/cpu/patinhofeio/patinho_feio.h b/src/devices/cpu/patinhofeio/patinho_feio.h
index 030077ea78e..df80799d592 100644
--- a/src/devices/cpu/patinhofeio/patinho_feio.h
+++ b/src/devices/cpu/patinhofeio/patinho_feio.h
@@ -6,99 +6,99 @@
#define __PATINHOFEIO_H__
#define MCFG_PATINHO_RC_READ_CB(_devcb) \
- devcb = &patinho_feio_cpu_device::set_rc_read_callback(*device, DEVCB_##_devcb);
+ devcb = &patinho_feio_cpu_device::set_rc_read_callback(*device, DEVCB_##_devcb);
/* register IDs */
enum
{
- PATINHO_FEIO_CI=1, PATINHO_FEIO_ACC, PATINHO_FEIO_IDX, PATINHO_FEIO_RC
+ PATINHO_FEIO_CI=1, PATINHO_FEIO_ACC, PATINHO_FEIO_IDX, PATINHO_FEIO_RC
};
enum {
- DEVICE_BUSY=0,
- DEVICE_READY=1
+ DEVICE_BUSY=0,
+ DEVICE_READY=1
};
class patinho_feio_peripheral
{
public:
- patinho_feio_peripheral()
- : io_status(DEVICE_READY)
- , device_is_ok(true)
- , IRQ_request(false)
- { };
-
- int io_status;
- bool device_is_ok;
- bool IRQ_request;
+ patinho_feio_peripheral()
+ : io_status(DEVICE_READY)
+ , device_is_ok(true)
+ , IRQ_request(false)
+ { };
+
+ int io_status;
+ bool device_is_ok;
+ bool IRQ_request;
};
class patinho_feio_cpu_device : public cpu_device
{
public:
- // construction/destruction
- patinho_feio_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
+ // construction/destruction
+ patinho_feio_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
- template<class _Object> static devcb_base &set_rc_read_callback(device_t &device, _Object object) { return downcast<patinho_feio_cpu_device &>(device).m_rc_read_cb.set_callback(object); }
+ template<class _Object> static devcb_base &set_rc_read_callback(device_t &device, _Object object) { return downcast<patinho_feio_cpu_device &>(device).m_rc_read_cb.set_callback(object); }
protected:
-
- virtual void execute_run() override;
- virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override;
- address_space_config m_program_config;
+ virtual void execute_run() override;
+ virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override;
- /* processor registers */
- unsigned char m_acc; /* accumulator (8 bits) */
- unsigned int m_pc; /* program counter (12 bits)
+ address_space_config m_program_config;
+
+ /* processor registers */
+ unsigned char m_acc; /* accumulator (8 bits) */
+ unsigned int m_pc; /* program counter (12 bits)
* Actual register name is CI, which
* stands for "Contador de Instrucao"
* or "instructions counter".
*/
- unsigned int m_rc; /* RC = "Registrador de Chaves" (Keys Register)
+ unsigned int m_rc; /* RC = "Registrador de Chaves" (Keys Register)
* It represents the 12 bits of input data
* from toggle switches in the computer panel
*/
- unsigned char m_idx;
+ unsigned char m_idx;
+
+ /* processor state flip-flops */
+ bool m_run; /* processor is running */
+ bool m_wait_for_interrupt;
+ bool m_interrupts_enabled;
+ bool m_scheduled_IND_bit_reset;
+ bool m_indirect_addressing;
- /* processor state flip-flops */
- bool m_run; /* processor is running */
- bool m_wait_for_interrupt;
- bool m_interrupts_enabled;
- bool m_scheduled_IND_bit_reset;
- bool m_indirect_addressing;
+ int m_flags;
+ // V = "Vai um" (Carry flag)
+ // T = "Transbordo" (Overflow flag)
- int m_flags;
- // V = "Vai um" (Carry flag)
- // T = "Transbordo" (Overflow flag)
-
- patinho_feio_peripheral m_peripherals[16];
+ patinho_feio_peripheral m_peripherals[16];
- int m_address_mask; /* address mask */
- int m_icount;
+ int m_address_mask; /* address mask */
+ int m_icount;
- address_space *m_program;
+ address_space *m_program;
- // device-level overrides
- virtual void device_start() override;
- virtual void device_reset() override;
+ // device-level overrides
+ virtual void device_start() override;
+ virtual void device_reset() override;
- // device_execute_interface overrides
- virtual UINT32 execute_min_cycles() const override { return 1; }
- virtual UINT32 execute_max_cycles() const override { return 2; }
+ // device_execute_interface overrides
+ virtual UINT32 execute_min_cycles() const override { return 1; }
+ virtual UINT32 execute_max_cycles() const override { return 2; }
- // device_memory_interface overrides
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
+ // device_memory_interface overrides
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
- // device_disasm_interface overrides
- virtual UINT32 disasm_min_opcode_bytes() const override { return 1; }
- virtual UINT32 disasm_max_opcode_bytes() const override { return 2; }
+ // device_disasm_interface overrides
+ virtual UINT32 disasm_min_opcode_bytes() const override { return 1; }
+ virtual UINT32 disasm_max_opcode_bytes() const override { return 2; }
private:
- void execute_instruction();
- unsigned int compute_effective_address(unsigned int addr);
- UINT16 read_panel_keys_register();
- devcb_read16 m_rc_read_cb;
+ void execute_instruction();
+ unsigned int compute_effective_address(unsigned int addr);
+ UINT16 read_panel_keys_register();
+ devcb_read16 m_rc_read_cb;
};
diff --git a/src/devices/cpu/patinhofeio/patinho_feio_dasm.cpp b/src/devices/cpu/patinhofeio/patinho_feio_dasm.cpp
index ac78ef4be73..f2f2899af6e 100644
--- a/src/devices/cpu/patinhofeio/patinho_feio_dasm.cpp
+++ b/src/devices/cpu/patinhofeio/patinho_feio_dasm.cpp
@@ -5,161 +5,161 @@
CPU_DISASSEMBLE( patinho_feio )
{
- int addr, value, n, f;
+ int addr, value, n, f;
- switch (oprom[0] & 0xF0)
- {
- case 0x00:
- //PLA = "Pula": Unconditionally JUMP to effective address
- addr = (oprom[0] & 0x0F) << 8 | oprom[1];
- sprintf (buffer, "PLA /%03X", addr);
- return 2;
- case 0x10:
- //PLAX = "Pulo indexado": Unconditionally JUMP to indexed address
- addr = (oprom[0] & 0x0F) << 8 | oprom[1];
- sprintf (buffer, "PLAX (IDX) + /%03X", addr);
- return 2;
- case 0x20:
- //ARM = "Armazena": Stores the contents of the
- // accumulator in the given 12bit address
- addr = (oprom[0] & 0x0F) << 8 | oprom[1];
- if (addr==0){
- sprintf (buffer, "ARM (IDX)");
- }else{
- sprintf (buffer, "ARM /%03X", addr);
- }
- return 2;
- case 0x30:
- //ARMX = "Armazenamento indexado": Stores the contents of the accumulator in the
- // given 12bit address (indexed by IDX)
- addr = (oprom[0] & 0x0F) << 8 | oprom[1];
- sprintf (buffer, "ARMX (IDX) + /%03X", addr);
- return 2;
- case 0x40:
- //CAR = "Carrega": Loads the contents of the given 12bit address
- // into the accumulator
- addr = (oprom[0] & 0x0F) << 8 | oprom[1];
- if (addr==0){
- sprintf (buffer, "CAR (IDX)");
- }else{
- sprintf (buffer, "CAR /%03X", addr);
- }
- return 2;
- case 0x50:
- //CARX = "Carga indexada": Loads the contents of the given 12bit address
- // (indexed by IDX) into the accumulator
- addr = (oprom[0] & 0x0F) << 8 | oprom[1];
- sprintf (buffer, "CARX (IDX) + /%03X", addr);
- return 2;
- case 0x60:
- //SOM = "Soma": Adds the contents of the given 12bit address
- // into the accumulator
- addr = (oprom[0] & 0x0F) << 8 | oprom[1];
- sprintf (buffer, "SOM /%03X", addr);
- return 2;
- case 0x70:
- //SOMX = "Soma indexada": Adds the contents of the given 12bit address
- // (indexed by IDX) into the accumulator
- addr = (oprom[0] & 0x0F) << 8 | oprom[1];
- sprintf (buffer, "SOMX (IDX) + /%03X", addr);
- return 2;
- case 0xA0:
- //PLAN = "Pula se ACC for negativo": Jumps to the 12bit address
- // if the accumulator is negative
- addr = (oprom[0] & 0x0F) << 8 | oprom[1];
- sprintf (buffer, "PLAN /%03X", addr);
- return 2;
- case 0xB0:
- //PLAZ = "Pula se ACC for zero": Jumps to the 12bit address
- // if the accumulator is zero
- addr = (oprom[0] & 0x0F) << 8 | oprom[1];
- sprintf (buffer, "PLAZ /%03X", addr);
- return 2;
- case 0xC0:
- n = (oprom[0] & 0x0F);
- f = (oprom[1] & 0x0F);
- n+= (n < 10) ? '0' : 'A'-10;
- f+= (f < 10) ? '0' : 'A'-10;
- switch(oprom[1] & 0xF0)
- {
- case 0x10: sprintf (buffer, "FNC /%c%c", n, f); return 2;
- case 0x20: sprintf (buffer, "SAL /%c%c", n, f); return 2;
- case 0x40: sprintf (buffer, "ENTR /%c0", n); return 2;
- case 0x80: sprintf (buffer, "SAI /%c0", n); return 2;
- }
- break;
- case 0xD0:
- value = oprom[1] & 0x0F;
- switch (oprom[0] & 0x0F)
- {
- case 0x01:
- switch (oprom[1] & 0xF0)
- {
- case 0x00: sprintf (buffer, "DD /%01X", value); return 2; //DD = "Deslocamento para a direita": Shift right
- case 0x10: sprintf (buffer, "DDV /%01X", value); return 2; //DDV = "Deslocamento para a direita c/ V": Shift right with carry
- case 0x20: sprintf (buffer, "GD /%01X", value); return 2; //GD = "Giro para a direita": Rotate right
- case 0x30: sprintf (buffer, "GDV /%01X", value); return 2; //GDV = "Giro para a direita c/ V": Rotate right with carry
- case 0x40: sprintf (buffer, "DE /%01X", value); return 2; //DE = "Deslocamento para a esquerda": Shift right
- case 0x50: sprintf (buffer, "DEV /%01X", value); return 2; //DEV = "Deslocamento para a esquerda c/ V": Shift right with carry
- case 0x60: sprintf (buffer, "GE /%01X", value); return 2; //GE = "Giro para a esquerda": Rotate right
- case 0x70: sprintf (buffer, "GEV /%01X", value); return 2; //GEV = "Giro para a esquerda c/ V": Rotate right with carry
- case 0x80: sprintf (buffer, "DDS /%01X", value); return 2; //DDS = "Deslocamento para a direita com duplicacao de sinal": Shift right with sign duplication
- }
- break;
- case 0x02: sprintf (buffer, "XOR /%02X", oprom[1]); return 2; //Logical XOR
- case 0x04: sprintf (buffer, "NAND /%02X", oprom[1]); return 2; //Logical NAND
- case 0x08: sprintf (buffer, "SOMI /%02X", oprom[1]); return 2; //SOMI = "Soma imediata": Add immediate value into accumulator
- case 0x0A: sprintf (buffer, "CARI /%02X", oprom[1]); return 2; //CARI = "Carrega imediato": Loads an immediate value into the accumulator
- }
- break;
- case 0xE0:
- //SUS = "Subtrai um ou salta"
- addr = (oprom[0] & 0x0F) << 8 | oprom[1];
- sprintf (buffer, "SUS /%03X", addr);
- return 2;
- case 0xF0:
- //PUG = "Pula e guarda"
- addr = (oprom[0] & 0x0F) << 8 | oprom[1];
- sprintf (buffer, "PUG /%03X", addr);
- return 2;
- }
+ switch (oprom[0] & 0xF0)
+ {
+ case 0x00:
+ //PLA = "Pula": Unconditionally JUMP to effective address
+ addr = (oprom[0] & 0x0F) << 8 | oprom[1];
+ sprintf (buffer, "PLA /%03X", addr);
+ return 2;
+ case 0x10:
+ //PLAX = "Pulo indexado": Unconditionally JUMP to indexed address
+ addr = (oprom[0] & 0x0F) << 8 | oprom[1];
+ sprintf (buffer, "PLAX (IDX) + /%03X", addr);
+ return 2;
+ case 0x20:
+ //ARM = "Armazena": Stores the contents of the
+ // accumulator in the given 12bit address
+ addr = (oprom[0] & 0x0F) << 8 | oprom[1];
+ if (addr==0){
+ sprintf (buffer, "ARM (IDX)");
+ }else{
+ sprintf (buffer, "ARM /%03X", addr);
+ }
+ return 2;
+ case 0x30:
+ //ARMX = "Armazenamento indexado": Stores the contents of the accumulator in the
+ // given 12bit address (indexed by IDX)
+ addr = (oprom[0] & 0x0F) << 8 | oprom[1];
+ sprintf (buffer, "ARMX (IDX) + /%03X", addr);
+ return 2;
+ case 0x40:
+ //CAR = "Carrega": Loads the contents of the given 12bit address
+ // into the accumulator
+ addr = (oprom[0] & 0x0F) << 8 | oprom[1];
+ if (addr==0){
+ sprintf (buffer, "CAR (IDX)");
+ }else{
+ sprintf (buffer, "CAR /%03X", addr);
+ }
+ return 2;
+ case 0x50:
+ //CARX = "Carga indexada": Loads the contents of the given 12bit address
+ // (indexed by IDX) into the accumulator
+ addr = (oprom[0] & 0x0F) << 8 | oprom[1];
+ sprintf (buffer, "CARX (IDX) + /%03X", addr);
+ return 2;
+ case 0x60:
+ //SOM = "Soma": Adds the contents of the given 12bit address
+ // into the accumulator
+ addr = (oprom[0] & 0x0F) << 8 | oprom[1];
+ sprintf (buffer, "SOM /%03X", addr);
+ return 2;
+ case 0x70:
+ //SOMX = "Soma indexada": Adds the contents of the given 12bit address
+ // (indexed by IDX) into the accumulator
+ addr = (oprom[0] & 0x0F) << 8 | oprom[1];
+ sprintf (buffer, "SOMX (IDX) + /%03X", addr);
+ return 2;
+ case 0xA0:
+ //PLAN = "Pula se ACC for negativo": Jumps to the 12bit address
+ // if the accumulator is negative
+ addr = (oprom[0] & 0x0F) << 8 | oprom[1];
+ sprintf (buffer, "PLAN /%03X", addr);
+ return 2;
+ case 0xB0:
+ //PLAZ = "Pula se ACC for zero": Jumps to the 12bit address
+ // if the accumulator is zero
+ addr = (oprom[0] & 0x0F) << 8 | oprom[1];
+ sprintf (buffer, "PLAZ /%03X", addr);
+ return 2;
+ case 0xC0:
+ n = (oprom[0] & 0x0F);
+ f = (oprom[1] & 0x0F);
+ n+= (n < 10) ? '0' : 'A'-10;
+ f+= (f < 10) ? '0' : 'A'-10;
+ switch(oprom[1] & 0xF0)
+ {
+ case 0x10: sprintf (buffer, "FNC /%c%c", n, f); return 2;
+ case 0x20: sprintf (buffer, "SAL /%c%c", n, f); return 2;
+ case 0x40: sprintf (buffer, "ENTR /%c0", n); return 2;
+ case 0x80: sprintf (buffer, "SAI /%c0", n); return 2;
+ }
+ break;
+ case 0xD0:
+ value = oprom[1] & 0x0F;
+ switch (oprom[0] & 0x0F)
+ {
+ case 0x01:
+ switch (oprom[1] & 0xF0)
+ {
+ case 0x00: sprintf (buffer, "DD /%01X", value); return 2; //DD = "Deslocamento para a direita": Shift right
+ case 0x10: sprintf (buffer, "DDV /%01X", value); return 2; //DDV = "Deslocamento para a direita c/ V": Shift right with carry
+ case 0x20: sprintf (buffer, "GD /%01X", value); return 2; //GD = "Giro para a direita": Rotate right
+ case 0x30: sprintf (buffer, "GDV /%01X", value); return 2; //GDV = "Giro para a direita c/ V": Rotate right with carry
+ case 0x40: sprintf (buffer, "DE /%01X", value); return 2; //DE = "Deslocamento para a esquerda": Shift right
+ case 0x50: sprintf (buffer, "DEV /%01X", value); return 2; //DEV = "Deslocamento para a esquerda c/ V": Shift right with carry
+ case 0x60: sprintf (buffer, "GE /%01X", value); return 2; //GE = "Giro para a esquerda": Rotate right
+ case 0x70: sprintf (buffer, "GEV /%01X", value); return 2; //GEV = "Giro para a esquerda c/ V": Rotate right with carry
+ case 0x80: sprintf (buffer, "DDS /%01X", value); return 2; //DDS = "Deslocamento para a direita com duplicacao de sinal": Shift right with sign duplication
+ }
+ break;
+ case 0x02: sprintf (buffer, "XOR /%02X", oprom[1]); return 2; //Logical XOR
+ case 0x04: sprintf (buffer, "NAND /%02X", oprom[1]); return 2; //Logical NAND
+ case 0x08: sprintf (buffer, "SOMI /%02X", oprom[1]); return 2; //SOMI = "Soma imediata": Add immediate value into accumulator
+ case 0x0A: sprintf (buffer, "CARI /%02X", oprom[1]); return 2; //CARI = "Carrega imediato": Loads an immediate value into the accumulator
+ }
+ break;
+ case 0xE0:
+ //SUS = "Subtrai um ou salta"
+ addr = (oprom[0] & 0x0F) << 8 | oprom[1];
+ sprintf (buffer, "SUS /%03X", addr);
+ return 2;
+ case 0xF0:
+ //PUG = "Pula e guarda"
+ addr = (oprom[0] & 0x0F) << 8 | oprom[1];
+ sprintf (buffer, "PUG /%03X", addr);
+ return 2;
+ }
- switch (oprom[0])
- {
- case 0x80: sprintf (buffer, "LIMPO"); return 1;
- case 0x81: sprintf (buffer, "UM"); return 1;
- case 0x82: sprintf (buffer, "CMP1"); return 1;
- case 0x83: sprintf (buffer, "CMP2"); return 1;
- case 0x84: sprintf (buffer, "LIN"); return 1;
- case 0x85: sprintf (buffer, "INC"); return 1;
- case 0x86: sprintf (buffer, "UNEG"); return 1;
- case 0x87: sprintf (buffer, "LIMP1"); return 1;
- case 0x88: sprintf (buffer, "PNL 0"); return 1;
- case 0x89: sprintf (buffer, "PNL 1"); return 1;
- case 0x8A: sprintf (buffer, "PNL 2"); return 1;
- case 0x8B: sprintf (buffer, "PNL 3"); return 1;
- case 0x8C: sprintf (buffer, "PNL 4"); return 1;
- case 0x8D: sprintf (buffer, "PNL 5"); return 1;
- case 0x8E: sprintf (buffer, "PNL 6"); return 1;
- case 0x8F: sprintf (buffer, "PNL 7"); return 1;
- case 0x90: sprintf (buffer, "ST 0"); return 1;
- case 0x91: sprintf (buffer, "STM 0"); return 1;
- case 0x92: sprintf (buffer, "ST 1"); return 1;
- case 0x93: sprintf (buffer, "STM 1"); return 1;
- case 0x94: sprintf (buffer, "SV 0"); return 1;
- case 0x95: sprintf (buffer, "SVM 0"); return 1;
- case 0x96: sprintf (buffer, "SV 1"); return 1;
- case 0x97: sprintf (buffer, "SVM 1"); return 1;
- case 0x98: sprintf (buffer, "PUL"); return 1;
- case 0x99: sprintf (buffer, "TRE"); return 1;
- case 0x9A: sprintf (buffer, "INIB"); return 1;
- case 0x9B: sprintf (buffer, "PERM"); return 1;
- case 0x9C: sprintf (buffer, "ESP"); return 1;
- case 0x9D: sprintf (buffer, "PARE"); return 1;
- case 0x9E: sprintf (buffer, "TRI"); return 1;
- case 0x9F: sprintf (buffer, "IND"); return 1;
- }
+ switch (oprom[0])
+ {
+ case 0x80: sprintf (buffer, "LIMPO"); return 1;
+ case 0x81: sprintf (buffer, "UM"); return 1;
+ case 0x82: sprintf (buffer, "CMP1"); return 1;
+ case 0x83: sprintf (buffer, "CMP2"); return 1;
+ case 0x84: sprintf (buffer, "LIN"); return 1;
+ case 0x85: sprintf (buffer, "INC"); return 1;
+ case 0x86: sprintf (buffer, "UNEG"); return 1;
+ case 0x87: sprintf (buffer, "LIMP1"); return 1;
+ case 0x88: sprintf (buffer, "PNL 0"); return 1;
+ case 0x89: sprintf (buffer, "PNL 1"); return 1;
+ case 0x8A: sprintf (buffer, "PNL 2"); return 1;
+ case 0x8B: sprintf (buffer, "PNL 3"); return 1;
+ case 0x8C: sprintf (buffer, "PNL 4"); return 1;
+ case 0x8D: sprintf (buffer, "PNL 5"); return 1;
+ case 0x8E: sprintf (buffer, "PNL 6"); return 1;
+ case 0x8F: sprintf (buffer, "PNL 7"); return 1;
+ case 0x90: sprintf (buffer, "ST 0"); return 1;
+ case 0x91: sprintf (buffer, "STM 0"); return 1;
+ case 0x92: sprintf (buffer, "ST 1"); return 1;
+ case 0x93: sprintf (buffer, "STM 1"); return 1;
+ case 0x94: sprintf (buffer, "SV 0"); return 1;
+ case 0x95: sprintf (buffer, "SVM 0"); return 1;
+ case 0x96: sprintf (buffer, "SV 1"); return 1;
+ case 0x97: sprintf (buffer, "SVM 1"); return 1;
+ case 0x98: sprintf (buffer, "PUL"); return 1;
+ case 0x99: sprintf (buffer, "TRE"); return 1;
+ case 0x9A: sprintf (buffer, "INIB"); return 1;
+ case 0x9B: sprintf (buffer, "PERM"); return 1;
+ case 0x9C: sprintf (buffer, "ESP"); return 1;
+ case 0x9D: sprintf (buffer, "PARE"); return 1;
+ case 0x9E: sprintf (buffer, "TRI"); return 1;
+ case 0x9F: sprintf (buffer, "IND"); return 1;
+ }
- sprintf (buffer, "illegal instruction");
- return 1;
+ sprintf (buffer, "illegal instruction");
+ return 1;
}
diff --git a/src/devices/cpu/tms32051/32051ops.inc b/src/devices/cpu/tms32051/32051ops.inc
index fb78b3a5f18..27827d8cc70 100644
--- a/src/devices/cpu/tms32051/32051ops.inc
+++ b/src/devices/cpu/tms32051/32051ops.inc
@@ -388,7 +388,7 @@ void tms32051_device::op_and_mem()
{
UINT16 ea = GET_ADDRESS();
UINT16 data = DM_READ16(ea);
-
+
m_acc &= (UINT32)(data);
CYCLES(1);
@@ -1359,7 +1359,7 @@ void tms32051_device::op_out()
{
UINT16 port = ROPCODE();
UINT16 ea = GET_ADDRESS();
-
+
UINT16 data = DM_READ16(ea);
m_io->write_word(port << 1, data);
diff --git a/src/devices/cpu/tms32051/tms32051.cpp b/src/devices/cpu/tms32051/tms32051.cpp
index d4b565675fc..983678bbf82 100644
--- a/src/devices/cpu/tms32051/tms32051.cpp
+++ b/src/devices/cpu/tms32051/tms32051.cpp
@@ -387,7 +387,7 @@ void tms32051_device::execute_run()
{
CHANGE_PC(m_pasr);
}
-
+
m_brcr--;
if (m_brcr <= 0)
{
@@ -492,10 +492,10 @@ READ16_MEMBER( tms32051_device::cpuregs_r )
case 0x28: // PDWSR
return 0;
- case 0x37: // ABU BKR
+ case 0x37: // ABU BKR
return 0;
- case 0x50: // Memory-mapped I/O ports
+ case 0x50: // Memory-mapped I/O ports
case 0x51:
case 0x52:
case 0x53:
@@ -606,7 +606,7 @@ WRITE16_MEMBER( tms32051_device::cpuregs_w )
case 0x2a: // CWSR
break;
- case 0x50: // Memory-mapped I/O ports
+ case 0x50: // Memory-mapped I/O ports
case 0x51:
case 0x52:
case 0x53:
@@ -684,4 +684,4 @@ void tms32053_device::device_config_complete()
{
m_program_config = address_space_config("program", ENDIANNESS_LITTLE, 16, 16, -1, ADDRESS_MAP_NAME(tms32053_internal_pgm));
m_data_config = address_space_config("data", ENDIANNESS_LITTLE, 16, 16, -1, ADDRESS_MAP_NAME(tms32053_internal_data));
-} \ No newline at end of file
+}
diff --git a/src/devices/cpu/tms32082/dis_mp.cpp b/src/devices/cpu/tms32082/dis_mp.cpp
index aa13351b88b..e7083901fc7 100644
--- a/src/devices/cpu/tms32082/dis_mp.cpp
+++ b/src/devices/cpu/tms32082/dis_mp.cpp
@@ -231,14 +231,14 @@ static offs_t tms32082_disasm_mp(char *buffer, offs_t pc, const UINT8 *oprom)
case 0x00: print("illop0 "); break;
case 0x01: print("trap %d", UIMM15(uimm15)); break;
case 0x02: print("cmnd 0x%04X", UIMM15(uimm15)); break;
-
+
case 0x04:
if (op == 0x00020000)
print("nop ");
else
print("rdcr %s, R%d", get_creg_name(UIMM15(uimm15)), rd);
break;
-
+
case 0x05: print("swcr R%d, %s, R%d", rd, get_creg_name(UIMM15(uimm15)), rs); break;
case 0x06: print("brcr %s", get_creg_name(UIMM15(uimm15))); break;
case 0x08: print("shift%s.dz %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
diff --git a/src/devices/cpu/x86log.h b/src/devices/cpu/x86log.h
index 82a8990b59e..ac7195c99bd 100644
--- a/src/devices/cpu/x86log.h
+++ b/src/devices/cpu/x86log.h
@@ -35,34 +35,34 @@ constexpr int COMMENT_POOL_SIZE{MAX_COMMENTS * 40};
/* code logging info */
struct log_comment
{
- x86code* base;
- const char* string;
+ x86code* base;
+ const char* string;
};
/* data ranges */
struct data_range_t
{
- x86code* base;
- x86code* end;
- int size;
+ x86code* base;
+ x86code* end;
+ int size;
};
/* the code logging context */
struct x86log_context
{
- std::string filename; /* name of the file */
- FILE* file; /* file we are logging to */
+ std::string filename; /* name of the file */
+ FILE* file; /* file we are logging to */
- data_range_t data_range[MAX_DATA_RANGES]; /* list of data ranges */
- int data_range_count; /* number of data ranges */
+ data_range_t data_range[MAX_DATA_RANGES]; /* list of data ranges */
+ int data_range_count; /* number of data ranges */
- log_comment comment_list[MAX_COMMENTS]; /* list of comments */
- int comment_count; /* number of live comments */
+ log_comment comment_list[MAX_COMMENTS]; /* list of comments */
+ int comment_count; /* number of live comments */
- char comment_pool[COMMENT_POOL_SIZE]; /* string pool to hold comments */
- char* comment_pool_next; /* pointer to next string pool location */
+ char comment_pool[COMMENT_POOL_SIZE]; /* string pool to hold comments */
+ char* comment_pool_next; /* pointer to next string pool location */
};
@@ -80,15 +80,15 @@ void x86log_free_context(x86log_context* log) noexcept;
/* add a comment associated with a given code pointer */
template <typename... Ts>
inline void x86log_add_comment(
- x86log_context* log, x86code* base, const char* format, Ts&&... xs);
+ x86log_context* log, x86code* base, const char* format, Ts&&... xs);
/* mark a given range as data for logging purposes */
void x86log_mark_as_data(
- x86log_context* log, x86code* base, x86code* end, int size) noexcept;
+ x86log_context* log, x86code* base, x86code* end, int size) noexcept;
/* disassemble a range of code and reset accumulated information */
void x86log_disasm_code_range(
- x86log_context* log, const char* label, x86code* start, x86code* stop);
+ x86log_context* log, const char* label, x86code* start, x86code* stop);
/* manually printf information to the log file */
template <typename... Ts>
@@ -102,33 +102,33 @@ inline void x86log_printf(x86log_context* log, const char* format, Ts&&... xs);
template <typename... Ts>
inline void x86log_add_comment(
- x86log_context* log, x86code* base, const char* format, Ts&&... xs)
+ x86log_context* log, x86code* base, const char* format, Ts&&... xs)
{
- char* string = log->comment_pool_next;
- log_comment* comment;
-
- assert(log->comment_count < MAX_COMMENTS);
- assert(log->comment_pool_next + strlen(format) + 256 <
- log->comment_pool + COMMENT_POOL_SIZE);
-
- /* we assume comments are registered in order; enforce this */
- assert(log->comment_count == 0 ||
- base >= log->comment_list[log->comment_count - 1].base);
-
- /* if we exceed the maxima, skip it */
- if(log->comment_count >= MAX_COMMENTS) return;
- if(log->comment_pool_next + strlen(format) + 256 >=
- log->comment_pool + COMMENT_POOL_SIZE)
- return;
-
- /* do the printf to the string pool */
- log->comment_pool_next +=
- sprintf(log->comment_pool_next, format, std::forward<Ts>(xs)...) + 1;
-
- /* fill in the new comment */
- comment = &log->comment_list[log->comment_count++];
- comment->base = base;
- comment->string = string;
+ char* string = log->comment_pool_next;
+ log_comment* comment;
+
+ assert(log->comment_count < MAX_COMMENTS);
+ assert(log->comment_pool_next + strlen(format) + 256 <
+ log->comment_pool + COMMENT_POOL_SIZE);
+
+ /* we assume comments are registered in order; enforce this */
+ assert(log->comment_count == 0 ||
+ base >= log->comment_list[log->comment_count - 1].base);
+
+ /* if we exceed the maxima, skip it */
+ if(log->comment_count >= MAX_COMMENTS) return;
+ if(log->comment_pool_next + strlen(format) + 256 >=
+ log->comment_pool + COMMENT_POOL_SIZE)
+ return;
+
+ /* do the printf to the string pool */
+ log->comment_pool_next +=
+ sprintf(log->comment_pool_next, format, std::forward<Ts>(xs)...) + 1;
+
+ /* fill in the new comment */
+ comment = &log->comment_list[log->comment_count++];
+ comment->base = base;
+ comment->string = string;
}
@@ -140,21 +140,21 @@ inline void x86log_add_comment(
template <typename... Ts>
inline void x86log_printf(x86log_context* log, const char* format, Ts&&... xs)
{
- /* open the file, creating it if necessary */
- if(log->file == nullptr)
- {
- log->file = fopen(log->filename.c_str(), "w");
+ /* open the file, creating it if necessary */
+ if(log->file == nullptr)
+ {
+ log->file = fopen(log->filename.c_str(), "w");
- if(log->file == nullptr) return;
- }
+ if(log->file == nullptr) return;
+ }
- assert(log->file != nullptr);
+ assert(log->file != nullptr);
- /* do the printf */
- fprintf(log->file, format, std::forward<Ts>(xs)...);
+ /* do the printf */
+ fprintf(log->file, format, std::forward<Ts>(xs)...);
- /* flush the file */
- fflush(log->file);
+ /* flush the file */
+ fflush(log->file);
}
#endif /* __X86LOG_H__ */
diff --git a/src/devices/machine/i8271.cpp b/src/devices/machine/i8271.cpp
index 3d1d602dd74..cd8c0faf5bf 100644
--- a/src/devices/machine/i8271.cpp
+++ b/src/devices/machine/i8271.cpp
@@ -1541,7 +1541,6 @@ void i8271_device::device_timer(emu_timer &timer, device_timer_id id, int param,
void i8271_device::index_callback(floppy_image_device *floppy, int state)
{
for(auto & fi : flopi) {
-
if(fi.dev != floppy)
continue;
diff --git a/src/devices/machine/k053252.cpp b/src/devices/machine/k053252.cpp
index 6bd561233b4..45020926ace 100644
--- a/src/devices/machine/k053252.cpp
+++ b/src/devices/machine/k053252.cpp
@@ -123,7 +123,7 @@ void k053252_device::device_reset()
m_regs[i] = 0;
m_regs[0x08] = 1; // Xexex apparently does a wrong assignment for VC (sets up the INT enable register instead)
-
+
reset_internal_state();
}
@@ -173,14 +173,14 @@ void k053252_device::res_change()
//(HC+1) - HFP - HBP - 8*(HSW+1)
//VC - VFP - VBP - (VSW+1)
attoseconds_t refresh = HZ_TO_ATTOSECONDS(clock()) * (m_hc) * m_vc;
-
+
visarea.min_x = m_offsx;
visarea.min_y = m_offsy;
visarea.max_x = m_offsx + m_hc - m_hfp - m_hbp - 8*(m_hsw) - 1;
visarea.max_y = m_offsy + m_vc - m_vfp - m_vbp - (m_vsw) - 1;
-
+
m_screen->configure(m_hc, m_vc, visarea, refresh);
-
+
if (m_slave_screen)
m_slave_screen->configure(m_hc, m_vc, visarea, refresh);
@@ -189,7 +189,7 @@ void k053252_device::res_change()
printf("H %d HFP %d HSW %d HBP %d\n",m_hc,m_hfp,m_hsw*8,m_hbp);
printf("V %d VFP %d VSW %d VBP %d\n",m_vc,m_vfp,m_vsw,m_vbp);
// L stands for Legacy ...
- printf("L %d %d\n",m_offsx,m_offsy);
+ printf("L %d %d\n",m_offsx,m_offsy);
printf("Screen params: Clock: %u V-Sync %.2f H-Sync %.f\n",clock(),ATTOSECONDS_TO_HZ(refresh),ATTOSECONDS_TO_HZ(hsync));
printf("visible screen area: %d x %d\n\n",(visarea.max_x - visarea.min_x) + 1,(visarea.max_y - visarea.min_y) + 1);
#endif
@@ -251,7 +251,7 @@ WRITE8_MEMBER( k053252_device::write )
logerror("%02x VSW / %02x HSW set\n",m_vsw,m_hsw);
res_change();
break;
-
+
//case 0x0d: m_int_time(data); break;
case 0x0e: m_int1_ack_cb(1); break;
case 0x0f: m_int2_ack_cb(1); break;
diff --git a/src/devices/machine/k053252.h b/src/devices/machine/k053252.h
index a33b0f60698..a00743789ad 100644
--- a/src/devices/machine/k053252.h
+++ b/src/devices/machine/k053252.h
@@ -48,18 +48,18 @@ public:
DECLARE_WRITE8_MEMBER( write );
void res_change();
-
-
+
+
static void static_set_slave_screen(device_t &device, const char *tag);
protected:
// device-level overrides
virtual void device_start() override;
- virtual void device_reset() override;
+ virtual void device_reset() override;
virtual void device_clock_changed() override { reset_internal_state(); }
void reset_internal_state();
-
+
private:
// internal state
UINT8 m_regs[16];
@@ -75,7 +75,7 @@ protected:
int m_offsx;
int m_offsy;
- const char * m_slave_screen_tag;
+ const char * m_slave_screen_tag;
screen_device * m_slave_screen;
};
diff --git a/src/devices/machine/laserdsc.cpp b/src/devices/machine/laserdsc.cpp
index b8ecf53611c..7dbae408ba7 100644
--- a/src/devices/machine/laserdsc.cpp
+++ b/src/devices/machine/laserdsc.cpp
@@ -805,7 +805,7 @@ void laserdisc_device::init_video()
for (auto & frame : m_frame)
{
// first allocate a YUY16 bitmap at 2x the height
-
+
frame.m_bitmap.allocate(m_width, m_height * 2);
frame.m_bitmap.set_palette(m_videopalette);
fillbitmap_yuy16(frame.m_bitmap, 40, 109, 240);
diff --git a/src/devices/machine/pdc.cpp b/src/devices/machine/pdc.cpp
index 0df1621f980..4a882d12a04 100644
--- a/src/devices/machine/pdc.cpp
+++ b/src/devices/machine/pdc.cpp
@@ -7,87 +7,87 @@
**********************************************************************/
/*
- Device PDCN
- Board Copyright - IBM Corp 1989 Made in USA
-
- Labels:
- * 96D1975
- MN 90594C
-
- * EC# A6466SP
- MFG 85575
-
- Hardware:
- * CPU - Zilog Z0840006PSC Z80 @ 5MHz - U19
- * FDC - NEC D765AC-2 9002P7004 - U35
- * HDC - HDC9224 SMC E8838 8/90 - U59
- * DMA - P8237A-5 L1041330 - U34
- * Channel 0 - FDC
- * Channel 1 - Main system ram
- * Memory - HM6264ALP-12 SRAM 8KB - U16
- * Memory - HM6116P-2 SRAM 2KB - U33
- Logic:
- * U1 - PLS105AN Label: 59D9101
- * U11 - ?? Label: 59D10001
- * U27 - ?? Label: 96D1978
- * U28 - ?? Label: 97D8750
- * U31 - TIBPAL20L8-25CNT Label: 96D1987
- * U32 - ?? Label: 59D1001
- * U37 - PLS100N Label: 72D2701
- * U38 - PLS100N Label: 58D9201
- * U39 - ?? Label: 96D1981
- * U40 - ?? Label: 96D1984
- * U68 - ?? Label: 91D4301
- * U69 - ?? Label: 59D1001
- * U70 - ?? Label: 59D1001
-
- Switches:
- * S1 - Hard drive format configuration (Default all off)
- * S2 - Floppy drive format configuration (Default 1-7 off, 8 on)
-
- Program Memory:
- * 0x0000 - 0x3FFF : ROM 27128 Label: 97D9988
- * 0x8000 - 0x9FFF : SRAM HM6264ALP-12 8KB
- * 0xC000 - 0xC7FF : SRAM HM6116P-2 2KB
-
- IO Memory:
- * 0x00 - 0x01 : Old style command [0x5FF041B0]
- * 0x02 - 0x03 : FDC command address [0x5FF0C0B0][0x5FF0C1B0]
- * 0x04 - 0x05 : FDC command completion status [0x5FF030B0]
- * 0x06 - 0x07 : FDC data address [0x5FF080B0]
- * 0x10 - 0x18 : HDC registers (unknown)
- * 0x21 - 0x21 : FDC unknown, resets bit 1 on 0x38
- * 0x22 - 0x22 : FDC unknown
- * 0x23 - 0x24 : FDC Active DMA host address (auto increments)
- * 0x25 - 0x25 : FDC unknown
- * 0x26 - 0x26 : DREQ1 on
- * 0x27 - 0x27 : FDC unknown
- * 0x28 - 0x2A : Possibly LED lights
- * 0x2C - 0x2C : DREQ1 off
- * 0x2D - 0x2D : Unknown
- * 0x2E - 0x2E : Transfer direction 0x80 = PDC -> Host (read data)
- 0x00 = Host -> PDC (Commands, write data)
- * 0x2F - 0x2F : Unknown
- * 0x38 - 0x38 : FDC command request
- Bit 1: Debug?
- Bit 2: Command complete
- Bit 3: Unknown
- Bit 5: Unknown
- Bit 6-7: Error conditions
- * 0x39 - 0x39 : Interrupt status
- Bit 0: HDC9224 interrupt
- Bit 1: Incoming command
- Bit 3: FDD related, maybe uPD interrupt pin?
- * 0x3C - 0x3D : Dipswitch 2 and 1
- * 0x40 - 0x40 : HDC9224 DATA register
- * 0x41 - 0x41 : HDC9224 COMMAND register
- * 0x42 - 0x42 : uPD765 STATUS register
- * 0x43 - 0x43 : uPD765 DATA register
- * 0x50 - 0x51 : Unknown - reset latch maybe?
- * 0x52 - 0x52 : FDD Master motor control
- * 0x53 - 0x53 : Unknown
- * 0x54 - 0x57 : FDD motor control (Units 1-4)
- * 0x60 - 0x6F : P8237A DMA controller register set
+ Device PDCN
+ Board Copyright - IBM Corp 1989 Made in USA
+
+ Labels:
+ * 96D1975
+ MN 90594C
+
+ * EC# A6466SP
+ MFG 85575
+
+ Hardware:
+ * CPU - Zilog Z0840006PSC Z80 @ 5MHz - U19
+ * FDC - NEC D765AC-2 9002P7004 - U35
+ * HDC - HDC9224 SMC E8838 8/90 - U59
+ * DMA - P8237A-5 L1041330 - U34
+ * Channel 0 - FDC
+ * Channel 1 - Main system ram
+ * Memory - HM6264ALP-12 SRAM 8KB - U16
+ * Memory - HM6116P-2 SRAM 2KB - U33
+ Logic:
+ * U1 - PLS105AN Label: 59D9101
+ * U11 - ?? Label: 59D10001
+ * U27 - ?? Label: 96D1978
+ * U28 - ?? Label: 97D8750
+ * U31 - TIBPAL20L8-25CNT Label: 96D1987
+ * U32 - ?? Label: 59D1001
+ * U37 - PLS100N Label: 72D2701
+ * U38 - PLS100N Label: 58D9201
+ * U39 - ?? Label: 96D1981
+ * U40 - ?? Label: 96D1984
+ * U68 - ?? Label: 91D4301
+ * U69 - ?? Label: 59D1001
+ * U70 - ?? Label: 59D1001
+
+ Switches:
+ * S1 - Hard drive format configuration (Default all off)
+ * S2 - Floppy drive format configuration (Default 1-7 off, 8 on)
+
+ Program Memory:
+ * 0x0000 - 0x3FFF : ROM 27128 Label: 97D9988
+ * 0x8000 - 0x9FFF : SRAM HM6264ALP-12 8KB
+ * 0xC000 - 0xC7FF : SRAM HM6116P-2 2KB
+
+ IO Memory:
+ * 0x00 - 0x01 : Old style command [0x5FF041B0]
+ * 0x02 - 0x03 : FDC command address [0x5FF0C0B0][0x5FF0C1B0]
+ * 0x04 - 0x05 : FDC command completion status [0x5FF030B0]
+ * 0x06 - 0x07 : FDC data address [0x5FF080B0]
+ * 0x10 - 0x18 : HDC registers (unknown)
+ * 0x21 - 0x21 : FDC unknown, resets bit 1 on 0x38
+ * 0x22 - 0x22 : FDC unknown
+ * 0x23 - 0x24 : FDC Active DMA host address (auto increments)
+ * 0x25 - 0x25 : FDC unknown
+ * 0x26 - 0x26 : DREQ1 on
+ * 0x27 - 0x27 : FDC unknown
+ * 0x28 - 0x2A : Possibly LED lights
+ * 0x2C - 0x2C : DREQ1 off
+ * 0x2D - 0x2D : Unknown
+ * 0x2E - 0x2E : Transfer direction 0x80 = PDC -> Host (read data)
+ 0x00 = Host -> PDC (Commands, write data)
+ * 0x2F - 0x2F : Unknown
+ * 0x38 - 0x38 : FDC command request
+ Bit 1: Debug?
+ Bit 2: Command complete
+ Bit 3: Unknown
+ Bit 5: Unknown
+ Bit 6-7: Error conditions
+ * 0x39 - 0x39 : Interrupt status
+ Bit 0: HDC9224 interrupt
+ Bit 1: Incoming command
+ Bit 3: FDD related, maybe uPD interrupt pin?
+ * 0x3C - 0x3D : Dipswitch 2 and 1
+ * 0x40 - 0x40 : HDC9224 DATA register
+ * 0x41 - 0x41 : HDC9224 COMMAND register
+ * 0x42 - 0x42 : uPD765 STATUS register
+ * 0x43 - 0x43 : uPD765 DATA register
+ * 0x50 - 0x51 : Unknown - reset latch maybe?
+ * 0x52 - 0x52 : FDD Master motor control
+ * 0x53 - 0x53 : Unknown
+ * 0x54 - 0x57 : FDD motor control (Units 1-4)
+ * 0x60 - 0x6F : P8237A DMA controller register set
*/
@@ -98,10 +98,10 @@
// MACROS / CONSTANTS
//**************************************************************************
-#define Z80_TAG "pdc_z80" // U19
+#define Z80_TAG "pdc_z80" // U19
#define FDC_TAG "fdc"
-#define HDC_TAG "hdc"
-#define FDCDMA_TAG "i8237dma"
+#define HDC_TAG "hdc"
+#define FDCDMA_TAG "i8237dma"
#define TRACE_PDC_FDC 0
#define TRACE_PDC_HDC 0
@@ -119,8 +119,8 @@ const device_type PDC = &device_creator<pdc_device>;
//-------------------------------------------------
ROM_START( pdc )
- ROM_REGION( 0x4000, "rom", 0 )
- ROM_LOAD( "97d9988.27128.pdc.u17", 0x0000, 0x4000, CRC(d96ccaa6) SHA1(e1a465c2274a63e81dba7a71fc8b30f10c03baf0) ) // Label: "97D9988" 27128 @U17
+ ROM_REGION( 0x4000, "rom", 0 )
+ ROM_LOAD( "97d9988.27128.pdc.u17", 0x0000, 0x4000, CRC(d96ccaa6) SHA1(e1a465c2274a63e81dba7a71fc8b30f10c03baf0) ) // Label: "97D9988" 27128 @U17
ROM_END
//-------------------------------------------------
@@ -129,7 +129,7 @@ ROM_END
const rom_entry *pdc_device::device_rom_region() const
{
- return ROM_NAME( pdc );
+ return ROM_NAME( pdc );
}
//-------------------------------------------------
@@ -232,10 +232,10 @@ SLOT_INTERFACE_END
//-------------------------------------------------
static SLOT_INTERFACE_START( pdc_harddisks )
- SLOT_INTERFACE( "generic", MFMHD_GENERIC ) // Generic hard disk (self-adapting to image)
- SLOT_INTERFACE( "st213", MFMHD_ST213 ) // Seagate ST-213 (10 MB)
- SLOT_INTERFACE( "st225", MFMHD_ST225 ) // Seagate ST-225 (20 MB)
- SLOT_INTERFACE( "st251", MFMHD_ST251 ) // Seagate ST-251 (40 MB)
+ SLOT_INTERFACE( "generic", MFMHD_GENERIC ) // Generic hard disk (self-adapting to image)
+ SLOT_INTERFACE( "st213", MFMHD_ST213 ) // Seagate ST-213 (10 MB)
+ SLOT_INTERFACE( "st225", MFMHD_ST225 ) // Seagate ST-225 (20 MB)
+ SLOT_INTERFACE( "st251", MFMHD_ST251 ) // Seagate ST-251 (40 MB)
SLOT_INTERFACE_END
//-------------------------------------------------
@@ -243,7 +243,7 @@ SLOT_INTERFACE_END
//-------------------------------------------------
FLOPPY_FORMATS_MEMBER( pdc_device::floppy_formats )
- FLOPPY_PC_FORMAT
+ FLOPPY_PC_FORMAT
FLOPPY_FORMATS_END
//-------------------------------------------------
@@ -252,8 +252,8 @@ FLOPPY_FORMATS_END
static MACHINE_CONFIG_FRAGMENT( pdc )
/* CPU - Zilog Z0840006PSC */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_10MHz / 2)
- MCFG_CPU_PROGRAM_MAP(pdc_mem)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_10MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(pdc_mem)
MCFG_CPU_IO_MAP(pdc_io)
//MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
@@ -290,7 +290,7 @@ MACHINE_CONFIG_END
machine_config_constructor pdc_device::device_mconfig_additions() const
{
- return MACHINE_CONFIG_NAME( pdc );
+ return MACHINE_CONFIG_NAME( pdc );
}
ioport_constructor pdc_device::device_input_ports() const
@@ -308,7 +308,7 @@ ioport_constructor pdc_device::device_input_ports() const
pdc_device::pdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PDC, "ROLM PDC", tag, owner, clock, "pdc", __FILE__),
- m_pdccpu(*this, Z80_TAG),
+ m_pdccpu(*this, Z80_TAG),
m_dma8237(*this, FDCDMA_TAG),
m_fdc(*this, FDC_TAG),
m_hdc9224(*this, HDC_TAG),
@@ -338,7 +338,7 @@ void pdc_device::device_reset()
//reg_p38 |= 0x20; // no idea at all - bit 5 (32)
/* Reset CPU */
- m_pdccpu->reset();
+ m_pdccpu->reset();
/* Resolve callbacks */
m_m68k_r_cb.resolve_safe(0);
diff --git a/src/devices/machine/pdc.h b/src/devices/machine/pdc.h
index ac085ea02cd..c1f3a3cbf51 100644
--- a/src/devices/machine/pdc.h
+++ b/src/devices/machine/pdc.h
@@ -34,11 +34,11 @@
class pdc_device : public device_t
{
public:
- /* Constructor and Destructor */
+ /* Constructor and Destructor */
pdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- /* Optional information overrides */
- virtual machine_config_constructor device_mconfig_additions() const override;
+ /* Optional information overrides */
+ virtual machine_config_constructor device_mconfig_additions() const override;
virtual ioport_constructor device_input_ports() const override;
virtual const rom_entry *device_rom_region() const override;
@@ -69,7 +69,7 @@ public:
DECLARE_WRITE8_MEMBER(m68k_dma_w);
DECLARE_WRITE_LINE_MEMBER(fdc_irq);
- DECLARE_FLOPPY_FORMATS( floppy_formats );
+ DECLARE_FLOPPY_FORMATS( floppy_formats );
/* Main CPU accessible registers */
UINT8 reg_p0;
@@ -84,16 +84,16 @@ public:
UINT8 reg_p38;
UINT32 fdd_68k_dma_address; /* FDD <-> m68k DMA read/write address */
protected:
- /* Device-level overrides */
- virtual void device_start() override;
- virtual void device_reset() override;
+ /* Device-level overrides */
+ virtual void device_start() override;
+ virtual void device_reset() override;
/* Protected variables */
//UINT32 fdd_68k_dma_address;
bool b_fdc_irq;
/* Attached devices */
- required_device<cpu_device> m_pdccpu;
+ required_device<cpu_device> m_pdccpu;
required_device<am9517a_device> m_dma8237;
required_device<upd765a_device> m_fdc;
//required_device<floppy_connector> m_floppy;
@@ -103,8 +103,8 @@ protected:
required_shared_ptr<UINT8> m_pdc_ram;
/* Callbacks */
- devcb_read8 m_m68k_r_cb;
- devcb_write8 m_m68k_w_cb;
+ devcb_read8 m_m68k_r_cb;
+ devcb_write8 m_m68k_w_cb;
};
/* Device type */
diff --git a/src/devices/machine/pla.cpp b/src/devices/machine/pla.cpp
index 417fb4e6c3f..f96a2bd8f60 100644
--- a/src/devices/machine/pla.cpp
+++ b/src/devices/machine/pla.cpp
@@ -148,8 +148,6 @@ UINT32 pla_device::read(UINT32 input)
for (auto cache2_entry : m_cache2)
{
-
-
if ((UINT32)cache2_entry == input)
{
// cache2 hit
diff --git a/src/devices/machine/tms6100.cpp b/src/devices/machine/tms6100.cpp
index fc340de9247..402ba1ad7ca 100644
--- a/src/devices/machine/tms6100.cpp
+++ b/src/devices/machine/tms6100.cpp
@@ -206,7 +206,7 @@ WRITE_LINE_MEMBER(tms6100_device::romclock_w)
UINT8 word = m_rom[m_address >> 3];
if (m_reverse_bits)
word = BITSWAP8(word,0,1,2,3,4,5,6,7);
-
+
if (m_4bit_read)
{
m_data = word >> (m_address & 4) & 0xf;
diff --git a/src/devices/machine/upd765.cpp b/src/devices/machine/upd765.cpp
index 6587c44d360..48901ef2314 100644
--- a/src/devices/machine/upd765.cpp
+++ b/src/devices/machine/upd765.cpp
@@ -2247,7 +2247,6 @@ void upd765_family_device::run_drive_ready_polling()
void upd765_family_device::index_callback(floppy_image_device *floppy, int state)
{
for(auto & fi : flopi) {
-
if(fi.dev != floppy)
continue;
diff --git a/src/devices/machine/z80ctc.cpp b/src/devices/machine/z80ctc.cpp
index 13c4844c9e3..276254d96f1 100644
--- a/src/devices/machine/z80ctc.cpp
+++ b/src/devices/machine/z80ctc.cpp
@@ -185,8 +185,6 @@ int z80ctc_device::z80daisy_irq_state()
int state = 0;
for (auto & channel : m_channel)
{
-
-
// if we're servicing a request, don't indicate more interrupts
if (channel.m_int_state & Z80_DAISY_IEO)
{
diff --git a/src/devices/machine/z80scc.h b/src/devices/machine/z80scc.h
index edd0d9b6992..7f956ec9b74 100644
--- a/src/devices/machine/z80scc.h
+++ b/src/devices/machine/z80scc.h
@@ -137,7 +137,7 @@ public:
UINT8 do_sccreg_rr5();
UINT8 do_sccreg_rr6();
UINT8 do_sccreg_rr7();
-// UINT8 do_sccreg_rr8();
+// UINT8 do_sccreg_rr8();
UINT8 do_sccreg_rr9();
UINT8 do_sccreg_rr10();
UINT8 do_sccreg_rr11();
diff --git a/src/devices/sound/k053260.cpp b/src/devices/sound/k053260.cpp
index 134598a1f7c..f3ebc4b2445 100644
--- a/src/devices/sound/k053260.cpp
+++ b/src/devices/sound/k053260.cpp
@@ -274,7 +274,6 @@ void k053260_device::sound_stream_update(sound_stream &stream, stream_sample_t *
for (auto & voice : m_voice)
{
-
if (voice.playing())
voice.play(buffer);
}
diff --git a/src/devices/sound/qs1000.cpp b/src/devices/sound/qs1000.cpp
index 44ff9017ea4..a892945adad 100644
--- a/src/devices/sound/qs1000.cpp
+++ b/src/devices/sound/qs1000.cpp
@@ -488,8 +488,6 @@ void qs1000_device::sound_stream_update(sound_stream &stream, stream_sample_t **
// Iterate over voices and accumulate sample data
for (auto & chan : m_channels)
{
-
-
UINT8 lvol = chan.m_regs[6];
UINT8 rvol = chan.m_regs[7];
UINT8 vol = chan.m_regs[8];
diff --git a/src/devices/video/315_5313.h b/src/devices/video/315_5313.h
index 5994d47bb47..d7ca05ee2e6 100644
--- a/src/devices/video/315_5313.h
+++ b/src/devices/video/315_5313.h
@@ -294,7 +294,7 @@ private:
int m_vdp_pal;
int m_use_cram; // c2 uses it's own palette ram, so it sets this to 0
int m_dma_delay; // SVP and SegaCD have some 'lag' in DMA transfers
-
+
std::unique_ptr<UINT16[]> m_regs;
std::unique_ptr<UINT16[]> m_vram;
std::unique_ptr<UINT16[]> m_cram;
diff --git a/src/devices/video/ef9365.cpp b/src/devices/video/ef9365.cpp
index 0a5405fcf65..f923cfd0813 100644
--- a/src/devices/video/ef9365.cpp
+++ b/src/devices/video/ef9365.cpp
@@ -1,67 +1,67 @@
// license:BSD-3-Clause
-// copyright-holders:Jean-Franois DEL NERO
+// copyright-holders:Jean-Francois DEL NERO
/*********************************************************************
- ef9365.c
-
- Thomson EF9365/EF9366 video controller emulator code
-
- The EF9365/EF9366 is a video controller driving a frame buffer
- and having built-in vectors and characters drawing engines.
- This is natively a "black and white" chip (1 bitplane),
- but it is possible to add more bitplanes to have colors with a
- hardware trick. The system don't have direct access to the video
- memory, but indirect access is possible through the 0x0F command
- and some hardware glue logics.
- The current implementation emulate the main functions :
-
- Video modes supported (Hardware implementation dependent):
- - 256 x 256 (EF9365 with 4 bits shifters per bitplane and FMAT to VSS)
- - 512 x 512 interlaced (EF9365 with 8 bits shifters per bitplane and FMAT to VCC)
- - 512 x 256 non interlaced (EF9366 with 8 bits shifters per bitplane)
- - 128 x 128 (EF9365 with 2 bits shifters per bitplane and FMAT to VSS)
- - 64 x 64 (EF9365 with FMAT to VSS)
-
- - 1 bitplane up to 8 bitplanes hardware configuration.
- - 2 up to 256 colors fixed palette.
-
- Character & block drawing :
- - Normal / Titled mode
- - Horizontal / Vertical orientation
- - P & Q Zoom factors (1 up to 16)
-
- Vector drawing :
- - Normal / Dotted / Dashed / Dotted-Dashed mode
- - All directions and size supported.
-
- General :
- - Clear Screen
- - Fill Screen
- - Clear X & Y registers
- - Video RAM readback supported (Command 0x0F)
-
- What is NOT yet currently implemented:
- - Light pen support
- (To be done when i will find a software using the lightpen)
-
- What is implemented but not really tested:
- - Interrupts output.
- My target system (Squale Apollo 7) doesn't use the interruption
- for this chip. So i add the interrupt line support, but
- bug(s) is possible.
-
- The needed charset file charset_ef9365.rom (CRC 8d3053be) is available
- there : http://hxc2001.free.fr/Squale/rom/charset_ef9365.zip
- This ROM charset is into the EF9365/EF9366.
-
- To see how to use this driver, have a look to the Squale machine
- driver (squale.cpp).
- If you have any question, don't hesitate to contact me at the email
- present on this website : http://hxc2001.free.fr/
-
- 12/29/2015
- Jean-Franois DEL NERO
+ ef9365.c
+
+ Thomson EF9365/EF9366 video controller emulator code
+
+ The EF9365/EF9366 is a video controller driving a frame buffer
+ and having built-in vectors and characters drawing engines.
+ This is natively a "black and white" chip (1 bitplane),
+ but it is possible to add more bitplanes to have colors with a
+ hardware trick. The system don't have direct access to the video
+ memory, but indirect access is possible through the 0x0F command
+ and some hardware glue logics.
+ The current implementation emulate the main functions :
+
+ Video modes supported (Hardware implementation dependent):
+ - 256 x 256 (EF9365 with 4 bits shifters per bitplane and FMAT to VSS)
+ - 512 x 512 interlaced (EF9365 with 8 bits shifters per bitplane and FMAT to VCC)
+ - 512 x 256 non interlaced (EF9366 with 8 bits shifters per bitplane)
+ - 128 x 128 (EF9365 with 2 bits shifters per bitplane and FMAT to VSS)
+ - 64 x 64 (EF9365 with FMAT to VSS)
+
+ - 1 bitplane up to 8 bitplanes hardware configuration.
+ - 2 up to 256 colors fixed palette.
+
+ Character & block drawing :
+ - Normal / Titled mode
+ - Horizontal / Vertical orientation
+ - P & Q Zoom factors (1 up to 16)
+
+ Vector drawing :
+ - Normal / Dotted / Dashed / Dotted-Dashed mode
+ - All directions and size supported.
+
+ General :
+ - Clear Screen
+ - Fill Screen
+ - Clear X & Y registers
+ - Video RAM readback supported (Command 0x0F)
+
+ What is NOT yet currently implemented:
+ - Light pen support
+ (To be done when i will find a software using the lightpen)
+
+ What is implemented but not really tested:
+ - Interrupts output.
+ My target system (Squale Apollo 7) doesn't use the interruption
+ for this chip. So i add the interrupt line support, but
+ bug(s) is possible.
+
+ The needed charset file charset_ef9365.rom (CRC 8d3053be) is available
+ there : http://hxc2001.free.fr/Squale/rom/charset_ef9365.zip
+ This ROM charset is into the EF9365/EF9366.
+
+ To see how to use this driver, have a look to the Squale machine
+ driver (squale.cpp).
+ If you have any question, don't hesitate to contact me at the email
+ present on this website : http://hxc2001.free.fr/
+
+ 12/29/2015
+ Jean-Francois DEL NERO
*********************************************************************/
#include "emu.h"
@@ -343,8 +343,8 @@ void ef9365_device::device_reset()
void ef9365_device::update_interrupts()
{
int new_state = ( m_irq_vb && (m_registers[EF936X_REG_CTRL1] & 0x20) )
- || ( m_irq_rdy && (m_registers[EF936X_REG_CTRL1] & 0x40) )
- || ( m_irq_lb && (m_registers[EF936X_REG_CTRL1] & 0x10) );
+ || ( m_irq_rdy && (m_registers[EF936X_REG_CTRL1] & 0x40) )
+ || ( m_irq_lb && (m_registers[EF936X_REG_CTRL1] & 0x10) );
if (new_state != m_irq_state)
{
@@ -471,7 +471,6 @@ UINT8 ef9365_device::get_last_readback_word(int bitplane_number, int * pixel_off
void ef9365_device::draw_border(UINT16 line)
{
-
}
//-------------------------------------------------
@@ -792,7 +791,7 @@ int ef9365_device::draw_character( unsigned char c, int block, int smallblock )
for(p = 0; p < p_factor; p++)
{
if( !(m_registers[EF936X_REG_CTRL2] & 0x08) )
- { // Titled - Horizontal orientation
+ { // Titled - Horizontal orientation
plot(
x + ( (y_char*q_factor) + q ) + ( (x_char*p_factor) + p ),
y + ( (y_char*q_factor) + q )
@@ -816,14 +815,14 @@ int ef9365_device::draw_character( unsigned char c, int block, int smallblock )
for(p = 0; p < p_factor; p++)
{
if( !(m_registers[EF936X_REG_CTRL2] & 0x08) )
- { // Normal - Horizontal orientation
+ { // Normal - Horizontal orientation
plot(
x + ( (x_char*p_factor) + p ),
y + ( (y_char*q_factor) + q )
);
}
else
- { // Normal - Vertical orientation
+ { // Normal - Vertical orientation
plot(
x - ( (y_char*q_factor) + q ),
y + ( (x_char*p_factor) + p )
@@ -1046,29 +1045,29 @@ void ef9365_device::ef9365_exec(UINT8 cmd)
switch ( cmd & 0x7 ) // Direction code
{
case 0x1:
- busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() + tmp_delta_x, get_y_reg() + tmp_delta_y);
+ busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() + tmp_delta_x, get_y_reg() + tmp_delta_y);
break;
case 0x3:
- busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() - tmp_delta_x, get_y_reg() + tmp_delta_y);
+ busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() - tmp_delta_x, get_y_reg() + tmp_delta_y);
break;
case 0x5:
- busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() + tmp_delta_x, get_y_reg() - tmp_delta_y);
+ busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() + tmp_delta_x, get_y_reg() - tmp_delta_y);
break;
case 0x7:
- busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() - tmp_delta_x, get_y_reg() - tmp_delta_y);
+ busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() - tmp_delta_x, get_y_reg() - tmp_delta_y);
break;
case 0x0:
- busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() + tmp_delta_x, get_y_reg() );
+ busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() + tmp_delta_x, get_y_reg() );
break;
case 0x2:
- busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg(), get_y_reg() + tmp_delta_y);
+ busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg(), get_y_reg() + tmp_delta_y);
break;
case 0x4:
- busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg(), get_y_reg() - tmp_delta_y);
+ busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg(), get_y_reg() - tmp_delta_y);
break;
case 0x6:
- busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() - tmp_delta_x, get_y_reg() );
+ busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() - tmp_delta_x, get_y_reg() );
break;
}
set_busy_flag( cycles_to_us( busy_cycles ) );
@@ -1088,29 +1087,29 @@ void ef9365_device::ef9365_exec(UINT8 cmd)
switch ( cmd & 0x7 ) // Direction code
{
case 0x1:
- busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() + tmp_delta_x, get_y_reg() + tmp_delta_y);
+ busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() + tmp_delta_x, get_y_reg() + tmp_delta_y);
break;
case 0x3:
- busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() - tmp_delta_x, get_y_reg() + tmp_delta_y);
+ busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() - tmp_delta_x, get_y_reg() + tmp_delta_y);
break;
case 0x5:
- busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() + tmp_delta_x, get_y_reg() - tmp_delta_y);
+ busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() + tmp_delta_x, get_y_reg() - tmp_delta_y);
break;
case 0x7:
- busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() - tmp_delta_x, get_y_reg() - tmp_delta_y);
+ busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() - tmp_delta_x, get_y_reg() - tmp_delta_y);
break;
case 0x0:
- busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() + tmp_delta_x, get_y_reg() );
+ busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() + tmp_delta_x, get_y_reg() );
break;
case 0x2:
- busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg(), get_y_reg() + tmp_delta_y);
+ busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg(), get_y_reg() + tmp_delta_y);
break;
case 0x4:
- busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg(), get_y_reg() - tmp_delta_y);
+ busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg(), get_y_reg() - tmp_delta_y);
break;
case 0x6:
- busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() - tmp_delta_x, get_y_reg() );
+ busy_cycles = draw_vector ( get_x_reg(), get_y_reg(), get_x_reg() - tmp_delta_x, get_y_reg() );
break;
}
diff --git a/src/devices/video/ef9365.h b/src/devices/video/ef9365.h
index 9127bf8965e..e29b3adca33 100644
--- a/src/devices/video/ef9365.h
+++ b/src/devices/video/ef9365.h
@@ -1,5 +1,5 @@
// license:BSD-3-Clause
-// copyright-holders:Jean-Franois DEL NERO
+// copyright-holders:Jean-Francois DEL NERO
/*********************************************************************
ef9365.h
@@ -88,7 +88,7 @@ private:
void set_video_mode(void);
void draw_border(UINT16 line);
void ef9365_exec(UINT8 cmd);
- int cycles_to_us(int cycles);
+ int cycles_to_us(int cycles);
void dump_bitplanes_word();
void update_interrupts();
diff --git a/src/emu/clifront.cpp b/src/emu/clifront.cpp
index 331aa996121..a9321154c51 100644
--- a/src/emu/clifront.cpp
+++ b/src/emu/clifront.cpp
@@ -597,8 +597,6 @@ void cli_frontend::listdevices(const char *gamename)
// dump the results
for (auto device : device_list)
{
-
-
// extract the tag, stripping the leading colon
const char *tag = device->tag();
if (*tag == ':')
diff --git a/src/emu/debug/dvmemory.cpp b/src/emu/debug/dvmemory.cpp
index 2327d7284cc..b792d002c27 100644
--- a/src/emu/debug/dvmemory.cpp
+++ b/src/emu/debug/dvmemory.cpp
@@ -315,7 +315,7 @@ void debug_view_memory::view_update()
UINT64 chunkdata = 0;
floatx80 chunkdata80 = { 0, 0 };
bool ismapped;
-
+
if (m_data_format != 11)
ismapped = read(m_bytes_per_chunk, addrbyte + chunknum * m_bytes_per_chunk, chunkdata);
else
diff --git a/src/emu/debug/dvmemory.h b/src/emu/debug/dvmemory.h
index afe597b8477..234bd0ed19b 100644
--- a/src/emu/debug/dvmemory.h
+++ b/src/emu/debug/dvmemory.h
@@ -103,11 +103,11 @@ private:
debug_view_expression m_expression; // expression describing the start address
UINT32 m_chunks_per_row; // number of chunks displayed per line
UINT8 m_bytes_per_chunk; // bytes per chunk
- int m_data_format; // 1-8 current values 9 32bit floating point
+ int m_data_format; // 1-8 current values 9 32bit floating point
bool m_reverse_view; // reverse-endian view?
bool m_ascii_view; // display ASCII characters?
bool m_no_translation; // don't run addresses through the cpu translation hook
- bool m_edit_enabled; // can modify contents ?
+ bool m_edit_enabled; // can modify contents ?
offs_t m_maxaddr; // (derived) maximum address to display
UINT32 m_bytes_per_row; // (derived) number of bytes displayed per line
UINT32 m_byte_offset; // (derived) offset of starting visible byte
diff --git a/src/emu/drivenum.h b/src/emu/drivenum.h
index e3bf3117861..faaf685304a 100644
--- a/src/emu/drivenum.h
+++ b/src/emu/drivenum.h
@@ -120,7 +120,7 @@ private:
void release_current() const;
static const int CONFIG_CACHE_COUNT = 100;
-
+
// internal state
int m_current;
int m_filtered_count;
diff --git a/src/emu/input.cpp b/src/emu/input.cpp
index 2d19e6b1bf4..4a1100db177 100644
--- a/src/emu/input.cpp
+++ b/src/emu/input.cpp
@@ -676,7 +676,7 @@ bool input_seq::is_valid() const
for (auto code : m_code)
{
// invalid codes are never permitted
-
+
if (code == INPUT_CODE_INVALID)
return false;
diff --git a/src/emu/ioport.cpp b/src/emu/ioport.cpp
index 9bb43f0c4ec..32bff33dac9 100644
--- a/src/emu/ioport.cpp
+++ b/src/emu/ioport.cpp
@@ -1344,7 +1344,7 @@ std::string natural_keyboard::dump()
for (auto & code : m_keycode_map)
{
// describe the character code
-
+
strcatprintf(buffer,"%08X (%s) ", code.ch, unicode_to_string(tempstr, code.ch));
// pad with spaces
diff --git a/src/emu/render.cpp b/src/emu/render.cpp
index 48c53af8262..2fe0a20d880 100644
--- a/src/emu/render.cpp
+++ b/src/emu/render.cpp
@@ -1423,8 +1423,6 @@ void render_target::invalidate_all(void *refptr)
// iterate through all our primitive lists
for (auto & list : m_primlist)
{
-
-
// if we have a reference to this object, release our list
list.acquire_lock();
if (list.has_reference(refptr))
diff --git a/src/emu/sound.cpp b/src/emu/sound.cpp
index dbfc8813ec7..89db24f85ca 100644
--- a/src/emu/sound.cpp
+++ b/src/emu/sound.cpp
@@ -404,7 +404,6 @@ void sound_stream::update_with_accounting(bool second_tick)
if (output_bufindex > 0)
for (auto & output : m_output)
{
-
memmove(&output.m_buffer[0], &output.m_buffer[samples_to_lose], sizeof(output.m_buffer[0]) * (output_bufindex - samples_to_lose));
}
@@ -459,7 +458,6 @@ void sound_stream::recompute_sample_rate_data()
// When synchronous, pick the sample rate for the inputs, if any
for (auto & input : m_input)
{
-
if (input.m_source != nullptr)
{
if (!m_sample_rate)
@@ -486,7 +484,7 @@ void sound_stream::recompute_sample_rate_data()
for (auto & input : m_input)
{
// if we have a source, see if its sample rate changed
-
+
if (input.m_source != nullptr)
{
// okay, we have a new sample rate; recompute the latency to be the maximum
diff --git a/src/lib/formats/ipf_dsk.cpp b/src/lib/formats/ipf_dsk.cpp
index e7b8aad9137..77739da65b3 100644
--- a/src/lib/formats/ipf_dsk.cpp
+++ b/src/lib/formats/ipf_dsk.cpp
@@ -5,7 +5,7 @@
const floppy_format_type FLOPPY_IPF_FORMAT = &floppy_image_format_creator<ipf_format>;
-ipf_format::ipf_format(): tinfos(nullptr), tcount(0), type(0), release(0), revision(0), encoder_type(0),
+ipf_format::ipf_format(): tinfos(nullptr), tcount(0), type(0), release(0), revision(0), encoder_type(0),
encoder_revision(0), origin(0), min_cylinder(0), max_cylinder(0), min_head(0), max_head(0), credit_day(0), credit_time(0)
{
}
diff --git a/src/mame/arcade.lst b/src/mame/arcade.lst
index 6a2313bc7f7..b99a9c06695 100644
--- a/src/mame/arcade.lst
+++ b/src/mame/arcade.lst
@@ -314,7 +314,7 @@ amidars // GX337 (c) 1982 Konami
triplep // (c) 1982 KKI / made by Sanritsu?
triplepa // (c) 1982 KKI / made by Sanritsu?
knockout // (c) 1982 KKK
-knockoutb // bootleg
+knockoutb // bootleg
mariner // (c) 1981 Amenip
800fath // (c) 1981 Amenip + U.S. Billiards license
mars // (c) 1981 Artic
@@ -360,7 +360,7 @@ calipso // (c) 1982 Tago
anteater // (c) 1982 Tago
anteaterg // (c) 1983 TV-Tuning (F.E.G. license)
anteateruk // (c) 1983 Free Enterprise Games
-anteatergg // bootleg
+anteatergg // bootleg
rescue // (c) 1982 Stern
rescueb // (c) Videl Games (Rescue bootleg)
aponow // bootleg
@@ -1437,7 +1437,7 @@ pss64 // 199? Nintendo / Hudson Soft
// SNES-based hacks
kinstb // bootleg
-mk3snes // bootleg
+mk3snes // bootleg
ffight2b // bootleg
sblast2b // bootleg
iron // bootleg
@@ -1536,7 +1536,7 @@ schasera // RT Taito
schaserb // RT Taito
schaserc // RT Taito
schasercv // RT Taito
-schaserm // Model Racing
+schaserm // Model Racing
lupin3 // LP (c) 1980 Taito
lupin3a // LP (c) 1980 Taito
intruder // (c) 1980 GamePlan (Taito)
@@ -2119,7 +2119,7 @@ knightb // bootleg
kicknrun // A87 (c) 1986 Taito Corporation
kicknrunu // A87 (c) 1986 Taito Corporation
mexico86 // bootleg (Micro Research)
-mexico86a // bootleg
+mexico86a // bootleg
darius // A96 (c) 1986 Taito Corporation Japan (World)
dariusu // A96 (c) 1986 Taito America Corporation (US)
dariusj // A96 (c) 1986 Taito Corporation (Japan)
@@ -2501,7 +2501,7 @@ gseeker // 1992.?? D40 (c) 1992 Taito Corporation Japan (World)
gseekerj // 1992.12 D40 (c) 1992 Taito Corporation (Japan)
gseekeru // 1992.?? D40 (c) 1992 Taito America Corporation (US)
hthero93 // 1993.03 D49 (c) 1992 Taito Corporation (Japan)
-hthero93u // 1993.04 D49 (c) 1992 Taito America Corporation (US)
+hthero93u // 1993.04 D49 (c) 1992 Taito America Corporation (US)
cupfinal // 1993.?? D49 (c) 1993 Taito Corporation Japan (World)
trstar // 1993.?? D53 (c) 1993 Taito Corporation Japan (World)
trstarj // 1993.07 D53 (c) 1993 Taito Corporation (Japan)
@@ -3255,7 +3255,7 @@ sf2v004 // hack
sf2acc // hack
sf2acca // hack
sf2ceblp // hack
-sf2cebltw // hack
+sf2cebltw // hack
sf2accp2 // hack
sf2amf // bootleg
sf2amf2 // bootleg
@@ -3368,7 +3368,7 @@ ddtodh // 12/04/1994 (c) 1993 (Hispanic)
ddtodhr1 // 25/01/1994 (c) 1993 (Hispanic)
ddtodhr2 // 13/01/1994 (c) 1993 (Hispanic)
ssf2t // 23/02/1994 (c) 1994 (World)
-ssf2th // 23/02/1994 (c) 1994 (Hispanic)
+ssf2th // 23/02/1994 (c) 1994 (Hispanic)
ssf2tu // 23/03/1994 (c) 1994 (USA)
ssf2tur1 // 23/02/1994 (c) 1994 (USA)
ssf2ta // 23/02/1994 (c) 1994 (Asia)
@@ -3390,7 +3390,7 @@ vampja // 05/07/1994 (c) 1994 (Japan)
vampjr1 // 30/06/1994 (c) 1994 (Japan)
ringdest // 02/09/1994 (c) 1994 (Euro)
ringdesta // 31/08/1994 (c) 1994 (Asia)
-ringdesth // 02/09/1994 (c) 1994 (Hispanic)
+ringdesth // 02/09/1994 (c) 1994 (Hispanic)
smbomb // 31/08/1994 (c) 1994 (Japan)
smbombr1 // 08/08/1994 (c) 1994 (Japan)
armwar // 24/10/1994 (c) 1994 (Euro)
@@ -3740,7 +3740,7 @@ doapp // Dead Or Alive ++ (JAPAN)
cbaj // Cool Boaders Arcade Jam
shngmtkb // Shanghai Matekibuyuu
tondemo // Tondemo Crisis (JAPAN)
-glpracr3 // Gallop Racer 3 (Export)
+glpracr3 // Gallop Racer 3 (Export)
glpracr3j // Gallop Racer 3 (JAPAN)
flamegun // Flame Gunner (USA)
flamegunj // Flame Gunner (JAPAN)
@@ -4137,7 +4137,7 @@ tsurugij // 2001
wcombat // 2002
wcombatk // 2002
wcombatj // 2002
-wcombatu // 2002
+wcombatu // 2002
xtrial // 2002
mfightc // 2002
mfightcc // 2002
@@ -6176,7 +6176,7 @@ hbarrelw // (c) 1987 Data East Corporation (World)
baddudes // EI (c) 1988 Data East USA (US)
drgninja // EG (c) 1988 Data East Corporation (Japan)
drgninjab // bootleg
-drgninjab2 // bootleg
+drgninjab2 // bootleg
birdtry // (c) 1988 Data East Corporation (Japan)
robocop // EP? (c) 1988 Data East Corporation (World)
robocopw // EP? (c) 1988 Data East Corporation (World)
@@ -6780,7 +6780,7 @@ xmen2pj // GX065 (c) 1992 (Japan)
xmen6p // GX065 (c) 1992 (World)
xmen6pu // GX065 (c) 1992 (US)
xexex // GX067 (c) 1991 (World)
-orius // GX067 (c) 1991 (USA)
+orius // GX067 (c) 1991 (USA)
xexexa // GX067 (c) 1991 (Asia)
xexexj // GX067 (c) 1991 (Japan)
asterix // GX068 (c) 1992 (World)
@@ -7539,7 +7539,7 @@ badlandsb // bootleg
badlandsb2 // bootleg set 2
klax // 136075 (c) 1989
klax2 // 136075 (c) 1989
-klax2bl // bootleg
+klax2bl // bootleg
klax3 // 136075 (c) 1989
klaxj // 136075 (c) 1989 (Japan)
klaxd // 136075 (c) 1989 (Germany)
@@ -8112,7 +8112,7 @@ kuniokunb // bootleg
xsleena // TA-0019 (c) 1986 + Taito license
xsleenaj // TA-0019 (c) 1986
xsleenab // bootleg
-xsleenaba // bootleg
+xsleenaba // bootleg
solrwarr // TA-0019 (c) 1986 + Taito / Memetron license
battlane // -0215, -0216 (Data East part number) (c) 1986 + Taito license
battlane2 // -0215, -0216 (Data East part number) (c) 1986 + Taito license
@@ -8147,7 +8147,7 @@ vball2pjb // bootleg (of Japan set)
ddragon2 // TA-0026 (c) 1988 (World)
ddragon2u // TA-0026 (c) 1988 (US)
ddragon2j // TA-0026 (c) 1988 (Japan)
-ddragon2b // bootleg
+ddragon2b // bootleg
toffy // (c) 1993 Midas
stoffy // (c) 1994 Midas
stoffyu // (c) 1994 Midas + Unico
@@ -8242,7 +8242,7 @@ xxmissio // UPL-86001 [1986]
ninjakd2 // UPL-????? (c) 1987
ninjakd2a // UPL-????? (c) 1987
ninjakd2b // UPL-????? (c) 1987
-ninjakd2c // UPL-????? (c) 1987
+ninjakd2c // UPL-????? (c) 1987
rdaction // UPL-87003?(c) 1987 + World Games license
jt104 // hack?
mnight // UPL-????? (c) 1987 distributed by Kawakus
@@ -9152,7 +9152,7 @@ wrallyb // (c) 1993 - Ref 930217
glass // (c) 1993 - Ref 931021
glass10 // (c) 1993 - Ref 931021
glass10a // (c) 1993 - Ref 931021 shows "Break Edition" on a real PCB
-glasskr // (c) 1994 - Ref 931021 shows 1994 version, Anime girls, unprotected
+glasskr // (c) 1994 - Ref 931021 shows 1994 version, Anime girls, unprotected
targeth // (c) 1994 - Ref 940531
targetha // (c) 1994 - Ref 940531
thoop2 // (c) 1994 - Ref ???
@@ -9550,7 +9550,7 @@ sparkman // (c) 1989 SunA
sparkmana // (c) 1989 SunA
starfigh // (c) 1990 SunA
hardhea2 // (c) 1991 SunA
-hardhea2b // bootleg
+hardhea2b // bootleg
brickzn // (c) 1992 SunA
brickznv5 // (c) 1992 SunA
brickznv4 // (c) 1992 SunA
@@ -9638,7 +9638,7 @@ galhustl // (c) 1997 ACE International
// Playmark games
sslam // (c) 1993 - hack of Namco's Super World Court
sslama // ^
-sslamb // ^
+sslamb // ^
powerbal // (c) 1994
powerbals // (c) 1994
magicstk // (c) 1995
@@ -10677,7 +10677,7 @@ driblingbr // bootleg
ace // [1976 Allied Leisure]
clayshoo // [1979 Allied Leisure]
pirates // (c) 1994 NIX
-piratesb // bootleg?
+piratesb // bootleg?
genix // (c) 199? NIX
fitfight // bootleg of Art of Fighting
histryma // bootleg of Fighter's History
@@ -12050,7 +12050,7 @@ ichiban // (c) 199? Excel
3x3puzzla // (c) 199? Ace
gambl186 // unknown
gambl186a // unknown
-gambl186b // unknown
+gambl186b // unknown
// InterFlip / Recreativos Franco
videopkr // (c) 1984 InterFlip
diff --git a/src/mame/drivers/age_candy.cpp b/src/mame/drivers/age_candy.cpp
index 355f9e85092..986b9d3771c 100644
--- a/src/mame/drivers/age_candy.cpp
+++ b/src/mame/drivers/age_candy.cpp
@@ -20,13 +20,13 @@ class age_candy_state : public driver_device
public:
age_candy_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
- // ,m_maincpu(*this, "maincpu")
+ // ,m_maincpu(*this, "maincpu")
{ }
virtual void machine_start() override;
virtual void machine_reset() override;
-// required_device<mcs51_cpu_device> m_maincpu;
+// required_device<mcs51_cpu_device> m_maincpu;
};
static INPUT_PORTS_START( age_candy )
@@ -46,9 +46,9 @@ void age_candy_state::machine_reset()
static MACHINE_CONFIG_START( age_candy, age_candy_state )
/* basic machine hardware */
-// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown (vectors at end? 6xxx ?)
-// MCFG_CPU_PROGRAM_MAP(age_candy_map)
-// MCFG_CPU_IO_MAP(age_candy_io)
+// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown (vectors at end? 6xxx ?)
+// MCFG_CPU_PROGRAM_MAP(age_candy_map)
+// MCFG_CPU_IO_MAP(age_candy_io)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -62,4 +62,3 @@ ROM_START( age_cand )
ROM_END
GAME( 19??, age_cand, 0, age_candy, age_candy, driver_device, 0, ROT0, "Advanced Game Engineering", "Candy Crane (AGE)", MACHINE_IS_SKELETON_MECHANICAL )
-
diff --git a/src/mame/drivers/amerihok.cpp b/src/mame/drivers/amerihok.cpp
index 4a558aaaefd..aa8a19ae9e2 100644
--- a/src/mame/drivers/amerihok.cpp
+++ b/src/mame/drivers/amerihok.cpp
@@ -24,13 +24,13 @@ class amerihok_state : public driver_device
public:
amerihok_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
- // ,m_maincpu(*this, "maincpu")
+ // ,m_maincpu(*this, "maincpu")
{ }
virtual void machine_start() override;
virtual void machine_reset() override;
-// required_device<mcs51_cpu_device> m_maincpu;
+// required_device<mcs51_cpu_device> m_maincpu;
};
static INPUT_PORTS_START( amerihok )
@@ -50,9 +50,9 @@ void amerihok_state::machine_reset()
static MACHINE_CONFIG_START( amerihok, amerihok_state )
/* basic machine hardware */
-// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown
-// MCFG_CPU_PROGRAM_MAP(amerihok_map)
-// MCFG_CPU_IO_MAP(amerihok_io)
+// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown
+// MCFG_CPU_PROGRAM_MAP(amerihok_map)
+// MCFG_CPU_IO_MAP(amerihok_io)
// MCFG_CPU_VBLANK_INT_DRIVER("screen", amerihok_state, irq0_line_hold)
/* sound hardware */
@@ -75,4 +75,3 @@ ROM_START( amerihok )
ROM_END
GAME( 19??, amerihok, 0, amerihok, amerihok, driver_device, 0, ROT0, "<unknown>", "Ameri-Hockey", MACHINE_IS_SKELETON_MECHANICAL )
-
diff --git a/src/mame/drivers/aquarium.cpp b/src/mame/drivers/aquarium.cpp
index 6c665a195ce..c8f0d7fb4b1 100644
--- a/src/mame/drivers/aquarium.cpp
+++ b/src/mame/drivers/aquarium.cpp
@@ -26,7 +26,7 @@ Notes:
- A bug in the program code causes the OKI to be reset on the very
first coin inserted.
-// Sound banking + video references
+// Sound banking + video references
// https://www.youtube.com/watch?v=nyAQPrkt_a4
// https://www.youtube.com/watch?v=0gn2Kj2M46Q
@@ -74,7 +74,7 @@ WRITE8_MEMBER(aquarium_state::aquarium_z80_bank_w)
// aquarium bank 0006 00ff - correct (select) 110
// aquarium bank 0005 00ff - level 1 (correct)
// (all music seems correct w/regards the reference video)
-
+
membank("bank1")->set_entry(data & 0x7);
}
@@ -349,7 +349,7 @@ ROM_START( aquarium )
ROM_LOAD16_WORD_SWAP( "aquar3.bin", 0x000000, 0x080000, CRC(f197991e) SHA1(0a217d735e2643605dbfd6ee20f98f46b37d4838) )
ROM_REGION( 0x40000, "audiocpu", 0 ) /* z80 (sound) code */
- ROM_LOAD( "aquar5", 0x000000, 0x40000, CRC(fa555be1) SHA1(07236f2b2ba67e92984b9ddf4a8154221d535245) )
+ ROM_LOAD( "aquar5", 0x000000, 0x40000, CRC(fa555be1) SHA1(07236f2b2ba67e92984b9ddf4a8154221d535245) )
ROM_REGION( 0x100000, "gfx1", 0 ) /* BG Tiles */
ROM_LOAD( "aquar1", 0x000000, 0x080000, CRC(575df6ac) SHA1(071394273e512666fe124facdd8591a767ad0819) ) // 4bpp
@@ -378,7 +378,7 @@ ROM_START( aquariumj )
ROM_LOAD16_WORD_SWAP( "aquar3", 0x000000, 0x080000, CRC(344509a1) SHA1(9deb610732dee5066b3225cd7b1929b767579235) )
ROM_REGION( 0x40000, "audiocpu", 0 ) /* z80 (sound) code */
- ROM_LOAD( "aquar5", 0x000000, 0x40000, CRC(fa555be1) SHA1(07236f2b2ba67e92984b9ddf4a8154221d535245) )
+ ROM_LOAD( "aquar5", 0x000000, 0x40000, CRC(fa555be1) SHA1(07236f2b2ba67e92984b9ddf4a8154221d535245) )
ROM_REGION( 0x100000, "gfx1", 0 ) /* BG Tiles */
ROM_LOAD( "aquar1", 0x000000, 0x080000, CRC(575df6ac) SHA1(071394273e512666fe124facdd8591a767ad0819) ) // 4bpp
diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp
index 8351944fc8b..89b03477cb7 100644
--- a/src/mame/drivers/aristmk6.cpp
+++ b/src/mame/drivers/aristmk6.cpp
@@ -152,7 +152,7 @@ READ8_MEMBER(aristmk6_state::test_r)
default:
logerror("Unmapped read %08x\n", 0x13800000 + offset);
}
-
+
return 0;
}
diff --git a/src/mame/drivers/battlera.cpp b/src/mame/drivers/battlera.cpp
index b6c756b811f..fc008ff5351 100644
--- a/src/mame/drivers/battlera.cpp
+++ b/src/mame/drivers/battlera.cpp
@@ -7,12 +7,12 @@
Emulation by Bryan McPhail, mish@tendril.co.uk
- This board is based on the Hudson HuC6280 and Huc6270 IC's used in
+ This board is based on the Hudson HuC6280 and Huc6270 IC's used in
the NEC PC-Engine.
-
+
Differences from PC-Engine console:
Input ports are different (2 dips, 2 joysticks, 1 coin port)
- _Interface_ to palette is different (Huc6260 isn't present),
+ _Interface_ to palette is different (Huc6260 isn't present),
palette data is the same.
Extra sound chips (YM2203 & Oki M5205), and extra HuC6280 processor to drive them.
Twice as much VRAM (128kb).
@@ -20,7 +20,7 @@
Todo:
- There seems to be a bug with a stuck note from the YM2203 FM channel
at the start of scene 3 and near the ending when your characters are
- flying over a forest in a helicopter.
+ flying over a forest in a helicopter.
This is verified to NOT happen on real hardware - Guru
**********************************************************************
@@ -64,7 +64,7 @@ Notes:
DEC-01 - Hudson HuC6280 6502-based CPU with in-built Programmable Sound Generator
used as the main CPU. Clock input is 21.4772MHz and is divided internally
by 3 for the CPU (7.15906MHz) and by 6 for the PSG (3.579533MHz), although
- in this case the PSG isn't used. The Hudson markings have been scratch off
+ in this case the PSG isn't used. The Hudson markings have been scratch off
and the IC is labelled 'DEC-01'
45 - Hudson HuC6280 6502-based CPU with in-built PSG used as the sound CPU
Clock input is 21.4772MHz and is divided internally by 3 for the CPU
diff --git a/src/mame/drivers/cdi.cpp b/src/mame/drivers/cdi.cpp
index 88c650a8789..e2c984228e6 100644
--- a/src/mame/drivers/cdi.cpp
+++ b/src/mame/drivers/cdi.cpp
@@ -107,15 +107,15 @@ static ADDRESS_MAP_START( cdi910_mem, AS_PROGRAM, 16, cdi_state )
#if ENABLE_UART_PRINTING
AM_RANGE(0x00301400, 0x00301403) AM_DEVREAD("scc68070", cdi68070_device, uart_loopback_enable)
#endif
-// AM_RANGE(0x00300000, 0x00303bff) AM_DEVREADWRITE("cdic", cdicdic_device, ram_r, ram_w)
-// AM_RANGE(0x00303c00, 0x00303fff) AM_DEVREADWRITE("cdic", cdicdic_device, regs_r, regs_w)
-// AM_RANGE(0x00310000, 0x00317fff) AM_DEVREADWRITE("slave_hle", cdislave_device, slave_r, slave_w)
-// AM_RANGE(0x00318000, 0x0031ffff) AM_NOP
+// AM_RANGE(0x00300000, 0x00303bff) AM_DEVREADWRITE("cdic", cdicdic_device, ram_r, ram_w)
+// AM_RANGE(0x00303c00, 0x00303fff) AM_DEVREADWRITE("cdic", cdicdic_device, regs_r, regs_w)
+// AM_RANGE(0x00310000, 0x00317fff) AM_DEVREADWRITE("slave_hle", cdislave_device, slave_r, slave_w)
+// AM_RANGE(0x00318000, 0x0031ffff) AM_NOP
AM_RANGE(0x00320000, 0x00323fff) AM_DEVREADWRITE8("mk48t08", timekeeper_device, read, write, 0xff00) /* nvram (only low bytes used) */
AM_RANGE(0x004fffe0, 0x004fffff) AM_DEVREADWRITE("mcd212", mcd212_device, regs_r, regs_w)
-// AM_RANGE(0x00500000, 0x0057ffff) AM_RAM
+// AM_RANGE(0x00500000, 0x0057ffff) AM_RAM
AM_RANGE(0x00500000, 0x00ffffff) AM_NOP
-// AM_RANGE(0x00e00000, 0x00efffff) AM_RAM // DVC
+// AM_RANGE(0x00e00000, 0x00efffff) AM_RAM // DVC
AM_RANGE(0x80000000, 0x8000807f) AM_DEVREADWRITE("scc68070", cdi68070_device, periphs_r, periphs_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/cischeat.cpp b/src/mame/drivers/cischeat.cpp
index d4a2eaed5a1..d33d7ee8372 100644
--- a/src/mame/drivers/cischeat.cpp
+++ b/src/mame/drivers/cischeat.cpp
@@ -525,13 +525,13 @@ WRITE16_MEMBER(cischeat_state::captflag_leds_w)
COMBINE_DATA( &m_captflag_leds );
if (ACCESSING_BITS_8_15)
{
- coin_counter_w(machine(), 1, data & 0x0100); // coin 2
- set_led_status(machine(), 0, data & 0x0200); // decide
- coin_counter_w(machine(), 0, data & 0x0400); // coin 1
- set_led_status(machine(), 1, data & 0x2000); // select
+ coin_counter_w(machine(), 1, data & 0x0100); // coin 2
+ set_led_status(machine(), 0, data & 0x0200); // decide
+ coin_counter_w(machine(), 0, data & 0x0400); // coin 1
+ set_led_status(machine(), 1, data & 0x2000); // select
int power = (data & 0x1000);
- m_captflag_hopper->write(space, 0, power ? 0x80 : 0x00); // prize motor
+ m_captflag_hopper->write(space, 0, power ? 0x80 : 0x00); // prize motor
if (!power)
m_captflag_hopper->reset();
}
@@ -554,7 +554,7 @@ WRITE16_MEMBER(cischeat_state::captflag_motor_command_right_w)
// e09a up
// 80b9 - (when not busy)
// 0088 - (when busy)
- // e0ba down
+ // e0ba down
data = COMBINE_DATA( &m_captflag_motor_command[RIGHT] );
captflag_motor_move(RIGHT, data);
}
@@ -564,7 +564,7 @@ WRITE16_MEMBER(cischeat_state::captflag_motor_command_left_w)
// e0ba up
// 8099 - (when not busy)
// 0088 - (when busy)
- // e09a down
+ // e09a down
data = COMBINE_DATA( &m_captflag_motor_command[LEFT] );
captflag_motor_move(LEFT, data);
}
@@ -575,7 +575,7 @@ void cischeat_state::captflag_motor_move(int side, UINT16 data)
timer_device & dev = ((side == RIGHT) ? m_captflag_motor_right : m_captflag_motor_left);
-// bool busy = !(dev.time_left() == attotime::never);
+// bool busy = !(dev.time_left() == attotime::never);
bool busy = false;
if (data & 0x0010)
@@ -587,10 +587,10 @@ void cischeat_state::captflag_motor_move(int side, UINT16 data)
int inc;
switch (data >> 8)
{
- case 0xf5: inc = +2; break; // -5 -6
- case 0xf8: inc = +1; break; // -5 -3
- case 0xfe: inc = -1; break; // -5 +3
- case 0x01: inc = -2; break; // -5 +6
+ case 0xf5: inc = +2; break; // -5 -6
+ case 0xf8: inc = +1; break; // -5 -3
+ case 0xfe: inc = -1; break; // -5 +3
+ case 0x01: inc = -2; break; // -5 +6
default:
if ((data >> 8) + 5 >= 0x100)
inc = -1;
@@ -632,8 +632,8 @@ CUSTOM_INPUT_MEMBER(cischeat_state::captflag_motor_pos_r)
CUSTOM_INPUT_MEMBER(cischeat_state::captflag_motor_busy_r)
{
-// timer_device & dev = ((side == RIGHT) ? m_captflag_motor_right : m_captflag_motor_left);
-// return (dev.time_left() == attotime::never) ? 0 : 1;
+// timer_device & dev = ((side == RIGHT) ? m_captflag_motor_right : m_captflag_motor_left);
+// return (dev.time_left() == attotime::never) ? 0 : 1;
return 0;
}
@@ -1492,11 +1492,11 @@ static INPUT_PORTS_START( captflag )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1) // coin 2
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON1 ) // decide
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) // coin 1
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_SERVICE1 ) // service
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_SERVICE ) // test
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1) // coin 2
+ PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON1 ) // decide
+ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) // coin 1
+ PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_SERVICE1 ) // service
+ PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_SERVICE ) // test
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) // select
PORT_BIT( 0x4000, IP_ACTIVE_HIGH,IPT_OUTPUT ) PORT_READ_LINE_DEVICE_MEMBER("hopper", ticket_dispenser_device, line_r) // prize sensor
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // potery on schems?
@@ -1951,7 +1951,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(cischeat_state::captflag_scanline)
{
int scanline = param;
- if(scanline == 240) // vblank: draw screen
+ if(scanline == 240) // vblank: draw screen
m_maincpu->set_input_line(2, HOLD_LINE);
if(scanline == 50)
@@ -1961,7 +1961,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(cischeat_state::captflag_scanline)
static MACHINE_CONFIG_START( captflag, cischeat_state )
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000, XTAL_24MHz / 2) // TMP68000P-12
+ MCFG_CPU_ADD("maincpu",M68000, XTAL_24MHz / 2) // TMP68000P-12
MCFG_CPU_PROGRAM_MAP(captflag_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", cischeat_state, captflag_scanline, "screen", 0, 1)
@@ -1969,9 +1969,9 @@ static MACHINE_CONFIG_START( captflag, cischeat_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
-// MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+// MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
MCFG_SCREEN_REFRESH_RATE(30) //TODO: wrong!
-// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500 * 3) /* not accurate */)
+// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500 * 3) /* not accurate */)
MCFG_SCREEN_SIZE(256, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0 +16, 256-1 -16)
MCFG_SCREEN_UPDATE_DRIVER(cischeat_state, screen_update_scudhamm)
@@ -3248,13 +3248,13 @@ ROM_START( captflag )
ROM_LOAD16_BYTE( "cf-92128_4_ver1.4.ic46", 0x000001, 0x020000, CRC(e773f87f) SHA1(cf9d72b0df256b69b96f1cd6b5f86282801873e3) )
ROM_REGION( 0x80000, "gfx1", 0 ) /* Scroll 0 */
- ROM_LOAD( "mr92027-11_w89.ic54", 0x000000, 0x080000, CRC(d34cae3c) SHA1(622ad4645df12d34e55bbfb7194508957bb2198b) ) // 5 on the PCB
+ ROM_LOAD( "mr92027-11_w89.ic54", 0x000000, 0x080000, CRC(d34cae3c) SHA1(622ad4645df12d34e55bbfb7194508957bb2198b) ) // 5 on the PCB
// ROM_REGION( 0x080000, "gfx2", 0 ) /* Scroll 1 */
// UNUSED
ROM_REGION( 0x20000, "gfx3", 0 ) /* Scroll 2 */
- ROM_LOAD( "cf-92128_6.ic55", 0x000000, 0x020000, CRC(12debfc2) SHA1(f28d3f63a3c8965fcd838eedad4ef3682a28da0d) ) // 6 on the PCB
+ ROM_LOAD( "cf-92128_6.ic55", 0x000000, 0x020000, CRC(12debfc2) SHA1(f28d3f63a3c8965fcd838eedad4ef3682a28da0d) ) // 6 on the PCB
ROM_REGION( 0x400000, "gfx4", 0 ) /* Sprites */
ROM_LOAD16_BYTE( "gp-9189_1.ic1", 0x000000, 0x080000, CRC(03d69f0f) SHA1(97a0552d94ca1e9c76896903c02c3f005752e5db) )
@@ -3267,28 +3267,28 @@ ROM_START( captflag )
ROM_LOAD16_BYTE( "mr92027-08_w88.ic16", 0x300001, 0x080000, CRC(fb080dd6) SHA1(49eceba8cdce76dec3f6a85327135125bb0910f0) )
ROM_REGION( 0x80000, "user2", 0 ) /* ? Unused ROMs ? */
- ROM_LOAD( "pr91042.ic86", 0x000000, 0x000100, CRC(e71de4aa) SHA1(d06e5a35ad2127df2d6328cce153073380ee7819) ) // FIXED BITS (00000xxx0000xxxx)
- ROM_LOAD( "pr88004q.ic88", 0x000000, 0x000200, CRC(9327dc37) SHA1(cfe7b144cdcd76170d47f1c4e0f72b6d4fca0c8d) ) // FIXED BITS (1xxxxxxx1111x1xx)
- ROM_LOAD( "pr92027a.ic16", 0x000000, 0x000020, CRC(bee7adc6) SHA1(cd11a3dae0317d06a69b5707a653b8997c1eb97f) ) // FIXED BITS (0000000000000xxx), 1xxx0 = 0x00
- ROM_LOAD( "pr92027a.ic17", 0x000000, 0x000020, CRC(bee7adc6) SHA1(cd11a3dae0317d06a69b5707a653b8997c1eb97f) ) // ""
+ ROM_LOAD( "pr91042.ic86", 0x000000, 0x000100, CRC(e71de4aa) SHA1(d06e5a35ad2127df2d6328cce153073380ee7819) ) // FIXED BITS (00000xxx0000xxxx)
+ ROM_LOAD( "pr88004q.ic88", 0x000000, 0x000200, CRC(9327dc37) SHA1(cfe7b144cdcd76170d47f1c4e0f72b6d4fca0c8d) ) // FIXED BITS (1xxxxxxx1111x1xx)
+ ROM_LOAD( "pr92027a.ic16", 0x000000, 0x000020, CRC(bee7adc6) SHA1(cd11a3dae0317d06a69b5707a653b8997c1eb97f) ) // FIXED BITS (0000000000000xxx), 1xxx0 = 0x00
+ ROM_LOAD( "pr92027a.ic17", 0x000000, 0x000020, CRC(bee7adc6) SHA1(cd11a3dae0317d06a69b5707a653b8997c1eb97f) ) // ""
ROM_LOAD( "pr92027b.ic32.bin", 0x000000, 0x000113, CRC(483f4fb5) SHA1(84bb0300a106261634c921a37858482d3233c05a) )
ROM_LOAD( "pr92027b.ic32.jedec", 0x000000, 0x000bd0, CRC(f0ed1845) SHA1(203438fdee05810b2265624e1a1fdd55d360f833) )
ROM_LOAD( "pr92027b.ic36.bin", 0x000000, 0x000113, CRC(483f4fb5) SHA1(84bb0300a106261634c921a37858482d3233c05a) )
ROM_LOAD( "pr92027b.ic36.jedec", 0x000000, 0x000bd0, CRC(f0ed1845) SHA1(203438fdee05810b2265624e1a1fdd55d360f833) )
- ROM_LOAD( "ch9072_4.ic39", 0x000000, 0x002000, CRC(b45b4dc0) SHA1(b9fae0c9ac2d40f0a202c538d866d5f2941ba8dd) ) // FIXED BITS (0000000x), 1ST AND 2ND HALF IDENTICAL
- ROM_LOAD( "ch9072_5.ic33", 0x000000, 0x001000, CRC(a8025dc1) SHA1(c9bb7ea59bba3041c687b449ff1560d7d1ce2ec9) ) // FIXED BITS (xxxx0xxx)
+ ROM_LOAD( "ch9072_4.ic39", 0x000000, 0x002000, CRC(b45b4dc0) SHA1(b9fae0c9ac2d40f0a202c538d866d5f2941ba8dd) ) // FIXED BITS (0000000x), 1ST AND 2ND HALF IDENTICAL
+ ROM_LOAD( "ch9072_5.ic33", 0x000000, 0x001000, CRC(a8025dc1) SHA1(c9bb7ea59bba3041c687b449ff1560d7d1ce2ec9) ) // FIXED BITS (xxxx0xxx)
ROM_LOAD( "ch9072_6.ic35", 0x000000, 0x001000, CRC(5cc9c561) SHA1(10866fd0707498fe4d4415bf755c07b55af4ae18) )
- ROM_LOAD( "ch9072_8.ic59", 0x000000, 0x001000, CRC(6c99523b) SHA1(cc00b326b69a97b5bd2e2d741ab41692a14eae35) ) // FIXED BITS (0xxx0xxx)
+ ROM_LOAD( "ch9072_8.ic59", 0x000000, 0x001000, CRC(6c99523b) SHA1(cc00b326b69a97b5bd2e2d741ab41692a14eae35) ) // FIXED BITS (0xxx0xxx)
ROM_LOAD( "mr90015-35_w33.ic54", 0x000000, 0x080000, CRC(9d428fb7) SHA1(02f72938d73db932bd217620a175a05215f6016a) ) // not dumped yet (taken from the other games)
ROM_LOAD( "mr90015-35_w33.ic67", 0x000000, 0x080000, CRC(9d428fb7) SHA1(02f72938d73db932bd217620a175a05215f6016a) ) // ""
ROM_REGION( 0x100000, "oki1", 0 ) /* Samples (8x20000) */
- ROM_LOAD( "mr92027-10_w27.ic19", 0x000000, 0x100000, CRC(04bd729e) SHA1(92bcedf16554f33cc3d0dbdd8807b0e2fafe5d7c) ) // 2 on the PCB
+ ROM_LOAD( "mr92027-10_w27.ic19", 0x000000, 0x100000, CRC(04bd729e) SHA1(92bcedf16554f33cc3d0dbdd8807b0e2fafe5d7c) ) // 2 on the PCB
ROM_REGION( 0x100000, "oki2", 0 ) /* Samples (8x20000) */
- ROM_LOAD( "mr92027-09_w26.ic18", 0x000000, 0x100000, CRC(3aaa332a) SHA1(6c19364069e0b077a07ac4f9c4b0cf0c0985a42a) ) // 1 on the PCB
+ ROM_LOAD( "mr92027-09_w26.ic18", 0x000000, 0x100000, CRC(3aaa332a) SHA1(6c19364069e0b077a07ac4f9c4b0cf0c0985a42a) ) // 1 on the PCB
ROM_END
DRIVER_INIT_MEMBER(cischeat_state, captflag)
diff --git a/src/mame/drivers/clowndwn.cpp b/src/mame/drivers/clowndwn.cpp
index 5299fff61f8..2eacdadfc44 100644
--- a/src/mame/drivers/clowndwn.cpp
+++ b/src/mame/drivers/clowndwn.cpp
@@ -17,13 +17,13 @@ class clowndwn_state : public driver_device
public:
clowndwn_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
- // ,m_maincpu(*this, "maincpu")
+ // ,m_maincpu(*this, "maincpu")
{ }
virtual void machine_start() override;
virtual void machine_reset() override;
-// required_device<mcs51_cpu_device> m_maincpu;
+// required_device<mcs51_cpu_device> m_maincpu;
};
static INPUT_PORTS_START( clowndwn )
@@ -43,9 +43,9 @@ void clowndwn_state::machine_reset()
static MACHINE_CONFIG_START( clowndwn, clowndwn_state )
/* basic machine hardware */
-// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown (vectors at end? 6xxx ?)
-// MCFG_CPU_PROGRAM_MAP(clowndwn_map)
-// MCFG_CPU_IO_MAP(clowndwn_io)
+// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown (vectors at end? 6xxx ?)
+// MCFG_CPU_PROGRAM_MAP(clowndwn_map)
+// MCFG_CPU_IO_MAP(clowndwn_io)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -63,4 +63,3 @@ ROM_START( clowndwn )
ROM_END
GAME( 1987, clowndwn, 0, clowndwn, clowndwn, driver_device, 0, ROT0, "Elwood Electronics", "Clown Roll Down (Elwood)", MACHINE_IS_SKELETON_MECHANICAL )
-
diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp
index 92fdc31ec02..4348dbc88b4 100644
--- a/src/mame/drivers/cps1.cpp
+++ b/src/mame/drivers/cps1.cpp
@@ -9015,7 +9015,7 @@ ROM_START( sf2cebltw )
ROM_LOAD16_BYTE( "30.11f", 0x0c0001, 0x20000, CRC(d0580ff2) SHA1(1b2e4c4abbe90a68283c86e7cb5328b242be5683) )
ROM_LOAD16_WORD_SWAP( "s92_21a.5f", 0x100000, 0x80000, CRC(925a7877) SHA1(1960dca35f0ca6f2b399a9fccfbc0132ac6425d1) )
- ROM_REGION( 0x40000, "pal", 0 )
+ ROM_REGION( 0x40000, "pal", 0 )
ROM_LOAD( "bruteforce.palce16v8h-25.11d", 0x00000, 0x40000, CRC(430f722d) SHA1(b0c0570057c782b1114819fae907f45a01c55065) )
ROM_REGION( 0x600000, "gfx", 0 )
diff --git a/src/mame/drivers/cps2.cpp b/src/mame/drivers/cps2.cpp
index 4eb776d3bd7..a5cc6776637 100644
--- a/src/mame/drivers/cps2.cpp
+++ b/src/mame/drivers/cps2.cpp
@@ -910,7 +910,7 @@ READ16_MEMBER(cps_state::joy_or_paddle_ecofghtr_r)
else if ((dial1 & 0x800) < (m_ecofghtr_dial_last1 & 0x800)) // value gone from 0xfff to 0x000
{
m_ecofghtr_dial_direction1 = 1;
- }
+ }
m_ecofghtr_dial_last0 = dial0;
m_ecofghtr_dial_last1 = dial1;
diff --git a/src/mame/drivers/ddragon.cpp b/src/mame/drivers/ddragon.cpp
index dee04e91876..b422887971d 100644
--- a/src/mame/drivers/ddragon.cpp
+++ b/src/mame/drivers/ddragon.cpp
@@ -1728,7 +1728,7 @@ ROM_START( ddragon2u )
ROM_LOAD( "26ad-0.bin", 0x00000, 0x8000, CRC(75e36cd6) SHA1(f24805f4f6925b3ac508e66a6fc25c275b05f3b9) )
ROM_REGION( 0x10000, "gfx1", 0 )
- ROM_LOAD( "26a8-0.bin", 0x00000, 0x10000, CRC(3ad1049c) SHA1(11d9544a56f8e6a84beb307a5c8a9ff8afc55c66) ) /* chars */
+ ROM_LOAD( "26a8-0.bin", 0x00000, 0x10000, CRC(3ad1049c) SHA1(11d9544a56f8e6a84beb307a5c8a9ff8afc55c66) ) /* chars */
ROM_REGION( 0xc0000, "gfx2", 0 )
ROM_LOAD( "26j0-0.bin", 0x00000, 0x20000, CRC(db309c84) SHA1(ee095e4a3bc86737539784945decb1f63da47b9b) ) /* sprites */
@@ -1785,7 +1785,7 @@ ROM_START( ddragon2b )
ROM_LOAD( "13", 0x10000, 0x10000, CRC(7c21be72) SHA1(9935c983d0f7613ee192758ddcd8d8592e8bf78a) )
ROM_LOAD( "14", 0x20000, 0x10000, CRC(e92f91f4) SHA1(4351b2b117c1104dcdb6f48531ddad385691c945) )
ROM_LOAD( "12", 0x30000, 0x10000, CRC(6896e2f7) SHA1(d230d2406ae451f59d1d0783b1d670a0d3e28d8c) )
-
+
ROM_REGION( 0x40000, "oki", 0 ) /* adpcm samples */
ROM_LOAD( "7", 0x00000, 0x10000, CRC(6d9e3f0f) SHA1(5c3e7fb2e46939dd3c540b9e1af9591dbfd15b19) )
ROM_LOAD( "9", 0x10000, 0x10000, CRC(0c15dec9) SHA1(b0a6bb13216f4321b5fc01a649ea84d2d1d51088) )
diff --git a/src/mame/drivers/dec0.cpp b/src/mame/drivers/dec0.cpp
index 49d82306422..5e58b5ef2e2 100644
--- a/src/mame/drivers/dec0.cpp
+++ b/src/mame/drivers/dec0.cpp
@@ -1892,43 +1892,43 @@ ROM_END
/*
CPUs
-QTY Type clock position function
-1x SCN68000CAN64 main PCB 9h 16/32-bit Microprocessor - main
-1x UM6502 main PCB 7d 8-bit Microprocessor - sound
-1x MC3403 main PCB 14e Quad Operational Amplifier - sound
-1x GL358 main PCB 13b Dual Operational Amplifier - sound
-1x YM2203C main PCB 12a FM Operator Type-M (OPM) - sound
-2x YM3014B main PCB 13d, 13e D/A Converter (DAC) - sound
-1x YM3812 main PCB 9b FM Operator Type-L II (OPL II) - sound
-1x MC68705R3P ROMs PCB 1l 8-bit EPROM Microcomputer Unit - main (not dumped)
-1x M5205 ROMs PCB 12c ADPCM Speech Syntesis IC - sound
-1x oscillator 24.000MHz main PCB 2a
-1x oscillator 16.0000 main PCB 12n
-1x blu resonator CSB-400P ROMs PCB 12b
+QTY Type clock position function
+1x SCN68000CAN64 main PCB 9h 16/32-bit Microprocessor - main
+1x UM6502 main PCB 7d 8-bit Microprocessor - sound
+1x MC3403 main PCB 14e Quad Operational Amplifier - sound
+1x GL358 main PCB 13b Dual Operational Amplifier - sound
+1x YM2203C main PCB 12a FM Operator Type-M (OPM) - sound
+2x YM3014B main PCB 13d, 13e D/A Converter (DAC) - sound
+1x YM3812 main PCB 9b FM Operator Type-L II (OPL II) - sound
+1x MC68705R3P ROMs PCB 1l 8-bit EPROM Microcomputer Unit - main (not dumped)
+1x M5205 ROMs PCB 12c ADPCM Speech Syntesis IC - sound
+1x oscillator 24.000MHz main PCB 2a
+1x oscillator 16.0000 main PCB 12n
+1x blu resonator CSB-400P ROMs PCB 12b
ROMs
-QTY Type position status
-4x 27256 main PCB 1-4 dumped
-4x 27512 main PCB 5-8 dumped
-7x 27256 ROMs PCB 15,20-23,28,29 dumped
-9x 27512 ROMs PCB 9-14,27-30 dumped
-2x N82S129AN main PCB 2q,3p not dumped yet
-1x N82S131N main PCB 5q not dumped yet
-1x N82S137N main PCB 8u not dumped yet
-1x N82S129AN ROMs PCB 12c not dumped yet
+QTY Type position status
+4x 27256 main PCB 1-4 dumped
+4x 27512 main PCB 5-8 dumped
+7x 27256 ROMs PCB 15,20-23,28,29 dumped
+9x 27512 ROMs PCB 9-14,27-30 dumped
+2x N82S129AN main PCB 2q,3p not dumped yet
+1x N82S131N main PCB 5q not dumped yet
+1x N82S137N main PCB 8u not dumped yet
+1x N82S129AN ROMs PCB 12c not dumped yet
RAMs
-QTY Type position
-2x HY6264 main PCB 12c,12d
-14x TMM2018 main PCB 1e,2e,5k,5l,5m,5n,5o,5p,7m,7n,8b,11s,11t,11u
-2x TMM2064 ROMs PCB 8n,8o
-4x TMM2018 ROMs PCB 8f,8g,8j,8k
+QTY Type position
+2x HY6264 main PCB 12c,12d
+14x TMM2018 main PCB 1e,2e,5k,5l,5m,5n,5o,5p,7m,7n,8b,11s,11t,11u
+2x TMM2064 ROMs PCB 8n,8o
+4x TMM2018 ROMs PCB 8f,8g,8j,8k
PLDs
-QTY Type position status
+QTY Type position status
Others
1x 28x2 edge connector
3x 50 pins flat cable connector from main board to roms board
1x trimmer (volume)
-1x 8x2 switches DIP
+1x 8x2 switches DIP
*/
@@ -1937,7 +1937,7 @@ ROM_START( drgninjab2 )
ROM_LOAD16_BYTE( "a14.3e", 0x00000, 0x10000, CRC(c4b9f4e7) SHA1(4a8176cce8c7909aace8ece4f97b1a199617938e) ) // 99.978638%
ROM_LOAD16_BYTE( "a11.3b", 0x00001, 0x10000, CRC(e4cc7c60) SHA1(63aeab4e20420f28a947438f2d7079c92a43d2df) ) // 99.978638%
ROM_LOAD16_BYTE( "a12.2e", 0x40000, 0x10000, CRC(2b81faf7) SHA1(6d10c29f5ee06856843d83e77ba24c2b6e00a9cb) )
- ROM_LOAD16_BYTE( "a9.2b", 0x40001, 0x10000, CRC(c52c2e9d) SHA1(399f2b7df9d558c8f33bf1a7c8048c62e0f54cec) )
+ ROM_LOAD16_BYTE( "a9.2b", 0x40001, 0x10000, CRC(c52c2e9d) SHA1(399f2b7df9d558c8f33bf1a7c8048c62e0f54cec) )
ROM_REGION( 0x10000, "audiocpu", 0 ) /* Sound CPU */
ROM_LOAD( "a15.7b", 0x8000, 0x8000, CRC(82007af2) SHA1(f0db1b1dab199df402a7590e56d4d5ab4baca803) ) // 99.612427%
@@ -1982,7 +1982,7 @@ ROM_START( drgninjab2 )
ROM_LOAD( "n82s137n.8u", 0x0000, 0x400, CRC(a5cda23e) SHA1(d6c8534ae3c95b47a0701047fef67f15dd71f3fe) )
ROM_END
-
+
ROM_START( birdtry )
ROM_REGION( 0x60000, "maincpu", 0 ) /* 6*64k for 68000 code */
diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp
index 938be92fa48..9e439ded0a1 100644
--- a/src/mame/drivers/dooyong.cpp
+++ b/src/mame/drivers/dooyong.cpp
@@ -564,7 +564,7 @@ static INPUT_PORTS_START( flytiger )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_MODIFY("SYSTEM")
-// PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") // allows title screen + ending screen colours to cycle (but I'm not sure they're meant to, reference shots suggest not, maybe a debug port?)
+// PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") // allows title screen + ending screen colours to cycle (but I'm not sure they're meant to, reference shots suggest not, maybe a debug port?)
INPUT_PORTS_END
static INPUT_PORTS_START( sadari )
diff --git a/src/mame/drivers/fastinvaders.cpp b/src/mame/drivers/fastinvaders.cpp
index 9184cebd259..a1cc6de2041 100644
--- a/src/mame/drivers/fastinvaders.cpp
+++ b/src/mame/drivers/fastinvaders.cpp
@@ -90,8 +90,8 @@ static MACHINE_CONFIG_START( fastinvaders, fastinvaders_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8085A, 10000000 ) // guess
MCFG_CPU_PROGRAM_MAP(fastinvaders_map)
-// MCFG_CPU_IO_MAP(fastinvaders_io_map)
-// MCFG_CPU_VBLANK_INT_DRIVER("screen", fastinvaders_state, irq0_line_hold) // where is irqack?
+// MCFG_CPU_IO_MAP(fastinvaders_io_map)
+// MCFG_CPU_VBLANK_INT_DRIVER("screen", fastinvaders_state, irq0_line_hold) // where is irqack?
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -172,4 +172,3 @@ ROM_END
GAME( 1979, fi6845, 0, fastinvaders, fastinvaders, driver_device, 0, ROT0, "Fiberglass", "Fast Invaders (6845 version)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
GAME( 1979, fi8275, fi6845, fastinvaders, fastinvaders, driver_device, 0, ROT0, "Fiberglass", "Fast Invaders (8275 version)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-
diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp
index 6f920121999..220d97029eb 100644
--- a/src/mame/drivers/galaxian.cpp
+++ b/src/mame/drivers/galaxian.cpp
@@ -1750,10 +1750,10 @@ static ADDRESS_MAP_START( spactrai_map, AS_PROGRAM, 8, galaxian_state )
AM_RANGE(0x1600, 0x4fff) AM_ROM
// cleared on startup
-// AM_RANGE(0x6000, 0x60ff) AM_RAM
-// AM_RANGE(0x6800, 0x68ff) AM_RAM
-// AM_RANGE(0x7000, 0x70ff) AM_RAM
-
+// AM_RANGE(0x6000, 0x60ff) AM_RAM
+// AM_RANGE(0x6800, 0x68ff) AM_RAM
+// AM_RANGE(0x7000, 0x70ff) AM_RAM
+
// standard galaxian mapping?
AM_RANGE(0x6004, 0x6007) AM_MIRROR(0x07f8) AM_DEVWRITE("cust", galaxian_sound_device, lfo_freq_w)
AM_RANGE(0x6800, 0x6807) AM_MIRROR(0x07f8) AM_DEVWRITE("cust", galaxian_sound_device, sound_w)
@@ -1801,11 +1801,11 @@ static ADDRESS_MAP_START( anteatergg_map, AS_PROGRAM, 8, galaxian_state )
AM_RANGE(0x4000, 0x4fff) AM_RAM
AM_RANGE(0x5000, 0x53ff) AM_RAM AM_RAM_WRITE(galaxian_videoram_w) AM_SHARE("videoram")
AM_RANGE(0x5800, 0x58ff) AM_RAM AM_RAM_WRITE(galaxian_objram_w) AM_SHARE("spriteram")
-// AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0400) AM_RAM
+// AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0400) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x07ff) AM_READ_PORT("IN0")
-// AM_RANGE(0x6000, 0x6001) AM_MIRROR(0x07f8) AM_WRITE(start_lamp_w)
-// AM_RANGE(0x6002, 0x6002) AM_MIRROR(0x07f8) AM_WRITE(coin_lock_w)
-// AM_RANGE(0x6003, 0x6003) AM_MIRROR(0x07f8) AM_WRITE(coin_count_0_w)
+// AM_RANGE(0x6000, 0x6001) AM_MIRROR(0x07f8) AM_WRITE(start_lamp_w)
+// AM_RANGE(0x6002, 0x6002) AM_MIRROR(0x07f8) AM_WRITE(coin_lock_w)
+// AM_RANGE(0x6003, 0x6003) AM_MIRROR(0x07f8) AM_WRITE(coin_count_0_w)
AM_RANGE(0x6800, 0x6800) AM_MIRROR(0x07ff) AM_READ_PORT("IN1")
AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x07ff) AM_READ_PORT("IN2")
AM_RANGE(0x7001, 0x7001) AM_MIRROR(0x07f8) AM_WRITE(irq_enable_w)
@@ -7728,7 +7728,7 @@ ROM_START( spactrai )
ROM_REGION( 0x1000, "gfx1", 0 )
ROM_LOAD( "6cen.bin", 0x0000, 0x0800, CRC(a59a9f3f) SHA1(9564f1d013d566dc0b19762aec66119e2ece0b49) ) // MK2716J
ROM_LOAD( "7cen.bin", 0x0800, 0x0800, CRC(9b75b40a) SHA1(4ad94db3f1d6b45a3de1ed9b51d361f20c6706e4) ) // marked MM2758Q (which is meant to be a 1Kx8 EPROM, but in reality is a 2Kx8 EPROM ?!)
-
+
ROM_REGION( 0x0020, "proms", 0 )
ROM_LOAD( "stk.bin", 0x0000, 0x0020, CRC(6a0c7d87) SHA1(140335d85c67c75b65689d4e76d29863c209cf32) )
ROM_END
diff --git a/src/mame/drivers/gameking.cpp b/src/mame/drivers/gameking.cpp
index e2913c93f5a..66ce023b10b 100644
--- a/src/mame/drivers/gameking.cpp
+++ b/src/mame/drivers/gameking.cpp
@@ -3,14 +3,14 @@
/* TimeTop - GameKing */
/*
PeT mess@utanet.at 2015
-
+
Thanks to Deathadder, Judge, Porchy, Klaus Sommer, James Brolly & Brian Provinciano
hopefully my work (reverse engineerung, cartridge+bios backup, emulation) will be honored in future
and my name will not be removed entirely, especially by simple code rewrites of working emulation
-
+
flashcard, handheld, programmer, assembler ready to do some test on real hardware
-
+
todo:
!back up gameking3 bios so emulation of gameking3 gets possible; my gameking bios backup solution should work
search for rockwell r65c02 variant (cb:wai instruction) and several more exceptions, and implement it
@@ -18,7 +18,7 @@
work out bankswitching and exceptions
(improove emulation)
(add audio)
-
+
use gameking3 cartridge to get illegal cartridge scroller
This system appears to be based on the GeneralPlus GPL133 system-on-chip or a close relative.
@@ -59,13 +59,13 @@ public:
DECLARE_DEVICE_IMAGE_LOAD_MEMBER(gameking_cart);
struct Gkio {
- UINT8 input, input2;
- UINT8 timer;
- UINT8 res3[0x2f];
- UINT8 bank4000_address; // 32
- UINT8 bank4000_cart; //33 bit 0 only?
- UINT8 bank8000_cart; //34 bit 7; bits 0,1,.. a15,a16,..
- UINT8 res2[0x4c];
+ UINT8 input, input2;
+ UINT8 timer;
+ UINT8 res3[0x2f];
+ UINT8 bank4000_address; // 32
+ UINT8 bank4000_cart; //33 bit 0 only?
+ UINT8 bank8000_cart; //34 bit 7; bits 0,1,.. a15,a16,..
+ UINT8 res2[0x4c];
};
protected:
required_device<cpu_device> m_maincpu;
@@ -125,7 +125,7 @@ READ8_MEMBER(gameking_state::io_r)
if (offset != offsetof(Gkio, bank8000_cart))
logerror("%.6f io r %x %x\n", machine().time().as_double(), offset, data);
-
+
return data;
}
@@ -149,9 +149,9 @@ static ADDRESS_MAP_START( gameking_mem , AS_PROGRAM, 8, gameking_state )
AM_RANGE(0x0600, 0x077f) AM_READWRITE(lcd_r, lcd_w)
AM_RANGE(0x0d00, 0x0fff) AM_RAM // d00, e00, f00 prooved on handheld
-// AM_RANGE(0x1000, 0x1fff) AM_RAM // sthero writes to $19xx
+// AM_RANGE(0x1000, 0x1fff) AM_RAM // sthero writes to $19xx
-// AM_RANGE(0x3000, 0x3fff) AM_ROMBANK("bank3000")
+// AM_RANGE(0x3000, 0x3fff) AM_ROMBANK("bank3000")
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank4000")
AM_RANGE(0x8000, 0xffaf) AM_ROMBANK("bank8000")
AM_RANGE(0xffb0, 0xffff) AM_ROMBANK("bankboot") // cpu seems to read from 8000 bank, and for exceptions ignore bank
@@ -191,7 +191,7 @@ UINT32 gameking_state::screen_update_gameking(screen_device &screen, bitmap_ind1
{
for (int x=0, j=0;j<48/4;x+=4, j++)
{
- memory_region *maincpu_rom = memregion("maincpu");
+ memory_region *maincpu_rom = memregion("maincpu");
UINT8 data=maincpu_rom->base()[0x600+j+i*12];
bitmap.pix16(y, x+3)=data&3;
bitmap.pix16(y, x+2)=(data>>2)&3;
@@ -245,8 +245,8 @@ DEVICE_IMAGE_LOAD_MEMBER( gameking_state, gameking_cart )
void gameking_state::machine_start()
{
- std::string region_tag;
- m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
+ std::string region_tag;
+ m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
m_bank4000 = membank("bank4000");
m_bank8000 = membank("bank8000");
@@ -298,18 +298,18 @@ static MACHINE_CONFIG_START( gameking, gameking_state )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gameking1, gameking )
- MCFG_SOFTWARE_LIST_ADD("cart_list", "gameking")
+ MCFG_SOFTWARE_LIST_ADD("cart_list", "gameking")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gameking3, gameking )
- MCFG_SOFTWARE_LIST_ADD("cart_list", "gameking")
+ MCFG_SOFTWARE_LIST_ADD("cart_list", "gameking")
MCFG_SOFTWARE_LIST_ADD("cart_list_3", "gameking3")
MACHINE_CONFIG_END
ROM_START(gameking)
ROM_REGION(0x10000+0x80000, "maincpu", ROMREGION_ERASE00)
-// ROM_LOAD("gm218.bin", 0x10000, 0x80000, CRC(8f52a928) SHA1(2e791fc7b642440d36820d2c53e1bb732375eb6e) ) // a14 inversed
+// ROM_LOAD("gm218.bin", 0x10000, 0x80000, CRC(8f52a928) SHA1(2e791fc7b642440d36820d2c53e1bb732375eb6e) ) // a14 inversed
ROM_LOAD("gm218.bin", 0x10000, 0x80000, CRC(5a1ade3d) SHA1(e0d056f8ebfdf52ef6796d0375eba7fcc4a6a9d3) )
ROM_END
diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp
index 44a10251ed2..97f87b6bbba 100644
--- a/src/mame/drivers/goldnpkr.cpp
+++ b/src/mame/drivers/goldnpkr.cpp
@@ -4547,7 +4547,7 @@ ROM_START( potnpkrh )
ROM_LOAD( "unk_2716.8a", 0x1000, 0x0800, CRC(a138afa6) SHA1(80c6d11086f78e36dfc01c15b23e70667fcf17fc) ) /* char ROM */
/* Backplane at 5a has two bits different against the common cards gfx
- Offsets 0x380 and 0x400, bit0 is set to 0 */
+ Offsets 0x380 and 0x400, bit0 is set to 0 */
ROM_REGION( 0x1800, "gfx2", 0 )
ROM_LOAD( "unk_2716.4a", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */
ROM_LOAD( "unk_2716.5a", 0x0800, 0x0800, CRC(daf38d03) SHA1(6b518494688756ad7b753fdec46b6392c4a9ebbe) ) /* cards deck gfx, bitplane2 */
@@ -10149,7 +10149,7 @@ ROM_END
---------------------------------------------------------------------------
* First game program:
-
+
NMI vector is OK ($29FD).
RES & IRQ/BRK vectors are pointing to 0x2EE3 and $3065 (JMP $2EE3)
$2EE3 --> JMP $FBBB (where is in middle of a routine. Not the real start)
@@ -10159,22 +10159,22 @@ ROM_END
* Second game program:
Expects the string '#2D' placed in offset FAh-FCh (NVRAM)
-
+
fill FAh = 0x23
FBh = 0x32
FCh = 0x44
- #2D
+ #2D
...to pass the checks at $638c: JSR $6760
-
+
Another odd thing:
bp 6394
-
+
639f: lda #$20
63a1: sta $a0
- 63a3: lda $a0 \
+ 63a3: lda $a0 \
63a5: bne $63a3 / ---> loop waiting for register $a0 cleared!
-------------------------------------------------------------------------*/
@@ -10215,7 +10215,7 @@ ROM_START( animpkra )
ROM_END
-
+
/*********************************************
* Driver Init *
*********************************************/
diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp
index 0957fb7032a..8c0110c7a21 100644
--- a/src/mame/drivers/hh_tms1k.cpp
+++ b/src/mame/drivers/hh_tms1k.cpp
@@ -2691,7 +2691,7 @@ READ8_MEMBER(mdndclab_state::read_k)
8 buttons on the left, top-to-bottom: (lower 6 are just for sound-preview)
[Switch Key] [Next Turn / Level 1/2] [Dragon Flying / Defeat Tune] [Dragon Attacks / Dragon Wakes]
[Wall / Door] [Illegal Move / Warrior Moves] [Warrior 1 / Winner] [Warrior 2 / Treasure]
-
+
8*8 buttons to the right of that, making the gameboard
*/
diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp
index 538d40a8ad3..b288e7d9157 100644
--- a/src/mame/drivers/hp9845.cpp
+++ b/src/mame/drivers/hp9845.cpp
@@ -71,9 +71,9 @@ class hp9845b_state : public driver_device
public:
hp9845b_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
- m_lpu(*this , "lpu"),
- m_ppu(*this , "ppu"),
- m_palette(*this , "palette"),
+ m_lpu(*this , "lpu"),
+ m_ppu(*this , "ppu"),
+ m_palette(*this , "palette"),
m_io_key0(*this , "KEY0"),
m_io_key1(*this , "KEY1"),
m_io_key2(*this , "KEY2"),
@@ -82,14 +82,14 @@ public:
UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- virtual void machine_start() override;
- virtual void machine_reset() override;
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
- TIMER_DEVICE_CALLBACK_MEMBER(scanline_timer);
+ TIMER_DEVICE_CALLBACK_MEMBER(scanline_timer);
- void vblank_w(screen_device &screen, bool state);
+ void vblank_w(screen_device &screen, bool state);
- IRQ_CALLBACK_MEMBER(irq_callback);
+ IRQ_CALLBACK_MEMBER(irq_callback);
void update_irl(void);
TIMER_DEVICE_CALLBACK_MEMBER(kb_scan);
@@ -97,55 +97,55 @@ public:
DECLARE_READ16_MEMBER(kb_status_r);
DECLARE_WRITE16_MEMBER(kb_irq_clear_w);
- DECLARE_WRITE8_MEMBER(pa_w);
+ DECLARE_WRITE8_MEMBER(pa_w);
private:
- required_device<hp_5061_3001_cpu_device> m_lpu;
- required_device<hp_5061_3001_cpu_device> m_ppu;
+ required_device<hp_5061_3001_cpu_device> m_lpu;
+ required_device<hp_5061_3001_cpu_device> m_ppu;
required_device<palette_device> m_palette;
required_ioport m_io_key0;
required_ioport m_io_key1;
required_ioport m_io_key2;
required_ioport m_io_key3;
- void set_video_mar(UINT16 mar);
- void video_fill_buff(bool buff_idx);
- void video_render_buff(unsigned line_in_row, bool buff_idx);
+ void set_video_mar(UINT16 mar);
+ void video_fill_buff(bool buff_idx);
+ void video_render_buff(unsigned line_in_row, bool buff_idx);
// Character generator
const UINT8 *m_chargen;
- // Text mode video I/F
- typedef struct {
- UINT8 chars[ 80 ];
- UINT8 attrs[ 80 ];
- bool full;
- } video_buffer_t;
+ // Text mode video I/F
+ typedef struct {
+ UINT8 chars[ 80 ];
+ UINT8 attrs[ 80 ];
+ bool full;
+ } video_buffer_t;
bitmap_rgb32 m_bitmap;
- unsigned m_video_scanline;
- offs_t m_video_mar;
- UINT16 m_video_word;
- bool m_video_load_mar;
- bool m_video_byte_idx;
- UINT8 m_video_attr;
- bool m_video_buff_idx;
- bool m_video_blanked;
- UINT8 m_video_frame;
- video_buffer_t m_video_buff[ 2 ];
-
- // Interrupt handling
- UINT8 m_irl_pending;
-
- // State of keyboard
- ioport_value m_kb_state[ 4 ];
- UINT8 m_kb_scancode;
- UINT16 m_kb_status;
+ unsigned m_video_scanline;
+ offs_t m_video_mar;
+ UINT16 m_video_word;
+ bool m_video_load_mar;
+ bool m_video_byte_idx;
+ UINT8 m_video_attr;
+ bool m_video_buff_idx;
+ bool m_video_blanked;
+ UINT8 m_video_frame;
+ video_buffer_t m_video_buff[ 2 ];
+
+ // Interrupt handling
+ UINT8 m_irl_pending;
+
+ // State of keyboard
+ ioport_value m_kb_state[ 4 ];
+ UINT8 m_kb_scancode;
+ UINT16 m_kb_status;
};
static INPUT_PORTS_START(hp9845b)
- // Keyboard is arranged in a 8 x 16 matrix. Of the 128 possible positions, 118 are used.
+ // Keyboard is arranged in a 8 x 16 matrix. Of the 128 possible positions, 118 are used.
// Keys are mapped on bit b of KEYn
// where b = (row & 1) << 4 + column, n = row >> 1
// column = [0..15]
@@ -261,7 +261,7 @@ static INPUT_PORTS_START(hp9845b)
PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_UNUSED) // K12
PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_UNUSED) // K11
PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_UNUSED) // K10
- PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_UNUSED) // K9
+ PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_UNUSED) // K9
PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_UNUSED) // K8
PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') // 0
PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(') // 8
@@ -274,8 +274,8 @@ static INPUT_PORTS_START(hp9845b)
PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F7) PORT_NAME("K7") // K7
PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F6) PORT_NAME("K6") // K6
PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F5) PORT_NAME("K5") // K5
- PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F4) PORT_NAME("K4") // K4
- PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F3) PORT_NAME("K3") // K3
+ PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F4) PORT_NAME("K4") // K4
+ PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F3) PORT_NAME("K3") // K3
PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F2) PORT_NAME("K2") // K2
PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F1) PORT_NAME("K1") // K1
PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_ESC) PORT_NAME("K0") // K0
@@ -304,290 +304,290 @@ void hp9845b_state::machine_start()
{
machine().first_screen()->register_screen_bitmap(m_bitmap);
- m_chargen = memregion("chargen")->base();
+ m_chargen = memregion("chargen")->base();
}
void hp9845b_state::machine_reset()
{
- m_lpu->halt_w(1);
- m_ppu->halt_w(0);
-
- // Some sensible defaults
- m_video_mar = VIDEO_BUFFER_BASE;
- m_video_load_mar = false;
- m_video_byte_idx = false;
- m_video_attr = 0;
- m_video_buff_idx = false;
- m_video_blanked = false;
- m_video_frame = 0;
-
- m_irl_pending = 0;
-
- memset(&m_kb_state[ 0 ] , 0 , sizeof(m_kb_state));
- m_kb_scancode = 0x7f;
- m_kb_status = 0;
+ m_lpu->halt_w(1);
+ m_ppu->halt_w(0);
+
+ // Some sensible defaults
+ m_video_mar = VIDEO_BUFFER_BASE;
+ m_video_load_mar = false;
+ m_video_byte_idx = false;
+ m_video_attr = 0;
+ m_video_buff_idx = false;
+ m_video_blanked = false;
+ m_video_frame = 0;
+
+ m_irl_pending = 0;
+
+ memset(&m_kb_state[ 0 ] , 0 , sizeof(m_kb_state));
+ m_kb_scancode = 0x7f;
+ m_kb_status = 0;
}
void hp9845b_state::set_video_mar(UINT16 mar)
{
- m_video_mar = (mar & 0xfff) | VIDEO_BUFFER_BASE;
+ m_video_mar = (mar & 0xfff) | VIDEO_BUFFER_BASE;
}
void hp9845b_state::video_fill_buff(bool buff_idx)
{
- unsigned char_idx = 0;
- unsigned iters = 0;
- UINT8 byte;
- address_space& prog_space = m_ppu->space(AS_PROGRAM);
-
- m_video_buff[ buff_idx ].full = false;
-
- while (1) {
- if (!m_video_byte_idx) {
- if (iters++ >= MAX_WORD_PER_ROW) {
- // Limit on accesses per row reached
- break;
- }
- m_video_word = prog_space.read_word(m_video_mar << 1);
- if (m_video_load_mar) {
- // Load new address into MAR after start of a new frame or NWA instruction
- // TODO: decode graphic/alpha mode bit
- set_video_mar(~m_video_word);
- m_video_load_mar = false;
- continue;
- } else {
- // Read normal word from frame buffer, start parsing at MSB
- set_video_mar(m_video_mar + 1);
- byte = (UINT8)(m_video_word >> 8);
- m_video_byte_idx = true;
- }
- } else {
- // Parse LSB
- byte = (UINT8)(m_video_word & 0xff);
- m_video_byte_idx = false;
- }
- if ((byte & 0xc0) == 0x80) {
- // Attribute command
- m_video_attr = byte & 0x1f;
- } else if ((byte & 0xc1) == 0xc0) {
- // New Word Address (NWA)
- m_video_load_mar = true;
- m_video_byte_idx = false;
- } else if ((byte & 0xc1) == 0xc1) {
- // End of line (EOL)
- // Fill rest of buffer with spaces
- memset(&m_video_buff[ buff_idx ].chars[ char_idx ] , 0x20 , 80 - char_idx);
- memset(&m_video_buff[ buff_idx ].attrs[ char_idx ] , m_video_attr , 80 - char_idx);
- m_video_buff[ buff_idx ].full = true;
- break;
- } else {
- // Normal character
- m_video_buff[ buff_idx ].chars[ char_idx ] = byte;
- m_video_buff[ buff_idx ].attrs[ char_idx ] = m_video_attr;
- char_idx++;
- if (char_idx == 80) {
- m_video_buff[ buff_idx ].full = true;
- break;
- }
- }
- }
+ unsigned char_idx = 0;
+ unsigned iters = 0;
+ UINT8 byte;
+ address_space& prog_space = m_ppu->space(AS_PROGRAM);
+
+ m_video_buff[ buff_idx ].full = false;
+
+ while (1) {
+ if (!m_video_byte_idx) {
+ if (iters++ >= MAX_WORD_PER_ROW) {
+ // Limit on accesses per row reached
+ break;
+ }
+ m_video_word = prog_space.read_word(m_video_mar << 1);
+ if (m_video_load_mar) {
+ // Load new address into MAR after start of a new frame or NWA instruction
+ // TODO: decode graphic/alpha mode bit
+ set_video_mar(~m_video_word);
+ m_video_load_mar = false;
+ continue;
+ } else {
+ // Read normal word from frame buffer, start parsing at MSB
+ set_video_mar(m_video_mar + 1);
+ byte = (UINT8)(m_video_word >> 8);
+ m_video_byte_idx = true;
+ }
+ } else {
+ // Parse LSB
+ byte = (UINT8)(m_video_word & 0xff);
+ m_video_byte_idx = false;
+ }
+ if ((byte & 0xc0) == 0x80) {
+ // Attribute command
+ m_video_attr = byte & 0x1f;
+ } else if ((byte & 0xc1) == 0xc0) {
+ // New Word Address (NWA)
+ m_video_load_mar = true;
+ m_video_byte_idx = false;
+ } else if ((byte & 0xc1) == 0xc1) {
+ // End of line (EOL)
+ // Fill rest of buffer with spaces
+ memset(&m_video_buff[ buff_idx ].chars[ char_idx ] , 0x20 , 80 - char_idx);
+ memset(&m_video_buff[ buff_idx ].attrs[ char_idx ] , m_video_attr , 80 - char_idx);
+ m_video_buff[ buff_idx ].full = true;
+ break;
+ } else {
+ // Normal character
+ m_video_buff[ buff_idx ].chars[ char_idx ] = byte;
+ m_video_buff[ buff_idx ].attrs[ char_idx ] = m_video_attr;
+ char_idx++;
+ if (char_idx == 80) {
+ m_video_buff[ buff_idx ].full = true;
+ break;
+ }
+ }
+ }
}
void hp9845b_state::video_render_buff(unsigned line_in_row, bool buff_idx)
{
- if (!m_video_buff[ buff_idx ].full) {
- m_video_blanked = true;
- }
+ if (!m_video_buff[ buff_idx ].full) {
+ m_video_blanked = true;
+ }
- if (m_video_blanked) {
- // TODO: blank scanline
- } else {
+ if (m_video_blanked) {
+ // TODO: blank scanline
+ } else {
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- bool cursor_line = line_in_row == 12;
- bool ul_line = line_in_row == 14;
- bool cursor_blink = BIT(m_video_frame , 3);
- bool char_blink = BIT(m_video_frame , 4);
-
- for (unsigned i = 0; i < 80; i++) {
- UINT8 charcode = m_video_buff[ buff_idx ].chars[ i ];
- UINT8 attrs = m_video_buff[ buff_idx ].attrs[ i ];
- UINT8 chargen_byte = m_chargen[ line_in_row | ((unsigned)charcode << 4) ];
- UINT16 pixels;
-
- // TODO: Handle selection of 2nd chargen
- // TODO: Check if order of bits in "pixels" is ok
-
- if ((ul_line && BIT(attrs , 3)) ||
- (cursor_line && cursor_blink && BIT(attrs , 0))) {
- pixels = ~0;
- } else if (char_blink && BIT(attrs , 2)) {
- pixels = 0;
- } else {
- pixels = (UINT16)(chargen_byte & 0x7f) << 2;
- }
-
- if (BIT(attrs , 1)) {
- pixels = ~pixels;
- }
-
- for (unsigned j = 0; j < 9; j++) {
- bool pixel = (pixels & (1U << (8 - j))) != 0;
-
- m_bitmap.pix32(m_video_scanline , i * 9 + j) = palette[ pixel ? 1 : 0 ];
- }
- }
- }
+ bool cursor_line = line_in_row == 12;
+ bool ul_line = line_in_row == 14;
+ bool cursor_blink = BIT(m_video_frame , 3);
+ bool char_blink = BIT(m_video_frame , 4);
+
+ for (unsigned i = 0; i < 80; i++) {
+ UINT8 charcode = m_video_buff[ buff_idx ].chars[ i ];
+ UINT8 attrs = m_video_buff[ buff_idx ].attrs[ i ];
+ UINT8 chargen_byte = m_chargen[ line_in_row | ((unsigned)charcode << 4) ];
+ UINT16 pixels;
+
+ // TODO: Handle selection of 2nd chargen
+ // TODO: Check if order of bits in "pixels" is ok
+
+ if ((ul_line && BIT(attrs , 3)) ||
+ (cursor_line && cursor_blink && BIT(attrs , 0))) {
+ pixels = ~0;
+ } else if (char_blink && BIT(attrs , 2)) {
+ pixels = 0;
+ } else {
+ pixels = (UINT16)(chargen_byte & 0x7f) << 2;
+ }
+
+ if (BIT(attrs , 1)) {
+ pixels = ~pixels;
+ }
+
+ for (unsigned j = 0; j < 9; j++) {
+ bool pixel = (pixels & (1U << (8 - j))) != 0;
+
+ m_bitmap.pix32(m_video_scanline , i * 9 + j) = palette[ pixel ? 1 : 0 ];
+ }
+ }
+ }
}
TIMER_DEVICE_CALLBACK_MEMBER(hp9845b_state::scanline_timer)
{
- m_video_scanline = param;
+ m_video_scanline = param;
- if (m_video_scanline < VIDEO_ACTIVE_SCANLINES) {
- unsigned row = m_video_scanline / 15;
- unsigned line_in_row = m_video_scanline - row * 15;
+ if (m_video_scanline < VIDEO_ACTIVE_SCANLINES) {
+ unsigned row = m_video_scanline / 15;
+ unsigned line_in_row = m_video_scanline - row * 15;
- if (line_in_row == 0) {
- // Start of new row, swap buffers
- m_video_buff_idx = !m_video_buff_idx;
- video_fill_buff(!m_video_buff_idx);
- }
+ if (line_in_row == 0) {
+ // Start of new row, swap buffers
+ m_video_buff_idx = !m_video_buff_idx;
+ video_fill_buff(!m_video_buff_idx);
+ }
- video_render_buff(line_in_row , m_video_buff_idx);
- }
+ video_render_buff(line_in_row , m_video_buff_idx);
+ }
}
void hp9845b_state::vblank_w(screen_device &screen, bool state)
{
- // VBlank signal is fed into HALT flag of PPU
- m_ppu->halt_w(state);
-
- if (state) {
- // Start of V blank
- set_video_mar(0);
- m_video_load_mar = true;
- m_video_byte_idx = false;
- m_video_blanked = false;
- m_video_frame++;
- m_video_buff_idx = !m_video_buff_idx;
- video_fill_buff(!m_video_buff_idx);
- }
+ // VBlank signal is fed into HALT flag of PPU
+ m_ppu->halt_w(state);
+
+ if (state) {
+ // Start of V blank
+ set_video_mar(0);
+ m_video_load_mar = true;
+ m_video_byte_idx = false;
+ m_video_blanked = false;
+ m_video_frame++;
+ m_video_buff_idx = !m_video_buff_idx;
+ video_fill_buff(!m_video_buff_idx);
+ }
}
IRQ_CALLBACK_MEMBER(hp9845b_state::irq_callback)
{
- if (irqline == HPHYBRID_IRL) {
- return m_irl_pending;
- } else {
- return 0;
- }
+ if (irqline == HPHYBRID_IRL) {
+ return m_irl_pending;
+ } else {
+ return 0;
+ }
}
void hp9845b_state::update_irl(void)
{
- m_ppu->set_input_line(HPHYBRID_IRL , m_irl_pending != 0);
+ m_ppu->set_input_line(HPHYBRID_IRL , m_irl_pending != 0);
}
TIMER_DEVICE_CALLBACK_MEMBER(hp9845b_state::kb_scan)
{
- ioport_value input[ 4 ];
- input[ 0 ] = m_io_key0->read();
- input[ 1 ] = m_io_key1->read();
- input[ 2 ] = m_io_key2->read();
- input[ 3 ] = m_io_key3->read();
-
- // Set status bits for "shift", "control", "auto start" & "print all" keys
- // ** Print all **
- // (R,C) = (0,1)
- // Bit 12 in kb status
- if (BIT(input[ 0 ] , 1)) {
- BIT_SET(m_kb_status , 12);
- BIT_CLR(input[ 0 ] , 1);
- } else {
- BIT_CLR(m_kb_status, 12);
- }
- // ** Auto start **
- // (R,C) = (1,1)
- // Bit 13 in kb status
- if (BIT(input[ 0 ] , 17)) {
- BIT_SET(m_kb_status , 13);
- BIT_CLR(input[ 0 ] , 17);
- } else {
- BIT_CLR(m_kb_status, 13);
- }
- // ** Control **
- // (R,C) = (4,15)
- // Bit 14 in kb status
- if (BIT(input[ 2 ] , 15)) {
- BIT_SET(m_kb_status , 14);
- BIT_CLR(input[ 2 ] , 15);
- } else {
- BIT_CLR(m_kb_status, 14);
- }
- // ** Shift **
- // (R,C) = (0,15)
- // Bit 15 in kb status
- if (BIT(input[ 0 ] , 15)) {
- BIT_SET(m_kb_status , 15);
- BIT_CLR(input[ 0 ] , 15);
- } else {
- BIT_CLR(m_kb_status, 15);
- }
-
- // TODO: handle repeat key
- // TODO: handle ctrl+stop
-
- for (unsigned i = 0; i < 128; i++) {
- ioport_value mask = BIT_MASK(i & 0x1f);
- unsigned idx = i >> 5;
-
- if ((input[ idx ] & ~m_kb_state[ idx ]) & mask) {
- // Key pressed, store scancode & generate IRL
- m_kb_scancode = i;
- BIT_SET(m_irl_pending , 0);
- BIT_SET(m_kb_status, 0);
- update_irl();
-
- // Special case: pressing stop key sets LPU "status" flag
- if (i == 0x47) {
- m_lpu->status_w(1);
- }
- }
- }
-
- memcpy(&m_kb_state[ 0 ] , &input[ 0 ] , sizeof(m_kb_state));
+ ioport_value input[ 4 ];
+ input[ 0 ] = m_io_key0->read();
+ input[ 1 ] = m_io_key1->read();
+ input[ 2 ] = m_io_key2->read();
+ input[ 3 ] = m_io_key3->read();
+
+ // Set status bits for "shift", "control", "auto start" & "print all" keys
+ // ** Print all **
+ // (R,C) = (0,1)
+ // Bit 12 in kb status
+ if (BIT(input[ 0 ] , 1)) {
+ BIT_SET(m_kb_status , 12);
+ BIT_CLR(input[ 0 ] , 1);
+ } else {
+ BIT_CLR(m_kb_status, 12);
+ }
+ // ** Auto start **
+ // (R,C) = (1,1)
+ // Bit 13 in kb status
+ if (BIT(input[ 0 ] , 17)) {
+ BIT_SET(m_kb_status , 13);
+ BIT_CLR(input[ 0 ] , 17);
+ } else {
+ BIT_CLR(m_kb_status, 13);
+ }
+ // ** Control **
+ // (R,C) = (4,15)
+ // Bit 14 in kb status
+ if (BIT(input[ 2 ] , 15)) {
+ BIT_SET(m_kb_status , 14);
+ BIT_CLR(input[ 2 ] , 15);
+ } else {
+ BIT_CLR(m_kb_status, 14);
+ }
+ // ** Shift **
+ // (R,C) = (0,15)
+ // Bit 15 in kb status
+ if (BIT(input[ 0 ] , 15)) {
+ BIT_SET(m_kb_status , 15);
+ BIT_CLR(input[ 0 ] , 15);
+ } else {
+ BIT_CLR(m_kb_status, 15);
+ }
+
+ // TODO: handle repeat key
+ // TODO: handle ctrl+stop
+
+ for (unsigned i = 0; i < 128; i++) {
+ ioport_value mask = BIT_MASK(i & 0x1f);
+ unsigned idx = i >> 5;
+
+ if ((input[ idx ] & ~m_kb_state[ idx ]) & mask) {
+ // Key pressed, store scancode & generate IRL
+ m_kb_scancode = i;
+ BIT_SET(m_irl_pending , 0);
+ BIT_SET(m_kb_status, 0);
+ update_irl();
+
+ // Special case: pressing stop key sets LPU "status" flag
+ if (i == 0x47) {
+ m_lpu->status_w(1);
+ }
+ }
+ }
+
+ memcpy(&m_kb_state[ 0 ] , &input[ 0 ] , sizeof(m_kb_state));
}
READ16_MEMBER(hp9845b_state::kb_scancode_r)
{
- return ~m_kb_scancode & 0x7f;
+ return ~m_kb_scancode & 0x7f;
}
READ16_MEMBER(hp9845b_state::kb_status_r)
{
- return m_kb_status;
+ return m_kb_status;
}
WRITE16_MEMBER(hp9845b_state::kb_irq_clear_w)
{
- BIT_CLR(m_irl_pending , 0);
- BIT_CLR(m_kb_status, 0);
- update_irl();
- m_lpu->status_w(0);
- // TODO: beeper start
+ BIT_CLR(m_irl_pending , 0);
+ BIT_CLR(m_kb_status, 0);
+ update_irl();
+ m_lpu->status_w(0);
+ // TODO: beeper start
}
WRITE8_MEMBER(hp9845b_state::pa_w)
{
- // TODO: handle sts & flg
- if (data == 0xf) {
- // RHS tape drive (T15)
- m_ppu->status_w(1);
- m_ppu->flag_w(1);
- } else {
- m_ppu->status_w(0);
- m_ppu->flag_w(0);
- }
+ // TODO: handle sts & flg
+ if (data == 0xf) {
+ // RHS tape drive (T15)
+ m_ppu->status_w(1);
+ m_ppu->flag_w(1);
+ } else {
+ m_ppu->status_w(0);
+ m_ppu->flag_w(0);
+ }
}
static MACHINE_CONFIG_START( hp9845a, hp9845_state )
@@ -621,41 +621,41 @@ static MACHINE_CONFIG_START( hp9835a, hp9845_state )
MACHINE_CONFIG_END
static ADDRESS_MAP_START(global_mem_map , AS_PROGRAM , 16 , hp9845b_state)
- ADDRESS_MAP_GLOBAL_MASK(0x3f7fff)
- ADDRESS_MAP_UNMAP_LOW
- AM_RANGE(0x000000 , 0x007fff) AM_RAM AM_SHARE("lpu_ram")
- AM_RANGE(0x014000 , 0x017fff) AM_RAM AM_SHARE("ppu_ram")
- AM_RANGE(0x030000 , 0x037fff) AM_ROM AM_REGION("lpu" , 0)
- AM_RANGE(0x050000 , 0x057fff) AM_ROM AM_REGION("ppu" , 0)
- //AM_RANGE(0x250000 , 0x251fff) AM_ROM AM_REGION("test_rom" , 0)
+ ADDRESS_MAP_GLOBAL_MASK(0x3f7fff)
+ ADDRESS_MAP_UNMAP_LOW
+ AM_RANGE(0x000000 , 0x007fff) AM_RAM AM_SHARE("lpu_ram")
+ AM_RANGE(0x014000 , 0x017fff) AM_RAM AM_SHARE("ppu_ram")
+ AM_RANGE(0x030000 , 0x037fff) AM_ROM AM_REGION("lpu" , 0)
+ AM_RANGE(0x050000 , 0x057fff) AM_ROM AM_REGION("ppu" , 0)
+ //AM_RANGE(0x250000 , 0x251fff) AM_ROM AM_REGION("test_rom" , 0)
ADDRESS_MAP_END
static ADDRESS_MAP_START(ppu_io_map , AS_IO , 16 , hp9845b_state)
- ADDRESS_MAP_UNMAP_LOW
- // PA = 0, IC = 2
- // Keyboard scancode input
- AM_RANGE(HP_MAKE_IOADDR(0 , 2) , HP_MAKE_IOADDR(0 , 2)) AM_READ(kb_scancode_r)
- // PA = 0, IC = 3
- // Keyboard status input & keyboard interrupt clear
- AM_RANGE(HP_MAKE_IOADDR(0 , 3) , HP_MAKE_IOADDR(0 , 3)) AM_READWRITE(kb_status_r , kb_irq_clear_w)
+ ADDRESS_MAP_UNMAP_LOW
+ // PA = 0, IC = 2
+ // Keyboard scancode input
+ AM_RANGE(HP_MAKE_IOADDR(0 , 2) , HP_MAKE_IOADDR(0 , 2)) AM_READ(kb_scancode_r)
+ // PA = 0, IC = 3
+ // Keyboard status input & keyboard interrupt clear
+ AM_RANGE(HP_MAKE_IOADDR(0 , 3) , HP_MAKE_IOADDR(0 , 3)) AM_READWRITE(kb_status_r , kb_irq_clear_w)
ADDRESS_MAP_END
static MACHINE_CONFIG_START( hp9845b, hp9845b_state )
MCFG_CPU_ADD("lpu", HP_5061_3001, 5700000)
- MCFG_CPU_PROGRAM_MAP(global_mem_map)
- MCFG_HPHYBRID_SET_9845_BOOT(true)
+ MCFG_CPU_PROGRAM_MAP(global_mem_map)
+ MCFG_HPHYBRID_SET_9845_BOOT(true)
MCFG_CPU_ADD("ppu", HP_5061_3001, 5700000)
- MCFG_CPU_PROGRAM_MAP(global_mem_map)
+ MCFG_CPU_PROGRAM_MAP(global_mem_map)
MCFG_CPU_IO_MAP(ppu_io_map)
- MCFG_HPHYBRID_SET_9845_BOOT(true)
+ MCFG_HPHYBRID_SET_9845_BOOT(true)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(hp9845b_state , irq_callback)
- MCFG_HPHYBRID_PA_CHANGED(WRITE8(hp9845b_state , pa_w))
+ MCFG_HPHYBRID_PA_CHANGED(WRITE8(hp9845b_state , pa_w))
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_UPDATE_DRIVER(hp9845b_state, screen_update)
- MCFG_SCREEN_RAW_PARAMS(20849400 , 99 * 9 , 0 , 80 * 9 , 26 * 15 , 0 , 25 * 15)
- MCFG_SCREEN_VBLANK_DRIVER(hp9845b_state, vblank_w)
+ MCFG_SCREEN_RAW_PARAMS(20849400 , 99 * 9 , 0 , 80 * 9 , 26 * 15 , 0 , 25 * 15)
+ MCFG_SCREEN_VBLANK_DRIVER(hp9845b_state, vblank_w)
MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette")
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", hp9845b_state, scanline_timer, "screen", 0, 1)
@@ -663,7 +663,7 @@ static MACHINE_CONFIG_START( hp9845b, hp9845b_state )
// Actual keyboard refresh rate should be KEY_SCAN_OSCILLATOR / 128 (2560 Hz)
MCFG_TIMER_DRIVER_ADD_PERIODIC("kb_timer" , hp9845b_state , kb_scan , attotime::from_hz(100))
- MCFG_SOFTWARE_LIST_ADD("optrom_list", "hp9845b_rom")
+ MCFG_SOFTWARE_LIST_ADD("optrom_list", "hp9845b_rom")
MACHINE_CONFIG_END
ROM_START( hp9845a )
@@ -699,19 +699,19 @@ ROM_END
#define rom_hp9835b rom_hp9835a
ROM_START( hp9845b )
- ROM_REGION(0x4000 , "test_rom" , ROMREGION_16BIT | ROMREGION_BE)
- ROM_LOAD("09845-66520-45_00-Test_ROM.bin" , 0x0000 , 0x2000 , CRC(95a5b299))
- ROM_LOAD("09845-66520-45_10-Test_ROM.bin" , 0x2000 , 0x2000 , CRC(257e4c66))
+ ROM_REGION(0x4000 , "test_rom" , ROMREGION_16BIT | ROMREGION_BE)
+ ROM_LOAD("09845-66520-45_00-Test_ROM.bin" , 0x0000 , 0x2000 , CRC(95a5b299))
+ ROM_LOAD("09845-66520-45_10-Test_ROM.bin" , 0x2000 , 0x2000 , CRC(257e4c66))
ROM_REGION(0x800 , "chargen" , 0)
- // Don't have the real character generator from HP9845, use the one from HP64000 for now
+ // Don't have the real character generator from HP9845, use the one from HP64000 for now
ROM_LOAD("1818_2668.bin" , 0 , 0x800 , BAD_DUMP CRC(32a52664) SHA1(8b2a49a32510103ff424e8481d5ed9887f609f2f))
- ROM_REGION(0x10000, "lpu", ROMREGION_16BIT | ROMREGION_BE)
- ROM_LOAD("9845-LPU-Standard-Processor.bin", 0, 0x10000, CRC(dc266c1b) SHA1(1cf3267f13872fbbfc035b70f8b4ec6b5923f182))
+ ROM_REGION(0x10000, "lpu", ROMREGION_16BIT | ROMREGION_BE)
+ ROM_LOAD("9845-LPU-Standard-Processor.bin", 0, 0x10000, CRC(dc266c1b) SHA1(1cf3267f13872fbbfc035b70f8b4ec6b5923f182))
- ROM_REGION(0x10000, "ppu", ROMREGION_16BIT | ROMREGION_BE)
- ROM_LOAD("9845-PPU-Standard-Graphics.bin", 0, 0x10000, CRC(f866510f) SHA1(3e22cd2072e3a5f3603a1eb8477b6b4a198d184d))
+ ROM_REGION(0x10000, "ppu", ROMREGION_16BIT | ROMREGION_BE)
+ ROM_LOAD("9845-PPU-Standard-Graphics.bin", 0, 0x10000, CRC(f866510f) SHA1(3e22cd2072e3a5f3603a1eb8477b6b4a198d184d))
#if 0
ROM_REGION( 0200000, "lpu", ROMREGION_16BIT | ROMREGION_BE )
diff --git a/src/mame/drivers/ice_bozopail.cpp b/src/mame/drivers/ice_bozopail.cpp
index f690ec08a97..0fb674c3e0e 100644
--- a/src/mame/drivers/ice_bozopail.cpp
+++ b/src/mame/drivers/ice_bozopail.cpp
@@ -24,13 +24,13 @@ class ice_bozopail : public driver_device
public:
ice_bozopail(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
- // ,m_maincpu(*this, "maincpu")
+ // ,m_maincpu(*this, "maincpu")
{ }
virtual void machine_start() override;
virtual void machine_reset() override;
-// required_device<mcs51_cpu_device> m_maincpu;
+// required_device<mcs51_cpu_device> m_maincpu;
};
static INPUT_PORTS_START( ice_bozoice_bozo )
@@ -50,9 +50,9 @@ void ice_bozopail::machine_reset()
static MACHINE_CONFIG_START( ice_bozoice_bozo, ice_bozopail )
/* basic machine hardware */
-// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown
-// MCFG_CPU_PROGRAM_MAP(ice_bozoice_bozo_map)
-// MCFG_CPU_IO_MAP(ice_bozoice_bozo_io)
+// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown
+// MCFG_CPU_PROGRAM_MAP(ice_bozoice_bozo_map)
+// MCFG_CPU_IO_MAP(ice_bozoice_bozo_io)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -67,4 +67,3 @@ ROM_START( ice_bozo )
ROM_END
GAME( 1997?, ice_bozo, 0, ice_bozoice_bozo, ice_bozoice_bozo, driver_device, 0, ROT0, "Innovative Creations in Entertainment", "Bozo's Pail Toss (v2.07)", MACHINE_IS_SKELETON_MECHANICAL )
-
diff --git a/src/mame/drivers/indigo.cpp b/src/mame/drivers/indigo.cpp
index 2d25f663480..64a3a1c1c01 100644
--- a/src/mame/drivers/indigo.cpp
+++ b/src/mame/drivers/indigo.cpp
@@ -639,5 +639,5 @@ ROM_START( indigo4k )
ROM_END
/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
-COMP( 1991, indigo3k, 0, 0, indigo3k, indigo, driver_device, 0, "Silicon Graphics Inc", "IRIS Indigo (R3000, 33MHz)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1993, indigo4k, 0, 0, indigo4k, indigo, driver_device, 0, "Silicon Graphics Inc", "IRIS Indigo (R4400, 150MHz, Ver. 4.0.5D Rev A)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1991, indigo3k, 0, 0, indigo3k, indigo, driver_device, 0, "Silicon Graphics Inc", "IRIS Indigo (R3000, 33MHz)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1993, indigo4k, 0, 0, indigo4k, indigo, driver_device, 0, "Silicon Graphics Inc", "IRIS Indigo (R4400, 150MHz, Ver. 4.0.5D Rev A)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/jalmah.cpp b/src/mame/drivers/jalmah.cpp
index 1182c464f4c..426aab1e010 100644
--- a/src/mame/drivers/jalmah.cpp
+++ b/src/mame/drivers/jalmah.cpp
@@ -37,7 +37,7 @@ TODO:
a match in particular circumstances because there's a write in the 94000-9bfff region;
-Massive clean-ups needed for the MCU snippet programs and the input-ports, also check if
the programs are actually into the m68k program itself (like hachamf/tdragon/ddealer);
--Video code could be optimized too (for example by calling the priority function only when
+-Video code could be optimized too (for example by calling the priority function only when
priority number is updated), might also need a merging with Jaleco Mega System 1/NMK16 drivers;
Notes (1st MCU ver.):
diff --git a/src/mame/drivers/klax.cpp b/src/mame/drivers/klax.cpp
index 4110ff92da6..98590a8f486 100644
--- a/src/mame/drivers/klax.cpp
+++ b/src/mame/drivers/klax.cpp
@@ -98,7 +98,7 @@ static ADDRESS_MAP_START( klax2bl_map, AS_PROGRAM, 16, klax_state )
AM_RANGE(0x1f0000, 0x1fffff) AM_DEVWRITE("eeprom", atari_eeprom_device, unlock_write)
AM_RANGE(0x260000, 0x260001) AM_READ_PORT("P1") AM_WRITE(klax_latch_w)
AM_RANGE(0x260002, 0x260003) AM_READ_PORT("P2")
-// AM_RANGE(0x270000, 0x270001) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff) // no OKI here
+// AM_RANGE(0x270000, 0x270001) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff) // no OKI here
AM_RANGE(0x2e0000, 0x2e0001) AM_WRITE(watchdog_reset16_w)
AM_RANGE(0x360000, 0x360001) AM_WRITE(interrupt_ack_w)
AM_RANGE(0x3e0000, 0x3e07ff) AM_DEVREADWRITE8("palette", palette_device, read, write, 0xff00) AM_SHARE("palette")
@@ -237,14 +237,14 @@ static MACHINE_CONFIG_DERIVED( klax2bl, klax )
MCFG_CPU_ADD("audiocpu", Z80, 6000000) /* ? */
MCFG_CPU_PROGRAM_MAP(bootleg_sound_map)
-
+
MCFG_GFXDECODE_MODIFY("gfxdecode", klax2bl)
// guess, probably something like this
MCFG_SOUND_ADD("msm", MSM5205, 375000) /* ? */
-// MCFG_MSM5205_VCLK_CB(WRITELINE(klax_state, m5205_int1)) /* interrupt function */
-// MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* 4KHz 4-bit */
-// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+// MCFG_MSM5205_VCLK_CB(WRITELINE(klax_state, m5205_int1)) /* interrupt function */
+// MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* 4KHz 4-bit */
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/konamigx.cpp b/src/mame/drivers/konamigx.cpp
index 7553702adb5..f67cf5fdbb8 100644
--- a/src/mame/drivers/konamigx.cpp
+++ b/src/mame/drivers/konamigx.cpp
@@ -108,7 +108,7 @@
// TODO: check on PCB
#define MASTER_CLOCK XTAL_24MHz
-#define SUB_CLOCK XTAL_16MHz
+#define SUB_CLOCK XTAL_16MHz
/**********************************************************************************/
/*
@@ -221,7 +221,7 @@ void konamigx_state::generate_sprites(address_space &space, UINT32 src, UINT32 s
UINT16 color_set = 0x0000;
UINT16 color_rotate = 0x0000;
UINT16 v;
-
+
v = space.read_word(adr+24);
if(v & 0x8000) {
color_mask = 0xf3ff;
@@ -250,7 +250,7 @@ void konamigx_state::generate_sprites(address_space &space, UINT32 src, UINT32 s
zoom_x = 0x40;
if(!zoom_y)
zoom_y = 0x40;
-
+
if(set >= 0x200000 && set < 0xd00000)
{
UINT16 count2 = space.read_word(set);
@@ -262,7 +262,7 @@ void konamigx_state::generate_sprites(address_space &space, UINT32 src, UINT32 s
UINT16 col = space.read_word(set+4);
short y = space.read_word(set+6);
short x = space.read_word(set+8);
-
+
if(idx == 0xffff) {
set = (flip<<16) | col;
if(set >= 0x200000 && set < 0xd00000)
@@ -504,11 +504,11 @@ WRITE32_MEMBER(konamigx_state::eeprom_w)
}
WRITE32_MEMBER(konamigx_state::control_w)
-{
+{
// TODO: derive from reported PCB XTALs
const UINT32 pixclock[4] = { XTAL_6MHz, XTAL_8MHz, XTAL_12MHz, XTAL_16MHz};
//logerror("write %x to control register (mask=%x)\n", data, mem_mask);
-
+
// known controls:
// bit 23 = reset graphics chips
// bit 22 = 0 to halt 68000, 1 to let it run (SOUNDRESET)
@@ -545,7 +545,7 @@ WRITE32_MEMBER(konamigx_state::control_w)
m_k055673->k053246_set_objcha_line((data&0x100000) ? ASSERT_LINE : CLEAR_LINE);
m_gx_wrport2 = (data>>16)&0xff;
-
+
if(m_prev_pixel_clock != (m_gx_wrport2 & 3))
{
m_k053252->set_unscaled_clock(pixclock[m_gx_wrport2 & 3]);
@@ -598,7 +598,7 @@ TIMER_CALLBACK_MEMBER(konamigx_state::dmaend_callback)
void konamigx_state::dmastart_callback(int data)
{
int sprite_timing;
-
+
// raise the DMA busy flag
// TODO: is it supposed to raise even if DMA is disabled?
m_gx_rdport1_3 |= 2;
@@ -648,7 +648,7 @@ INTERRUPT_GEN_MEMBER(konamigx_state::konamigx_type2_vblank_irq)
TIMER_DEVICE_CALLBACK_MEMBER(konamigx_state::konamigx_type2_scanline)
{
int scanline = param;
-
+
if(scanline == 48)
{
if (m_gx_syncen & 0x40)
@@ -1725,7 +1725,7 @@ static MACHINE_CONFIG_DERIVED( dragoonj, konamigx )
MCFG_DEVICE_MODIFY("k053252")
MCFG_K053252_OFFSETS(24+16, 16)
-
+
MCFG_DEVICE_MODIFY("k056832")
MCFG_K056832_CONFIG("gfx1", 0, K056832_BPP_5, 1, 0, "none")
@@ -1791,7 +1791,7 @@ static MACHINE_CONFIG_DERIVED( racinfrc, konamigx )
MCFG_DEVICE_MODIFY("k053252")
MCFG_K053252_OFFSETS(24-8+16, 0)
-
+
MCFG_DEVICE_MODIFY("k056832")
MCFG_K056832_CONFIG("gfx1", 0, K056832_BPP_6, 0, 0, "none")
@@ -1814,7 +1814,7 @@ static MACHINE_CONFIG_DERIVED( gxtype3, konamigx )
MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
MCFG_VIDEO_START_OVERRIDE(konamigx_state, konamigx_type3)
-
+
MCFG_DEVICE_MODIFY("k053252")
MCFG_K053252_OFFSETS(0, 16)
MCFG_K053252_SET_SLAVE_SCREEN("screen2")
@@ -1879,7 +1879,7 @@ static MACHINE_CONFIG_DERIVED( gxtype4, konamigx )
MCFG_K053252_OFFSETS(0, 16)
MCFG_K053252_SET_SLAVE_SCREEN("screen2")
-
+
MCFG_DEVICE_MODIFY("k056832")
MCFG_K056832_CONFIG("gfx1", 0, K056832_BPP_8, 0, 0, "none")
@@ -1896,8 +1896,8 @@ static MACHINE_CONFIG_DERIVED( gxtype4_vsn, gxtype4 )
MCFG_DEVICE_MODIFY("k053252")
MCFG_K053252_OFFSETS(0, 16)
-
-
+
+
MCFG_SCREEN_MODIFY("screen2")
MCFG_SCREEN_SIZE(1024, 1024)
MCFG_SCREEN_VISIBLE_AREA(0, 576-1, 16, 32*8-1-16)
@@ -1924,7 +1924,7 @@ static MACHINE_CONFIG_DERIVED( winspike, konamigx )
MCFG_DEVICE_MODIFY("k053252")
MCFG_K053252_OFFSETS(24+15, 16)
-
+
MCFG_DEVICE_MODIFY("k056832")
MCFG_K056832_CB(konamigx_state, alpha_tile_callback)
MCFG_K056832_CONFIG("gfx1", 0, K056832_BPP_8, 0, 2, "none")
@@ -3724,7 +3724,7 @@ MACHINE_RESET_MEMBER(konamigx_state,konamigx)
m_gx_syncen = 0;
m_suspension_active = 0;
m_prev_pixel_clock = 0xff;
-
+
// Hold sound CPUs in reset
m_soundcpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
m_soundcpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
@@ -3928,7 +3928,7 @@ DRIVER_INIT_MEMBER(konamigx_state,posthack)
/* year ROM parent machine inp init */
/* dummy parent for the BIOS */
-GAME( 1994, konamigx, 0, konamigx_bios, konamigx, konamigx_state, konamigx, ROT0, "Konami", "System GX", MACHINE_IS_BIOS_ROOT )
+GAME( 1994, konamigx, 0, konamigx_bios, konamigx, konamigx_state, konamigx, ROT0, "Konami", "System GX", MACHINE_IS_BIOS_ROOT )
/* --------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
/* Type 1: standard with an add-on 53936 on the ROM board, analog inputs, */
diff --git a/src/mame/drivers/laz_aftrshok.cpp b/src/mame/drivers/laz_aftrshok.cpp
index 6e6ccfd93a4..d9611e29dd6 100644
--- a/src/mame/drivers/laz_aftrshok.cpp
+++ b/src/mame/drivers/laz_aftrshok.cpp
@@ -11,9 +11,9 @@ devices are 27c512
--------------------------
file Aftrshk.upd is the updated eprom for an update version.
-The update version uses a small (appx 2" x 4" ) pcb to turn on
+The update version uses a small (appx 2" x 4" ) pcb to turn on
the playfield motor. If you don't have this small pcb, then don't use
-this .upd version software. The small pcb is numbered
+this .upd version software. The small pcb is numbered
"pcb100067"
"Lazer Tron driver pcb V.02"
@@ -38,13 +38,13 @@ class aftrshok_state : public driver_device
public:
aftrshok_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
- // ,m_maincpu(*this, "maincpu")
+ // ,m_maincpu(*this, "maincpu")
{ }
virtual void machine_start() override;
virtual void machine_reset() override;
-// required_device<mcs51_cpu_device> m_maincpu;
+// required_device<mcs51_cpu_device> m_maincpu;
};
static INPUT_PORTS_START( aftrshok )
@@ -64,9 +64,9 @@ void aftrshok_state::machine_reset()
static MACHINE_CONFIG_START( aftrshok, aftrshok_state )
/* basic machine hardware */
-// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown
-// MCFG_CPU_PROGRAM_MAP(aftrshok_map)
-// MCFG_CPU_IO_MAP(aftrshok_io)
+// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown
+// MCFG_CPU_PROGRAM_MAP(aftrshok_map)
+// MCFG_CPU_IO_MAP(aftrshok_io)
// MCFG_CPU_VBLANK_INT_DRIVER("screen", aftrshok_state, irq0_line_hold)
/* sound hardware */
@@ -101,4 +101,3 @@ ROM_END
GAME( 19??, aftrshok, 0, aftrshok, aftrshok, driver_device, 0, ROT0, "Lazer-tron", "After Shock (Lazer-tron, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
GAME( 19??, aftrshoka, aftrshok, aftrshok, aftrshok, driver_device, 0, ROT0, "Lazer-tron", "After Shock (Lazer-tron, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-
diff --git a/src/mame/drivers/laz_awetoss.cpp b/src/mame/drivers/laz_awetoss.cpp
index bb63c93aaff..e0ae4697f64 100644
--- a/src/mame/drivers/laz_awetoss.cpp
+++ b/src/mame/drivers/laz_awetoss.cpp
@@ -18,13 +18,13 @@ class awetoss_state : public driver_device
public:
awetoss_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
- // ,m_maincpu(*this, "maincpu")
+ // ,m_maincpu(*this, "maincpu")
{ }
virtual void machine_start() override;
virtual void machine_reset() override;
-// required_device<mcs51_cpu_device> m_maincpu;
+// required_device<mcs51_cpu_device> m_maincpu;
};
static INPUT_PORTS_START( awetoss )
@@ -44,9 +44,9 @@ void awetoss_state::machine_reset()
static MACHINE_CONFIG_START( awetoss, awetoss_state )
/* basic machine hardware */
-// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown
-// MCFG_CPU_PROGRAM_MAP(awetoss_map)
-// MCFG_CPU_IO_MAP(awetoss_io)
+// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown
+// MCFG_CPU_PROGRAM_MAP(awetoss_map)
+// MCFG_CPU_IO_MAP(awetoss_io)
// MCFG_CPU_VBLANK_INT_DRIVER("screen", awetoss_state, irq0_line_hold)
/* sound hardware */
@@ -77,8 +77,7 @@ ROM_START( awetoss )
ROM_LOAD( "AWSMTOSS.U14", 0x00000, 0x10000, CRC(6217daaf) SHA1(3036e7f941f787374ef130d3ae6d57813d9e9aac) )
ROM_LOAD( "AWSMTOSS.U13", 0x10000, 0x10000, CRC(4ed3c827) SHA1(761d2796d4f40deeb2caa61c4a9c56ced156084b) )
ROM_LOAD( "AWSMTOSS.U12", 0x20000, 0x10000, CRC(9ddf6dd9) SHA1(c115828ab261ae6d83cb500057313c3a5570b4b0) )
- ROM_LOAD( "AWSMTOSS.U11", 0x30000, 0x10000, CRC(8ae9d4f0) SHA1(58d1d8972c8e4c9a7c63e9d63e267ea81515d22a) )
+ ROM_LOAD( "AWSMTOSS.U11", 0x30000, 0x10000, CRC(8ae9d4f0) SHA1(58d1d8972c8e4c9a7c63e9d63e267ea81515d22a) )
ROM_END
GAME( 19??, awetoss, 0, awetoss, awetoss, driver_device, 0, ROT0, "Lazer-tron", "Awesome Toss'em (Lazer-tron)", MACHINE_IS_SKELETON_MECHANICAL )
-
diff --git a/src/mame/drivers/laz_ribrac.cpp b/src/mame/drivers/laz_ribrac.cpp
index b5ee6ee58c7..fde9067a7b0 100644
--- a/src/mame/drivers/laz_ribrac.cpp
+++ b/src/mame/drivers/laz_ribrac.cpp
@@ -22,13 +22,13 @@ class laz_ribrac_state : public driver_device
public:
laz_ribrac_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
- // ,m_maincpu(*this, "maincpu")
+ // ,m_maincpu(*this, "maincpu")
{ }
virtual void machine_start() override;
virtual void machine_reset() override;
-// required_device<mcs51_cpu_device> m_maincpu;
+// required_device<mcs51_cpu_device> m_maincpu;
};
static INPUT_PORTS_START( laz_ribrac )
@@ -48,9 +48,9 @@ void laz_ribrac_state::machine_reset()
static MACHINE_CONFIG_START( laz_ribrac, laz_ribrac_state )
/* basic machine hardware */
-// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown
-// MCFG_CPU_PROGRAM_MAP(laz_ribrac_map)
-// MCFG_CPU_IO_MAP(laz_ribrac_io)
+// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown
+// MCFG_CPU_PROGRAM_MAP(laz_ribrac_map)
+// MCFG_CPU_IO_MAP(laz_ribrac_io)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -79,4 +79,3 @@ ROM_START( ribrac )
ROM_END
GAME( 1993, ribrac, 0, laz_ribrac, laz_ribrac, driver_device, 0, ROT0, "Lazer-tron", "Ribbit Racing (Lazer-tron)", MACHINE_IS_SKELETON_MECHANICAL )
-
diff --git a/src/mame/drivers/lethal.cpp b/src/mame/drivers/lethal.cpp
index 30f82d8195c..fb6ce38d331 100644
--- a/src/mame/drivers/lethal.cpp
+++ b/src/mame/drivers/lethal.cpp
@@ -731,7 +731,7 @@ ROM_START( lethalenj ) // Japan version JAD
ROM_LOAD( "lethalenj.nv", 0x0000, 0x0080, CRC(20b28f2f) SHA1(53d212f2c006729a01dfdb49cb36b67b9425172e) )
ROM_END
-ROM_START( lethaleneaa ) // Euro ver. EAA
+ROM_START( lethaleneaa ) // Euro ver. EAA
ROM_REGION( 0x40000, "maincpu", 0 ) /* main program */
ROM_LOAD( "191_a01.u4", 0x00000, 0x40000, CRC(c6f4d712) SHA1(92938b823f057b5185a2ada7878efa4bf7e6c682) ) // handwritten label
diff --git a/src/mame/drivers/mac.cpp b/src/mame/drivers/mac.cpp
index f54379d1754..05d9e85a61c 100644
--- a/src/mame/drivers/mac.cpp
+++ b/src/mame/drivers/mac.cpp
@@ -2305,10 +2305,10 @@ ROM_END
ROM_START( maciici )
ROM_REGION32_BE(0x80000, "bootrom", 0)
- ROM_LOAD32_BYTE( "341-0736.um12", 0x000000, 0x020000, CRC(7a1906e6) SHA1(3e39c80b52f40798502fcbdfc97b315545c4c4d3) )
- ROM_LOAD32_BYTE( "341-0735.um11", 0x000001, 0x020000, CRC(a8942189) SHA1(be9f653cab04c304d7ee8d4ec312c23ff5d47efc) )
- ROM_LOAD32_BYTE( "342-0734.um10", 0x000002, 0x020000, CRC(07f56402) SHA1(e11ca97181faf26cd0d05bd639d65998805c7822) )
- ROM_LOAD32_BYTE( "342-0733.um9", 0x000003, 0x020000, CRC(20c28451) SHA1(fecf849c9ac9717c18c13184e24a471888028e46) )
+ ROM_LOAD32_BYTE( "341-0736.um12", 0x000000, 0x020000, CRC(7a1906e6) SHA1(3e39c80b52f40798502fcbdfc97b315545c4c4d3) )
+ ROM_LOAD32_BYTE( "341-0735.um11", 0x000001, 0x020000, CRC(a8942189) SHA1(be9f653cab04c304d7ee8d4ec312c23ff5d47efc) )
+ ROM_LOAD32_BYTE( "342-0734.um10", 0x000002, 0x020000, CRC(07f56402) SHA1(e11ca97181faf26cd0d05bd639d65998805c7822) )
+ ROM_LOAD32_BYTE( "342-0733.um9", 0x000003, 0x020000, CRC(20c28451) SHA1(fecf849c9ac9717c18c13184e24a471888028e46) )
ROM_END
ROM_START( maciisi )
diff --git a/src/mame/drivers/megadriv.cpp b/src/mame/drivers/megadriv.cpp
index c6f24554b73..e72c8816197 100644
--- a/src/mame/drivers/megadriv.cpp
+++ b/src/mame/drivers/megadriv.cpp
@@ -280,7 +280,7 @@ void md_cons_state::install_cartslot()
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7fffff, read16_delegate(FUNC(base_md_cart_slot_device::read),(base_md_cart_slot_device*)m_cart), write16_delegate(FUNC(base_md_cart_slot_device::write),(base_md_cart_slot_device*)m_cart));
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa13000, 0xa130ff, read16_delegate(FUNC(base_md_cart_slot_device::read_a13),(base_md_cart_slot_device*)m_cart), write16_delegate(FUNC(base_md_cart_slot_device::write_a13),(base_md_cart_slot_device*)m_cart));
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa15000, 0xa150ff, read16_delegate(FUNC(base_md_cart_slot_device::read_a15),(base_md_cart_slot_device*)m_cart), write16_delegate(FUNC(base_md_cart_slot_device::write_a15),(base_md_cart_slot_device*)m_cart));
-// m_maincpu->space(AS_PROGRAM).install_write_handler(0xa14000, 0xa14003, write16_delegate(FUNC(base_md_cart_slot_device::write_tmss_bank),(base_md_cart_slot_device*)m_cart));
+// m_maincpu->space(AS_PROGRAM).install_write_handler(0xa14000, 0xa14003, write16_delegate(FUNC(base_md_cart_slot_device::write_tmss_bank),(base_md_cart_slot_device*)m_cart));
}
READ16_MEMBER( md_cons_state::tmss_r )
@@ -330,7 +330,7 @@ MACHINE_START_MEMBER(md_cons_state, ms_megadriv)
{
install_cartslot();
}
-
+
}
diff --git a/src/mame/drivers/megasys1.cpp b/src/mame/drivers/megasys1.cpp
index 96ab5ff16b9..ac08dc49e46 100644
--- a/src/mame/drivers/megasys1.cpp
+++ b/src/mame/drivers/megasys1.cpp
@@ -172,7 +172,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(megasys1_state::megasys1A_scanline)
{
int scanline = param;
- // stdragon: irq 1 is raster irq ("press start" behaviour), happens at around scanline 90(-16), 2 vblank, 3 is RTE.
+ // stdragon: irq 1 is raster irq ("press start" behaviour), happens at around scanline 90(-16), 2 vblank, 3 is RTE.
// p47: irq 2 valid, others RTE
// kickoff: irq 3 valid, others RTE
// tshingen: irq 3 RTE, irq 1 reads inputs, irq 2 sets vregs values (pending further investigation ...)
@@ -183,7 +183,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(megasys1_state::megasys1A_scanline)
// plusalph: irq 1 & 3 RTE, irq 2 valid
// rodland: irq 1 & 3 RTE, irq 2 valid (sets palette, vregs ...)
// soldam: irq 1 & 3 RTE, irq 2 valid
-
+
if(scanline == 240) // vblank-out irq
m_maincpu->set_input_line(2, HOLD_LINE);
@@ -306,7 +306,7 @@ WRITE16_MEMBER(megasys1_state::ms1_ram_w )
// 64th Street and Chimera Beast rely on this for attract inputs
m_ram[offset] = data;
-// if (mem_mask != 0xffff) printf("byte write to RAM %04x %04x %04x\n", offset, data, mem_mask);
+// if (mem_mask != 0xffff) printf("byte write to RAM %04x %04x %04x\n", offset, data, mem_mask);
}
diff --git a/src/mame/drivers/namcops2.cpp b/src/mame/drivers/namcops2.cpp
index d84afb8f3cf..a0eec46f766 100644
--- a/src/mame/drivers/namcops2.cpp
+++ b/src/mame/drivers/namcops2.cpp
@@ -1372,7 +1372,7 @@ ROM_START( rrvac )
ROM_REGION(0xc000, "jvsio", 0) // Namco "FCA" JVS I/O board PIC16F84 code (see namcos23.c for FCA details)
ROM_LOAD( "fcap11.ic2", 0x000000, 0x004010, CRC(1b2592ce) SHA1(a1a487361053af564f6ec67e545413e370a3b38c) )
// Fujitsu MB90F574 code, partial dumps, only last 48KB of 256KB flash was extracted
- ROM_LOAD( "fcaf11.ic4", 0x000000, 0x00c000, BAD_DUMP CRC(9794f16b) SHA1(94e1c036a6d23d39b2ad69dd1ad2cfa6163287e0) ) // almost good dump, all JVS related code and data is in place
+ ROM_LOAD( "fcaf11.ic4", 0x000000, 0x00c000, BAD_DUMP CRC(9794f16b) SHA1(94e1c036a6d23d39b2ad69dd1ad2cfa6163287e0) ) // almost good dump, all JVS related code and data is in place
ROM_LOAD( "fcb1_io-0b.ic4", 0x000000, 0x00c000, BAD_DUMP CRC(5e25b73f) SHA1(fa805a422ff8793989b0ce901cc868ec1a87c7ac) ) // most JVS handling code is in undumped area
ROM_REGION(0x80000, "steering", 0) // Steering I/O board MB90242A code (see namcos23.c for steering board details)
@@ -1393,7 +1393,7 @@ ROM_START( rrvac2 )
ROM_REGION(0xc000, "jvsio", 0) // Namco "FCA" JVS I/O board PIC16F84 code (see namcos23.c for FCA details)
ROM_LOAD( "fcap11.ic2", 0x000000, 0x004010, CRC(1b2592ce) SHA1(a1a487361053af564f6ec67e545413e370a3b38c) )
// Fujitsu MB90F574 code, partial dumps, only last 48KB of 256KB flash was extracted
- ROM_LOAD( "fcaf11.ic4", 0x000000, 0x00c000, BAD_DUMP CRC(9794f16b) SHA1(94e1c036a6d23d39b2ad69dd1ad2cfa6163287e0) ) // almost good dump, all JVS related code and data is in place
+ ROM_LOAD( "fcaf11.ic4", 0x000000, 0x00c000, BAD_DUMP CRC(9794f16b) SHA1(94e1c036a6d23d39b2ad69dd1ad2cfa6163287e0) ) // almost good dump, all JVS related code and data is in place
ROM_LOAD( "fcb1_io-0b.ic4", 0x000000, 0x00c000, BAD_DUMP CRC(5e25b73f) SHA1(fa805a422ff8793989b0ce901cc868ec1a87c7ac) ) // most JVS handling code is in undumped area
ROM_REGION(0x80000, "steering", 0) // Steering I/O board MB90242A code (see namcos23.c for steering board details)
@@ -1415,7 +1415,7 @@ ROM_START( rrvac1 )
ROM_REGION(0xc000, "jvsio", 0) // Namco "FCA" JVS I/O board PIC16F84 code (see namcos23.c for FCA details)
ROM_LOAD( "fcap11.ic2", 0x000000, 0x004010, CRC(1b2592ce) SHA1(a1a487361053af564f6ec67e545413e370a3b38c) )
// Fujitsu MB90F574 code, partial dumps, only last 48KB of 256KB flash was extracted
- ROM_LOAD( "fcaf11.ic4", 0x000000, 0x00c000, BAD_DUMP CRC(9794f16b) SHA1(94e1c036a6d23d39b2ad69dd1ad2cfa6163287e0) ) // almost good dump, all JVS related code and data is in place
+ ROM_LOAD( "fcaf11.ic4", 0x000000, 0x00c000, BAD_DUMP CRC(9794f16b) SHA1(94e1c036a6d23d39b2ad69dd1ad2cfa6163287e0) ) // almost good dump, all JVS related code and data is in place
ROM_LOAD( "fcb1_io-0b.ic4", 0x000000, 0x00c000, BAD_DUMP CRC(5e25b73f) SHA1(fa805a422ff8793989b0ce901cc868ec1a87c7ac) ) // most JVS handling code is in undumped area
ROM_REGION(0x80000, "steering", 0) // Steering I/O board MB90242A code (see namcos23.c for steering board details)
diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp
index aa820df5c13..4d72b6a114e 100644
--- a/src/mame/drivers/pacman.cpp
+++ b/src/mame/drivers/pacman.cpp
@@ -28,13 +28,13 @@
* Porky
* MTV Rock-N-Roll Trivia (Part 2)
* Woodpecker
- * Pacman Club / Club Lambada
+ * Pacman Club / Club Lambada
Known issues:
* Mystery items in Ali Baba don't work correctly because of protection.
- * Pacman Club controls need to be demultiplexed for 2-players simultaneous mode.
- Also need 4-players extra inputs.
+ * Pacman Club controls need to be demultiplexed for 2-players simultaneous mode.
+ Also need 4-players extra inputs.
Known to exist but dumps needed
* Eeeek!
@@ -4135,7 +4135,7 @@ ROM_START( clubpacm )
ROM_LOAD( "13.5f", 0x1000, 0x0800, CRC(22b0188a) SHA1(a9ed9ca8b36a60081fd364abc9bc23963932cc0b) )
ROM_LOAD( "15.5j", 0x1800, 0x0800, CRC(50c7477d) SHA1(c04ec282a8cb528df5e38ad750d12ee71612695d) )
- // Color PROMs have been dumped. They match the pacman/mspacman ones
+ // Color PROMs have been dumped. They match the pacman/mspacman ones
ROM_REGION( 0x0120, "proms", 0 )
ROM_LOAD( "n82s123n.7f", 0x0000, 0x0020, CRC(2fc650bd) SHA1(8d0268dee78e47c712202b0ec4f1f51109b1f2a5) )
ROM_LOAD( "m7611.4a", 0x0020, 0x0100, CRC(3eb3a8e4) SHA1(19097b5f60d1030f8b82d9f1d3a241f93e5c75d6) )
diff --git a/src/mame/drivers/patinho_feio.cpp b/src/mame/drivers/patinho_feio.cpp
index 884f4c8f4c2..e40274c884a 100644
--- a/src/mame/drivers/patinho_feio.cpp
+++ b/src/mame/drivers/patinho_feio.cpp
@@ -10,16 +10,16 @@
class patinho_feio_state : public driver_device
{
public:
- patinho_feio_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag)
- //,m_maincpu(*this, "maincpu")
- { }
-
- DECLARE_DRIVER_INIT(patinho_feio);
- DECLARE_READ16_MEMBER(rc_r);
- void load_tape(const char* name);
- void load_raw_data(const char* name, unsigned int start_address, unsigned int data_length);
- virtual void machine_start() override;
+ patinho_feio_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag)
+ //,m_maincpu(*this, "maincpu")
+ { }
+
+ DECLARE_DRIVER_INIT(patinho_feio);
+ DECLARE_READ16_MEMBER(rc_r);
+ void load_tape(const char* name);
+ void load_raw_data(const char* name, unsigned int start_address, unsigned int data_length);
+ virtual void machine_start() override;
// virtual void machine_reset();
// required_device<patinho_feio_cpu_device> m_maincpu;
};
@@ -33,84 +33,84 @@ DRIVER_INIT_MEMBER(patinho_feio_state, patinho_feio)
READ16_MEMBER(patinho_feio_state::rc_r)
{
- return ioport("RC_HIGH")->read() << 8 | ioport("RC_LOW")->read();
+ return ioport("RC_HIGH")->read() << 8 | ioport("RC_LOW")->read();
}
void patinho_feio_state::load_tape(const char* name){
- UINT8 *RAM = (UINT8 *) memshare("maincpu:internalram")->ptr();
- UINT8 *data = memregion(name)->base();
- unsigned int data_length = data[0];
- unsigned int start_address = data[1]*256 + data[2];
- INT8 expected_checksum = data[data_length + 3];
- INT8 checksum = 0;
-
- for (int i = 0; i < data_length + 3; i++){
- checksum -= (INT8) data[i];
- }
-
- if (checksum != expected_checksum){
- printf("[WARNING] Tape \"%s\": checksum = 0x%02X (expected 0x%02X)\n",
- name, (unsigned char) checksum, (unsigned char) expected_checksum);
- }
-
- memcpy(&RAM[start_address], &data[3], data_length);
+ UINT8 *RAM = (UINT8 *) memshare("maincpu:internalram")->ptr();
+ UINT8 *data = memregion(name)->base();
+ unsigned int data_length = data[0];
+ unsigned int start_address = data[1]*256 + data[2];
+ INT8 expected_checksum = data[data_length + 3];
+ INT8 checksum = 0;
+
+ for (int i = 0; i < data_length + 3; i++){
+ checksum -= (INT8) data[i];
+ }
+
+ if (checksum != expected_checksum){
+ printf("[WARNING] Tape \"%s\": checksum = 0x%02X (expected 0x%02X)\n",
+ name, (unsigned char) checksum, (unsigned char) expected_checksum);
+ }
+
+ memcpy(&RAM[start_address], &data[3], data_length);
}
void patinho_feio_state::load_raw_data(const char* name, unsigned int start_address, unsigned int data_length){
- UINT8 *RAM = (UINT8 *) memshare("maincpu:internalram")->ptr();
- UINT8 *data = memregion(name)->base();
+ UINT8 *RAM = (UINT8 *) memshare("maincpu:internalram")->ptr();
+ UINT8 *data = memregion(name)->base();
- memcpy(&RAM[start_address], data, data_length);
+ memcpy(&RAM[start_address], data, data_length);
}
void patinho_feio_state::machine_start(){
- // Copy some programs directly into RAM.
- // This is a hack for setting up the computer
- // while we don't support loading programs
- // from punched tape rolls...
-
- //"absolute program example" from page 16.7
- // Prints "PATINHO FEIO" on the DECWRITER:
- load_tape("exemplo_16.7");
-
- //"absolute program example" from appendix G:
- // Allows users to load programs from the
- // console into the computer memory.
- load_raw_data("hexam", 0xE00, 0x0D5);
+ // Copy some programs directly into RAM.
+ // This is a hack for setting up the computer
+ // while we don't support loading programs
+ // from punched tape rolls...
+
+ //"absolute program example" from page 16.7
+ // Prints "PATINHO FEIO" on the DECWRITER:
+ load_tape("exemplo_16.7");
+
+ //"absolute program example" from appendix G:
+ // Allows users to load programs from the
+ // console into the computer memory.
+ load_raw_data("hexam", 0xE00, 0x0D5);
}
static INPUT_PORTS_START( patinho_feio )
- PORT_START("RC_LOW")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 0") PORT_CODE(KEYCODE_EQUALS) PORT_TOGGLE
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 1") PORT_CODE(KEYCODE_MINUS) PORT_TOGGLE
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 2") PORT_CODE(KEYCODE_0) PORT_TOGGLE
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 3") PORT_CODE(KEYCODE_9) PORT_TOGGLE
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 4") PORT_CODE(KEYCODE_8) PORT_TOGGLE
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 5") PORT_CODE(KEYCODE_7) PORT_TOGGLE
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 6") PORT_CODE(KEYCODE_6) PORT_TOGGLE
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 7") PORT_CODE(KEYCODE_5) PORT_TOGGLE
-
- PORT_START("RC_HIGH")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 8") PORT_CODE(KEYCODE_4) PORT_TOGGLE
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 7") PORT_CODE(KEYCODE_3) PORT_TOGGLE
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 10") PORT_CODE(KEYCODE_2) PORT_TOGGLE
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 11") PORT_CODE(KEYCODE_1) PORT_TOGGLE
+ PORT_START("RC_LOW")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 0") PORT_CODE(KEYCODE_EQUALS) PORT_TOGGLE
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 1") PORT_CODE(KEYCODE_MINUS) PORT_TOGGLE
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 2") PORT_CODE(KEYCODE_0) PORT_TOGGLE
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 3") PORT_CODE(KEYCODE_9) PORT_TOGGLE
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 4") PORT_CODE(KEYCODE_8) PORT_TOGGLE
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 5") PORT_CODE(KEYCODE_7) PORT_TOGGLE
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 6") PORT_CODE(KEYCODE_6) PORT_TOGGLE
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 7") PORT_CODE(KEYCODE_5) PORT_TOGGLE
+
+ PORT_START("RC_HIGH")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 8") PORT_CODE(KEYCODE_4) PORT_TOGGLE
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 7") PORT_CODE(KEYCODE_3) PORT_TOGGLE
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 10") PORT_CODE(KEYCODE_2) PORT_TOGGLE
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RC bit 11") PORT_CODE(KEYCODE_1) PORT_TOGGLE
INPUT_PORTS_END
static MACHINE_CONFIG_START( patinho_feio, patinho_feio_state )
- /* basic machine hardware */
- /* CPU @ approx. 500 kHz (memory cycle time is 2usec) */
- MCFG_CPU_ADD("maincpu", PATINHO_FEIO, 500000)
- MCFG_PATINHO_RC_READ_CB(READ16(patinho_feio_state, rc_r))
+ /* basic machine hardware */
+ /* CPU @ approx. 500 kHz (memory cycle time is 2usec) */
+ MCFG_CPU_ADD("maincpu", PATINHO_FEIO, 500000)
+ MCFG_PATINHO_RC_READ_CB(READ16(patinho_feio_state, rc_r))
MACHINE_CONFIG_END
ROM_START( patinho )
- ROM_REGION( 0x0d5, "hexam", 0 )
- ROM_LOAD( "apendice_g__hexam.bin", 0x000, 0x0d5, CRC(c6addc59) SHA1(126bc97247eac45c58708eaac216c2438e9e4af9) )
+ ROM_REGION( 0x0d5, "hexam", 0 )
+ ROM_LOAD( "apendice_g__hexam.bin", 0x000, 0x0d5, CRC(c6addc59) SHA1(126bc97247eac45c58708eaac216c2438e9e4af9) )
- ROM_REGION( 0x0d5, "exemplo_16.7", 0 )
- ROM_LOAD( "exemplo_16.7.bin", 0x000, 0x028, CRC(0a87ac8d) SHA1(7c35ac3eed9ed239f2ef56c26e6f0c59f635e1ac) )
+ ROM_REGION( 0x0d5, "exemplo_16.7", 0 )
+ ROM_LOAD( "exemplo_16.7.bin", 0x000, 0x028, CRC(0a87ac8d) SHA1(7c35ac3eed9ed239f2ef56c26e6f0c59f635e1ac) )
ROM_END
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1972, patinho, 0, 0, patinho_feio, patinho_feio, patinho_feio_state, patinho_feio, "Escola Politécnica - Universidade de São Paulo", "Patinho Feio" , MACHINE_NO_SOUND_HW | MACHINE_NOT_WORKING)
+COMP( 1972, patinho, 0, 0, patinho_feio, patinho_feio, patinho_feio_state, patinho_feio, "Escola Politecnica - Universidade de Sao Paulo", "Patinho Feio" , MACHINE_NO_SOUND_HW | MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/peplus.cpp b/src/mame/drivers/peplus.cpp
index 4311ee233f6..841d98f26d1 100644
--- a/src/mame/drivers/peplus.cpp
+++ b/src/mame/drivers/peplus.cpp
@@ -144,7 +144,7 @@ Super PE+
XnnnnnnP Poker Data. Contains poker game + paytable percentages
Data roms will not work with every Program rom. Incompatible combos report: Incompatible Data EPROM
X000055P is a good example, it works with most XP000xxx Program roms. Others may be as few as two due
- to specific requirements of the game. Examples are Jackpot Poker and games with mid game bonus payouts.
+ to specific requirements of the game. Examples are Jackpot Poker and games with mid game bonus payouts.
XMPnnnnn Multi-Poker Programs. Different options for each set, but all use the same XMnnnnnP data
XMP00002 through XMP00006, XMP00020 & XMP00024 Use the XM000xxP Multi-Poker Data
XMP00014, XMP00017 & XMP00030 Use the WING Board add-on and use the XnnnnnnP Poker Data (Not all are compatible!)
@@ -167,9 +167,9 @@ NOTE: Do NOT use the CG+CAP combos listed below as THE definitive absolute refe
NOTE: Sets marked PSR Verified use official IGT CG+CAP combo as documented in a IGT PSR (Program Summary Report)
Stardard PE+ sets marked as PSR Verified means the build version is correctly matched to the CG+CAP combo
Sets marked as PSR Verified on superboards means the XP000xxx poker program is correctly matched to the
- CG+CAP combo. Except for specialty games the CG set is determined by XP000xxx Poker Program. However,
- where specialty games are involved the X00xxxxP DATA rom determines the CG set due to specific needs.
- PSR Verified does not gaurantee or imply that other XP000xxx programs are incompatible with said DATA rom.
+ CG+CAP combo. Except for specialty games the CG set is determined by XP000xxx Poker Program. However,
+ where specialty games are involved the X00xxxxP DATA rom determines the CG set due to specific needs.
+ PSR Verified does not gaurantee or imply that other XP000xxx programs are incompatible with said DATA rom.
NOTE: International PP0xxx sets support a Tournament mode. You can toggle back and forth between standard and
Tournament mode by pressing and holding Jackpot Reset (L key) and pressing Change Request (Y key)
@@ -6020,7 +6020,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K 4K 4A SF RF (Bonus)
% Range: 92.3-94.3% Optimum: 96.3% Hit Frequency: 45.1%
Programs Available: PP0596
-* Payout for a Royal Flush is shown as "MINIMANIA" and for the named suited Sequential Royal it shows "POKERMANIA"
+* Payout for a Royal Flush is shown as "MINIMANIA" and for the named suited Sequential Royal it shows "POKERMANIA"
Currently errors out with CCOM LINK DOWN as CCOM linking is not supported
*/
@@ -6046,7 +6046,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K 4K 4A SF RF (Bonus)
% Range: 92.3-94.3% Optimum: 96.3% Hit Frequency: 45.1%
Programs Available: PP0598
-* Payout for a Royal Flush is shown as "MINIMANIA" and for the named suited Sequential Royal it shows "POKERMANIA"
+* Payout for a Royal Flush is shown as "MINIMANIA" and for the named suited Sequential Royal it shows "POKERMANIA"
Currently errors out with CCOM LINK DOWN as CCOM linking is not supported
*/
@@ -6058,7 +6058,7 @@ Currently errors out with CCOM LINK DOWN as CCOM linking is not supported
ROM_LOAD( "mgo-cg2093.u73", 0x08000, 0x8000, BAD_DUMP CRC(8bf73e80) SHA1(25ee0a6fe61d1f92a47fd9408c36111b1ed73a56) )
ROM_LOAD( "mbo-cg2093.u74", 0x10000, 0x8000, BAD_DUMP CRC(907400f2) SHA1(56ceb960a08b2d3f87e4acb720675cbbfb39d012) )
ROM_LOAD( "mxo-cg2093.u75", 0x18000, 0x8000, BAD_DUMP CRC(b6c3e987) SHA1(97f71792cb584a659615d1fe78228ac11fe32571) )
-
+
ROM_REGION( 0x100, "proms", 0 )
ROM_LOAD( "cap779.u50", 0x0000, 0x0100, CRC(b04a98fd) SHA1(4788c7cb88aa692a55855ca65e092df43506e55a) )
ROM_END
@@ -6350,7 +6350,7 @@ PayTable 3K STR FL FH 4K SF 5K RF 4D RF (Bonus)
ROM_LOAD( "mxo-cg2312.u80", 0x18000, 0x8000, CRC(1e0d3df8) SHA1(716d6bd2b41ef41a7da393e805651c378a16e00e) ) /* These graphics don't seem to work with anything else */
ROM_REGION( 0x200, "proms", 0 )
-// ROM_LOAD( "cap740.u50", 0x0000, 0x0100, CRC(6fe619c4) SHA1(49e43dafd010ce0fe9b2a63b96a4ddedcb933c6d) ) /* verified - For use with CG2195 when added */
+// ROM_LOAD( "cap740.u50", 0x0000, 0x0100, CRC(6fe619c4) SHA1(49e43dafd010ce0fe9b2a63b96a4ddedcb933c6d) ) /* verified - For use with CG2195 when added */
ROM_LOAD( "capx2312.u43", 0x0000, 0x0200, CRC(66971da6) SHA1(6984a68bc2f01009ad6a7a0705c00e715c29bb65) )
ROM_END
@@ -9348,7 +9348,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus)
WA 1 2 3 4 5 7 20 50 300 800
% Range: 91.0-93.0% Optimum: 95.0% Hit Frequency: 45.5%
Programs Available: X000557P
-
+
NOTE: Same as X000040P, except MAX Coin (set to 5) CANNOT be changed - NJ jurisdiction
*/
ROM_REGION( 0x10000, "maincpu", 0 )
@@ -9969,7 +9969,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K 4K 4A SF RF (Bonus)
ROM_LOAD( "mgo-cg2242.u78", 0x08000, 0x8000, CRC(53eed56f) SHA1(e79f31c5c817b8b96b4970c1a702d1892961d441) )
ROM_LOAD( "mbo-cg2242.u79", 0x10000, 0x8000, CRC(af092f50) SHA1(53a3536593bb14c4072e8a5ee9e05af332feceb1) )
ROM_LOAD( "mxo-cg2242.u80", 0x18000, 0x8000, CRC(ecacb6b2) SHA1(32660adcc266fbbb3702a0cd30e25d11b953d23d) )
-
+
ROM_REGION( 0x200, "proms", 0 )
ROM_LOAD( "capx1321.u43", 0x0000, 0x0200, CRC(4b57569f) SHA1(fa29c0f627e7ce79951ec6dadec114864144f37d) )
ROM_END
diff --git a/src/mame/drivers/pirates.cpp b/src/mame/drivers/pirates.cpp
index b891641791c..edec5b00e2b 100644
--- a/src/mame/drivers/pirates.cpp
+++ b/src/mame/drivers/pirates.cpp
@@ -323,7 +323,7 @@ ROM_START( piratesb )
ROM_LOAD( "U31", 0x000000, 0x080000, CRC(63a739ec) SHA1(c57f657225e62b3c9c5f0c7185ad7a87794d55f4) )
ROM_END
-
+
ROM_START( genix )
diff --git a/src/mame/drivers/r9751.cpp b/src/mame/drivers/r9751.cpp
index ad094420204..fd8f0e5c9a0 100644
--- a/src/mame/drivers/r9751.cpp
+++ b/src/mame/drivers/r9751.cpp
@@ -3,7 +3,7 @@
/******************************************************************************
*
* Rolm CBX 9751 Driver
-*
+*
* This driver attempts to emulate the following models:
* * Model 10
* * Model 20
@@ -21,10 +21,10 @@
*
* Special Thanks to:
* * Stephen Stair (sgstair) - for help with reverse engineering,
-* programming, and emulation
+* programming, and emulation
* * Felipe Sanches (FSanches) - for help with MESS and emulation
* * Michael Zapf (mizapf) - for building the HDC9234/HDC9224
-* driver that makes this driver possible
+* driver that makes this driver possible
*
* Memory map:
* * 0x00000000 - 0x00ffffff : RAM 12MB to 16MB known, up to 128MB?
@@ -67,8 +67,8 @@ public:
DECLARE_READ32_MEMBER(r9751_mmio_5ff_r);
DECLARE_WRITE32_MEMBER(r9751_mmio_5ff_w);
- DECLARE_READ32_MEMBER(r9751_mmio_ff05_r);
- DECLARE_WRITE32_MEMBER(r9751_mmio_ff05_w);
+ DECLARE_READ32_MEMBER(r9751_mmio_ff05_r);
+ DECLARE_WRITE32_MEMBER(r9751_mmio_ff05_w);
DECLARE_READ32_MEMBER(r9751_mmio_fff8_r);
DECLARE_WRITE32_MEMBER(r9751_mmio_fff8_w);
@@ -94,7 +94,7 @@ private:
UINT32 smioc_out_addr;
// End registers
-// UINT32 fdd_scsi_command;
+// UINT32 fdd_scsi_command;
address_space *m_mem;
// functions
@@ -106,8 +106,8 @@ private:
UINT32 r9751_state::swap_uint32( UINT32 val )
{
- val = ((val << 8) & 0xFF00FF00 ) | ((val >> 8) & 0xFF00FF );
- return (val << 16) | (val >> 16);
+ val = ((val << 8) & 0xFF00FF00 ) | ((val >> 8) & 0xFF00FF );
+ return (val << 16) | (val >> 16);
}
READ8_MEMBER(r9751_state::pdc_dma_r)
@@ -127,7 +127,7 @@ DRIVER_INIT_MEMBER(r9751_state,r9751)
reg_ff050320 = 1;
reg_fff80040 = 0;
fdd_dest_address = 0;
-// fdd_scsi_command = 0;
+// fdd_scsi_command = 0;
fdd_cmd_complete = 0;
smioc_out_addr = 0;
m_mem = &m_maincpu->space(AS_PROGRAM);
@@ -300,7 +300,7 @@ WRITE32_MEMBER( r9751_state::r9751_mmio_5ff_w )
READ32_MEMBER( r9751_state::r9751_mmio_ff05_r )
{
UINT32 data;
- UINT32 address = offset * 4 + 0xFF050000;
+ UINT32 address = offset * 4 + 0xFF050000;
switch(address)
{
@@ -352,8 +352,8 @@ WRITE32_MEMBER( r9751_state::r9751_mmio_ff05_w )
READ32_MEMBER( r9751_state::r9751_mmio_fff8_r )
{
- UINT32 data;
- UINT32 address = offset * 4 + 0xFFF80000;
+ UINT32 data;
+ UINT32 address = offset * 4 + 0xFFF80000;
switch(address)
{
@@ -369,7 +369,7 @@ READ32_MEMBER( r9751_state::r9751_mmio_fff8_r )
WRITE32_MEMBER( r9751_state::r9751_mmio_fff8_w )
{
- UINT32 address = offset * 4 + 0xFFF80000;
+ UINT32 address = offset * 4 + 0xFFF80000;
switch(address)
{
@@ -391,8 +391,8 @@ static ADDRESS_MAP_START(r9751_mem, AS_PROGRAM, 32, r9751_state)
AM_RANGE(0x00000000,0x00ffffff) AM_RAM AM_SHARE("main_ram") // 16MB
//AM_RANGE(0x01000000,0x07ffffff) AM_NOP
AM_RANGE(0x08000000,0x0800ffff) AM_ROM AM_REGION("prom", 0)
- AM_RANGE(0x5FF00000,0x5FFFFFFF) AM_READWRITE(r9751_mmio_5ff_r, r9751_mmio_5ff_w)
- AM_RANGE(0xFF050000,0xFF06FFFF) AM_READWRITE(r9751_mmio_ff05_r, r9751_mmio_ff05_w)
+ AM_RANGE(0x5FF00000,0x5FFFFFFF) AM_READWRITE(r9751_mmio_5ff_r, r9751_mmio_5ff_w)
+ AM_RANGE(0xFF050000,0xFF06FFFF) AM_READWRITE(r9751_mmio_ff05_r, r9751_mmio_ff05_w)
AM_RANGE(0xFFF80000,0xFFF8FFFF) AM_READWRITE(r9751_mmio_fff8_r, r9751_mmio_fff8_w)
//AM_RANGE(0xffffff00,0xffffffff) AM_RAM // Unknown area
ADDRESS_MAP_END
diff --git a/src/mame/drivers/rollext.cpp b/src/mame/drivers/rollext.cpp
index a973103f67d..0a01fc4e26e 100644
--- a/src/mame/drivers/rollext.cpp
+++ b/src/mame/drivers/rollext.cpp
@@ -61,7 +61,7 @@
[0x00000320] 2000000-TCOUNT in XINT3 handler
[0x01010668] copied from (word)0xb0000004 in XINT3 handler
- ROM [0xc0050000] 0x10000 floats copied to [0x40180000]
+ ROM [0xc0050000] 0x10000 floats copied to [0x40180000]
Texture ROM decode:
@@ -170,7 +170,7 @@ void rollext_renderer::process_display_list(UINT32* disp_ram)
// Word 0: xxxxxxxx -------- -------- -------- Command? 0xFC for quads
// -------- -------- xxxxxxxx -------- Palette?
// -------- -------- -------- xxxxxxxx Number of verts? (4 for quads)
-
+
// Word 1: xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx Vertex 1 X
// Word 2: xxxxxxxx xxxxx--- -------- -------- Texture Origin Bottom
@@ -227,10 +227,10 @@ void rollext_renderer::process_display_list(UINT32* disp_ram)
vert[j].y = (int)((u2f(iy) / 2.0f) + 192.0f);
}
- vert[0].p[0] = 0.0f; vert[0].p[1] = 1.0f;
- vert[1].p[0] = 0.0f; vert[1].p[1] = 0.0f;
- vert[2].p[0] = 1.0f; vert[2].p[1] = 0.0f;
- vert[3].p[0] = 1.0f; vert[3].p[1] = 1.0f;
+ vert[0].p[0] = 0.0f; vert[0].p[1] = 1.0f;
+ vert[1].p[0] = 0.0f; vert[1].p[1] = 0.0f;
+ vert[2].p[0] = 1.0f; vert[2].p[1] = 0.0f;
+ vert[3].p[0] = 1.0f; vert[3].p[1] = 1.0f;
rollext_polydata &extra = object_data_alloc();
@@ -238,18 +238,18 @@ void rollext_renderer::process_display_list(UINT32* disp_ram)
extra.tex_left = (disp_ram[(ii + 8) / 4] >> 8) & 0x7ff;
extra.pal = (disp_ram[(ii + 0) / 4] >> 8) & 0x1f;
-#if 0
+#if 0
printf("P%d\n", i);
for (int j=0; j < 6; j++)
{
printf(" %08X %08X %08X %08X", disp_ram[(ii + (j*0x10) + 0) / 4], disp_ram[(ii + (j*0x10) + 4) / 4], disp_ram[(ii + (j*0x10) + 8) / 4], disp_ram[(ii + (j*0x10) + 12) / 4]);
printf(" %f %f %f %f\n", u2f(disp_ram[(ii + (j*0x10) + 0) / 4]), u2f(disp_ram[(ii + (j*0x10) + 4) / 4]), u2f(disp_ram[(ii + (j*0x10) + 8) / 4]), u2f(disp_ram[(ii + (j*0x10) + 12) / 4]));
}
-#endif
+#endif
render_triangle(visarea, rd, 4, vert[0], vert[1], vert[2]);
render_triangle(visarea, rd, 4, vert[0], vert[2], vert[3]);
-
+
}
wait();
@@ -371,7 +371,7 @@ UINT32 rollext_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
ii += 1536;
}
#endif
-
+
m_renderer->display(&bitmap, cliprect);
//m_renderer->clear_fb();
@@ -443,7 +443,7 @@ WRITE32_MEMBER(rollext_state::cmd_callback)
printf("PP num %d\n", num);
printf("0x00000084 = %08X\n", space.read_dword(0x84));
-
+
UINT32 ra = 0x1000280;
/*
diff --git a/src/mame/drivers/rungun.cpp b/src/mame/drivers/rungun.cpp
index 4cc31afe1f2..af05982fed2 100644
--- a/src/mame/drivers/rungun.cpp
+++ b/src/mame/drivers/rungun.cpp
@@ -29,10 +29,10 @@
Known Issues:
- CRTC and video registers needs syncronization with current video draw state, it's very noticeable if for example scroll values are in very different states between screens.
- - Current draw state could be improved optimization-wise (for example by supporting it in the core in some way).
- - sprite palettes are not entirely right
-
-
+ - Current draw state could be improved optimization-wise (for example by supporting it in the core in some way).
+ - sprite palettes are not entirely right
+
+
*************************************************************************/
#include "emu.h"
@@ -68,7 +68,7 @@ READ16_MEMBER(rungun_state::rng_sysregs_r)
bit9 : screen output select
*/
{
- UINT8 field_bit = machine().first_screen()->frame_number() & 1;
+ UINT8 field_bit = machine().first_screen()->frame_number() & 1;
if(m_single_screen_mode == true)
field_bit = 1;
return (ioport("SYSTEM")->read() & 0xfdff) | (field_bit << 9);
@@ -95,12 +95,12 @@ WRITE16_MEMBER(rungun_state::rng_sysregs_w)
bit0 : eeprom_di_write
bit1 : eeprom_cs_write
bit2 : eeprom_clk_write
- bit3 : coin counter #1
- bit4 : coin counter #2 (when coin slot "common" is selected)
+ bit3 : coin counter #1
+ bit4 : coin counter #2 (when coin slot "common" is selected)
bit7 : set before massive memory writes (video chip select?)
bit10 : IRQ5 ACK
- bit12 : if set, forces screen output to 1 monitor.
- bit14 : (0) sprite on top of PSAC2 layer (1) other way around (title screen)
+ bit12 : if set, forces screen output to 1 monitor.
+ bit14 : (0) sprite on top of PSAC2 layer (1) other way around (title screen)
*/
if (ACCESSING_BITS_0_7)
{
@@ -123,7 +123,7 @@ WRITE16_MEMBER(rungun_state::rng_sysregs_w)
bit 1 : disable PSAC2 input?
bit 2 : OBJCHA
bit 3 : enable IRQ 5
- bit 7-4: base address for 53936 ROM readback.
+ bit 7-4: base address for 53936 ROM readback.
*/
m_k055673->k053246_set_objcha_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE);
m_roz_rombase = (data & 0xf0) >> 4;
@@ -162,7 +162,7 @@ INTERRUPT_GEN_MEMBER(rungun_state::rng_interrupt)
// send to sprite device current state (i.e. bread & butter sprite DMA)
// TODO: firing this in screen update causes sprites to desync badly ...
sprite_dma_trigger();
-
+
if (m_sysreg[0x0c / 2] & 0x09)
device.execute().set_input_line(M68K_IRQ_5, ASSERT_LINE);
}
@@ -185,21 +185,21 @@ WRITE16_MEMBER(rungun_state::palette_write)
palette_device *cur_paldevice = m_video_mux_bank == 0 ? m_palette : static_cast<palette_device *>(m_palette2);
UINT32 addr = offset + m_video_mux_bank*0x800/2;
COMBINE_DATA(&m_pal_ram[addr]);
-
+
UINT8 r,g,b;
-
+
r = m_pal_ram[addr] & 0x1f;
g = (m_pal_ram[addr] & 0x3e0) >> 5;
b = (m_pal_ram[addr] & 0x7e00) >> 10;
-
+
cur_paldevice->set_pen_color(offset,pal5bit(r),pal5bit(g),pal5bit(b));
}
static ADDRESS_MAP_START( rungun_map, AS_PROGRAM, 16, rungun_state )
AM_RANGE(0x000000, 0x2fffff) AM_ROM // main program + data
- AM_RANGE(0x300000, 0x3007ff) AM_READWRITE(palette_read,palette_write)
+ AM_RANGE(0x300000, 0x3007ff) AM_READWRITE(palette_read,palette_write)
AM_RANGE(0x380000, 0x39ffff) AM_RAM // work RAM
- AM_RANGE(0x400000, 0x43ffff) AM_READ8(rng_53936_rom_r,0x00ff) // '936 ROM readback window
+ AM_RANGE(0x400000, 0x43ffff) AM_READ8(rng_53936_rom_r,0x00ff) // '936 ROM readback window
AM_RANGE(0x480000, 0x48001f) AM_READWRITE(rng_sysregs_r, rng_sysregs_w) AM_SHARE("sysreg")
AM_RANGE(0x4c0000, 0x4c001f) AM_DEVREADWRITE8("k053252", k053252_device, read, write, 0x00ff) // CCU (for scanline and vblank polling)
AM_RANGE(0x540000, 0x540001) AM_WRITE(sound_irq_w)
@@ -211,7 +211,7 @@ static ADDRESS_MAP_START( rungun_map, AS_PROGRAM, 16, rungun_state )
AM_RANGE(0x580000, 0x58001f) AM_RAM // sound regs read/write fall-through
AM_RANGE(0x5c0000, 0x5c000f) AM_DEVREAD("k055673", k055673_device, k055673_rom_word_r) // 246A ROM readback window
AM_RANGE(0x5c0010, 0x5c001f) AM_DEVWRITE("k055673", k055673_device, k055673_reg_word_w)
- AM_RANGE(0x600000, 0x601fff) AM_RAMBANK("spriteram_bank") // OBJ RAM
+ AM_RANGE(0x600000, 0x601fff) AM_RAMBANK("spriteram_bank") // OBJ RAM
AM_RANGE(0x640000, 0x640007) AM_DEVWRITE("k055673", k055673_device, k053246_word_w) // '246A registers
AM_RANGE(0x680000, 0x68001f) AM_DEVWRITE("k053936", k053936_device, ctrl_w) // '936 registers
AM_RANGE(0x6c0000, 0x6cffff) AM_READWRITE(rng_psac2_videoram_r,rng_psac2_videoram_w) // PSAC2 ('936) RAM (34v + 35v)
@@ -391,8 +391,8 @@ void rungun_state::machine_start()
m_banked_ram = make_unique_clear<UINT16[]>(0x2000);
m_pal_ram = make_unique_clear<UINT16[]>(0x800*2);
membank("spriteram_bank")->configure_entries(0,2,&m_banked_ram[0],0x2000);
-
-
+
+
save_item(NAME(m_sound_ctrl));
save_item(NAME(m_sound_status));
save_item(NAME(m_sound_nmi_clk));
@@ -460,7 +460,7 @@ static MACHINE_CONFIG_START( rng, rungun_state )
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
MCFG_PALETTE_ENABLE_SHADOWS()
MCFG_PALETTE_ENABLE_HILIGHTS()
-
+
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -989,4 +989,4 @@ GAMEL( 1993, rungunuad,rungun, rng_dual, rng_dual, driver_device, 0, ROT0, "Kona
GAMEL( 1993, slmdunkjd,rungun, rng_dual, rng_dual, driver_device, 0, ROT0, "Konami", "Slam Dunk (ver JAA 1993 10.8) (dual screen with demux adapter)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND, layout_rungun_dual )
// this set has no dipswitches to select single screen mode (they're not even displayed in test menu) it's twin cabinet ONLY
-GAMEL( 1993, rungunud, rungun, rng_dual, rng_nodip, driver_device, 0, ROT0, "Konami", "Run and Gun (ver UAB 1993 10.12, dedicated twin cabinet)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND, layout_rungun_dual )
+GAMEL( 1993, rungunud, rungun, rng_dual, rng_nodip, driver_device, 0, ROT0, "Konami", "Run and Gun (ver UAB 1993 10.12, dedicated twin cabinet)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND, layout_rungun_dual )
diff --git a/src/mame/drivers/sansa_fuze.cpp b/src/mame/drivers/sansa_fuze.cpp
index 75634b5fa70..2ee426af50c 100644
--- a/src/mame/drivers/sansa_fuze.cpp
+++ b/src/mame/drivers/sansa_fuze.cpp
@@ -48,7 +48,7 @@ ROM_START( sanfuze2 )
// this rom was dumped using the RockBox (custom firmware) debugging features, it's presumably the internal ROM
// I don't know if it's specific to the Fuze 2, or shared.
ROM_LOAD( "sanza.rom", 0x00000, 0x20000, CRC(a93674b0) SHA1(3a17dfc9ad31f07fdd66e3dac94c9494c59f3203) )
-
+
// these are firmware update files, we probably need to extract the data from them in order to use them with the ROM
// above and get things booting.
// http://forums.sandisk.com/t5/Sansa-Fuze/Sansa-Fuze-Firmware-Update-01-02-31-amp-02-03-33/td-p/139175
@@ -59,7 +59,7 @@ ROM_START( sanfuze2 )
ROM_LOAD( "020333_clpp_data.dat", 0x00000, 0x566a0d, CRC(2093569c) SHA1(7882abcf000860a3071f5afe91719530bc54c68a) ) // original filename clpp_data.dat, actually a 6 minute MP3 advertisement for slotRadio
ROM_REGION(0xf00000, "updates1", 0 )
- // 01.02.31 (for Fuze 1?)
+ // 01.02.31 (for Fuze 1?)
ROM_LOAD( "010231_fuzea.bin", 0x00000, 0xf00000, CRC(48b264cb) SHA1(387d5270fdd2fb7ba3901be59651a55167700768) ) // original filename fuzea.bin
ROM_END
diff --git a/src/mame/drivers/scm_500.cpp b/src/mame/drivers/scm_500.cpp
index f49a5574d0e..1e5eac486ae 100644
--- a/src/mame/drivers/scm_500.cpp
+++ b/src/mame/drivers/scm_500.cpp
@@ -17,12 +17,12 @@ class scm_500_state : public driver_device
public:
scm_500_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
-// ,m_maincpu(*this, "maincpu")
+// ,m_maincpu(*this, "maincpu")
{ }
virtual void machine_start() override;
virtual void machine_reset() override;
-// required_device<cpu_device> m_maincpu;
+// required_device<cpu_device> m_maincpu;
};
diff --git a/src/mame/drivers/segajw.cpp b/src/mame/drivers/segajw.cpp
index 3b0dec4c3c5..5b4dae626ee 100644
--- a/src/mame/drivers/segajw.cpp
+++ b/src/mame/drivers/segajw.cpp
@@ -298,10 +298,10 @@ static INPUT_PORTS_START( segajw )
PORT_DIPSETTING( 0x0000, "$25" )
PORT_DIPSETTING( 0x0001, "$5" )
PORT_DIPSETTING( 0x0002, "$1" )
- PORT_DIPSETTING( 0x0003, "50¢" )
- PORT_DIPSETTING( 0x0004, "25¢" )
- PORT_DIPSETTING( 0x0005, "10¢" )
- PORT_DIPSETTING( 0x0006, "5¢" )
+ PORT_DIPSETTING( 0x0003, "50c" )
+ PORT_DIPSETTING( 0x0004, "25c" )
+ PORT_DIPSETTING( 0x0005, "10c" )
+ PORT_DIPSETTING( 0x0006, "5c" )
PORT_DIPSETTING( 0x0007, "Medal" )
PORT_DIPNAME( 0x0008, 0x0000, "Max. Pay" ) PORT_DIPLOCATION("SW2:4")
PORT_DIPSETTING( 0x0008, "500" )
diff --git a/src/mame/drivers/snesb.cpp b/src/mame/drivers/snesb.cpp
index 04dc492c099..e5980a70314 100644
--- a/src/mame/drivers/snesb.cpp
+++ b/src/mame/drivers/snesb.cpp
@@ -1023,7 +1023,7 @@ ROM_START( mk3snes ) // this is identical to the SNES release apart from a singl
ROM_LOAD( "1.U1", 0x200000, 0x080000, CRC(4cab6332) SHA1(3c417ba6d35532b4e2ca9ae4a3b730c589d26aee) )
ROM_LOAD( "2.U2", 0x280000, 0x080000, CRC(0327999b) SHA1(dc6bb11a925e893453e0e5e5d88b8ace8d6cf859) )
ROM_LOAD( "3.U3", 0x300000, 0x080000, CRC(229af2de) SHA1(1bbb02aec08afab979ffbe4b68a48dc4cc923f73) )
- ROM_LOAD( "4.U4", 0x380000, 0x080000, CRC(b51930d9) SHA1(220f00d64809a6218015a738e53f11d8dc81578f) ) // 4.U4 is a 99.999809% match for the last part of sns-a3me-0.u1 (mk3u in snes softlist - 1 byte changed?!)
+ ROM_LOAD( "4.U4", 0x380000, 0x080000, CRC(b51930d9) SHA1(220f00d64809a6218015a738e53f11d8dc81578f) ) // 4.U4 is a 99.999809% match for the last part of sns-a3me-0.u1 (mk3u in snes softlist - 1 byte changed?!)
ROM_REGION( 0x1000, "mcu", 0 )
ROM_LOAD( "D87C51.U9", 0x00000, 0x1000, CRC(f447620a) SHA1(ac0d78c7b339f13d5f96a6727a0f2147158697f9) )
diff --git a/src/mame/drivers/spc1000.cpp b/src/mame/drivers/spc1000.cpp
index 6b22b9c0e2a..f0a90944100 100644
--- a/src/mame/drivers/spc1000.cpp
+++ b/src/mame/drivers/spc1000.cpp
@@ -403,8 +403,8 @@ void spc1000_state::machine_start()
// intialize banks 2 & 4 (write banks)
membank("bank2")->set_base(ram);
membank("bank4")->set_base(ram + 0x8000);
-
- m_time = machine().scheduler().time();
+
+ m_time = machine().scheduler().time();
}
void spc1000_state::machine_reset()
diff --git a/src/mame/drivers/squale.cpp b/src/mame/drivers/squale.cpp
index d536d07f7b1..81f215526b4 100644
--- a/src/mame/drivers/squale.cpp
+++ b/src/mame/drivers/squale.cpp
@@ -1,5 +1,5 @@
// license:BSD-3-Clause
-// copyright-holders:Miodrag Milanovic, Jean-Franois DEL NERO
+// copyright-holders:Miodrag Milanovic, Jean-Francois DEL NERO
/***************************************************************************
Apollo 7 Squale
diff --git a/src/mame/drivers/sslam.cpp b/src/mame/drivers/sslam.cpp
index 40c5d9d7e5a..70fa00b7b44 100644
--- a/src/mame/drivers/sslam.cpp
+++ b/src/mame/drivers/sslam.cpp
@@ -845,7 +845,7 @@ ROM_END
// other labels seem to be that of the powerbals set below, but with sslam content, maybe it was
// factory converted to powerbals at one time, then back again?
// there are quite a lot of changes from the above sets.
-ROM_START( sslamb )
+ROM_START( sslamb )
ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASE00 ) /* 68000 Code */
ROM_LOAD16_BYTE( "21.u67", 0x00000, 0x80000, CRC(a7c57d58) SHA1(28964c30a12bf7b236fd10bd3b1da341b54f4b7c) )
ROM_RELOAD_SSLAM(0x100000)
diff --git a/src/mame/drivers/st17xx.cpp b/src/mame/drivers/st17xx.cpp
index e4398849778..f3ba9428aea 100644
--- a/src/mame/drivers/st17xx.cpp
+++ b/src/mame/drivers/st17xx.cpp
@@ -2,36 +2,36 @@
// copyright-holders:Justin Kerk
/***************************************************************************
- Saturn ST-17xx series DVD players
+ Saturn ST-17xx series DVD players
- Skeleton driver.
+ Skeleton driver.
****************************************************************************/
/*
- TODO:
+ TODO:
- - everything
+ - everything
- Technical info:
- DVD-player-on-a-chip designs from Mediatek:
- http://www.mediatek.com/en/products/home-entertainment/consumer-dvd-blu-ray/
+ Technical info:
+ DVD-player-on-a-chip designs from Mediatek:
+ http://www.mediatek.com/en/products/home-entertainment/consumer-dvd-blu-ray/
- MT1379:
- http://pdf.datasheetcatalog.com/datasheets/134/477326_DS.pdf
+ MT1379:
+ http://pdf.datasheetcatalog.com/datasheets/134/477326_DS.pdf
- MT1389:
- http://newage.mpeg4-players.info/mt1389/mt1389.html
- http://groups.yahoo.com/group/MEDIATEK1389/
- http://www.sigmatek-xm600.borec.cz/chip.html
- http://www.sigmatek-xm600.borec.cz/Info%20-%20MT1389%20v0.3b%20English.doc (rename to .rtf)
- Includes an 8032, ARM7TDMI, and unknown DSP
+ MT1389:
+ http://newage.mpeg4-players.info/mt1389/mt1389.html
+ http://groups.yahoo.com/group/MEDIATEK1389/
+ http://www.sigmatek-xm600.borec.cz/chip.html
+ http://www.sigmatek-xm600.borec.cz/Info%20-%20MT1389%20v0.3b%20English.doc (rename to .rtf)
+ Includes an 8032, ARM7TDMI, and unknown DSP
- SUNPLUS SPHE8200A:
- http://pdf.datasheetcatalog.com/datasheets/2300/499420_DS.pdf
- https://004code.googlecode.com/svn/trunk/h/regmapo_8200.h
- "32-bit RISC" architecture, but which one?
+ SUNPLUS SPHE8200A:
+ http://pdf.datasheetcatalog.com/datasheets/2300/499420_DS.pdf
+ https://004code.googlecode.com/svn/trunk/h/regmapo_8200.h
+ "32-bit RISC" architecture, but which one?
*/
diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp
index 1d3bf9a0399..9cb83e9e67a 100644
--- a/src/mame/drivers/subsino2.cpp
+++ b/src/mame/drivers/subsino2.cpp
@@ -676,8 +676,8 @@ UINT32 subsino2_state::screen_update_subsino2(screen_device &screen, bitmap_ind1
case 0x07:
mask_y[0] = ~(8-1);
break;
-// case 0x7f: // ptrain
-// break;
+// case 0x7f: // ptrain
+// break;
case 0xfd:
l0_reel = true;
break;
diff --git a/src/mame/drivers/sun3.cpp b/src/mame/drivers/sun3.cpp
index 23090708618..00126ba93a9 100644
--- a/src/mame/drivers/sun3.cpp
+++ b/src/mame/drivers/sun3.cpp
@@ -298,8 +298,8 @@
#define SCC2_TAG "scc2"
#define ESP_TAG "esp"
#define FDC_TAG "fdc"
-#define RS232A_TAG "rs232a"
-#define RS232B_TAG "rs232b"
+#define RS232A_TAG "rs232a"
+#define RS232B_TAG "rs232b"
class sun3_state : public driver_device
{
diff --git a/src/mame/drivers/taitopjc.cpp b/src/mame/drivers/taitopjc.cpp
index bd1c63e2334..3326bfa9cd3 100644
--- a/src/mame/drivers/taitopjc.cpp
+++ b/src/mame/drivers/taitopjc.cpp
@@ -77,7 +77,7 @@
0xf010:
0xf020:
- TLCS -> PPC Commands:
+ TLCS -> PPC Commands:
0x7000: DSP ready
0xd000: Vblank
@@ -93,7 +93,7 @@
#define LOG_TLCS_TO_PPC_COMMANDS 1
#define LOG_PPC_TO_TLCS_COMMANDS 1
-#define LOG_DISPLAY_LIST 0
+#define LOG_DISPLAY_LIST 0
class taitopjc_state : public driver_device
{
@@ -208,7 +208,7 @@ UINT32 taitopjc_state::screen_update_taitopjc(screen_device &screen, bitmap_ind1
int palette = (tile >> 12) & 0xf;
- tile &= 0xfff;
+ tile &= 0xfff;
for (y=0; y < 16; y++)
{
@@ -249,7 +249,7 @@ void taitopjc_state::videochip_w(offs_t address, UINT32 data)
m_pal_ram[address - 0x20000000] = data;
int b = (data >> 16) & 0xff;
- int g = (data >> 8) & 0xff;
+ int g = (data >> 8) & 0xff;
int r = (data >> 0) & 0xff;
m_palette->set_pen_color(address - 0x20000000, rgb_t(r, g, b));
}
@@ -382,7 +382,7 @@ void taitopjc_state::print_display_list()
int count = (w & 0x7fff) + 1;
UINT16 d = m_dsp_ram[ptr++];
for (int i=0; i < count; i++)
- {
+ {
UINT16 s = m_dsp_ram[ptr++];
printf(" %04X -> [%04X]\n", s, d);
d++;
@@ -639,7 +639,7 @@ static ADDRESS_MAP_START( tms_program_map, AS_PROGRAM, 16, taitopjc_state )
AM_RANGE(0x4c00, 0xefff) AM_ROM AM_REGION("user2", 0x9800)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tms_data_map, AS_DATA, 16, taitopjc_state )
+static ADDRESS_MAP_START( tms_data_map, AS_DATA, 16, taitopjc_state )
AM_RANGE(0x4000, 0x6fff) AM_ROM AM_REGION("user2", 0x8000)
AM_RANGE(0x7000, 0xefff) AM_RAM
AM_RANGE(0xf000, 0xffff) AM_READWRITE(tms_dspshare_r, tms_dspshare_w)
@@ -660,27 +660,27 @@ static INPUT_PORTS_START( taitopjc )
PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_COIN1 ) // Coin A
+ PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_COIN1 ) // Coin A
PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00000080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_START("INPUTS2")
- PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service") PORT_CODE(KEYCODE_7) // Service switch
- PORT_SERVICE_NO_TOGGLE( 0x00000002, IP_ACTIVE_LOW) // Test Button
+ PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service") PORT_CODE(KEYCODE_7) // Service switch
+ PORT_SERVICE_NO_TOGGLE( 0x00000002, IP_ACTIVE_LOW) // Test Button
PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_START1 ) // Select 1
- PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_START2 ) // Select 2
+ PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_START1 ) // Select 1
+ PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_START2 ) // Select 2
PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00000080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_START("INPUTS3")
- PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) // P1 trigger
- PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) // P1 bomb
- PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) // P2 trigger
- PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) // P2 bomb
+ PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) // P1 trigger
+ PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) // P1 bomb
+ PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) // P2 trigger
+ PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) // P2 bomb
PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -796,7 +796,7 @@ ROM_START( optiger )
ROM_REGION16_BE( 0xc00000, "poly", 0 )
ROM_LOAD16_WORD_SWAP( "e63-09_poly0.3", 0x000000, 0x400000, CRC(c3e2b1e0) SHA1(ee71f3f59b46e26dbe2ff724da2c509267c8bf2f) )
ROM_LOAD16_WORD_SWAP( "e63-10_poly1.4", 0x400000, 0x400000, CRC(f4a56390) SHA1(fc3c51a7f4639479e66ad50dcc94255d94803c97) )
- ROM_LOAD16_WORD_SWAP( "e63-11_poly2.5", 0x800000, 0x400000, CRC(2293d9f8) SHA1(16adaa0523168ee63a7a34b29622c623558fdd82) )
+ ROM_LOAD16_WORD_SWAP( "e63-11_poly2.5", 0x800000, 0x400000, CRC(2293d9f8) SHA1(16adaa0523168ee63a7a34b29622c623558fdd82) )
// Poly 3 is not populated
ROM_REGION( 0x800000, "sound_data", 0 )
diff --git a/src/mame/drivers/tasman.cpp b/src/mame/drivers/tasman.cpp
index e1c2de09110..a9c65694c9b 100644
--- a/src/mame/drivers/tasman.cpp
+++ b/src/mame/drivers/tasman.cpp
@@ -14,7 +14,7 @@
Thanks to palindrome for PCB scans.
0x38606
-
+
TODO:
- dual port sound RAM;
- interrupt sources / irq masking;
@@ -45,7 +45,7 @@ public:
DECLARE_DRIVER_INIT(kingtut);
DECLARE_VIDEO_START(kongambl);
UINT8 m_irq_mask;
-
+
virtual void machine_reset() override { m_irq_mask = 0; };
UINT32 screen_update_kongambl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(kongambl_vblank);
@@ -141,7 +141,7 @@ READ32_MEMBER(kongambl_state::eeprom_r)
WRITE8_MEMBER(kongambl_state::eeprom_w)
{
// offset == 3 seems mux writes (active low)
-
+
if (offset == 2)
{
ioport("EEPROMOUT")->write(data&0x7, 0xff);
@@ -150,7 +150,7 @@ WRITE8_MEMBER(kongambl_state::eeprom_w)
}
else
printf("%02x %02x\n",offset,data);
-
+
if(offset == 0)
m_irq_mask = data;
}
@@ -566,7 +566,7 @@ static const gfx_layout charlayout8_tasman =
8,
// 0,8,16,24,32,40,48,56
{ 56,24,40,8,48,16,32,0 },
- { 0,1,2,3,4,5,6,7 },
+ { 0,1,2,3,4,5,6,7 },
{ 0*64, 1*64, 2*64, 3*64, 4*64, 5*64, 6*64, 7*64},
8*64
};
@@ -585,11 +585,11 @@ TIMER_DEVICE_CALLBACK_MEMBER(kongambl_state::kongambl_vblank)
m_maincpu->set_input_line(1, HOLD_LINE); // vblank?
//if(scanline == 256 && m_irq_mask & 2)
- // m_maincpu->set_input_line(2, HOLD_LINE); // unknown (jumps to work RAM via a branch or returns lv 2 exception error, extension board?)
-
+ // m_maincpu->set_input_line(2, HOLD_LINE); // unknown (jumps to work RAM via a branch or returns lv 2 exception error, extension board?)
+
if(scanline == 0 && m_irq_mask & 4)
m_maincpu->set_input_line(3, HOLD_LINE); // sprite irq?
-
+
if(scanline == 128 && m_irq_mask & 8)
m_maincpu->set_input_line(4, HOLD_LINE); // sound irq
@@ -603,13 +603,13 @@ static MACHINE_CONFIG_START( kongambl, kongambl_state )
MCFG_CPU_ADD("sndcpu", M68000, 16000000)
MCFG_CPU_PROGRAM_MAP(kongamaud_map)
MCFG_CPU_PERIODIC_INT_DRIVER(kongambl_state, irq2_line_hold, 480)
-
+
MCFG_DEVICE_ADD("k053252", K053252, 25000000)
MCFG_K053252_OFFSETS(0, 16) // TBD
MCFG_K053252_INT1_ACK_CB(WRITELINE(konamigx_state, vblank_irq_ack_w))
MCFG_K053252_INT2_ACK_CB(WRITELINE(konamigx_state, hblank_irq_ack_w))
MCFG_VIDEO_SET_SCREEN("screen")
-
+
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MCFG_SCREEN_ADD("screen", RASTER)
@@ -772,9 +772,9 @@ DRIVER_INIT_MEMBER(kongambl_state,kingtut)
{
//UINT32 *rom = (UINT32*)memregion("maincpu")->base();
- //rom[0x3986c/4] = (rom[0x3986c/4] & 0xffff0000) | 0x600e; // patch ROM check
- //rom[0x2bfc8/4] = (rom[0x2bfc8/4] & 0xffff0000) | 0x6612; // patch VRAM ROM checks
- //rom[0x2acd0/4] = (rom[0x2acd0/4] & 0xffff) | 0x6612<<16; // patch OBJ ROM checks
+ //rom[0x3986c/4] = (rom[0x3986c/4] & 0xffff0000) | 0x600e; // patch ROM check
+ //rom[0x2bfc8/4] = (rom[0x2bfc8/4] & 0xffff0000) | 0x6612; // patch VRAM ROM checks
+ //rom[0x2acd0/4] = (rom[0x2acd0/4] & 0xffff) | 0x6612<<16; // patch OBJ ROM checks
//rom[0x55e40/4] = (rom[0x55e40/4] & 0xffff0000) | 0x4e71; // goes away from the POST
}
diff --git a/src/mame/drivers/tekxp33x.cpp b/src/mame/drivers/tekxp33x.cpp
index 76345aafe33..5e90c391c22 100644
--- a/src/mame/drivers/tekxp33x.cpp
+++ b/src/mame/drivers/tekxp33x.cpp
@@ -2,35 +2,35 @@
// copyright-holders:Justin Kerk
/***************************************************************************
- Tektronix TekXpress XP33x series X terminals
+ Tektronix TekXpress XP33x series X terminals
- Skeleton driver.
+ Skeleton driver.
****************************************************************************/
/*
- TODO:
-
- - everything
-
- Technical info:
- https://www.linux-mips.org/wiki/Tektronix_TekXPress_XP338
- https://web.archive.org/web/20061013084616/http://tekxp-linux.hopto.org/pmwiki/pmwiki.php/Hardware/XP33x
- http://bio.gsi.de/DOCS/NCD/xp.html
-
- CPU: IDT 79R3052E (MIPS I R3000 embedded core. Big Endian. With MMU, without FPU.)
- Graphic Chipset: Texas Instruments (34020AGBL-40) TI 34010 (TIGA)
- Graphic RAMDAC: Brooktree BT458LPJ135 (Supported in XFree86)
- RAM: 4MB onboard, upgradeable to 52MB, 3 slots for 5V FPM NoParity SIMMs
- ROM: 256Kb, 2 x 27c1024 (64Kx16), with BootMonitor
- Peripherals:
- 1x Ethernet Port (AUI and UTP) -- AMD AM79C98 Chipset
- 2x Serial Ports -- Philips SCC2692 Dual UART chipset
- Keyboard and Mouse controller is a generic PC-Style i8742 with Phoenix BIOS.
- 1x "ERGO" Port (Combined Monitor, Keyboard, Mouse)
- 16K (2K*8) EEPROM is SEEQ NQ2816A-250, AT28C16 compatible. Contains Boot Monitor settings. The content is compressed.
- Micron MT56C0816 - ??? Flash
+ TODO:
+
+ - everything
+
+ Technical info:
+ https://www.linux-mips.org/wiki/Tektronix_TekXPress_XP338
+ https://web.archive.org/web/20061013084616/http://tekxp-linux.hopto.org/pmwiki/pmwiki.php/Hardware/XP33x
+ http://bio.gsi.de/DOCS/NCD/xp.html
+
+ CPU: IDT 79R3052E (MIPS I R3000 embedded core. Big Endian. With MMU, without FPU.)
+ Graphic Chipset: Texas Instruments (34020AGBL-40) TI 34010 (TIGA)
+ Graphic RAMDAC: Brooktree BT458LPJ135 (Supported in XFree86)
+ RAM: 4MB onboard, upgradeable to 52MB, 3 slots for 5V FPM NoParity SIMMs
+ ROM: 256Kb, 2 x 27c1024 (64Kx16), with BootMonitor
+ Peripherals:
+ 1x Ethernet Port (AUI and UTP) -- AMD AM79C98 Chipset
+ 2x Serial Ports -- Philips SCC2692 Dual UART chipset
+ Keyboard and Mouse controller is a generic PC-Style i8742 with Phoenix BIOS.
+ 1x "ERGO" Port (Combined Monitor, Keyboard, Mouse)
+ 16K (2K*8) EEPROM is SEEQ NQ2816A-250, AT28C16 compatible. Contains Boot Monitor settings. The content is compressed.
+ Micron MT56C0816 - ??? Flash
*/
diff --git a/src/mame/drivers/tispellb.cpp b/src/mame/drivers/tispellb.cpp
index 7200433e1b8..4f1ba13968b 100644
--- a/src/mame/drivers/tispellb.cpp
+++ b/src/mame/drivers/tispellb.cpp
@@ -3,24 +3,24 @@
/***************************************************************************
** subclass of hh_tms1k_state (includes/hh_tms1k.h, drivers/hh_tms1k.cpp) **
-
+
Texas Instruments Spelling B hardware
-
+
The Spelling B was introduced together with the Speak & Spell. It is a
handheld educational toy with booklet. Two revisions of the hardware exist.
(* indicates not dumped)
-
+
1st revision:
-
+
Spelling B (US), 1978
- TMS0270 MCU TMC0272 (die labeled 0272A T0270B)
- TMS1980 MCU TMC1984 (die labeled 1980A 84A)
- 8-digit cyan VFD display (seen with and without apostrophe)
-
+
Spelling ABC (UK), 1979: exact same hardware as US version
2nd revision:
-
+
Spelling B (US), 1979
- TMS0270 MCU TMC0274*
- TMC0355 4KB VSM ROM CD2602*
@@ -31,7 +31,7 @@
Spelling ABC (Germany), 1979: different VSM
- TMC0355 4KB VSM ROM CD2607*
-
+
Mr. Challenger (US), 1979
- TMS0270 MCU TMC0273
- TMC0355 4KB VSM ROM CD2601
@@ -212,7 +212,7 @@ WRITE16_MEMBER(tispellb_state::rev2_write_o)
{
// SEG DP: speaker out
m_speaker->level_w(data >> 15 & 1);
-
+
// SEG DP and SEG AP are not connected to VFD, rest is same as rev1
main_write_o(space, offset, data & 0x6fff);
}
@@ -229,7 +229,7 @@ WRITE16_MEMBER(tispellb_state::rev2_write_r)
m_tms6100->romclock_w(1);
m_tms6100->romclock_w(0);
}
-
+
// rest is same as rev1
main_write_r(space, offset, data);
}
@@ -250,7 +250,7 @@ INPUT_CHANGED_MEMBER(tispellb_state::power_button)
{
m_power_on = true;
m_maincpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE);
-
+
if (m_subcpu)
m_subcpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE);
}
@@ -319,7 +319,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mrchalgr )
PORT_INCLUDE( spellb ) // same key layout as spellb
-
+
PORT_MODIFY("IN.5")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_EQUALS) PORT_NAME("2nd Player")
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ENTER) PORT_NAME("Score")
diff --git a/src/mame/drivers/tvcapcom.cpp b/src/mame/drivers/tvcapcom.cpp
index 35abcb1e324..29e5508ce32 100644
--- a/src/mame/drivers/tvcapcom.cpp
+++ b/src/mame/drivers/tvcapcom.cpp
@@ -50,9 +50,9 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( tvcapcom, tvcapcom_state )
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC603, 72900000) // IBM PowerPC Broadway CPU @ 729 MHz ?
+ MCFG_CPU_ADD("maincpu", PPC603, 72900000) // IBM PowerPC Broadway CPU @ 729 MHz ?
MCFG_CPU_PROGRAM_MAP(gc_map)
- MCFG_DEVICE_DISABLE()
+ MCFG_DEVICE_DISABLE()
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -72,7 +72,7 @@ ROM_START( tvcapcom )
// Bios??
ROM_REGION( 0x21000898, "flash", ROMREGION_ERASE) // it's possible all these dumps are bad
-
+
ROM_LOAD("tvc_read1.u14", 0x00, 0x21000898, CRC(51de96ac) SHA1(11a631a695140efa299e6fe9e68c0026dcebc766) ) // old dump, lots of data repeats, seems to cut out in the middle of a block?!
// alt attempts at dumping the same rom, same weird size as above.. the same CRC was read consistently each time, but then differed when read again later without being used inbetween, some blocks seem to get swapped around?!
@@ -82,4 +82,3 @@ ROM_START( tvcapcom )
ROM_END
GAME( 2008, tvcapcom, 0, tvcapcom, tvcapcom, driver_device, 0, ROT0, "Capcom", "Tatsunoko Vs Capcom : Cross Generation of Heroes", MACHINE_IS_SKELETON )
-
diff --git a/src/mame/drivers/wecleman.cpp b/src/mame/drivers/wecleman.cpp
index b529f4b8bfd..f9051f1e77e 100644
--- a/src/mame/drivers/wecleman.cpp
+++ b/src/mame/drivers/wecleman.cpp
@@ -18,7 +18,7 @@ Hot Chase:
- Sound BGMs are regressed (hiccups badly);
- Samples pitch is too low, for instance game over speech;
Common Issues:
-- Too many hacks with protection/blitter/colors.
+- Too many hacks with protection/blitter/colors.
Additionally, there's a bug report that claims that current arrangement is broken for later levels in WEC Le Mans.
007643 / 007645 could do with a rewrite, in short.
- One ROM unused (32K in hotchase, 16K in wecleman)
@@ -676,7 +676,7 @@ WRITE8_MEMBER(wecleman_state::hotchase_sound_control_w)
offset 00000xxx----- channel select (0:channel 0, 1:channel 1)
++------ chip select ( 0:chip 1, 1:chip2, 2:chip3)
data&0x0f left volume (data>>4)&0x0f right volume
- */
+ */
case 0x0:
case 0x1:
m_k007232_1->set_volume( offset&1, (data&0x0f) * 0x08, (data>>4) * 0x08 );
diff --git a/src/mame/etc/template_driver.cpp b/src/mame/etc/template_driver.cpp
index 82b10681476..c233db1b6ba 100644
--- a/src/mame/etc/template_driver.cpp
+++ b/src/mame/etc/template_driver.cpp
@@ -151,8 +151,8 @@ static MACHINE_CONFIG_START( xxx, xxx_state )
MCFG_SCREEN_UPDATE_DRIVER(xxx_state, screen_update)
// MCFG_SCREEN_SIZE(32*8, 32*8)
// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK/2, 442, 0, 320, 264, 0, 240) /* generic NTSC video timing at 320x240 */
- //MCFG_SCREEN_RAW_PARAMS(SYS_A_CPU_CLOCK/4, 442, 0, 256, 263, 16, 240) /* generic NTSC video timing at 256x224 */
+ MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK/2, 442, 0, 320, 264, 0, 240) /* generic NTSC video timing at 320x240 */
+ //MCFG_SCREEN_RAW_PARAMS(SYS_A_CPU_CLOCK/4, 442, 0, 256, 263, 16, 240) /* generic NTSC video timing at 256x224 */
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", xxx)
diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h
index 620f4374118..2741a17be17 100644
--- a/src/mame/includes/aquarium.h
+++ b/src/mame/includes/aquarium.h
@@ -26,7 +26,7 @@ public:
required_shared_ptr<UINT16> m_bak_videoram;
required_shared_ptr<UINT16> m_txt_videoram;
required_shared_ptr<UINT16> m_scroll;
-
+
/* video-related */
tilemap_t *m_txt_tilemap;
tilemap_t *m_mid_tilemap;
diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h
index cd493a8b083..2d0b64f566a 100644
--- a/src/mame/includes/cclimber.h
+++ b/src/mame/includes/cclimber.h
@@ -49,7 +49,7 @@ public:
tilemap_t *m_pf_tilemap;
tilemap_t *m_bs_tilemap;
tilemap_t *m_toproller_bg_tilemap;
- std::unique_ptr<UINT8[]> m_opcodes;
+ std::unique_ptr<UINT8[]> m_opcodes;
DECLARE_WRITE8_MEMBER(swimmer_sh_soundlatch_w);
DECLARE_WRITE8_MEMBER(yamato_p0_w);
diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h
index 85497c434e2..ddb37ce8510 100644
--- a/src/mame/includes/cps1.h
+++ b/src/mame/includes/cps1.h
@@ -146,14 +146,14 @@ public:
optional_shared_ptr<UINT16> m_objram1;
optional_shared_ptr<UINT16> m_objram2;
optional_shared_ptr<UINT16> m_output;
-
+
optional_ioport m_io_in0;
optional_ioport m_io_in1;
std::unique_ptr<UINT16[]> m_cps2_buffered_obj;
// game-specific
std::unique_ptr<UINT16[]> m_gigaman2_dummyqsound_ram;
UINT16 sf2ceblp_prot;
-
+
/* video-related */
tilemap_t *m_bg_tilemap[3];
int m_scanline1;
@@ -184,11 +184,11 @@ public:
int m_cps2digitalvolumelevel;
int m_cps2disabledigitalvolume;
emu_timer *m_digital_volume_timer;
- int m_cps2_dial_type;
- int m_ecofghtr_dial_direction0;
- int m_ecofghtr_dial_direction1;
- int m_ecofghtr_dial_last0;
- int m_ecofghtr_dial_last1;
+ int m_cps2_dial_type;
+ int m_ecofghtr_dial_direction0;
+ int m_ecofghtr_dial_direction1;
+ int m_ecofghtr_dial_last0;
+ int m_ecofghtr_dial_last1;
/* fcrash sound hw */
diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h
index a9aadc003ba..28a01852fbf 100644
--- a/src/mame/includes/namcos22.h
+++ b/src/mame/includes/namcos22.h
@@ -126,7 +126,7 @@ class namcos22_renderer : public poly_manager<float, namcos22_object_data, 4, 80
{
public:
namcos22_renderer(namcos22_state &state);
-
+
void render_scene(screen_device &screen, bitmap_rgb32 &bitmap);
struct namcos22_scenenode *new_scenenode(running_machine &machine, UINT32 zsort, namcos22_scenenode_type type);
diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h
index 8136dfba4b1..2819bbde4a9 100644
--- a/src/mame/includes/rungun.h
+++ b/src/mame/includes/rungun.h
@@ -52,24 +52,24 @@ public:
tilemap_t *m_936_tilemap[2];
std::unique_ptr<UINT16[]> m_psac2_vram;
std::unique_ptr<UINT16[]> m_ttl_vram;
- std::unique_ptr<UINT16[]> m_pal_ram;
- UINT8 m_current_display_bank;
+ std::unique_ptr<UINT16[]> m_pal_ram;
+ UINT8 m_current_display_bank;
int m_ttl_gfx_index;
int m_sprite_colorbase;
- UINT8 *m_roz_rom;
- UINT8 m_roz_rombase;
-
+ UINT8 *m_roz_rom;
+ UINT8 m_roz_rombase;
+
/* sound */
UINT8 m_sound_ctrl;
UINT8 m_sound_status;
UINT8 m_sound_nmi_clk;
-
- bool m_video_priority_mode;
+
+ bool m_video_priority_mode;
std::unique_ptr<UINT16[]> m_banked_ram;
- bool m_single_screen_mode;
- UINT8 m_video_mux_bank;
-
+ bool m_single_screen_mode;
+ UINT8 m_video_mux_bank;
+
DECLARE_READ16_MEMBER(rng_sysregs_r);
DECLARE_WRITE16_MEMBER(rng_sysregs_w);
DECLARE_WRITE16_MEMBER(sound_cmd1_w);
@@ -89,7 +89,7 @@ public:
DECLARE_READ16_MEMBER(palette_read);
DECLARE_WRITE16_MEMBER(palette_write);
-
+
K055673_CB_MEMBER(sprite_callback);
virtual void machine_start() override;
@@ -102,6 +102,6 @@ public:
bitmap_ind16 m_rng_dual_demultiplex_left_temp;
bitmap_ind16 m_rng_dual_demultiplex_right_temp;
void sprite_dma_trigger(void);
-
+
INTERRUPT_GEN_MEMBER(rng_interrupt);
};
diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h
index b289d22dce7..9ac5c6688da 100644
--- a/src/mame/includes/tnzs.h
+++ b/src/mame/includes/tnzs.h
@@ -135,7 +135,7 @@ public:
void screen_eof_tnzs(screen_device &screen, bool state);
INTERRUPT_GEN_MEMBER(arknoid2_interrupt);
-
+
void mcu_reset();
void mcu_handle_coins(int coin);
};
diff --git a/src/mame/layout/captflag.lay b/src/mame/layout/captflag.lay
index aa4157c004c..ed1770f57f8 100644
--- a/src/mame/layout/captflag.lay
+++ b/src/mame/layout/captflag.lay
@@ -1,107 +1,107 @@
<?xml version="1.0" ?>
<mamelayout version="2">
- <!-- Left Flag (Red) -->
- <element name="left_flag" defstate="0">
- <!-- Top position -->
- <!-- Falgpole -->
- <rect state="0">
- <bounds x="0.95" y="0.6" width="0.05" height="0.4"/>
- <color red="0.8" green="0.8" blue="0.8"/>
- </rect>
- <!-- Flag -->
- <rect state="0">
- <bounds x="0" y="0" width="1" height="0.6"/>
- <color red="1.0" green="0.0" blue="0.0"/>
- </rect>
+ <!-- Left Flag (Red) -->
+ <element name="left_flag" defstate="0">
+ <!-- Top position -->
+ <!-- Falgpole -->
+ <rect state="0">
+ <bounds x="0.95" y="0.6" width="0.05" height="0.4"/>
+ <color red="0.8" green="0.8" blue="0.8"/>
+ </rect>
+ <!-- Flag -->
+ <rect state="0">
+ <bounds x="0" y="0" width="1" height="0.6"/>
+ <color red="1.0" green="0.0" blue="0.0"/>
+ </rect>
- <rect state="1">
- <bounds x="0.95" y="1.6" width="0.05" height="0.4"/>
- <color red="0.8" green="0.8" blue="0.8"/>
- </rect>
- <rect state="1">
- <bounds x="0" y="1" width="1" height="0.6"/>
- <color red="1.0" green="0.0" blue="0.0"/>
- </rect>
+ <rect state="1">
+ <bounds x="0.95" y="1.6" width="0.05" height="0.4"/>
+ <color red="0.8" green="0.8" blue="0.8"/>
+ </rect>
+ <rect state="1">
+ <bounds x="0" y="1" width="1" height="0.6"/>
+ <color red="1.0" green="0.0" blue="0.0"/>
+ </rect>
- <rect state="2">
- <bounds x="0.95" y="2.6" width="0.05" height="0.4"/>
- <color red="0.8" green="0.8" blue="0.8"/>
- </rect>
- <rect state="2">
- <bounds x="0" y="2" width="1" height="0.6"/>
- <color red="1.0" green="0.0" blue="0.0"/>
- </rect>
+ <rect state="2">
+ <bounds x="0.95" y="2.6" width="0.05" height="0.4"/>
+ <color red="0.8" green="0.8" blue="0.8"/>
+ </rect>
+ <rect state="2">
+ <bounds x="0" y="2" width="1" height="0.6"/>
+ <color red="1.0" green="0.0" blue="0.0"/>
+ </rect>
- <rect state="3">
- <bounds x="0.95" y="3.6" width="0.05" height="0.4"/>
- <color red="0.8" green="0.8" blue="0.8"/>
- </rect>
- <rect state="3">
- <bounds x="0" y="3" width="1" height="0.6"/>
- <color red="1.0" green="0.0" blue="0.0"/>
- </rect>
- </element>
+ <rect state="3">
+ <bounds x="0.95" y="3.6" width="0.05" height="0.4"/>
+ <color red="0.8" green="0.8" blue="0.8"/>
+ </rect>
+ <rect state="3">
+ <bounds x="0" y="3" width="1" height="0.6"/>
+ <color red="1.0" green="0.0" blue="0.0"/>
+ </rect>
+ </element>
- <!-- Right Flag (White) -->
- <element name="right_flag" defstate="0">
- <!-- Top position -->
- <!-- Falgpole -->
- <rect state="3">
- <bounds x="0" y="0.6" width="0.05" height="0.4"/>
- <color red="0.8" green="0.8" blue="0.8"/>
- </rect>
- <!-- Flag -->
- <rect state="3">
- <bounds x="0" y="0" width="1" height="0.6"/>
- <color red="1.0" green="1.0" blue="1.0"/>
- </rect>
+ <!-- Right Flag (White) -->
+ <element name="right_flag" defstate="0">
+ <!-- Top position -->
+ <!-- Falgpole -->
+ <rect state="3">
+ <bounds x="0" y="0.6" width="0.05" height="0.4"/>
+ <color red="0.8" green="0.8" blue="0.8"/>
+ </rect>
+ <!-- Flag -->
+ <rect state="3">
+ <bounds x="0" y="0" width="1" height="0.6"/>
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </rect>
- <rect state="2">
- <bounds x="0" y="1.6" width="0.05" height="0.4"/>
- <color red="0.8" green="0.8" blue="0.8"/>
- </rect>
- <rect state="2">
- <bounds x="0" y="1" width="1" height="0.6"/>
- <color red="1.0" green="1.0" blue="1.0"/>
- </rect>
+ <rect state="2">
+ <bounds x="0" y="1.6" width="0.05" height="0.4"/>
+ <color red="0.8" green="0.8" blue="0.8"/>
+ </rect>
+ <rect state="2">
+ <bounds x="0" y="1" width="1" height="0.6"/>
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </rect>
- <rect state="1">
- <bounds x="0" y="2.6" width="0.05" height="0.4"/>
- <color red="0.8" green="0.8" blue="0.8"/>
- </rect>
- <rect state="1">
- <bounds x="0" y="2" width="1" height="0.6"/>
- <color red="1.0" green="1.0" blue="1.0"/>
- </rect>
+ <rect state="1">
+ <bounds x="0" y="2.6" width="0.05" height="0.4"/>
+ <color red="0.8" green="0.8" blue="0.8"/>
+ </rect>
+ <rect state="1">
+ <bounds x="0" y="2" width="1" height="0.6"/>
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </rect>
- <rect state="0">
- <bounds x="0" y="3.6" width="0.05" height="0.4"/>
- <color red="0.8" green="0.8" blue="0.8"/>
- </rect>
- <rect state="0">
- <bounds x="0" y="3" width="1" height="0.6"/>
- <color red="1.0" green="1.0" blue="1.0"/>
- </rect>
- </element>
+ <rect state="0">
+ <bounds x="0" y="3.6" width="0.05" height="0.4"/>
+ <color red="0.8" green="0.8" blue="0.8"/>
+ </rect>
+ <rect state="0">
+ <bounds x="0" y="3" width="1" height="0.6"/>
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </rect>
+ </element>
- <view name="Mechanical Torso (No Artwork)">
+ <view name="Mechanical Torso (No Artwork)">
- <!-- Screen (Face) -->
- <screen index="0">
- <bounds left="0" top="0" right="3" bottom="4" />
- </screen>
+ <!-- Screen (Face) -->
+ <screen index="0">
+ <bounds left="0" top="0" right="3" bottom="4" />
+ </screen>
- <!-- Left Arm -->
- <bezel name="left" element="left_flag">
- <bounds x="-1.1" y="0" width="1" height="4"/>
- </bezel>
+ <!-- Left Arm -->
+ <bezel name="left" element="left_flag">
+ <bounds x="-1.1" y="0" width="1" height="4"/>
+ </bezel>
- <!-- Right Arm -->
- <bezel name="right" element="right_flag">
- <bounds x="3.1" y="0" width="1" height="4"/>
- </bezel>
+ <!-- Right Arm -->
+ <bezel name="right" element="right_flag">
+ <bounds x="3.1" y="0" width="1" height="4"/>
+ </bezel>
- </view>
+ </view>
</mamelayout>
diff --git a/src/mame/layout/rungun_dual.lay b/src/mame/layout/rungun_dual.lay
index da540d918ce..c2840a9db5a 100644
--- a/src/mame/layout/rungun_dual.lay
+++ b/src/mame/layout/rungun_dual.lay
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<mamelayout version="2">
- <!-- the MAME core has no real concept of demuxing a 60hz output across 2 screens, so this is a little ugly -->
-
+ <!-- the MAME core has no real concept of demuxing a 60hz output across 2 screens, so this is a little ugly -->
+
<view name="Demultiplexed Output">
<screen index="0">
<bounds x="0" y="0" width="4" height="3" />
@@ -11,23 +11,23 @@
</screen>
</view>
-
- <view name="First Screen">
- <screen index="0">
- <bounds x="4.03" y="0" width="4" height="3" />
- </screen>
- </view>
- <view name="Second Screen">
- <!-- if we don't render the first screen then MAME never calls the update function so the data for the 2nd never gets rendered :/ -->
- <screen index="0">
- <bounds x="0" y="0" width="1" height="1" />
- </screen>
+ <view name="First Screen">
+ <screen index="0">
+ <bounds x="4.03" y="0" width="4" height="3" />
+ </screen>
+ </view>
+
+ <view name="Second Screen">
+ <!-- if we don't render the first screen then MAME never calls the update function so the data for the 2nd never gets rendered :/ -->
+ <screen index="0">
+ <bounds x="0" y="0" width="1" height="1" />
+ </screen>
- <screen index="1">
- <bounds x="0" y="0" width="4" height="3" />
- </screen>
- </view>
+ <screen index="1">
+ <bounds x="0" y="0" width="4" height="3" />
+ </screen>
+ </view>
</mamelayout>
diff --git a/src/mame/machine/315-5881_crypt.cpp b/src/mame/machine/315-5881_crypt.cpp
index b73f6a85931..60d5311c7d3 100644
--- a/src/mame/machine/315-5881_crypt.cpp
+++ b/src/mame/machine/315-5881_crypt.cpp
@@ -859,7 +859,7 @@ void sega_315_5881_crypt_device::line_fill()
assert(line_buffer_pos == line_buffer_size);
UINT8 *lp = line_buffer.get();
UINT8 *lc = line_buffer_prev.get();
-
+
line_buffer.swap(line_buffer_prev);
line_buffer_pos = 0;
diff --git a/src/mame/machine/amstrad.cpp b/src/mame/machine/amstrad.cpp
index 9b7d5394e9d..3e89d234271 100644
--- a/src/mame/machine/amstrad.cpp
+++ b/src/mame/machine/amstrad.cpp
@@ -2346,7 +2346,7 @@ control is passed to the default entry in rom 0*/
void amstrad_state::amstrad_reset_machine()
{
m_last_write = 0xff;
-
+
/* enable lower rom (OS rom) */
amstrad_GateArray_write(0x089);
diff --git a/src/mame/machine/fd1094.cpp b/src/mame/machine/fd1094.cpp
index 6fb0f8b866e..9dc3009cd31 100644
--- a/src/mame/machine/fd1094.cpp
+++ b/src/mame/machine/fd1094.cpp
@@ -572,7 +572,6 @@ fd1094_device::fd1094_device(const machine_config &mconfig, const char *tag, dev
memset(m_masked_opcodes_lookup, 0, sizeof(m_masked_opcodes_lookup));
for (auto opcode : s_masked_opcodes)
{
-
m_masked_opcodes_lookup[0][opcode >> 4] |= 1 << ((opcode >> 1) & 7);
m_masked_opcodes_lookup[1][opcode >> 4] |= 1 << ((opcode >> 1) & 7);
}
diff --git a/src/mame/machine/gdrom.cpp b/src/mame/machine/gdrom.cpp
index 1cb04d34739..5aead47aae1 100644
--- a/src/mame/machine/gdrom.cpp
+++ b/src/mame/machine/gdrom.cpp
@@ -37,69 +37,69 @@
static const UINT8 GDROM_Cmd71_Reply[] =
{
- 0x96, 0x0B, 0x45, 0xF0, 0x7E, 0xFF, 0x3D, 0x06, 0x4D, 0x7D, 0x10, 0xBF, 0x07, 0x00, 0x73, 0xCF,
- 0x9C, 0x00, 0xBC, 0x0C, 0x1C, 0xAF, 0x1C, 0x30, 0xE7, 0xA7, 0x03, 0xA8, 0x98, 0x00, 0xBD, 0x0F,
- 0xBD, 0x5B, 0xAA, 0x50, 0x23, 0x39, 0x31, 0x10, 0x0E, 0x69, 0x13, 0xE5, 0x00, 0xD2, 0x0D, 0x66,
- 0x54, 0xBF, 0x5F, 0xFD, 0x37, 0x74, 0xF4, 0x5B, 0x22, 0x00, 0xC6, 0x09, 0x0F, 0xCA, 0x93, 0xE8,
- 0xA4, 0xAB, 0x00, 0x61, 0x0E, 0x2E, 0xE1, 0x4B, 0x76, 0x8B, 0x6A, 0xA5, 0x9C, 0xE6, 0x23, 0xC4,
- 0x00, 0x4B, 0x06, 0x1B, 0x91, 0x01, 0x00, 0xE2, 0x0D, 0xCF, 0xCA, 0x38, 0x3A, 0xB9, 0xE7, 0x91,
- 0xE5, 0xEF, 0x4B, 0x00, 0xD6, 0x09, 0xD3, 0x68, 0x3E, 0xC4, 0xAF, 0x2D, 0x00, 0x2A, 0x0D, 0xF9,
- 0xFC, 0x78, 0xED, 0xAE, 0x99, 0xB3, 0x32, 0x5A, 0xE7, 0x00, 0x4C, 0x0A, 0x22, 0x97, 0x5B, 0x82,
- 0x06, 0x7A, 0x4C, 0x00, 0x42, 0x0E, 0x57, 0x78, 0x46, 0xF5, 0x20, 0xFC, 0x6B, 0xCB, 0x01, 0x5B,
- 0x86, 0x00, 0xE4, 0x0E, 0xB2, 0x26, 0xCD, 0x71, 0xE3, 0xA5, 0x33, 0x06, 0x8E, 0x9A, 0x50, 0x00,
- 0x07, 0x07, 0xF5, 0x34, 0xEF, 0xE6, 0x00, 0x32, 0x0F, 0x13, 0x41, 0x59, 0x56, 0x0F, 0x02, 0x38,
- 0x2A, 0x64, 0x2A, 0x07, 0x3E, 0x00, 0x52, 0x11, 0x2A, 0x1D, 0x5F, 0x76, 0x66, 0xA0, 0xB2, 0x2F,
- 0x97, 0xC7, 0x5E, 0x6E, 0x52, 0xE2, 0x00, 0x58, 0x09, 0xCA, 0x89, 0xA5, 0xDF, 0x0A, 0xDE, 0x00,
- 0x50, 0x06, 0x49, 0xB8, 0xB4, 0x00, 0x77, 0x05, 0x24, 0xE8, 0x00, 0xBB, 0x0C, 0x91, 0x89, 0xA2,
- 0x8B, 0x62, 0xDE, 0x6A, 0xC6, 0x60, 0x00, 0xE7, 0x0F, 0x0F, 0x11, 0x96, 0x55, 0xD2, 0xBF, 0xE6,
- 0x48, 0x0B, 0x5C, 0xAB, 0xDC, 0x00, 0xBA, 0x0A, 0x30, 0xD7, 0x48, 0x0E, 0x78, 0x63, 0x0C, 0x00,
- 0xD2, 0x0D, 0xFB, 0x8A, 0xA3, 0xFE, 0xF8, 0x3A, 0xDD, 0x88, 0xA9, 0x4B, 0x00, 0xA2, 0x0A, 0x75,
- 0x5D, 0x0D, 0x37, 0x24, 0xC5, 0x9D, 0x00, 0xF7, 0x0B, 0x25, 0xEF, 0xDB, 0x41, 0xE0, 0x52, 0x3E,
- 0x4E, 0x00, 0xB7, 0x03, 0x00, 0xE5, 0x11, 0xB9, 0xDE, 0x5A, 0x57, 0xCF, 0xB9, 0x1A, 0xFC, 0x7F,
- 0x26, 0xEE, 0x7B, 0xCD, 0x2B, 0x00, 0x4B, 0x08, 0xB8, 0x09, 0x70, 0x6A, 0x9F, 0x00, 0x4B, 0x11,
- 0x8C, 0x15, 0x87, 0xA3, 0x05, 0x4F, 0x37, 0x8E, 0x63, 0xDE, 0xEF, 0x39, 0xFC, 0x4B, 0x00, 0xAB,
- 0x10, 0x0B, 0x91, 0xAA, 0x0F, 0xE1, 0xE9, 0xAE, 0x69, 0x3A, 0xF8, 0x03, 0x69, 0xD2, 0x00, 0xE2,
- 0x07, 0xC1, 0x5C, 0x3D, 0x82, 0x00, 0xA9, 0x08, 0x68, 0xC4, 0xAD, 0x2E, 0xD1, 0x00, 0xF7, 0x0E,
- 0xC6, 0x47, 0xC8, 0xCD, 0x8E, 0x7C, 0x00, 0x5C, 0x95, 0xB9, 0xF4, 0x00, 0xE3, 0x04, 0x5B, 0x00,
- 0x74, 0x07, 0x65, 0xC7, 0x84, 0x8E, 0x00, 0xC6, 0x07, 0x61, 0x80, 0x44, 0x3F, 0x00, 0xC8, 0x0E,
- 0x72, 0x78, 0x47, 0xD3, 0xC2, 0x4D, 0xAF, 0xC0, 0x54, 0x13, 0x31, 0x00, 0xF7, 0x0D, 0x48, 0xD8,
- 0xE2, 0x92, 0x9F, 0x7F, 0x2F, 0x44, 0x68, 0x33, 0x00, 0x0D, 0x10, 0xAB, 0xFE, 0xEA, 0x8E, 0x19,
- 0x81, 0xF8, 0x6F, 0x7C, 0xDE, 0xE1, 0xB3, 0x06, 0x00, 0x4D, 0x11, 0x66, 0xAE, 0x4C, 0xF9, 0xB7,
- 0x2F, 0xEE, 0xB0, 0x8E, 0x7E, 0xE1, 0x8D, 0x95, 0x6F, 0x00, 0xF4, 0x0D, 0x88, 0x9D, 0xCA, 0xE3,
- 0xC4, 0xB2, 0x47, 0xBB, 0xA0, 0x69, 0x00, 0xF3, 0x0B, 0x48, 0x17, 0x41, 0x64, 0xA0, 0x0E, 0x71,
- 0x82, 0x00, 0x34, 0x1E, 0x18, 0x4D, 0x85, 0x80, 0x4C, 0xA9, 0x0B, 0x66, 0x9B, 0x75, 0x13, 0x61,
- 0x70, 0x27, 0x81, 0x7A, 0x02, 0xCD, 0x57, 0xAB, 0xDF, 0x02, 0x93, 0x52, 0x83, 0xDF, 0x48, 0xA8,
- 0xA6, 0x9E, 0x74, 0x6F, 0x89, 0x03, 0x28, 0x25, 0x52, 0x96, 0xFF, 0x67, 0x7A, 0xD8, 0x3C, 0xB1,
- 0x2C, 0x46, 0x84, 0xEF, 0xE1, 0xC1, 0xC6, 0xC9, 0xDC, 0x96, 0xAA, 0xA9, 0xC4, 0x82, 0x58, 0x27,
- 0x57, 0x75, 0x67, 0x34, 0xFB, 0x3B, 0x25, 0xBF, 0xFB, 0x3B, 0xF6, 0x13, 0xEC, 0x96, 0xE5, 0x16,
- 0x26, 0xFD, 0xA8, 0xDA, 0x1B, 0xC6, 0x50, 0x7F, 0x47, 0xFF, 0x08, 0x55, 0x08, 0xED, 0x00, 0x93,
- 0x9B, 0xC4, 0x71, 0x67, 0xEC, 0xA6, 0xCC, 0x16, 0x20, 0x87, 0x47, 0x07, 0xA6, 0x00, 0x79, 0x5D,
- 0x4F, 0xAB, 0xA1, 0x6F, 0x7A, 0x6B, 0x27, 0xC4, 0xDA, 0xA3, 0xC3, 0x94, 0x4F, 0x7F, 0xF3, 0xE5,
- 0x1B, 0x6F, 0xCC, 0xE5, 0xF0, 0xE5, 0x9D, 0xC9, 0xAE, 0xFD, 0x39, 0xAC, 0x4C, 0xE5, 0x58, 0x83,
- 0x25, 0x65, 0x92, 0x74, 0x9E, 0x81, 0xA0, 0xB6, 0xA9, 0x02, 0x9B, 0x07, 0xB6, 0xE7, 0x79, 0x57,
- 0xD9, 0x4A, 0xCE, 0xFA, 0xB4, 0x94, 0x05, 0xCC, 0x86, 0x3C, 0xDD, 0x06, 0xCD, 0xA6, 0x24, 0x24,
- 0xFA, 0xC1, 0xF9, 0x48, 0xC9, 0x0C, 0x6C, 0xC4, 0x96, 0x82, 0x17, 0xF6, 0x31, 0x09, 0xC4, 0xE2,
- 0x77, 0xFD, 0xCF, 0x46, 0x18, 0xB2, 0x5F, 0x01, 0x6B, 0xD1, 0x7B, 0x56, 0xB8, 0x94, 0x4A, 0xE5,
- 0x6C, 0x19, 0xF0, 0xC0, 0xB6, 0x70, 0x93, 0xF7, 0xD3, 0xD1, 0x2B, 0x6E, 0x7C, 0x53, 0x6D, 0x85,
- 0xD1, 0x0C, 0x8B, 0x77, 0xEE, 0x90, 0xDA, 0x15, 0x55, 0xE0, 0x58, 0x09, 0x56, 0xFC, 0x31, 0x9F,
- 0xAF, 0x46, 0xCB, 0xC3, 0x8D, 0x71, 0x75, 0xF2, 0x2C, 0xC3, 0xBB, 0xA1, 0xC4, 0xCF, 0x27, 0x56,
- 0x7C, 0x9B, 0xFE, 0xAF, 0x3E, 0x4E, 0xB4, 0xCD, 0x6A, 0xAA, 0xF5, 0xF3, 0xE3, 0x22, 0x82, 0xE1,
- 0xA5, 0x68, 0xB3, 0xDB, 0x8F, 0x9E, 0x5E, 0x7B, 0x90, 0xF0, 0x79, 0x3F, 0x52, 0x8C, 0x61, 0x88,
- 0x76, 0xAE, 0x14, 0x63, 0x19, 0x0F, 0x1D, 0xCE, 0xA1, 0x63, 0x10, 0xB2, 0xE2, 0xD7, 0x94, 0xB1,
- 0x33, 0xCB, 0x28, 0x85, 0x7D, 0x9B, 0xF5, 0xF4, 0x25, 0x50, 0x9B, 0xDB, 0x35, 0xA5, 0xB0, 0x9C,
- 0x09, 0x92, 0xE3, 0x31, 0x40, 0xAB, 0x4D, 0xF4, 0x35, 0xE8, 0xB3, 0x0A, 0x21, 0xC3, 0x86, 0x9C,
- 0xCB, 0x29, 0xA4, 0x77, 0x57, 0xBC, 0xD8, 0xDA, 0xA5, 0x82, 0x80, 0xE8, 0xCF, 0x72, 0x81, 0xAD,
- 0x2E, 0x28, 0xFF, 0xD8, 0xB6, 0xD1, 0x2B, 0x97, 0x00, 0xFF, 0xE1, 0x06, 0x44, 0x39, 0x1C, 0x4B,
- 0xAB, 0x19, 0x5B, 0x4D, 0xD6, 0x3E, 0x1B, 0x5C, 0x64, 0xBB, 0x32, 0x68, 0xF5, 0x7C, 0xC9, 0x9E,
- 0xE8, 0xB4, 0x29, 0x1B, 0x7F, 0x4D, 0x80, 0x80, 0x7E, 0x8B, 0x1C, 0x0A, 0xE6, 0x9A, 0xBF, 0x49,
- 0x1E, 0xC5, 0xB6, 0x67, 0x7D, 0x05, 0xE4, 0x90, 0x40, 0x4B, 0xAF, 0x9B, 0x52, 0xDE, 0x17, 0x80,
- 0x81, 0x56, 0xEA, 0x3A, 0x53, 0x82, 0x8C, 0x62, 0xFB, 0x96, 0x97, 0x6F, 0xC1, 0x16, 0x78, 0xD4,
- 0x7B, 0xE7, 0xB9, 0x5A, 0x2A, 0xEB, 0x87, 0x68, 0x33, 0xD3, 0x31, 0x45, 0xFA, 0xFE, 0xF4, 0x1C,
- 0x90, 0x86, 0x73, 0x77, 0xD9, 0xA9, 0xD1, 0x4A, 0x4A, 0xCF, 0xAE, 0x23, 0xDB, 0xF9, 0x09, 0xD8,
- 0x18, 0xDC, 0x6A, 0x0D, 0xE4, 0x19, 0x8C, 0x65, 0xC6, 0x64, 0xC7, 0xDC, 0xA9, 0xE3, 0x91, 0xB1,
- 0x4C, 0xC8, 0xC1, 0x9E, 0x3B, 0x7F, 0xCB, 0xA3, 0xCF, 0xDD, 0xF0, 0x1D, 0x07, 0x6E, 0xDC, 0xCE,
- 0x0D, 0xCD, 0x7E, 0x1E, 0x55, 0x11, 0x8B, 0xDF, 0x3A, 0xAB, 0xB6, 0x3B, 0x6E, 0x52, 0x7F, 0xA7,
- 0x00, 0xD1, 0x33, 0xBE, 0xF2, 0x9B, 0xFC, 0x4A, 0xCF, 0x9D, 0x8F, 0xC6, 0xC4, 0x7B, 0xDA, 0xE7,
+ 0x96, 0x0B, 0x45, 0xF0, 0x7E, 0xFF, 0x3D, 0x06, 0x4D, 0x7D, 0x10, 0xBF, 0x07, 0x00, 0x73, 0xCF,
+ 0x9C, 0x00, 0xBC, 0x0C, 0x1C, 0xAF, 0x1C, 0x30, 0xE7, 0xA7, 0x03, 0xA8, 0x98, 0x00, 0xBD, 0x0F,
+ 0xBD, 0x5B, 0xAA, 0x50, 0x23, 0x39, 0x31, 0x10, 0x0E, 0x69, 0x13, 0xE5, 0x00, 0xD2, 0x0D, 0x66,
+ 0x54, 0xBF, 0x5F, 0xFD, 0x37, 0x74, 0xF4, 0x5B, 0x22, 0x00, 0xC6, 0x09, 0x0F, 0xCA, 0x93, 0xE8,
+ 0xA4, 0xAB, 0x00, 0x61, 0x0E, 0x2E, 0xE1, 0x4B, 0x76, 0x8B, 0x6A, 0xA5, 0x9C, 0xE6, 0x23, 0xC4,
+ 0x00, 0x4B, 0x06, 0x1B, 0x91, 0x01, 0x00, 0xE2, 0x0D, 0xCF, 0xCA, 0x38, 0x3A, 0xB9, 0xE7, 0x91,
+ 0xE5, 0xEF, 0x4B, 0x00, 0xD6, 0x09, 0xD3, 0x68, 0x3E, 0xC4, 0xAF, 0x2D, 0x00, 0x2A, 0x0D, 0xF9,
+ 0xFC, 0x78, 0xED, 0xAE, 0x99, 0xB3, 0x32, 0x5A, 0xE7, 0x00, 0x4C, 0x0A, 0x22, 0x97, 0x5B, 0x82,
+ 0x06, 0x7A, 0x4C, 0x00, 0x42, 0x0E, 0x57, 0x78, 0x46, 0xF5, 0x20, 0xFC, 0x6B, 0xCB, 0x01, 0x5B,
+ 0x86, 0x00, 0xE4, 0x0E, 0xB2, 0x26, 0xCD, 0x71, 0xE3, 0xA5, 0x33, 0x06, 0x8E, 0x9A, 0x50, 0x00,
+ 0x07, 0x07, 0xF5, 0x34, 0xEF, 0xE6, 0x00, 0x32, 0x0F, 0x13, 0x41, 0x59, 0x56, 0x0F, 0x02, 0x38,
+ 0x2A, 0x64, 0x2A, 0x07, 0x3E, 0x00, 0x52, 0x11, 0x2A, 0x1D, 0x5F, 0x76, 0x66, 0xA0, 0xB2, 0x2F,
+ 0x97, 0xC7, 0x5E, 0x6E, 0x52, 0xE2, 0x00, 0x58, 0x09, 0xCA, 0x89, 0xA5, 0xDF, 0x0A, 0xDE, 0x00,
+ 0x50, 0x06, 0x49, 0xB8, 0xB4, 0x00, 0x77, 0x05, 0x24, 0xE8, 0x00, 0xBB, 0x0C, 0x91, 0x89, 0xA2,
+ 0x8B, 0x62, 0xDE, 0x6A, 0xC6, 0x60, 0x00, 0xE7, 0x0F, 0x0F, 0x11, 0x96, 0x55, 0xD2, 0xBF, 0xE6,
+ 0x48, 0x0B, 0x5C, 0xAB, 0xDC, 0x00, 0xBA, 0x0A, 0x30, 0xD7, 0x48, 0x0E, 0x78, 0x63, 0x0C, 0x00,
+ 0xD2, 0x0D, 0xFB, 0x8A, 0xA3, 0xFE, 0xF8, 0x3A, 0xDD, 0x88, 0xA9, 0x4B, 0x00, 0xA2, 0x0A, 0x75,
+ 0x5D, 0x0D, 0x37, 0x24, 0xC5, 0x9D, 0x00, 0xF7, 0x0B, 0x25, 0xEF, 0xDB, 0x41, 0xE0, 0x52, 0x3E,
+ 0x4E, 0x00, 0xB7, 0x03, 0x00, 0xE5, 0x11, 0xB9, 0xDE, 0x5A, 0x57, 0xCF, 0xB9, 0x1A, 0xFC, 0x7F,
+ 0x26, 0xEE, 0x7B, 0xCD, 0x2B, 0x00, 0x4B, 0x08, 0xB8, 0x09, 0x70, 0x6A, 0x9F, 0x00, 0x4B, 0x11,
+ 0x8C, 0x15, 0x87, 0xA3, 0x05, 0x4F, 0x37, 0x8E, 0x63, 0xDE, 0xEF, 0x39, 0xFC, 0x4B, 0x00, 0xAB,
+ 0x10, 0x0B, 0x91, 0xAA, 0x0F, 0xE1, 0xE9, 0xAE, 0x69, 0x3A, 0xF8, 0x03, 0x69, 0xD2, 0x00, 0xE2,
+ 0x07, 0xC1, 0x5C, 0x3D, 0x82, 0x00, 0xA9, 0x08, 0x68, 0xC4, 0xAD, 0x2E, 0xD1, 0x00, 0xF7, 0x0E,
+ 0xC6, 0x47, 0xC8, 0xCD, 0x8E, 0x7C, 0x00, 0x5C, 0x95, 0xB9, 0xF4, 0x00, 0xE3, 0x04, 0x5B, 0x00,
+ 0x74, 0x07, 0x65, 0xC7, 0x84, 0x8E, 0x00, 0xC6, 0x07, 0x61, 0x80, 0x44, 0x3F, 0x00, 0xC8, 0x0E,
+ 0x72, 0x78, 0x47, 0xD3, 0xC2, 0x4D, 0xAF, 0xC0, 0x54, 0x13, 0x31, 0x00, 0xF7, 0x0D, 0x48, 0xD8,
+ 0xE2, 0x92, 0x9F, 0x7F, 0x2F, 0x44, 0x68, 0x33, 0x00, 0x0D, 0x10, 0xAB, 0xFE, 0xEA, 0x8E, 0x19,
+ 0x81, 0xF8, 0x6F, 0x7C, 0xDE, 0xE1, 0xB3, 0x06, 0x00, 0x4D, 0x11, 0x66, 0xAE, 0x4C, 0xF9, 0xB7,
+ 0x2F, 0xEE, 0xB0, 0x8E, 0x7E, 0xE1, 0x8D, 0x95, 0x6F, 0x00, 0xF4, 0x0D, 0x88, 0x9D, 0xCA, 0xE3,
+ 0xC4, 0xB2, 0x47, 0xBB, 0xA0, 0x69, 0x00, 0xF3, 0x0B, 0x48, 0x17, 0x41, 0x64, 0xA0, 0x0E, 0x71,
+ 0x82, 0x00, 0x34, 0x1E, 0x18, 0x4D, 0x85, 0x80, 0x4C, 0xA9, 0x0B, 0x66, 0x9B, 0x75, 0x13, 0x61,
+ 0x70, 0x27, 0x81, 0x7A, 0x02, 0xCD, 0x57, 0xAB, 0xDF, 0x02, 0x93, 0x52, 0x83, 0xDF, 0x48, 0xA8,
+ 0xA6, 0x9E, 0x74, 0x6F, 0x89, 0x03, 0x28, 0x25, 0x52, 0x96, 0xFF, 0x67, 0x7A, 0xD8, 0x3C, 0xB1,
+ 0x2C, 0x46, 0x84, 0xEF, 0xE1, 0xC1, 0xC6, 0xC9, 0xDC, 0x96, 0xAA, 0xA9, 0xC4, 0x82, 0x58, 0x27,
+ 0x57, 0x75, 0x67, 0x34, 0xFB, 0x3B, 0x25, 0xBF, 0xFB, 0x3B, 0xF6, 0x13, 0xEC, 0x96, 0xE5, 0x16,
+ 0x26, 0xFD, 0xA8, 0xDA, 0x1B, 0xC6, 0x50, 0x7F, 0x47, 0xFF, 0x08, 0x55, 0x08, 0xED, 0x00, 0x93,
+ 0x9B, 0xC4, 0x71, 0x67, 0xEC, 0xA6, 0xCC, 0x16, 0x20, 0x87, 0x47, 0x07, 0xA6, 0x00, 0x79, 0x5D,
+ 0x4F, 0xAB, 0xA1, 0x6F, 0x7A, 0x6B, 0x27, 0xC4, 0xDA, 0xA3, 0xC3, 0x94, 0x4F, 0x7F, 0xF3, 0xE5,
+ 0x1B, 0x6F, 0xCC, 0xE5, 0xF0, 0xE5, 0x9D, 0xC9, 0xAE, 0xFD, 0x39, 0xAC, 0x4C, 0xE5, 0x58, 0x83,
+ 0x25, 0x65, 0x92, 0x74, 0x9E, 0x81, 0xA0, 0xB6, 0xA9, 0x02, 0x9B, 0x07, 0xB6, 0xE7, 0x79, 0x57,
+ 0xD9, 0x4A, 0xCE, 0xFA, 0xB4, 0x94, 0x05, 0xCC, 0x86, 0x3C, 0xDD, 0x06, 0xCD, 0xA6, 0x24, 0x24,
+ 0xFA, 0xC1, 0xF9, 0x48, 0xC9, 0x0C, 0x6C, 0xC4, 0x96, 0x82, 0x17, 0xF6, 0x31, 0x09, 0xC4, 0xE2,
+ 0x77, 0xFD, 0xCF, 0x46, 0x18, 0xB2, 0x5F, 0x01, 0x6B, 0xD1, 0x7B, 0x56, 0xB8, 0x94, 0x4A, 0xE5,
+ 0x6C, 0x19, 0xF0, 0xC0, 0xB6, 0x70, 0x93, 0xF7, 0xD3, 0xD1, 0x2B, 0x6E, 0x7C, 0x53, 0x6D, 0x85,
+ 0xD1, 0x0C, 0x8B, 0x77, 0xEE, 0x90, 0xDA, 0x15, 0x55, 0xE0, 0x58, 0x09, 0x56, 0xFC, 0x31, 0x9F,
+ 0xAF, 0x46, 0xCB, 0xC3, 0x8D, 0x71, 0x75, 0xF2, 0x2C, 0xC3, 0xBB, 0xA1, 0xC4, 0xCF, 0x27, 0x56,
+ 0x7C, 0x9B, 0xFE, 0xAF, 0x3E, 0x4E, 0xB4, 0xCD, 0x6A, 0xAA, 0xF5, 0xF3, 0xE3, 0x22, 0x82, 0xE1,
+ 0xA5, 0x68, 0xB3, 0xDB, 0x8F, 0x9E, 0x5E, 0x7B, 0x90, 0xF0, 0x79, 0x3F, 0x52, 0x8C, 0x61, 0x88,
+ 0x76, 0xAE, 0x14, 0x63, 0x19, 0x0F, 0x1D, 0xCE, 0xA1, 0x63, 0x10, 0xB2, 0xE2, 0xD7, 0x94, 0xB1,
+ 0x33, 0xCB, 0x28, 0x85, 0x7D, 0x9B, 0xF5, 0xF4, 0x25, 0x50, 0x9B, 0xDB, 0x35, 0xA5, 0xB0, 0x9C,
+ 0x09, 0x92, 0xE3, 0x31, 0x40, 0xAB, 0x4D, 0xF4, 0x35, 0xE8, 0xB3, 0x0A, 0x21, 0xC3, 0x86, 0x9C,
+ 0xCB, 0x29, 0xA4, 0x77, 0x57, 0xBC, 0xD8, 0xDA, 0xA5, 0x82, 0x80, 0xE8, 0xCF, 0x72, 0x81, 0xAD,
+ 0x2E, 0x28, 0xFF, 0xD8, 0xB6, 0xD1, 0x2B, 0x97, 0x00, 0xFF, 0xE1, 0x06, 0x44, 0x39, 0x1C, 0x4B,
+ 0xAB, 0x19, 0x5B, 0x4D, 0xD6, 0x3E, 0x1B, 0x5C, 0x64, 0xBB, 0x32, 0x68, 0xF5, 0x7C, 0xC9, 0x9E,
+ 0xE8, 0xB4, 0x29, 0x1B, 0x7F, 0x4D, 0x80, 0x80, 0x7E, 0x8B, 0x1C, 0x0A, 0xE6, 0x9A, 0xBF, 0x49,
+ 0x1E, 0xC5, 0xB6, 0x67, 0x7D, 0x05, 0xE4, 0x90, 0x40, 0x4B, 0xAF, 0x9B, 0x52, 0xDE, 0x17, 0x80,
+ 0x81, 0x56, 0xEA, 0x3A, 0x53, 0x82, 0x8C, 0x62, 0xFB, 0x96, 0x97, 0x6F, 0xC1, 0x16, 0x78, 0xD4,
+ 0x7B, 0xE7, 0xB9, 0x5A, 0x2A, 0xEB, 0x87, 0x68, 0x33, 0xD3, 0x31, 0x45, 0xFA, 0xFE, 0xF4, 0x1C,
+ 0x90, 0x86, 0x73, 0x77, 0xD9, 0xA9, 0xD1, 0x4A, 0x4A, 0xCF, 0xAE, 0x23, 0xDB, 0xF9, 0x09, 0xD8,
+ 0x18, 0xDC, 0x6A, 0x0D, 0xE4, 0x19, 0x8C, 0x65, 0xC6, 0x64, 0xC7, 0xDC, 0xA9, 0xE3, 0x91, 0xB1,
+ 0x4C, 0xC8, 0xC1, 0x9E, 0x3B, 0x7F, 0xCB, 0xA3, 0xCF, 0xDD, 0xF0, 0x1D, 0x07, 0x6E, 0xDC, 0xCE,
+ 0x0D, 0xCD, 0x7E, 0x1E, 0x55, 0x11, 0x8B, 0xDF, 0x3A, 0xAB, 0xB6, 0x3B, 0x6E, 0x52, 0x7F, 0xA7,
+ 0x00, 0xD1, 0x33, 0xBE, 0xF2, 0x9B, 0xFC, 0x4A, 0xCF, 0x9D, 0x8F, 0xC6, 0xC4, 0x7B, 0xDA, 0xE7,
0x2A, 0x1C, 0x26, 0x6E
};
diff --git a/src/mame/machine/mac.cpp b/src/mame/machine/mac.cpp
index 2ae0f4ca38d..e62ecd96cc9 100644
--- a/src/mame/machine/mac.cpp
+++ b/src/mame/machine/mac.cpp
@@ -347,7 +347,7 @@ void mac_state::v8_resize()
if (is_rom)
{
mac_install_memory(0x00000000, memory_size-1, memory_size, memory_data, is_rom, "bank1");
-
+
// install catcher in place of ROM that will detect the first access to ROM in its real location
m_maincpu->space(AS_PROGRAM).install_read_handler(0xa00000, 0xafffff, read32_delegate(FUNC(mac_state::rom_switch_r), this), 0xffffffff);
}
@@ -496,7 +496,7 @@ void mac_state::set_memory_overlay(int overlay)
READ32_MEMBER(mac_state::rom_switch_r)
{
- offs_t ROM_size = memregion("bootrom")->bytes();
+ offs_t ROM_size = memregion("bootrom")->bytes();
UINT32 *ROM_data = (UINT32 *)memregion("bootrom")->base();
// disable the overlay
@@ -505,7 +505,7 @@ READ32_MEMBER(mac_state::rom_switch_r)
set_memory_overlay(0);
}
-// printf("rom_switch_r: offset %08x ROM_size -1 = %08x, masked = %08x\n", offset, ROM_size-1, offset & ((ROM_size - 1)>>2));
+// printf("rom_switch_r: offset %08x ROM_size -1 = %08x, masked = %08x\n", offset, ROM_size-1, offset & ((ROM_size - 1)>>2));
return ROM_data[offset & ((ROM_size - 1)>>2)];
}
@@ -1946,7 +1946,7 @@ void mac_state::machine_reset()
if (m_overlay_timeout != (emu_timer *)nullptr)
{
- if ((m_model == MODEL_MAC_LC_III) || (m_model == MODEL_MAC_LC_III_PLUS) || (m_model >= MODEL_MAC_LC_475 && m_model <= MODEL_MAC_LC_580)) // up to 36 MB
+ if ((m_model == MODEL_MAC_LC_III) || (m_model == MODEL_MAC_LC_III_PLUS) || (m_model >= MODEL_MAC_LC_475 && m_model <= MODEL_MAC_LC_580)) // up to 36 MB
{
m_overlay_timeout->adjust(attotime::never);
}
diff --git a/src/mame/machine/naomigd.cpp b/src/mame/machine/naomigd.cpp
index ea7e0d5e24e..14e180c74bf 100644
--- a/src/mame/machine/naomigd.cpp
+++ b/src/mame/machine/naomigd.cpp
@@ -470,7 +470,7 @@ void naomi_gdrom_board::device_start()
UINT32 i = 0;
while (i < 2048 && buffer[i] != 0)
{
- if (buffer[i] == 3 && buffer[i + 8] == 'R' && buffer[i + 9] == 'O' && buffer[i + 10] == 'M') // find ROM dir
+ if (buffer[i] == 3 && buffer[i + 8] == 'R' && buffer[i + 9] == 'O' && buffer[i + 10] == 'M') // find ROM dir
{
UINT32 dir = ((buffer[i + 2] << 0) |
(buffer[i + 3] << 8) |
diff --git a/src/mame/machine/playch10.cpp b/src/mame/machine/playch10.cpp
index 63b5490bae1..f48334c287a 100644
--- a/src/mame/machine/playch10.cpp
+++ b/src/mame/machine/playch10.cpp
@@ -1098,7 +1098,7 @@ DRIVER_INIT_MEMBER(playch10_state,pchboard)
/* common init */
DRIVER_INIT_CALL(playch10);
-
+
m_ppu->set_scanline_callback(ppu2c0x_scanline_delegate(FUNC(playch10_state::gboard_scanline_cb),this));
}
diff --git a/src/mame/machine/scramble.cpp b/src/mame/machine/scramble.cpp
index 80cca7a8016..6f2293f2b90 100644
--- a/src/mame/machine/scramble.cpp
+++ b/src/mame/machine/scramble.cpp
@@ -645,7 +645,7 @@ DRIVER_INIT_MEMBER(scramble_state,harem)
{
UINT8 *ROM = memregion("maincpu")->base() + 0x8000;
size_t size = 0x2000;
-
+
m_harem_decrypted_data = std::make_unique<UINT8[]>(size * 3);
UINT8 *data = m_harem_decrypted_data.get();
m_harem_decrypted_opcodes = std::make_unique<UINT8[]>(size * 3);
diff --git a/src/mame/mess.lst b/src/mame/mess.lst
index d1f1b515a47..b897cb18d8b 100644
--- a/src/mame/mess.lst
+++ b/src/mame/mess.lst
@@ -260,7 +260,7 @@ telngtcs
krvnjvtv
oc2000
mpt05
-h21 // TRQ Video Computer H-21
+h21 // TRQ Video Computer H-21
// Game Park
diff --git a/src/mame/video/aquarium.cpp b/src/mame/video/aquarium.cpp
index a941388269e..273697a291f 100644
--- a/src/mame/video/aquarium.cpp
+++ b/src/mame/video/aquarium.cpp
@@ -105,7 +105,7 @@ UINT32 aquarium_state::screen_update_aquarium(screen_device &screen, bitmap_ind1
m_bak_tilemap->set_scrolly(0, m_scroll[3]);
m_txt_tilemap->set_scrollx(0, m_scroll[4]);
m_txt_tilemap->set_scrolly(0, m_scroll[5]);
-
+
bitmap.fill(0, cliprect); // WDUD logo suggests this
m_temp_sprite_bitmap.fill(0, cliprect);
diff --git a/src/mame/video/cischeat.cpp b/src/mame/video/cischeat.cpp
index 16b1cf073a3..ffe21b504f9 100644
--- a/src/mame/video/cischeat.cpp
+++ b/src/mame/video/cischeat.cpp
@@ -1419,7 +1419,7 @@ if ( machine().input().code_pressed(KEYCODE_Z) || machine().input().code_pressed
#if 0
// captflag
{
- popmessage( "[%04x] [%04x]\nLEDS %04x", m_captflag_motor_command[LEFT], m_captflag_motor_command[RIGHT], m_captflag_leds );
+ popmessage( "[%04x] [%04x]\nLEDS %04x", m_captflag_motor_command[LEFT], m_captflag_motor_command[RIGHT], m_captflag_leds );
m_captflag_motor_command[LEFT] = m_captflag_motor_command[RIGHT] = 0;
}
#endif
diff --git a/src/mame/video/dooyong.cpp b/src/mame/video/dooyong.cpp
index e0886cc9471..51a4c04a427 100644
--- a/src/mame/video/dooyong.cpp
+++ b/src/mame/video/dooyong.cpp
@@ -101,7 +101,7 @@ WRITE8_MEMBER(dooyong_z80_ym2203_state::lastday_ctrl_w)
WRITE8_MEMBER(dooyong_z80_ym2203_state::pollux_ctrl_w)
{
-// printf("pollux_ctrl_w %02x\n", data);
+// printf("pollux_ctrl_w %02x\n", data);
/* bit 0 is flip screen */
flip_screen_set(data & 0x01);
@@ -125,7 +125,7 @@ WRITE8_MEMBER(dooyong_z80_ym2203_state::pollux_ctrl_w)
/* bit 4 is used but unknown - display disable? */
}
-
+
WRITE8_MEMBER(dooyong_z80_state::primella_ctrl_w)
@@ -147,7 +147,7 @@ WRITE8_MEMBER(dooyong_z80_state::primella_ctrl_w)
READ8_MEMBER(dooyong_z80_state::paletteram_flytiger_r)
{
if (m_palette_bank) offset+= 0x800;
-
+
return m_paletteram_flytiger[offset];
}
@@ -155,11 +155,11 @@ READ8_MEMBER(dooyong_z80_state::paletteram_flytiger_r)
WRITE8_MEMBER(dooyong_z80_state::paletteram_flytiger_w)
{
if (m_palette_bank) offset+= 0x800;
-
+
m_paletteram_flytiger[offset] = data;
UINT16 const value = m_paletteram_flytiger[offset & ~1] | (m_paletteram_flytiger[offset | 1] << 8);
m_palette->set_pen_color(offset/2, pal5bit(value >> 10), pal5bit(value >> 5), pal5bit(value >> 0));
-
+
}
WRITE8_MEMBER(dooyong_z80_state::flytiger_ctrl_w)
diff --git a/src/mame/video/galastrm.cpp b/src/mame/video/galastrm.cpp
index 2e5a51502a6..b2841777249 100644
--- a/src/mame/video/galastrm.cpp
+++ b/src/mame/video/galastrm.cpp
@@ -228,7 +228,7 @@ void galastrm_renderer::tc0610_rotate_draw(bitmap_ind16 &srcbitmap, const rectan
{
float x;
float y;
-// float z;
+// float z;
} tmpz[4];
vertex_t vert[4];
@@ -372,19 +372,19 @@ void galastrm_renderer::tc0610_rotate_draw(bitmap_ind16 &srcbitmap, const rectan
}
{
-// polyVert tmpz[4];
+// polyVert tmpz[4];
tmpz[0].x = ((float)(-zx) * zcs) - ((float)(-zy) * zsn);
tmpz[0].y = ((float)(-zx) * zsn) + ((float)(-zy) * zcs);
-// tmpz[0].z = 0.0;
+// tmpz[0].z = 0.0;
tmpz[1].x = ((float)(-zx) * zcs) - ((float)(zy-1) * zsn);
tmpz[1].y = ((float)(-zx) * zsn) + ((float)(zy-1) * zcs);
-// tmpz[1].z = 0.0;
+// tmpz[1].z = 0.0;
tmpz[2].x = ((float)(zx-1) * zcs) - ((float)(zy-1) * zsn);
tmpz[2].y = ((float)(zx-1) * zsn) + ((float)(zy-1) * zcs);
-// tmpz[2].z = 0.0;
+// tmpz[2].z = 0.0;
tmpz[3].x = ((float)(zx-1) * zcs) - ((float)(-zy) * zsn);
tmpz[3].y = ((float)(zx-1) * zsn) + ((float)(-zy) * zcs);
-// tmpz[3].z = 0.0;
+// tmpz[3].z = 0.0;
vert[0].x = tmpz[0].x + (float)(lx / 2);
vert[0].y = tmpz[0].y + (float)(ly / 2);
diff --git a/src/mame/video/gime.h b/src/mame/video/gime.h
index a23565baa0e..b73c64440e7 100644
--- a/src/mame/video/gime.h
+++ b/src/mame/video/gime.h
@@ -270,7 +270,7 @@ private:
UINT32 get_data_mc6847(UINT32 video_position, UINT8 *data, UINT8 *mode);
UINT32 get_data_without_attributes(UINT32 video_position, UINT8 *data, UINT8 *mode);
UINT32 get_data_with_attributes(UINT32 video_position, UINT8 *data, UINT8 *mode);
-
+
// template function for doing video update collection
template<UINT8 xres, get_data_func get_data, bool record_mode>
UINT32 record_scanline_res(int scanline);
diff --git a/src/mame/video/k001604.cpp b/src/mame/video/k001604.cpp
index 94794d23653..6308e9f2736 100644
--- a/src/mame/video/k001604.cpp
+++ b/src/mame/video/k001604.cpp
@@ -24,7 +24,7 @@ k001604_device::k001604_device(const machine_config &mconfig, const char *tag, d
m_layer_size(0),
m_roz_size(0),
m_txt_mem_offset(0),
- m_roz_mem_offset(0),
+ m_roz_mem_offset(0),
m_layer_roz(nullptr),
m_tile_ram(nullptr),
m_char_ram(nullptr),
diff --git a/src/mame/video/k053936.cpp b/src/mame/video/k053936.cpp
index aa1fcdd9929..8e851c14e82 100644
--- a/src/mame/video/k053936.cpp
+++ b/src/mame/video/k053936.cpp
@@ -114,7 +114,7 @@ static void K053936_zoom_draw(int chip,UINT16 *ctrl,UINT16 *linectrl, screen_dev
maxy = ctrl[0x0b] + K053936_offset[chip][1]-2 - 1;
if (maxy > cliprect.max_y)
maxy = cliprect.max_y;
-
+
}
else
{
diff --git a/src/mame/video/k055555.cpp b/src/mame/video/k055555.cpp
index 8db4e9f982c..adebdf0fe10 100644
--- a/src/mame/video/k055555.cpp
+++ b/src/mame/video/k055555.cpp
@@ -100,7 +100,7 @@ WRITE32_MEMBER( k055555_device::K055555_long_w )
regdat = data>>24;
K055555_write_reg(regnum, regdat);
}
-
+
if (ACCESSING_BITS_8_15)
{
regnum = (offset<<1)+1;
diff --git a/src/mame/video/konamigx.cpp b/src/mame/video/konamigx.cpp
index 356947da9db..6bdaa0e015c 100644
--- a/src/mame/video/konamigx.cpp
+++ b/src/mame/video/konamigx.cpp
@@ -158,7 +158,7 @@ K055673_CB_MEMBER(konamigx_state::le2_sprite_callback)
int konamigx_state::K055555GX_decode_vmixcolor(int layer, int *color) // (see p.62 7.2.6 and p.27 3.3)
{
int vcb, shift, pal, vmx, von, pl45, emx;
-
+
vcb = m_vcblk[layer]<<6;
shift = layer<<1;
pal = *color;
@@ -173,10 +173,10 @@ int konamigx_state::K055555GX_decode_vmixcolor(int layer, int *color) // (see p.
pal |= pl45;
emx |= vmx;
pal |= vcb;
-
+
//if (m_gx_le2_textcolour_hack)
- // if (layer==0)
- // pal |= 0x1c0;
+ // if (layer==0)
+ // pal |= 0x1c0;
if (von == 3) emx = -1; // invalidate external mix code if all bits are from internal
*color = pal;
@@ -1052,7 +1052,7 @@ K056832_CB_MEMBER(konamigx_state::alpha_tile_callback)
// Daisu-Kiss stage presentation
// Sexy Parodius level 3b
*code = (m_gx_tilebanks[(d & 0xe000)>>13]<<13) + (d & 0x1fff);
-
+
if (VERBOSE)
popmessage("skipped alpha tile(layer=%d mix=%d)", layer, mixcode);
}
@@ -1437,7 +1437,7 @@ UINT32 konamigx_state::screen_update_konamigx(screen_device &screen, bitmap_rgb3
if (m_gx_specialrozenable == 1)
{
const pen_t *paldata = m_palette->pens();
-
+
// hack, draw the roz tilemap if W is held
if ( machine().input().code_pressed(KEYCODE_W) )
{
diff --git a/src/mame/video/legionna.cpp b/src/mame/video/legionna.cpp
index a939570a75f..4cecc5adb32 100644
--- a/src/mame/video/legionna.cpp
+++ b/src/mame/video/legionna.cpp
@@ -56,7 +56,7 @@ WRITE16_MEMBER(legionna_state::tile_scroll_base_w)
// TODO: specific for Godzilla, needs visible area changes.
if(offset == 7)
m_text_layer->set_scrolldy(0x1ef - data,0x1ef - data);
-
+
printf("%02x %04x\n",offset,data);
}
@@ -516,7 +516,7 @@ UINT32 legionna_state::screen_update_godzilla(screen_device &screen, bitmap_ind1
{
bitmap.fill(0x0200, cliprect);
screen.priority().fill(0, cliprect);
-
+
if (!(m_layer_disable&0x0001)) m_background_layer->draw(screen, bitmap, cliprect, 0,0);
if (!(m_layer_disable&0x0002)) m_midground_layer->draw(screen, bitmap, cliprect, 0,0);
if (!(m_layer_disable&0x0004)) m_foreground_layer->draw(screen, bitmap, cliprect, 0,1);
diff --git a/src/mame/video/megasys1.cpp b/src/mame/video/megasys1.cpp
index 414c38ec08d..1770c490218 100644
--- a/src/mame/video/megasys1.cpp
+++ b/src/mame/video/megasys1.cpp
@@ -266,7 +266,7 @@ VIDEO_START_MEMBER(megasys1_state,megasys1)
m_8x8_scroll_factor[2] = 1; m_16x16_scroll_factor[2] = 4;
if (strcmp(machine().system().name, "soldam") == 0 ||
- strcmp(machine().system().name, "soldamj") == 0)
+ strcmp(machine().system().name, "soldamj") == 0)
{
m_8x8_scroll_factor[1] = 4; m_16x16_scroll_factor[1] = 4;
}
@@ -417,7 +417,7 @@ WRITE16_MEMBER(megasys1_state::megasys1_vregs_A_w)
if(((offset*2) & 0x300) == 0)
m_screen->update_partial(m_screen->vpos());
-
+
switch (offset)
{
case 0x000/2 : m_active_layers = new_data; break;
@@ -596,7 +596,7 @@ WRITE16_MEMBER(megasys1_state::megasys1_vregs_D_w)
00-07 ?
08 fed- ---- ---- ---- ?
---c ---- ---- ---- mosaic sol.
- ---- ba98 ---- ---- mosaic
+ ---- ba98 ---- ---- mosaic
---- ---- 7--- ---- y flip
---- ---- -6-- ---- x flip
---- ---- --45 ---- ?
@@ -658,8 +658,7 @@ void megasys1_state::partial_clear_sprite_bitmap(screen_device &screen, bitmap_i
inline void megasys1_state::draw_16x16_priority_sprite(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect, INT32 code, INT32 color, INT32 sx, INT32 sy, INT32 flipx, INT32 flipy, UINT8 mosaic, UINT8 mosaicsol, INT32 priority)
{
-
-// if (sy >= nScreenHeight || sy < -15 || sx >= nScreenWidth || sx < -15) return;
+// if (sy >= nScreenHeight || sy < -15 || sx >= nScreenWidth || sx < -15) return;
gfx_element *decodegfx = m_gfxdecode->gfx(3);
sy = sy + 16;
@@ -673,13 +672,13 @@ inline void megasys1_state::draw_16x16_priority_sprite(screen_device &screen, bi
for (INT32 y = 0; y < 16; y++, sy++, sx-=16)
{
- // UINT16 *dest = &bitmap.pix16(sy)+ sx;
- // UINT8 *prio = &screen.priority().pix8(sy) + sx;
+ // UINT16 *dest = &bitmap.pix16(sy)+ sx;
+ // UINT8 *prio = &screen.priority().pix8(sy) + sx;
UINT16* dest = &m_sprite_buffer_bitmap.pix16(sy)+ sx;
for (INT32 x = 0; x < 16; x++, sx++)
{
- if (sx < cliprect.min_x || sy < cliprect.min_y || sx > cliprect.max_x || sy > cliprect.max_y) continue;
+ if (sx < cliprect.min_x || sy < cliprect.min_y || sx > cliprect.max_x || sy > cliprect.max_y) continue;
INT32 pxl;
@@ -690,7 +689,6 @@ inline void megasys1_state::draw_16x16_priority_sprite(screen_device &screen, bi
}
if (pxl != 0x0f) {
-
if (!(dest[x] & 0x8000)) {
dest[x] = (pxl+color) | (priority << 14);
@@ -706,7 +704,7 @@ void megasys1_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,co
{
int color,code,sx,sy,flipx,flipy,attr,sprite;
-
+
/* objram: 0x100*4 entries spritedata: 0x80 entries */
diff --git a/src/mame/video/rungun.cpp b/src/mame/video/rungun.cpp
index 607c5d2bc9b..f91da2df5f3 100644
--- a/src/mame/video/rungun.cpp
+++ b/src/mame/video/rungun.cpp
@@ -21,7 +21,7 @@ TILE_GET_INFO_MEMBER(rungun_state::ttl_get_tile_info)
UINT32 base_addr = (FPTR)tilemap.user_data();
UINT8 *lvram = (UINT8 *)m_ttl_vram.get() + base_addr;
int attr, code;
-
+
attr = (lvram[BYTE_XOR_LE(tile_index<<2)] & 0xf0) >> 4;
code = ((lvram[BYTE_XOR_LE(tile_index<<2)] & 0x0f) << 8) | (lvram[BYTE_XOR_LE((tile_index<<2)+2)]);
@@ -60,7 +60,7 @@ TILE_GET_INFO_MEMBER(rungun_state::get_rng_936_tile_info)
{
UINT32 base_addr = (FPTR)tilemap.user_data();
int tileno, colour, flipx;
-
+
tileno = m_psac2_vram[tile_index * 2 + 1 + base_addr] & 0x3fff;
flipx = (m_psac2_vram[tile_index * 2 + 1 + base_addr] & 0xc000) >> 14;
colour = 0x10 + (m_psac2_vram[tile_index * 2 + base_addr] & 0x000f);
@@ -108,7 +108,7 @@ void rungun_state::video_start()
m_936_tilemap[screen_num] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(rungun_state::get_rng_936_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 128, 128);
m_936_tilemap[screen_num]->set_user_data((void *)(FPTR)(screen_num * 0x80000));
m_936_tilemap[screen_num]->set_transparent_pen(0);
-
+
}
m_sprite_colorbase = 0x20;
@@ -123,7 +123,7 @@ UINT32 rungun_state::screen_update_rng(screen_device &screen, bitmap_ind16 &bitm
m_current_display_bank = machine().first_screen()->frame_number() & 1;
if(m_single_screen_mode == true)
m_current_display_bank = 0;
-
+
if(m_video_priority_mode == false)
{
m_k053936->zoom_draw(screen, bitmap, cliprect, m_936_tilemap[m_current_display_bank], 0, 0, 1);
@@ -134,7 +134,7 @@ UINT32 rungun_state::screen_update_rng(screen_device &screen, bitmap_ind16 &bitm
m_k055673->k053247_sprites_draw(bitmap, cliprect);
m_k053936->zoom_draw(screen, bitmap, cliprect, m_936_tilemap[m_current_display_bank], 0, 0, 1);
}
-
+
m_ttl_tilemap[m_current_display_bank]->draw(screen, bitmap, cliprect, 0, 0);
return 0;
@@ -174,5 +174,5 @@ void rungun_state::sprite_dma_trigger(void)
// TODO: size could be programmable somehow.
for(int i=0;i<0x1000;i+=2)
- m_k055673->k053247_word_w(space,i/2,m_banked_ram[(i + src_address) /2],0xffff);
+ m_k055673->k053247_word_w(space,i/2,m_banked_ram[(i + src_address) /2],0xffff);
}
diff --git a/src/mame/video/segaybd.cpp b/src/mame/video/segaybd.cpp
index 2ea2a5c2531..fb649463333 100644
--- a/src/mame/video/segaybd.cpp
+++ b/src/mame/video/segaybd.cpp
@@ -55,7 +55,7 @@ UINT32 segaybd_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
UINT16 *src = &sprites.pix(y);
UINT8 *pri = &screen.priority().pix(y);
-
+
for (int x = rect->min_x; x <= rect->max_x; x++)
{
@@ -67,7 +67,7 @@ UINT32 segaybd_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
// int colpri = ((data[4] & 0xff) << 4) | (((data[1] >> 9) & 0xf) << 12);
// so PPPPppppppppcccc (P = priority p = palette c = colour data)
// for Y board the (((data[1] >> 9) & 0xf) << 12) bit is the part we care about
-
+
// the format of the screen.priority() buffer (populated in rotate_draw) is
// ccc----- Sprite color
diff --git a/src/mame/video/seibu_crtc.h b/src/mame/video/seibu_crtc.h
index dc2b31a219e..37f04e31177 100644
--- a/src/mame/video/seibu_crtc.h
+++ b/src/mame/video/seibu_crtc.h
@@ -28,7 +28,7 @@
#define MCFG_SEIBU_CRTC_REG_1A_CB(_devcb) \
devcb = &seibu_crtc_device::set_reg_1a_callback(*device, DEVCB_##_devcb);
-
+
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
@@ -70,8 +70,8 @@ protected:
private:
devcb_write16 m_layer_en_cb;
devcb_write16 m_layer_scroll_cb;
- devcb_write16 m_reg_1a_cb;
- devcb_write16 m_layer_scroll_base_cb;
+ devcb_write16 m_reg_1a_cb;
+ devcb_write16 m_layer_scroll_base_cb;
const address_space_config m_space_config;
inline UINT16 read_word(offs_t address);
inline void write_word(offs_t address, UINT16 data);
diff --git a/src/mame/video/tc0780fpa.cpp b/src/mame/video/tc0780fpa.cpp
index f8bca1a8d84..c353137db96 100644
--- a/src/mame/video/tc0780fpa.cpp
+++ b/src/mame/video/tc0780fpa.cpp
@@ -7,7 +7,7 @@
#include "tc0780fpa.h"
-#define POLY_FIFO_SIZE 32
+#define POLY_FIFO_SIZE 32
tc0780fpa_renderer::tc0780fpa_renderer(device_t &parent, screen_device &screen, const UINT8 *texture_ram)
@@ -19,7 +19,7 @@ tc0780fpa_renderer::tc0780fpa_renderer(device_t &parent, screen_device &screen,
m_fb[0] = std::make_unique<bitmap_ind16>(width, height);
m_fb[1] = std::make_unique<bitmap_ind16>(width, height);
m_zb = std::make_unique<bitmap_ind16>(width, height);
-
+
m_texture = texture_ram;
m_cliprect = screen.cliprect();
@@ -153,7 +153,7 @@ void tc0780fpa_renderer::render_texture_scan(INT32 scanline, const extent_t &ext
void tc0780fpa_renderer::render(UINT16 *polygon_fifo, int length)
-{
+{
vertex_t vert[4];
int i;
@@ -418,7 +418,7 @@ void tc0780fpa_device::device_start()
m_renderer = std::make_unique<tc0780fpa_renderer>(*this, *m_screen, m_texture.get());
- save_pointer(NAME(m_texture.get()), 0x400000);
+ save_pointer(NAME(m_texture.get()), 0x400000);
save_pointer(NAME(m_poly_fifo.get()), POLY_FIFO_SIZE);
save_item(NAME(m_poly_fifo_ptr));
save_item(NAME(m_tex_address));
@@ -479,16 +479,16 @@ WRITE16_MEMBER(tc0780fpa_device::poly_fifo_w)
{
assert (m_poly_fifo_ptr < POLY_FIFO_SIZE); // never happens
m_poly_fifo[m_poly_fifo_ptr++] = data;
-
+
static const int cmd_length[8] = { 7, 13, -1, 20, 17, -1, 26, -1 };
UINT16 cmd = m_poly_fifo[0] & 0x7;
if (m_poly_fifo_ptr >= cmd_length[cmd])
{
- m_renderer->render(m_poly_fifo.get(), m_poly_fifo_ptr);
+ m_renderer->render(m_poly_fifo.get(), m_poly_fifo_ptr);
m_poly_fifo_ptr = 0;
}
-
+
}
WRITE16_MEMBER(tc0780fpa_device::render_w)
@@ -502,4 +502,4 @@ WRITE16_MEMBER(tc0780fpa_device::render_w)
void tc0780fpa_device::draw(bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_renderer->draw(bitmap, cliprect);
-} \ No newline at end of file
+}
diff --git a/src/mame/video/tc0780fpa.h b/src/mame/video/tc0780fpa.h
index 6562285a65c..40d5955ef9c 100644
--- a/src/mame/video/tc0780fpa.h
+++ b/src/mame/video/tc0780fpa.h
@@ -78,4 +78,4 @@ private:
extern const device_type TC0780FPA;
-#endif \ No newline at end of file
+#endif
diff --git a/src/mame/video/tecmo_mix.cpp b/src/mame/video/tecmo_mix.cpp
index ae56f25bbce..7e1a4414fa5 100644
--- a/src/mame/video/tecmo_mix.cpp
+++ b/src/mame/video/tecmo_mix.cpp
@@ -234,8 +234,8 @@ void tecmo_mix_device::mix_bitmaps(screen_device &screen, bitmap_rgb32 &bitmap,
else
{
dd[x] = paldata[sprpixel + m_spregular_comp];
- //dd[x] = rand();
- // the bad tiles on the wildfang map (shown between levels) are drawn here.. why? looks like they should be transparent?
+ //dd[x] = rand();
+ // the bad tiles on the wildfang map (shown between levels) are drawn here.. why? looks like they should be transparent?
// most wildfang sprites use this and are fine, so what's going wrong?
}
}
diff --git a/src/osd/modules/debugger/debugint.cpp b/src/osd/modules/debugger/debugint.cpp
index 28b6379f70e..6a118bf23ba 100644
--- a/src/osd/modules/debugger/debugint.cpp
+++ b/src/osd/modules/debugger/debugint.cpp
@@ -386,7 +386,7 @@ static void dview_draw_box(DView *dv, int rtype, int x, int y, int w, int h, rgb
static void dview_draw_line(DView *dv, int rtype, int x1, int y1, int x2, int y2, rgb_t col)
{
rectangle r;
-
+
dview_get_rect(dv, rtype, r);
dv->container->add_line(NX(dv, x1 + r.min_x), NY(dv, y1 + r.min_y),
NX(dv, x2 + r.min_x), NY(dv, y2 + r.min_y), UI_LINE_WIDTH, col,
@@ -808,9 +808,9 @@ static void dview_size_allocate(DView *dv)
dv->vsb.visible = (size.y * debug_font_height > r.height() ? 1 : 0);
dview_get_rect(dv, RECT_DVIEW_CLIENT, r);
-// dv->hsb.visible = (size.x * debug_font_width > r.width() ? 1 : 0);
-// dv->vsb.visible = (size.y * debug_font_height > r.height() ? 1 : 0);
-// dview_get_rect(dv, RECT_DVIEW_CLIENT, r);
+// dv->hsb.visible = (size.x * debug_font_width > r.width() ? 1 : 0);
+// dv->vsb.visible = (size.y * debug_font_height > r.height() ? 1 : 0);
+// dview_get_rect(dv, RECT_DVIEW_CLIENT, r);
col.y = (r.height() - 2 * BORDER_YTHICKNESS /*+ debug_font_height - 1*/) / debug_font_height;
col.x = (r.width() - 2 * BORDER_XTHICKNESS /*+ debug_font_width - 1*/) / debug_font_width;
@@ -918,7 +918,7 @@ void debug_internal::init_debugger(running_machine &machine)
debug_font = m_machine->render().font_alloc("Courier New");
else
debug_font = m_machine->render().font_alloc(font_name);
-
+
debug_font_width = 0;
if(font_size < 8)
debug_font_height = 16; // default
@@ -1218,11 +1218,11 @@ static void on_memory_data_format(DView *dv, const ui_menu_event *event)
if(order[x] == format)
idx = x;
}
-
+
if (event->iptkey == IPT_UI_RIGHT)
{
idx++;
- if(idx >= 7)
+ if(idx >= 7)
idx = 0;
memview->set_data_format(order[idx]);
dview_set_state(dv, VIEW_STATE_NEEDS_UPDATE, TRUE);
@@ -1230,7 +1230,7 @@ static void on_memory_data_format(DView *dv, const ui_menu_event *event)
if (event->iptkey == IPT_UI_LEFT)
{
idx--;
- if(idx < 0)
+ if(idx < 0)
idx = 6;
memview->set_data_format(order[idx]);
dview_set_state(dv, VIEW_STATE_NEEDS_UPDATE, TRUE);
@@ -1274,22 +1274,22 @@ static void render_editor(DView_edit *editor)
const char* str = editor->str.c_str();
int str_x = 2 * BORDER_XTHICKNESS;
int start;
-// int editor_width;
-
+// int editor_width;
+
dview_get_rect(dv,RECT_DVIEW_HSB,r);
-// editor_width = debug_font->string_width(debug_font_height, debug_font_aspect, editor->str.c_str());
+// editor_width = debug_font->string_width(debug_font_height, debug_font_aspect, editor->str.c_str());
// figure out which character to start drawing, so that you can always see the end of the string you're typing
start = strlen(str) - (r.width() / (debug_font_width + 2*BORDER_XTHICKNESS));
if(start < 0)
start = 0;
-
+
dview_draw_box(dv,RECT_DVIEW_HSB,0,0,r.width(),r.height(),rgb_t(0xff,0xff,0xff,0xff));
dview_draw_line(dv,RECT_DVIEW_HSB,0,0,r.width(),0,rgb_t(0xff,0xc0,0xc0,0xc0));
dview_draw_line(dv,RECT_DVIEW_HSB,r.width(),0,r.width(),r.height(),rgb_t(0xff,0x60,0x60,0x60));
dview_draw_line(dv,RECT_DVIEW_HSB,r.width(),r.height(),0,r.height(),rgb_t(0xff,0x60,0x60,0x60));
dview_draw_line(dv,RECT_DVIEW_HSB,0,r.height(),0,0,rgb_t(0xff,0xc0,0xc0,0xc0));
-
+
for(int x=start;x<strlen(str);x++)
{
if(str_x < r.width() - debug_font_width)
@@ -1641,7 +1641,7 @@ void debug_internal::wait_for_debugger(device_t &device, bool firststop)
statewin->ofs_x = 350;
statewin->bounds.set(0,150,0,600);
win_count++;
-
+
DView *console = dview_alloc(target, device.machine(), DVT_CONSOLE, VIEW_STATE_FOLLOW_CPU);
dview_set_title(console, "Console");
console->editor.active = TRUE;
diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp
index a37a0c8653b..ac21290ac1a 100644
--- a/src/osd/modules/render/d3d/d3dhlsl.cpp
+++ b/src/osd/modules/render/d3d/d3dhlsl.cpp
@@ -1441,7 +1441,7 @@ int shaders::post_pass(render_target *rt, int source_index, poly_info *poly, int
? rgb_t(0, 0, 0)
: machine->first_screen()->palette()->palette()->entry_color(0);
back_color_rgb = apply_color_convolution(back_color_rgb);
- float back_color[3] = {
+ float back_color[3] = {
static_cast<float>(back_color_rgb.r()) / 255.0f,
static_cast<float>(back_color_rgb.g()) / 255.0f,
static_cast<float>(back_color_rgb.b()) / 255.0f };
diff --git a/src/tools/chdman.cpp b/src/tools/chdman.cpp
index 7d4472b1d61..75da3c76741 100644
--- a/src/tools/chdman.cpp
+++ b/src/tools/chdman.cpp
@@ -775,7 +775,6 @@ static int print_help(const char *argv0, const char *error = nullptr)
printf("Usage:\n");
for (auto & desc : s_commands)
{
-
printf(" %s %s%s\n", argv0, desc.name, desc.description);
}
printf("\nFor help with any command, run:\n");
diff --git a/src/version.cpp b/src/version.cpp
index ce17119e68e..aaa9455e40d 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -8,7 +8,7 @@
***************************************************************************/
-#define BARE_BUILD_VERSION "0.168"
+#define BARE_BUILD_VERSION "0.169"
extern const char bare_build_version[];
extern const char build_version[];