summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2015-10-28 08:06:12 +0100
committerGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2015-10-28 08:06:12 +0100
commit47f56372ee5f2d5eec2793608a5426296857b26a (patch)
tree5cb578501b3dfc70b9af27214d72dd0d881d3bd8
parentf55f3d9624ef703151c81d9d9dae02eb13313076 (diff)
Cleanup and version bumpmame0167
-rw-r--r--hash/a2600.xml108
-rw-r--r--hash/bbc_32016_flop.xml26
-rw-r--r--hash/bbc_z80_flop.xml2
-rw-r--r--hash/bbcb_cass.xml4
-rw-r--r--hash/bbcb_flop.xml2
-rw-r--r--hash/pico.xml4
-rw-r--r--hash/pro128s_flop.xml2
-rw-r--r--hash/sg1000.xml68
-rw-r--r--hash/sms.xml122
-rw-r--r--hash/spectrum_cass.xml94
-rw-r--r--hash/tandy2k.xml22
-rw-r--r--hash/unichamp.xml6
-rw-r--r--src/devices/bus/a2bus/a2themill.c2
-rw-r--r--src/devices/bus/cpc/ddi1.h2
-rw-r--r--src/devices/bus/cpc/doubler.c11
-rw-r--r--src/devices/bus/cpc/doubler.h10
-rw-r--r--src/devices/bus/isa/omti8621.c2
-rw-r--r--src/devices/bus/rs232/pty.c152
-rw-r--r--src/devices/bus/rs232/pty.h58
-rw-r--r--src/devices/bus/rs232/rs232.c2
-rw-r--r--src/devices/bus/tiki100/8088.c2
-rw-r--r--src/devices/bus/tiki100/8088.h2
-rw-r--r--src/devices/bus/tiki100/exp.h4
-rw-r--r--src/devices/bus/tiki100/hdc.c2
-rw-r--r--src/devices/bus/tiki100/hdc.h2
-rw-r--r--src/devices/cpu/mips/mips3.h2
-rw-r--r--src/devices/imagedev/floppy.c34
-rw-r--r--src/devices/imagedev/floppy.h12
-rw-r--r--src/devices/machine/z80scc.c296
-rw-r--r--src/devices/machine/z80scc.h416
-rw-r--r--src/devices/machine/z80sio.c190
-rw-r--r--src/devices/machine/z80sio.h302
-rw-r--r--src/devices/video/poly.h40
-rw-r--r--src/emu/dipty.c70
-rw-r--r--src/emu/dipty.h26
-rw-r--r--src/emu/emuopts.c2
-rw-r--r--src/emu/screen.h2
-rw-r--r--src/emu/ui/info_pty.c30
-rw-r--r--src/emu/ui/mainmenu.c12
-rw-r--r--src/emu/ui/mainmenu.h2
-rw-r--r--src/emu/video/vector.c6
-rw-r--r--src/lib/formats/apollo_dsk.c1
-rw-r--r--src/lib/formats/tzx_cas.c2
-rw-r--r--src/mame/arcade.lst58
-rw-r--r--src/mame/audio/hng64.c2
-rw-r--r--src/mame/drivers/apple2e.c8
-rw-r--r--src/mame/drivers/aristmk5.c41
-rw-r--r--src/mame/drivers/beathead.c2
-rw-r--r--src/mame/drivers/bublbobl.c10
-rw-r--r--src/mame/drivers/by17.c277
-rw-r--r--src/mame/drivers/by35.c176
-rw-r--r--src/mame/drivers/cardline.c2
-rw-r--r--src/mame/drivers/cave.c14
-rw-r--r--src/mame/drivers/chicago.c2
-rw-r--r--src/mame/drivers/cntsteer.c12
-rw-r--r--src/mame/drivers/cubeqst.c2
-rw-r--r--src/mame/drivers/dec0.c10
-rw-r--r--src/mame/drivers/ec184x.c2
-rw-r--r--src/mame/drivers/electron.c12
-rw-r--r--src/mame/drivers/eti660.c2
-rw-r--r--src/mame/drivers/firefox.c2
-rw-r--r--src/mame/drivers/galaxian.c4
-rw-r--r--src/mame/drivers/galaxold.c2
-rw-r--r--src/mame/drivers/gatron.c6
-rw-r--r--src/mame/drivers/i7000.c26
-rw-r--r--src/mame/drivers/imds2.c4
-rw-r--r--src/mame/drivers/konamigq.c4
-rw-r--r--src/mame/drivers/konamim2.c2
-rw-r--r--src/mame/drivers/lindbergh.c4
-rw-r--r--src/mame/drivers/m107.c18
-rw-r--r--src/mame/drivers/m72.c160
-rw-r--r--src/mame/drivers/m92.c18
-rw-r--r--src/mame/drivers/macpci.c2
-rw-r--r--src/mame/drivers/merit.c4
-rw-r--r--src/mame/drivers/micral.c40
-rw-r--r--src/mame/drivers/namcops2.c34
-rw-r--r--src/mame/drivers/namcos11.c2
-rw-r--r--src/mame/drivers/namcos12.c26
-rw-r--r--src/mame/drivers/namcos23.c114
-rw-r--r--src/mame/drivers/nmg5.c2
-rw-r--r--src/mame/drivers/othunder.c6
-rw-r--r--src/mame/drivers/peplus.c6
-rw-r--r--src/mame/drivers/rd100.c38
-rw-r--r--src/mame/drivers/replicator.c918
-rw-r--r--src/mame/drivers/segac2.c2
-rw-r--r--src/mame/drivers/segas24.c2
-rw-r--r--src/mame/drivers/shougi.c8
-rw-r--r--src/mame/drivers/slotcarn.c4
-rw-r--r--src/mame/drivers/subhuntr.c34
-rw-r--r--src/mame/drivers/timeplt.c2
-rw-r--r--src/mame/drivers/unichamp.c98
-rw-r--r--src/mame/drivers/vicdual.c4
-rw-r--r--src/mame/drivers/vpoker.c2
-rw-r--r--src/mame/drivers/wecleman.c2
-rw-r--r--src/mame/includes/hng64.h50
-rw-r--r--src/mame/includes/m107.h2
-rw-r--r--src/mame/includes/m92.h2
-rw-r--r--src/mame/includes/osborne1.h2
-rw-r--r--src/mame/layout/by17.lay54
-rw-r--r--src/mame/layout/by17_matahari.lay226
-rw-r--r--src/mame/layout/by17_pwerplay.lay90
-rw-r--r--src/mame/layout/by35.lay52
-rw-r--r--src/mame/layout/by35_playboy.lay208
-rw-r--r--src/mame/machine/apollo.c2
-rw-r--r--src/mame/machine/electron.c2
-rw-r--r--src/mame/machine/mm1kb.c2
-rw-r--r--src/mame/machine/mm1kb.h4
-rw-r--r--src/mame/machine/psxcd.c153
-rw-r--r--src/mame/mess.lst4
-rw-r--r--src/mame/video/apple2.c2
-rw-r--r--src/mame/video/btoads.c4
-rw-r--r--src/mame/video/cloak.c2
-rw-r--r--src/mame/video/decbac06.h2
-rw-r--r--src/mame/video/dkong.c2
-rw-r--r--src/mame/video/galaxian.c18
-rw-r--r--src/mame/video/gic.c152
-rw-r--r--src/mame/video/gic.h22
-rw-r--r--src/mame/video/gyruss.c2
-rw-r--r--src/mame/video/hng64.c217
-rw-r--r--src/mame/video/hng64_3d.c132
-rw-r--r--src/mame/video/m72.c12
-rw-r--r--src/mame/video/meadows.c2
-rw-r--r--src/mame/video/mikromik.c16
-rw-r--r--src/mame/video/model3.c14
-rw-r--r--src/mame/video/qix.c10
-rw-r--r--src/mame/video/sega16sp.c3
-rw-r--r--src/mame/video/segaic16.c2
-rw-r--r--src/mame/video/spacefb.c4
-rw-r--r--src/mame/video/system1.c12
-rw-r--r--src/mame/video/timeplt.c4
-rw-r--r--src/mame/video/tp84.c2
-rw-r--r--src/osd/modules/render/d3d/d3dhlsl.c6
-rw-r--r--src/osd/osdmini/minifile.c2
-rw-r--r--src/osd/osdnet.c2
-rw-r--r--src/osd/sdl/sdlfile.c18
-rw-r--r--src/osd/sdl/sdlptty_os2.c2
-rw-r--r--src/osd/sdl/sdlptty_unix.c126
-rw-r--r--src/osd/windows/winfile.c2
-rw-r--r--src/version.c2
139 files changed, 3008 insertions, 3029 deletions
diff --git a/hash/a2600.xml b/hash/a2600.xml
index 732a78084d9..d1172e3357a 100644
--- a/hash/a2600.xml
+++ b/hash/a2600.xml
@@ -17941,7 +17941,7 @@ Info from Atariage and Atarimania
</part>
</software>
- <!-- The AtariAge logo looks incorrect, but games function, there are probably other version too, YouTube shows a 2007 version. -->
+ <!-- The AtariAge logo looks incorrect, but games function, there are probably other version too, YouTube shows a 2007 version. -->
<software name="stelstok">
<description>Stella's Stocking 2008</description>
<year>2008</year>
@@ -17955,59 +17955,59 @@ Info from Atariage and Atarimania
</part>
</software>
- <!-- This was released by the author, also available via Atariage, are both versions the same? needs DPC+ emulation -->
- <software name="stayfr2" supported="no">
- <description>Stay Frosty 2 (NTSC)</description>
- <year>2013</year>
- <publisher>Spiceware</publisher>
- <sharedfeat name="compatibility" value="NTSC" />
- <part name="cart" interface="a2600_cart">
- <feature name="slot" value="a26_dpcplus" />
- <dataarea name="rom" size="0x8000">
- <rom name="SF2_20131217_RC8_NTSC.bin" size="0x8000" crc="4eb739ab" sha1="5eceaf8e90bd9a002f4935f082df7b25716dceb0" offset="0" />
- </dataarea>
- </part>
- </software>
-
- <software name="stayfr2d" cloneof="stayfr2" supported="no">
- <description>Stay Frosty 2 (NTSC, demo)</description>
- <year>2013</year>
- <publisher>Spiceware</publisher>
- <sharedfeat name="compatibility" value="NTSC" />
- <part name="cart" interface="a2600_cart">
- <feature name="slot" value="a26_dpcplus" />
- <dataarea name="rom" size="0x8000">
- <rom name="SF2_demo_NTSC.bin" size="0x8000" crc="fd850bd6" sha1="bd8166da7777c66e6bb3ab0c77563193d8289f5f" offset="0" />
- </dataarea>
- </part>
- </software>
-
-
- <software name="stayfr2e" cloneof="stayfr2" supported="no">
- <description>Stay Frosty 2 (PAL)</description>
- <year>2013</year>
- <publisher>Spiceware</publisher>
- <sharedfeat name="compatibility" value="PAL" />
- <part name="cart" interface="a2600_cart">
- <feature name="slot" value="a26_dpcplus" />
- <dataarea name="rom" size="0x8000">
- <rom name="SF2_20131217_RC8_PAL.bin" size="0x8000" crc="7b495dc3" sha1="1625ef74b0a48c2968fad832ab8e2edc8187a53f" offset="0" />
- </dataarea>
- </part>
- </software>
-
- <software name="stayfr2de" cloneof="stayfr2" supported="no">
- <description>Stay Frosty 2 (PAL, demo)</description>
- <year>2013</year>
- <publisher>Spiceware</publisher>
- <sharedfeat name="compatibility" value="PAL" />
- <part name="cart" interface="a2600_cart">
- <feature name="slot" value="a26_dpcplus" />
- <dataarea name="rom" size="0x8000">
- <rom name="SF2_demo_PAL.bin" size="0x8000" crc="b47582f3" sha1="73625429e73f1b354e0cbe6a360d79590032de2b" offset="0" />
- </dataarea>
- </part>
- </software>
+ <!-- This was released by the author, also available via Atariage, are both versions the same? needs DPC+ emulation -->
+ <software name="stayfr2" supported="no">
+ <description>Stay Frosty 2 (NTSC)</description>
+ <year>2013</year>
+ <publisher>Spiceware</publisher>
+ <sharedfeat name="compatibility" value="NTSC" />
+ <part name="cart" interface="a2600_cart">
+ <feature name="slot" value="a26_dpcplus" />
+ <dataarea name="rom" size="0x8000">
+ <rom name="SF2_20131217_RC8_NTSC.bin" size="0x8000" crc="4eb739ab" sha1="5eceaf8e90bd9a002f4935f082df7b25716dceb0" offset="0" />
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="stayfr2d" cloneof="stayfr2" supported="no">
+ <description>Stay Frosty 2 (NTSC, demo)</description>
+ <year>2013</year>
+ <publisher>Spiceware</publisher>
+ <sharedfeat name="compatibility" value="NTSC" />
+ <part name="cart" interface="a2600_cart">
+ <feature name="slot" value="a26_dpcplus" />
+ <dataarea name="rom" size="0x8000">
+ <rom name="SF2_demo_NTSC.bin" size="0x8000" crc="fd850bd6" sha1="bd8166da7777c66e6bb3ab0c77563193d8289f5f" offset="0" />
+ </dataarea>
+ </part>
+ </software>
+
+
+ <software name="stayfr2e" cloneof="stayfr2" supported="no">
+ <description>Stay Frosty 2 (PAL)</description>
+ <year>2013</year>
+ <publisher>Spiceware</publisher>
+ <sharedfeat name="compatibility" value="PAL" />
+ <part name="cart" interface="a2600_cart">
+ <feature name="slot" value="a26_dpcplus" />
+ <dataarea name="rom" size="0x8000">
+ <rom name="SF2_20131217_RC8_PAL.bin" size="0x8000" crc="7b495dc3" sha1="1625ef74b0a48c2968fad832ab8e2edc8187a53f" offset="0" />
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="stayfr2de" cloneof="stayfr2" supported="no">
+ <description>Stay Frosty 2 (PAL, demo)</description>
+ <year>2013</year>
+ <publisher>Spiceware</publisher>
+ <sharedfeat name="compatibility" value="PAL" />
+ <part name="cart" interface="a2600_cart">
+ <feature name="slot" value="a26_dpcplus" />
+ <dataarea name="rom" size="0x8000">
+ <rom name="SF2_demo_PAL.bin" size="0x8000" crc="b47582f3" sha1="73625429e73f1b354e0cbe6a360d79590032de2b" offset="0" />
+ </dataarea>
+ </part>
+ </software>
</softwarelist>
diff --git a/hash/bbc_32016_flop.xml b/hash/bbc_32016_flop.xml
index 52a9f1a1f32..d27f7000be1 100644
--- a/hash/bbc_32016_flop.xml
+++ b/hash/bbc_32016_flop.xml
@@ -22,7 +22,7 @@
</dataarea>
</part>
</software>
-
+
<software name="panos112" supported="no">
<description>2 PanOS System v1.1</description>
<year>1985</year>
@@ -35,7 +35,7 @@
</dataarea>
</part>
</software>
-
+
<software name="panos113" supported="no">
<description>3 FORTRAN 77 (PanOS) v1.1</description>
<year>1985</year>
@@ -48,7 +48,7 @@
</dataarea>
</part>
</software>
-
+
<software name="panos114" supported="no">
<description>4 ISO PASCAL (PanOS) v1.1</description>
<year>1985</year>
@@ -61,7 +61,7 @@
</dataarea>
</part>
</software>
-
+
<software name="panos115" supported="no">
<description>5 C (PanOS) v1.1</description>
<year>1985</year>
@@ -74,7 +74,7 @@
</dataarea>
</part>
</software>
-
+
<software name="panos116" supported="no">
<description>6 Cambridge LISP (PanOS) v1.1</description>
<year>1985</year>
@@ -87,7 +87,7 @@
</dataarea>
</part>
</software>
-
+
<software name="panos117" supported="no">
<description>7 Welcome Programs v1.1</description>
<year>1985</year>
@@ -100,7 +100,7 @@
</dataarea>
</part>
</software>
-
+
<software name="panos141" supported="no">
<description>1 PanOS Startup and Utilities v1.4</description>
<year>1985</year>
@@ -113,7 +113,7 @@
</dataarea>
</part>
</software>
-
+
<software name="panos142" supported="no">
<description>2 PanOS System v1.4</description>
<year>1985</year>
@@ -126,7 +126,7 @@
</dataarea>
</part>
</software>
-
+
<software name="panos143" supported="no">
<description>3 FORTRAN 77 (PanOS) v1.4</description>
<year>1985</year>
@@ -139,7 +139,7 @@
</dataarea>
</part>
</software>
-
+
<software name="panos144" supported="no">
<description>4 ISO PASCAL (PanOS) v1.4</description>
<year>1985</year>
@@ -152,7 +152,7 @@
</dataarea>
</part>
</software>
-
+
<software name="panos145" supported="no">
<description>5 C (PanOS) v1.4</description>
<year>1985</year>
@@ -165,7 +165,7 @@
</dataarea>
</part>
</software>
-
+
<software name="panos146" supported="no">
<description>6 Cambridge LISP (PanOS) v1.4</description>
<year>1985</year>
@@ -178,7 +178,7 @@
</dataarea>
</part>
</software>
-
+
<software name="panos147" supported="no">
<description>7 Welcome Programs v1.4</description>
<year>1985</year>
diff --git a/hash/bbc_z80_flop.xml b/hash/bbc_z80_flop.xml
index 394d349c7f7..6cff60c7cd5 100644
--- a/hash/bbc_z80_flop.xml
+++ b/hash/bbc_z80_flop.xml
@@ -37,7 +37,7 @@
</dataarea>
</part>
</software>
-
+
<software name="cpmsys3" supported="no">
<description>Acorn CP/M System Disc 3</description>
<year>1984</year>
diff --git a/hash/bbcb_cass.xml b/hash/bbcb_cass.xml
index cf61809809a..06782a2d500 100644
--- a/hash/bbcb_cass.xml
+++ b/hash/bbcb_cass.xml
@@ -1941,7 +1941,7 @@
</dataarea>
</part>
</software>
-
+
<software name="carwarsp">
<description>Car Wars/Planet of the Aliens</description>
<year>1982</year>
@@ -5228,7 +5228,7 @@
</dataarea>
</part>
</software>
-
+
<software name="golddigg">
<description>Gold Digger</description>
<year>1984</year>
diff --git a/hash/bbcb_flop.xml b/hash/bbcb_flop.xml
index f34d20a7001..295a030428b 100644
--- a/hash/bbcb_flop.xml
+++ b/hash/bbcb_flop.xml
@@ -36,7 +36,7 @@
</dataarea>
</part>
</software>
-
+
<software name="elite">
<description>Elite</description>
<year>1984</year>
diff --git a/hash/pico.xml b/hash/pico.xml
index d4e8fe0078b..94265c61fa6 100644
--- a/hash/pico.xml
+++ b/hash/pico.xml
@@ -3823,8 +3823,8 @@ But how do later protos fit with this theory? Maybe the later protos were from t
<dataarea name="rom" size="524288">
<rom name="mpr-18458-t.ic1" size="524288" crc="6340c18a" sha1="101d5652ffd704788f1f44b671be843e3430e58a" offset="000000" loadflag="load16_word_swap" />
</dataarea>
- <!-- this is a 22 track companion audio CD (to be played on standalone CD player while operating the game?) -->
- <!-- dumping software / drive: BurnAtOnce 0.99.5 / TS-L633R -->
+ <!-- this is a 22 track companion audio CD (to be played on standalone CD player while operating the game?) -->
+ <!-- dumping software / drive: BurnAtOnce 0.99.5 / TS-L633R -->
<diskarea name="cdrom">
<disk name="sanouk5cd" sha1="c9330bbf118405c02347bd83a1cc24ab2bb4310d"/>
</diskarea>
diff --git a/hash/pro128s_flop.xml b/hash/pro128s_flop.xml
index 0de8cee38a6..b40068439bd 100644
--- a/hash/pro128s_flop.xml
+++ b/hash/pro128s_flop.xml
@@ -403,5 +403,5 @@
</dataarea>
</part>
</software>
-
+
</softwarelist>
diff --git a/hash/sg1000.xml b/hash/sg1000.xml
index 8f2aecaa907..6739ebb5c80 100644
--- a/hash/sg1000.xml
+++ b/hash/sg1000.xml
@@ -1296,18 +1296,18 @@ A135 : 森林歷險記 / Sēnlín lìxiǎn jì -> Pitfall II (same as R-049 by A
</part>
</software>
- <software name="herotw" cloneof="hero"> <!-- English logo version -->
- <description>H.E.R.O. (Tw)</description>
- <year>1985</year>
- <publisher>Aaronix</publisher>
- <part name="cart" interface="sg1000_cart">
- <dataarea name="rom" size="32768">
- <rom name="H.E.R.O. [english logo] (TW).sg" size="32768" crc="96f09c6d" sha1="82b530feef7c011361e21b62d2c359c626ab8a9c" offset="000000" />
- </dataarea>
- </part>
- </software>
-
- <software name="homemj">
+ <software name="herotw" cloneof="hero"> <!-- English logo version -->
+ <description>H.E.R.O. (Tw)</description>
+ <year>1985</year>
+ <publisher>Aaronix</publisher>
+ <part name="cart" interface="sg1000_cart">
+ <dataarea name="rom" size="32768">
+ <rom name="H.E.R.O. [english logo] (TW).sg" size="32768" crc="96f09c6d" sha1="82b530feef7c011361e21b62d2c359c626ab8a9c" offset="000000" />
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="homemj">
<description>Home Mahjong (Jpn, v1)</description>
<year>1984</year>
<publisher>Sega</publisher>
@@ -1358,18 +1358,18 @@ A135 : 森林歷險記 / Sēnlín lìxiǎn jì -> Pitfall II (same as R-049 by A
</part>
</software>
- <software name="hustletw" cloneof="hustle">
- <description>Hustle Chumy / Wanpi shu (Tw)</description>
- <year>1984</year>
- <publisher>Aaronix</publisher>
- <part name="cart" interface="sg1000_cart">
- <dataarea name="rom" size="16384">
- <rom name="Hustle Chumy (TW).sg" size="16384" crc="c4ed1fd9" sha1="e7800d107ef0a7773eea2d482b5db9d866ba74f9" offset="000000" />
- </dataarea>
- </part>
- </software>
+ <software name="hustletw" cloneof="hustle">
+ <description>Hustle Chumy / Wanpi shu (Tw)</description>
+ <year>1984</year>
+ <publisher>Aaronix</publisher>
+ <part name="cart" interface="sg1000_cart">
+ <dataarea name="rom" size="16384">
+ <rom name="Hustle Chumy (TW).sg" size="16384" crc="c4ed1fd9" sha1="e7800d107ef0a7773eea2d482b5db9d866ba74f9" offset="000000" />
+ </dataarea>
+ </part>
+ </software>
- <software name="hyperspt">
+ <software name="hyperspt">
<description>Hyper Sports (Jpn)</description>
<year>1985</year>
<publisher>Sega / Konami</publisher>
@@ -2101,18 +2101,18 @@ A135 : 森林歷險記 / Sēnlín lìxiǎn jì -> Pitfall II (same as R-049 by A
</part>
</software>
- <software name="rocknboltw" cloneof="rocknbol"> <!-- English logo version -->
- <description>Rock n' Bolt (Tw)</description>
- <year>1985</year>
- <publisher>Aaronix</publisher>
- <part name="cart" interface="sg1000_cart">
- <dataarea name="rom" size="32768">
- <rom name="Rock n' Bolt [english logo] (TW).sg" size="32768" crc="09a82af7" sha1="e3be08bda8459fc60836abe332e9864e7c596202" offset="000000" />
- </dataarea>
- </part>
- </software>
+ <software name="rocknboltw" cloneof="rocknbol"> <!-- English logo version -->
+ <description>Rock n' Bolt (Tw)</description>
+ <year>1985</year>
+ <publisher>Aaronix</publisher>
+ <part name="cart" interface="sg1000_cart">
+ <dataarea name="rom" size="32768">
+ <rom name="Rock n' Bolt [english logo] (TW).sg" size="32768" crc="09a82af7" sha1="e3be08bda8459fc60836abe332e9864e7c596202" offset="000000" />
+ </dataarea>
+ </part>
+ </software>
- <software name="safarihu" supported="no">
+ <software name="safarihu" supported="no">
<description>Safari Hunting (Jpn)</description>
<year>1983</year>
<publisher>Sega</publisher>
diff --git a/hash/sms.xml b/hash/sms.xml
index 8ca17a6c605..abff52326d7 100644
--- a/hash/sms.xml
+++ b/hash/sms.xml
@@ -120,19 +120,19 @@
</part>
</software>
- <software name="actionfgtw" cloneof="actionfg">
- <description>Action Fighter / Mo zhan che (Taiwan)</description>
- <year>1986</year>
- <publisher>&lt;unknown&gt;</publisher>
- <part name="cart" interface="sms_cart">
- <dataarea name="rom" size="131072">
- <rom name="Action Fighter (TW).sms" size="131072" crc="8418f438" sha1="4f514dc568466f6b0424086edeb3fa0014f9c887" offset="000000" />
- </dataarea>
- </part>
- </software>
-
-
- <software name="addfam">
+ <software name="actionfgtw" cloneof="actionfg">
+ <description>Action Fighter / Mo zhan che (Taiwan)</description>
+ <year>1986</year>
+ <publisher>&lt;unknown&gt;</publisher>
+ <part name="cart" interface="sms_cart">
+ <dataarea name="rom" size="131072">
+ <rom name="Action Fighter (TW).sms" size="131072" crc="8418f438" sha1="4f514dc568466f6b0424086edeb3fa0014f9c887" offset="000000" />
+ </dataarea>
+ </part>
+ </software>
+
+
+ <software name="addfam">
<description>The Addams Family (Euro)</description>
<year>1993</year>
<publisher>Flying Edge</publisher>
@@ -2103,43 +2103,43 @@
</part>
</software>
- <software name="eswatp0" cloneof="eswatc"> <!-- early build, alt subtitle -->
- <description>E-SWAT - The Ultimate Battle In The Factor Against Crime (prototype 0)</description>
- <year>1990</year>
- <publisher>Sega</publisher>
- <info name="serial" value="7042"/>
- <part name="cart" interface="sms_cart">
- <dataarea name="rom" size="262144">
- <rom name="E-SWAT [Proto 0].sms" size="262144" crc="4f20694a" sha1="855c2f54b700663cedd6484aab396d849dcb5290" offset="000000" />
- </dataarea>
- </part>
- </software>
-
- <software name="eswatp1" cloneof="eswatc">
- <description>E-SWAT - City Under Siege (prototype 1)</description>
- <year>1990</year>
- <publisher>Sega</publisher>
- <info name="serial" value="7042"/>
- <part name="cart" interface="sms_cart">
- <dataarea name="rom" size="262144">
- <rom name="E-SWAT [Proto 1].sms" size="262144" crc="f7ca9801" sha1="12c5005f8a0d78c75704b61bf87961875b9d29d4" offset="000000" />
- </dataarea>
- </part>
- </software>
-
- <software name="eswatp2" cloneof="eswatc">
- <description>E-SWAT - City Under Siege (prototype 2)</description>
- <year>1990</year>
- <publisher>Sega</publisher>
- <info name="serial" value="7042"/>
- <part name="cart" interface="sms_cart">
- <dataarea name="rom" size="262144">
- <rom name="E-SWAT [Proto 2].sms" size="262144" crc="fd91cc7e" sha1="63fa1fcbf941b0e0ce601b3094c6c31f997c95d8" offset="000000" />
- </dataarea>
- </part>
- </software>
-
- <software name="excdizzy" supported="no">
+ <software name="eswatp0" cloneof="eswatc"> <!-- early build, alt subtitle -->
+ <description>E-SWAT - The Ultimate Battle In The Factor Against Crime (prototype 0)</description>
+ <year>1990</year>
+ <publisher>Sega</publisher>
+ <info name="serial" value="7042"/>
+ <part name="cart" interface="sms_cart">
+ <dataarea name="rom" size="262144">
+ <rom name="E-SWAT [Proto 0].sms" size="262144" crc="4f20694a" sha1="855c2f54b700663cedd6484aab396d849dcb5290" offset="000000" />
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="eswatp1" cloneof="eswatc">
+ <description>E-SWAT - City Under Siege (prototype 1)</description>
+ <year>1990</year>
+ <publisher>Sega</publisher>
+ <info name="serial" value="7042"/>
+ <part name="cart" interface="sms_cart">
+ <dataarea name="rom" size="262144">
+ <rom name="E-SWAT [Proto 1].sms" size="262144" crc="f7ca9801" sha1="12c5005f8a0d78c75704b61bf87961875b9d29d4" offset="000000" />
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="eswatp2" cloneof="eswatc">
+ <description>E-SWAT - City Under Siege (prototype 2)</description>
+ <year>1990</year>
+ <publisher>Sega</publisher>
+ <info name="serial" value="7042"/>
+ <part name="cart" interface="sms_cart">
+ <dataarea name="rom" size="262144">
+ <rom name="E-SWAT [Proto 2].sms" size="262144" crc="fd91cc7e" sha1="63fa1fcbf941b0e0ce601b3094c6c31f997c95d8" offset="000000" />
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="excdizzy" supported="no">
<description>The Excellent Dizzy Collection (Euro, USA, Prototype)</description>
<year>19??</year>
<publisher>Codemasters</publisher>
@@ -5729,18 +5729,18 @@
</part>
</software>
- <software name="supcol">
- <description>Super Columns &amp; Tetris (Kor)</description>
- <year>1990</year>
- <publisher>Hi-Com</publisher>
- <part name="cart" interface="sms_cart">
- <dataarea name="rom" size="262144">
- <rom name="Super Columns (KR).sms" size="32768" crc="6ce7f694" sha1="9d696b6eda1d13b8d439509beeb64210987e308e" offset="000000" />
- </dataarea>
- </part>
- </software>
+ <software name="supcol">
+ <description>Super Columns &amp; Tetris (Kor)</description>
+ <year>1990</year>
+ <publisher>Hi-Com</publisher>
+ <part name="cart" interface="sms_cart">
+ <dataarea name="rom" size="262144">
+ <rom name="Super Columns (KR).sms" size="32768" crc="6ce7f694" sha1="9d696b6eda1d13b8d439509beeb64210987e308e" offset="000000" />
+ </dataarea>
+ </part>
+ </software>
- <software name="smgp">
+ <software name="smgp">
<description>Super Monaco GP (Euro, Bra)</description>
<year>1990</year>
<publisher>Sega</publisher>
diff --git a/hash/spectrum_cass.xml b/hash/spectrum_cass.xml
index f29457fc8c8..b014e22aee9 100644
--- a/hash/spectrum_cass.xml
+++ b/hash/spectrum_cass.xml
@@ -709,7 +709,7 @@
</part>
</software>
- <!-- Homebrew released at http://spectralinterlude.com/#download for use on real systems & emulators -->
+ <!-- Homebrew released at http://spectralinterlude.com/#download for use on real systems & emulators -->
<software name="castlvsi">
<description>Castlevania - Spectral Interlude (v1.1, English, 128K)</description>
<year>2015</year>
@@ -798,52 +798,52 @@
</part>
</software>
- <!-- V1.0 doesn't exist in Spanish? or Italian (translations were made after the 1.1 release) -->
-
- <!-- what are these? were there unannounced updates at some point? check data, remove if just duplicate -->
- <software name="castlvsia" cloneof="castlvsi">
- <description>Castlevania - Spectral Interlude (alt, English, 128K)</description>
- <year>2015</year>
- <publisher>Rewind</publisher>
- <part name="cass" interface="spectrum_cass">
- <dataarea name="cass" size="126416">
- <rom name="castlevania_si_en.tap" size="126416" crc="c7fb2adf" sha1="22fdb537a3e4b3ed05aac82f34103212c179db4a" offset="0"/>
- </dataarea>
- </part>
- </software>
-
- <software name="castlvsirua" cloneof="castlvsi">
- <description>Castlevania - Spectral Interlude (alt, Russian, 128K)</description>
- <year>2015</year>
- <publisher>Rewind</publisher>
- <part name="cass" interface="spectrum_cass">
- <dataarea name="cass" size="127075">
- <rom name="castlevania_si_ru.tap" size="127075" crc="e4e9bd2a" sha1="8bae5e5d2e310335f3aba96b2a0ed6c5c447eb18" offset="0"/>
- </dataarea>
- </part>
- </software>
-
- <software name="castlvsipla" cloneof="castlvsi">
- <description>Castlevania - Spectral Interlude (alt, Polish, 128K)</description>
- <year>2015</year>
- <publisher>Rewind</publisher>
- <part name="cass" interface="spectrum_cass">
- <dataarea name="cass" size="127413">
- <rom name="castlevania_si_pl.tap" size="127413" crc="98e2c6a6" sha1="6eb777aa7c0c057cf04f3162e7e80f6c4286e406" offset="0"/>
- </dataarea>
- </part>
- </software>
-
- <software name="castlvsiesa" cloneof="castlvsi">
- <description>Castlevania - Spectral Interlude (alt, Spanish, 128K)</description>
- <year>2015</year>
- <publisher>Rewind</publisher>
- <part name="cass" interface="spectrum_cass">
- <dataarea name="cass" size="126973">
- <rom name="castlevania_si_es.tap" size="126973" crc="4479be59" sha1="c5c816d4b02526c37ea44cbac8d1836ca03fd2fe" offset="0"/>
- </dataarea>
- </part>
- </software>
+ <!-- V1.0 doesn't exist in Spanish? or Italian (translations were made after the 1.1 release) -->
+
+ <!-- what are these? were there unannounced updates at some point? check data, remove if just duplicate -->
+ <software name="castlvsia" cloneof="castlvsi">
+ <description>Castlevania - Spectral Interlude (alt, English, 128K)</description>
+ <year>2015</year>
+ <publisher>Rewind</publisher>
+ <part name="cass" interface="spectrum_cass">
+ <dataarea name="cass" size="126416">
+ <rom name="castlevania_si_en.tap" size="126416" crc="c7fb2adf" sha1="22fdb537a3e4b3ed05aac82f34103212c179db4a" offset="0"/>
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="castlvsirua" cloneof="castlvsi">
+ <description>Castlevania - Spectral Interlude (alt, Russian, 128K)</description>
+ <year>2015</year>
+ <publisher>Rewind</publisher>
+ <part name="cass" interface="spectrum_cass">
+ <dataarea name="cass" size="127075">
+ <rom name="castlevania_si_ru.tap" size="127075" crc="e4e9bd2a" sha1="8bae5e5d2e310335f3aba96b2a0ed6c5c447eb18" offset="0"/>
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="castlvsipla" cloneof="castlvsi">
+ <description>Castlevania - Spectral Interlude (alt, Polish, 128K)</description>
+ <year>2015</year>
+ <publisher>Rewind</publisher>
+ <part name="cass" interface="spectrum_cass">
+ <dataarea name="cass" size="127413">
+ <rom name="castlevania_si_pl.tap" size="127413" crc="98e2c6a6" sha1="6eb777aa7c0c057cf04f3162e7e80f6c4286e406" offset="0"/>
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="castlvsiesa" cloneof="castlvsi">
+ <description>Castlevania - Spectral Interlude (alt, Spanish, 128K)</description>
+ <year>2015</year>
+ <publisher>Rewind</publisher>
+ <part name="cass" interface="spectrum_cass">
+ <dataarea name="cass" size="126973">
+ <rom name="castlevania_si_es.tap" size="126973" crc="4479be59" sha1="c5c816d4b02526c37ea44cbac8d1836ca03fd2fe" offset="0"/>
+ </dataarea>
+ </part>
+ </software>
</softwarelist>
diff --git a/hash/tandy2k.xml b/hash/tandy2k.xml
index 1ded2114927..902ff8966ea 100644
--- a/hash/tandy2k.xml
+++ b/hash/tandy2k.xml
@@ -15,17 +15,17 @@
<year>1983</year>
<publisher>Lotus</publisher>
-<!-- <part name="flop1" interface="floppy_5_25">
- <dataarea name="flop" size="331572">
- <rom name="123-sys.td0" size="331572" crc="a7cacc1e" sha1="8720bb7614821403c269012adea81f6cb6d84f7d" offset="0"/>
- </dataarea>
- </part>
-
- <part name="flop2" interface="floppy_5_25">
- <dataarea name="flop" size="533442">
- <rom name="123_sys.td0" size="533442" crc="cc6845f9" sha1="a819783b18c35f7ad2531c108acfa0acdf3225bf" offset="0"/>
- </dataarea>
- </part> -->
+<!-- <part name="flop1" interface="floppy_5_25">
+ <dataarea name="flop" size="331572">
+ <rom name="123-sys.td0" size="331572" crc="a7cacc1e" sha1="8720bb7614821403c269012adea81f6cb6d84f7d" offset="0"/>
+ </dataarea>
+ </part>
+
+ <part name="flop2" interface="floppy_5_25">
+ <dataarea name="flop" size="533442">
+ <rom name="123_sys.td0" size="533442" crc="cc6845f9" sha1="a819783b18c35f7ad2531c108acfa0acdf3225bf" offset="0"/>
+ </dataarea>
+ </part> -->
<!-- repaired copy protected by hand -->
<part name="flop1" interface="floppy_5_25">
<dataarea name="flop" size="331572">
diff --git a/hash/unichamp.xml b/hash/unichamp.xml
index 2d128200a84..c4aae48a0db 100644
--- a/hash/unichamp.xml
+++ b/hash/unichamp.xml
@@ -37,7 +37,7 @@
<rom name="pac-04.bin" size="0x1000" crc="cac09841" sha1="bc9db83f26ed0810938156db6b104b4576754225" offset="0x0000"/>
</dataarea>
</part>
- </software>
+ </software>
<software name="pac-05">
<description>Math</description>
@@ -49,6 +49,6 @@
<rom name="pac-05.bin" size="0x1000" crc="d54a6090" sha1="e85593096f43dcf14b08fd2c9fda277008a8df8b" offset="0x0000"/>
</dataarea>
</part>
- </software>
-
+ </software>
+
</softwarelist>
diff --git a/src/devices/bus/a2bus/a2themill.c b/src/devices/bus/a2bus/a2themill.c
index 8f6fc5d1cc0..34b2cac13c1 100644
--- a/src/devices/bus/a2bus/a2themill.c
+++ b/src/devices/bus/a2bus/a2themill.c
@@ -255,7 +255,7 @@ READ8_MEMBER( a2bus_themill_device::dma_r )
{
return slot_dma_read(space, (offset&0xfff) + 0xc000);
}
- else if (offset <= 0xcfff) // 6809 Cxxx -> 6502 ZP
+ else if (offset <= 0xcfff) // 6809 Cxxx -> 6502 ZP
{
return slot_dma_read(space, (offset&0xfff));
}
diff --git a/src/devices/bus/cpc/ddi1.h b/src/devices/bus/cpc/ddi1.h
index 404bc76120c..9d36783d9b4 100644
--- a/src/devices/bus/cpc/ddi1.h
+++ b/src/devices/bus/cpc/ddi1.h
@@ -42,7 +42,7 @@ private:
required_device<upd765_family_device> m_fdc;
required_device<floppy_connector> m_connector;
-
+
bool m_rom_active;
bool m_romen;
};
diff --git a/src/devices/bus/cpc/doubler.c b/src/devices/bus/cpc/doubler.c
index 50bdf437a5d..2c753d3565e 100644
--- a/src/devices/bus/cpc/doubler.c
+++ b/src/devices/bus/cpc/doubler.c
@@ -1,15 +1,15 @@
// license:BSD-3-Clause
// copyright-holders:Barry Rodewald
/*
- * doubler.c -- Draysoft Doubler - external cassette interface for the 464 (works on 664/6128 with external cassette?),
+ * doubler.c -- Draysoft Doubler - external cassette interface for the 464 (works on 664/6128 with external cassette?),
* intended for use in duplicating cassette software
*
*/
-
- #include "doubler.h"
- #include "includes/amstrad.h"
- //**************************************************************************
+ #include "doubler.h"
+ #include "includes/amstrad.h"
+
+ //**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
@@ -72,4 +72,3 @@ READ8_MEMBER(cpc_doubler_device::ext_tape_r)
data |= 0x20;
return data;
}
-
diff --git a/src/devices/bus/cpc/doubler.h b/src/devices/bus/cpc/doubler.h
index 22cac02c3e2..6b650179b0f 100644
--- a/src/devices/bus/cpc/doubler.h
+++ b/src/devices/bus/cpc/doubler.h
@@ -1,13 +1,13 @@
// license:BSD-3-Clause
// copyright-holders:Barry Rodewald
/*
- * doubler.c -- Draysoft Doubler - external cassette interface for the 464 (works on 664/6128 with external cassette?),
+ * doubler.c -- Draysoft Doubler - external cassette interface for the 464 (works on 664/6128 with external cassette?),
* intended for use in duplicating cassette software
*
* Uses only port F0E0 (may conflict with other peripherals, PPI port A is not usable while Doubler software is running)
*
*/
-
+
#ifndef DOUBLER_H_
#define DOUBLER_H_
@@ -27,7 +27,7 @@ public:
virtual machine_config_constructor device_mconfig_additions() const;
DECLARE_READ8_MEMBER(ext_tape_r);
-
+
protected:
// device-level overrides
virtual void device_start();
@@ -35,11 +35,11 @@ protected:
private:
cpc_expansion_slot_device *m_slot;
-
+
required_device<cassette_image_device> m_tape;
};
// device type definition
extern const device_type CPC_DOUBLER;
-
+
#endif /* DOUBLER_H_ */
diff --git a/src/devices/bus/isa/omti8621.c b/src/devices/bus/isa/omti8621.c
index fdb11304f5c..9f86243a90a 100644
--- a/src/devices/bus/isa/omti8621.c
+++ b/src/devices/bus/isa/omti8621.c
@@ -216,7 +216,7 @@ MACHINE_CONFIG_FRAGMENT( omti_disk )
MCFG_PC_FDC_DRQ_CALLBACK(WRITELINE(omti8621_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(OMTI_FDC_TAG":0", pc_hd_floppies, "525hd", omti8621_device::floppy_formats)
// Apollo workstations never have more then 1 floppy drive
-// MCFG_FLOPPY_DRIVE_ADD(OMTI_FDC_TAG":1", pc_hd_floppies, "525hd", omti8621_device::floppy_formats)
+// MCFG_FLOPPY_DRIVE_ADD(OMTI_FDC_TAG":1", pc_hd_floppies, "525hd", omti8621_device::floppy_formats)
MACHINE_CONFIG_END
FLOPPY_FORMATS_MEMBER( omti8621_device::floppy_formats )
diff --git a/src/devices/bus/rs232/pty.c b/src/devices/bus/rs232/pty.c
index bc673318e2a..0039925ac85 100644
--- a/src/devices/bus/rs232/pty.c
+++ b/src/devices/bus/rs232/pty.c
@@ -7,132 +7,132 @@
static const int TIMER_POLL = 1;
pseudo_terminal_device::pseudo_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, PSEUDO_TERMINAL, "Pseudo terminal", tag, owner, clock, "pseudo_terminal", __FILE__),
- device_serial_interface(mconfig, *this),
- device_rs232_port_interface(mconfig, *this),
- device_pty_interface(mconfig, *this),
- m_rs232_txbaud(*this, "RS232_TXBAUD"),
- m_rs232_rxbaud(*this, "RS232_RXBAUD"),
- m_rs232_startbits(*this, "RS232_STARTBITS"),
- m_rs232_databits(*this, "RS232_DATABITS"),
- m_rs232_parity(*this, "RS232_PARITY"),
- m_rs232_stopbits(*this, "RS232_STOPBITS"),
- m_input_count(0),
- m_input_index(0)
+ device_t(mconfig, PSEUDO_TERMINAL, "Pseudo terminal", tag, owner, clock, "pseudo_terminal", __FILE__),
+ device_serial_interface(mconfig, *this),
+ device_rs232_port_interface(mconfig, *this),
+ device_pty_interface(mconfig, *this),
+ m_rs232_txbaud(*this, "RS232_TXBAUD"),
+ m_rs232_rxbaud(*this, "RS232_RXBAUD"),
+ m_rs232_startbits(*this, "RS232_STARTBITS"),
+ m_rs232_databits(*this, "RS232_DATABITS"),
+ m_rs232_parity(*this, "RS232_PARITY"),
+ m_rs232_stopbits(*this, "RS232_STOPBITS"),
+ m_input_count(0),
+ m_input_index(0)
{
}
WRITE_LINE_MEMBER(pseudo_terminal_device::update_serial)
{
- int startbits = convert_startbits(m_rs232_startbits->read());
- int databits = convert_databits(m_rs232_databits->read());
- parity_t parity = convert_parity(m_rs232_parity->read());
- stop_bits_t stopbits = convert_stopbits(m_rs232_stopbits->read());
+ int startbits = convert_startbits(m_rs232_startbits->read());
+ int databits = convert_databits(m_rs232_databits->read());
+ parity_t parity = convert_parity(m_rs232_parity->read());
+ stop_bits_t stopbits = convert_stopbits(m_rs232_stopbits->read());
- set_data_frame(startbits, databits, parity, stopbits);
+ set_data_frame(startbits, databits, parity, stopbits);
- int txbaud = convert_baud(m_rs232_txbaud->read());
- set_tra_rate(txbaud);
+ int txbaud = convert_baud(m_rs232_txbaud->read());
+ set_tra_rate(txbaud);
- int rxbaud = convert_baud(m_rs232_rxbaud->read());
- set_rcv_rate(rxbaud);
+ int rxbaud = convert_baud(m_rs232_rxbaud->read());
+ set_rcv_rate(rxbaud);
- output_rxd(1);
+ output_rxd(1);
- // TODO: make this configurable
- output_dcd(0);
- output_dsr(0);
- output_cts(0);
+ // TODO: make this configurable
+ output_dcd(0);
+ output_dsr(0);
+ output_cts(0);
}
static INPUT_PORTS_START(pseudo_terminal)
- MCFG_RS232_BAUD("RS232_TXBAUD", RS232_BAUD_9600, "TX Baud", pseudo_terminal_device, update_serial)
- MCFG_RS232_BAUD("RS232_RXBAUD", RS232_BAUD_9600, "RX Baud", pseudo_terminal_device, update_serial)
- MCFG_RS232_STARTBITS("RS232_STARTBITS", RS232_STARTBITS_1, "Start Bits", pseudo_terminal_device, update_serial)
- MCFG_RS232_DATABITS("RS232_DATABITS", RS232_DATABITS_8, "Data Bits", pseudo_terminal_device, update_serial)
- MCFG_RS232_PARITY("RS232_PARITY", RS232_PARITY_NONE, "Parity", pseudo_terminal_device, update_serial)
- MCFG_RS232_STOPBITS("RS232_STOPBITS", RS232_STOPBITS_1, "Stop Bits", pseudo_terminal_device, update_serial)
+ MCFG_RS232_BAUD("RS232_TXBAUD", RS232_BAUD_9600, "TX Baud", pseudo_terminal_device, update_serial)
+ MCFG_RS232_BAUD("RS232_RXBAUD", RS232_BAUD_9600, "RX Baud", pseudo_terminal_device, update_serial)
+ MCFG_RS232_STARTBITS("RS232_STARTBITS", RS232_STARTBITS_1, "Start Bits", pseudo_terminal_device, update_serial)
+ MCFG_RS232_DATABITS("RS232_DATABITS", RS232_DATABITS_8, "Data Bits", pseudo_terminal_device, update_serial)
+ MCFG_RS232_PARITY("RS232_PARITY", RS232_PARITY_NONE, "Parity", pseudo_terminal_device, update_serial)
+ MCFG_RS232_STOPBITS("RS232_STOPBITS", RS232_STOPBITS_1, "Stop Bits", pseudo_terminal_device, update_serial)
INPUT_PORTS_END
ioport_constructor pseudo_terminal_device::device_input_ports() const
{
- return INPUT_PORTS_NAME(pseudo_terminal);
+ return INPUT_PORTS_NAME(pseudo_terminal);
}
void pseudo_terminal_device::device_start()
{
- m_timer_poll = timer_alloc(TIMER_POLL);
+ m_timer_poll = timer_alloc(TIMER_POLL);
- open();
+ open();
}
void pseudo_terminal_device::device_stop()
{
- close();
+ close();
}
void pseudo_terminal_device::device_reset()
{
- update_serial(0);
- queue();
+ update_serial(0);
+ queue();
}
void pseudo_terminal_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
- switch (id)
- {
- case TIMER_POLL:
- queue();
- break;
-
- default:
- device_serial_interface::device_timer(timer, id, param, ptr);
- }
+ switch (id)
+ {
+ case TIMER_POLL:
+ queue();
+ break;
+
+ default:
+ device_serial_interface::device_timer(timer, id, param, ptr);
+ }
}
void pseudo_terminal_device::tra_callback()
{
- output_rxd(transmit_register_get_data_bit());
+ output_rxd(transmit_register_get_data_bit());
}
void pseudo_terminal_device::tra_complete()
{
- queue();
+ queue();
}
void pseudo_terminal_device::rcv_complete()
{
- receive_register_extract();
- write(get_received_char());
+ receive_register_extract();
+ write(get_received_char());
}
void pseudo_terminal_device::queue(void)
{
- if (is_transmit_register_empty())
- {
- if (m_input_index == m_input_count)
- {
- m_input_index = 0;
- int tmp = read(m_input_buffer , sizeof(m_input_buffer));
- if (tmp > 0) {
- m_input_count = tmp;
- } else {
- m_input_count = 0;
- }
- }
-
- if (m_input_count != 0)
- {
- transmit_register_setup(m_input_buffer[ m_input_index++ ]);
-
- m_timer_poll->adjust(attotime::never);
- }
- else
- {
- int txbaud = convert_baud(m_rs232_txbaud->read());
- m_timer_poll->adjust(attotime::from_hz(txbaud));
- }
- }
+ if (is_transmit_register_empty())
+ {
+ if (m_input_index == m_input_count)
+ {
+ m_input_index = 0;
+ int tmp = read(m_input_buffer , sizeof(m_input_buffer));
+ if (tmp > 0) {
+ m_input_count = tmp;
+ } else {
+ m_input_count = 0;
+ }
+ }
+
+ if (m_input_count != 0)
+ {
+ transmit_register_setup(m_input_buffer[ m_input_index++ ]);
+
+ m_timer_poll->adjust(attotime::never);
+ }
+ else
+ {
+ int txbaud = convert_baud(m_rs232_txbaud->read());
+ m_timer_poll->adjust(attotime::from_hz(txbaud));
+ }
+ }
}
const device_type PSEUDO_TERMINAL = &device_creator<pseudo_terminal_device>;
diff --git a/src/devices/bus/rs232/pty.h b/src/devices/bus/rs232/pty.h
index 1f4ddbce754..222ee446b53 100644
--- a/src/devices/bus/rs232/pty.h
+++ b/src/devices/bus/rs232/pty.h
@@ -7,44 +7,44 @@
#include "rs232.h"
class pseudo_terminal_device : public device_t,
- public device_serial_interface,
- public device_rs232_port_interface,
- public device_pty_interface
+ public device_serial_interface,
+ public device_rs232_port_interface,
+ public device_pty_interface
{
public:
- pseudo_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pseudo_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) {
- device_serial_interface::rx_w(state);
- }
+ virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) {
+ device_serial_interface::rx_w(state);
+ }
- DECLARE_WRITE_LINE_MEMBER(update_serial);
+ DECLARE_WRITE_LINE_MEMBER(update_serial);
protected:
- virtual ioport_constructor device_input_ports() const;
- virtual void device_start();
- virtual void device_stop();
- virtual void device_reset();
- virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
+ virtual ioport_constructor device_input_ports() const;
+ virtual void device_start();
+ virtual void device_stop();
+ virtual void device_reset();
+ virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
- virtual void tra_callback();
- virtual void tra_complete();
- virtual void rcv_complete();
+ virtual void tra_callback();
+ virtual void tra_complete();
+ virtual void rcv_complete();
private:
- required_ioport m_rs232_txbaud;
- required_ioport m_rs232_rxbaud;
- required_ioport m_rs232_startbits;
- required_ioport m_rs232_databits;
- required_ioport m_rs232_parity;
- required_ioport m_rs232_stopbits;
-
- UINT8 m_input_buffer[ 1024 ];
- UINT32 m_input_count;
- UINT32 m_input_index;
- emu_timer *m_timer_poll;
-
- void queue(void);
+ required_ioport m_rs232_txbaud;
+ required_ioport m_rs232_rxbaud;
+ required_ioport m_rs232_startbits;
+ required_ioport m_rs232_databits;
+ required_ioport m_rs232_parity;
+ required_ioport m_rs232_stopbits;
+
+ UINT8 m_input_buffer[ 1024 ];
+ UINT32 m_input_count;
+ UINT32 m_input_index;
+ emu_timer *m_timer_poll;
+
+ void queue(void);
};
extern const device_type PSEUDO_TERMINAL;
diff --git a/src/devices/bus/rs232/rs232.c b/src/devices/bus/rs232/rs232.c
index cb2d1771a6e..411a31a8f01 100644
--- a/src/devices/bus/rs232/rs232.c
+++ b/src/devices/bus/rs232/rs232.c
@@ -111,5 +111,5 @@ SLOT_INTERFACE_START( default_rs232_devices )
SLOT_INTERFACE("null_modem", NULL_MODEM)
SLOT_INTERFACE("printer", SERIAL_PRINTER)
SLOT_INTERFACE("terminal", SERIAL_TERMINAL)
- SLOT_INTERFACE("pty", PSEUDO_TERMINAL)
+ SLOT_INTERFACE("pty", PSEUDO_TERMINAL)
SLOT_INTERFACE_END
diff --git a/src/devices/bus/tiki100/8088.c b/src/devices/bus/tiki100/8088.c
index 1065c856340..d8c9fe201b5 100644
--- a/src/devices/bus/tiki100/8088.c
+++ b/src/devices/bus/tiki100/8088.c
@@ -14,7 +14,7 @@
// MACROS/CONSTANTS
//**************************************************************************
-#define I8088_TAG "u3"
+#define I8088_TAG "u3"
diff --git a/src/devices/bus/tiki100/8088.h b/src/devices/bus/tiki100/8088.h
index 2700866a169..6bfa5e723bc 100644
--- a/src/devices/bus/tiki100/8088.h
+++ b/src/devices/bus/tiki100/8088.h
@@ -24,7 +24,7 @@
// ======================> tiki100_8088_t
class tiki100_8088_t : public device_t,
- public device_tiki100bus_card_interface
+ public device_tiki100bus_card_interface
{
public:
// construction/destruction
diff --git a/src/devices/bus/tiki100/exp.h b/src/devices/bus/tiki100/exp.h
index fc25c522c79..e41b18e7831 100644
--- a/src/devices/bus/tiki100/exp.h
+++ b/src/devices/bus/tiki100/exp.h
@@ -105,8 +105,8 @@ public:
// ======================> tiki100_bus_slot_t
class tiki100_bus_slot_t : public device_t,
- public device_slot_interface,
- public device_z80daisy_interface
+ public device_slot_interface,
+ public device_z80daisy_interface
{
public:
// construction/destruction
diff --git a/src/devices/bus/tiki100/hdc.c b/src/devices/bus/tiki100/hdc.c
index 2b978635ead..504222f0f48 100644
--- a/src/devices/bus/tiki100/hdc.c
+++ b/src/devices/bus/tiki100/hdc.c
@@ -14,7 +14,7 @@
// MACROS/CONSTANTS
//**************************************************************************
-#define WD1010_TAG "hdc"
+#define WD1010_TAG "hdc"
diff --git a/src/devices/bus/tiki100/hdc.h b/src/devices/bus/tiki100/hdc.h
index d06342fc66c..fefde73c2e7 100644
--- a/src/devices/bus/tiki100/hdc.h
+++ b/src/devices/bus/tiki100/hdc.h
@@ -25,7 +25,7 @@
// ======================> tiki100_hdc_t
class tiki100_hdc_t : public device_t,
- public device_tiki100bus_card_interface
+ public device_tiki100bus_card_interface
{
public:
// construction/destruction
diff --git a/src/devices/cpu/mips/mips3.h b/src/devices/cpu/mips/mips3.h
index 4ae8398dac0..87462f79d5b 100644
--- a/src/devices/cpu/mips/mips3.h
+++ b/src/devices/cpu/mips/mips3.h
@@ -366,7 +366,7 @@ private:
UINT32 m_nextpc;
UINT32 m_pcbase;
UINT8 m_cf[4][8];
- bool m_delayslot;
+ bool m_delayslot;
int m_op;
int m_interrupt_cycles;
UINT32 m_ll_value;
diff --git a/src/devices/imagedev/floppy.c b/src/devices/imagedev/floppy.c
index c248b10a1e7..47ddeb05f38 100644
--- a/src/devices/imagedev/floppy.c
+++ b/src/devices/imagedev/floppy.c
@@ -415,10 +415,10 @@ bool floppy_image_device::call_load()
if (!cur_load_cb.isnull())
return cur_load_cb(this);
- if (motor_always_on) {
- // When disk is inserted, start motor
- mon_w(0);
- } else if(!mon)
+ if (motor_always_on) {
+ // When disk is inserted, start motor
+ mon_w(0);
+ } else if(!mon)
ready_counter = 2;
return IMAGE_INIT_PASS;
@@ -446,10 +446,10 @@ void floppy_image_device::call_unload()
if (!cur_unload_cb.isnull())
cur_unload_cb(this);
- if (motor_always_on) {
- // When disk is removed, stop motor
- mon_w(1);
- } else if(!ready) {
+ if (motor_always_on) {
+ // When disk is removed, stop motor
+ mon_w(1);
+ } else if(!ready) {
ready = true;
if(!cur_ready_cb.isnull())
cur_ready_cb(this, ready);
@@ -497,15 +497,15 @@ void floppy_image_device::mon_w(int state)
if (!mon && image)
{
revolution_start_time = machine().time();
- if (motor_always_on) {
- // Drives with motor that is always spinning are immediately ready when a disk is loaded
- // because there is no spin-up time
- ready = false;
- if(!cur_ready_cb.isnull())
- cur_ready_cb(this, ready);
- } else {
- ready_counter = 2;
- }
+ if (motor_always_on) {
+ // Drives with motor that is always spinning are immediately ready when a disk is loaded
+ // because there is no spin-up time
+ ready = false;
+ if(!cur_ready_cb.isnull())
+ cur_ready_cb(this, ready);
+ } else {
+ ready_counter = 2;
+ }
index_resync();
}
diff --git a/src/devices/imagedev/floppy.h b/src/devices/imagedev/floppy.h
index a57b2c7b72e..5968ed6eeb8 100644
--- a/src/devices/imagedev/floppy.h
+++ b/src/devices/imagedev/floppy.h
@@ -290,11 +290,11 @@ private:
sound_stream* m_sound;
bool m_loaded;
- bool m_is525; // true if this is a 5.25" floppy drive
+ bool m_is525; // true if this is a 5.25" floppy drive
- int m_sampleindex_motor_start;
- int m_sampleindex_motor_loop;
- int m_sampleindex_motor_end;
+ int m_sampleindex_motor_start;
+ int m_sampleindex_motor_loop;
+ int m_sampleindex_motor_end;
int m_samplesize_motor_start;
int m_samplesize_motor_loop;
int m_samplesize_motor_end;
@@ -302,8 +302,8 @@ private:
int m_motor_playback_state;
bool m_motor_on;
- int m_step_samples;
- int m_sampleindex_step1;
+ int m_step_samples;
+ int m_sampleindex_step1;
int m_samplesize_step[MAX_STEP_SAMPLES];
int m_samplepos_step;
int m_step_playback_state;
diff --git a/src/devices/machine/z80scc.c b/src/devices/machine/z80scc.c
index 91221c8d339..1abc94fec86 100644
--- a/src/devices/machine/z80scc.c
+++ b/src/devices/machine/z80scc.c
@@ -73,7 +73,7 @@ TODO:
#include "z80scc.h"
//**************************************************************************
-// MACROS / CONSTANTS
+// MACROS / CONSTANTS
//**************************************************************************
#define VERBOSE 0
@@ -89,11 +89,11 @@ TODO:
#define FUNCNAME __PRETTY_FUNCTION__
#endif
-#define CHANA_TAG "cha"
-#define CHANB_TAG "chb"
+#define CHANA_TAG "cha"
+#define CHANB_TAG "chb"
//**************************************************************************
-// DEVICE DEFINITIONS
+// DEVICE DEFINITIONS
//**************************************************************************
// device type definition
const device_type Z80SCC = &device_creator<z80scc_device>;
@@ -108,7 +108,7 @@ const device_type SCC85233 = &device_creator<scc85233_device>;
const device_type SCC8523L = &device_creator<scc8523L_device>;
//-------------------------------------------------
-// device_mconfig_additions -
+// device_mconfig_additions -
//-------------------------------------------------
MACHINE_CONFIG_FRAGMENT( z80scc )
MCFG_DEVICE_ADD(CHANA_TAG, Z80SCC_CHANNEL, 0)
@@ -121,11 +121,11 @@ machine_config_constructor z80scc_device::device_mconfig_additions() const
}
//**************************************************************************
-// LIVE DEVICE
+// LIVE DEVICE
//**************************************************************************
//-------------------------------------------------
-// z80scc_device - constructor
+// z80scc_device - constructor
//-------------------------------------------------
z80scc_device::z80scc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
@@ -213,7 +213,7 @@ scc8523L_device::scc8523L_device(const machine_config &mconfig, const char *tag,
: z80scc_device(mconfig, SCC8523L, "SCC 8523L", tag, owner, clock, TYPE_SCC8523L, "scc8523L", __FILE__){ }
//-------------------------------------------------
-// device_start - device-specific startup
+// device_start - device-specific startup
//-------------------------------------------------
void z80scc_device::device_start()
@@ -252,7 +252,7 @@ void z80scc_device::device_start()
//-------------------------------------------------
-// device_reset - device-specific reset
+// device_reset - device-specific reset
//-------------------------------------------------
void z80scc_device::device_reset()
@@ -269,7 +269,7 @@ Each of the SCC's two channels contain three sources of interrupts, making a tot
sources. These three sources of interrupts are: 1) Receiver, 2) Transmitter, and 3) External/Status
conditions. In addition, there are several conditions that may cause these interrupts.*/
//-------------------------------------------------
-// z80daisy_irq_state - get interrupt status
+// z80daisy_irq_state - get interrupt status
//-------------------------------------------------
int z80scc_device::z80daisy_irq_state()
@@ -278,8 +278,8 @@ int z80scc_device::z80daisy_irq_state()
int i;
LOG(("%s %s A:%d%d%d B:%d%d%d ",FUNCNAME, tag(),
- m_int_state[0], m_int_state[1], m_int_state[2],
- m_int_state[3], m_int_state[4], m_int_state[5]));
+ m_int_state[0], m_int_state[1], m_int_state[2],
+ m_int_state[3], m_int_state[4], m_int_state[5]));
// loop over all interrupt sources
for (i = 0; i < 6; i++)
@@ -300,7 +300,7 @@ int z80scc_device::z80daisy_irq_state()
//-------------------------------------------------
-// z80daisy_irq_ack - interrupt acknowledge
+// z80daisy_irq_ack - interrupt acknowledge
//-------------------------------------------------
int z80scc_device::z80daisy_irq_ack()
@@ -333,7 +333,7 @@ int z80scc_device::z80daisy_irq_ack()
//-------------------------------------------------
-// z80daisy_irq_reti - return from interrupt
+// z80daisy_irq_reti - return from interrupt
//-------------------------------------------------
void z80scc_device::z80daisy_irq_reti()
@@ -360,7 +360,7 @@ void z80scc_device::z80daisy_irq_reti()
//-------------------------------------------------
-// check_interrupts -
+// check_interrupts -
//-------------------------------------------------
void z80scc_device::check_interrupts()
@@ -372,7 +372,7 @@ void z80scc_device::check_interrupts()
//-------------------------------------------------
-// reset_interrupts -
+// reset_interrupts -
//-------------------------------------------------
void z80scc_device::reset_interrupts()
@@ -394,24 +394,24 @@ UINT8 z80scc_device::modify_vector(UINT8 vec, int i, UINT8 src)
Interrupt Vector Modification
V3 V2 V1 Status High/Status Low =0
V4 V5 V6 Status High/Status Low =1
- 0 0 0 Ch B Transmit Buffer Empty
- 0 0 1 Ch B External/Status Change
- 0 1 0 Ch B Receive Char. Available
- 0 1 1 Ch B Special Receive Condition
- 1 0 0 Ch A Transmit Buffer Empty
- 1 0 1 Ch A External/Status Change
- 1 1 0 Ch A Receive Char. Available
- 1 1 1 Ch A Special Receive Condition
+ 0 0 0 Ch B Transmit Buffer Empty
+ 0 0 1 Ch B External/Status Change
+ 0 1 0 Ch B Receive Char. Available
+ 0 1 1 Ch B Special Receive Condition
+ 1 0 0 Ch A Transmit Buffer Empty
+ 1 0 1 Ch A External/Status Change
+ 1 1 0 Ch A Receive Char. Available
+ 1 1 1 Ch A Special Receive Condition
*/
// Add channel offset according to table above
- src |= (i == CHANNEL_A ? 0x04 : 0x00 );
+ src |= (i == CHANNEL_A ? 0x04 : 0x00 );
// Modify vector according to Hi/lo bit of WR9
if (m_chanA->m_wr9 & z80scc_channel::WR9_BIT_SHSL) // Affect V4-V6
{
vec |= src << 4;
}
- else // Affect V1-V3
+ else // Affect V1-V3
{
vec |= src << 1;
}
@@ -420,7 +420,7 @@ UINT8 z80scc_device::modify_vector(UINT8 vec, int i, UINT8 src)
//-------------------------------------------------
-// trigger_interrupt -
+// trigger_interrupt -
//-------------------------------------------------
void z80scc_device::trigger_interrupt(int index, int state)
{
@@ -438,7 +438,7 @@ void z80scc_device::trigger_interrupt(int index, int state)
LOG(("Master Interrupt Enable is not set, blocking attempt to interrupt\n"));
return;
}
-
+
switch(state)
{
case z80scc_channel::INT_RECEIVE:
@@ -477,13 +477,13 @@ void z80scc_device::trigger_interrupt(int index, int state)
logerror("Attempt to trigger interrupt of unknown origin blocked: %02x on channel %c\n", state, 'A' + index);
return;
}
-
+
// Vector modification requested?
if (m_chanA->m_wr9 & z80scc_channel::WR9_BIT_VIS)
{
vector = modify_vector(vector, index, source);
}
-
+
//LOG(("Z80SCC \"%s\": %c : Interrupt Request %u\n", tag(), 'A' + index, state));
// update vector register // TODO: What if interrupts are nested? May we loose the modified vector or even get the wrong one?
@@ -500,20 +500,20 @@ void z80scc_device::trigger_interrupt(int index, int state)
*/
// Add channel offset to priority according to table above
priority = prio_level + (index == CHANNEL_A ? 3 : 0 );
-
+
// trigger interrupt
m_int_state[priority] |= Z80_DAISY_INT;
-
+
// Based on the fact that prio levels are aligned with the bitorder of rr3 we can do this...
m_chanA->m_rr3 |= (prio_level << (index == CHANNEL_A ? 3 : 0 ));
-
+
// check for interrupt
check_interrupts();
}
//-------------------------------------------------
-// m1_r - interrupt acknowledge
+// m1_r - interrupt acknowledge
//-------------------------------------------------
int z80scc_device::m1_r()
@@ -523,7 +523,7 @@ int z80scc_device::m1_r()
//-------------------------------------------------
-// cd_ba_r - Universal Bus read
+// cd_ba_r - Universal Bus read
//-------------------------------------------------
READ8_MEMBER( z80scc_device::cd_ba_r )
{
@@ -537,28 +537,28 @@ READ8_MEMBER( z80scc_device::cd_ba_r )
logerror("Z80SCC cd_ba_r not supported by this device variant, you should probably use combinations of c*_r/w and d*_r/w (see z80scc.h)\n");
return 0;
}
-
- // LOG(("z80scc_device::cd_ba_r ba:%02x cd:%02x\n", ba, cd));
+
+ // LOG(("z80scc_device::cd_ba_r ba:%02x cd:%02x\n", ba, cd));
return cd ? channel->control_read() : channel->data_read();
}
//-------------------------------------------------
-// cd_ba_w - Universal Bus write
+// cd_ba_w - Universal Bus write
//-------------------------------------------------
WRITE8_MEMBER( z80scc_device::cd_ba_w )
{
int ba = BIT(offset, 0);
int cd = BIT(offset, 1);
z80scc_channel *channel = ba ? m_chanB : m_chanA;
-
+
/* Expell non-Universal Bus variants */
if ( !(m_variant & SET_Z85X3X) )
{
logerror("Z80SCC cd_ba_w not supported by this device variant, you should probably use combinations of c*_r/w and d*_r/w (see z80scc.h)\n");
return;
}
-
- // LOG(("z80scc_device::cd_ba_w ba:%02x cd:%02x\n", ba, cd));
+
+ // LOG(("z80scc_device::cd_ba_w ba:%02x cd:%02x\n", ba, cd));
if (cd)
channel->control_write(data);
else
@@ -567,7 +567,7 @@ WRITE8_MEMBER( z80scc_device::cd_ba_w )
//-------------------------------------------------
-// ba_cd_r - Universal Bus read
+// ba_cd_r - Universal Bus read
//-------------------------------------------------
READ8_MEMBER( z80scc_device::ba_cd_r )
@@ -575,21 +575,21 @@ READ8_MEMBER( z80scc_device::ba_cd_r )
int ba = BIT(offset, 1);
int cd = BIT(offset, 0);
z80scc_channel *channel = ba ? m_chanB : m_chanA;
-
+
/* Expell non-Universal Bus variants */
if ( !(m_variant & SET_Z85X3X) )
{
logerror("Z80SCC ba_cd_r not supported by this device variant, you should probably use combinations of c*_r/w and d*_r/w (see z80scc.h)\n");
return 0;
}
-
- // LOG(("z80scc_device::ba_cd_r ba:%02x cd:%02x\n", ba, cd));
+
+ // LOG(("z80scc_device::ba_cd_r ba:%02x cd:%02x\n", ba, cd));
return cd ? channel->control_read() : channel->data_read();
}
//-------------------------------------------------
-// ba_cd_w -
+// ba_cd_w -
//-------------------------------------------------
WRITE8_MEMBER( z80scc_device::ba_cd_w )
@@ -597,14 +597,14 @@ WRITE8_MEMBER( z80scc_device::ba_cd_w )
int ba = BIT(offset, 1);
int cd = BIT(offset, 0);
z80scc_channel *channel = ba ? m_chanB : m_chanA;
-
+
/* Expell non-Universal Bus variants */
if ( !(m_variant & SET_Z85X3X) )
{
logerror("Z80SCC ba_cd_w not supported by this device variant, you should probably use combinations of c*_r/w and d*_r/w (see z80scc.h)\n");
return;
}
-
+
LOG(("z80scc_device::ba_cd_w ba:%02x cd:%02x\n", ba, cd));
if (cd)
@@ -614,11 +614,11 @@ WRITE8_MEMBER( z80scc_device::ba_cd_w )
}
//**************************************************************************
-// SCC CHANNEL
+// SCC CHANNEL
//**************************************************************************
//-------------------------------------------------
-// SCC_channel - constructor
+// SCC_channel - constructor
//-------------------------------------------------
z80scc_channel::z80scc_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
@@ -641,11 +641,11 @@ z80scc_channel::z80scc_channel(const machine_config &mconfig, const char *tag, d
LOG(("%s\n",FUNCNAME));
// Reset all registers
- m_rr0 = m_rr1 = m_rr2 = m_rr3 = m_rr4 = m_rr5 = m_rr6 = m_rr7 = m_rr8
+ m_rr0 = m_rr1 = m_rr2 = m_rr3 = m_rr4 = m_rr5 = m_rr6 = m_rr7 = m_rr8
= m_rr9 = m_rr10 = m_rr11 = m_rr12 = m_rr13 = m_rr14 = m_rr15 = 0;
- m_wr0 = m_wr1 = m_wr2 = m_wr3 = m_wr4 = m_wr5 = m_wr6 = m_wr7 = m_wr8
+ m_wr0 = m_wr1 = m_wr2 = m_wr3 = m_wr4 = m_wr5 = m_wr6 = m_wr7 = m_wr8
= m_wr9 = m_wr10 = m_wr11 = m_wr12 = m_wr13 = m_wr14 = m_wr15 = 0;
-
+
for (int i = 0; i < 3; i++) // TODO adapt to SCC fifos
{
m_rx_data_fifo[i] = 0;
@@ -655,7 +655,7 @@ z80scc_channel::z80scc_channel(const machine_config &mconfig, const char *tag, d
//-------------------------------------------------
-// start - channel startup
+// start - channel startup
//-------------------------------------------------
void z80scc_channel::device_start()
@@ -665,10 +665,10 @@ void z80scc_channel::device_start()
m_index = m_uart->get_channel_index(this);
m_uart->m_wr0_ptrbits = 0;
-
+
m_rx_fifo_sz = (m_uart->m_variant & SET_ESCC) ? 8 : 3;
m_rx_fifo_wp = m_rx_fifo_rp = 0;
-
+
// state saving
save_item(NAME(m_rr0));
save_item(NAME(m_rr1));
@@ -725,7 +725,7 @@ void z80scc_channel::device_start()
//-------------------------------------------------
-// reset - reset channel status
+// reset - reset channel status
//-------------------------------------------------
void z80scc_channel::device_reset()
@@ -737,24 +737,24 @@ void z80scc_channel::device_reset()
transmit_register_reset();
// Soft/Channel Reset values according to SCC users manual
- m_wr0 = 0x00;
+ m_wr0 = 0x00;
m_wr1 &= 0x24;
m_wr3 &= 0x01;
m_wr4 |= 0x04;
m_wr5 &= 0x61;
if (m_uart->m_variant & (z80scc_device::TYPE_SCC85C30 | SET_ESCC))
m_wr7 = 0x20;
- m_wr9 &= 0xdf; // WR9 has a different hard reset value
+ m_wr9 &= 0xdf; // WR9 has a different hard reset value
m_wr10 &= 0x60; // WR10 has a different hard reset value
m_wr11 &= 0xff; // WR11 has a different hard reset value
m_wr14 &= 0xc3; // WR14 has a different hard reset value
m_wr14 |= 0x20;
- m_wr15 = 0xf8;
+ m_wr15 = 0xf8;
m_rr0 &= 0xfc;
m_rr0 |= 0x44;
m_rr1 &= 0x07;
m_rr1 |= 0x06;
- m_rr3 = 0x00;
+ m_rr3 = 0x00;
m_rr10 &= 0x40;
#if 1 // old reset code
@@ -786,7 +786,7 @@ void z80scc_channel::device_timer(emu_timer &timer, device_timer_id id, int para
//-------------------------------------------------
-// tra_callback -
+// tra_callback -
//-------------------------------------------------
void z80scc_channel::tra_callback()
@@ -812,7 +812,7 @@ void z80scc_channel::tra_callback()
else if (!is_transmit_register_empty())
{
int db = transmit_register_get_data_bit();
-
+
LOG(("%" I64FMT "d %s() \"%s \"Channel %c transmit data bit %d m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, db, m_wr5));
// transmit data
if (m_index == z80scc_device::CHANNEL_A)
@@ -829,7 +829,7 @@ void z80scc_channel::tra_callback()
//-------------------------------------------------
-// tra_complete -
+// tra_complete -
//-------------------------------------------------
void z80scc_channel::tra_complete()
@@ -880,7 +880,7 @@ void z80scc_channel::tra_complete()
//-------------------------------------------------
-// rcv_callback -
+// rcv_callback -
//-------------------------------------------------
void z80scc_channel::rcv_callback()
@@ -900,7 +900,7 @@ void z80scc_channel::rcv_callback()
//-------------------------------------------------
-// rcv_complete -
+// rcv_complete -
//-------------------------------------------------
void z80scc_channel::rcv_complete()
@@ -915,7 +915,7 @@ void z80scc_channel::rcv_complete()
//-------------------------------------------------
-// get_clock_mode - get clock divisor
+// get_clock_mode - get clock divisor
//-------------------------------------------------
int z80scc_channel::get_clock_mode()
@@ -924,10 +924,10 @@ int z80scc_channel::get_clock_mode()
switch (m_wr4 & WR4_CLOCK_RATE_MASK)
{
- case WR4_CLOCK_RATE_X1: clocks = 1; break;
- case WR4_CLOCK_RATE_X16: clocks = 16; break;
- case WR4_CLOCK_RATE_X32: clocks = 32; break;
- case WR4_CLOCK_RATE_X64: clocks = 64; break;
+ case WR4_CLOCK_RATE_X1: clocks = 1; break;
+ case WR4_CLOCK_RATE_X16: clocks = 16; break;
+ case WR4_CLOCK_RATE_X32: clocks = 32; break;
+ case WR4_CLOCK_RATE_X64: clocks = 64; break;
}
return clocks;
@@ -955,7 +955,7 @@ void z80scc_channel::set_rts(int state)
void z80scc_channel::update_rts()
{
-// LOG(("%s(%d) \"%s\": %c \n", FUNCNAME, state, m_owner->tag(), 'A' + m_index));
+// LOG(("%s(%d) \"%s\": %c \n", FUNCNAME, state, m_owner->tag(), 'A' + m_index));
if (m_wr5 & WR5_RTS)
{
// when the RTS bit is set, the _RTS output goes low
@@ -973,7 +973,7 @@ void z80scc_channel::update_rts()
}
//-------------------------------------------------
-// get_stop_bits - get number of stop bits
+// get_stop_bits - get number of stop bits
//-------------------------------------------------
device_serial_interface::stop_bits_t z80scc_channel::get_stop_bits()
@@ -990,7 +990,7 @@ device_serial_interface::stop_bits_t z80scc_channel::get_stop_bits()
//-------------------------------------------------
-// get_rx_word_length - get receive word length
+// get_rx_word_length - get receive word length
//-------------------------------------------------
int z80scc_channel::get_rx_word_length()
@@ -999,10 +999,10 @@ int z80scc_channel::get_rx_word_length()
switch (m_wr3 & WR3_RX_WORD_LENGTH_MASK)
{
- case WR3_RX_WORD_LENGTH_5: bits = 5; break;
- case WR3_RX_WORD_LENGTH_6: bits = 6; break;
- case WR3_RX_WORD_LENGTH_7: bits = 7; break;
- case WR3_RX_WORD_LENGTH_8: bits = 8; break;
+ case WR3_RX_WORD_LENGTH_5: bits = 5; break;
+ case WR3_RX_WORD_LENGTH_6: bits = 6; break;
+ case WR3_RX_WORD_LENGTH_7: bits = 7; break;
+ case WR3_RX_WORD_LENGTH_8: bits = 8; break;
}
return bits;
@@ -1010,7 +1010,7 @@ int z80scc_channel::get_rx_word_length()
//-------------------------------------------------
-// get_tx_word_length - get transmit word length
+// get_tx_word_length - get transmit word length
//-------------------------------------------------
int z80scc_channel::get_tx_word_length()
@@ -1019,10 +1019,10 @@ int z80scc_channel::get_tx_word_length()
switch (m_wr5 & WR5_TX_WORD_LENGTH_MASK)
{
- case WR5_TX_WORD_LENGTH_5: bits = 5; break;
- case WR5_TX_WORD_LENGTH_6: bits = 6; break;
- case WR5_TX_WORD_LENGTH_7: bits = 7; break;
- case WR5_TX_WORD_LENGTH_8: bits = 8; break;
+ case WR5_TX_WORD_LENGTH_5: bits = 5; break;
+ case WR5_TX_WORD_LENGTH_6: bits = 6; break;
+ case WR5_TX_WORD_LENGTH_7: bits = 7; break;
+ case WR5_TX_WORD_LENGTH_8: bits = 8; break;
}
return bits;
@@ -1231,7 +1231,7 @@ UINT8 z80scc_channel::do_sccreg_rr15()
}
//-------------------------------------------------
-// control_read - read control register
+// control_read - read control register
//-------------------------------------------------
UINT8 z80scc_channel::control_read()
{
@@ -1239,7 +1239,7 @@ UINT8 z80scc_channel::control_read()
int reg = m_uart->m_wr0_ptrbits; //m_wr0;
int regmask = (WR0_REGISTER_MASK | (m_uart->m_wr0_ptrbits & WR0_POINT_HIGH));
- // LOG(("%s(%02x) reg %02x, regmask %02x, WR0 %02x\n", __func__, data, reg, regmask, m_wr0));
+ // LOG(("%s(%02x) reg %02x, regmask %02x, WR0 %02x\n", __func__, data, reg, regmask, m_wr0));
m_uart->m_wr0_ptrbits = 0;
reg &= regmask;
@@ -1252,23 +1252,23 @@ UINT8 z80scc_channel::control_read()
/* TODO. Sort out 80X30 limitations in register access */
switch (reg)
{
- case REG_RR0_STATUS: data = do_sccreg_rr0(); break; // TODO: verify handling of SCC specific bits: D6 and D1
- case REG_RR1_SPEC_RCV_COND: data = do_sccreg_rr1(); break;
+ case REG_RR0_STATUS: data = do_sccreg_rr0(); break; // TODO: verify handling of SCC specific bits: D6 and D1
+ case REG_RR1_SPEC_RCV_COND: data = do_sccreg_rr1(); break;
case REG_RR2_INTERRUPT_VECT: data = do_sccreg_rr2(); break; // Channel dependent and SCC specific handling compared to SIO
/* registers 3-7 are specific to SCC. TODO: Check variant and log/stop misuse */
case REG_RR3_INTERUPPT_PEND: data = do_sccreg_rr3(); break;
- case REG_RR4_WR4_OR_RR0: data = do_sccreg_rr4(); break;
- case REG_RR5_WR5_OR_RR0: data = do_sccreg_rr5(); break;
- case REG_RR6_LSB_OR_RR2: data = do_sccreg_rr6(); break;
- case REG_RR7_MSB_OR_RR3: data = do_sccreg_rr7(); break;
+ case REG_RR4_WR4_OR_RR0: data = do_sccreg_rr4(); break;
+ case REG_RR5_WR5_OR_RR0: data = do_sccreg_rr5(); break;
+ case REG_RR6_LSB_OR_RR2: data = do_sccreg_rr6(); break;
+ case REG_RR7_MSB_OR_RR3: data = do_sccreg_rr7(); break;
/* registers 8-15 are specific to SCC */
- case REG_RR8_RECEIVE_DATA: data = data_read(); break;
- case REG_RR9_WR3_OR_RR13: data = do_sccreg_rr9(); break;
- case REG_RR10_MISC_STATUS: data = do_sccreg_rr10(); break;
- case REG_RR11_WR10_OR_RR15: data = do_sccreg_rr11(); break;
+ case REG_RR8_RECEIVE_DATA: data = data_read(); break;
+ case REG_RR9_WR3_OR_RR13: data = do_sccreg_rr9(); break;
+ case REG_RR10_MISC_STATUS: data = do_sccreg_rr10(); break;
+ case REG_RR11_WR10_OR_RR15: data = do_sccreg_rr11(); break;
case REG_RR12_LO_TIME_CONST: data = do_sccreg_rr12(); break;
case REG_RR13_HI_TIME_CONST: data = do_sccreg_rr13(); break;
- case REG_RR14_WR7_OR_R10: data = do_sccreg_rr14(); break;
+ case REG_RR14_WR7_OR_R10: data = do_sccreg_rr14(); break;
case REG_RR15_WR15_EXT_STAT: data = do_sccreg_rr15(); break;
default:
logerror("Z80SCC \"%s\" %s: %c : Unsupported RRx register:%02x\n", m_owner->tag(), __func__, 'A' + m_index, reg);
@@ -1308,7 +1308,7 @@ void z80scc_channel::do_sccreg_wr0(UINT8 data)
m_wr0 = data;
m_uart->m_wr0_ptrbits = data & WR0_REGISTER_MASK;
- /* Sort out SCC specific behaviours from legacy SIO behaviour */
+ /* Sort out SCC specific behaviours from legacy SIO behaviour */
/* WR0_Z_* are Z80X30 specific commands */
switch (data & WR0_COMMAND_MASK)
{
@@ -1340,7 +1340,7 @@ void z80scc_channel::do_sccreg_wr0(UINT8 data)
External/Status interrupt. However, if this second status change does not persist
(there are two transitions), another interrupt is not generated. Exceptions to this
rule are detailed in the RR0 description.*/
- // do_sccreg_wr0(data);
+ // do_sccreg_wr0(data);
if (!m_zc)
{
m_rr0 |= RR0_ZC;
@@ -1441,21 +1441,21 @@ void z80scc_channel::do_sccreg_wr1(UINT8 data)
LOG(("- Wait/Ready Enable %u\n", (data & WR1_WRDY_ENABLE) ? 1 : 0));
LOG(("- Wait/Ready Function %s\n", (data & WR1_WRDY_FUNCTION) ? "Ready" : "Wait"));
LOG(("- Wait/Ready on %s\n", (data & WR1_WRDY_ON_RX_TX) ? "Receive" : "Transmit"));
-
+
switch (data & WR1_RX_INT_MODE_MASK)
{
case WR1_RX_INT_DISABLE:
LOG(("- Receiver Interrupt Disabled\n"));
break;
-
+
case WR1_RX_INT_FIRST:
LOG(("- Receiver Interrupt on First Character\n"));
break;
-
+
case WR1_RX_INT_ALL_PARITY:
LOG(("- Receiver Interrupt on All Characters, Parity Affects Vector\n"));
break;
-
+
case WR1_RX_INT_ALL:
LOG(("- Receiver Interrupt on All Characters\n"));
break;
@@ -1472,7 +1472,7 @@ void z80scc_channel::do_sccreg_wr2(UINT8 data)
m_wr2 = data;
m_uart->m_chanA->m_rr2 = data;
m_uart->m_chanB->m_rr2 = data; /* TODO: Sort out the setting of ChanB depending on bits in WR9 */
-
+
m_uart->check_interrupts();
}
@@ -1589,13 +1589,13 @@ void z80scc_channel::do_sccreg_wr11(UINT8 data)
/SYNC pin is unavailable for other use. The /SYNC signal is forced to zero internally. A hardware
reset forces /NO XTAL. (At least 20 ms should be allowed after this bit is set to allow the oscillator
to stabilize.)*/
- LOG((" Clock type %s\n", data & WR11_RCVCLK_TYPE ? "Crystal oscillator between RTxC and /SYNC pins" : "TTL level on RTxC pin"));
+ LOG((" Clock type %s\n", data & WR11_RCVCLK_TYPE ? "Crystal oscillator between RTxC and /SYNC pins" : "TTL level on RTxC pin"));
/*Bits 6 and 5: Receiver Clock select bits 1 and 0
These bits determine the source of the receive clock as listed below. They do not
interfere with any of the modes of operation in the SCC, but simply control a multiplexer just
before the internal receive clock input. A hardware reset forces the receive clock to come from the
/RTxC pin.*/
- LOG((" Receive clock source is: "));
+ LOG((" Receive clock source is: "));
switch (data & WR11_RCVCLK_SRC_MASK)
{
case WR11_RCVCLK_SRC_RTXC: LOG(("RTxC\n")); break;
@@ -1611,7 +1611,7 @@ void z80scc_channel::do_sccreg_wr11(UINT8 data)
degrees the output of the DPLL used by the receiver. This makes the received and transmitted bit
cells occur simultaneously, neglecting delays. A hardware reset selects the /TRxC pin as the
source of the transmit clocks.*/
- LOG((" Transmit clock source is: "));
+ LOG((" Transmit clock source is: "));
switch (data & WR11_TRACLK_SRC_MASK)
{
case WR11_TRACLK_SRC_RTXC: LOG(("RTxC\n")); break;
@@ -1626,7 +1626,7 @@ void z80scc_channel::do_sccreg_wr11(UINT8 data)
transmit clock is programmed to come from the /TRxC pin, /TRxC is an input, regardless of the
state of this bit. The /TRxC pin is also an input if this bit is set to 0. A hardware reset forces this bit
to 0.*/
- LOG((" TRxC pin is %s\n", data & WR11_TRXC_DIRECTION ? "Output" : "Input"));
+ LOG((" TRxC pin is %s\n", data & WR11_TRXC_DIRECTION ? "Output" : "Input"));
/*Bits 1 and 0: /TRxC Output Source select bits 1 and 0
These bits determine the signal to be echoed out of the SCC via the /TRxC pin as listed in Table
on page 167. No signal is produced if /TRxC has been programmed as the source of either the
@@ -1634,7 +1634,7 @@ void z80scc_channel::do_sccreg_wr11(UINT8 data)
If the XTAL oscillator output is programmed to be echoed, and the XTAL oscillator is not enabled,
the /TRxC pin goes High. The DPLL signal that is echoed is the DPLL signal used by the receiver.
Hardware reset selects the XTAL oscillator as the output source*/
- LOG((" TRxC clock source is: "));
+ LOG((" TRxC clock source is: "));
switch (data & WR11_TRXSRC_SRC_MASK)
{
case WR11_TRXSRC_SRC_XTAL: LOG(("the Oscillator\n")); break;
@@ -1656,9 +1656,9 @@ void z80scc_channel::do_sccreg_wr11(UINT8 data)
the desired rate in bits per second and the BR clock period in seconds. This formula is derived
because the counter decrements from N down to zero-plus-one-cycle for reloading the time constant.
This is then fed to a toggle flip-flop to make the output a square wave.
-
+
Time Constant = Clock Frequency / (2 * Desired Rate * Baud Rate Clock Period) - 2
-
+
*/
void z80scc_channel::do_sccreg_wr12(UINT8 data)
{
@@ -1670,7 +1670,7 @@ void z80scc_channel::do_sccreg_wr12(UINT8 data)
void z80scc_channel::do_sccreg_wr13(UINT8 data)
{
m_wr13 = data;
- LOG(("Z80SCC \"%s\": %c : %s %02x High byte of Time Constant for Baudrate generator - not implemented \n", m_owner->tag(), 'A' + m_index, __func__, data));
+ LOG(("Z80SCC \"%s\": %c : %s %02x High byte of Time Constant for Baudrate generator - not implemented \n", m_owner->tag(), 'A' + m_index, __func__, data));
}
/*
@@ -1743,14 +1743,14 @@ void z80scc_channel::do_sccreg_wr14(UINT8 data)
interrupt. This is true, even if an External/Status condition is pending at the time the bit is set*/
void z80scc_channel::do_sccreg_wr15(UINT8 data)
{
- LOG(("%s(%d) \"%s\": %c : External/Status Control Bits - not implemented\n",
- FUNCNAME, data, m_owner->tag(), 'A' + m_index));
+ LOG(("%s(%d) \"%s\": %c : External/Status Control Bits - not implemented\n",
+ FUNCNAME, data, m_owner->tag(), 'A' + m_index));
m_wr15 = data;
}
/*TODO: Z80X30 Register Access
----------------------------
-The Shift Right/Shift Left bit in the Channel B WR0 controls which bits are decoded to form the register
+The Shift Right/Shift Left bit in the Channel B WR0 controls which bits are decoded to form the register
address. See do_sccreg_wr0() for details */
/*Z85X30 Register Access
@@ -1771,7 +1771,7 @@ The fact that the pointer bits are reset to 0, unless explicitly set otherwise,
RR0 may also be accessed in a single cycle. That is, it is not necessary to write the pointer bits
with 0 before accessing WR0 or RR0.*/
//-------------------------------------------------
-// control_write - write control register
+// control_write - write control register
//-------------------------------------------------
void z80scc_channel::control_write(UINT8 data)
@@ -1782,21 +1782,21 @@ void z80scc_channel::control_write(UINT8 data)
m_uart->m_wr0_ptrbits = 0; // The "Point High" command is only valid for one access
reg &= regmask;
-
+
if (reg != 0)
{
// mask out register index
m_wr0 &= ~regmask;
}
-
+
LOG(("\n%s(%02x) reg %02x, regmask %02x\n", FUNCNAME, data, reg, regmask));
-
+
/* TODO. Sort out 80X30 & other SCC variants limitations in register access */
switch (reg)
{
- case REG_WR0_COMMAND_REGPT: do_sccreg_wr0(data); ;break;
+ case REG_WR0_COMMAND_REGPT: do_sccreg_wr0(data); ;break;
case REG_WR1_INT_DMA_ENABLE: do_sccreg_wr1(data); m_uart->check_interrupts(); break;
- case REG_WR2_INT_VECTOR: do_sccreg_wr2(data); break;
+ case REG_WR2_INT_VECTOR: do_sccreg_wr2(data); break;
case REG_WR3_RX_CONTROL:
do_sccreg_wr3(data);
update_serial();
@@ -1816,13 +1816,13 @@ void z80scc_channel::control_write(UINT8 data)
break;
case REG_WR6_SYNC_OR_SDLC_A: do_sccreg_wr6(data); break;
case REG_WR7_SYNC_OR_SDLC_F: do_sccreg_wr7(data); break;
- case REG_WR8_TRANSMIT_DATA: do_sccreg_wr8(data); break;
+ case REG_WR8_TRANSMIT_DATA: do_sccreg_wr8(data); break;
case REG_WR9_MASTER_INT_CTRL: do_sccreg_wr9(data); break;
case REG_WR10_MSC_RX_TX_CTRL: do_sccreg_wr10(data); break;
- case REG_WR11_CLOCK_MODES: do_sccreg_wr11(data); break;
- case REG_WR12_LO_BAUD_GEN: do_sccreg_wr12(data); break;
- case REG_WR13_HI_BAUD_GEN: do_sccreg_wr13(data); break;
- case REG_WR14_MISC_CTRL: do_sccreg_wr14(data); break;
+ case REG_WR11_CLOCK_MODES: do_sccreg_wr11(data); break;
+ case REG_WR12_LO_BAUD_GEN: do_sccreg_wr12(data); break;
+ case REG_WR13_HI_BAUD_GEN: do_sccreg_wr13(data); break;
+ case REG_WR14_MISC_CTRL: do_sccreg_wr14(data); break;
case REG_WR15_EXT_ST_INT_CTRL:do_sccreg_wr15(data); break;
default:
logerror("Z80SCC \"%s\": %c : Unsupported WRx register:%02x\n", m_owner->tag(), 'A' + m_index, reg);
@@ -1831,7 +1831,7 @@ void z80scc_channel::control_write(UINT8 data)
//-------------------------------------------------
-// data_read - read data register from fifo
+// data_read - read data register from fifo
//-------------------------------------------------
UINT8 z80scc_channel::data_read()
@@ -1855,13 +1855,13 @@ UINT8 z80scc_channel::data_read()
FIFO to preserve the status, it is necessary to issue the Error Reset command to
unlock it. Only the exit location of the FIFO is locked allowing more data to be
received into the other bytes of the Receive FIFO.*/
-
+
// load data from the FIFO
data = m_rx_fifo_rp_data();
-
+
// load error status from the FIFO
m_rr1 = (m_rr1 & ~(RR1_CRC_FRAMING_ERROR | RR1_RX_OVERRUN_ERROR | RR1_PARITY_ERROR)) | m_rx_error_fifo[m_rx_fifo_rp];
-
+
// trigger interrup and lock the fifo if an error is present
if (m_rr1 & (RR1_CRC_FRAMING_ERROR | RR1_RX_OVERRUN_ERROR | RR1_PARITY_ERROR))
{
@@ -1925,13 +1925,13 @@ void z80scc_channel::m_rx_fifo_rp_step()
}
}
-READ8_MEMBER (z80scc_device::da_r) { return m_chanA->data_read(); }
+READ8_MEMBER (z80scc_device::da_r) { return m_chanA->data_read(); }
WRITE8_MEMBER (z80scc_device::da_w) { m_chanA->data_write(data); }
-READ8_MEMBER (z80scc_device::db_r) { return m_chanB->data_read(); }
+READ8_MEMBER (z80scc_device::db_r) { return m_chanB->data_read(); }
WRITE8_MEMBER (z80scc_device::db_w) { m_chanB->data_write(data); }
//-------------------------------------------------
-// data_write - write data register
+// data_write - write data register
//-------------------------------------------------
void z80scc_channel::data_write(UINT8 data)
{
@@ -1962,7 +1962,7 @@ void z80scc_channel::data_write(UINT8 data)
//-------------------------------------------------
-// receive_data - receive data word into fifo
+// receive_data - receive data word into fifo
//-------------------------------------------------
void z80scc_channel::receive_data(UINT8 data)
@@ -2013,7 +2013,7 @@ void z80scc_channel::receive_data(UINT8 data)
//-------------------------------------------------
-// cts_w - clear to send handler
+// cts_w - clear to send handler
//-------------------------------------------------
WRITE_LINE_MEMBER( z80scc_channel::cts_w )
@@ -2052,7 +2052,7 @@ WRITE_LINE_MEMBER( z80scc_channel::cts_w )
//-------------------------------------------------
-// dcd_w - data carrier detected handler
+// dcd_w - data carrier detected handler
//-------------------------------------------------
WRITE_LINE_MEMBER( z80scc_channel::dcd_w )
@@ -2090,7 +2090,7 @@ WRITE_LINE_MEMBER( z80scc_channel::dcd_w )
//-------------------------------------------------
-// ri_w - ring indicator handler
+// ri_w - ring indicator handler
//-------------------------------------------------
WRITE_LINE_MEMBER( z80scc_channel::ri_w )
@@ -2122,7 +2122,7 @@ WRITE_LINE_MEMBER( z80scc_channel::ri_w )
}
//-------------------------------------------------
-// sync_w - sync handler
+// sync_w - sync handler
//-------------------------------------------------
WRITE_LINE_MEMBER( z80scc_channel::sync_w )
{
@@ -2130,7 +2130,7 @@ WRITE_LINE_MEMBER( z80scc_channel::sync_w )
}
//-------------------------------------------------
-// rxc_w - receive clock
+// rxc_w - receive clock
//-------------------------------------------------
WRITE_LINE_MEMBER( z80scc_channel::rxc_w )
{
@@ -2143,17 +2143,17 @@ WRITE_LINE_MEMBER( z80scc_channel::rxc_w )
else if(state)
{
rx_clock_w(m_rx_clock < clocks/2);
-
+
m_rx_clock++;
if (m_rx_clock == clocks)
m_rx_clock = 0;
-
+
}
}
}
//-------------------------------------------------
-// txc_w - transmit clock
+// txc_w - transmit clock
//-------------------------------------------------
WRITE_LINE_MEMBER( z80scc_channel::txc_w )
{
@@ -2166,7 +2166,7 @@ WRITE_LINE_MEMBER( z80scc_channel::txc_w )
else if(state)
{
tx_clock_w(m_tx_clock < clocks/2);
-
+
m_tx_clock++;
if (m_tx_clock == clocks)
m_tx_clock = 0;
@@ -2175,7 +2175,7 @@ WRITE_LINE_MEMBER( z80scc_channel::txc_w )
}
//-------------------------------------------------
-// update_serial -
+// update_serial -
//-------------------------------------------------
void z80scc_channel::update_serial()
{
@@ -2202,18 +2202,18 @@ void z80scc_channel::update_serial()
if (m_rxc > 0)
{
set_rcv_rate(m_rxc / clocks);
- LOG((" - Receiver clock: %d mode: %d rate: %d/%xh\n", m_rxc, clocks, m_rxc / clocks, m_rxc / clocks));
+ LOG((" - Receiver clock: %d mode: %d rate: %d/%xh\n", m_rxc, clocks, m_rxc / clocks, m_rxc / clocks));
}
if (m_txc > 0)
{
set_tra_rate(m_txc / clocks);
- LOG((" - Transmit clock: %d mode: %d rate: %d/%xh\n", m_rxc, clocks, m_rxc / clocks, m_rxc / clocks));
+ LOG((" - Transmit clock: %d mode: %d rate: %d/%xh\n", m_rxc, clocks, m_rxc / clocks, m_rxc / clocks));
}
}
//-------------------------------------------------
-// set_dtr -
+// set_dtr -
//-------------------------------------------------
void z80scc_channel::set_dtr(int state)
{
@@ -2229,8 +2229,8 @@ void z80scc_channel::set_dtr(int state)
//-------------------------------------------------
-// write_rx - called by terminal through rs232/diserial
-// when character is sent to board
+// write_rx - called by terminal through rs232/diserial
+// when character is sent to board
//-------------------------------------------------
WRITE_LINE_MEMBER(z80scc_channel::write_rx)
{
diff --git a/src/devices/machine/z80scc.h b/src/devices/machine/z80scc.h
index 5e21b85bff7..800a9dc3a0f 100644
--- a/src/devices/machine/z80scc.h
+++ b/src/devices/machine/z80scc.h
@@ -2,7 +2,7 @@
// copyright-holders:Joakim Larsson Edstrom
/***************************************************************************
- Z80-SCC Serial Communications Controller emulation
+ Z80-SCC Serial Communications Controller emulation
****************************************************************************
_____ _____ _____ _____
@@ -38,7 +38,7 @@
#include "cpu/z80/z80daisy.h"
//**************************************************************************
-// DEVICE CONFIGURATION MACROS
+// DEVICE CONFIGURATION MACROS
//**************************************************************************
#define MCFG_Z80SCC_ADD(_tag, _clock, _rxa, _txa, _rxb, _txb) \
@@ -101,7 +101,7 @@
//**************************************************************************
-// TYPE DEFINITIONS
+// TYPE DEFINITIONS
//**************************************************************************
// ======================> z80scc_channel
@@ -187,7 +187,7 @@ public:
int m_txc;
// Register state
- // read registers enum
+ // read registers enum
UINT8 m_rr0; // REG_RR0_STATUS
UINT8 m_rr1; // REG_RR1_SPEC_RCV_COND
UINT8 m_rr2; // REG_RR2_INTERRUPT_VECT
@@ -197,7 +197,7 @@ public:
UINT8 m_rr6; // REG_RR6_LSB_OR_RR2
UINT8 m_rr7; // REG_RR7_MSB_OR_RR3
UINT8 m_rr8; // REG_RR8_RECEIVE_DATA
- UINT8 m_rr9; // REG_RR9_WR3_OR_RR13
+ UINT8 m_rr9; // REG_RR9_WR3_OR_RR13
UINT8 m_rr10; // REG_RR10_MISC_STATUS
UINT8 m_rr11; // REG_RR11_WR10_OR_RR15
UINT8 m_rr12; // REG_RR12_LO_TIME_CONST
@@ -205,7 +205,7 @@ public:
UINT8 m_rr14; // REG_RR14_WR7_OR_R10
UINT8 m_rr15; // REG_RR15_WR15_EXT_STAT
- // write registers enum
+ // write registers enum
UINT8 m_wr0; // REG_WR0_COMMAND_REGPT
UINT8 m_wr1; // REG_WR1_INT_DMA_ENABLE
UINT8 m_wr2; // REG_WR2_INT_VECTOR
@@ -229,241 +229,241 @@ protected:
{
INT_TRANSMIT = 0,
INT_EXTERNAL = 1,
- INT_RECEIVE = 2,
- INT_SPECIAL = 3
+ INT_RECEIVE = 2,
+ INT_SPECIAL = 3
};
// Read registers
enum
{
- REG_RR0_STATUS = 0, // SIO
- REG_RR1_SPEC_RCV_COND = 1, // SIO
- REG_RR2_INTERRUPT_VECT = 2, // SIO
- REG_RR3_INTERUPPT_PEND = 3,
- REG_RR4_WR4_OR_RR0 = 4,
- REG_RR5_WR5_OR_RR0 = 5,
- REG_RR6_LSB_OR_RR2 = 6,
- REG_RR7_MSB_OR_RR3 = 7,
- REG_RR8_RECEIVE_DATA = 8,
- REG_RR9_WR3_OR_RR13 = 9,
- REG_RR10_MISC_STATUS = 10,
- REG_RR11_WR10_OR_RR15 = 11,
- REG_RR12_LO_TIME_CONST = 12,
- REG_RR13_HI_TIME_CONST = 13,
- REG_RR14_WR7_OR_R10 = 14,
- REG_RR15_WR15_EXT_STAT = 15
+ REG_RR0_STATUS = 0, // SIO
+ REG_RR1_SPEC_RCV_COND = 1, // SIO
+ REG_RR2_INTERRUPT_VECT = 2, // SIO
+ REG_RR3_INTERUPPT_PEND = 3,
+ REG_RR4_WR4_OR_RR0 = 4,
+ REG_RR5_WR5_OR_RR0 = 5,
+ REG_RR6_LSB_OR_RR2 = 6,
+ REG_RR7_MSB_OR_RR3 = 7,
+ REG_RR8_RECEIVE_DATA = 8,
+ REG_RR9_WR3_OR_RR13 = 9,
+ REG_RR10_MISC_STATUS = 10,
+ REG_RR11_WR10_OR_RR15 = 11,
+ REG_RR12_LO_TIME_CONST = 12,
+ REG_RR13_HI_TIME_CONST = 13,
+ REG_RR14_WR7_OR_R10 = 14,
+ REG_RR15_WR15_EXT_STAT = 15
};
-
+
// Write registers
enum
{
- REG_WR0_COMMAND_REGPT = 0, // SIO
- REG_WR1_INT_DMA_ENABLE = 1, // SIO
- REG_WR2_INT_VECTOR = 2, // SIO
- REG_WR3_RX_CONTROL = 3, // SIO
- REG_WR4_RX_TX_MODES = 4, // SIO
- REG_WR5_TX_CONTROL = 5, // SIO
- REG_WR6_SYNC_OR_SDLC_A = 6, // SIO
- REG_WR7_SYNC_OR_SDLC_F = 7, // SIO
- REG_WR8_TRANSMIT_DATA = 8,
+ REG_WR0_COMMAND_REGPT = 0, // SIO
+ REG_WR1_INT_DMA_ENABLE = 1, // SIO
+ REG_WR2_INT_VECTOR = 2, // SIO
+ REG_WR3_RX_CONTROL = 3, // SIO
+ REG_WR4_RX_TX_MODES = 4, // SIO
+ REG_WR5_TX_CONTROL = 5, // SIO
+ REG_WR6_SYNC_OR_SDLC_A = 6, // SIO
+ REG_WR7_SYNC_OR_SDLC_F = 7, // SIO
+ REG_WR8_TRANSMIT_DATA = 8,
REG_WR9_MASTER_INT_CTRL = 9,
REG_WR10_MSC_RX_TX_CTRL = 10,
- REG_WR11_CLOCK_MODES = 11,
- REG_WR12_LO_BAUD_GEN = 12,
- REG_WR13_HI_BAUD_GEN = 13,
- REG_WR14_MISC_CTRL = 14,
+ REG_WR11_CLOCK_MODES = 11,
+ REG_WR12_LO_BAUD_GEN = 12,
+ REG_WR13_HI_BAUD_GEN = 13,
+ REG_WR14_MISC_CTRL = 14,
REG_WR15_EXT_ST_INT_CTRL= 15
};
enum
{
- RR0_RX_CHAR_AVAILABLE = 0x01, // SIO bit
- RR0_ZC = 0x02, // SCC bit
- RR0_TX_BUFFER_EMPTY = 0x04, // SIO
- RR0_DCD = 0x08, // SIO
- RR0_RI = 0x10, // DART bit? TODO: investigate function and remove
- RR0_SYNC_HUNT = 0x10, // SIO bit, not supported
- RR0_CTS = 0x20, // SIO bit
- RR0_TX_UNDERRUN = 0x40, // SIO bit, not supported
- RR0_BREAK_ABORT = 0x80 // SIO bit, not supported
+ RR0_RX_CHAR_AVAILABLE = 0x01, // SIO bit
+ RR0_ZC = 0x02, // SCC bit
+ RR0_TX_BUFFER_EMPTY = 0x04, // SIO
+ RR0_DCD = 0x08, // SIO
+ RR0_RI = 0x10, // DART bit? TODO: investigate function and remove
+ RR0_SYNC_HUNT = 0x10, // SIO bit, not supported
+ RR0_CTS = 0x20, // SIO bit
+ RR0_TX_UNDERRUN = 0x40, // SIO bit, not supported
+ RR0_BREAK_ABORT = 0x80 // SIO bit, not supported
};
enum
{
- RR1_ALL_SENT = 0x01, // SIO/SCC bit
- RR1_RESIDUE_CODE_MASK = 0x0e, // SIO/SCC bits, not supported
- RR1_PARITY_ERROR = 0x10, // SIO/SCC bits
- RR1_RX_OVERRUN_ERROR = 0x20, // SIO/SCC bits
- RR1_CRC_FRAMING_ERROR = 0x40, // SIO/SCC bits
- RR1_END_OF_FRAME = 0x80 // SIO/SCC bits, not supported
+ RR1_ALL_SENT = 0x01, // SIO/SCC bit
+ RR1_RESIDUE_CODE_MASK = 0x0e, // SIO/SCC bits, not supported
+ RR1_PARITY_ERROR = 0x10, // SIO/SCC bits
+ RR1_RX_OVERRUN_ERROR = 0x20, // SIO/SCC bits
+ RR1_CRC_FRAMING_ERROR = 0x40, // SIO/SCC bits
+ RR1_END_OF_FRAME = 0x80 // SIO/SCC bits, not supported
};
enum
- { // TODO: overload SIO functionality
- RR2_INT_VECTOR_MASK = 0xff, // SCC channel A, SIO channel B (special case)
- RR2_INT_VECTOR_V1 = 0x02, // SIO (special case) /SCC Channel B
- RR2_INT_VECTOR_V2 = 0x04, // SIO (special case) /SCC Channel B
- RR2_INT_VECTOR_V3 = 0x08 // SIO (special case) /SCC Channel B
+ { // TODO: overload SIO functionality
+ RR2_INT_VECTOR_MASK = 0xff, // SCC channel A, SIO channel B (special case)
+ RR2_INT_VECTOR_V1 = 0x02, // SIO (special case) /SCC Channel B
+ RR2_INT_VECTOR_V2 = 0x04, // SIO (special case) /SCC Channel B
+ RR2_INT_VECTOR_V3 = 0x08 // SIO (special case) /SCC Channel B
};
-
+
enum
{
- RR3_CHANB_EXT_IP = 0x01, // SCC IP pending registers
- RR3_CHANB_TX_IP = 0x02, // only read in Channel A (for both channels)
- RR3_CHANB_RX_IP = 0x04, // channel B return all zero
- RR3_CHANA_EXT_IP = 0x08,
- RR3_CHANA_TX_IP = 0x10,
- RR3_CHANA_RX_IP = 0x20
+ RR3_CHANB_EXT_IP = 0x01, // SCC IP pending registers
+ RR3_CHANB_TX_IP = 0x02, // only read in Channel A (for both channels)
+ RR3_CHANB_RX_IP = 0x04, // channel B return all zero
+ RR3_CHANA_EXT_IP = 0x08,
+ RR3_CHANA_TX_IP = 0x10,
+ RR3_CHANA_RX_IP = 0x20
};
-
+
enum // Universal Bus WR0 commands for 85X30
{
- WR0_REGISTER_MASK = 0x07,
- WR0_COMMAND_MASK = 0x38, // COMMANDS
- WR0_NULL = 0x00, // 0 0 0
- WR0_POINT_HIGH = 0x08, // 0 0 1
- WR0_RESET_EXT_STATUS = 0x10, // 0 1 0
- WR0_SEND_ABORT = 0x18, // 0 1 1
- WR0_ENABLE_INT_NEXT_RX = 0x20, // 1 0 0
- WR0_RESET_TX_INT = 0x28, // 1 0 1
- WR0_ERROR_RESET = 0x30, // 1 1 0
- WR0_RESET_HIGHEST_IUS = 0x38, // 1 1 1
- WR0_CRC_RESET_CODE_MASK = 0xc0, // RESET
- WR0_CRC_RESET_NULL = 0x00, // 0 0
- WR0_CRC_RESET_RX = 0x40, // 0 1
- WR0_CRC_RESET_TX = 0x80, // 1 0
+ WR0_REGISTER_MASK = 0x07,
+ WR0_COMMAND_MASK = 0x38, // COMMANDS
+ WR0_NULL = 0x00, // 0 0 0
+ WR0_POINT_HIGH = 0x08, // 0 0 1
+ WR0_RESET_EXT_STATUS = 0x10, // 0 1 0
+ WR0_SEND_ABORT = 0x18, // 0 1 1
+ WR0_ENABLE_INT_NEXT_RX = 0x20, // 1 0 0
+ WR0_RESET_TX_INT = 0x28, // 1 0 1
+ WR0_ERROR_RESET = 0x30, // 1 1 0
+ WR0_RESET_HIGHEST_IUS = 0x38, // 1 1 1
+ WR0_CRC_RESET_CODE_MASK = 0xc0, // RESET
+ WR0_CRC_RESET_NULL = 0x00, // 0 0
+ WR0_CRC_RESET_RX = 0x40, // 0 1
+ WR0_CRC_RESET_TX = 0x80, // 1 0
WR0_CRC_RESET_TX_UNDERRUN = 0xc0 // 1 1
};
enum // ZBUS WR0 commands or 80X30
{
- WR0_Z_COMMAND_MASK = 0x38, // COMMANDS
- WR0_Z_NULL_1 = 0x00, // 0 0 0
- WR0_Z_NULL_2 = 0x08, // 0 0 1
- WR0_Z_RESET_EXT_STATUS = 0x10, // 0 1 0
- WR0_Z_SEND_ABORT = 0x18, // 0 1 1
- WR0_Z_ENABLE_INT_NEXT_RX = 0x20, // 1 0 0
- WR0_Z_RESET_TX_INT = 0x28, // 1 0 1
- WR0_Z_ERROR_RESET = 0x30, // 1 1 0
- WR0_Z_RESET_HIGHEST_IUS = 0x38, // 1 1 1
- WR0_Z_SHIFT_MASK = 0x03, // SHIFT mode SDLC chan B
- WR0_Z_SEL_SHFT_LEFT = 0x02, // 1 0
- WR0_Z_SEL_SHFT_RIGHT = 0x03 // 1 1
+ WR0_Z_COMMAND_MASK = 0x38, // COMMANDS
+ WR0_Z_NULL_1 = 0x00, // 0 0 0
+ WR0_Z_NULL_2 = 0x08, // 0 0 1
+ WR0_Z_RESET_EXT_STATUS = 0x10, // 0 1 0
+ WR0_Z_SEND_ABORT = 0x18, // 0 1 1
+ WR0_Z_ENABLE_INT_NEXT_RX = 0x20, // 1 0 0
+ WR0_Z_RESET_TX_INT = 0x28, // 1 0 1
+ WR0_Z_ERROR_RESET = 0x30, // 1 1 0
+ WR0_Z_RESET_HIGHEST_IUS = 0x38, // 1 1 1
+ WR0_Z_SHIFT_MASK = 0x03, // SHIFT mode SDLC chan B
+ WR0_Z_SEL_SHFT_LEFT = 0x02, // 1 0
+ WR0_Z_SEL_SHFT_RIGHT = 0x03 // 1 1
};
enum
{
- WR1_EXT_INT_ENABLE = 0x01,
- WR1_TX_INT_ENABLE = 0x02,
- WR1_PARITY_IS_SPEC_COND = 0x04,
- WR1_RX_INT_MODE_MASK = 0x18,
- WR1_RX_INT_DISABLE = 0x00,
- WR1_RX_INT_FIRST = 0x08,
- WR1_RX_INT_ALL_PARITY = 0x10, // not supported
- WR1_RX_INT_ALL = 0x18,
- WR1_WRDY_ON_RX_TX = 0x20, // not supported
- WR1_WRDY_FUNCTION = 0x40, // not supported
- WR1_WRDY_ENABLE = 0x80 // not supported
+ WR1_EXT_INT_ENABLE = 0x01,
+ WR1_TX_INT_ENABLE = 0x02,
+ WR1_PARITY_IS_SPEC_COND = 0x04,
+ WR1_RX_INT_MODE_MASK = 0x18,
+ WR1_RX_INT_DISABLE = 0x00,
+ WR1_RX_INT_FIRST = 0x08,
+ WR1_RX_INT_ALL_PARITY = 0x10, // not supported
+ WR1_RX_INT_ALL = 0x18,
+ WR1_WRDY_ON_RX_TX = 0x20, // not supported
+ WR1_WRDY_FUNCTION = 0x40, // not supported
+ WR1_WRDY_ENABLE = 0x80 // not supported
};
enum
{
- WR3_RX_ENABLE = 0x01,
+ WR3_RX_ENABLE = 0x01,
WR3_SYNC_CHAR_LOAD_INHIBIT= 0x02, // not supported
- WR3_ADDRESS_SEARCH_MODE = 0x04, // not supported
- WR3_RX_CRC_ENABLE = 0x08, // not supported
- WR3_ENTER_HUNT_PHASE = 0x10, // not supported
- WR3_AUTO_ENABLES = 0x20,
- WR3_RX_WORD_LENGTH_MASK = 0xc0,
- WR3_RX_WORD_LENGTH_5 = 0x00,
- WR3_RX_WORD_LENGTH_7 = 0x40,
- WR3_RX_WORD_LENGTH_6 = 0x80,
- WR3_RX_WORD_LENGTH_8 = 0xc0
+ WR3_ADDRESS_SEARCH_MODE = 0x04, // not supported
+ WR3_RX_CRC_ENABLE = 0x08, // not supported
+ WR3_ENTER_HUNT_PHASE = 0x10, // not supported
+ WR3_AUTO_ENABLES = 0x20,
+ WR3_RX_WORD_LENGTH_MASK = 0xc0,
+ WR3_RX_WORD_LENGTH_5 = 0x00,
+ WR3_RX_WORD_LENGTH_7 = 0x40,
+ WR3_RX_WORD_LENGTH_6 = 0x80,
+ WR3_RX_WORD_LENGTH_8 = 0xc0
};
enum
{
- WR4_PARITY_ENABLE = 0x01,
- WR4_PARITY_EVEN = 0x02,
- WR4_STOP_BITS_MASK = 0x0c,
- WR4_STOP_BITS_1 = 0x04,
- WR4_STOP_BITS_1_5 = 0x08, // not supported
- WR4_STOP_BITS_2 = 0x0c,
- WR4_SYNC_MODE_MASK = 0x30, // not supported
- WR4_SYNC_MODE_8_BIT = 0x00, // not supported
- WR4_SYNC_MODE_16_BIT = 0x10, // not supported
- WR4_SYNC_MODE_SDLC = 0x20, // not supported
- WR4_SYNC_MODE_EXT = 0x30, // not supported
- WR4_CLOCK_RATE_MASK = 0xc0,
- WR4_CLOCK_RATE_X1 = 0x00,
- WR4_CLOCK_RATE_X16 = 0x40,
- WR4_CLOCK_RATE_X32 = 0x80,
- WR4_CLOCK_RATE_X64 = 0xc0
+ WR4_PARITY_ENABLE = 0x01,
+ WR4_PARITY_EVEN = 0x02,
+ WR4_STOP_BITS_MASK = 0x0c,
+ WR4_STOP_BITS_1 = 0x04,
+ WR4_STOP_BITS_1_5 = 0x08, // not supported
+ WR4_STOP_BITS_2 = 0x0c,
+ WR4_SYNC_MODE_MASK = 0x30, // not supported
+ WR4_SYNC_MODE_8_BIT = 0x00, // not supported
+ WR4_SYNC_MODE_16_BIT = 0x10, // not supported
+ WR4_SYNC_MODE_SDLC = 0x20, // not supported
+ WR4_SYNC_MODE_EXT = 0x30, // not supported
+ WR4_CLOCK_RATE_MASK = 0xc0,
+ WR4_CLOCK_RATE_X1 = 0x00,
+ WR4_CLOCK_RATE_X16 = 0x40,
+ WR4_CLOCK_RATE_X32 = 0x80,
+ WR4_CLOCK_RATE_X64 = 0xc0
};
enum
{
- WR5_TX_CRC_ENABLE = 0x01, // not supported
- WR5_RTS = 0x02,
- WR5_CRC16 = 0x04, // not supported
- WR5_TX_ENABLE = 0x08,
- WR5_SEND_BREAK = 0x10,
- WR5_TX_WORD_LENGTH_MASK = 0x60,
- WR5_TX_WORD_LENGTH_5 = 0x00,
- WR5_TX_WORD_LENGTH_6 = 0x40,
- WR5_TX_WORD_LENGTH_7 = 0x20,
- WR5_TX_WORD_LENGTH_8 = 0x60,
- WR5_DTR = 0x80
+ WR5_TX_CRC_ENABLE = 0x01, // not supported
+ WR5_RTS = 0x02,
+ WR5_CRC16 = 0x04, // not supported
+ WR5_TX_ENABLE = 0x08,
+ WR5_SEND_BREAK = 0x10,
+ WR5_TX_WORD_LENGTH_MASK = 0x60,
+ WR5_TX_WORD_LENGTH_5 = 0x00,
+ WR5_TX_WORD_LENGTH_6 = 0x40,
+ WR5_TX_WORD_LENGTH_7 = 0x20,
+ WR5_TX_WORD_LENGTH_8 = 0x60,
+ WR5_DTR = 0x80
};
/* SCC specifics */
enum
{
- WR9_CMD_MASK = 0xC0,
- WR9_CMD_NORESET = 0x00,
- WR9_CMD_CHNB_RESET = 0x40,
- WR9_CMD_CHNA_RESET = 0x80,
- WR9_CMD_HW_RESET = 0xC0,
- WR9_BIT_VIS = 0x01,
- WR9_BIT_NV = 0x02,
- WR9_BIT_DLC = 0x04,
- WR9_BIT_MIE = 0x08,
- WR9_BIT_SHSL = 0x10,
- WR9_BIT_IACK = 0x20
+ WR9_CMD_MASK = 0xC0,
+ WR9_CMD_NORESET = 0x00,
+ WR9_CMD_CHNB_RESET = 0x40,
+ WR9_CMD_CHNA_RESET = 0x80,
+ WR9_CMD_HW_RESET = 0xC0,
+ WR9_BIT_VIS = 0x01,
+ WR9_BIT_NV = 0x02,
+ WR9_BIT_DLC = 0x04,
+ WR9_BIT_MIE = 0x08,
+ WR9_BIT_SHSL = 0x10,
+ WR9_BIT_IACK = 0x20
};
enum
{
- WR11_RCVCLK_TYPE = 0x80,
+ WR11_RCVCLK_TYPE = 0x80,
WR11_RCVCLK_SRC_MASK = 0x60, // RCV CLOCK
WR11_RCVCLK_SRC_RTXC = 0x00, // 0 0
WR11_RCVCLK_SRC_TRXC = 0x20, // 0 1
- WR11_RCVCLK_SRC_BR = 0x40, // 1 0
+ WR11_RCVCLK_SRC_BR = 0x40, // 1 0
WR11_RCVCLK_SRC_DPLL = 0x60, // 1 1
WR11_TRACLK_SRC_MASK = 0x18, // TRA CLOCK
WR11_TRACLK_SRC_RTXC = 0x00, // 0 0
WR11_TRACLK_SRC_TRXC = 0x08, // 0 1
- WR11_TRACLK_SRC_BR = 0x10, // 1 0
+ WR11_TRACLK_SRC_BR = 0x10, // 1 0
WR11_TRACLK_SRC_DPLL = 0x18, // 1 1
- WR11_TRXC_DIRECTION = 0x04,
+ WR11_TRXC_DIRECTION = 0x04,
WR11_TRXSRC_SRC_MASK = 0x03, // TRXX CLOCK
WR11_TRXSRC_SRC_XTAL = 0x00, // 0 0
- WR11_TRXSRC_SRC_TRA = 0x01, // 0 1
- WR11_TRXSRC_SRC_BR = 0x02, // 1 0
+ WR11_TRXSRC_SRC_TRA = 0x01, // 0 1
+ WR11_TRXSRC_SRC_BR = 0x02, // 1 0
WR11_TRXSRC_SRC_DPLL = 0x03 // 1 1
};
enum
{
- WR14_DPLL_CMD_MASK = 0xe0, // Command
- WR14_CMD_NULL = 0x00, // 0 0 0
- WR14_CMD_ESM = 0x20, // 0 0 1
- WR14_CMD_RMC = 0x40, // 0 1 0
+ WR14_DPLL_CMD_MASK = 0xe0, // Command
+ WR14_CMD_NULL = 0x00, // 0 0 0
+ WR14_CMD_ESM = 0x20, // 0 0 1
+ WR14_CMD_RMC = 0x40, // 0 1 0
WR14_CMD_DISABLE_DPLL = 0x60, // 0 1 1
- WR14_CMD_SS_BGR = 0x80, // 1 0 0
- WR14_CMD_SS_RTXC = 0xa0, // 1 0 1
- WR14_CMD_SET_FM = 0xc0, // 1 1 0
- WR14_CMD_SET_NRZI = 0xe0 // 1 1 1
+ WR14_CMD_SS_BGR = 0x80, // 1 0 0
+ WR14_CMD_SS_RTXC = 0xa0, // 1 0 1
+ WR14_CMD_SET_FM = 0xc0, // 1 1 0
+ WR14_CMD_SET_NRZI = 0xe0 // 1 1 1
};
void update_serial();
@@ -477,39 +477,39 @@ protected:
int get_tx_word_length();
// receiver state
- UINT8 m_rx_data_fifo[8]; // receive data FIFO
- UINT8 m_rx_error_fifo[8]; // receive error FIFO
- UINT8 m_rx_error; // current receive error
- //int m_rx_fifo // receive FIFO pointer
- int m_rx_fifo_rp; // receive FIFO read pointer
- int m_rx_fifo_wp; // receive FIFO write pointer
- int m_rx_fifo_sz; // receive FIFO size
-
- int m_rx_clock; // receive clock pulse count
- int m_rx_first; // first character received
- int m_rx_break; // receive break condition
- UINT8 m_rx_rr0_latch; // read register 0 latched
+ UINT8 m_rx_data_fifo[8]; // receive data FIFO
+ UINT8 m_rx_error_fifo[8]; // receive error FIFO
+ UINT8 m_rx_error; // current receive error
+ //int m_rx_fifo // receive FIFO pointer
+ int m_rx_fifo_rp; // receive FIFO read pointer
+ int m_rx_fifo_wp; // receive FIFO write pointer
+ int m_rx_fifo_sz; // receive FIFO size
+
+ int m_rx_clock; // receive clock pulse count
+ int m_rx_first; // first character received
+ int m_rx_break; // receive break condition
+ UINT8 m_rx_rr0_latch; // read register 0 latched
int m_rxd;
- int m_ri; // ring indicator latch
- int m_cts; // clear to send latch
- int m_dcd; // data carrier detect latch
+ int m_ri; // ring indicator latch
+ int m_cts; // clear to send latch
+ int m_dcd; // data carrier detect latch
// transmitter state
- UINT8 m_tx_data; // transmit data register
- int m_tx_clock; // transmit clock pulse count
+ UINT8 m_tx_data; // transmit data register
+ int m_tx_clock; // transmit clock pulse count
- int m_dtr; // data terminal ready
- int m_rts; // request to send
+ int m_dtr; // data terminal ready
+ int m_rts; // request to send
// synchronous state
- UINT16 m_sync; // sync character
+ UINT16 m_sync; // sync character
int m_index;
z80scc_device *m_uart;
// SCC specifics
- int m_ph; // Point high command to access regs 08-0f
+ int m_ph; // Point high command to access regs 08-0f
UINT8 m_zc;
};
@@ -607,7 +607,7 @@ protected:
// Variants in the SCC family
enum
{
- TYPE_Z80SCC = 0x001,
+ TYPE_Z80SCC = 0x001,
TYPE_SCC8030 = 0x002,
TYPE_SCC80C30 = 0x004,
TYPE_SCC80230 = 0x008,
@@ -621,10 +621,10 @@ protected:
#define SET_NMOS ( z80scc_device::TYPE_SCC8030 | z80scc_device::TYPE_SCC8530 )
#define SET_CMOS ( z80scc_device::TYPE_SCC80C30 | z80scc_device::TYPE_SCC85C30 )
#define SET_ESCC ( z80scc_device::TYPE_SCC80230 | z80scc_device::TYPE_SCC85230 | z80scc_device::TYPE_SCC8523L )
-#define SET_EMSCC z80scc_device::TYPE_SCC85233
+#define SET_EMSCC z80scc_device::TYPE_SCC85233
#define SET_Z80X30 ( z80scc_device::TYPE_SCC8030 | z80scc_device::TYPE_SCC80C30 | z80scc_device::TYPE_SCC80230 )
#define SET_Z85X3X ( z80scc_device::TYPE_SCC8530 | z80scc_device::TYPE_SCC85C30 | z80scc_device::TYPE_SCC85230 \
- | z80scc_device::TYPE_SCC8523L | z80scc_device::TYPE_SCC85233 )
+ | z80scc_device::TYPE_SCC8523L | z80scc_device::TYPE_SCC85233 )
enum
{
@@ -641,25 +641,25 @@ protected:
int m_rxcb;
int m_txcb;
- devcb_write_line m_out_txda_cb;
- devcb_write_line m_out_dtra_cb;
- devcb_write_line m_out_rtsa_cb;
- devcb_write_line m_out_wrdya_cb;
- devcb_write_line m_out_synca_cb;
-
- devcb_write_line m_out_txdb_cb;
- devcb_write_line m_out_dtrb_cb;
- devcb_write_line m_out_rtsb_cb;
- devcb_write_line m_out_wrdyb_cb;
- devcb_write_line m_out_syncb_cb;
-
- devcb_write_line m_out_int_cb;
- devcb_write_line m_out_rxdrqa_cb;
- devcb_write_line m_out_txdrqa_cb;
- devcb_write_line m_out_rxdrqb_cb;
- devcb_write_line m_out_txdrqb_cb;
-
- int m_int_state[6]; // interrupt state
+ devcb_write_line m_out_txda_cb;
+ devcb_write_line m_out_dtra_cb;
+ devcb_write_line m_out_rtsa_cb;
+ devcb_write_line m_out_wrdya_cb;
+ devcb_write_line m_out_synca_cb;
+
+ devcb_write_line m_out_txdb_cb;
+ devcb_write_line m_out_dtrb_cb;
+ devcb_write_line m_out_rtsb_cb;
+ devcb_write_line m_out_wrdyb_cb;
+ devcb_write_line m_out_syncb_cb;
+
+ devcb_write_line m_out_int_cb;
+ devcb_write_line m_out_rxdrqa_cb;
+ devcb_write_line m_out_txdrqa_cb;
+ devcb_write_line m_out_rxdrqb_cb;
+ devcb_write_line m_out_txdrqb_cb;
+
+ int m_int_state[6]; // interrupt state
int m_variant;
UINT8 m_wr0_ptrbits;
diff --git a/src/devices/machine/z80sio.c b/src/devices/machine/z80sio.c
index 09c0e46663f..00f65a8e6b4 100644
--- a/src/devices/machine/z80sio.c
+++ b/src/devices/machine/z80sio.c
@@ -50,7 +50,7 @@
#include "z80sio.h"
//**************************************************************************
-// MACROS / CONSTANTS
+// MACROS / CONSTANTS
//**************************************************************************
#define VERBOSE 0
@@ -68,13 +68,13 @@
#define FUNCNAME __PRETTY_FUNCTION__
#endif
-#define CHANA_TAG "cha"
-#define CHANB_TAG "chb"
+#define CHANA_TAG "cha"
+#define CHANB_TAG "chb"
//**************************************************************************
-// DEVICE DEFINITIONS
+// DEVICE DEFINITIONS
//**************************************************************************
// device type definition
@@ -82,7 +82,7 @@ const device_type Z80SIO = &device_creator<z80sio_device>;
const device_type Z80SIO_CHANNEL = &device_creator<z80sio_channel>;
//-------------------------------------------------
-// device_mconfig_additions -
+// device_mconfig_additions -
//-------------------------------------------------
MACHINE_CONFIG_FRAGMENT( z80sio )
@@ -96,11 +96,11 @@ machine_config_constructor z80sio_device::device_mconfig_additions() const
}
//**************************************************************************
-// LIVE DEVICE
+// LIVE DEVICE
//**************************************************************************
//-------------------------------------------------
-// z80sio_device - constructor
+// z80sio_device - constructor
//-------------------------------------------------
z80sio_device::z80sio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
@@ -164,7 +164,7 @@ z80sio_device::z80sio_device(const machine_config &mconfig, const char *tag, dev
}
//-------------------------------------------------
-// device_start - device-specific startup
+// device_start - device-specific startup
//-------------------------------------------------
void z80sio_device::device_start()
{
@@ -200,7 +200,7 @@ void z80sio_device::device_start()
//-------------------------------------------------
-// device_reset - device-specific reset
+// device_reset - device-specific reset
//-------------------------------------------------
void z80sio_device::device_reset()
{
@@ -211,7 +211,7 @@ void z80sio_device::device_reset()
}
//-------------------------------------------------
-// z80daisy_irq_state - get interrupt status
+// z80daisy_irq_state - get interrupt status
//-------------------------------------------------
int z80sio_device::z80daisy_irq_state()
{
@@ -220,8 +220,8 @@ int z80sio_device::z80daisy_irq_state()
LOG(("%s %s A:%d%d%d%d B:%d%d%d%d ",FUNCNAME, tag(),
- m_int_state[0], m_int_state[1], m_int_state[2], m_int_state[3],
- m_int_state[4], m_int_state[5], m_int_state[6], m_int_state[7]));
+ m_int_state[0], m_int_state[1], m_int_state[2], m_int_state[3],
+ m_int_state[4], m_int_state[5], m_int_state[6], m_int_state[7]));
// loop over all interrupt sources
for (i = 0; i < 8; i++)
@@ -236,13 +236,13 @@ int z80sio_device::z80daisy_irq_state()
}
LOG(("Interrupt State %u\n", state));
-
+
return state;
}
//-------------------------------------------------
-// z80daisy_irq_ack - interrupt acknowledge
+// z80daisy_irq_ack - interrupt acknowledge
//-------------------------------------------------
int z80sio_device::z80daisy_irq_ack()
{
@@ -274,7 +274,7 @@ int z80sio_device::z80daisy_irq_ack()
//-------------------------------------------------
-// z80daisy_irq_reti - return from interrupt
+// z80daisy_irq_reti - return from interrupt
//-------------------------------------------------
void z80sio_device::z80daisy_irq_reti()
{
@@ -300,7 +300,7 @@ void z80sio_device::z80daisy_irq_reti()
//-------------------------------------------------
-// check_interrupts -
+// check_interrupts -
//-------------------------------------------------
void z80sio_device::check_interrupts()
{
@@ -311,7 +311,7 @@ void z80sio_device::check_interrupts()
//-------------------------------------------------
-// reset_interrupts -
+// reset_interrupts -
//-------------------------------------------------
void z80sio_device::reset_interrupts()
{
@@ -327,7 +327,7 @@ void z80sio_device::reset_interrupts()
//-------------------------------------------------
-// trigger_interrupt - TODO: needs attention for SIO
+// trigger_interrupt - TODO: needs attention for SIO
//-------------------------------------------------
void z80sio_device::trigger_interrupt(int index, int state)
{
@@ -384,7 +384,7 @@ void z80sio_device::trigger_interrupt(int index, int state)
// status affects vector
vector = (m_chanB->m_wr2 & 0xf1) | (!index << 3) | (state << 1);
}
-// }
+// }
// update vector register
m_chanB->m_rr2 = vector;
@@ -398,7 +398,7 @@ void z80sio_device::trigger_interrupt(int index, int state)
//-------------------------------------------------
-// m1_r - interrupt acknowledge
+// m1_r - interrupt acknowledge
//-------------------------------------------------
int z80sio_device::m1_r()
{
@@ -408,7 +408,7 @@ int z80sio_device::m1_r()
//-------------------------------------------------
-// cd_ba_r -
+// cd_ba_r -
//-------------------------------------------------
READ8_MEMBER( z80sio_device::cd_ba_r )
{
@@ -423,7 +423,7 @@ READ8_MEMBER( z80sio_device::cd_ba_r )
//-------------------------------------------------
-// cd_ba_w -
+// cd_ba_w -
//-------------------------------------------------
WRITE8_MEMBER( z80sio_device::cd_ba_w )
{
@@ -441,7 +441,7 @@ WRITE8_MEMBER( z80sio_device::cd_ba_w )
//-------------------------------------------------
-// ba_cd_r -
+// ba_cd_r -
//-------------------------------------------------
READ8_MEMBER( z80sio_device::ba_cd_r )
{
@@ -456,7 +456,7 @@ READ8_MEMBER( z80sio_device::ba_cd_r )
//-------------------------------------------------
-// ba_cd_w -
+// ba_cd_w -
//-------------------------------------------------
WRITE8_MEMBER( z80sio_device::ba_cd_w )
{
@@ -473,11 +473,11 @@ WRITE8_MEMBER( z80sio_device::ba_cd_w )
}
//**************************************************************************
-// SIO CHANNEL
+// SIO CHANNEL
//**************************************************************************
//-------------------------------------------------
-// z80sio_channel - constructor
+// z80sio_channel - constructor
//-------------------------------------------------
z80sio_channel::z80sio_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z80SIO_CHANNEL, "Z80 SIO channel", tag, owner, clock, "z80sio_channel", __FILE__),
@@ -512,7 +512,7 @@ z80sio_channel::z80sio_channel(const machine_config &mconfig, const char *tag, d
//-------------------------------------------------
-// start - channel startup
+// start - channel startup
//-------------------------------------------------
void z80sio_channel::device_start()
{
@@ -555,7 +555,7 @@ void z80sio_channel::device_start()
//-------------------------------------------------
-// reset - reset channel status
+// reset - reset channel status
//-------------------------------------------------
void z80sio_channel::device_reset()
{
@@ -590,7 +590,7 @@ void z80sio_channel::device_timer(emu_timer &timer, device_timer_id id, int para
}
//-------------------------------------------------
-// tra_callback -
+// tra_callback -
//-------------------------------------------------
void z80sio_channel::tra_callback()
{
@@ -615,7 +615,7 @@ void z80sio_channel::tra_callback()
else if (!is_transmit_register_empty())
{
int db = transmit_register_get_data_bit();
-
+
LOG(("%" I64FMT "d %s() \"%s \"Channel %c transmit data bit %d m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, db, m_wr5));
// transmit data
if (m_index == z80sio_device::CHANNEL_A)
@@ -632,7 +632,7 @@ void z80sio_channel::tra_callback()
//-------------------------------------------------
-// tra_complete -
+// tra_complete -
//-------------------------------------------------
void z80sio_channel::tra_complete()
{
@@ -683,7 +683,7 @@ void z80sio_channel::tra_complete()
//-------------------------------------------------
-// rcv_callback -
+// rcv_callback -
//-------------------------------------------------
void z80sio_channel::rcv_callback()
{
@@ -703,7 +703,7 @@ void z80sio_channel::rcv_callback()
//-------------------------------------------------
-// rcv_complete -
+// rcv_complete -
//-------------------------------------------------
void z80sio_channel::rcv_complete()
{
@@ -717,7 +717,7 @@ void z80sio_channel::rcv_complete()
//-------------------------------------------------
-// get_clock_mode - get clock divisor
+// get_clock_mode - get clock divisor
//-------------------------------------------------
int z80sio_channel::get_clock_mode()
@@ -727,10 +727,10 @@ int z80sio_channel::get_clock_mode()
switch (m_wr4 & WR4_CLOCK_RATE_MASK)
{
- case WR4_CLOCK_RATE_X1: clocks = 1; break;
- case WR4_CLOCK_RATE_X16: clocks = 16; break;
- case WR4_CLOCK_RATE_X32: clocks = 32; break;
- case WR4_CLOCK_RATE_X64: clocks = 64; break;
+ case WR4_CLOCK_RATE_X1: clocks = 1; break;
+ case WR4_CLOCK_RATE_X16: clocks = 16; break;
+ case WR4_CLOCK_RATE_X32: clocks = 32; break;
+ case WR4_CLOCK_RATE_X64: clocks = 64; break;
}
return clocks;
@@ -758,7 +758,7 @@ void z80sio_channel::set_rts(int state)
void z80sio_channel::update_rts()
{
- // LOG(("%s(%d) \"%s\" Channel %c \n", FUNCNAME, state, m_owner->tag(), 'A' + m_index));
+ // LOG(("%s(%d) \"%s\" Channel %c \n", FUNCNAME, state, m_owner->tag(), 'A' + m_index));
LOG(("%s() \"%s\" Channel %c \n", FUNCNAME, m_owner->tag(), 'A' + m_index));
if (m_wr5 & WR5_RTS)
{
@@ -771,13 +771,13 @@ void z80sio_channel::update_rts()
// when the RTS bit is reset, the _RTS output goes high after the transmitter empties
m_rts = 0;
}
-
+
// data terminal ready output follows the state programmed into the DTR bit*/
set_dtr((m_wr5 & WR5_DTR) ? 0 : 1);
}
//-------------------------------------------------
-// get_stop_bits - get number of stop bits
+// get_stop_bits - get number of stop bits
//-------------------------------------------------
device_serial_interface::stop_bits_t z80sio_channel::get_stop_bits()
@@ -795,7 +795,7 @@ device_serial_interface::stop_bits_t z80sio_channel::get_stop_bits()
//-------------------------------------------------
-// get_rx_word_length - get receive word length
+// get_rx_word_length - get receive word length
//-------------------------------------------------
int z80sio_channel::get_rx_word_length()
@@ -805,10 +805,10 @@ int z80sio_channel::get_rx_word_length()
switch (m_wr3 & WR3_RX_WORD_LENGTH_MASK)
{
- case WR3_RX_WORD_LENGTH_5: bits = 5; break;
- case WR3_RX_WORD_LENGTH_6: bits = 6; break;
- case WR3_RX_WORD_LENGTH_7: bits = 7; break;
- case WR3_RX_WORD_LENGTH_8: bits = 8; break;
+ case WR3_RX_WORD_LENGTH_5: bits = 5; break;
+ case WR3_RX_WORD_LENGTH_6: bits = 6; break;
+ case WR3_RX_WORD_LENGTH_7: bits = 7; break;
+ case WR3_RX_WORD_LENGTH_8: bits = 8; break;
}
return bits;
@@ -816,7 +816,7 @@ int z80sio_channel::get_rx_word_length()
//-------------------------------------------------
-// get_tx_word_length - get transmit word length
+// get_tx_word_length - get transmit word length
//-------------------------------------------------
int z80sio_channel::get_tx_word_length()
@@ -826,10 +826,10 @@ int z80sio_channel::get_tx_word_length()
switch (m_wr5 & WR5_TX_WORD_LENGTH_MASK)
{
- case WR5_TX_WORD_LENGTH_5: bits = 5; break;
- case WR5_TX_WORD_LENGTH_6: bits = 6; break;
- case WR5_TX_WORD_LENGTH_7: bits = 7; break;
- case WR5_TX_WORD_LENGTH_8: bits = 8; break;
+ case WR5_TX_WORD_LENGTH_5: bits = 5; break;
+ case WR5_TX_WORD_LENGTH_6: bits = 6; break;
+ case WR5_TX_WORD_LENGTH_7: bits = 7; break;
+ case WR5_TX_WORD_LENGTH_8: bits = 8; break;
}
return bits;
@@ -869,7 +869,7 @@ UINT8 z80sio_channel::do_sioreg_rr2()
//-------------------------------------------------
-// control_read - read control register
+// control_read - read control register
//-------------------------------------------------
UINT8 z80sio_channel::control_read()
@@ -886,8 +886,8 @@ UINT8 z80sio_channel::control_read()
switch (reg)
{
- case REG_RR0_STATUS: data = do_sioreg_rr0(); break;
- case REG_RR1_SPEC_RCV_COND: data = do_sioreg_rr1(); break;
+ case REG_RR0_STATUS: data = do_sioreg_rr0(); break;
+ case REG_RR1_SPEC_RCV_COND: data = do_sioreg_rr1(); break;
case REG_RR2_INTERRUPT_VECT: data = do_sioreg_rr2(); break;
default:
logerror("Z80SIO \"%s\" Channel %c : Unsupported RRx register:%02x\n", m_owner->tag(), 'A' + m_index, reg);
@@ -937,8 +937,8 @@ void z80sio_channel::do_sioreg_wr0(UINT8 data)
// update register to reflect wire values TODO: Check if this will fire new interrupts
if (!m_dcd) m_rr0 |= RR0_DCD;
if (m_sync) m_rr0 |= RR0_SYNC_HUNT;
- if (m_cts) m_rr0 |= RR0_CTS;
-
+ if (m_cts) m_rr0 |= RR0_CTS;
+
LOG(("Z80SIO \"%s\" Channel %c : Reset External/Status Interrupt\n", m_owner->tag(), 'A' + m_index));
break;
case WR0_CHANNEL_RESET:
@@ -968,7 +968,7 @@ void z80sio_channel::do_sioreg_wr0(UINT8 data)
break;
default:
LOG(("Z80SIO \"%s\" Channel %c : Unsupported WR0 command %02x mask %02x\n", m_owner->tag(), 'A' + m_index, data, WR0_REGISTER_MASK));
-
+
}
do_sioreg_wr0_resets(data);
}
@@ -983,21 +983,21 @@ void z80sio_channel::do_sioreg_wr1(UINT8 data)
LOG(("Z80SIO \"%s\" Channel %c : Wait/Ready Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR1_WRDY_ENABLE) ? 1 : 0));
LOG(("Z80SIO \"%s\" Channel %c : Wait/Ready Function %s\n", m_owner->tag(), 'A' + m_index, (data & WR1_WRDY_FUNCTION) ? "Ready" : "Wait"));
LOG(("Z80SIO \"%s\" Channel %c : Wait/Ready on %s\n", m_owner->tag(), 'A' + m_index, (data & WR1_WRDY_ON_RX_TX) ? "Receive" : "Transmit"));
-
+
switch (data & WR1_RX_INT_MODE_MASK)
{
case WR1_RX_INT_DISABLE:
LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt Disabled\n", m_owner->tag(), 'A' + m_index));
break;
-
+
case WR1_RX_INT_FIRST:
LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt on First Character\n", m_owner->tag(), 'A' + m_index));
break;
-
+
case WR1_RX_INT_ALL_PARITY:
LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt on All Characters, Parity Affects Vector\n", m_owner->tag(), 'A' + m_index));
break;
-
+
case WR1_RX_INT_ALL:
LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt on All Characters\n", m_owner->tag(), 'A' + m_index));
break;
@@ -1058,30 +1058,30 @@ void z80sio_channel::do_sioreg_wr7(UINT8 data)
}
//-------------------------------------------------
-// control_write - write control register
+// control_write - write control register
//-------------------------------------------------
void z80sio_channel::control_write(UINT8 data)
{
- UINT8 reg = m_wr0 & WR0_REGISTER_MASK;
+ UINT8 reg = m_wr0 & WR0_REGISTER_MASK;
if (reg != 0)
{
// mask out register index
m_wr0 &= ~WR0_REGISTER_MASK;
}
-
+
LOG(("\n%s(%02x) reg %02x\n", FUNCNAME, data, reg));
-
+
switch (reg)
{
- case REG_WR0_COMMAND_REGPT: do_sioreg_wr0(data); break;
- case REG_WR1_INT_DMA_ENABLE: do_sioreg_wr1(data); m_uart->check_interrupts(); break;
- case REG_WR2_INT_VECTOR: do_sioreg_wr2(data); break;
- case REG_WR3_RX_CONTROL: do_sioreg_wr3(data); update_serial(); break;
- case REG_WR4_RX_TX_MODES: do_sioreg_wr4(data); update_serial(); break;
- case REG_WR5_TX_CONTROL: do_sioreg_wr5(data); update_serial(); update_rts(); break;
- case REG_WR6_SYNC_OR_SDLC_A: do_sioreg_wr6(data); break;
- case REG_WR7_SYNC_OR_SDLC_F: do_sioreg_wr7(data); break;
+ case REG_WR0_COMMAND_REGPT: do_sioreg_wr0(data); break;
+ case REG_WR1_INT_DMA_ENABLE: do_sioreg_wr1(data); m_uart->check_interrupts(); break;
+ case REG_WR2_INT_VECTOR: do_sioreg_wr2(data); break;
+ case REG_WR3_RX_CONTROL: do_sioreg_wr3(data); update_serial(); break;
+ case REG_WR4_RX_TX_MODES: do_sioreg_wr4(data); update_serial(); break;
+ case REG_WR5_TX_CONTROL: do_sioreg_wr5(data); update_serial(); update_rts(); break;
+ case REG_WR6_SYNC_OR_SDLC_A: do_sioreg_wr6(data); break;
+ case REG_WR7_SYNC_OR_SDLC_F: do_sioreg_wr7(data); break;
default:
logerror("Z80SIO \"%s\" Channel %c : Unsupported WRx register:%02x\n", m_owner->tag(), 'A' + m_index, reg);
}
@@ -1089,7 +1089,7 @@ void z80sio_channel::control_write(UINT8 data)
//-------------------------------------------------
-// data_read - read data register
+// data_read - read data register
//-------------------------------------------------
UINT8 z80sio_channel::data_read()
{
@@ -1099,28 +1099,28 @@ UINT8 z80sio_channel::data_read()
{
// load data from the FIFO
data = m_rx_data_fifo[m_rx_fifo];
-
+
// load error status from the FIFO
m_rr1 = (m_rr1 & ~(RR1_CRC_FRAMING_ERROR | RR1_RX_OVERRUN_ERROR | RR1_PARITY_ERROR)) | m_rx_error_fifo[m_rx_fifo];
-
+
// decrease FIFO pointer
m_rx_fifo--;
-
+
if (m_rx_fifo < 0)
{
// no more characters available in the FIFO
m_rr0 &= ~ RR0_RX_CHAR_AVAILABLE;
}
}
-
+
LOG(("Z80SIO \"%s\" Channel %c : Data Register Read '%02x'\n", m_owner->tag(), 'A' + m_index, data));
-
+
return data;
}
-
+
//-------------------------------------------------
-// data_write - write data register
+// data_write - write data register
//-------------------------------------------------
void z80sio_channel::data_write(UINT8 data)
{
@@ -1140,7 +1140,7 @@ void z80sio_channel::data_write(UINT8 data)
}
else
{
- LOG((" Transmitter %s, data byte dropped\n", m_wr5 & WR5_TX_ENABLE ? "not enabled" : "not emptied"));
+ LOG((" Transmitter %s, data byte dropped\n", m_wr5 & WR5_TX_ENABLE ? "not enabled" : "not emptied"));
m_rr0 &= ~RR0_TX_BUFFER_EMPTY;
}
@@ -1149,7 +1149,7 @@ void z80sio_channel::data_write(UINT8 data)
//-------------------------------------------------
-// receive_data - receive data word
+// receive_data - receive data word
//-------------------------------------------------
void z80sio_channel::receive_data(UINT8 data)
{
@@ -1157,7 +1157,7 @@ void z80sio_channel::receive_data(UINT8 data)
if (m_rx_fifo == 2)
{
- LOG((" Overrun detected\n"));
+ LOG((" Overrun detected\n"));
// receive overrun error detected
m_rx_error |= RR1_RX_OVERRUN_ERROR;
@@ -1180,13 +1180,13 @@ void z80sio_channel::receive_data(UINT8 data)
{
m_rx_fifo++;
}
-
+
// store received character and error status into FIFO
m_rx_data_fifo[m_rx_fifo] = data;
m_rx_error_fifo[m_rx_fifo] = m_rx_error;
-
+
m_rr0 |= RR0_RX_CHAR_AVAILABLE;
-
+
// receive interrupt
switch (m_wr1 & WR1_RX_INT_MODE_MASK)
{
@@ -1210,7 +1210,7 @@ void z80sio_channel::receive_data(UINT8 data)
//-------------------------------------------------
-// cts_w - clear to send handler
+// cts_w - clear to send handler
//-------------------------------------------------
WRITE_LINE_MEMBER( z80sio_channel::cts_w )
@@ -1249,7 +1249,7 @@ WRITE_LINE_MEMBER( z80sio_channel::cts_w )
//-------------------------------------------------
-// dcd_w - data carrier detected handler
+// dcd_w - data carrier detected handler
//-------------------------------------------------
WRITE_LINE_MEMBER( z80sio_channel::dcd_w )
@@ -1287,7 +1287,7 @@ WRITE_LINE_MEMBER( z80sio_channel::dcd_w )
//-------------------------------------------------
-// sh_w - Sync Hunt handler
+// sh_w - Sync Hunt handler
//-------------------------------------------------
WRITE_LINE_MEMBER( z80sio_channel::sync_w )
@@ -1320,7 +1320,7 @@ WRITE_LINE_MEMBER( z80sio_channel::sync_w )
//-------------------------------------------------
-// rxc_w - receive clock
+// rxc_w - receive clock
//-------------------------------------------------
WRITE_LINE_MEMBER( z80sio_channel::rxc_w )
@@ -1342,7 +1342,7 @@ WRITE_LINE_MEMBER( z80sio_channel::rxc_w )
//-------------------------------------------------
-// txc_w - transmit clock
+// txc_w - transmit clock
//-------------------------------------------------
WRITE_LINE_MEMBER( z80sio_channel::txc_w )
@@ -1364,7 +1364,7 @@ WRITE_LINE_MEMBER( z80sio_channel::txc_w )
//-------------------------------------------------
-// update_serial -
+// update_serial -
//-------------------------------------------------
void z80sio_channel::update_serial()
{
@@ -1402,7 +1402,7 @@ void z80sio_channel::update_serial()
//-------------------------------------------------
-// set_dtr -
+// set_dtr -
//-------------------------------------------------
void z80sio_channel::set_dtr(int state)
@@ -1417,7 +1417,7 @@ void z80sio_channel::set_dtr(int state)
}
//-------------------------------------------------
-// write_rx -
+// write_rx -
//-------------------------------------------------
WRITE_LINE_MEMBER(z80sio_channel::write_rx)
diff --git a/src/devices/machine/z80sio.h b/src/devices/machine/z80sio.h
index bf75e8fe362..dc04bd5c020 100644
--- a/src/devices/machine/z80sio.h
+++ b/src/devices/machine/z80sio.h
@@ -59,7 +59,7 @@
#include "cpu/z80/z80daisy.h"
//**************************************************************************
-// DEVICE CONFIGURATION MACROS
+// DEVICE CONFIGURATION MACROS
//**************************************************************************
#define MCFG_Z80SIO_ADD(_tag, _clock, _rxa, _txa, _rxb, _txb) \
@@ -116,7 +116,7 @@
//**************************************************************************
-// TYPE DEFINITIONS
+// TYPE DEFINITIONS
//**************************************************************************
// ======================> z80sio_channel
@@ -146,7 +146,7 @@ public:
UINT8 do_sioreg_rr0();
UINT8 do_sioreg_rr1();
UINT8 do_sioreg_rr2();
-
+
// write register handlers
void do_sioreg_wr0(UINT8 data);
void do_sioreg_wr0_resets(UINT8 data);
@@ -157,7 +157,7 @@ public:
void do_sioreg_wr5(UINT8 data);
void do_sioreg_wr6(UINT8 data);
void do_sioreg_wr7(UINT8 data);
-
+
UINT8 control_read();
void control_write(UINT8 data);
@@ -178,11 +178,11 @@ public:
int m_txc;
// Register state
- // read registers enum
+ // read registers enum
UINT8 m_rr0; // REG_RR0_STATUS
UINT8 m_rr1; // REG_RR1_SPEC_RCV_COND
UINT8 m_rr2; // REG_RR2_INTERRUPT_VECT
- // write registers enum
+ // write registers enum
UINT8 m_wr0; // REG_WR0_COMMAND_REGPT
UINT8 m_wr1; // REG_WR1_INT_DMA_ENABLE
UINT8 m_wr2; // REG_WR2_INT_VECTOR
@@ -206,153 +206,153 @@ protected:
// Read registers
enum
{
- REG_RR0_STATUS = 0,
- REG_RR1_SPEC_RCV_COND = 1,
- REG_RR2_INTERRUPT_VECT = 2
+ REG_RR0_STATUS = 0,
+ REG_RR1_SPEC_RCV_COND = 1,
+ REG_RR2_INTERRUPT_VECT = 2
};
-
+
// Write registers
enum
{
- REG_WR0_COMMAND_REGPT = 0,
- REG_WR1_INT_DMA_ENABLE = 1,
- REG_WR2_INT_VECTOR = 2,
- REG_WR3_RX_CONTROL = 3,
- REG_WR4_RX_TX_MODES = 4,
- REG_WR5_TX_CONTROL = 5,
- REG_WR6_SYNC_OR_SDLC_A = 6,
- REG_WR7_SYNC_OR_SDLC_F = 7
+ REG_WR0_COMMAND_REGPT = 0,
+ REG_WR1_INT_DMA_ENABLE = 1,
+ REG_WR2_INT_VECTOR = 2,
+ REG_WR3_RX_CONTROL = 3,
+ REG_WR4_RX_TX_MODES = 4,
+ REG_WR5_TX_CONTROL = 5,
+ REG_WR6_SYNC_OR_SDLC_A = 6,
+ REG_WR7_SYNC_OR_SDLC_F = 7
};
-
+
enum
{
- RR0_RX_CHAR_AVAILABLE = 0x01,
- RR0_INTERRUPT_PENDING = 0x02,
- RR0_TX_BUFFER_EMPTY = 0x04,
- RR0_DCD = 0x08,
- RR0_SYNC_HUNT = 0x10,
- RR0_CTS = 0x20,
- RR0_TX_UNDERRUN = 0x40,
- RR0_BREAK_ABORT = 0x80
+ RR0_RX_CHAR_AVAILABLE = 0x01,
+ RR0_INTERRUPT_PENDING = 0x02,
+ RR0_TX_BUFFER_EMPTY = 0x04,
+ RR0_DCD = 0x08,
+ RR0_SYNC_HUNT = 0x10,
+ RR0_CTS = 0x20,
+ RR0_TX_UNDERRUN = 0x40,
+ RR0_BREAK_ABORT = 0x80
};
enum
{
- RR1_ALL_SENT = 0x01,
- RR1_RESIDUE_CODE_MASK = 0x0e,
- RR1_PARITY_ERROR = 0x10,
- RR1_RX_OVERRUN_ERROR = 0x20,
- RR1_CRC_FRAMING_ERROR = 0x40,
- RR1_END_OF_FRAME = 0x80
+ RR1_ALL_SENT = 0x01,
+ RR1_RESIDUE_CODE_MASK = 0x0e,
+ RR1_PARITY_ERROR = 0x10,
+ RR1_RX_OVERRUN_ERROR = 0x20,
+ RR1_CRC_FRAMING_ERROR = 0x40,
+ RR1_END_OF_FRAME = 0x80
};
enum
- { // TODO: overload SIO functionality
- RR2_INT_VECTOR_MASK = 0xff, // SCC channel A, SIO channel B (special case)
- RR2_INT_VECTOR_V1 = 0x02, // SIO (special case) /SCC Channel B
- RR2_INT_VECTOR_V2 = 0x04, // SIO (special case) /SCC Channel B
- RR2_INT_VECTOR_V3 = 0x08 // SIO (special case) /SCC Channel B
+ { // TODO: overload SIO functionality
+ RR2_INT_VECTOR_MASK = 0xff, // SCC channel A, SIO channel B (special case)
+ RR2_INT_VECTOR_V1 = 0x02, // SIO (special case) /SCC Channel B
+ RR2_INT_VECTOR_V2 = 0x04, // SIO (special case) /SCC Channel B
+ RR2_INT_VECTOR_V3 = 0x08 // SIO (special case) /SCC Channel B
};
-
+
enum
{
- WR0_REGISTER_MASK = 0x07,
- WR0_COMMAND_MASK = 0x38,
- WR0_NULL = 0x00,
- WR0_SEND_ABORT = 0x08, // not supported
- WR0_RESET_EXT_STATUS = 0x10,
- WR0_CHANNEL_RESET = 0x18,
- WR0_ENABLE_INT_NEXT_RX = 0x20,
- WR0_RESET_TX_INT = 0x28, // not supported
- WR0_ERROR_RESET = 0x30,
- WR0_RETURN_FROM_INT = 0x38, // not supported
- WR0_CRC_RESET_CODE_MASK = 0xc0, // not supported
- WR0_CRC_RESET_NULL = 0x00, // not supported
- WR0_CRC_RESET_RX = 0x40, // not supported
- WR0_CRC_RESET_TX = 0x80, // not supported
+ WR0_REGISTER_MASK = 0x07,
+ WR0_COMMAND_MASK = 0x38,
+ WR0_NULL = 0x00,
+ WR0_SEND_ABORT = 0x08, // not supported
+ WR0_RESET_EXT_STATUS = 0x10,
+ WR0_CHANNEL_RESET = 0x18,
+ WR0_ENABLE_INT_NEXT_RX = 0x20,
+ WR0_RESET_TX_INT = 0x28, // not supported
+ WR0_ERROR_RESET = 0x30,
+ WR0_RETURN_FROM_INT = 0x38, // not supported
+ WR0_CRC_RESET_CODE_MASK = 0xc0, // not supported
+ WR0_CRC_RESET_NULL = 0x00, // not supported
+ WR0_CRC_RESET_RX = 0x40, // not supported
+ WR0_CRC_RESET_TX = 0x80, // not supported
WR0_CRC_RESET_TX_UNDERRUN = 0xc0 // not supported
};
enum
{
- WR1_EXT_INT_ENABLE = 0x01,
- WR1_TX_INT_ENABLE = 0x02,
- WR1_STATUS_VECTOR = 0x04,
- WR1_RX_INT_MODE_MASK = 0x18,
- WR1_RX_INT_DISABLE = 0x00,
- WR1_RX_INT_FIRST = 0x08,
- WR1_RX_INT_ALL_PARITY = 0x10, // not supported
- WR1_RX_INT_ALL = 0x18,
- WR1_WRDY_ON_RX_TX = 0x20, // not supported
- WR1_WRDY_FUNCTION = 0x40, // not supported
- WR1_WRDY_ENABLE = 0x80 // not supported
+ WR1_EXT_INT_ENABLE = 0x01,
+ WR1_TX_INT_ENABLE = 0x02,
+ WR1_STATUS_VECTOR = 0x04,
+ WR1_RX_INT_MODE_MASK = 0x18,
+ WR1_RX_INT_DISABLE = 0x00,
+ WR1_RX_INT_FIRST = 0x08,
+ WR1_RX_INT_ALL_PARITY = 0x10, // not supported
+ WR1_RX_INT_ALL = 0x18,
+ WR1_WRDY_ON_RX_TX = 0x20, // not supported
+ WR1_WRDY_FUNCTION = 0x40, // not supported
+ WR1_WRDY_ENABLE = 0x80 // not supported
};
enum
{
- WR2_DATA_XFER_INT = 0x00, // not supported
- WR2_DATA_XFER_DMA_INT = 0x01, // not supported
- WR2_DATA_XFER_DMA = 0x02, // not supported
- WR2_DATA_XFER_ILLEGAL = 0x03, // not supported
- WR2_DATA_XFER_MASK = 0x03, // not supported
- WR2_PRIORITY = 0x04, // not supported
- WR2_MODE_8085_1 = 0x00, // not supported
- WR2_MODE_8085_2 = 0x08, // not supported
- WR2_MODE_8086_8088 = 0x10, // not supported
- WR2_MODE_ILLEGAL = 0x18, // not supported
- WR2_MODE_MASK = 0x18, // not supported
- WR2_VECTORED_INT = 0x20, // not supported
- WR2_PIN10_SYNDETB_RTSB = 0x80 // not supported
+ WR2_DATA_XFER_INT = 0x00, // not supported
+ WR2_DATA_XFER_DMA_INT = 0x01, // not supported
+ WR2_DATA_XFER_DMA = 0x02, // not supported
+ WR2_DATA_XFER_ILLEGAL = 0x03, // not supported
+ WR2_DATA_XFER_MASK = 0x03, // not supported
+ WR2_PRIORITY = 0x04, // not supported
+ WR2_MODE_8085_1 = 0x00, // not supported
+ WR2_MODE_8085_2 = 0x08, // not supported
+ WR2_MODE_8086_8088 = 0x10, // not supported
+ WR2_MODE_ILLEGAL = 0x18, // not supported
+ WR2_MODE_MASK = 0x18, // not supported
+ WR2_VECTORED_INT = 0x20, // not supported
+ WR2_PIN10_SYNDETB_RTSB = 0x80 // not supported
};
enum
{
- WR3_RX_ENABLE = 0x01,
+ WR3_RX_ENABLE = 0x01,
WR3_SYNC_CHAR_LOAD_INHIBIT= 0x02, // not supported
- WR3_ADDRESS_SEARCH_MODE = 0x04, // not supported
- WR3_RX_CRC_ENABLE = 0x08, // not supported
- WR3_ENTER_HUNT_PHASE = 0x10, // not supported
- WR3_AUTO_ENABLES = 0x20,
- WR3_RX_WORD_LENGTH_MASK = 0xc0,
- WR3_RX_WORD_LENGTH_5 = 0x00,
- WR3_RX_WORD_LENGTH_7 = 0x40,
- WR3_RX_WORD_LENGTH_6 = 0x80,
- WR3_RX_WORD_LENGTH_8 = 0xc0
+ WR3_ADDRESS_SEARCH_MODE = 0x04, // not supported
+ WR3_RX_CRC_ENABLE = 0x08, // not supported
+ WR3_ENTER_HUNT_PHASE = 0x10, // not supported
+ WR3_AUTO_ENABLES = 0x20,
+ WR3_RX_WORD_LENGTH_MASK = 0xc0,
+ WR3_RX_WORD_LENGTH_5 = 0x00,
+ WR3_RX_WORD_LENGTH_7 = 0x40,
+ WR3_RX_WORD_LENGTH_6 = 0x80,
+ WR3_RX_WORD_LENGTH_8 = 0xc0
};
enum
{
- WR4_PARITY_ENABLE = 0x01,
- WR4_PARITY_EVEN = 0x02,
- WR4_STOP_BITS_MASK = 0x0c,
- WR4_STOP_BITS_1 = 0x04,
- WR4_STOP_BITS_1_5 = 0x08, // not supported
- WR4_STOP_BITS_2 = 0x0c,
- WR4_SYNC_MODE_MASK = 0x30, // not supported
- WR4_SYNC_MODE_8_BIT = 0x00, // not supported
- WR4_SYNC_MODE_16_BIT = 0x10, // not supported
- WR4_SYNC_MODE_SDLC = 0x20, // not supported
- WR4_SYNC_MODE_EXT = 0x30, // not supported
- WR4_CLOCK_RATE_MASK = 0xc0,
- WR4_CLOCK_RATE_X1 = 0x00,
- WR4_CLOCK_RATE_X16 = 0x40,
- WR4_CLOCK_RATE_X32 = 0x80,
- WR4_CLOCK_RATE_X64 = 0xc0
+ WR4_PARITY_ENABLE = 0x01,
+ WR4_PARITY_EVEN = 0x02,
+ WR4_STOP_BITS_MASK = 0x0c,
+ WR4_STOP_BITS_1 = 0x04,
+ WR4_STOP_BITS_1_5 = 0x08, // not supported
+ WR4_STOP_BITS_2 = 0x0c,
+ WR4_SYNC_MODE_MASK = 0x30, // not supported
+ WR4_SYNC_MODE_8_BIT = 0x00, // not supported
+ WR4_SYNC_MODE_16_BIT = 0x10, // not supported
+ WR4_SYNC_MODE_SDLC = 0x20, // not supported
+ WR4_SYNC_MODE_EXT = 0x30, // not supported
+ WR4_CLOCK_RATE_MASK = 0xc0,
+ WR4_CLOCK_RATE_X1 = 0x00,
+ WR4_CLOCK_RATE_X16 = 0x40,
+ WR4_CLOCK_RATE_X32 = 0x80,
+ WR4_CLOCK_RATE_X64 = 0xc0
};
enum
{
- WR5_TX_CRC_ENABLE = 0x01, // not supported
- WR5_RTS = 0x02,
- WR5_CRC16 = 0x04, // not supported
- WR5_TX_ENABLE = 0x08,
- WR5_SEND_BREAK = 0x10,
- WR5_TX_WORD_LENGTH_MASK = 0x60,
- WR5_TX_WORD_LENGTH_5 = 0x00,
- WR5_TX_WORD_LENGTH_6 = 0x40,
- WR5_TX_WORD_LENGTH_7 = 0x20,
- WR5_TX_WORD_LENGTH_8 = 0x60,
- WR5_DTR = 0x80
+ WR5_TX_CRC_ENABLE = 0x01, // not supported
+ WR5_RTS = 0x02,
+ WR5_CRC16 = 0x04, // not supported
+ WR5_TX_ENABLE = 0x08,
+ WR5_SEND_BREAK = 0x10,
+ WR5_TX_WORD_LENGTH_MASK = 0x60,
+ WR5_TX_WORD_LENGTH_5 = 0x00,
+ WR5_TX_WORD_LENGTH_6 = 0x40,
+ WR5_TX_WORD_LENGTH_7 = 0x20,
+ WR5_TX_WORD_LENGTH_8 = 0x60,
+ WR5_DTR = 0x80
};
void update_serial();
@@ -366,30 +366,30 @@ protected:
int get_tx_word_length();
// receiver state
- UINT8 m_rx_data_fifo[3]; // receive data FIFO
- UINT8 m_rx_error_fifo[3]; // receive error FIFO
- UINT8 m_rx_error; // current receive error
- int m_rx_fifo; // receive FIFO pointer
+ UINT8 m_rx_data_fifo[3]; // receive data FIFO
+ UINT8 m_rx_error_fifo[3]; // receive error FIFO
+ UINT8 m_rx_error; // current receive error
+ int m_rx_fifo; // receive FIFO pointer
- int m_rx_clock; // receive clock pulse count
- int m_rx_first; // first character received
- int m_rx_break; // receive break condition
- UINT8 m_rx_rr0_latch; // read register 0 latched
+ int m_rx_clock; // receive clock pulse count
+ int m_rx_first; // first character received
+ int m_rx_break; // receive break condition
+ UINT8 m_rx_rr0_latch; // read register 0 latched
int m_rxd;
- int m_sh; // sync hunt
- int m_cts; // clear to send latch
- int m_dcd; // data carrier detect latch
+ int m_sh; // sync hunt
+ int m_cts; // clear to send latch
+ int m_dcd; // data carrier detect latch
// transmitter state
- UINT8 m_tx_data; // transmit data register
- int m_tx_clock; // transmit clock pulse count
+ UINT8 m_tx_data; // transmit data register
+ int m_tx_clock; // transmit clock pulse count
- int m_dtr; // data terminal ready
- int m_rts; // request to send
+ int m_dtr; // data terminal ready
+ int m_rts; // request to send
// synchronous state
- UINT16 m_sync; // sync character
+ UINT16 m_sync; // sync character
int m_index;
z80sio_device *m_uart;
@@ -403,11 +403,11 @@ class z80sio_device : public device_t,
{
friend class z80sio_channel;
- public:
+ public:
// construction/destruction
z80sio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
z80sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
template<class _Object> static devcb_base &set_out_txda_callback(device_t &device, _Object object) { return downcast<z80sio_device &>(device).m_out_txda_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_dtra_callback(device_t &device, _Object object) { return downcast<z80sio_device &>(device).m_out_dtra_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_rtsa_callback(device_t &device, _Object object) { return downcast<z80sio_device &>(device).m_out_rtsa_cb.set_callback(object); }
@@ -504,25 +504,25 @@ protected:
int m_rxcb;
int m_txcb;
- devcb_write_line m_out_txda_cb;
- devcb_write_line m_out_dtra_cb;
- devcb_write_line m_out_rtsa_cb;
- devcb_write_line m_out_wrdya_cb;
- devcb_write_line m_out_synca_cb;
-
- devcb_write_line m_out_txdb_cb;
- devcb_write_line m_out_dtrb_cb;
- devcb_write_line m_out_rtsb_cb;
- devcb_write_line m_out_wrdyb_cb;
- devcb_write_line m_out_syncb_cb;
-
- devcb_write_line m_out_int_cb;
- devcb_write_line m_out_rxdrqa_cb;
- devcb_write_line m_out_txdrqa_cb;
- devcb_write_line m_out_rxdrqb_cb;
- devcb_write_line m_out_txdrqb_cb;
-
- int m_int_state[8]; // interrupt state
+ devcb_write_line m_out_txda_cb;
+ devcb_write_line m_out_dtra_cb;
+ devcb_write_line m_out_rtsa_cb;
+ devcb_write_line m_out_wrdya_cb;
+ devcb_write_line m_out_synca_cb;
+
+ devcb_write_line m_out_txdb_cb;
+ devcb_write_line m_out_dtrb_cb;
+ devcb_write_line m_out_rtsb_cb;
+ devcb_write_line m_out_wrdyb_cb;
+ devcb_write_line m_out_syncb_cb;
+
+ devcb_write_line m_out_int_cb;
+ devcb_write_line m_out_rxdrqa_cb;
+ devcb_write_line m_out_txdrqa_cb;
+ devcb_write_line m_out_rxdrqb_cb;
+ devcb_write_line m_out_txdrqb_cb;
+
+ int m_int_state[8]; // interrupt state
int m_variant;
};
diff --git a/src/devices/video/poly.h b/src/devices/video/poly.h
index 0ba401e0755..c5f22c0409e 100644
--- a/src/devices/video/poly.h
+++ b/src/devices/video/poly.h
@@ -1177,7 +1177,7 @@ template<typename _BaseType, int _MaxParams>
struct frustum_clip_vertex
{
_BaseType x, y, z, w; // A 3d coordinate already transformed by a projection matrix
- _BaseType p[_MaxParams]; // Additional parameters to clip
+ _BaseType p[_MaxParams]; // Additional parameters to clip
};
@@ -1212,11 +1212,11 @@ int frustum_clip_w(const frustum_clip_vertex<_BaseType, _MaxParams>* v, int num_
clipv[clip_verts].y = v[previ].y + ((v[i].y - v[previ].y) * t);
clipv[clip_verts].z = v[previ].z + ((v[i].z - v[previ].z) * t);
clipv[clip_verts].w = v[previ].w + ((v[i].w - v[previ].w) * t);
-
- // Interpolate the rest of the parameters
- for (int pi = 0; pi < _MaxParams; pi++)
- clipv[clip_verts].p[pi] = v[previ].p[pi] + ((v[i].p[pi] - v[previ].p[pi]) * t);
-
+
+ // Interpolate the rest of the parameters
+ for (int pi = 0; pi < _MaxParams; pi++)
+ clipv[clip_verts].p[pi] = v[previ].p[pi] + ((v[i].p[pi] - v[previ].p[pi]) * t);
+
++clip_verts;
}
if (v1_side > 0) // current point is inside
@@ -1280,12 +1280,12 @@ int frustum_clip(const frustum_clip_vertex<_BaseType, _MaxParams>* v, int num_ve
clipv[clip_verts].y = v[previ].y + ((v[i].y - v[previ].y) * t);
clipv[clip_verts].z = v[previ].z + ((v[i].z - v[previ].z) * t);
clipv[clip_verts].w = v[previ].w + ((v[i].w - v[previ].w) * t);
-
- // Interpolate the rest of the parameters
- for (int pi = 0; pi < _MaxParams; pi++)
- clipv[clip_verts].p[pi] = v[previ].p[pi] + ((v[i].p[pi] - v[previ].p[pi]) * t);
- ++clip_verts;
+ // Interpolate the rest of the parameters
+ for (int pi = 0; pi < _MaxParams; pi++)
+ clipv[clip_verts].p[pi] = v[previ].p[pi] + ((v[i].p[pi] - v[previ].p[pi]) * t);
+
+ ++clip_verts;
}
if (v1_side > 0) // current point is inside
{
@@ -1304,15 +1304,15 @@ int frustum_clip(const frustum_clip_vertex<_BaseType, _MaxParams>* v, int num_ve
template<typename _BaseType, int _MaxParams>
int frustum_clip_all(frustum_clip_vertex<_BaseType, _MaxParams>* clip_vert, int num_vertices, frustum_clip_vertex<_BaseType, _MaxParams>* out)
{
- num_vertices = frustum_clip_w<_BaseType, _MaxParams>(clip_vert, num_vertices, clip_vert);
- num_vertices = frustum_clip<_BaseType, _MaxParams>(clip_vert, num_vertices, clip_vert, 0, 0); // W <= -X
- num_vertices = frustum_clip<_BaseType, _MaxParams>(clip_vert, num_vertices, clip_vert, 0, 1); // W <= +X
- num_vertices = frustum_clip<_BaseType, _MaxParams>(clip_vert, num_vertices, clip_vert, 1, 0); // W <= -Y
- num_vertices = frustum_clip<_BaseType, _MaxParams>(clip_vert, num_vertices, clip_vert, 1, 1); // W <= +X
- num_vertices = frustum_clip<_BaseType, _MaxParams>(clip_vert, num_vertices, clip_vert, 2, 0); // W <= -Z
- num_vertices = frustum_clip<_BaseType, _MaxParams>(clip_vert, num_vertices, clip_vert, 2, 1); // W <= +Z
- out = clip_vert;
- return num_vertices;
+ num_vertices = frustum_clip_w<_BaseType, _MaxParams>(clip_vert, num_vertices, clip_vert);
+ num_vertices = frustum_clip<_BaseType, _MaxParams>(clip_vert, num_vertices, clip_vert, 0, 0); // W <= -X
+ num_vertices = frustum_clip<_BaseType, _MaxParams>(clip_vert, num_vertices, clip_vert, 0, 1); // W <= +X
+ num_vertices = frustum_clip<_BaseType, _MaxParams>(clip_vert, num_vertices, clip_vert, 1, 0); // W <= -Y
+ num_vertices = frustum_clip<_BaseType, _MaxParams>(clip_vert, num_vertices, clip_vert, 1, 1); // W <= +X
+ num_vertices = frustum_clip<_BaseType, _MaxParams>(clip_vert, num_vertices, clip_vert, 2, 0); // W <= -Z
+ num_vertices = frustum_clip<_BaseType, _MaxParams>(clip_vert, num_vertices, clip_vert, 2, 1); // W <= +Z
+ out = clip_vert;
+ return num_vertices;
}
diff --git a/src/emu/dipty.c b/src/emu/dipty.c
index 1d188f95d0a..f0637abb0fe 100644
--- a/src/emu/dipty.c
+++ b/src/emu/dipty.c
@@ -12,10 +12,10 @@
#include "osdcore.h"
device_pty_interface::device_pty_interface(const machine_config &mconfig, device_t &device)
- : device_interface(device, "pty"),
- m_pty_master(NULL),
- m_slave_name(),
- m_opened(false)
+ : device_interface(device, "pty"),
+ m_pty_master(NULL),
+ m_slave_name(),
+ m_opened(false)
{
}
@@ -25,61 +25,61 @@ device_pty_interface::~device_pty_interface()
bool device_pty_interface::open(void)
{
- if (!m_opened) {
- char buffer[ 128 ];
-
- if (osd_openpty(&m_pty_master , buffer , sizeof(buffer)) == FILERR_NONE) {
- m_opened = true;
- m_slave_name.assign(buffer);
- } else {
- m_opened = false;
- m_pty_master = NULL;
- }
- }
-
- return m_opened;
+ if (!m_opened) {
+ char buffer[ 128 ];
+
+ if (osd_openpty(&m_pty_master , buffer , sizeof(buffer)) == FILERR_NONE) {
+ m_opened = true;
+ m_slave_name.assign(buffer);
+ } else {
+ m_opened = false;
+ m_pty_master = NULL;
+ }
+ }
+
+ return m_opened;
}
void device_pty_interface::close(void)
{
- if (m_opened) {
- osd_close(m_pty_master);
- m_opened = false;
- }
+ if (m_opened) {
+ osd_close(m_pty_master);
+ m_opened = false;
+ }
}
bool device_pty_interface::is_open(void) const
{
- return m_opened;
+ return m_opened;
}
ssize_t device_pty_interface::read(UINT8 *rx_chars , size_t count)
{
- UINT32 actual_bytes;
+ UINT32 actual_bytes;
- if (m_opened && osd_read(m_pty_master, rx_chars, 0, count, &actual_bytes) == FILERR_NONE) {
- return actual_bytes;
- } else {
- return -1;
- }
+ if (m_opened && osd_read(m_pty_master, rx_chars, 0, count, &actual_bytes) == FILERR_NONE) {
+ return actual_bytes;
+ } else {
+ return -1;
+ }
}
void device_pty_interface::write(UINT8 tx_char)
{
- UINT32 actual_bytes;
+ UINT32 actual_bytes;
- if (m_opened) {
- osd_write(m_pty_master, &tx_char, 0, 1, &actual_bytes);
- }
+ if (m_opened) {
+ osd_write(m_pty_master, &tx_char, 0, 1, &actual_bytes);
+ }
}
bool device_pty_interface::is_slave_connected(void) const
{
- // TODO: really check for slave status
- return m_opened;
+ // TODO: really check for slave status
+ return m_opened;
}
const char *device_pty_interface::slave_name(void) const
{
- return m_slave_name.c_str();
+ return m_slave_name.c_str();
}
diff --git a/src/emu/dipty.h b/src/emu/dipty.h
index c381420a0ca..8df192efcca 100644
--- a/src/emu/dipty.h
+++ b/src/emu/dipty.h
@@ -20,26 +20,26 @@
class device_pty_interface : public device_interface
{
public:
- // construction/destruction
- device_pty_interface(const machine_config &mconfig, device_t &device);
- virtual ~device_pty_interface();
+ // construction/destruction
+ device_pty_interface(const machine_config &mconfig, device_t &device);
+ virtual ~device_pty_interface();
- bool open(void);
- void close(void);
+ bool open(void);
+ void close(void);
- bool is_open(void) const;
+ bool is_open(void) const;
- ssize_t read(UINT8 *rx_chars , size_t count);
- void write(UINT8 tx_char);
+ ssize_t read(UINT8 *rx_chars , size_t count);
+ void write(UINT8 tx_char);
- bool is_slave_connected(void) const;
+ bool is_slave_connected(void) const;
- const char *slave_name(void) const;
+ const char *slave_name(void) const;
protected:
- osd_file *m_pty_master;
- std::string m_slave_name;
- bool m_opened;
+ osd_file *m_pty_master;
+ std::string m_slave_name;
+ bool m_opened;
};
// iterator
diff --git a/src/emu/emuopts.c b/src/emu/emuopts.c
index 0a71dd3afe5..a163a7ae65d 100644
--- a/src/emu/emuopts.c
+++ b/src/emu/emuopts.c
@@ -445,7 +445,7 @@ void emu_options::parse_standard_inis(std::string &error_string)
parse_one_ini("computer", OPTION_PRIORITY_SYSTYPE_INI, &error_string);
else if (cursystem->flags & MACHINE_TYPE_OTHER)
parse_one_ini("othersys", OPTION_PRIORITY_SYSTYPE_INI, &error_string);
-
+
machine_config config(*cursystem, *this);
screen_device_iterator iter(config.root_device());
for (const screen_device *device = iter.first(); device != NULL; device = iter.next())
diff --git a/src/emu/screen.h b/src/emu/screen.h
index 095142cf7c7..725160005a2 100644
--- a/src/emu/screen.h
+++ b/src/emu/screen.h
@@ -285,7 +285,7 @@ private:
UINT8 m_curtexture; // current texture index
bool m_changed; // has this bitmap changed?
INT32 m_last_partial_scan; // scanline of last partial update
- INT32 m_partial_scan_hpos; // horizontal pixel last rendered on this partial scanline
+ INT32 m_partial_scan_hpos; // horizontal pixel last rendered on this partial scanline
bitmap_argb32 m_screen_overlay_bitmap; // screen overlay bitmap
UINT32 m_unique_id; // unique id for this screen_device
rgb_t m_color; // render color
diff --git a/src/emu/ui/info_pty.c b/src/emu/ui/info_pty.c
index 1fe865f5668..5a6dca59efb 100644
--- a/src/emu/ui/info_pty.c
+++ b/src/emu/ui/info_pty.c
@@ -13,7 +13,7 @@
#include "ui/info_pty.h"
ui_menu_pty_info::ui_menu_pty_info(running_machine &machine, render_container *container) :
- ui_menu(machine, container)
+ ui_menu(machine, container)
{
}
@@ -23,22 +23,22 @@ ui_menu_pty_info::~ui_menu_pty_info()
void ui_menu_pty_info::populate()
{
- item_append("Pseudo terminals", NULL, MENU_FLAG_DISABLE, NULL);
- item_append("", NULL, MENU_FLAG_DISABLE, NULL);
-
- pty_interface_iterator iter(machine().root_device());
- for (device_pty_interface *pty = iter.first(); pty != NULL; pty = iter.next()) {
- const char *port_name = pty->device().owner()->tag() + 1;
- if (pty->is_open()) {
- item_append(port_name , pty->slave_name() , MENU_FLAG_DISABLE , NULL);
- } else {
- item_append(port_name , "[failed]" , MENU_FLAG_DISABLE , NULL);
- }
- item_append("", NULL, MENU_FLAG_DISABLE, NULL);
- }
+ item_append("Pseudo terminals", NULL, MENU_FLAG_DISABLE, NULL);
+ item_append("", NULL, MENU_FLAG_DISABLE, NULL);
+
+ pty_interface_iterator iter(machine().root_device());
+ for (device_pty_interface *pty = iter.first(); pty != NULL; pty = iter.next()) {
+ const char *port_name = pty->device().owner()->tag() + 1;
+ if (pty->is_open()) {
+ item_append(port_name , pty->slave_name() , MENU_FLAG_DISABLE , NULL);
+ } else {
+ item_append(port_name , "[failed]" , MENU_FLAG_DISABLE , NULL);
+ }
+ item_append("", NULL, MENU_FLAG_DISABLE, NULL);
+ }
}
void ui_menu_pty_info::handle()
{
- process(0);
+ process(0);
}
diff --git a/src/emu/ui/mainmenu.c b/src/emu/ui/mainmenu.c
index 196fdb976c2..27d224678ce 100644
--- a/src/emu/ui/mainmenu.c
+++ b/src/emu/ui/mainmenu.c
@@ -91,10 +91,10 @@ void ui_menu_main::populate()
item_append("Tape Control", NULL, 0, (void *)TAPE_CONTROL);
}
- pty_interface_iterator ptyiter(machine().root_device());
- if (ptyiter.first() != NULL) {
- item_append("Pseudo terminals", NULL, 0, (void *)PTY_INFO);
- }
+ pty_interface_iterator ptyiter(machine().root_device());
+ if (ptyiter.first() != NULL) {
+ item_append("Pseudo terminals", NULL, 0, (void *)PTY_INFO);
+ }
if (machine().ioport().has_bioses())
item_append("Bios Selection", NULL, 0, (void *)BIOS_SELECTION);
@@ -196,8 +196,8 @@ void ui_menu_main::handle()
ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_tape_control(machine(), container, NULL)));
break;
- case PTY_INFO:
- ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_pty_info(machine(), container)));
+ case PTY_INFO:
+ ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_pty_info(machine(), container)));
break;
case SLOT_DEVICES:
diff --git a/src/emu/ui/mainmenu.h b/src/emu/ui/mainmenu.h
index b35a5927073..aa1f3a99885 100644
--- a/src/emu/ui/mainmenu.h
+++ b/src/emu/ui/mainmenu.h
@@ -45,7 +45,7 @@ private:
SELECT_GAME,
BIOS_SELECTION,
BARCODE_READ,
- PTY_INFO
+ PTY_INFO
};
};
diff --git a/src/emu/video/vector.c b/src/emu/video/vector.c
index f0146234afe..720e24bd049 100644
--- a/src/emu/video/vector.c
+++ b/src/emu/video/vector.c
@@ -227,12 +227,12 @@ void vector_device::add_point(int x, int y, rgb_t color, int intensity)
if (m_flicker && (intensity > 0))
{
float random = (float)(machine().rand() & 255) / 255.0f; // random value between 0.0 and 1.0
-
+
intensity -= (int)(intensity * random * m_flicker);
if (intensity < 0)
{
intensity = 0;
- }
+ }
if (intensity > 255)
{
intensity = 255;
@@ -344,7 +344,7 @@ UINT32 vector_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
coords.y1 = ((float)curpoint->y - yoffs) * yscale;
// extend zero-length vector line (vector point) by quarter beam_width on both sides
- if (fabs(coords.x0 - coords.x1) < FLT_EPSILON &&
+ if (fabs(coords.x0 - coords.x1) < FLT_EPSILON &&
fabs(coords.y0 - coords.y1) < FLT_EPSILON)
{
coords.x0 += xratio * beam_width * 0.25f;
diff --git a/src/lib/formats/apollo_dsk.c b/src/lib/formats/apollo_dsk.c
index 74ac0372a85..29dbe23b0b5 100644
--- a/src/lib/formats/apollo_dsk.c
+++ b/src/lib/formats/apollo_dsk.c
@@ -53,4 +53,3 @@ int apollo_format::identify(io_generic *io, UINT32 form_factor)
return ((size == expected_size) || (size == 0)) ? 1 : 0;
}
-
diff --git a/src/lib/formats/tzx_cas.c b/src/lib/formats/tzx_cas.c
index 5c8d79a636c..9a920844903 100644
--- a/src/lib/formats/tzx_cas.c
+++ b/src/lib/formats/tzx_cas.c
@@ -314,7 +314,7 @@ static int tzx_handle_direct(INT16 **buffer, const UINT8 *bytes, int pause, int
tzx_output_wave(buffer, samples);
size += samples;
-
+
}
}
diff --git a/src/mame/arcade.lst b/src/mame/arcade.lst
index 34b1a9819c8..bf4195f8d86 100644
--- a/src/mame/arcade.lst
+++ b/src/mame/arcade.lst
@@ -1827,7 +1827,7 @@ rtypej // (c) 1987 (Japan)
rtypejp // (c) 1987 (Japan)
rtypeu // (c) 1987 + Nintendo USA license (US)
rtypeb // bootleg
-rtypem82b // bootleg
+rtypem82b // bootleg
bchopper // (c) 1987
mrheli // (c) 1987 (Japan)
nspirit // (c) 1988
@@ -1845,7 +1845,7 @@ dbreedm72 // (c) 1989
rtype2 // (c) 1989
rtype2j // (c) 1989 (Japan)
rtype2jc // (c) 1989 (Japan)
-rtype2m82b // bootleg
+rtype2m82b // bootleg
majtitle // (c) 1990 (World)
majtitlej // (c) 1990 (Japan)
hharry // (c) 1990 (World)
@@ -1856,12 +1856,12 @@ poundfor // (c) 1990 (World)
poundforj // (c) 1990 (Japan)
poundforu // (c) 1990 Irem America (US)
airduelm72 // (c) 1990 (Japan)
-airduel // (c) 1990 (World)
+airduel // (c) 1990 (World)
cosmccop // (c) 1991 (World)
gallop // (c) 1991 (Japan)
ltswords // (c) 1991 (World)
kengo // (c) 1991 (Japan)
-kengoa // (c) 1991 (Japan)
+kengoa // (c) 1991 (Japan)
// not M72, but same sound hardware
sichuan2 // (c) 1989 Tamtex
sichuan2a // (c) 1989 Tamtex
@@ -2097,15 +2097,15 @@ boblbobl // bootleg
sboblbobl // bootleg
sboblbobla // bootleg
sboblboblb // bootleg
-sboblboblc // bootleg
-bublboblb // bootleg
+sboblboblc // bootleg
+bublboblb // bootleg
bub68705 // bootleg
dland // bootleg
-bbredux // bootleg / hack
-bublcave // hack
-boblcave // hack
-bublcave11 // hack
-bublcave10 // hack
+bbredux // bootleg / hack
+bublcave // hack
+boblcave // hack
+bublcave11 // hack
+bublcave10 // hack
missb2 // bootleg on enhanced hardware
bublpong // bootleg on enhanced hardware
kikikai // A85 (c) 1986 Taito Corporation
@@ -2871,7 +2871,7 @@ pacslot // (c) 1996 Namco
ppsatan // (c) 1996 <unknown>
ddonpach // (c) 1997 Atlus/Cave
ddonpachj // (c) 1997 Atlus/Cave
-ddonpacha // hack
+ddonpacha // hack
dfeveron // (c) 1998 Cave + Nihon System license
feversos // (c) 1998 Cave + Nihon System license
esprade // (c) 1998 Atlus/Cave
@@ -3105,7 +3105,7 @@ madgear // 2/1989 (c) 1989 (US)
madgearj // 2/1989 (c) 1989 (Japan)
ledstorm // 1988 (c) 1988 (US)
leds2011 // 1988 (c) 1988 (World)
-leds2011u // 1988 (c) 1988 (US)
+leds2011u // 1988 (c) 1988 (US)
// 3/1989 Dokaben (baseball) - see below among "Mitchell" games
// 8/1989 Dokaben 2 (baseball) - see below among "Mitchell" games
// 10/1989 Capcom Baseball - see below among "Mitchell" games
@@ -3874,7 +3874,7 @@ soulclbrjb // 1998.?? Soul Calibur (Japan, SOC11/VER.B)
soulclbrja // 1998.?? Soul Calibur (Japan, SOC11/VER.A2)
technodr // 1998.07 Techno Drive
mdhorse // 1998.11 Derby Quiz My Dream Horse (Japan, MDH1/VER.A2)
-aplarail // 1998.12 Attack Pla Rail
+aplarail // 1998.12 Attack Pla Rail
tenkomor // 1998.?? Tenkomori Shooting (Asia, TKM2/VER.A1)
tenkomorja // 1998.12 Tenkomori Shooting (Japan, TKM1/VER.A1)
pacapp // 1998.12 Paca Paca Passion (Japan, PPP1/VER.A2)
@@ -4510,7 +4510,7 @@ wboyub // bootleg of wboyu
wbdeluxe // (c) 1986 + Escape license (S1)
wboysys2 // 834-5984 (c) 1986 + Escape license (S1)
gardia // 834-6119 (S2?)
-gardiaj //
+gardiaj //
gardiab // bootleg
nob // (c) Data East
nobb // bootleg
@@ -4695,11 +4695,11 @@ riotcity // (c) 1991 Sega / Westone (Unprotected)
ryukyu // (c) 1990 (FD1094)
sdib // (c) 1987 (FD1089A)
sdibl // (c) 1987 bootleg
-sdibl2 // bootleg
-sdibl3 // bootleg
-sdibl4 // bootleg
-sdibl5 // bootleg
-sdibl6 // bootleg
+sdibl2 // bootleg
+sdibl3 // bootleg
+sdibl4 // bootleg
+sdibl5 // bootleg
+sdibl6 // bootleg
defense // (c) 1987 (FD1094)
shinobi5 // (c) 1987 (Unprotected)
shinobi4 // (c) 1987 (MC-8123B)
@@ -4889,7 +4889,7 @@ toutrund // bootleg
toutrunjd // bootleg
toutrun3d // bootleg
toutrunj1d // bootleg
-toutrun2d // bootleg
+toutrun2d // bootleg
shangon3d // bootleg
// X Board
@@ -6635,7 +6635,7 @@ vendettaj // GX081 (c) 1991 (Japan)
mogura // GX141 (c) 1991
wecleman // GX602 (c) 1986
weclemana // GX602?(c) 1988
-weclemanb // GX602 (c) 1986
+weclemanb // GX602 (c) 1986
hotchase // GX763 (c) 1988
hotchasea
chqflag // GX717 (c) 1988
@@ -9087,7 +9087,7 @@ vastar4 // (c) 1983 Sesame Japan
// Gaelco 2D games
mastboy // (c) 1987 - No Ref on the PCB
mastboyi // (c) 1987 - No Ref on the PCB
-mastboyia // (c) 1987 - No Ref on the PCB
+mastboyia // (c) 1987 - No Ref on the PCB
xorworld // (c) 1990 - prototype
bigkarnk // (c) 1991 - Ref 901112-1
// Master Boy 2 // (c) 1991 - Ref ???
@@ -9729,7 +9729,7 @@ pclubysa // (c) 2000 Yun Sung
garogun // (c) 2000 Yun Sung
7ordi // (c) 2002 Yun Sung
wondstck // (c) ???? Yun Sung
-wondstcka // (c) ???? Yun Sung
+wondstcka // (c) ???? Yun Sung
// Zilec games
blueprnt // (c) 1982 Bally Midway (Zilec in ROM 3U, and the programmer names)
@@ -10187,7 +10187,7 @@ svg // (c) 2003 Spectral vs Generation
svgtw
svgpcb //
ket // (c) 2002 Ketsui
-ket1 //
+ket1 //
keta //
ketb //
ketarr // hack
@@ -10195,8 +10195,8 @@ ketarr151 // hack
ketarr15 // hack
ketarr10 // hack
ketarrs151 // hack
-ketarrs15 // hack
-ketarrf // hack
+ketarrs15 // hack
+ketarrf // hack
ddpdoj // (c) 2002 DoDonPachi Dai-Ou-Jou
ddpdoja //
ddpdojb //
@@ -11189,7 +11189,7 @@ lastfght // (c) 2000 Subsino
xplan // (c) 2006 Subsino
sliver // (c) 1996 Hollow Corp
-slivera //
+slivera //
intrscti // ????
pasha2 // (c) 1998 Dong Sung
trvmadns // (c) 1985 Thunderhead Inc.
@@ -13212,7 +13212,7 @@ tmspoker
kas89 // 1989, SFC S.R.L.
caspoker // 1987, PM / Beck Elektronik.
wildpkr // 199?, TAB Austria.
-subhuntr // 1979 Model Racing
+subhuntr // 1979 Model Racing
manohman // 199?, Merkur.
diff --git a/src/mame/audio/hng64.c b/src/mame/audio/hng64.c
index 11caed9b98b..220afc56240 100644
--- a/src/mame/audio/hng64.c
+++ b/src/mame/audio/hng64.c
@@ -277,7 +277,7 @@ WRITE16_MEMBER(hng64_state::sound_comms_w)
/* correct? */
m_audiocpu->set_input_line(5, CLEAR_LINE);
//if(data)
- // printf("IRQ ACK %02x?\n",data);
+ // printf("IRQ ACK %02x?\n",data);
return;
}
diff --git a/src/mame/drivers/apple2e.c b/src/mame/drivers/apple2e.c
index 692a22a9e0b..426eed983aa 100644
--- a/src/mame/drivers/apple2e.c
+++ b/src/mame/drivers/apple2e.c
@@ -1153,22 +1153,22 @@ void apple2e_state::do_io(address_space &space, int offset, bool is_iic)
case 0x50: // graphics mode
machine().first_screen()->update_now();
- m_video->m_graphics = true;
+ m_video->m_graphics = true;
break;
case 0x51: // text mode
machine().first_screen()->update_now();
- m_video->m_graphics = false;
+ m_video->m_graphics = false;
break;
case 0x52: // no mix
machine().first_screen()->update_now();
- m_video->m_mix = false;
+ m_video->m_mix = false;
break;
case 0x53: // mixed mode
machine().first_screen()->update_now();
- m_video->m_mix = true;
+ m_video->m_mix = true;
break;
case 0x54: // set page 1
diff --git a/src/mame/drivers/aristmk5.c b/src/mame/drivers/aristmk5.c
index 3babb16a443..ebe95934a1a 100644
--- a/src/mame/drivers/aristmk5.c
+++ b/src/mame/drivers/aristmk5.c
@@ -522,7 +522,7 @@ void aristmk5_state::machine_reset()
static MACHINE_CONFIG_START( aristmk5, aristmk5_state )
- MCFG_CPU_ADD("maincpu", ARM, MASTER_CLOCK/6) // 12000000
+ MCFG_CPU_ADD("maincpu", ARM, MASTER_CLOCK/6) // 12000000
MCFG_CPU_PROGRAM_MAP(aristmk5_drame_map)
MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(2)) /* 1.6 - 2 seconds */
@@ -568,7 +568,7 @@ static MACHINE_CONFIG_START( aristmk5, aristmk5_state )
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( aristmk5_usa, aristmk5_state )
- MCFG_CPU_ADD("maincpu", ARM, MASTER_CLOCK/6) // 12000000
+ MCFG_CPU_ADD("maincpu", ARM, MASTER_CLOCK/6) // 12000000
MCFG_CPU_PROGRAM_MAP(aristmk5_map)
MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(2)) /* 1.6 - 2 seconds */
@@ -815,7 +815,7 @@ ROM_START( adonisa )
ROM_REGION( 0x100, "eeproms", 0 )
ROM_LOAD( "st93c46.u27", 0x0000, 0x0080, CRC(115c305a) SHA1(684a70d74ec92564e17c4292cd357e603842c485) )
- ROM_LOAD( "st93c46.u26", 0x0080, 0x0080, CRC(652d544c) SHA1(cd5bd20e9a0f22d7367cc169e2844a02751c7c91) ) // blank... all 0xff's
+ ROM_LOAD( "st93c46.u26", 0x0080, 0x0080, CRC(652d544c) SHA1(cd5bd20e9a0f22d7367cc169e2844a02751c7c91) ) // blank... all 0xff's
ROM_REGION( 0x0005, "plds", 0 )
ROM_LOAD( "gal20v8b.u22", 0x0000, 0x0001, NO_DUMP ) /* 28-Lead PLCC package. Unable to read */
@@ -982,10 +982,10 @@ ROM_END
ROM_START( bumblbug )
ARISTOCRAT_MK5_BIOS
ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
- ROM_LOAD32_WORD( "bumble_bugs_export.u7", 0x000000, 0x80000, CRC(ec605a36) SHA1(114e0840cfbd0c64645a5a33065db85462a0ba2d) ) // 92.691%
- ROM_LOAD32_WORD( "bumble_bugs_export.u11", 0x000002, 0x80000, CRC(17b154bd) SHA1(efdf307670a3d74f7980fec2d2197d837d4c26e2) ) // 92.691%
- ROM_LOAD32_WORD( "bumble_bugs_export.u8", 0x100000, 0x80000, CRC(e0c01d01) SHA1(9153129fd348a97da7cccf002e5d03e4b4db9264) ) // base
- ROM_LOAD32_WORD( "bumble_bugs_export.u12", 0x100002, 0x80000, CRC(28700d5d) SHA1(87a583cd487da6cb4c2da5f62297f0e577269fae) ) // base
+ ROM_LOAD32_WORD( "bumble_bugs_export.u7", 0x000000, 0x80000, CRC(ec605a36) SHA1(114e0840cfbd0c64645a5a33065db85462a0ba2d) ) // 92.691%
+ ROM_LOAD32_WORD( "bumble_bugs_export.u11", 0x000002, 0x80000, CRC(17b154bd) SHA1(efdf307670a3d74f7980fec2d2197d837d4c26e2) ) // 92.691%
+ ROM_LOAD32_WORD( "bumble_bugs_export.u8", 0x100000, 0x80000, CRC(e0c01d01) SHA1(9153129fd348a97da7cccf002e5d03e4b4db9264) ) // base
+ ROM_LOAD32_WORD( "bumble_bugs_export.u12", 0x100002, 0x80000, CRC(28700d5d) SHA1(87a583cd487da6cb4c2da5f62297f0e577269fae) ) // base
ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 ) /* ARM Code */
@@ -995,7 +995,7 @@ ROM_START( bumblbug )
ROM_END
// 586/7(b) - 10 Credit Multiplier / 9 Line Multiline.
-// Penguin Pays - Export B - 14/07/97.
+// Penguin Pays - Export B - 14/07/97.
// All devices are 27c4002 instead of 27c4096.
ROM_START( pengpays )
ARISTOCRAT_MK5_BIOS
@@ -1018,14 +1018,14 @@ ROM_END
// Marked as GHG1012 and 92.767%
ROM_START( bootsctn )
ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
- ROM_LOAD32_WORD( "ghg1012_boot_scootin.u7", 0x000000, 0x80000, CRC(ca26f31e) SHA1(e8da31cc8d12bf8a28f1ca4d796259ae9010f8af) ) // 92.767%
- ROM_LOAD32_WORD( "ghg1012_boot_scootin.u11", 0x000002, 0x80000, CRC(61da1767) SHA1(83d4df1060975f03f291b9119c0d2b8debb0fb60) ) // 92.767%
- ROM_LOAD32_WORD( "ghg1012_boot_scootin.u8", 0x100000, 0x80000, CRC(9ae4d616) SHA1(60d4d36f75685dfe21f914fa4682cd6a64fcfa58) ) // base
- ROM_LOAD32_WORD( "ghg1012_boot_scootin.u12", 0x100002, 0x80000, CRC(2c50c083) SHA1(ae3b01200d152df9b2966b5308c71e9d1ad43d78) ) // base
- ROM_LOAD32_WORD( "ghg1012_boot_scootin.u9", 0x200000, 0x80000, CRC(c0a4920d) SHA1(d2c6d259d2e067b6e5ad72a6ef164aac7d72bc5a) ) // base
- ROM_LOAD32_WORD( "ghg1012_boot_scootin.u13", 0x200002, 0x80000, CRC(55716d82) SHA1(5b9982a49201842e9551a9c763a6babbb47a863e) ) // base
- ROM_LOAD32_WORD( "ghg1012_boot_scootin.u10", 0x300000, 0x80000, CRC(3ecdf7ee) SHA1(9d658a22da737daafdf6cb0d49009796036d04b1) ) // base
- ROM_LOAD32_WORD( "ghg1012_boot_scootin.u14", 0x300002, 0x80000, CRC(18934c51) SHA1(f7c9c95c687dbfe89747e7877157fde37bc1119e) ) // base
+ ROM_LOAD32_WORD( "ghg1012_boot_scootin.u7", 0x000000, 0x80000, CRC(ca26f31e) SHA1(e8da31cc8d12bf8a28f1ca4d796259ae9010f8af) ) // 92.767%
+ ROM_LOAD32_WORD( "ghg1012_boot_scootin.u11", 0x000002, 0x80000, CRC(61da1767) SHA1(83d4df1060975f03f291b9119c0d2b8debb0fb60) ) // 92.767%
+ ROM_LOAD32_WORD( "ghg1012_boot_scootin.u8", 0x100000, 0x80000, CRC(9ae4d616) SHA1(60d4d36f75685dfe21f914fa4682cd6a64fcfa58) ) // base
+ ROM_LOAD32_WORD( "ghg1012_boot_scootin.u12", 0x100002, 0x80000, CRC(2c50c083) SHA1(ae3b01200d152df9b2966b5308c71e9d1ad43d78) ) // base
+ ROM_LOAD32_WORD( "ghg1012_boot_scootin.u9", 0x200000, 0x80000, CRC(c0a4920d) SHA1(d2c6d259d2e067b6e5ad72a6ef164aac7d72bc5a) ) // base
+ ROM_LOAD32_WORD( "ghg1012_boot_scootin.u13", 0x200002, 0x80000, CRC(55716d82) SHA1(5b9982a49201842e9551a9c763a6babbb47a863e) ) // base
+ ROM_LOAD32_WORD( "ghg1012_boot_scootin.u10", 0x300000, 0x80000, CRC(3ecdf7ee) SHA1(9d658a22da737daafdf6cb0d49009796036d04b1) ) // base
+ ROM_LOAD32_WORD( "ghg1012_boot_scootin.u14", 0x300002, 0x80000, CRC(18934c51) SHA1(f7c9c95c687dbfe89747e7877157fde37bc1119e) ) // base
ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 ) /* ARM Code */
@@ -1034,13 +1034,13 @@ ROM_START( bootsctn )
ROM_REGION( 0x20000*4, "sram", ROMREGION_ERASE00 )
ROM_END
-// MV4104 3,5,10,20,25,50 Credit Multiplier / 9-20 Line Multiline.
+// MV4104 3,5,10,20,25,50 Credit Multiplier / 9-20 Line Multiline.
// CUCKOO - Export C - 02/02/00.
// All devices are 27c4002 instead of 27c4096.
ROM_START( cuckoo )
ARISTOCRAT_MK5_BIOS
ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
- ROM_LOAD32_WORD( "mv4104_cuckoo.u7", 0x000000, 0x80000, CRC(0bd17338) SHA1(b8f467bdf8d76533a2b7d44fe93be414f25a3c31) ) //
+ ROM_LOAD32_WORD( "mv4104_cuckoo.u7", 0x000000, 0x80000, CRC(0bd17338) SHA1(b8f467bdf8d76533a2b7d44fe93be414f25a3c31) ) //
ROM_LOAD32_WORD( "mv4104_cuckoo.u11", 0x000002, 0x80000, CRC(4c407deb) SHA1(57589e61a376ddff99cd420eb47bf8c902c6a249) )
ROM_LOAD32_WORD( "mv4104_cuckoo.u8", 0x100000, 0x80000, CRC(33f52052) SHA1(89cbfe588d91244adff4c520fa94962d69ff20bf) )
ROM_LOAD32_WORD( "mv4104_cuckoo.u12", 0x100002, 0x80000, CRC(00bb7597) SHA1(f4d6b21091e320a82d59477469340633b001ed0d) )
@@ -1053,7 +1053,7 @@ ROM_START( cuckoo )
ROM_END
// MV4115 - 5,10,20 Credit Multiplier / 9 Line Multiline.
-// Magic Mask [Reel Game] - Export A - 09/05/2000.
+// Magic Mask [Reel Game] - Export A - 09/05/2000.
ROM_START( magicmsk )
ARISTOCRAT_MK5_BIOS
ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
@@ -1070,7 +1070,7 @@ ROM_START( magicmsk )
ROM_END
// MV4115 - 5,10,20 Credit Multiplier / 9 Line Multiline.
-// Magic Mask [Reel Game] - Export A - 09/05/2000.
+// Magic Mask [Reel Game] - Export A - 09/05/2000.
// Alternate set with identical description, but way different
// than the parent. All devices are 27c4002 instead of 27c4096.
//
@@ -1168,4 +1168,3 @@ GAME( 2000, margmgc, 0, aristmk5, aristmk5, aristmk5_state, aristmk
GAME( 2001, geishanz, 0, aristmk5, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Geisha (0101408V, New Zealand)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND ) // MV4127, A - 05/03/01
GAME( 2001, adonise, aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Adonis (MV4124/1, Export)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND ) // MV4124/1, B - 31/07/01
GAME( 2001, partygrs, aristmk5, aristmk5_usa, aristmk5, aristmk5_state, aristmk5, ROT0, "Aristocrat", "Party Gras (MV4115/6, Export)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND ) // MV4115/6, A - 10/11/01
-
diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c
index 1d6dbe3335c..2f7b18f674f 100644
--- a/src/mame/drivers/beathead.c
+++ b/src/mame/drivers/beathead.c
@@ -120,7 +120,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(beathead_state::scanline_callback)
int scanline = param;
/* update the video */
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
/* on scanline zero, clear any halt condition */
diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c
index fb55af1e101..f2fba272e1d 100644
--- a/src/mame/drivers/bublbobl.c
+++ b/src/mame/drivers/bublbobl.c
@@ -265,7 +265,7 @@ TODO:
- tokio: sound support is probably incomplete. There are a couple of unknown
accesses done by the CPU, including to the YM2203 I/O ports. At the
very least, there should be some filters.
-
+
there are also Bubble Bobble bootlegs with a P8749H MCU, however the MCU
is protected against reading and the main code only differs by 1 byte from
Bubble Bobble. If the MCU were to be dumped that would also make for
@@ -1646,7 +1646,7 @@ ROM_START( bublcave )
ROM_LOAD( "bublcave-20.35", 0x68000, 0x8000, CRC(64322e24) SHA1(acff8a9fcaf74f198653080759898d15cccf04e8) )
ROM_REGION( 0x0100, "proms", 0 )
- ROM_LOAD( "a71-25.41", 0x0000, 0x0100, CRC(2d0f8545) SHA1(089c31e2f614145ef2743164f7b52ae35bc06808) ) /* video timing */
+ ROM_LOAD( "a71-25.41", 0x0000, 0x0100, CRC(2d0f8545) SHA1(089c31e2f614145ef2743164f7b52ae35bc06808) ) /* video timing */
ROM_END
@@ -1717,7 +1717,7 @@ ROM_START( bublcave11 )
ROM_LOAD( "bublcave-20.35", 0x68000, 0x8000, CRC(64322e24) SHA1(acff8a9fcaf74f198653080759898d15cccf04e8) )
ROM_REGION( 0x0100, "proms", 0 )
- ROM_LOAD( "a71-25.41", 0x0000, 0x0100, CRC(2d0f8545) SHA1(089c31e2f614145ef2743164f7b52ae35bc06808) ) /* video timing */
+ ROM_LOAD( "a71-25.41", 0x0000, 0x0100, CRC(2d0f8545) SHA1(089c31e2f614145ef2743164f7b52ae35bc06808) ) /* video timing */
ROM_END
ROM_START( bublcave10 )
@@ -1749,7 +1749,7 @@ ROM_START( bublcave10 )
ROM_LOAD( "bublcave-20.35", 0x68000, 0x8000, CRC(64322e24) SHA1(acff8a9fcaf74f198653080759898d15cccf04e8) )
ROM_REGION( 0x0100, "proms", 0 )
- ROM_LOAD( "a71-25.41", 0x0000, 0x0100, CRC(2d0f8545) SHA1(089c31e2f614145ef2743164f7b52ae35bc06808) ) /* video timing */
+ ROM_LOAD( "a71-25.41", 0x0000, 0x0100, CRC(2d0f8545) SHA1(089c31e2f614145ef2743164f7b52ae35bc06808) ) /* video timing */
ROM_END
ROM_START( bublboblb )
@@ -1874,5 +1874,3 @@ GAME( 2013, boblcave, bublbobl, boblbobl, boblcave, bublbobl_state, bublbobl,
GAME( 2012, bublcave11, bublbobl, bublbobl, bublbobl, bublbobl_state, bublbobl, ROT0, "hack (Bisboch and Aladar)", "Bubble Bobble: Lost Cave V1.1", MACHINE_SUPPORTS_SAVE )
GAME( 2012, bublcave10, bublbobl, bublbobl, bublbobl, bublbobl_state, bublbobl, ROT0, "hack (Bisboch and Aladar)", "Bubble Bobble: Lost Cave V1.0", MACHINE_SUPPORTS_SAVE )
-
-
diff --git a/src/mame/drivers/by17.c b/src/mame/drivers/by17.c
index e75edc970a0..02afc2174ca 100644
--- a/src/mame/drivers/by17.c
+++ b/src/mame/drivers/by17.c
@@ -91,7 +91,7 @@ private:
UINT8 m_segment[6];
UINT8 m_lamp_decode;
UINT8 m_solenoid_features[20][4];
- UINT8 m_io_hold_x[5]; // Used to hold switches closed (drop targets, balls in outholes/saucers etc). Solenoid activity release them.
+ UINT8 m_io_hold_x[5]; // Used to hold switches closed (drop targets, balls in outholes/saucers etc). Solenoid activity release them.
required_device<m6800_cpu_device> m_maincpu;
required_shared_ptr<UINT8> m_nvram;
required_device<pia6821_device> m_pia_u10;
@@ -125,7 +125,7 @@ static INPUT_PORTS_START( by17 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Activity") PORT_CHANGED_MEMBER(DEVICE_SELF, by17_state, activity_button, NULL)
PORT_START("DSW0")
- PORT_DIPNAME( 0x1f, 0x02, "Coin Slot 1") PORT_DIPLOCATION("SW0:!1,!2,!3,!4,!5") // same as 03
+ PORT_DIPNAME( 0x1f, 0x02, "Coin Slot 1") PORT_DIPLOCATION("SW0:!1,!2,!3,!4,!5") // same as 03
PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ))
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ))
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ))
@@ -157,18 +157,18 @@ static INPUT_PORTS_START( by17 )
PORT_DIPSETTING( 0x1d, "2 Coins/14 Credits")
PORT_DIPSETTING( 0x1e, "1 Coin/15 Credits")
PORT_DIPSETTING( 0x1f, "2 Coins/15 Credits")
- PORT_DIPNAME( 0x20, 0x20, "Score Level Award") PORT_DIPLOCATION("SW0:!6")
+ PORT_DIPNAME( 0x20, 0x20, "Score Level Award") PORT_DIPLOCATION("SW0:!6")
PORT_DIPSETTING( 0x00, "Extra Ball")
PORT_DIPSETTING( 0x20, "Replay")
- PORT_DIPNAME( 0x40, 0x00, "S07") PORT_DIPLOCATION("SW0:!7")
+ PORT_DIPNAME( 0x40, 0x00, "S07") PORT_DIPLOCATION("SW0:!7")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x40, DEF_STR( On ))
- PORT_DIPNAME( 0x80, 0x80, "Play Melodies") PORT_DIPLOCATION("SW0:!8")
+ PORT_DIPNAME( 0x80, 0x80, "Play Melodies") PORT_DIPLOCATION("SW0:!8")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x80, DEF_STR( On ))
PORT_START("DSW1")
- PORT_DIPNAME( 0x1f, 0x02, "Coin Slot 3") PORT_DIPLOCATION("SW1:!1,!2,!3,!4,!5") // same as 01
+ PORT_DIPNAME( 0x1f, 0x02, "Coin Slot 3") PORT_DIPLOCATION("SW1:!1,!2,!3,!4,!5") // same as 01
PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ))
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ))
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ))
@@ -200,18 +200,18 @@ static INPUT_PORTS_START( by17 )
PORT_DIPSETTING( 0x1d, "2 Coins/14 Credits")
PORT_DIPSETTING( 0x1e, "1 Coin/15 Credits")
PORT_DIPSETTING( 0x1f, "2 Coins/15 Credits")
- PORT_DIPNAME( 0x20, 0x00, "S14") PORT_DIPLOCATION("SW1:!6")
+ PORT_DIPNAME( 0x20, 0x00, "S14") PORT_DIPLOCATION("SW1:!6")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x20, DEF_STR( On ))
- PORT_DIPNAME( 0x40, 0x40, "Award for Beating Highest Score") PORT_DIPLOCATION("SW1:!7")
+ PORT_DIPNAME( 0x40, 0x40, "Award for Beating Highest Score") PORT_DIPLOCATION("SW1:!7")
PORT_DIPSETTING( 0x00, "Novelty")
PORT_DIPSETTING( 0x40, "3 Credits")
- PORT_DIPNAME( 0x80, 0x80, "Balls per Game") PORT_DIPLOCATION("SW1:!8")
+ PORT_DIPNAME( 0x80, 0x80, "Balls per Game") PORT_DIPLOCATION("SW1:!8")
PORT_DIPSETTING( 0x00, "3")
PORT_DIPSETTING( 0x80, "5")
PORT_START("DSW2")
- PORT_DIPNAME( 0x07, 0x01, "Maximum Credits") PORT_DIPLOCATION("SW2:!1,!2,!3")
+ PORT_DIPNAME( 0x07, 0x01, "Maximum Credits") PORT_DIPLOCATION("SW2:!1,!2,!3")
PORT_DIPSETTING( 0x00, "5")
PORT_DIPSETTING( 0x01, "10")
PORT_DIPSETTING( 0x02, "15")
@@ -220,25 +220,25 @@ static INPUT_PORTS_START( by17 )
PORT_DIPSETTING( 0x05, "30")
PORT_DIPSETTING( 0x06, "35")
PORT_DIPSETTING( 0x07, "40")
- PORT_DIPNAME( 0x08, 0x08, "Credits Displayed") PORT_DIPLOCATION("SW2:!4")
+ PORT_DIPNAME( 0x08, 0x08, "Credits Displayed") PORT_DIPLOCATION("SW2:!4")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x08, DEF_STR( On ))
PORT_DIPNAME( 0x10, 0x10, "Match")
- PORT_DIPSETTING( 0x00, DEF_STR( Off )) PORT_DIPLOCATION("SW2:!5")
+ PORT_DIPSETTING( 0x00, DEF_STR( Off )) PORT_DIPLOCATION("SW2:!5")
PORT_DIPSETTING( 0x10, DEF_STR( On ))
// from here, game-specific options
- PORT_DIPNAME( 0x20, 0x00, "S22 (game specific)") PORT_DIPLOCATION("SW2:!6")
+ PORT_DIPNAME( 0x20, 0x00, "S22 (game specific)") PORT_DIPLOCATION("SW2:!6")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x20, DEF_STR( On ))
- PORT_DIPNAME( 0x40, 0x00, "S23 (game specific)") PORT_DIPLOCATION("SW2:!7")
+ PORT_DIPNAME( 0x40, 0x00, "S23 (game specific)") PORT_DIPLOCATION("SW2:!7")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x40, DEF_STR( On ))
- PORT_DIPNAME( 0x80, 0x00, "No Free Balls or Games") PORT_DIPLOCATION("SW2:!8") // night rider
+ PORT_DIPNAME( 0x80, 0x00, "No Free Balls or Games") PORT_DIPLOCATION("SW2:!8") // night rider
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x80, DEF_STR( On ))
PORT_START("DSW3")
- PORT_DIPNAME( 0x0f, 0x00, "Coin Slot 2") PORT_DIPLOCATION("SW3:!1,!2,!3,!4")
+ PORT_DIPNAME( 0x0f, 0x00, "Coin Slot 2") PORT_DIPLOCATION("SW3:!1,!2,!3,!4")
PORT_DIPSETTING( 0x00, "Same as Slot 1")
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ))
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ))
@@ -255,16 +255,16 @@ static INPUT_PORTS_START( by17 )
PORT_DIPSETTING( 0x0d, "1 Coin/13 Credits")
PORT_DIPSETTING( 0x0e, "1 Coin/14 Credits")
PORT_DIPSETTING( 0x0f, "1 Coin/15 Credits")
- PORT_DIPNAME( 0x10, 0x00, "S29 (game specific)") PORT_DIPLOCATION("SW3:!5")
+ PORT_DIPNAME( 0x10, 0x00, "S29 (game specific)") PORT_DIPLOCATION("SW3:!5")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x10, DEF_STR( On ))
- PORT_DIPNAME( 0x20, 0x00, "S30 (game specific)") PORT_DIPLOCATION("SW3:!6")
+ PORT_DIPNAME( 0x20, 0x00, "S30 (game specific)") PORT_DIPLOCATION("SW3:!6")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x20, DEF_STR( On ))
- PORT_DIPNAME( 0x40, 0x00, "Awards") PORT_DIPLOCATION("SW3:!7") // night rider
+ PORT_DIPNAME( 0x40, 0x00, "Awards") PORT_DIPLOCATION("SW3:!7") // night rider
PORT_DIPSETTING( 0x00, "Conservative")
PORT_DIPSETTING( 0x40, "Liberal")
- PORT_DIPNAME( 0x80, 0x00, "Lane Adjustment") PORT_DIPLOCATION("SW3:!8") // night rider
+ PORT_DIPNAME( 0x80, 0x00, "Lane Adjustment") PORT_DIPLOCATION("SW3:!8") // night rider
PORT_DIPSETTING( 0x00, "Conservative")
PORT_DIPSETTING( 0x80, "Liberal")
@@ -278,8 +278,8 @@ static INPUT_PORTS_START( by17 )
// standard
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_TILT )
-// PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Outhole") PORT_CODE(KEYCODE_BACKSPACE)
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, outhole_x0, (void *)0x07) // PORT_CODE(KEYCODE_BACKSPACE)
+// PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Outhole") PORT_CODE(KEYCODE_BACKSPACE)
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, outhole_x0, (void *)0x07) // PORT_CODE(KEYCODE_BACKSPACE)
PORT_START("X1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -327,105 +327,105 @@ static INPUT_PORTS_START( matahari )
PORT_INCLUDE( by17 )
PORT_MODIFY("DSW0")
- PORT_DIPNAME( 0x60, 0x60, "Award for Beating Highest Score") PORT_DIPLOCATION("SW0:!6,!7")
+ PORT_DIPNAME( 0x60, 0x60, "Award for Beating Highest Score") PORT_DIPLOCATION("SW0:!6,!7")
PORT_DIPSETTING( 0x00, "Nothing")
PORT_DIPSETTING( 0x20, "1 Credit")
PORT_DIPSETTING( 0x40, "2 Credits")
PORT_DIPSETTING( 0x60, "3 Credits")
PORT_MODIFY("DSW1")
- PORT_DIPNAME( 0x40, 0x00, "S15") PORT_DIPLOCATION("SW1:!7")
+ PORT_DIPNAME( 0x40, 0x00, "S15") PORT_DIPLOCATION("SW1:!7")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x40, DEF_STR( On ))
PORT_MODIFY("DSW2")
- PORT_DIPNAME( 0x20, 0x00, "S22") PORT_DIPLOCATION("SW2:!6")
+ PORT_DIPNAME( 0x20, 0x00, "S22") PORT_DIPLOCATION("SW2:!6")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x20, DEF_STR( On ))
- PORT_DIPNAME( 0x40, 0x00, "Saucer Award Feature") PORT_DIPLOCATION("SW2:!7")
+ PORT_DIPNAME( 0x40, 0x00, "Saucer Award Feature") PORT_DIPLOCATION("SW2:!7")
PORT_DIPSETTING( 0x00, "Start at 3000 Points")
PORT_DIPSETTING( 0x40, "Start at 2X Bonus")
- PORT_DIPNAME( 0x80, 0x00, "A & B Special Award Feature Per Ball") PORT_DIPLOCATION("SW2:!8")
+ PORT_DIPNAME( 0x80, 0x00, "A & B Special Award Feature Per Ball") PORT_DIPLOCATION("SW2:!8")
PORT_DIPSETTING( 0x00, "Award Special Once")
PORT_DIPSETTING( 0x80, "Award Special Alternates")
PORT_MODIFY("DSW3")
- PORT_DIPNAME( 0x10, 0x00, "S29") PORT_DIPLOCATION("SW3:!5")
+ PORT_DIPNAME( 0x10, 0x00, "S29") PORT_DIPLOCATION("SW3:!5")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x10, DEF_STR( On ))
- PORT_DIPNAME( 0x60, 0x60, "Extra Ball / Specials Award Mode") PORT_DIPLOCATION("SW3:!6,!7")
+ PORT_DIPNAME( 0x60, 0x60, "Extra Ball / Specials Award Mode") PORT_DIPLOCATION("SW3:!6,!7")
PORT_DIPSETTING( 0x00, "Novelty / 50,000")
-// PORT_DIPSETTING( 0x20, "")
+// PORT_DIPSETTING( 0x20, "")
PORT_DIPSETTING( 0x40, "Extra Ball / 50,000")
PORT_DIPSETTING( 0x60, "Extra Ball / Replay")
- PORT_DIPNAME( 0x80, 0x80, "Score Level Award") PORT_DIPLOCATION("SW3:!8")
+ PORT_DIPNAME( 0x80, 0x80, "Score Level Award") PORT_DIPLOCATION("SW3:!8")
PORT_DIPSETTING( 0x00, "Extra Ball")
PORT_DIPSETTING( 0x80, "Replay")
- PORT_MODIFY("X2") /* Drop Target switches */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x20) // PORT_CODE(KEYCODE_K)
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x21) // PORT_CODE(KEYCODE_J)
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x22) // PORT_CODE(KEYCODE_H)
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x23) // PORT_CODE(KEYCODE_G)
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x24) // PORT_CODE(KEYCODE_F)
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x25) // PORT_CODE(KEYCODE_D)
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x26) // PORT_CODE(KEYCODE_S)
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x27) // PORT_CODE(KEYCODE_A)
+ PORT_MODIFY("X2") /* Drop Target switches */
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x20) // PORT_CODE(KEYCODE_K)
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x21) // PORT_CODE(KEYCODE_J)
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x22) // PORT_CODE(KEYCODE_H)
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x23) // PORT_CODE(KEYCODE_G)
+ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x24) // PORT_CODE(KEYCODE_F)
+ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x25) // PORT_CODE(KEYCODE_D)
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x26) // PORT_CODE(KEYCODE_S)
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x27) // PORT_CODE(KEYCODE_A)
PORT_MODIFY("X3")
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, saucer_x3, (void *)0x37) // PORT_CODE(KEYCODE_Q)
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, saucer_x3, (void *)0x37) // PORT_CODE(KEYCODE_Q)
INPUT_PORTS_END
static INPUT_PORTS_START( pwerplay )
PORT_INCLUDE( by17 )
PORT_MODIFY("DSW0")
- PORT_DIPNAME( 0x60, 0x60, "Award for Beating Highest Score") PORT_DIPLOCATION("SW0:!6,!7")
+ PORT_DIPNAME( 0x60, 0x60, "Award for Beating Highest Score") PORT_DIPLOCATION("SW0:!6,!7")
PORT_DIPSETTING( 0x00, "Nothing")
PORT_DIPSETTING( 0x20, "1 Credit")
PORT_DIPSETTING( 0x40, "2 Credits")
PORT_DIPSETTING( 0x60, "3 Credits")
PORT_MODIFY("DSW1")
- PORT_DIPNAME( 0x20, 0x00, "Drop Target Award Sequence") PORT_DIPLOCATION("SW1:!6")
+ PORT_DIPNAME( 0x20, 0x00, "Drop Target Award Sequence") PORT_DIPLOCATION("SW1:!6")
PORT_DIPSETTING( 0x00, "5X then Extra Ball")
PORT_DIPSETTING( 0x20, "5X and Extra Ball")
- PORT_DIPNAME( 0x40, 0x00, "Rollover Button Score") PORT_DIPLOCATION("SW1:!7")
+ PORT_DIPNAME( 0x40, 0x00, "Rollover Button Score") PORT_DIPLOCATION("SW1:!7")
PORT_DIPSETTING( 0x00, "Conservative - 100 Points")
PORT_DIPSETTING( 0x40, "Liberal - 1,000 Points")
PORT_MODIFY("DSW2")
- PORT_DIPNAME( 0x20, 0x00, "Drop Target Bank Reset") PORT_DIPLOCATION("SW2:!6")
+ PORT_DIPNAME( 0x20, 0x00, "Drop Target Bank Reset") PORT_DIPLOCATION("SW2:!6")
PORT_DIPSETTING( 0x00, "Reset Both Banks")
PORT_DIPSETTING( 0x20, "Reset Completed Bank Only")
- PORT_DIPNAME( 0x40, 0x00, "Pop Bumper Scores") PORT_DIPLOCATION("SW2:!7")
+ PORT_DIPNAME( 0x40, 0x00, "Pop Bumper Scores") PORT_DIPLOCATION("SW2:!7")
PORT_DIPSETTING( 0x00, "Alternate 1,000 Points Top and Bottom")
PORT_DIPSETTING( 0x40, "All score 1,000 Points When Lit")
PORT_MODIFY("DSW3")
- PORT_DIPNAME( 0x30, 0x20, "Top Saucer Specials Feature") PORT_DIPLOCATION("SW3:!5,!6")
+ PORT_DIPNAME( 0x30, 0x20, "Top Saucer Specials Feature") PORT_DIPLOCATION("SW3:!5,!6")
PORT_DIPSETTING( 0x00, "Outlane Specials do Not Light")
-// PORT_DIPSETTING( 0x10, "")
+// PORT_DIPSETTING( 0x10, "")
PORT_DIPSETTING( 0x20, "Outlane Specials Alternate")
PORT_DIPSETTING( 0x30, "Outlane Specials Both Light")
- PORT_DIPNAME( 0xc0, 0xc0, "Award Mode") PORT_DIPLOCATION("SW3:!7,!8")
+ PORT_DIPNAME( 0xc0, 0xc0, "Award Mode") PORT_DIPLOCATION("SW3:!7,!8")
PORT_DIPSETTING( 0x00, "Novelty / 50,000")
-// PORT_DIPSETTING( 0x40, "")
+// PORT_DIPSETTING( 0x40, "")
PORT_DIPSETTING( 0x80, "Extra Ball / 50,000")
PORT_DIPSETTING( 0xc0, "Extra Ball / Replay")
- PORT_MODIFY("X2") /* Drop Target switches */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x20) // PORT_CODE(KEYCODE_K)
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x21) // PORT_CODE(KEYCODE_J)
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x22) // PORT_CODE(KEYCODE_H)
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x23) // PORT_CODE(KEYCODE_G)
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x24) // PORT_CODE(KEYCODE_F)
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x25) // PORT_CODE(KEYCODE_D)
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x26) // PORT_CODE(KEYCODE_S)
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x27) // PORT_CODE(KEYCODE_A)
+ PORT_MODIFY("X2") /* Drop Target switches */
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x20) // PORT_CODE(KEYCODE_K)
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x21) // PORT_CODE(KEYCODE_J)
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x22) // PORT_CODE(KEYCODE_H)
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x23) // PORT_CODE(KEYCODE_G)
+ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x24) // PORT_CODE(KEYCODE_F)
+ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x25) // PORT_CODE(KEYCODE_D)
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x26) // PORT_CODE(KEYCODE_S)
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, drop_target_x2, (void *)0x27) // PORT_CODE(KEYCODE_A)
PORT_MODIFY("X3")
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, saucer_x3, (void *)0x37) // PORT_CODE(KEYCODE_Q)
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by17_state, saucer_x3, (void *)0x37) // PORT_CODE(KEYCODE_Q)
INPUT_PORTS_END
@@ -465,28 +465,28 @@ CUSTOM_INPUT_MEMBER( by17_state::drop_target_x2 )
switch (bit_shift)
{
- case 0: if (machine().input().code_pressed_once(KEYCODE_K))
+ case 0: if (machine().input().code_pressed_once(KEYCODE_K))
m_io_hold_x[port] |= (1 << bit_shift);
break;
- case 1: if (machine().input().code_pressed_once(KEYCODE_J))
+ case 1: if (machine().input().code_pressed_once(KEYCODE_J))
m_io_hold_x[port] |= (1 << bit_shift);
break;
- case 2: if (machine().input().code_pressed_once(KEYCODE_H))
+ case 2: if (machine().input().code_pressed_once(KEYCODE_H))
m_io_hold_x[port] |= (1 << bit_shift);
break;
- case 3: if (machine().input().code_pressed_once(KEYCODE_G))
+ case 3: if (machine().input().code_pressed_once(KEYCODE_G))
m_io_hold_x[port] |= (1 << bit_shift);
break;
- case 4: if (machine().input().code_pressed_once(KEYCODE_F))
+ case 4: if (machine().input().code_pressed_once(KEYCODE_F))
m_io_hold_x[port] |= (1 << bit_shift);
break;
- case 5: if (machine().input().code_pressed_once(KEYCODE_D))
+ case 5: if (machine().input().code_pressed_once(KEYCODE_D))
m_io_hold_x[port] |= (1 << bit_shift);
break;
- case 6: if (machine().input().code_pressed_once(KEYCODE_S))
+ case 6: if (machine().input().code_pressed_once(KEYCODE_S))
m_io_hold_x[port] |= (1 << bit_shift);
break;
- case 7: if (machine().input().code_pressed_once(KEYCODE_A))
+ case 7: if (machine().input().code_pressed_once(KEYCODE_A))
m_io_hold_x[port] |= (1 << bit_shift);
break;
}
@@ -526,7 +526,7 @@ READ_LINE_MEMBER( by17_state::u10_cb1_r )
WRITE_LINE_MEMBER( by17_state::u10_ca2_w )
{
-#if 0 // Display Blanking - Out of sync with video redraw rate and causes flicker so it's disabled
+#if 0 // Display Blanking - Out of sync with video redraw rate and causes flicker so it's disabled
if (state == 0)
{
int digit;
@@ -547,7 +547,7 @@ WRITE_LINE_MEMBER( by17_state::u10_ca2_w )
WRITE_LINE_MEMBER( by17_state::u10_cb2_w )
{
-// logerror("New U10 CB2 state %01x, was %01x. PIA=%02x\n", state, m_u10_cb2, m_u10a);
+// logerror("New U10 CB2 state %01x, was %01x. PIA=%02x\n", state, m_u10_cb2, m_u10a);
if (state == TRUE)
m_lamp_decode = m_u10a & 0x0f;
@@ -583,20 +583,20 @@ READ8_MEMBER( by17_state::u10_a_r )
WRITE8_MEMBER( by17_state::u10_a_w )
{
-// logerror("Writing %02x to U10 PIA, CB2 state is %01x, CA2 state is %01x, Lamp_Dec is %02x\n",data, m_u10_cb2, m_u10_ca2, (m_lamp_decode & 0x0f));
+// logerror("Writing %02x to U10 PIA, CB2 state is %01x, CA2 state is %01x, Lamp_Dec is %02x\n",data, m_u10_cb2, m_u10_ca2, (m_lamp_decode & 0x0f));
if (!m_u10_ca2)
{
- if (BIT(data, 0)==0) // Display 1
+ if (BIT(data, 0)==0) // Display 1
m_segment[1] = data>>4;
else
- if (BIT(data, 1)==0) // Display 2
+ if (BIT(data, 1)==0) // Display 2
m_segment[2] = data>>4;
else
- if (BIT(data, 2)==0) // Display 3
+ if (BIT(data, 2)==0) // Display 3
m_segment[3] = data>>4;
else
- if (BIT(data, 3)==0) // Display 4
+ if (BIT(data, 3)==0) // Display 4
m_segment[4] = data>>4;
}
@@ -665,7 +665,7 @@ READ8_MEMBER( by17_state::u11_a_r )
WRITE8_MEMBER( by17_state::u11_a_w )
{
- if (BIT(data, 0)==0) // Display Credit/Ball
+ if (BIT(data, 0)==0) // Display Credit/Ball
{
m_segment[5] = m_u10a>>4;
}
@@ -691,7 +691,7 @@ WRITE8_MEMBER( by17_state::u11_a_w )
if BIT(data, 2)
m_digit = 6;
else
- if (BIT(data, 2) && BIT(data, 3)) // Aftermarket 7th digit strobe for 6 digit games
+ if (BIT(data, 2) && BIT(data, 3)) // Aftermarket 7th digit strobe for 6 digit games
m_digit = 7;
if ((m_u10_ca2==0) && m_digit)
@@ -713,17 +713,17 @@ WRITE8_MEMBER( by17_state::u11_b_w )
{
if (!m_u11_cb2)
{
- if ((data & 0x0f) < 0x0f) // Momentary Solenoids
+ if ((data & 0x0f) < 0x0f) // Momentary Solenoids
{
output_set_indexed_value( "solenoid", (data & 0x0f), TRUE);
- if (m_solenoid_features[(data & 0x0f)][3]) // Reset/release relevant switch after firing Solenoid
+ if (m_solenoid_features[(data & 0x0f)][3]) // Reset/release relevant switch after firing Solenoid
m_io_hold_x[(m_solenoid_features[(data & 0x0f)][2])] &= (m_solenoid_features[(data & 0x0f)][3]);
- if (m_solenoid_features[(data & 0x0f)][0] != 0xff) // Play solenoid audio sample
+ if (m_solenoid_features[(data & 0x0f)][0] != 0xff) // Play solenoid audio sample
m_samples->start(m_solenoid_features[(data & 0x0f)][0], m_solenoid_features[(data & 0x0f)][1]);
}
- else // Rest output - all momentary solenoids are off
+ else // Rest output - all momentary solenoids are off
{
for (int i=0; i<15; i++)
{
@@ -747,25 +747,25 @@ WRITE8_MEMBER( by17_state::u11_b_w )
}
if ((m_u11b & 0x20) && ((data & 0x20)==0))
{
- output_set_value("solenoid17", TRUE); // Coin Lockout Coil engage
+ output_set_value("solenoid17", TRUE); // Coin Lockout Coil engage
if (m_solenoid_features[17][0] != 0xff)
m_samples->start(m_solenoid_features[17][0], m_solenoid_features[17][1]);
}
else if ((data & 0x20) && ((m_u11b & 0x20)==0))
{
- output_set_value("solenoid17", FALSE); // Coin Lockout Coil release
+ output_set_value("solenoid17", FALSE); // Coin Lockout Coil release
if (m_solenoid_features[17][0] != 0xff)
m_samples->start(m_solenoid_features[17][0], m_solenoid_features[17][2]);
}
if ((m_u11b & 0x40) && ((data & 0x40)==0))
{
- output_set_value("solenoid18", TRUE); // Flipper Enable Relay engage
+ output_set_value("solenoid18", TRUE); // Flipper Enable Relay engage
if (m_solenoid_features[18][0] != 0xff)
m_samples->start(m_solenoid_features[18][0], m_solenoid_features[18][1]);
}
else if ((data & 0x40) && ((m_u11b & 0x40)==0))
{
- output_set_value("solenoid18", FALSE); // Flipper Enable Relay release
+ output_set_value("solenoid18", FALSE); // Flipper Enable Relay release
if (m_solenoid_features[18][0] != 0xff)
m_samples->start(m_solenoid_features[18][0], m_solenoid_features[18][2]);
}
@@ -789,14 +789,13 @@ WRITE8_MEMBER( by17_state::u11_b_w )
// zero-cross detection
TIMER_DEVICE_CALLBACK_MEMBER( by17_state::timer_z_freq )
{
-
/* Zero Crossing Detector - this timing is based on 50Hz AC line power input converted to unregulated DC
- -+ +---+
+ -+ +---+
| | |
|<-------- 9.30ms -------->|<->|700us
| | |
- +--------------------------+ +-----
+ +--------------------------+ +-----
*/
timer_device *zero_crossing_active_timer = machine().device<timer_device>("timer_z_pulse");
@@ -825,7 +824,6 @@ TIMER_DEVICE_CALLBACK_MEMBER( by17_state::timer_z_pulse )
// 555 timer for display refresh
TIMER_DEVICE_CALLBACK_MEMBER( by17_state::u11_timer )
{
-
/* +--------------------------+ +-----
| | |
|<-------- 2.85ms -------->|<->|300us
@@ -851,7 +849,6 @@ TIMER_DEVICE_CALLBACK_MEMBER( by17_state::timer_d_pulse )
DRIVER_INIT_MEMBER( by17_state, by17 )
{
-
static const UINT8 solenoid_features_default[20][4] =
{
// This table serves two functions and is configured on a per game basis:
@@ -860,12 +857,12 @@ DRIVER_INIT_MEMBER( by17_state, by17 )
// { Sound Channel, Sound Sample, Switch Strobe, Switch Return Mask }
/*00*/ { 0x00, 0x00, 0x00, 0x00 },
- /*01*/ { 0x05, 0x01, 0x00, 0x00 }, // Chime 10
- /*02*/ { 0x05, 0x02, 0x00, 0x00 }, // Chime 100
- /*03*/ { 0x05, 0x03, 0x00, 0x00 }, // Chime 1000
- /*04*/ { 0x05, 0x04, 0x00, 0x00 }, // Chime 10000
- /*05*/ { 0x04, 0x00, 0x00, 0x00 }, // Knocker
- /*06*/ { 0x01, 0x09, 0x00, 0x7f }, // Outhole
+ /*01*/ { 0x05, 0x01, 0x00, 0x00 }, // Chime 10
+ /*02*/ { 0x05, 0x02, 0x00, 0x00 }, // Chime 100
+ /*03*/ { 0x05, 0x03, 0x00, 0x00 }, // Chime 1000
+ /*04*/ { 0x05, 0x04, 0x00, 0x00 }, // Chime 10000
+ /*05*/ { 0x04, 0x00, 0x00, 0x00 }, // Knocker
+ /*06*/ { 0x01, 0x09, 0x00, 0x7f }, // Outhole
/*07*/ { 0x00, 0x00, 0x00, 0x00 },
/*08*/ { 0x02, 0x00, 0x00, 0x00 },
/*09*/ { 0x02, 0x00, 0x00, 0x00 },
@@ -874,11 +871,11 @@ DRIVER_INIT_MEMBER( by17_state, by17 )
/*12*/ { 0x00, 0x00, 0x00, 0x00 },
/*13*/ { 0x02, 0x00, 0x00, 0x00 },
/*14*/ { 0x00, 0x00, 0x00, 0x00 },
- /*15*/ { 0xff, 0xff, 0x00, 0x00 }, // None - all momentary solenoids off
+ /*15*/ { 0xff, 0xff, 0x00, 0x00 }, // None - all momentary solenoids off
// { Sound Channel, Sound engage, Sound release, Not Used }
/*16*/ { 0xff, 0xff, 0xff, 0x00 },
- /*17*/ { 0x00, 0x0c, 0x0d, 0x00 }, // Coin Lockout coil
- /*18*/ { 0x00, 0x0e, 0x0f, 0x00 }, // Flipper Enable relay
+ /*17*/ { 0x00, 0x0c, 0x0d, 0x00 }, // Coin Lockout coil
+ /*18*/ { 0x00, 0x0e, 0x0f, 0x00 }, // Flipper Enable relay
/*19*/ { 0xff, 0xff, 0xff, 0x00 }
};
@@ -892,30 +889,29 @@ DRIVER_INIT_MEMBER( by17_state, by17 )
DRIVER_INIT_MEMBER( by17_state, matahari )
{
-
static const UINT8 solenoid_features_matahari[20][4] =
{
// { Sound Channel, Sound Sample, Switch Strobe, Switch Return Mask }
- /*00*/ { 0x02, 0x05, 0x03, 0x7f }, // Saucer
- /*01*/ { 0x05, 0x01, 0x00, 0x00 }, // Chime 10
- /*02*/ { 0x05, 0x02, 0x00, 0x00 }, // Chime 100
- /*03*/ { 0x05, 0x03, 0x00, 0x00 }, // Chime 1000
- /*04*/ { 0x05, 0x04, 0x00, 0x00 }, // Chime 10000
- /*05*/ { 0x04, 0x06, 0x00, 0x00 }, // Knocker
- /*06*/ { 0x01, 0x09, 0x00, 0x7f }, // Outhole
- /*07*/ { 0x02, 0x00, 0x00, 0x00 }, // Pop Bumper Left Bottom
- /*08*/ { 0x02, 0x00, 0x00, 0x00 }, // Pop Bumper Left Top
- /*09*/ { 0x02, 0x00, 0x00, 0x00 }, // Pop Bumper Right Top
- /*10*/ { 0x02, 0x00, 0x00, 0x00 }, // Pop Bumper Right Bottom
- /*11*/ { 0x02, 0x07, 0x00, 0x00 }, // Slingshot Left
- /*12*/ { 0x00, 0x0b, 0x02, 0x0f }, // Drop Target Reset Left
- /*13*/ { 0x02, 0x07, 0x00, 0x00 }, // Slingshot Right
- /*14*/ { 0x03, 0x0b, 0x02, 0xf0 }, // Drop Target Reset Right
- /*15*/ { 0xff, 0xff, 0x00, 0x00 }, // None - all momentary solenoids off
+ /*00*/ { 0x02, 0x05, 0x03, 0x7f }, // Saucer
+ /*01*/ { 0x05, 0x01, 0x00, 0x00 }, // Chime 10
+ /*02*/ { 0x05, 0x02, 0x00, 0x00 }, // Chime 100
+ /*03*/ { 0x05, 0x03, 0x00, 0x00 }, // Chime 1000
+ /*04*/ { 0x05, 0x04, 0x00, 0x00 }, // Chime 10000
+ /*05*/ { 0x04, 0x06, 0x00, 0x00 }, // Knocker
+ /*06*/ { 0x01, 0x09, 0x00, 0x7f }, // Outhole
+ /*07*/ { 0x02, 0x00, 0x00, 0x00 }, // Pop Bumper Left Bottom
+ /*08*/ { 0x02, 0x00, 0x00, 0x00 }, // Pop Bumper Left Top
+ /*09*/ { 0x02, 0x00, 0x00, 0x00 }, // Pop Bumper Right Top
+ /*10*/ { 0x02, 0x00, 0x00, 0x00 }, // Pop Bumper Right Bottom
+ /*11*/ { 0x02, 0x07, 0x00, 0x00 }, // Slingshot Left
+ /*12*/ { 0x00, 0x0b, 0x02, 0x0f }, // Drop Target Reset Left
+ /*13*/ { 0x02, 0x07, 0x00, 0x00 }, // Slingshot Right
+ /*14*/ { 0x03, 0x0b, 0x02, 0xf0 }, // Drop Target Reset Right
+ /*15*/ { 0xff, 0xff, 0x00, 0x00 }, // None - all momentary solenoids off
// { Sound Channel, Sound engage, Sound release, Not Used }
/*16*/ { 0xff, 0xff, 0xff, 0x00 },
- /*17*/ { 0x00, 0x0c, 0x0d, 0x00 }, // Coin Lockout coil
- /*18*/ { 0x00, 0x0e, 0x0f, 0x00 }, // Flipper Enable relay
+ /*17*/ { 0x00, 0x0c, 0x0d, 0x00 }, // Coin Lockout coil
+ /*18*/ { 0x00, 0x0e, 0x0f, 0x00 }, // Flipper Enable relay
/*19*/ { 0xff, 0xff, 0xff, 0x00 }
};
@@ -929,30 +925,29 @@ DRIVER_INIT_MEMBER( by17_state, matahari )
DRIVER_INIT_MEMBER( by17_state, pwerplay )
{
-
static const UINT8 solenoid_features_pwerplay[20][4] =
{
// { Sound Channel, Sound Sample, Switch Strobe, Switch Return Mask }
- /*00*/ { 0x00, 0x10, 0x00, 0x00 }, // Post Down
- /*01*/ { 0x05, 0x01, 0x00, 0x00 }, // Chime 10
- /*02*/ { 0x05, 0x02, 0x00, 0x00 }, // Chime 100
- /*03*/ { 0x05, 0x03, 0x00, 0x00 }, // Chime 1000
- /*04*/ { 0x05, 0x04, 0x00, 0x00 }, // Chime 10000
- /*05*/ { 0x04, 0x06, 0x00, 0x00 }, // Knocker
- /*06*/ { 0x01, 0x09, 0x00, 0x7f }, // Outhole
- /*07*/ { 0x02, 0x05, 0x03, 0x7f }, // Saucer
- /*08*/ { 0x02, 0x00, 0x00, 0x00 }, // Pop Bumper Left
- /*09*/ { 0x02, 0x00, 0x00, 0x00 }, // Pop Bumper Right
- /*10*/ { 0x02, 0x00, 0x00, 0x00 }, // Pop Bumper Bottom
- /*11*/ { 0x02, 0x07, 0x00, 0x00 }, // Slingshot Left
- /*12*/ { 0x00, 0x0b, 0x02, 0x0f }, // Drop Target Reset Left
- /*13*/ { 0x02, 0x07, 0x00, 0x00 }, // Slingshot Right
- /*14*/ { 0x03, 0x0b, 0x02, 0xf0 }, // Drop Target Reset Right
- /*15*/ { 0xff, 0xff, 0x00, 0x00 }, // None - all momentary solenoids off
+ /*00*/ { 0x00, 0x10, 0x00, 0x00 }, // Post Down
+ /*01*/ { 0x05, 0x01, 0x00, 0x00 }, // Chime 10
+ /*02*/ { 0x05, 0x02, 0x00, 0x00 }, // Chime 100
+ /*03*/ { 0x05, 0x03, 0x00, 0x00 }, // Chime 1000
+ /*04*/ { 0x05, 0x04, 0x00, 0x00 }, // Chime 10000
+ /*05*/ { 0x04, 0x06, 0x00, 0x00 }, // Knocker
+ /*06*/ { 0x01, 0x09, 0x00, 0x7f }, // Outhole
+ /*07*/ { 0x02, 0x05, 0x03, 0x7f }, // Saucer
+ /*08*/ { 0x02, 0x00, 0x00, 0x00 }, // Pop Bumper Left
+ /*09*/ { 0x02, 0x00, 0x00, 0x00 }, // Pop Bumper Right
+ /*10*/ { 0x02, 0x00, 0x00, 0x00 }, // Pop Bumper Bottom
+ /*11*/ { 0x02, 0x07, 0x00, 0x00 }, // Slingshot Left
+ /*12*/ { 0x00, 0x0b, 0x02, 0x0f }, // Drop Target Reset Left
+ /*13*/ { 0x02, 0x07, 0x00, 0x00 }, // Slingshot Right
+ /*14*/ { 0x03, 0x0b, 0x02, 0xf0 }, // Drop Target Reset Right
+ /*15*/ { 0xff, 0xff, 0x00, 0x00 }, // None - all momentary solenoids off
// { Sound Channel, Sound engage, Sound release, Not Used }
- /*16*/ { 0x00, 0x11, 0x0f, 0x00 }, // Post Up
- /*17*/ { 0x00, 0x0c, 0x0d, 0x00 }, // Coin Lockout coil
- /*18*/ { 0x00, 0x0e, 0x0f, 0x00 }, // Flipper Enable relay
+ /*16*/ { 0x00, 0x11, 0x0f, 0x00 }, // Post Up
+ /*17*/ { 0x00, 0x0c, 0x0d, 0x00 }, // Coin Lockout coil
+ /*18*/ { 0x00, 0x0e, 0x0f, 0x00 }, // Flipper Enable relay
/*19*/ { 0xff, 0xff, 0xff, 0x00 }
};
@@ -977,7 +972,7 @@ MACHINE_RESET_MEMBER( by17_state, by17 )
m_u11a = 0;
m_u11b = 0;
m_lamp_decode = 0x0f;
- m_io_hold_x[0] = 0x80; // Put ball in Outhole on startup
+ m_io_hold_x[0] = 0x80; // Put ball in Outhole on startup
m_io_hold_x[1] = m_io_hold_x[2] = m_io_hold_x[3] = m_io_hold_x[4] = 0;
}
@@ -985,12 +980,12 @@ MACHINE_RESET_MEMBER( by17_state, by17 )
static MACHINE_CONFIG_START( by17, by17_state )
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, 530000) // No xtal, just 2 chips forming a multivibrator oscillator around 530KHz
+ MCFG_CPU_ADD("maincpu", M6800, 530000) // No xtal, just 2 chips forming a multivibrator oscillator around 530KHz
MCFG_CPU_PROGRAM_MAP(by17_map)
MCFG_MACHINE_RESET_OVERRIDE( by17_state, by17 )
- MCFG_NVRAM_ADD_0FILL("nvram") // 'F' filled causes Credit Display to be blank on first startup
+ MCFG_NVRAM_ADD_0FILL("nvram") // 'F' filled causes Credit Display to be blank on first startup
/* Video */
MCFG_DEFAULT_LAYOUT(layout_by17)
diff --git a/src/mame/drivers/by35.c b/src/mame/drivers/by35.c
index bf091e7a6a5..60a2a3c640f 100644
--- a/src/mame/drivers/by35.c
+++ b/src/mame/drivers/by35.c
@@ -173,7 +173,7 @@ private:
static ADDRESS_MAP_START( by35_map, AS_PROGRAM, 8, by35_state )
- ADDRESS_MAP_GLOBAL_MASK(0x7fff) // A15 is not connected
+ ADDRESS_MAP_GLOBAL_MASK(0x7fff) // A15 is not connected
AM_RANGE(0x0000, 0x007f) AM_RAM
AM_RANGE(0x0088, 0x008b) AM_DEVREADWRITE("pia_u10", pia6821_device, read, write)
AM_RANGE(0x0090, 0x0093) AM_DEVREADWRITE("pia_u11", pia6821_device, read, write)
@@ -182,7 +182,7 @@ static ADDRESS_MAP_START( by35_map, AS_PROGRAM, 8, by35_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( nuovo_map, AS_PROGRAM, 8, by35_state )
-// AM_RANGE(0x0000, 0x007f) AM_RAM // Schematics infer that the M6802 internal RAM is disabled.
+// AM_RANGE(0x0000, 0x007f) AM_RAM // Schematics infer that the M6802 internal RAM is disabled.
AM_RANGE(0x0088, 0x008b) AM_DEVREADWRITE("pia_u10", pia6821_device, read, write)
AM_RANGE(0x0090, 0x0093) AM_DEVREADWRITE("pia_u11", pia6821_device, read, write)
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
@@ -197,7 +197,7 @@ static INPUT_PORTS_START( by35 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Activity") PORT_CHANGED_MEMBER(DEVICE_SELF, by35_state, activity_button, 0)
PORT_START("DSW0")
- PORT_DIPNAME( 0x1f, 0x02, "Coin Slot 1") PORT_DIPLOCATION("SW0:!1,!2,!3,!4,!5") // same as 03
+ PORT_DIPNAME( 0x1f, 0x02, "Coin Slot 1") PORT_DIPLOCATION("SW0:!1,!2,!3,!4,!5") // same as 03
PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ))
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ))
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ))
@@ -229,17 +229,17 @@ static INPUT_PORTS_START( by35 )
PORT_DIPSETTING( 0x1d, "2 Coins/14 Credits")
PORT_DIPSETTING( 0x1e, "1 Coin/15 Credits")
PORT_DIPSETTING( 0x1f, "2 Coins/15 Credits")
- PORT_DIPNAME( 0x60, 0x40, "Award for Beating Highest Score") PORT_DIPLOCATION("SW0:!6,!7")
+ PORT_DIPNAME( 0x60, 0x40, "Award for Beating Highest Score") PORT_DIPLOCATION("SW0:!6,!7")
PORT_DIPSETTING( 0x00, "Nothing")
PORT_DIPSETTING( 0x20, "1 Credit")
PORT_DIPSETTING( 0x40, "2 Credits")
PORT_DIPSETTING( 0x60, "3 Credits")
- PORT_DIPNAME( 0x80, 0x80, "Melody Option 1") PORT_DIPLOCATION("SW0:!8")
+ PORT_DIPNAME( 0x80, 0x80, "Melody Option 1") PORT_DIPLOCATION("SW0:!8")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x80, DEF_STR( On ))
PORT_START("DSW1")
- PORT_DIPNAME( 0x1f, 0x02, "Coin Slot 3") PORT_DIPLOCATION("SW1:!1,!2,!3,!4,!5") // same as 01
+ PORT_DIPNAME( 0x1f, 0x02, "Coin Slot 3") PORT_DIPLOCATION("SW1:!1,!2,!3,!4,!5") // same as 01
PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ))
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ))
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ))
@@ -271,16 +271,16 @@ static INPUT_PORTS_START( by35 )
PORT_DIPSETTING( 0x1d, "2 Coins/14 Credits")
PORT_DIPSETTING( 0x1e, "1 Coin/15 Credits")
PORT_DIPSETTING( 0x1f, "2 Coins/15 Credits")
- PORT_DIPNAME( 0x60, 0x60, "Score Level Award") PORT_DIPLOCATION("SW1:!6,!7")
+ PORT_DIPNAME( 0x60, 0x60, "Score Level Award") PORT_DIPLOCATION("SW1:!6,!7")
PORT_DIPSETTING( 0x00, "Nothing")
PORT_DIPSETTING( 0x40, "Extra Ball")
PORT_DIPSETTING( 0x60, "Replay")
- PORT_DIPNAME( 0x80, 0x80, "Balls Per Game") PORT_DIPLOCATION("SW1:!8")
+ PORT_DIPNAME( 0x80, 0x80, "Balls Per Game") PORT_DIPLOCATION("SW1:!8")
PORT_DIPSETTING( 0x00, "3")
PORT_DIPSETTING( 0x80, "5")
PORT_START("DSW2")
- PORT_DIPNAME( 0x07, 0x01, "Maximum Credits") PORT_DIPLOCATION("SW2:!1,!2,!3")
+ PORT_DIPNAME( 0x07, 0x01, "Maximum Credits") PORT_DIPLOCATION("SW2:!1,!2,!3")
PORT_DIPSETTING( 0x00, "5")
PORT_DIPSETTING( 0x01, "10")
PORT_DIPSETTING( 0x02, "15")
@@ -289,24 +289,24 @@ static INPUT_PORTS_START( by35 )
PORT_DIPSETTING( 0x05, "30")
PORT_DIPSETTING( 0x06, "35")
PORT_DIPSETTING( 0x07, "40")
- PORT_DIPNAME( 0x08, 0x08, "Credits Displayed") PORT_DIPLOCATION("SW2:!4")
+ PORT_DIPNAME( 0x08, 0x08, "Credits Displayed") PORT_DIPLOCATION("SW2:!4")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x08, DEF_STR( On ))
- PORT_DIPNAME( 0x10, 0x10, "Match Feature") PORT_DIPLOCATION("SW2:!5")
+ PORT_DIPNAME( 0x10, 0x10, "Match Feature") PORT_DIPLOCATION("SW2:!5")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x10, DEF_STR( On ))
- PORT_DIPNAME( 0x20, 0x00, "S22 (game specific)") PORT_DIPLOCATION("SW2:!6")
+ PORT_DIPNAME( 0x20, 0x00, "S22 (game specific)") PORT_DIPLOCATION("SW2:!6")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x20, DEF_STR( On ))
- PORT_DIPNAME( 0x40, 0x00, "S23 (game specific)") PORT_DIPLOCATION("SW2:!7")
+ PORT_DIPNAME( 0x40, 0x00, "S23 (game specific)") PORT_DIPLOCATION("SW2:!7")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x40, DEF_STR( On ))
- PORT_DIPNAME( 0x80, 0x00, "S24 (game specific)") PORT_DIPLOCATION("SW2:!8")
+ PORT_DIPNAME( 0x80, 0x00, "S24 (game specific)") PORT_DIPLOCATION("SW2:!8")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x80, DEF_STR( On ))
PORT_START("DSW3")
- PORT_DIPNAME( 0x0f, 0x00, "Coin Slot 2") PORT_DIPLOCATION("SW3:!1,!2,!3,!4")
+ PORT_DIPNAME( 0x0f, 0x00, "Coin Slot 2") PORT_DIPLOCATION("SW3:!1,!2,!3,!4")
PORT_DIPSETTING( 0x00, "Same as Slot 1")
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ))
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ))
@@ -323,16 +323,16 @@ static INPUT_PORTS_START( by35 )
PORT_DIPSETTING( 0x0d, "1 Coin/13 Credits")
PORT_DIPSETTING( 0x0e, "1 Coin/14 Credits")
PORT_DIPSETTING( 0x0f, "1 Coin/15 Credits")
- PORT_DIPNAME( 0x10, 0x00, "S29 (game specific)") PORT_DIPLOCATION("SW3:!5")
+ PORT_DIPNAME( 0x10, 0x00, "S29 (game specific)") PORT_DIPLOCATION("SW3:!5")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x10, DEF_STR( On ))
- PORT_DIPNAME( 0x20, 0x00, "S30 (game specific)") PORT_DIPLOCATION("SW3:!6")
+ PORT_DIPNAME( 0x20, 0x00, "S30 (game specific)") PORT_DIPLOCATION("SW3:!6")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x20, DEF_STR( On ))
- PORT_DIPNAME( 0x40, 0x00, "S31 (game specific)") PORT_DIPLOCATION("SW3:!7")
+ PORT_DIPNAME( 0x40, 0x00, "S31 (game specific)") PORT_DIPLOCATION("SW3:!7")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x40, DEF_STR( On ))
- PORT_DIPNAME( 0x80, 0x80, "Melody Option 2") PORT_DIPLOCATION("SW3:!8")
+ PORT_DIPNAME( 0x80, 0x80, "Melody Option 2") PORT_DIPLOCATION("SW3:!8")
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x80, DEF_STR( On ))
@@ -344,7 +344,7 @@ static INPUT_PORTS_START( by35 )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSLASH)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_TILT )
-// PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Outhole") PORT_CODE(KEYCODE_BACKSPACE)
+// PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Outhole") PORT_CODE(KEYCODE_BACKSPACE)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by35_state, outhole_x0, (void *)0x07) // PORT_CODE(KEYCODE_BACKSPACE)
PORT_START("X1")
@@ -392,28 +392,28 @@ static INPUT_PORTS_START( playboy )
PORT_INCLUDE( by35 )
PORT_MODIFY("DSW2")
- PORT_DIPNAME( 0x20, 0x00, "Drop Target Special") PORT_DIPLOCATION("SW2:!6")
+ PORT_DIPNAME( 0x20, 0x00, "Drop Target Special") PORT_DIPLOCATION("SW2:!6")
PORT_DIPSETTING( 0x00, "Lit Until Next Ball")
PORT_DIPSETTING( 0x20, "Lit Until Collected")
- PORT_DIPNAME( 0x40, 0x00, "Playmate Keys") PORT_DIPLOCATION("SW2:!7")
+ PORT_DIPNAME( 0x40, 0x00, "Playmate Keys") PORT_DIPLOCATION("SW2:!7")
PORT_DIPSETTING( 0x00, "Reset At Next Ball")
PORT_DIPSETTING( 0x40, "Remembered Next Ball")
- PORT_DIPNAME( 0x80, 0x00, "25000 Outlanes") PORT_DIPLOCATION("SW2:!8")
+ PORT_DIPNAME( 0x80, 0x00, "25000 Outlanes") PORT_DIPLOCATION("SW2:!8")
PORT_DIPSETTING( 0x00, "Alternate")
PORT_DIPSETTING( 0x80, "Both")
PORT_MODIFY("DSW3")
- PORT_DIPNAME( 0x10, 0x00, "2 and 3 Key Lanes") PORT_DIPLOCATION("SW3:!5")
+ PORT_DIPNAME( 0x10, 0x00, "2 and 3 Key Lanes") PORT_DIPLOCATION("SW3:!5")
PORT_DIPSETTING( 0x00, "Separate")
PORT_DIPSETTING( 0x10, "Tied Together")
- PORT_DIPNAME( 0x20, 0x00, "1 and 4 Key Lanes") PORT_DIPLOCATION("SW3:!6")
+ PORT_DIPNAME( 0x20, 0x00, "1 and 4 Key Lanes") PORT_DIPLOCATION("SW3:!6")
PORT_DIPSETTING( 0x00, "Separate")
PORT_DIPSETTING( 0x20, "Tied Together")
- PORT_DIPNAME( 0x40, 0x00, "Rollover Button Award") PORT_DIPLOCATION("SW3:!7")
+ PORT_DIPNAME( 0x40, 0x00, "Rollover Button Award") PORT_DIPLOCATION("SW3:!7")
PORT_DIPSETTING( 0x00, "Extra Ball or Special Reset At Next Ball")
PORT_DIPSETTING( 0x40, "Extra Ball or Special Held Until Collected")
- PORT_MODIFY("X0") /* Drop Target switches */
+ PORT_MODIFY("X0") /* Drop Target switches */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by35_state, drop_target_x0, (void *)0x00) // PORT_CODE(KEYCODE_STOP)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by35_state, drop_target_x0, (void *)0x01) // PORT_CODE(KEYCODE_SLASH)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, by35_state, drop_target_x0, (void *)0x02) // PORT_CODE(KEYCODE_OPENBRACE)
@@ -463,19 +463,19 @@ CUSTOM_INPUT_MEMBER( by35_state::drop_target_x0 )
switch (bit_shift)
{
- case 0: if (machine().input().code_pressed_once(KEYCODE_STOP))
+ case 0: if (machine().input().code_pressed_once(KEYCODE_STOP))
m_io_hold_x[port] |= (1 << bit_shift);
break;
- case 1: if (machine().input().code_pressed_once(KEYCODE_SLASH))
+ case 1: if (machine().input().code_pressed_once(KEYCODE_SLASH))
m_io_hold_x[port] |= (1 << bit_shift);
break;
- case 2: if (machine().input().code_pressed_once(KEYCODE_OPENBRACE))
+ case 2: if (machine().input().code_pressed_once(KEYCODE_OPENBRACE))
m_io_hold_x[port] |= (1 << bit_shift);
break;
- case 3: if (machine().input().code_pressed_once(KEYCODE_CLOSEBRACE))
+ case 3: if (machine().input().code_pressed_once(KEYCODE_CLOSEBRACE))
m_io_hold_x[port] |= (1 << bit_shift);
break;
- case 4: if (machine().input().code_pressed_once(KEYCODE_BACKSLASH))
+ case 4: if (machine().input().code_pressed_once(KEYCODE_BACKSLASH))
m_io_hold_x[port] |= (1 << bit_shift);
break;
}
@@ -514,7 +514,7 @@ READ_LINE_MEMBER( by35_state::u10_cb1_r )
WRITE_LINE_MEMBER( by35_state::u10_ca2_w )
{
-#if 0 // Display Blanking - Out of sync with video redraw rate and causes flicker so it's disabled
+#if 0 // Display Blanking - Out of sync with video redraw rate and causes flicker so it's disabled
if (state == 0)
{
int digit;
@@ -535,7 +535,7 @@ WRITE_LINE_MEMBER( by35_state::u10_ca2_w )
WRITE_LINE_MEMBER( by35_state::u10_cb2_w )
{
-// logerror("New U10 CB2 state %01x, was %01x. PIA=%02x\n", state, m_u10_cb2, m_u10a);
+// logerror("New U10 CB2 state %01x, was %01x. PIA=%02x\n", state, m_u10_cb2, m_u10a);
if (state == TRUE)
m_lamp_decode = m_u10a & 0x0f;
@@ -574,7 +574,7 @@ WRITE_LINE_MEMBER( by35_state::u11_cb2_as2888_w )
snd_sustain_timer->adjust(attotime::from_msec(5));
m_timer_as2888 = true;
- m_discrete->write(space, NODE_08, 11); // 11 volt pulse
+ m_discrete->write(space, NODE_08, 11); // 11 volt pulse
}
m_u11_cb2 = state;
@@ -587,20 +587,20 @@ READ8_MEMBER( by35_state::u10_a_r )
WRITE8_MEMBER( by35_state::u10_a_w )
{
-// logerror("Writing %02x to U10 PIA, CB2 state is %01x, CA2 state is %01x, Lamp_Dec is %02x\n",data, m_u10_cb2, m_u10_ca2, (m_lamp_decode & 0x0f));
+// logerror("Writing %02x to U10 PIA, CB2 state is %01x, CA2 state is %01x, Lamp_Dec is %02x\n",data, m_u10_cb2, m_u10_ca2, (m_lamp_decode & 0x0f));
if (!m_u10_ca2)
{
- if (BIT(data, 0)==0) // Display 1
+ if (BIT(data, 0)==0) // Display 1
m_segment[1] = data>>4;
else
- if (BIT(data, 1)==0) // Display 2
+ if (BIT(data, 1)==0) // Display 2
m_segment[2] = data>>4;
else
- if (BIT(data, 2)==0) // Display 3
+ if (BIT(data, 2)==0) // Display 3
m_segment[3] = data>>4;
else
- if (BIT(data, 3)==0) // Display 4
+ if (BIT(data, 3)==0) // Display 4
m_segment[4] = data>>4;
}
@@ -669,7 +669,7 @@ READ8_MEMBER( by35_state::u11_a_r )
WRITE8_MEMBER( by35_state::u11_a_w )
{
- if (BIT(data, 0)==0) // Display Credit/Ball
+ if (BIT(data, 0)==0) // Display Credit/Ball
{
m_segment[5] = m_u10a>>4;
}
@@ -695,7 +695,7 @@ WRITE8_MEMBER( by35_state::u11_a_w )
if BIT(data, 2)
m_digit = 6;
else
- if (BIT(data, 2) && BIT(data, 3)) // Aftermarket 7th digit strobe for 6 digit games
+ if (BIT(data, 2) && BIT(data, 3)) // Aftermarket 7th digit strobe for 6 digit games
m_digit = 7;
else
if (BIT(data, 1) && m_7d)
@@ -720,19 +720,19 @@ WRITE8_MEMBER( by35_state::u11_b_w )
{
if (!m_u11_cb2)
{
- if ((data & 0x0f) < 0x0f) // Momentary Solenoids
+ if ((data & 0x0f) < 0x0f) // Momentary Solenoids
{
- if (m_solenoid_features[(data & 0x0f)][0] != 0xff) { // Play solenoid audio sample
+ if (m_solenoid_features[(data & 0x0f)][0] != 0xff) { // Play solenoid audio sample
if (output_get_indexed_value("solenoid", (data & 0x0f)) == FALSE)
m_samples->start(m_solenoid_features[(data & 0x0f)][0], m_solenoid_features[(data & 0x0f)][1]);
}
output_set_indexed_value( "solenoid", (data & 0x0f), TRUE);
- if (m_solenoid_features[(data & 0x0f)][3]) // Reset/release relevant switch after firing Solenoid
+ if (m_solenoid_features[(data & 0x0f)][3]) // Reset/release relevant switch after firing Solenoid
m_io_hold_x[(m_solenoid_features[(data & 0x0f)][2])] &= (m_solenoid_features[(data & 0x0f)][3]);
}
- else // Rest output - all momentary solenoids are off
+ else // Rest output - all momentary solenoids are off
{
for (int i=0; i<15; i++)
{
@@ -756,25 +756,25 @@ WRITE8_MEMBER( by35_state::u11_b_w )
}
if ((m_u11b & 0x20) && ((data & 0x20)==0))
{
- output_set_value("solenoid17", TRUE); // Coin Lockout Coil engage
+ output_set_value("solenoid17", TRUE); // Coin Lockout Coil engage
if (m_solenoid_features[17][0] != 0xff)
m_samples->start(m_solenoid_features[17][0], m_solenoid_features[17][1]);
}
else if ((data & 0x20) && ((m_u11b & 0x20)==0))
{
- output_set_value("solenoid17", FALSE); // Coin Lockout Coil release
+ output_set_value("solenoid17", FALSE); // Coin Lockout Coil release
if (m_solenoid_features[17][0] != 0xff)
m_samples->start(m_solenoid_features[17][0], m_solenoid_features[17][2]);
}
if ((m_u11b & 0x40) && ((data & 0x40)==0))
{
- output_set_value("solenoid18", TRUE); // Flipper Enable Relay engage
+ output_set_value("solenoid18", TRUE); // Flipper Enable Relay engage
if (m_solenoid_features[18][0] != 0xff)
m_samples->start(m_solenoid_features[18][0], m_solenoid_features[18][1]);
}
else if ((data & 0x40) && ((m_u11b & 0x40)==0))
{
- output_set_value("solenoid18", FALSE); // Flipper Enable Relay release
+ output_set_value("solenoid18", FALSE); // Flipper Enable Relay release
if (m_solenoid_features[18][0] != 0xff)
m_samples->start(m_solenoid_features[18][0], m_solenoid_features[18][2]);
}
@@ -803,14 +803,13 @@ WRITE8_MEMBER( by35_state::u11_b_as2888_w )
// zero-cross detection
TIMER_DEVICE_CALLBACK_MEMBER( by35_state::timer_z_freq )
{
-
/* Zero Crossing Detector - this timing is based on 50Hz AC line power input converted to unregulated DC
- -+ +---+
+ -+ +---+
| | |
|<-------- 9.30ms -------->|<->|700us
| | |
- +--------------------------+ +-----
+ +--------------------------+ +-----
*/
timer_device *zero_crossing_active_timer = machine().device<timer_device>("timer_z_pulse");
@@ -839,7 +838,6 @@ TIMER_DEVICE_CALLBACK_MEMBER( by35_state::timer_z_pulse )
// 555 timer for display refresh
TIMER_DEVICE_CALLBACK_MEMBER( by35_state::u11_timer )
{
-
/* +--------------------------+ +-----
| | |
|<-------- 2.85ms -------->|<->|300us
@@ -875,7 +873,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( by35_state::timer_s )
m_discrete->write(space, NODE_04, ((m_snd_div & 0x04)>>2) * 1);
m_discrete->write(space, NODE_01, ((m_snd_div & 0x01)>>0) * 1);
-// if (m_snd_sel == 0x01) logerror("SndSel=%02x, Tone=%02x, Div=%02x\n",m_snd_sel, m_snd_tone_gen, m_snd_div);
+// if (m_snd_sel == 0x01) logerror("SndSel=%02x, Tone=%02x, Div=%02x\n",m_snd_sel, m_snd_tone_gen, m_snd_div);
}
}
@@ -887,11 +885,11 @@ TIMER_DEVICE_CALLBACK_MEMBER( by35_state::timer_as2888 )
if ((m_u11a & 0x02) == 0) offs |= 0x10;
{
m_snd_sel = m_snd_prom[offs];
-// logerror("SndSel read %02x from PROM addr %02x\n",m_snd_sel, offs );
+// logerror("SndSel read %02x from PROM addr %02x\n",m_snd_sel, offs );
m_snd_sel = BITSWAP8(m_snd_sel,0,1,2,3,4,5,6,7);
m_snd_tone_gen = m_snd_sel;
-// logerror("SndSel=%02x, Tone=%02x, Div=%02x\n",m_snd_sel, m_snd_tone_gen, m_snd_div);
+// logerror("SndSel=%02x, Tone=%02x, Div=%02x\n",m_snd_sel, m_snd_tone_gen, m_snd_div);
}
m_discrete->write(space, NODE_08, 0);
@@ -905,7 +903,6 @@ TIMER_DEVICE_CALLBACK_MEMBER( by35_state::timer_as2888 )
DRIVER_INIT_MEMBER( by35_state, by35_6 )
{
-
static const UINT8 solenoid_features_default[20][4] =
{
// This table serves two functions and is configured on a per game basis:
@@ -918,8 +915,8 @@ DRIVER_INIT_MEMBER( by35_state, by35_6 )
/*02*/ { 0x00, 0x00, 0x00, 0x00 },
/*03*/ { 0x00, 0x00, 0x00, 0x00 },
/*04*/ { 0x00, 0x00, 0x00, 0x00 },
- /*05*/ { 0x04, 0x06, 0x00, 0x00 }, // Knocker
- /*06*/ { 0x01, 0x09, 0x00, 0x7f }, // Outhole
+ /*05*/ { 0x04, 0x06, 0x00, 0x00 }, // Knocker
+ /*06*/ { 0x01, 0x09, 0x00, 0x7f }, // Outhole
/*07*/ { 0x00, 0x0a, 0x00, 0x00 },
/*08*/ { 0x02, 0x00, 0x00, 0x00 },
/*09*/ { 0x02, 0x00, 0x00, 0x00 },
@@ -928,11 +925,11 @@ DRIVER_INIT_MEMBER( by35_state, by35_6 )
/*12*/ { 0x00, 0x0b, 0x00, 0x00 },
/*13*/ { 0x02, 0x07, 0x00, 0x00 },
/*14*/ { 0x00, 0x00, 0x00, 0x00 },
- /*15*/ { 0xff, 0xff, 0x00, 0x00 }, // None - all momentary solenoids off
+ /*15*/ { 0xff, 0xff, 0x00, 0x00 }, // None - all momentary solenoids off
// { Sound Channel, Sound engage, Sound release, Not Used }
/*16*/ { 0xff, 0xff, 0xff, 0x00 },
- /*17*/ { 0x00, 0x0c, 0x0d, 0x00 }, // Coin Lockout coil
- /*18*/ { 0x00, 0x0e, 0x0f, 0x00 }, // Flipper enable relay
+ /*17*/ { 0x00, 0x0c, 0x0d, 0x00 }, // Coin Lockout coil
+ /*18*/ { 0x00, 0x0e, 0x0f, 0x00 }, // Flipper enable relay
/*19*/ { 0xff, 0xff, 0xff, 0x00 }
};
@@ -949,7 +946,6 @@ DRIVER_INIT_MEMBER( by35_state, by35_6 )
DRIVER_INIT_MEMBER( by35_state, playboy )
{
-
static const UINT8 solenoid_features_playboy[20][4] =
{
// { Sound Channel, Sound Sample, Switch Strobe, Switch Return Mask }
@@ -958,21 +954,21 @@ DRIVER_INIT_MEMBER( by35_state, playboy )
/*02*/ { 0xff, 0xff, 0x00, 0x00 },
/*03*/ { 0xff, 0xff, 0x00, 0x00 },
/*04*/ { 0xff, 0xff, 0x00, 0x00 },
- /*05*/ { 0x04, 0x06, 0x00, 0x00 }, // Knocker
- /*06*/ { 0x01, 0x09, 0x00, 0x7f }, // Outhole
- /*07*/ { 0x02, 0x0a, 0x03, 0x7f }, // Kickback Grotto
- /*08*/ { 0x02, 0x00, 0x00, 0x00 }, // Pop Bumper Left
- /*09*/ { 0x02, 0x00, 0x00, 0x00 }, // Pop Bumper Right
- /*10*/ { 0x02, 0x00, 0x00, 0x00 }, // Pop Bumper Bottom
- /*11*/ { 0x02, 0x07, 0x00, 0x00 }, // Slingshot Left
- /*12*/ { 0x03, 0x0b, 0x00, 0xe0 }, // Drop Target Reset
- /*13*/ { 0x02, 0x07, 0x00, 0x00 }, // Slingshot Right
+ /*05*/ { 0x04, 0x06, 0x00, 0x00 }, // Knocker
+ /*06*/ { 0x01, 0x09, 0x00, 0x7f }, // Outhole
+ /*07*/ { 0x02, 0x0a, 0x03, 0x7f }, // Kickback Grotto
+ /*08*/ { 0x02, 0x00, 0x00, 0x00 }, // Pop Bumper Left
+ /*09*/ { 0x02, 0x00, 0x00, 0x00 }, // Pop Bumper Right
+ /*10*/ { 0x02, 0x00, 0x00, 0x00 }, // Pop Bumper Bottom
+ /*11*/ { 0x02, 0x07, 0x00, 0x00 }, // Slingshot Left
+ /*12*/ { 0x03, 0x0b, 0x00, 0xe0 }, // Drop Target Reset
+ /*13*/ { 0x02, 0x07, 0x00, 0x00 }, // Slingshot Right
/*14*/ { 0xff, 0xff, 0x00, 0x00 },
- /*15*/ { 0xff, 0xff, 0x00, 0x00 }, // None - all momentary solenoids off
+ /*15*/ { 0xff, 0xff, 0x00, 0x00 }, // None - all momentary solenoids off
// { Sound Channel, Sound engage, Sound release, Not Used }
/*16*/ { 0xff, 0xff, 0xff, 0x00 },
- /*17*/ { 0x00, 0x0c, 0x0d, 0x00 }, // Coin Lockout coil
- /*18*/ { 0x00, 0x0e, 0x0f, 0x00 }, // Flipper enable relay
+ /*17*/ { 0x00, 0x0c, 0x0d, 0x00 }, // Coin Lockout coil
+ /*18*/ { 0x00, 0x0e, 0x0f, 0x00 }, // Flipper enable relay
/*19*/ { 0xff, 0xff, 0xff, 0x00 }
};
@@ -1009,7 +1005,7 @@ MACHINE_RESET_MEMBER( by35_state, by35 )
m_u11a = 0;
m_u11b = 0;
m_lamp_decode = 0x0f;
- m_io_hold_x[0] = 0x80; // Put ball in Outhole on startup
+ m_io_hold_x[0] = 0x80; // Put ball in Outhole on startup
m_io_hold_x[1] = m_io_hold_x[2] = m_io_hold_x[3] = m_io_hold_x[4] = m_io_hold_x[5] = 0;
}
@@ -1026,7 +1022,7 @@ static const discrete_mixer_desc as2888_digital_mixer_info =
{0, 0, 0, 0}, /* r_node */
{0, 0}, /* c{} */
0, /* rI */
-// RES_VOLTAGE_DIVIDER(RES_K(10), RES_R(360)), /* rF */
+// RES_VOLTAGE_DIVIDER(RES_K(10), RES_R(360)), /* rF */
RES_K(10), /* rF */ // not really
CAP_U(0.01), /* cF */
0, /* cAmp */
@@ -1048,32 +1044,32 @@ static const discrete_op_amp_filt_info as2888_preamp_info = {
static DISCRETE_SOUND_START(as2888)
- DISCRETE_INPUT_DATA(NODE_08) // Start Sustain Attenuation from 555 circuit
- DISCRETE_INPUT_LOGIC(NODE_01) // Binary Counter B output (divide by 1) T2
- DISCRETE_INPUT_LOGIC(NODE_04) // Binary Counter D output (divide by 4) T3
+ DISCRETE_INPUT_DATA(NODE_08) // Start Sustain Attenuation from 555 circuit
+ DISCRETE_INPUT_LOGIC(NODE_01) // Binary Counter B output (divide by 1) T2
+ DISCRETE_INPUT_LOGIC(NODE_04) // Binary Counter D output (divide by 4) T3
- DISCRETE_DIVIDE(NODE_11, 1, NODE_01, 1) // 2
+ DISCRETE_DIVIDE(NODE_11, 1, NODE_01, 1) // 2
DISCRETE_DIVIDE(NODE_14, 1, NODE_04, 1)
- DISCRETE_RCFILTER(NODE_06, NODE_14, RES_K(15), CAP_U(0.1)) // T4 filter
+ DISCRETE_RCFILTER(NODE_06, NODE_14, RES_K(15), CAP_U(0.1)) // T4 filter
#if 0
- DISCRETE_RCFILTER(NODE_05, NODE_11, RES_K(33), CAP_U(0.01)) // T1 filter
+ DISCRETE_RCFILTER(NODE_05, NODE_11, RES_K(33), CAP_U(0.01)) // T1 filter
DISCRETE_ADDER2(NODE_07, 1, NODE_05, NODE_06)
#else
- DISCRETE_MIXER2(NODE_07, 1, NODE_11, NODE_06, &as2888_digital_mixer_info) // Mix and filter T1 and T4 together
+ DISCRETE_MIXER2(NODE_07, 1, NODE_11, NODE_06, &as2888_digital_mixer_info) // Mix and filter T1 and T4 together
#endif
DISCRETE_RCDISC5(NODE_87, 1, NODE_08, RES_K(150), CAP_U(1.0))
DISCRETE_RCFILTER_VREF(NODE_88,NODE_87,RES_M(1),CAP_U(0.01),2)
- DISCRETE_MULTIPLY(NODE_09, NODE_07, NODE_88) // Apply sustain
+ DISCRETE_MULTIPLY(NODE_09, NODE_07, NODE_88) // Apply sustain
DISCRETE_OP_AMP_FILTER(NODE_20, 1, NODE_09, 0, DISC_OP_AMP_FILTER_IS_HIGH_PASS_1, &as2888_preamp_info)
- DISCRETE_CRFILTER(NODE_25, NODE_20, RES_M(100), CAP_U(0.05)) // Resistor is fake. Capacitor in series between pre-amp and output amp.
+ DISCRETE_CRFILTER(NODE_25, NODE_20, RES_M(100), CAP_U(0.05)) // Resistor is fake. Capacitor in series between pre-amp and output amp.
- DISCRETE_GAIN(NODE_30, NODE_25, 50) // Output amplifier LM380 fixed inbuilt gain of 50
+ DISCRETE_GAIN(NODE_30, NODE_25, 50) // Output amplifier LM380 fixed inbuilt gain of 50
DISCRETE_OUTPUT(NODE_30, 10000000) // 17000000
DISCRETE_SOUND_END
@@ -1087,7 +1083,7 @@ static MACHINE_CONFIG_START( by35, by35_state )
MCFG_MACHINE_RESET_OVERRIDE( by35_state, by35 )
- MCFG_NVRAM_ADD_0FILL("nvram") // 'F' filled causes Credit Display to be blank on first startup
+ MCFG_NVRAM_ADD_0FILL("nvram") // 'F' filled causes Credit Display to be blank on first startup
/* Video */
MCFG_DEFAULT_LAYOUT(layout_by35)
@@ -2127,7 +2123,7 @@ ROM_END
/ 301/Bulls Eye
/-------------------------------*/
ROM_START(bullseye)
- ROM_REGION(0x8000, "maincpu", 0) // Actually seems to have an address mask of 0x3fff
+ ROM_REGION(0x8000, "maincpu", 0) // Actually seems to have an address mask of 0x3fff
ROM_LOAD("bull.u2", 0x2000, 0x1000, CRC(a2951aa2) SHA1(f9c0826c5d1d6d904286678ed90de3850a13b5f4))
ROM_LOAD("bull.u6", 0x3000, 0x1000, CRC(64d4b9c4) SHA1(bf4d0671372fd3a445c4c7330b9849171ca8048c))
ROM_RELOAD( 0x7000, 0x1000)
diff --git a/src/mame/drivers/cardline.c b/src/mame/drivers/cardline.c
index 2eda29b5910..460b1e7dfa0 100644
--- a/src/mame/drivers/cardline.c
+++ b/src/mame/drivers/cardline.c
@@ -139,7 +139,7 @@ WRITE_LINE_MEMBER(cardline_state::hsync_changed)
{
/* update any video up to the current scanline */
m_hsync_q = (state ? 0x00 : 0x10);
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
}
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index eb3e7f32db7..5e333578c03 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -3152,26 +3152,26 @@ ROM_END
ROM_START( ddonpacha )
- ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */
+ ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */
ROM_LOAD16_BYTE( "arrange_u27.bin", 0x000000, 0x080000, CRC(44b899ae) SHA1(798ec437d861b94fcd90c99a7015dd420887c788) )
ROM_LOAD16_BYTE( "arrange_u26.bin", 0x000001, 0x080000, CRC(727a09a8) SHA1(91876386855f19e8a3d8d1df71dfe9b3d98e9ea9) )
- ROM_REGION( 0x800000 * 2, "sprites0", 0 ) /* Sprites: * 2 */
+ ROM_REGION( 0x800000 * 2, "sprites0", 0 ) /* Sprites: * 2 */
ROM_LOAD( "u50.bin", 0x000000, 0x200000, CRC(14b260ec) SHA1(33bda210302428d5500115d0c7a839cdfcb67d17) )
ROM_LOAD( "arrange_u51.bin", 0x200000, 0x200000, CRC(0f3e5148) SHA1(3016f4d075940feae691389606cd2aa7ac53849e) )
ROM_LOAD( "u52.bin", 0x400000, 0x200000, CRC(02492ee0) SHA1(64d9cc64a4ad189a8b03cf6a749ddb732b4a0014) )
ROM_LOAD( "u53.bin", 0x600000, 0x200000, CRC(cb4c10f0) SHA1(a622e8bd0c938b5d38b392b247400b744d8be288) )
- ROM_REGION( 0x200000, "layer0", 0 ) /* Layer 0 */
+ ROM_REGION( 0x200000, "layer0", 0 ) /* Layer 0 */
ROM_LOAD( "u60.bin", 0x000000, 0x200000, CRC(903096a7) SHA1(a243e903fef7c4a7b71383263e82e42acd869261) )
- ROM_REGION( 0x200000, "layer1", 0 ) /* Layer 1 */
+ ROM_REGION( 0x200000, "layer1", 0 ) /* Layer 1 */
ROM_LOAD( "u61.bin", 0x000000, 0x200000, CRC(d89b7631) SHA1(a66bb4955ca58fab8973ca37a0f971e9a67ce017) )
- ROM_REGION( 0x200000, "layer2", 0 ) /* Layer 2 */
+ ROM_REGION( 0x200000, "layer2", 0 ) /* Layer 2 */
ROM_LOAD( "arrange_u62.bin", 0x000000, 0x200000, CRC(42e4c6c5) SHA1(4d282f7592f5fc5e11839c57f39cae20b8422aa1) )
- ROM_REGION( 0x400000, "ymz", 0 ) /* Samples */
+ ROM_REGION( 0x400000, "ymz", 0 ) /* Samples */
ROM_LOAD( "u6.bin", 0x000000, 0x200000, CRC(9dfdafaf) SHA1(f5cb450cdc78a20c3a74c6dac05c9ac3cba08327) )
ROM_LOAD( "u7.bin", 0x200000, 0x200000, CRC(795b17d5) SHA1(cbfc29f1df9600c82e0fdae00edd00da5b73e14c) )
@@ -5061,7 +5061,7 @@ GAME( 1996, ppsatan, 0, ppsatan, ppsatan, cave_state, ppsatan, ROT0
GAME( 1997, ddonpach, 0, ddonpach, cave, cave_state, ddonpach, ROT270, "Cave (Atlus license)", "DoDonPachi (International, Master Ver. 97/02/05)", MACHINE_SUPPORTS_SAVE )
GAME( 1997, ddonpachj, ddonpach, ddonpach, cave, cave_state, ddonpach, ROT270, "Cave (Atlus license)", "DoDonPachi (Japan, Master Ver. 97/02/05)", MACHINE_SUPPORTS_SAVE )
// NOT an official CAVE release, but several PCBs have been converted to it and used on location.
-GAME( 2012, ddonpacha, ddonpach, ddonpach, cave, cave_state, ddonpach, ROT270, "hack (trap15)", "DoDonPachi (2012/02/12 Arrange Ver. 1.1) (hack)", MACHINE_SUPPORTS_SAVE )
+GAME( 2012, ddonpacha, ddonpach, ddonpach, cave, cave_state, ddonpach, ROT270, "hack (trap15)", "DoDonPachi (2012/02/12 Arrange Ver. 1.1) (hack)", MACHINE_SUPPORTS_SAVE )
GAME( 1998, dfeveron, feversos, dfeveron, cave, cave_state, dfeveron, ROT270, "Cave (Nihon System license)", "Dangun Feveron (Japan, Ver. 98/09/17)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/chicago.c b/src/mame/drivers/chicago.c
index a15b07fdb0c..762236efec0 100644
--- a/src/mame/drivers/chicago.c
+++ b/src/mame/drivers/chicago.c
@@ -14,7 +14,7 @@
TV Pingame (1975) #451
Super Flipper (1975) #458
Demolition Derby (1976) #466
-
+
***************************************************************************/
diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c
index 3766eb129a2..99f7dd9a200 100644
--- a/src/mame/drivers/cntsteer.c
+++ b/src/mame/drivers/cntsteer.c
@@ -19,10 +19,10 @@
- In Back Rotate Test, rotation is tested with the following arrangement (upper bits of rotation parameter):
04 -> 05 -> 02 -> 03 -> 00 -> 01 -> 06 -> 07 -> 04 and backwards
Anything with bit 0 set is tested from 0xff to 0, with bit 0 clear that's 0 -> 0xff, fun.
- - Understand how irq communication works between CPUs. Buffer $415-6 seems involved in the protocol.
- We currently have slave CPU irq hooked up to vblank, might or might not be correct.
- - invert order between maincpu and subcpu, subcpu is clearly the master CPU here.
- - understand why background mirroring causes wrong gfxs on title screen (wrong tilemap paging, missing video bit or it's actually a RMW thing);
+ - Understand how irq communication works between CPUs. Buffer $415-6 seems involved in the protocol.
+ We currently have slave CPU irq hooked up to vblank, might or might not be correct.
+ - invert order between maincpu and subcpu, subcpu is clearly the master CPU here.
+ - understand why background mirroring causes wrong gfxs on title screen (wrong tilemap paging, missing video bit or it's actually a RMW thing);
cleanup
- split into driver/video;
@@ -633,8 +633,8 @@ INTERRUPT_GEN_MEMBER(cntsteer_state::subcpu_vblank_irq)
// That's my best guess so far about how Slave is supposed to stop execution on Master CPU, the lack of any realistic write
// between these operations brings us to this.
// Game currently returns error on MIX CPU RAM because halt-ing BACK CPU doesn't happen when it should of course ...
-// UINT8 dp_r = (UINT8)device.state().state_int(M6809_DP);
-// m_maincpu->set_input_line(INPUT_LINE_HALT, dp_r ? ASSERT_LINE : CLEAR_LINE);
+// UINT8 dp_r = (UINT8)device.state().state_int(M6809_DP);
+// m_maincpu->set_input_line(INPUT_LINE_HALT, dp_r ? ASSERT_LINE : CLEAR_LINE);
m_subcpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE);
}
diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c
index 837e77c9a9f..edf334cb961 100644
--- a/src/mame/drivers/cubeqst.c
+++ b/src/mame/drivers/cubeqst.c
@@ -101,7 +101,7 @@ void cubeqst_state::video_start()
WRITE16_MEMBER(cubeqst_state::palette_w)
{
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
COMBINE_DATA(&m_generic_paletteram_16[offset]);
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index f065957618c..4bb0c6ad27d 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -1633,14 +1633,14 @@ static MACHINE_CONFIG_DERIVED( midresb, midres )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
// bootleg doesn't seem to support row/col scroll (or enable is different)
-// MCFG_DEVICE_MODIFY("tilegen1")
-// MCFG_BAC06_BOOTLEG_DISABLE_16x16
-// MCFG_BAC06_BOOTLEG_DISABLE_RC_SCROLL
+// MCFG_DEVICE_MODIFY("tilegen1")
+// MCFG_BAC06_BOOTLEG_DISABLE_16x16
+// MCFG_BAC06_BOOTLEG_DISABLE_RC_SCROLL
MCFG_DEVICE_MODIFY("tilegen2")
-// MCFG_BAC06_BOOTLEG_DISABLE_8x8
+// MCFG_BAC06_BOOTLEG_DISABLE_8x8
MCFG_BAC06_BOOTLEG_DISABLE_RC_SCROLL
MCFG_DEVICE_MODIFY("tilegen3")
-// MCFG_BAC06_BOOTLEG_DISABLE_8x8
+// MCFG_BAC06_BOOTLEG_DISABLE_8x8
MCFG_BAC06_BOOTLEG_DISABLE_RC_SCROLL
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ec184x.c b/src/mame/drivers/ec184x.c
index c6ddebef72f..17a51aaf110 100644
--- a/src/mame/drivers/ec184x.c
+++ b/src/mame/drivers/ec184x.c
@@ -18,7 +18,7 @@
#include "cpu/i86/i86.h"
#include "machine/ram.h"
-#define EC1841_MEMBOARD_SIZE (512*1024)
+#define EC1841_MEMBOARD_SIZE (512*1024)
#define VERBOSE_DBG 1 /* general debug messages */
diff --git a/src/mame/drivers/electron.c b/src/mame/drivers/electron.c
index 9dbc5468a6f..1009dc504a3 100644
--- a/src/mame/drivers/electron.c
+++ b/src/mame/drivers/electron.c
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Wilbert Pol
/******************************************************************************
- Acorn Electron driver
+ Acorn Electron driver
By Wilbert Pol
-
+
Hardware Overview
-----------------
The Acorn Electron is a budget version of the BBC Micro home computer
@@ -18,7 +18,7 @@ Internal ports for cassette storage, RGB/CVBS monitors and TV output
Various expansions can be added via the rear expansion port
PCB Layout
----------- |-------------------|
+---------- |-------------------|
|--------| EXPANSION PORT |
|-----|---------------------| |---||---------|
|MOD | SPKR 16MHz LS169 18VAC|| []18VAC INPUT
@@ -33,7 +33,7 @@ PCB Layout
Notes: (all IC's shown. Only 16 ICs are used)
6502 - 6502 CPU, clock input 2.000MHz [16/8]
ULA - Custom logic chip 12CO21, also containing most of the BBC Micro circuitry
- Early PCB revisions used a PLCC68 chip in a socket. Later revisions used a
+ Early PCB revisions used a PLCC68 chip in a socket. Later revisions used a
PGA68 chip soldered directly into the motherboard
4164 - 4164 64k x4-bit DRAM (4 chips for 32kbytes total)
ROM - Hitachi HN613256 32k x8-bit MASK ROM containing OS & BASIC
@@ -45,10 +45,10 @@ Notes: (all IC's shown. Only 16 ICs are used)
PWR - 3-pin power input from internal power supply
KBD_CONN - 22-pin keyboard connector
SPKR - 2-pin internal speaker connector
-
+
******************************************************************************
Emulation notes:
-
+
I don't have a real system to verify the behaviour of the emulation. The things
that can be done through BASIC programs seem to behave properly (most of the time :).
diff --git a/src/mame/drivers/eti660.c b/src/mame/drivers/eti660.c
index 238ec6d9b6f..d7d453b5823 100644
--- a/src/mame/drivers/eti660.c
+++ b/src/mame/drivers/eti660.c
@@ -219,7 +219,7 @@ READ8_MEMBER( eti660_state::pia_pa_r )
*/
UINT8 i, data = 0xff;
-
+
for (i = 0; i < 4; i++)
if BIT(m_keylatch, i)
return m_io_keyboard[i]->read();
diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c
index d77ee4b6a39..a7ce6872fad 100644
--- a/src/mame/drivers/firefox.c
+++ b/src/mame/drivers/firefox.c
@@ -267,7 +267,7 @@ UINT32 firefox_state::screen_update_firefox(screen_device &screen, bitmap_rgb32
TIMER_DEVICE_CALLBACK_MEMBER(firefox_state::video_timer_callback)
{
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
m_maincpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE );
diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c
index 446e3b310b7..610f4c37ea7 100644
--- a/src/mame/drivers/galaxian.c
+++ b/src/mame/drivers/galaxian.c
@@ -5235,7 +5235,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(galaxian_state::timefgtr_scanline)
// change spriteram base per each 64-line part of the screen
if ((split & 0x3f) == 0)
{
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
m_sprites_base = 0x40 | (split << 2 & 0x300);
}
@@ -5346,7 +5346,7 @@ static MACHINE_CONFIG_DERIVED( froggermc, galaxian_base )
/* alternate memory map */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(mooncrst_map_base) /* no discrete sound ! */
-
+
MCFG_CPU_MODIFY("audiocpu")
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(DEVICE_SELF, galaxian_state, froggermc_audiocpu_irq_ack)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c
index 0b74004e5d7..47563f2d0f9 100644
--- a/src/mame/drivers/galaxold.c
+++ b/src/mame/drivers/galaxold.c
@@ -3480,7 +3480,7 @@ ROM_END
ROM_START( spcwarp )
// conversion of 'cosmos' (cvs.c) to Galaxian hardware
- // notes:
+ // notes:
// -came out of an unemulated games collection - may or may not be actually spcwarp but it's unique
// -uses hunchbkg hardware with a different map
// -the game likely calls a checksum check every 10 frames, causes game to freeze (probably because of bad ROM)
diff --git a/src/mame/drivers/gatron.c b/src/mame/drivers/gatron.c
index ad838396231..707bc13ce5c 100644
--- a/src/mame/drivers/gatron.c
+++ b/src/mame/drivers/gatron.c
@@ -188,7 +188,7 @@
Press "BIG BAR TICKET" (key C) to play with Big Bar (right) Ticket.
A curiosity...
-
+
The Pull Tabs flyer shows the following paytable:
- Super Star - - Lady Luck - - Big Bar -
@@ -199,14 +199,14 @@
3x Crowns 1 3x Bells 2 3x Bananas 2
...but the game seems to have inverted objects importance:
-
+
- Super Star - - Lady Luck - - Big Bar -
3x Crowns 75 3x Bells 100 3x Bananas 75
3x Clubs 8 3x Licquors 25 3x Plums 10
3x Cups 4 3x Horseshoes 10 3x Pears 6
3x Hearts 3 3x Watermelons 5 3x Cherries 4
3x Stars 1 3x Oranges 2 3x Bars 2
-
+
Can't get an input or combination of them that change this logic.
Maybe the paytable is different in this set, or just the flyer doesn't
reflect the real thing.
diff --git a/src/mame/drivers/i7000.c b/src/mame/drivers/i7000.c
index a1dc4b0b24c..6938dbecc44 100644
--- a/src/mame/drivers/i7000.c
+++ b/src/mame/drivers/i7000.c
@@ -389,19 +389,19 @@ ROM_START( i7000 )
ROM_REGION( 0x0800, "gfx1", 0 )
ROM_LOAD( "i7000_chargen.rom", 0x0000, 0x0800, CRC(fb7383e9) SHA1(71a6561bb9ff3cbf74711fa7ab445f9b43f15626) )
- /*
- The character generator ROM originally dumped had
- some corrupt data that was manually fixed:
-
- ROM address | Originally dumped value | Manually fixed value | Comment
- 0x06A2 | 0xF7 | 0xFE | This is a fix to the upper right portion of a 2x2 tile image of a big filled circle
- 0x06A3 | 0xF7 | 0xFE | This is another fix to the same tile (character value: 0xD4)
-
- Also, characters 0x05, 0x06, 0x07 and 0x08
- as well as lowercase 'x' (0x78), uppercase 'Y' (0x59)
- may contain corrupt data, but we can't be sure,
- unless we find another Itautec I7000 computer and
- redump it's ROMs to double-check.
+ /*
+ The character generator ROM originally dumped had
+ some corrupt data that was manually fixed:
+
+ ROM address | Originally dumped value | Manually fixed value | Comment
+ 0x06A2 | 0xF7 | 0xFE | This is a fix to the upper right portion of a 2x2 tile image of a big filled circle
+ 0x06A3 | 0xF7 | 0xFE | This is another fix to the same tile (character value: 0xD4)
+
+ Also, characters 0x05, 0x06, 0x07 and 0x08
+ as well as lowercase 'x' (0x78), uppercase 'Y' (0x59)
+ may contain corrupt data, but we can't be sure,
+ unless we find another Itautec I7000 computer and
+ redump it's ROMs to double-check.
*/
ROM_REGION( 0x1000, "drive", 0 )
diff --git a/src/mame/drivers/imds2.c b/src/mame/drivers/imds2.c
index 361cd44fbf2..ed05a682f77 100644
--- a/src/mame/drivers/imds2.c
+++ b/src/mame/drivers/imds2.c
@@ -566,7 +566,7 @@ void imds2_state::driver_start()
void imds2_state::machine_start()
{
- m_iocfdc->set_ready_line_connected(true);
+ m_iocfdc->set_ready_line_connected(true);
}
void imds2_state::video_start()
@@ -812,7 +812,7 @@ static MACHINE_CONFIG_START(imds2 , imds2_state)
MCFG_DEVICE_ADD("iocfdc" , I8271 , IOC_XTAL_Y1 / 2)
MCFG_I8271_DRQ_CALLBACK(DEVWRITELINE("iocdma" , i8257_device , dreq1_w))
MCFG_FLOPPY_DRIVE_ADD("iocfdc:0", imds2_floppies, "8sssd", floppy_image_device::default_floppy_formats)
- MCFG_SLOT_FIXED(true)
+ MCFG_SLOT_FIXED(true)
MCFG_CPU_ADD("iocpio" , I8041 , IOC_XTAL_Y3)
MCFG_CPU_IO_MAP(pio_io_map)
diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c
index d9591e493ae..458737b8556 100644
--- a/src/mame/drivers/konamigq.c
+++ b/src/mame/drivers/konamigq.c
@@ -47,7 +47,7 @@
3- trigger
4- +5v
5- reload (see below)
-
+
The Crypt Killer shotguns have 6 wires coming out of the gun.
The wire colors and connections are....
Black - Ground; joined to CN6/7/8 pin 2
@@ -56,7 +56,7 @@
White - Trigger; joined to CN6/7/8 pin 3
Purple - Reload; joined to CN6/7/8 pin 5
Grey - Reload ground; this wire must be joined to any ground for the reload to work
-
+
CN3 - For connection of extra controls/buttons (e.g. player 3 start etc)
CN14 - For connection of additional speaker for stereo output
68000 - Clock input 8.000MHz [32/4]
diff --git a/src/mame/drivers/konamim2.c b/src/mame/drivers/konamim2.c
index 5939929c8c4..886eafa471a 100644
--- a/src/mame/drivers/konamim2.c
+++ b/src/mame/drivers/konamim2.c
@@ -1187,7 +1187,7 @@ static MACHINE_CONFIG_START( m2, konamim2_state )
MCFG_PALETTE_ADD_RRRRRGGGGGBBBBB("palette")
- /*cd-rom*/
+ /*cd-rom*/
MCFG_CDROM_ADD( "cdrom" )
MCFG_CDROM_INTERFACE("3do_m2_cdrom")
diff --git a/src/mame/drivers/lindbergh.c b/src/mame/drivers/lindbergh.c
index 3d94a5ea9ed..3511d246509 100644
--- a/src/mame/drivers/lindbergh.c
+++ b/src/mame/drivers/lindbergh.c
@@ -168,8 +168,8 @@ Sticker: 838-14673
| |SLOT | IDE40 ATX_POWER |
|------------------|---------|-------------------------------|
Notes:
- CPU - Lindbergh RED: Intel Celeron D 335 SL8HM 2.8GHz 256k L2 cache, 533MHz FSB.
- Lindbergh YELLOW: Intel Pentium 4 3.00GHz/1M/800 SL8JZ
+ CPU - Lindbergh RED: Intel Celeron D 335 SL8HM 2.8GHz 256k L2 cache, 533MHz FSB.
+ Lindbergh YELLOW: Intel Pentium 4 3.00GHz/1M/800 SL8JZ
SIMM1 - Lindbergh RED: 512M DDR PC3200
Lindbergh YELLOW: 1GB DDR PC3200
82541PI - Intel Gigabit Ethernet Controller
diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c
index d857157672b..599d1da3167 100644
--- a/src/mame/drivers/m107.c
+++ b/src/mame/drivers/m107.c
@@ -45,21 +45,21 @@ confirmed for m107 games as well.
#define M107_TRIGGER_IRQ3 m_maincpu->set_input_line_and_vector(0, HOLD_LINE, m_upd71059c->HACK_get_base_vector()+3 ); /* Sound cpu->Main cpu interrupt */
// not used due to HOLD LINE logic
#define M107_CLEAR_IRQ0 ;
-#define M107_CLEAR_IRQ1 ;
+#define M107_CLEAR_IRQ1 ;
#define M107_CLEAR_IRQ2 ;
#define M107_CLEAR_IRQ3 ;
#else
-#define M107_TRIGGER_IRQ0 m_upd71059c->ir0_w(1);
-#define M107_TRIGGER_IRQ1 m_upd71059c->ir1_w(1);
-#define M107_TRIGGER_IRQ2 m_upd71059c->ir2_w(1);
-#define M107_TRIGGER_IRQ3 m_upd71059c->ir3_w(1);
+#define M107_TRIGGER_IRQ0 m_upd71059c->ir0_w(1);
+#define M107_TRIGGER_IRQ1 m_upd71059c->ir1_w(1);
+#define M107_TRIGGER_IRQ2 m_upd71059c->ir2_w(1);
+#define M107_TRIGGER_IRQ3 m_upd71059c->ir3_w(1);
// not sure when these should happen, probably the source of our issues
-#define M107_CLEAR_IRQ0 m_upd71059c->ir0_w(0);
-#define M107_CLEAR_IRQ1 m_upd71059c->ir1_w(0);
-#define M107_CLEAR_IRQ2 m_upd71059c->ir2_w(0);
-#define M107_CLEAR_IRQ3 m_upd71059c->ir3_w(0);
+#define M107_CLEAR_IRQ0 m_upd71059c->ir0_w(0);
+#define M107_CLEAR_IRQ1 m_upd71059c->ir1_w(0);
+#define M107_CLEAR_IRQ2 m_upd71059c->ir2_w(0);
+#define M107_CLEAR_IRQ3 m_upd71059c->ir3_w(0);
#endif
diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c
index 4cb93f3a8d6..2fad012c24c 100644
--- a/src/mame/drivers/m72.c
+++ b/src/mame/drivers/m72.c
@@ -13,90 +13,90 @@ M72 - 3 board stack, 2 known variants
M72-B-D (bottom) / M72-A-C (middle) / M72-ROM-C (top)
- This is the original hardware used by R-type
+ This is the original hardware used by R-type
Z80 program uploaded to RAM rather than having a ROM
each of the 2 tile layers uses it's own set of ROMs.
- Flip bits are with the tile num, so 0x3fff max tiles
- per layer
+ Flip bits are with the tile num, so 0x3fff max tiles
+ per layer
- M72-B-D (bottom) / M72-A-C (middle) / M72-C-A (top)
+ M72-B-D (bottom) / M72-A-C (middle) / M72-C-A (top)
- This is used by all other M72 games, adds support
- for an I8751 MCU and sample playback
+ This is used by all other M72 games, adds support
+ for an I8751 MCU and sample playback
M81 - 2 PCB Stack
- M81-A-B (top board) (seen on Dragon Breed)
- CPUs, program roms etc.
+ M81-A-B (top board) (seen on Dragon Breed)
+ CPUs, program roms etc.
- M81-B-B (bottom board) (seen on Dragon Breed)
- supports
- 8 sprite ROMS
- 4 tile roms for FG layer (A0-A3)
- (Jumper J3 also allows them to be used for BG)
- 4 tile roms for BG layer (B0-B3)
+ M81-B-B (bottom board) (seen on Dragon Breed)
+ supports
+ 8 sprite ROMS
+ 4 tile roms for FG layer (A0-A3)
+ (Jumper J3 also allows them to be used for BG)
+ 4 tile roms for BG layer (B0-B3)
- The Jumper at J3 seems to be an important difference
- from M72, it allows both the FG and BG layers to
- operate from a single set of ROMs.
- W - use both sets of ROMs
- S - use a single set of ROMs (A0-A3)
+ The Jumper at J3 seems to be an important difference
+ from M72, it allows both the FG and BG layers to
+ operate from a single set of ROMs.
+ W - use both sets of ROMs
+ S - use a single set of ROMs (A0-A3)
- revised hardware, Z80 uses a ROM, no MCU, same video
+ revised hardware, Z80 uses a ROM, no MCU, same video
system as M72 (some layer offsets - why?)
M82 - board made for Major Title, Z80 has a rom, no MCU
has an extra sprite layer, rowscroll, and a larger
- tilemap. Tile data from both tile layers now comes
- from a single set of ROMs, flip bits moved to 2nd
- word meaning max of 0xffff tiles.
+ tilemap. Tile data from both tile layers now comes
+ from a single set of ROMs, flip bits moved to 2nd
+ word meaning max of 0xffff tiles.
- * Some games were converted to run on this board,
- leaving the extra sprite HW unused.
+ * Some games were converted to run on this board,
+ leaving the extra sprite HW unused.
M84 - 2 PCB stack
functionally same as M82 but without the extra sprite hw??
-
- M84-A-A (bottom board) (most games)
- supports
- 4 program roms
- 8 tile roms
- 1 snd prg, 1 voice rom
- CPUs and some customs etc.
-
- M84-D-B (bottom board) (found on lightning swords / kengo)
- redesigned version of above but
- for V35 CPU? (seems to lack the UPD71059C interrupt
- controller which isn't needed when with the V35)
-
- M84-C-A (top board) (listed as for Hammering Harry)
- 4 sprite roms (in a row)
- 6 larger chips with detail removed
- etc.
-
- M84-B-A (top board) (found on rytpe 2)
- M84-B-B (top board) (lightning swords / kengo)
- these both look very similar, if not the same
-
- 4 sprite roms (in a square)
- various NANAO marked customs
- KNA70H016(12) NANAO 0201
- KNA65005 17 NANAO 9048KS
- KNA71H010(15) NANAO 0X2002
- KNA72H010(14) NANAO 0Z2001
- KNA71H009(13) NANAO 122001
- KNA70H015(11) NANAO 092002
- KNA91H014 NANAO 0Z2001V
- etc.
+
+ M84-A-A (bottom board) (most games)
+ supports
+ 4 program roms
+ 8 tile roms
+ 1 snd prg, 1 voice rom
+ CPUs and some customs etc.
+
+ M84-D-B (bottom board) (found on lightning swords / kengo)
+ redesigned version of above but
+ for V35 CPU? (seems to lack the UPD71059C interrupt
+ controller which isn't needed when with the V35)
+
+ M84-C-A (top board) (listed as for Hammering Harry)
+ 4 sprite roms (in a row)
+ 6 larger chips with detail removed
+ etc.
+
+ M84-B-A (top board) (found on rytpe 2)
+ M84-B-B (top board) (lightning swords / kengo)
+ these both look very similar, if not the same
+
+ 4 sprite roms (in a square)
+ various NANAO marked customs
+ KNA70H016(12) NANAO 0201
+ KNA65005 17 NANAO 9048KS
+ KNA71H010(15) NANAO 0X2002
+ KNA72H010(14) NANAO 0Z2001
+ KNA71H009(13) NANAO 122001
+ KNA70H015(11) NANAO 092002
+ KNA91H014 NANAO 0Z2001V
+ etc.
M85 - Pound for Pound uses this, possibly just M84 with
a modified sound section?
- - most Jamma inputs not connected, trackball only
+ - most Jamma inputs not connected, trackball only
Year Board Protected?
@@ -147,7 +147,7 @@ TODO:
IRQ controller
--------------
-The IRQ controller is a UPD71059C
+The IRQ controller is a UPD71059C
The initialization consists of one write to port 0x40 and multiple writes
(2 or 3) to port 0x42. The first value written to 0x42 is the IRQ vector base.
@@ -212,21 +212,21 @@ other supported games as well.
#define M72_TRIGGER_IRQ3 m_maincpu->set_input_line_and_vector(0, HOLD_LINE, m_upd71059c->HACK_get_base_vector()+3 ); /* Sound cpu->Main cpu interrupt */
// not used due to HOLD LINE logic
#define M72_CLEAR_IRQ0 ;
-#define M72_CLEAR_IRQ1 ;
+#define M72_CLEAR_IRQ1 ;
#define M72_CLEAR_IRQ2 ;
#define M72_CLEAR_IRQ3 ;
#else
-#define M72_TRIGGER_IRQ0 m_upd71059c->ir0_w(1);
-#define M72_TRIGGER_IRQ1 m_upd71059c->ir1_w(1);
-#define M72_TRIGGER_IRQ2 m_upd71059c->ir2_w(1);
-#define M72_TRIGGER_IRQ3 m_upd71059c->ir3_w(1);
+#define M72_TRIGGER_IRQ0 m_upd71059c->ir0_w(1);
+#define M72_TRIGGER_IRQ1 m_upd71059c->ir1_w(1);
+#define M72_TRIGGER_IRQ2 m_upd71059c->ir2_w(1);
+#define M72_TRIGGER_IRQ3 m_upd71059c->ir3_w(1);
// not sure when these should happen, probably the source of our issues
-#define M72_CLEAR_IRQ0 m_upd71059c->ir0_w(0);
-#define M72_CLEAR_IRQ1 m_upd71059c->ir1_w(0);
-#define M72_CLEAR_IRQ2 m_upd71059c->ir2_w(0);
-#define M72_CLEAR_IRQ3 m_upd71059c->ir3_w(0);
+#define M72_CLEAR_IRQ0 m_upd71059c->ir0_w(0);
+#define M72_CLEAR_IRQ1 m_upd71059c->ir1_w(0);
+#define M72_CLEAR_IRQ2 m_upd71059c->ir2_w(0);
+#define M72_CLEAR_IRQ3 m_upd71059c->ir3_w(0);
#endif
@@ -957,8 +957,7 @@ M72_CPU1_MEMORY( dbreedm72, 0x80000, 0x90000 )
AM_RANGE(0xd0000, 0xd3fff) AM_RAM_WRITE(videoram1_w) AM_SHARE("videoram1") \
AM_RANGE(0xd8000, 0xdbfff) AM_RAM_WRITE(videoram2_w) AM_SHARE("videoram2") \
AM_RANGE(0xffff0, 0xfffff) AM_ROM \
-ADDRESS_MAP_END \
-
+ADDRESS_MAP_END
/* WORKRAM */
M81_CPU1_MEMORY( xmultipl, 0x9c000 )
M81_CPU1_MEMORY( dbreed, 0x88000 )
@@ -979,8 +978,7 @@ M81_CPU1_MEMORY( hharry, 0xa0000 )
AM_RANGE(PALETTERAM2, PALETTERAM2+0xbff) AM_READWRITE(palette2_r, palette2_w) AM_SHARE("paletteram2") \
AM_RANGE(0xe0000, 0xe3fff) AM_RAM /* work RAM */ \
AM_RANGE(0xffff0, 0xfffff) AM_ROM \
-ADDRESS_MAP_END \
-
+ADDRESS_MAP_END
M84_CPU1_MEMORY( rtype2, 0xd0000, 0xc8000, 0xd8000 )
M84_CPU1_MEMORY( hharryu, 0xd0000, 0xa0000, 0xa8000 )
M84_CPU1_MEMORY( kengo, 0x80000, 0xa0000, 0xa8000 )
@@ -1988,7 +1986,7 @@ static MACHINE_CONFIG_DERIVED( m81_xmultipl, m81_hharry )
MCFG_VIDEO_START_OVERRIDE(m72_state,xmultipl) // different offsets
MACHINE_CONFIG_END
-
+
static MACHINE_CONFIG_DERIVED( m81_dbreed, m81_xmultipl )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(dbreed_map)
@@ -2049,7 +2047,7 @@ static MACHINE_CONFIG_START( cosmccop, m72_state )
MCFG_CPU_PROGRAM_MAP(kengo_map)
MCFG_CPU_IO_MAP(m84_v33_portmap)
//#ifndef USE_HACKED_IRQS
-// MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("upd71059c", pic8259_device, inta_cb)
+// MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("upd71059c", pic8259_device, inta_cb)
//#endif
MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
@@ -2058,8 +2056,8 @@ static MACHINE_CONFIG_START( cosmccop, m72_state )
MCFG_CPU_PERIODIC_INT_DRIVER(m72_state, nmi_line_pulse, 128*55) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
-// MCFG_PIC8259_ADD( "upd71059c", INPUTLINE("maincpu", 0), VCC, NULL)
-
+// MCFG_PIC8259_ADD( "upd71059c", INPUTLINE("maincpu", 0), VCC, NULL)
+
MCFG_MACHINE_START_OVERRIDE(m72_state,kengo)
MCFG_MACHINE_RESET_OVERRIDE(m72_state,kengo)
@@ -2085,7 +2083,7 @@ MACHINE_CONFIG_END
/****************************************** M82 ***********************************************/
-/* Major Title uses
+/* Major Title uses
M82-A-A as the top board
M82-B-A and as the bottom board
@@ -2123,7 +2121,7 @@ static MACHINE_CONFIG_START( m82, m72_state )
MACHINE_CONFIG_END
-/* Pound for Pound uses
+/* Pound for Pound uses
M85-A-B / M85-B
*/
@@ -2143,7 +2141,7 @@ static MACHINE_CONFIG_START( poundfor, m72_state )
/* IRQs are generated by main Z80 and YM2151 */
MCFG_PIC8259_ADD( "upd71059c", INPUTLINE("maincpu", 0), VCC, NULL)
-
+
/* video hardware */
MCFG_GFXDECODE_ADD("gfxdecode", "palette", rtype2)
MCFG_PALETTE_ADD("palette", 512)
@@ -3474,7 +3472,7 @@ ROM_START( rtype2j )
ROM_REGION( 0x0200, "proms", 0 ) /* located on M84-B-A */
ROM_LOAD( "rt2_b-4n-.bin", 0x0000, 0x0100, CRC(b460c438) SHA1(00e20cf754b6fd5138ee4d2f6ec28dff9e292fe6) )
- ROM_LOAD( "rt2_b-4p-.bin", 0x0100, 0x0100, CRC(a4f2c4bc) SHA1(f13b0a4b52dcc6704063b676f09d83dcba170133) )
+ ROM_LOAD( "rt2_b-4p-.bin", 0x0100, 0x0100, CRC(a4f2c4bc) SHA1(f13b0a4b52dcc6704063b676f09d83dcba170133) )
ROM_END
ROM_START( rtype2jc )
@@ -3677,7 +3675,7 @@ ROM_START( kengoa )
ROM_REGION( 0x0200, "proms", 0 ) /* located on M84-B-B */
ROM_LOAD( "KEN_B-4N-.IC23", 0x0000, 0x0100, CRC(b460c438) SHA1(00e20cf754b6fd5138ee4d2f6ec28dff9e292fe6) )
- ROM_LOAD( "KEN_B-4P-.IC24", 0x0100, 0x0100, CRC(526f10ca) SHA1(e0ecd4db0720a4a37489e4d725843a2fbf266ebf) ) // differs from rtype 2 / ninja spirit
+ ROM_LOAD( "KEN_B-4P-.IC24", 0x0100, 0x0100, CRC(526f10ca) SHA1(e0ecd4db0720a4a37489e4d725843a2fbf266ebf) ) // differs from rtype 2 / ninja spirit
ROM_END
diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c
index 7ac6630ef16..6f06921f32b 100644
--- a/src/mame/drivers/m92.c
+++ b/src/mame/drivers/m92.c
@@ -223,21 +223,21 @@ psoldier dip locations still need verification.
#define M92_TRIGGER_IRQ3 m_maincpu->set_input_line_and_vector(0, HOLD_LINE, m_upd71059c->HACK_get_base_vector()+3 ); /* Sound cpu->Main cpu interrupt */
// not used due to HOLD LINE logic
#define M92_CLEAR_IRQ0 ;
-#define M92_CLEAR_IRQ1 ;
+#define M92_CLEAR_IRQ1 ;
#define M92_CLEAR_IRQ2 ;
#define M92_CLEAR_IRQ3 ;
#else
-#define M92_TRIGGER_IRQ0 m_upd71059c->ir0_w(1);
-#define M92_TRIGGER_IRQ1 m_upd71059c->ir1_w(1);
-#define M92_TRIGGER_IRQ2 m_upd71059c->ir2_w(1);
-#define M92_TRIGGER_IRQ3 m_upd71059c->ir3_w(1);
+#define M92_TRIGGER_IRQ0 m_upd71059c->ir0_w(1);
+#define M92_TRIGGER_IRQ1 m_upd71059c->ir1_w(1);
+#define M92_TRIGGER_IRQ2 m_upd71059c->ir2_w(1);
+#define M92_TRIGGER_IRQ3 m_upd71059c->ir3_w(1);
// not sure when these should happen, probably the source of our issues
-#define M92_CLEAR_IRQ0 m_upd71059c->ir0_w(0);
-#define M92_CLEAR_IRQ1 m_upd71059c->ir1_w(0);
-#define M92_CLEAR_IRQ2 m_upd71059c->ir2_w(0);
-#define M92_CLEAR_IRQ3 m_upd71059c->ir3_w(0);
+#define M92_CLEAR_IRQ0 m_upd71059c->ir0_w(0);
+#define M92_CLEAR_IRQ1 m_upd71059c->ir1_w(0);
+#define M92_CLEAR_IRQ2 m_upd71059c->ir2_w(0);
+#define M92_CLEAR_IRQ3 m_upd71059c->ir3_w(0);
#endif
diff --git a/src/mame/drivers/macpci.c b/src/mame/drivers/macpci.c
index 5e24c434114..97cb494ca73 100644
--- a/src/mame/drivers/macpci.c
+++ b/src/mame/drivers/macpci.c
@@ -111,7 +111,7 @@ static MACHINE_CONFIG_START( pippin, macpci_state )
MCFG_CDROM_ADD("cdrom")
MCFG_CDROM_INTERFACE("pippin_cdrom")
- MCFG_SOFTWARE_LIST_ADD("cd_list","pippin")
+ MCFG_SOFTWARE_LIST_ADD("cd_list","pippin")
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("32M")
diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c
index 2983b49aeac..46186a10e1a 100644
--- a/src/mame/drivers/merit.c
+++ b/src/mame/drivers/merit.c
@@ -232,7 +232,7 @@ WRITE8_MEMBER(merit_state::palette_w)
{
int co;
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
data &= 0x0f;
@@ -306,7 +306,7 @@ MC6845_UPDATE_ROW( merit_state::crtc_update_row )
WRITE_LINE_MEMBER(merit_state::hsync_changed)
{
/* update any video up to the current scanline */
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
}
diff --git a/src/mame/drivers/micral.c b/src/mame/drivers/micral.c
index 0defae8fad3..0dbbbe51938 100644
--- a/src/mame/drivers/micral.c
+++ b/src/mame/drivers/micral.c
@@ -200,31 +200,31 @@ INPUT_PORTS_END
UINT32 micral_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
-// for (int y = 0; y < 32*8; y++)
-// {
-// offs_t offset = (y / 8) * 128;
+// for (int y = 0; y < 32*8; y++)
+// {
+// offs_t offset = (y / 8) * 128;
-// for (int sx = 0; sx < 64; sx++)
-// {
-// UINT8 code = m_video_ram[offset++];
-// UINT8 attr = m_video_ram[offset++];
+// for (int sx = 0; sx < 64; sx++)
+// {
+// UINT8 code = m_video_ram[offset++];
+// UINT8 attr = m_video_ram[offset++];
-// offs_t char_offs = ((code & 0x7f) << 3) | (y & 0x07);
-// if (BIT(code, 7)) char_offs = ((code & 0x7f) << 3) | ((y >> 1) & 0x07);
+// offs_t char_offs = ((code & 0x7f) << 3) | (y & 0x07);
+// if (BIT(code, 7)) char_offs = ((code & 0x7f) << 3) | ((y >> 1) & 0x07);
-// UINT8 data = m_char_rom->base()[char_offs];
+// UINT8 data = m_char_rom->base()[char_offs];
-// rgb_t fg = m_palette->pen_color(attr & 0x07);
-// rgb_t bg = m_palette->pen_color((attr >> 3) & 0x07);
+// rgb_t fg = m_palette->pen_color(attr & 0x07);
+// rgb_t bg = m_palette->pen_color((attr >> 3) & 0x07);
-// for (int x = 0; x < 6; x++)
-// {
-// bitmap.pix32(y, (sx * 6) + x) = BIT(data, 7) ? fg : bg;
+// for (int x = 0; x < 6; x++)
+// {
+// bitmap.pix32(y, (sx * 6) + x) = BIT(data, 7) ? fg : bg;
-// data <<= 1;
-// }
-// }
-// }
+// data <<= 1;
+// }
+// }
+// }
return 0;
}
@@ -251,7 +251,7 @@ static MACHINE_CONFIG_START( micral, micral_state )
MCFG_CPU_ADD( "maincpu", Z80, XTAL_4MHz )
MCFG_CPU_PROGRAM_MAP(micral_mem)
// no i/o ports on main cpu
- MCFG_CPU_ADD( "keyboard", Z80, XTAL_1MHz ) // freq unknown
+ MCFG_CPU_ADD( "keyboard", Z80, XTAL_1MHz ) // freq unknown
MCFG_CPU_PROGRAM_MAP(micral_kbd_mem)
MCFG_CPU_IO_MAP(micral_kbd_io)
diff --git a/src/mame/drivers/namcops2.c b/src/mame/drivers/namcops2.c
index d22aa7ab8c7..50205be53ec 100644
--- a/src/mame/drivers/namcops2.c
+++ b/src/mame/drivers/namcops2.c
@@ -538,7 +538,7 @@ Notes:
J9 - 6-pin connector (not used)
J10 - 80-pin Namco connector (not used, probably for an add-on PCB with ROMs for diagnostics)
-This PCB is used with Cobra The Arcade. The game will boot with several I/O boards but in the test mode in 'I/O TEST'
+This PCB is used with Cobra The Arcade. The game will boot with several I/O boards but in the test mode in 'I/O TEST'
the I/O board is only reported as good with the RAYS PCB, otherwise it reports 'NG'.
This same PCB is also used with the DX rear-projection-screen version of Crisis Zone (on System 23 Evolution 2 hardware).
Note this board requires a CCD camera and infrared guns and infrared sensors.
@@ -599,7 +599,7 @@ Notes:
J101 - 6 pin connector for power input
J102 - 60 pin flat cable connector
J104 - 5 pin connector (not populated)
- J204 - USB-B connector (also wired in-line with J104. Note the signal is still the
+ J204 - USB-B connector (also wired in-line with J104. Note the signal is still the
normal Namco communication signal; i.e. RS485)
J106 - 30 pin flat cable connector
J108 - 4 pin connector
@@ -613,9 +613,9 @@ Notes:
V290 FCB PCB is almost identical to FCA PCB. The main differences are changed internal MCU code & PIC code,
some extra/different connectors, less D1017 driver transistors and an added RS-232 IC.
-The V290 FCB PCB is used with touchscreen games such as Dragon Chronicles, Druaga Online, Idol Master etc.
+The V290 FCB PCB is used with touchscreen games such as Dragon Chronicles, Druaga Online, Idol Master etc.
It supports a serial touchscreen interface, card readers and buttons.
-The additional devices are supported via J108 which connects to another PCB 'XOU020-A' which contains a
+The additional devices are supported via J108 which connects to another PCB 'XOU020-A' which contains a
Texas Instruments TMS32VC540x DSP, TSOP32 flash ROM and other components.
@@ -738,15 +738,15 @@ System246 PMOTHER PCB
| |EP20K100E LC35256 RS5C348 J14 |
| |QC208 | 32.768kHz BR9080F |
| 16M |--------| |----------|
-| 16M 66.666MHz C807U-1V86|
-| 4MHz|
-| J11 MM1537|
-| |------| J10 |
-| | C448 | 61C256 EPM3128 |
-| | | |
-| |------| |
-| J9 |
-| TMP95C061 |
+| 16M 66.666MHz C807U-1V86|
+| 4MHz|
+| J11 MM1537|
+| |------| J10 |
+| | C448 | 61C256 EPM3128 |
+| | | |
+| |------| |
+| J9 |
+| TMP95C061 |
J8 CXA2055P |
| MAX232 ADM485 6358N J7
| J3 |
@@ -764,7 +764,7 @@ Notes:
J10 - 6-pin connector for programming EPM3128 CPLD (not populated)
J11 - Flat cable connector joining to PS2 main board
J12 - 40-pin IDE connector for CD/DVD/HDD drives
- J13 - 4-pin power input connector (+5V/GND)
+ J13 - 4-pin power input connector (+5V/GND)
J14 - 34-pin connector plugged directly into PS2 main board
J15 - 4-pin power output connector plugged directly into PS2 main board (the PS2 main board PSU is not populated)
C807U-1V86 - Toshiba TMP87PH47U microcontroller with 16k x8-bit OTP EPROM re-badged as 'SONY C8707U-1V86 (C)2000 SCEI'
@@ -783,14 +783,14 @@ C807U-1V86 - Toshiba TMP87PH47U microcontroller with 16k x8-bit OTP EPROM re-bad
RS5C348 - Ricoh RS5C348 RTC
BR9080F - ROHN BR9080F 512 word x16-bit serial EEPROM
MM1537 - Mitsumi MM1537 reset chip. No info available but pin 2 of MM1537 tied to TMP87PH47 reset pin 14 so it's a reset chip
- MAX232 - Maxim MAX232 dual serial to TTL logic level driver/receiver
+ MAX232 - Maxim MAX232 dual serial to TTL logic level driver/receiver
BATTERY - CR2032 3.0V battery
-
+
This revision was initially used with Tekken 4, Time Crisis 3, Battle Gear 3 and Soul Calibur II. There are reports
that the DVD-based games on this system are fussy about the model of DVD-ROM drive used. Powering the drive from an
external PSU will help in some cases.
-A PS2 main board (such as GH-006) is required and plugs into J14 & J15 directly and two flat cables
+A PS2 main board (such as GH-006) is required and plugs into J14 & J15 directly and two flat cables
from J9 & J11 also connect to the PS2 main board.
The board documented here is green. A blue PCB has been seen used in Time Crisis 3. It's not known if the PCB
is different to this one.
diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c
index 5b813e8dbdc..682fccae8f0 100644
--- a/src/mame/drivers/namcos11.c
+++ b/src/mame/drivers/namcos11.c
@@ -289,7 +289,7 @@ JAMMA Harness:
Pin 1 Parts Side - GND
Pin 3 Parts Side - +5V
Pin 22 Parts Side - Gun 1 Trigger
-Pin 22 Solder Side - Gun 2 Trigger
+Pin 22 Solder Side - Gun 2 Trigger
***************************************************************************/
diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c
index 3620838e9de..1978c90cf26 100644
--- a/src/mame/drivers/namcos12.c
+++ b/src/mame/drivers/namcos12.c
@@ -966,8 +966,8 @@ Notes:
This PCB was found on the following games (so far)....
Ghoul Panic (OB2/VER.A)
- Oh! Bakyuuun (OB1/VER.A)
- Gunbarl (GNB4/VER.A)
+ Oh! Bakyuuun (OB1/VER.A)
+ Gunbarl (GNB4/VER.A)
Point Blank 2 (GNB5/VER.A)
To connect a normal (i.e. HAPP) light gun only 4 wires are needed.
@@ -990,7 +990,7 @@ JAMMA Harness:
Pin 1 Parts Side - GND
Pin 3 Parts Side - +5V
Pin 22 Parts Side - Gun 1 Trigger
-Pin 22 Solder Side - Gun 2 Trigger
+Pin 22 Solder Side - Gun 2 Trigger
CDXA PCB
@@ -1070,9 +1070,9 @@ Notes:
J1/2/3/8 - Multi-pin connectors joining to controls and main PCB
J9 - Power input connector
-I/O board (for Attack Pla-Rail)
+I/O board (for Attack Pla-Rail)
-------------------------------
-Attack Pla-Rail requires an I/O board to boot. Several I/O boards are accepted including TSS-I/O, FCA, ASCA3, ASCA5
+Attack Pla-Rail requires an I/O board to boot. Several I/O boards are accepted including TSS-I/O, FCA, ASCA3, ASCA5
and also the common JVS I/O boards manufactured by Sega.
The game uses 3 buttons and a 5k potentiometer for the lever. The button signals come from the I/O board.
The lever must be wired to analog port 0 (pin B22 parts side) of the Namco 48-way edge connector.
@@ -1527,7 +1527,7 @@ static ADDRESS_MAP_START( s12h8rwjvsmap, AS_PROGRAM, 16, namcos12_state )
AM_RANGE(0x280000, 0x287fff) AM_DEVREADWRITE("c352", c352_device, read, write)
AM_RANGE(0x300000, 0x300001) AM_READ_PORT("DIN0")
AM_RANGE(0x300002, 0x300003) AM_READ_PORT("DIN1")
- AM_RANGE(0x300010, 0x300011) AM_NOP
+ AM_RANGE(0x300010, 0x300011) AM_NOP
AM_RANGE(0x300030, 0x300031) AM_NOP // most S12 bioses write here simply to generate a wait state. there is no deeper meaning.
ADDRESS_MAP_END
@@ -1572,7 +1572,7 @@ READ16_MEMBER(namcos12_state::s12_mcu_p6_r)
READ16_MEMBER(namcos12_state::s12_mcu_jvs_p8_r)
{
- return 0x12; // bit 4 = JVS enable. aplarail requires it to be on, soulclbr & others will require JVS I/O if it's on
+ return 0x12; // bit 4 = JVS enable. aplarail requires it to be on, soulclbr & others will require JVS I/O if it's on
}
static ADDRESS_MAP_START( s12h8iomap, AS_IO, 16, namcos12_state )
@@ -2017,14 +2017,14 @@ static INPUT_PORTS_START( aplarail )
PORT_BIT( 0xff3f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_START("IN01")
- PORT_BIT( 0x00000800, IP_ACTIVE_LOW, IPT_BUTTON1 ) // left
- PORT_BIT( 0x00001000, IP_ACTIVE_LOW, IPT_START1 ) // OK / Start
- PORT_BIT( 0x00002000, IP_ACTIVE_LOW, IPT_BUTTON2 ) // right
+ PORT_BIT( 0x00000800, IP_ACTIVE_LOW, IPT_BUTTON1 ) // left
+ PORT_BIT( 0x00001000, IP_ACTIVE_LOW, IPT_START1 ) // OK / Start
+ PORT_BIT( 0x00002000, IP_ACTIVE_LOW, IPT_BUTTON2 ) // right
PORT_BIT( 0xc7ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_START("IN23")
PORT_BIT( 0xf7ff, IP_ACTIVE_LOW, IPT_UNKNOWN)
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN1 ) // coin
+ PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN1 ) // coin
PORT_START("DIN0")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN)
@@ -2035,7 +2035,7 @@ static INPUT_PORTS_START( aplarail )
PORT_START("LEVER")
PORT_BIT( 0x07ff, 0x03ff, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_NAME("Speed Lever") PORT_REVERSE
-
+
PORT_START("SERVICE")
PORT_BIT(0xff, IP_ACTIVE_LOW, IPT_UNKNOWN)
INPUT_PORTS_END
@@ -3147,7 +3147,7 @@ ROM_START( aplarail )
ROM_REGION( 0x40000, "iocpu", 0) /* Truck K. I/O board */
ROM_LOAD( "asca1_io-a.ic2", 0x000000, 0x040000, CRC(77cdf69a) SHA1(497af1059f85c07bea2dd0d303481623f6019dcf) )
- ROM_REGION( 0x800, "at28c16", 0) /* pre-calibrated NVRAM */
+ ROM_REGION( 0x800, "at28c16", 0) /* pre-calibrated NVRAM */
ROM_LOAD( "at28c16", 0x000000, 0x000800, CRC(db1b63c5) SHA1(01fc3386a2d1cb1bed1b7fd9bd2fd59e503832d3) )
ROM_END
diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c
index 7ae38dbf454..a8dcf1a30f2 100644
--- a/src/mame/drivers/namcos23.c
+++ b/src/mame/drivers/namcos23.c
@@ -1586,7 +1586,7 @@ UINT16 namcos23_state::nthword(const UINT32 *pSource, int offs)
namcos23_renderer::namcos23_renderer(namcos23_state &state)
: poly_manager<float, namcos23_render_data, 4, POLY_MAX_ENTRIES>(state.machine()),
- m_state(state)
+ m_state(state)
{
}
@@ -1892,15 +1892,15 @@ void namcos23_renderer::render_scanline(INT32 scanline, const extent_t& extent,
float du = extent.param[1].dpdx;
float dv = extent.param[2].dpdx;
float dl = extent.param[3].dpdx;
-
+
UINT32 *img = &object.bitmap->pix32(scanline, extent.startx);
-
+
for(int x = extent.startx; x < extent.stopx; x++) {
float z = w ? 1/w : 0;
UINT32 pcol = rd.texture_lookup(*rd.machine, rd.pens, u*z, v*z);
float ll = l*z;
*img = (light(pcol >> 16, ll) << 16) | (light(pcol >> 8, ll) << 8) | light(pcol, ll);
-
+
w += dw;
u += du;
v += dv;
@@ -2035,61 +2035,61 @@ void namcos23_state::render_one_model(const namcos23_render_entry *re)
namcos23_poly_entry *p = render.polys + render.poly_count;
- // Should be unnecessary now that frustum clipping happens, but this still culls polys behind the camera
+ // Should be unnecessary now that frustum clipping happens, but this still culls polys behind the camera
p->vertex_count = render.polymgr->zclip_if_less(ne, pv, p->pv, 4, 0.00001f);
-
- // Project if you don't clip on the near plane
+
+ // Project if you don't clip on the near plane
if(p->vertex_count >= 3) {
- // Project the eye points
- frustum_clip_vertex<float, 3> clipVerts[10];
- for(int i=0; i<p->vertex_count; i++) {
- // Construct a frustum clipping vert from the NDCoords
- const float Z = p->pv[i].p[0];
- clipVerts[i].x = p->pv[i].x / Z;
- clipVerts[i].y = p->pv[i].y / Z;
- clipVerts[i].z = Z;
- clipVerts[i].w = Z;
- clipVerts[i].p[0] = p->pv[i].p[1];
- clipVerts[i].p[1] = p->pv[i].p[2];
- clipVerts[i].p[2] = p->pv[i].p[3];
- }
-
- // Clip against all edges of the view frustum
- int num_vertices = frustum_clip_all<float, 3>(clipVerts, p->vertex_count, clipVerts);
-
- if (num_vertices != 0)
- {
- // Push the results back into the main vertices
- for (int i=0; i < num_vertices; i++)
- {
- p->pv[i].x = clipVerts[i].x;
- p->pv[i].y = clipVerts[i].y;
- p->pv[i].p[0] = clipVerts[i].w;
- p->pv[i].p[1] = clipVerts[i].p[0];
- p->pv[i].p[2] = clipVerts[i].p[1];
- p->pv[i].p[3] = clipVerts[i].p[2];
- }
- p->vertex_count = num_vertices;
-
- // This is our poor-man's projection matrix
- for(int i=0; i<p->vertex_count; i++)
- {
- render_project(p->pv[i]);
-
- float w = p->pv[i].p[0];
- p->pv[i].p[1] *= w;
- p->pv[i].p[2] *= w;
- p->pv[i].p[3] *= w;
- }
-
- // Compute an odd sorta'-Z thing that can situate the polygon wherever you want in Z-depth
- p->zkey = 0.5f*(minz+maxz);
- p->front = !(h & 0x00000001);
- p->rd.machine = &machine();
- p->rd.texture_lookup = render_texture_lookup_nocache_point;
- p->rd.pens = m_palette->pens() + (color << 8);
- render.poly_count++;
- }
+ // Project the eye points
+ frustum_clip_vertex<float, 3> clipVerts[10];
+ for(int i=0; i<p->vertex_count; i++) {
+ // Construct a frustum clipping vert from the NDCoords
+ const float Z = p->pv[i].p[0];
+ clipVerts[i].x = p->pv[i].x / Z;
+ clipVerts[i].y = p->pv[i].y / Z;
+ clipVerts[i].z = Z;
+ clipVerts[i].w = Z;
+ clipVerts[i].p[0] = p->pv[i].p[1];
+ clipVerts[i].p[1] = p->pv[i].p[2];
+ clipVerts[i].p[2] = p->pv[i].p[3];
+ }
+
+ // Clip against all edges of the view frustum
+ int num_vertices = frustum_clip_all<float, 3>(clipVerts, p->vertex_count, clipVerts);
+
+ if (num_vertices != 0)
+ {
+ // Push the results back into the main vertices
+ for (int i=0; i < num_vertices; i++)
+ {
+ p->pv[i].x = clipVerts[i].x;
+ p->pv[i].y = clipVerts[i].y;
+ p->pv[i].p[0] = clipVerts[i].w;
+ p->pv[i].p[1] = clipVerts[i].p[0];
+ p->pv[i].p[2] = clipVerts[i].p[1];
+ p->pv[i].p[3] = clipVerts[i].p[2];
+ }
+ p->vertex_count = num_vertices;
+
+ // This is our poor-man's projection matrix
+ for(int i=0; i<p->vertex_count; i++)
+ {
+ render_project(p->pv[i]);
+
+ float w = p->pv[i].p[0];
+ p->pv[i].p[1] *= w;
+ p->pv[i].p[2] *= w;
+ p->pv[i].p[3] *= w;
+ }
+
+ // Compute an odd sorta'-Z thing that can situate the polygon wherever you want in Z-depth
+ p->zkey = 0.5f*(minz+maxz);
+ p->front = !(h & 0x00000001);
+ p->rd.machine = &machine();
+ p->rd.texture_lookup = render_texture_lookup_nocache_point;
+ p->rd.pens = m_palette->pens() + (color << 8);
+ render.poly_count++;
+ }
}
if(type & 0x000010000)
diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c
index f54110c224a..642bb9a89b5 100644
--- a/src/mame/drivers/nmg5.c
+++ b/src/mame/drivers/nmg5.c
@@ -1442,7 +1442,7 @@ ROM_START( wondstcka )
ROM_REGION( 0x280000, "gfx2", 0 ) /* 16x16x5 */
ROM_LOAD( "8.u83 ", 0x000000, 0x80000, CRC(f51cf9c6) SHA1(6d0fc749bab918ff6a9d7fae8be7c65823349283) )
-// ROM_LOAD( "9.u82", 0x080000, 0x80000, CRC(8c6cff4d) SHA1(5a217ff60f10bf5c58091c189b3509d1361a16b3) ) // bad dump
+// ROM_LOAD( "9.u82", 0x080000, 0x80000, CRC(8c6cff4d) SHA1(5a217ff60f10bf5c58091c189b3509d1361a16b3) ) // bad dump
ROM_LOAD( "9.u82", 0x080000, 0x80000, CRC(ddd3c60c) SHA1(19b68a44c877d0bf630d07b18541ef9636f5adac) )
ROM_LOAD( "7.u105", 0x100000, 0x80000, CRC(a7fc624d) SHA1(b336ab6e16555db30f9366bf5b797b5ba3ea767c) )
ROM_LOAD( "6.u96", 0x180000, 0x80000, CRC(2369d8a3) SHA1(4224f50c9c31624dfcac6215d60a2acdd39bb477) )
diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c
index 0e4bd82eef0..ddc4513a135 100644
--- a/src/mame/drivers/othunder.c
+++ b/src/mame/drivers/othunder.c
@@ -58,7 +58,7 @@ Notes:
6116.56 & 54 - Sprite attribute/enable RAM, tied to TC0320OBR
Other 6116 RAM - Sprite RAM, connected to TC0020VAR & TC0050VDZ
6264.73 & 74 - Color RAM
-
+
Taito Custom ICs -
TC0220IOC
TC0110PCR
@@ -67,7 +67,7 @@ Notes:
TC0320OBR
TC0020VAR
TC0050VDZ (x3)
- TC0070RGB (ceramic module)
+ TC0070RGB (ceramic module)
TC0310FAM (ceramic module)
VSync: 60.0552Hz
HSync: 15.4938kHz
@@ -75,7 +75,7 @@ Notes:
Note: The hardware outputs reversed video because the cabinet uses a mirror.
The video can't be flipped/reversed with the DIPs, it's fixed in hardware.
- PCB edge connector is 28-way non-JAMMA.
+ PCB edge connector is 28-way non-JAMMA.
The gun is NOT a light gun, it uses two 5k-ohm potentiometers for the X-Y position
Solder | Parts
diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c
index af60b1efb17..8782e74cbe5 100644
--- a/src/mame/drivers/peplus.c
+++ b/src/mame/drivers/peplus.c
@@ -8880,7 +8880,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K 4K 4A SF RF (Bonus)
P435A 1 1 3 4 5 8 50 80 160 50 250 800
% Range: 90.2-92.2% Optimum: 94.2% Hit Frequency: 45.1%
Programs Available: X002179P
-
+
NOTE: Same as X000726P, except MAX Coin (set to 5) CANNOT be changed - NJ jurisdiction
*/
ROM_REGION( 0x10000, "maincpu", 0 )
@@ -8907,7 +8907,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K 4K 4A SF RF (Bonus)
P437A 1 1 3 4 5 6 50 80 160 50 250 800
% Range: 88.0-90.0% Optimum: 92.0% Hit Frequency: 45.1%
Programs Available: X002180P
-
+
NOTE: Same as X000728P, except MAX Coin (set to 5) CANNOT be changed - NJ jurisdiction
*/
ROM_REGION( 0x10000, "maincpu", 0 )
@@ -10290,7 +10290,7 @@ Double Bonus Poker P325A 97.80%
ROM_LOAD( "mgo-cg2174.u78", 0x08000, 0x8000, CRC(cc46adb0) SHA1(6065aa5dcb9091ad80e499c7ee6dc629e79c865a) )
ROM_LOAD( "mbo-cg2174.u79", 0x10000, 0x8000, CRC(7291a0c8) SHA1(1068f35e6ef5fd88c584922860231840a90fb623) )
ROM_LOAD( "mxo-cg2174.u80", 0x18000, 0x8000, CRC(14f9480c) SHA1(59323f9fc5995277aea86d088893b6eb95b4e89b) )
-
+
ROM_REGION( 0x200, "proms", 0 )
ROM_LOAD( "capx2174.u43", 0x0000, 0x0200, CRC(50bdad55) SHA1(958d463c7effb3457c1f9c44c9b7822339c04e8b) )
ROM_END
diff --git a/src/mame/drivers/rd100.c b/src/mame/drivers/rd100.c
index 12f9ac627b2..46c20ff62ce 100644
--- a/src/mame/drivers/rd100.c
+++ b/src/mame/drivers/rd100.c
@@ -48,31 +48,31 @@ INPUT_PORTS_END
UINT32 rd100_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
-// for (int y = 0; y < 32*8; y++)
-// {
-// offs_t offset = (y / 8) * 128;
+// for (int y = 0; y < 32*8; y++)
+// {
+// offs_t offset = (y / 8) * 128;
-// for (int sx = 0; sx < 64; sx++)
-// {
-// UINT8 code = m_video_ram[offset++];
-// UINT8 attr = m_video_ram[offset++];
+// for (int sx = 0; sx < 64; sx++)
+// {
+// UINT8 code = m_video_ram[offset++];
+// UINT8 attr = m_video_ram[offset++];
-// offs_t char_offs = ((code & 0x7f) << 3) | (y & 0x07);
-// if (BIT(code, 7)) char_offs = ((code & 0x7f) << 3) | ((y >> 1) & 0x07);
+// offs_t char_offs = ((code & 0x7f) << 3) | (y & 0x07);
+// if (BIT(code, 7)) char_offs = ((code & 0x7f) << 3) | ((y >> 1) & 0x07);
-// UINT8 data = m_char_rom->base()[char_offs];
+// UINT8 data = m_char_rom->base()[char_offs];
-// rgb_t fg = m_palette->pen_color(attr & 0x07);
-// rgb_t bg = m_palette->pen_color((attr >> 3) & 0x07);
+// rgb_t fg = m_palette->pen_color(attr & 0x07);
+// rgb_t bg = m_palette->pen_color((attr >> 3) & 0x07);
-// for (int x = 0; x < 6; x++)
-// {
-// bitmap.pix32(y, (sx * 6) + x) = BIT(data, 7) ? fg : bg;
+// for (int x = 0; x < 6; x++)
+// {
+// bitmap.pix32(y, (sx * 6) + x) = BIT(data, 7) ? fg : bg;
-// data <<= 1;
-// }
-// }
-// }
+// data <<= 1;
+// }
+// }
+// }
return 0;
}
diff --git a/src/mame/drivers/replicator.c b/src/mame/drivers/replicator.c
index 032e2246f8d..7ac2f528be1 100644
--- a/src/mame/drivers/replicator.c
+++ b/src/mame/drivers/replicator.c
@@ -151,39 +151,39 @@
class replicator_state : public driver_device
{
public:
- replicator_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_lcdc(*this, "hd44780"),
- m_dac(*this, "dac")
- {
- }
-
- virtual void machine_start();
-
- UINT8 m_port_a;
- UINT8 m_port_b;
- UINT8 m_port_c;
- UINT8 m_port_d;
- UINT8 m_port_e;
- UINT8 m_port_f;
- UINT8 m_port_g;
- UINT8 m_port_h;
- UINT8 m_port_j;
- UINT8 m_port_k;
- UINT8 m_port_l;
-
- UINT8 shift_register_value;
-
- required_device<avr8_device> m_maincpu;
- required_device<hd44780_device> m_lcdc;
- required_device<dac_device> m_dac;
-
- DECLARE_READ8_MEMBER(port_r);
- DECLARE_WRITE8_MEMBER(port_w);
- DECLARE_DRIVER_INIT(replicator);
- virtual void machine_reset();
- DECLARE_PALETTE_INIT(replicator);
+ replicator_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
+ m_maincpu(*this, "maincpu"),
+ m_lcdc(*this, "hd44780"),
+ m_dac(*this, "dac")
+ {
+ }
+
+ virtual void machine_start();
+
+ UINT8 m_port_a;
+ UINT8 m_port_b;
+ UINT8 m_port_c;
+ UINT8 m_port_d;
+ UINT8 m_port_e;
+ UINT8 m_port_f;
+ UINT8 m_port_g;
+ UINT8 m_port_h;
+ UINT8 m_port_j;
+ UINT8 m_port_k;
+ UINT8 m_port_l;
+
+ UINT8 shift_register_value;
+
+ required_device<avr8_device> m_maincpu;
+ required_device<hd44780_device> m_lcdc;
+ required_device<dac_device> m_dac;
+
+ DECLARE_READ8_MEMBER(port_r);
+ DECLARE_WRITE8_MEMBER(port_w);
+ DECLARE_DRIVER_INIT(replicator);
+ virtual void machine_reset();
+ DECLARE_PALETTE_INIT(replicator);
};
void replicator_state::machine_start()
@@ -192,339 +192,339 @@ void replicator_state::machine_start()
READ8_MEMBER(replicator_state::port_r)
{
- switch( offset )
- {
- case AVR8_IO_PORTA:
- {
+ switch( offset )
+ {
+ case AVR8_IO_PORTA:
+ {
#if LOG_PORTS
- printf("[%08X] Port A READ (A-axis signals + B-axis STEP&DIR)\n", m_maincpu->m_shifted_pc);
+ printf("[%08X] Port A READ (A-axis signals + B-axis STEP&DIR)\n", m_maincpu->m_shifted_pc);
#endif
- return 0x00;
- }
- case AVR8_IO_PORTB:
- {
+ return 0x00;
+ }
+ case AVR8_IO_PORTB:
+ {
#if LOG_PORTS
- printf("[%08X] Port B READ (SD-CS; 1280-MISO/MOSI/SCK; EX2-FAN/HEAT/PWR-CHECK; BLINK)\n", m_maincpu->m_shifted_pc);
+ printf("[%08X] Port B READ (SD-CS; 1280-MISO/MOSI/SCK; EX2-FAN/HEAT/PWR-CHECK; BLINK)\n", m_maincpu->m_shifted_pc);
#endif
- return 0x00;
- }
- case AVR8_IO_PORTC:
- {
+ return 0x00;
+ }
+ case AVR8_IO_PORTC:
+ {
#if LOG_PORTS
- printf("[%08X] Port C READ (1280-EX1/EX2; LCD-signals; R&G-LED; DETECT)\n", m_maincpu->m_shifted_pc);
+ printf("[%08X] Port C READ (1280-EX1/EX2; LCD-signals; R&G-LED; DETECT)\n", m_maincpu->m_shifted_pc);
#endif
- return DETECT; //indicated that the Interface board is present.
- }
- case AVR8_IO_PORTD:
- {
+ return DETECT; //indicated that the Interface board is present.
+ }
+ case AVR8_IO_PORTD:
+ {
#if LOG_PORTS
- printf("[%08X] Port D READ (SDA/SCL; 1280-EX-TX/RX)\n", m_maincpu->m_shifted_pc);
+ printf("[%08X] Port D READ (SDA/SCL; 1280-EX-TX/RX)\n", m_maincpu->m_shifted_pc);
#endif
- return 0x00;
- }
- case AVR8_IO_PORTE:
- {
+ return 0x00;
+ }
+ case AVR8_IO_PORTE:
+ {
#if LOG_PORTS
- printf("[%08X] Port E READ (1280-TX/RX; THERMO-signals)\n", m_maincpu->m_shifted_pc);
+ printf("[%08X] Port E READ (1280-TX/RX; THERMO-signals)\n", m_maincpu->m_shifted_pc);
#endif
- return 0x00;
- }
- case AVR8_IO_PORTF:
- {
+ return 0x00;
+ }
+ case AVR8_IO_PORTF:
+ {
#if LOG_PORTS
- printf("[%08X] Port F READ (X-axis & Y-axis signals)\n", m_maincpu->m_shifted_pc);
+ printf("[%08X] Port F READ (X-axis & Y-axis signals)\n", m_maincpu->m_shifted_pc);
#endif
- return 0x00;
- }
- case AVR8_IO_PORTG:
- {
+ return 0x00;
+ }
+ case AVR8_IO_PORTG:
+ {
#if LOG_PORTS
- printf("[%08X] Port G READ (BUZZ; Cutoff-sr-check; B-axis EN; 1280-EX3/EX4)\n", m_maincpu->m_shifted_pc);
+ printf("[%08X] Port G READ (BUZZ; Cutoff-sr-check; B-axis EN; 1280-EX3/EX4)\n", m_maincpu->m_shifted_pc);
#endif
- return 0x00;
- }
- case AVR8_IO_PORTH:
- {
+ return 0x00;
+ }
+ case AVR8_IO_PORTH:
+ {
#if LOG_PORTS
- printf("[%08X] Port H READ (cuttoff-text/reset; EX1-FAN/HEAT/PWR-CHECK; SD-CD/SD-WP)\n", m_maincpu->m_shifted_pc);
+ printf("[%08X] Port H READ (cuttoff-text/reset; EX1-FAN/HEAT/PWR-CHECK; SD-CD/SD-WP)\n", m_maincpu->m_shifted_pc);
#endif
- return 0x00;
- }
- case AVR8_IO_PORTJ:
- {
+ return 0x00;
+ }
+ case AVR8_IO_PORTJ:
+ {
#if LOG_PORTS
- printf("[%08X] Port J READ (Interface buttons; POTS-SCL; B-axis-POT)\n", m_maincpu->m_shifted_pc);
+ printf("[%08X] Port J READ (Interface buttons; POTS-SCL; B-axis-POT)\n", m_maincpu->m_shifted_pc);
#endif
- return ioport("keypad")->read();
- }
- case AVR8_IO_PORTK:
- {
+ return ioport("keypad")->read();
+ }
+ case AVR8_IO_PORTK:
+ {
#if LOG_PORTS
- printf("[%08X] Port K READ (Z-axis signals; HBP-THERM; 1280-EX5/6/7)\n", m_maincpu->m_shifted_pc);
+ printf("[%08X] Port K READ (Z-axis signals; HBP-THERM; 1280-EX5/6/7)\n", m_maincpu->m_shifted_pc);
#endif
- return 0x00;
- }
- case AVR8_IO_PORTL:
- {
+ return 0x00;
+ }
+ case AVR8_IO_PORTL:
+ {
#if LOG_PORTS
- printf("[%08X] Port L READ (HBP; EXTRA-FET; X-MIN/MAX; Y-MIN/MAX; Z-MIN/MAX)\n", m_maincpu->m_shifted_pc);
+ printf("[%08X] Port L READ (HBP; EXTRA-FET; X-MIN/MAX; Y-MIN/MAX; Z-MIN/MAX)\n", m_maincpu->m_shifted_pc);
#endif
- return 0x00;
- }
- }
- return 0;
+ return 0x00;
+ }
+ }
+ return 0;
}
WRITE8_MEMBER(replicator_state::port_w)
{
- switch( offset )
- {
- case AVR8_IO_PORTA:
- {
- if (data == m_port_a) break;
+ switch( offset )
+ {
+ case AVR8_IO_PORTA:
+ {
+ if (data == m_port_a) break;
#if LOG_PORTS
- UINT8 old_port_a = m_port_a;
- UINT8 changed = data ^ old_port_a;
-
- printf("[%08X] ", m_maincpu->m_shifted_pc);
- if(changed & A_AXIS_DIR) printf("[A] A_AXIS_DIR: %s\n", data & A_AXIS_DIR ? "HIGH" : "LOW");
- if(changed & A_AXIS_STEP) printf("[A] A_AXIS_STEP: %s\n", data & A_AXIS_STEP ? "HIGH" : "LOW");
- if(changed & A_AXIS_EN) printf("[A] A_AXIS_EN: %s\n", data & A_AXIS_EN ? "HIGH" : "LOW");
- if(changed & A_AXIS_POT) printf("[A] A_AXIS_POT: %s\n", data & A_AXIS_POT ? "HIGH" : "LOW");
- if(changed & B_AXIS_DIR) printf("[A] B_AXIS_DIR: %s\n", data & B_AXIS_DIR ? "HIGH" : "LOW");
- if(changed & B_AXIS_STEP) printf("[A] B_AXIS_STEP: %s\n", data & B_AXIS_STEP ? "HIGH" : "LOW");
+ UINT8 old_port_a = m_port_a;
+ UINT8 changed = data ^ old_port_a;
+
+ printf("[%08X] ", m_maincpu->m_shifted_pc);
+ if(changed & A_AXIS_DIR) printf("[A] A_AXIS_DIR: %s\n", data & A_AXIS_DIR ? "HIGH" : "LOW");
+ if(changed & A_AXIS_STEP) printf("[A] A_AXIS_STEP: %s\n", data & A_AXIS_STEP ? "HIGH" : "LOW");
+ if(changed & A_AXIS_EN) printf("[A] A_AXIS_EN: %s\n", data & A_AXIS_EN ? "HIGH" : "LOW");
+ if(changed & A_AXIS_POT) printf("[A] A_AXIS_POT: %s\n", data & A_AXIS_POT ? "HIGH" : "LOW");
+ if(changed & B_AXIS_DIR) printf("[A] B_AXIS_DIR: %s\n", data & B_AXIS_DIR ? "HIGH" : "LOW");
+ if(changed & B_AXIS_STEP) printf("[A] B_AXIS_STEP: %s\n", data & B_AXIS_STEP ? "HIGH" : "LOW");
#endif
- m_port_a = data;
- break;
- }
- case AVR8_IO_PORTB:
- {
- if (data == m_port_b) break;
+ m_port_a = data;
+ break;
+ }
+ case AVR8_IO_PORTB:
+ {
+ if (data == m_port_b) break;
#if LOG_PORTS
- UINT8 old_port_b = m_port_b;
- UINT8 changed = data ^ old_port_b;
-
- printf("[%08X] ", m_maincpu->m_shifted_pc);
- if(changed & SD_CS) printf("[B] SD Card Chip Select: %s\n", data & SD_CS ? "HIGH" : "LOW");
- if(changed & SCK_1280) printf("[B] 1280-SCK: %s\n", data & SCK_1280 ? "HIGH" : "LOW");
- if(changed & MOSI_1280) printf("[B] 1280-MOSI: %s\n", data & MOSI_1280 ? "HIGH" : "LOW");
- if(changed & MISO_1280) printf("[B] 1280-MISO: %s\n", data & MISO_1280 ? "HIGH" : "LOW");
- if(changed & EX2_PWR_CHECK) printf("[B] EX2-PWR-CHECK: %s\n", data & EX2_PWR_CHECK ? "HIGH" : "LOW");
- if(changed & EX2_HEAT) printf("[B] EX2_HEAT: %s\n", data & EX2_HEAT ? "HIGH" : "LOW");
- if(changed & EX2_FAN) printf("[B] EX2_FAN: %s\n", data & EX2_FAN ? "HIGH" : "LOW");
- if(changed & BLINK) printf("[B] BLINK: %s\n", data & BLINK ? "HIGH" : "LOW");
+ UINT8 old_port_b = m_port_b;
+ UINT8 changed = data ^ old_port_b;
+
+ printf("[%08X] ", m_maincpu->m_shifted_pc);
+ if(changed & SD_CS) printf("[B] SD Card Chip Select: %s\n", data & SD_CS ? "HIGH" : "LOW");
+ if(changed & SCK_1280) printf("[B] 1280-SCK: %s\n", data & SCK_1280 ? "HIGH" : "LOW");
+ if(changed & MOSI_1280) printf("[B] 1280-MOSI: %s\n", data & MOSI_1280 ? "HIGH" : "LOW");
+ if(changed & MISO_1280) printf("[B] 1280-MISO: %s\n", data & MISO_1280 ? "HIGH" : "LOW");
+ if(changed & EX2_PWR_CHECK) printf("[B] EX2-PWR-CHECK: %s\n", data & EX2_PWR_CHECK ? "HIGH" : "LOW");
+ if(changed & EX2_HEAT) printf("[B] EX2_HEAT: %s\n", data & EX2_HEAT ? "HIGH" : "LOW");
+ if(changed & EX2_FAN) printf("[B] EX2_FAN: %s\n", data & EX2_FAN ? "HIGH" : "LOW");
+ if(changed & BLINK) printf("[B] BLINK: %s\n", data & BLINK ? "HIGH" : "LOW");
#endif
- m_port_b = data;
- break;
- }
- case AVR8_IO_PORTC:
- {
- if (data == m_port_c) break;
-
- UINT8 old_port_c = m_port_c;
- UINT8 changed = data ^ old_port_c;
+ m_port_b = data;
+ break;
+ }
+ case AVR8_IO_PORTC:
+ {
+ if (data == m_port_c) break;
+
+ UINT8 old_port_c = m_port_c;
+ UINT8 changed = data ^ old_port_c;
#if LOG_PORTS
- printf("[%08X] ", m_maincpu->m_shifted_pc);
- if(changed & EX2_1280) printf("[C] EX2_1280: %s\n", data & EX2_1280 ? "HIGH" : "LOW");
- if(changed & EX1_1280) printf("[C] EX1_1280: %s\n", data & EX1_1280 ? "HIGH" : "LOW");
- if(changed & LCD_CLK) printf("[C] LCD_CLK: %s\n", data & LCD_CLK ? "HIGH" : "LOW");
- if(changed & LCD_DATA) printf("[C] LCD_DATA: %s\n", data & LCD_DATA ? "HIGH" : "LOW");
- if(changed & LCD_STROBE) printf("[C] LCD_STROBE: %s\n", data & LCD_STROBE ? "HIGH" : "LOW");
- if(changed & RLED) printf("[C] RLED: %s\n", data & RLED ? "HIGH" : "LOW");
- if(changed & GLED) printf("[C] GLED: %s\n", data & GLED ? "HIGH" : "LOW");
- if(changed & DETECT) printf("[C] DETECT: %s\n", data & DETECT ? "HIGH" : "LOW");
+ printf("[%08X] ", m_maincpu->m_shifted_pc);
+ if(changed & EX2_1280) printf("[C] EX2_1280: %s\n", data & EX2_1280 ? "HIGH" : "LOW");
+ if(changed & EX1_1280) printf("[C] EX1_1280: %s\n", data & EX1_1280 ? "HIGH" : "LOW");
+ if(changed & LCD_CLK) printf("[C] LCD_CLK: %s\n", data & LCD_CLK ? "HIGH" : "LOW");
+ if(changed & LCD_DATA) printf("[C] LCD_DATA: %s\n", data & LCD_DATA ? "HIGH" : "LOW");
+ if(changed & LCD_STROBE) printf("[C] LCD_STROBE: %s\n", data & LCD_STROBE ? "HIGH" : "LOW");
+ if(changed & RLED) printf("[C] RLED: %s\n", data & RLED ? "HIGH" : "LOW");
+ if(changed & GLED) printf("[C] GLED: %s\n", data & GLED ? "HIGH" : "LOW");
+ if(changed & DETECT) printf("[C] DETECT: %s\n", data & DETECT ? "HIGH" : "LOW");
#endif
- if (changed & LCD_CLK){
- /* The LCD is interfaced by an 8-bit shift register (74HC4094). */
- if (data & LCD_CLK){//CLK positive edge
- shift_register_value = (shift_register_value << 1) | ((data & LCD_DATA) >> 3);
- //printf("[%08X] ", m_maincpu->m_shifted_pc);
- //printf("[C] LCD CLK positive edge. shift_register=0x%02X\n", shift_register_value);
- }
- }
-
- if(changed & LCD_STROBE){
- if (data & LCD_STROBE){ //STROBE positive edge
- bool RS = (shift_register_value >> 1) & 1;
- bool RW = (shift_register_value >> 2) & 1;
- bool enable = (shift_register_value >> 3) & 1;
- UINT8 lcd_data = shift_register_value & 0xF0;
-
- if (enable && RW==0){
- if (RS==0){
- m_lcdc->control_write(space, 0, lcd_data);
- } else {
- m_lcdc->data_write(space, 0, lcd_data);
- }
- }
- }
- }
- m_port_c = data;
-
- break;
- }
- case AVR8_IO_PORTD:
- {
- if (data == m_port_d) break;
+ if (changed & LCD_CLK){
+ /* The LCD is interfaced by an 8-bit shift register (74HC4094). */
+ if (data & LCD_CLK){//CLK positive edge
+ shift_register_value = (shift_register_value << 1) | ((data & LCD_DATA) >> 3);
+ //printf("[%08X] ", m_maincpu->m_shifted_pc);
+ //printf("[C] LCD CLK positive edge. shift_register=0x%02X\n", shift_register_value);
+ }
+ }
+
+ if(changed & LCD_STROBE){
+ if (data & LCD_STROBE){ //STROBE positive edge
+ bool RS = (shift_register_value >> 1) & 1;
+ bool RW = (shift_register_value >> 2) & 1;
+ bool enable = (shift_register_value >> 3) & 1;
+ UINT8 lcd_data = shift_register_value & 0xF0;
+
+ if (enable && RW==0){
+ if (RS==0){
+ m_lcdc->control_write(space, 0, lcd_data);
+ } else {
+ m_lcdc->data_write(space, 0, lcd_data);
+ }
+ }
+ }
+ }
+ m_port_c = data;
+
+ break;
+ }
+ case AVR8_IO_PORTD:
+ {
+ if (data == m_port_d) break;
#if LOG_PORTS
- UINT8 old_port_d = m_port_d;
- UINT8 changed = data ^ old_port_d;
-
- printf("[%08X] ", m_maincpu->m_shifted_pc);
- if(changed & PORTD_SCL) printf("[D] PORTD_SCL: %s\n", data & PORTD_SCL ? "HIGH" : "LOW");
- if(changed & PORTD_SDA) printf("[D] PORTD_SDA: %s\n", data & PORTD_SDA ? "HIGH" : "LOW");
- if(changed & EX_RX_1280) printf("[D] EX_RX_1280: %s\n", data & EX_RX_1280 ? "HIGH" : "LOW");
- if(changed & EX_TX_1280) printf("[D] EX_TX_1280: %s\n", data & EX_TX_1280 ? "HIGH" : "LOW");
+ UINT8 old_port_d = m_port_d;
+ UINT8 changed = data ^ old_port_d;
+
+ printf("[%08X] ", m_maincpu->m_shifted_pc);
+ if(changed & PORTD_SCL) printf("[D] PORTD_SCL: %s\n", data & PORTD_SCL ? "HIGH" : "LOW");
+ if(changed & PORTD_SDA) printf("[D] PORTD_SDA: %s\n", data & PORTD_SDA ? "HIGH" : "LOW");
+ if(changed & EX_RX_1280) printf("[D] EX_RX_1280: %s\n", data & EX_RX_1280 ? "HIGH" : "LOW");
+ if(changed & EX_TX_1280) printf("[D] EX_TX_1280: %s\n", data & EX_TX_1280 ? "HIGH" : "LOW");
#endif
- m_port_d = data;
- break;
- }
- case AVR8_IO_PORTE:
- {
- if (data == m_port_e) break;
+ m_port_d = data;
+ break;
+ }
+ case AVR8_IO_PORTE:
+ {
+ if (data == m_port_e) break;
#if LOG_PORTS
- UINT8 old_port_e = m_port_e;
- UINT8 changed = data ^ old_port_e;
-
- printf("[%08X] ", m_maincpu->m_shifted_pc);
- if(changed & RX_1280) printf("[E] 1280-RX: %s\n", data & RX_1280 ? "HIGH" : "LOW");
- if(changed & TX_1280) printf("[E] 1280-TX: %s\n", data & TX_1280 ? "HIGH" : "LOW");
- if(changed & THERMO_SCK) printf("[E] THERMO-SCK: %s\n", data & THERMO_SCK ? "HIGH" : "LOW");
- if(changed & THERMO_CS1) printf("[E] THERMO-CS1: %s\n", data & THERMO_CS1 ? "HIGH" : "LOW");
- if(changed & THERMO_CS2) printf("[E] THERMO-CS2: %s\n", data & THERMO_CS2 ? "HIGH" : "LOW");
- if(changed & THERMO_DO) printf("[E] THERMO-DO: %s\n", data & THERMO_DO ? "HIGH" : "LOW");
+ UINT8 old_port_e = m_port_e;
+ UINT8 changed = data ^ old_port_e;
+
+ printf("[%08X] ", m_maincpu->m_shifted_pc);
+ if(changed & RX_1280) printf("[E] 1280-RX: %s\n", data & RX_1280 ? "HIGH" : "LOW");
+ if(changed & TX_1280) printf("[E] 1280-TX: %s\n", data & TX_1280 ? "HIGH" : "LOW");
+ if(changed & THERMO_SCK) printf("[E] THERMO-SCK: %s\n", data & THERMO_SCK ? "HIGH" : "LOW");
+ if(changed & THERMO_CS1) printf("[E] THERMO-CS1: %s\n", data & THERMO_CS1 ? "HIGH" : "LOW");
+ if(changed & THERMO_CS2) printf("[E] THERMO-CS2: %s\n", data & THERMO_CS2 ? "HIGH" : "LOW");
+ if(changed & THERMO_DO) printf("[E] THERMO-DO: %s\n", data & THERMO_DO ? "HIGH" : "LOW");
#endif
- m_port_e = data;
- break;
- }
- case AVR8_IO_PORTF:
- {
- if (data == m_port_f) break;
+ m_port_e = data;
+ break;
+ }
+ case AVR8_IO_PORTF:
+ {
+ if (data == m_port_f) break;
#if LOG_PORTS
- UINT8 old_port_f = m_port_f;
- UINT8 changed = data ^ old_port_f;
-
- printf("[%08X] ", m_maincpu->m_shifted_pc);
- if(changed & X_AXIS_DIR) printf("[F] X_AXIS_DIR: %s\n", data & X_AXIS_DIR ? "HIGH" : "LOW");
- if(changed & X_AXIS_STEP) printf("[F] X_AXIS_STEP: %s\n", data & X_AXIS_STEP ? "HIGH" : "LOW");
- if(changed & X_AXIS_EN) printf("[F] X_AXIS_EN: %s\n", data & X_AXIS_EN ? "HIGH" : "LOW");
- if(changed & X_AXIS_POT) printf("[F] X_AXIS_POT: %s\n", data & X_AXIS_POT ? "HIGH" : "LOW");
- if(changed & Y_AXIS_DIR) printf("[F] Y_AXIS_DIR: %s\n", data & Y_AXIS_DIR ? "HIGH" : "LOW");
- if(changed & Y_AXIS_STEP) printf("[F] Y_AXIS_STEP: %s\n", data & Y_AXIS_STEP ? "HIGH" : "LOW");
- if(changed & Y_AXIS_EN) printf("[F] Y_AXIS_EN: %s\n", data & Y_AXIS_EN ? "HIGH" : "LOW");
- if(changed & Y_AXIS_POT) printf("[F] Y_AXIS_POT: %s\n", data & Y_AXIS_POT ? "HIGH" : "LOW");
+ UINT8 old_port_f = m_port_f;
+ UINT8 changed = data ^ old_port_f;
+
+ printf("[%08X] ", m_maincpu->m_shifted_pc);
+ if(changed & X_AXIS_DIR) printf("[F] X_AXIS_DIR: %s\n", data & X_AXIS_DIR ? "HIGH" : "LOW");
+ if(changed & X_AXIS_STEP) printf("[F] X_AXIS_STEP: %s\n", data & X_AXIS_STEP ? "HIGH" : "LOW");
+ if(changed & X_AXIS_EN) printf("[F] X_AXIS_EN: %s\n", data & X_AXIS_EN ? "HIGH" : "LOW");
+ if(changed & X_AXIS_POT) printf("[F] X_AXIS_POT: %s\n", data & X_AXIS_POT ? "HIGH" : "LOW");
+ if(changed & Y_AXIS_DIR) printf("[F] Y_AXIS_DIR: %s\n", data & Y_AXIS_DIR ? "HIGH" : "LOW");
+ if(changed & Y_AXIS_STEP) printf("[F] Y_AXIS_STEP: %s\n", data & Y_AXIS_STEP ? "HIGH" : "LOW");
+ if(changed & Y_AXIS_EN) printf("[F] Y_AXIS_EN: %s\n", data & Y_AXIS_EN ? "HIGH" : "LOW");
+ if(changed & Y_AXIS_POT) printf("[F] Y_AXIS_POT: %s\n", data & Y_AXIS_POT ? "HIGH" : "LOW");
#endif
- m_port_f = data;
- break;
- }
- case AVR8_IO_PORTG:
- {
- if (data == m_port_g) break;
+ m_port_f = data;
+ break;
+ }
+ case AVR8_IO_PORTG:
+ {
+ if (data == m_port_g) break;
- UINT8 old_port_g = m_port_g;
- UINT8 changed = data ^ old_port_g;
+ UINT8 old_port_g = m_port_g;
+ UINT8 changed = data ^ old_port_g;
#if LOG_PORTS
- printf("[%08X] ", m_maincpu->m_shifted_pc);
- if(changed & EX4_1280) printf("[G] EX4_1280: %s\n", data & EX4_1280 ? "HIGH" : "LOW");
- if(changed & EX3_1280) printf("[G] EX3_1280: %s\n", data & EX3_1280 ? "HIGH" : "LOW");
- if(changed & B_AXIS_EN) printf("[G] B_AXIS_EN: %s\n", data & B_AXIS_EN ? "HIGH" : "LOW");
- if(changed & CUTOFF_SR_CHECK) printf("[G] CUTOFF_SR_CHECK: %s\n", data & CUTOFF_SR_CHECK ? "HIGH" : "LOW");
- if(changed & BUZZ) printf("[G] BUZZ: %s\n", data & BUZZ ? "HIGH" : "LOW");
+ printf("[%08X] ", m_maincpu->m_shifted_pc);
+ if(changed & EX4_1280) printf("[G] EX4_1280: %s\n", data & EX4_1280 ? "HIGH" : "LOW");
+ if(changed & EX3_1280) printf("[G] EX3_1280: %s\n", data & EX3_1280 ? "HIGH" : "LOW");
+ if(changed & B_AXIS_EN) printf("[G] B_AXIS_EN: %s\n", data & B_AXIS_EN ? "HIGH" : "LOW");
+ if(changed & CUTOFF_SR_CHECK) printf("[G] CUTOFF_SR_CHECK: %s\n", data & CUTOFF_SR_CHECK ? "HIGH" : "LOW");
+ if(changed & BUZZ) printf("[G] BUZZ: %s\n", data & BUZZ ? "HIGH" : "LOW");
#endif
- if(changed & BUZZ){
- /* FIX-ME: What is the largest sample value allowed?
- I'm using 0x3F based on what I see in src/mame/drivers/craft.c
- But as the method is called "write_unsigned8", I guess we could have samples with values up to 0xFF, right?
- Anyway... With the 0x3F value we'll get a sound that is not so loud, which may be less annoying... :-)
- */
- UINT8 audio_sample = (data & BUZZ) ? 0x3F : 0;
- m_dac->write_unsigned8(audio_sample << 1);
- }
-
- m_port_g = data;
- break;
- }
- case AVR8_IO_PORTH:
- {
- if (data == m_port_h) break;
+ if(changed & BUZZ){
+ /* FIX-ME: What is the largest sample value allowed?
+ I'm using 0x3F based on what I see in src/mame/drivers/craft.c
+ But as the method is called "write_unsigned8", I guess we could have samples with values up to 0xFF, right?
+ Anyway... With the 0x3F value we'll get a sound that is not so loud, which may be less annoying... :-)
+ */
+ UINT8 audio_sample = (data & BUZZ) ? 0x3F : 0;
+ m_dac->write_unsigned8(audio_sample << 1);
+ }
+
+ m_port_g = data;
+ break;
+ }
+ case AVR8_IO_PORTH:
+ {
+ if (data == m_port_h) break;
#if LOG_PORTS
- UINT8 old_port_h = m_port_h;
- UINT8 changed = data ^ old_port_h;
-
- printf("[%08X] ", m_maincpu->m_shifted_pc);
- if(changed & CUTOFF_TEST) printf("[H] CUTOFF_TEST: %s\n", data & CUTOFF_TEST ? "HIGH" : "LOW");
- if(changed & CUTOFF_RESET) printf("[H] CUTOFF_RESET: %s\n", data & CUTOFF_RESET ? "HIGH" : "LOW");
- if(changed & EX1_PWR_CHECK) printf("[H] EX1_PWR_CHECK: %s\n", data & EX1_PWR_CHECK ? "HIGH" : "LOW");
- if(changed & EX1_HEAT) printf("[H] EX1_HEAT: %s\n", data & EX1_HEAT ? "HIGH" : "LOW");
- if(changed & EX1_FAN) printf("[H] EX1_FAN: %s\n", data & EX1_FAN ? "HIGH" : "LOW");
- if(changed & SD_WP) printf("[H] SD_WP: %s\n", data & SD_WP ? "HIGH" : "LOW");
- if(changed & SD_CD) printf("[H] SD_CD: %s\n", data & SD_CD ? "HIGH" : "LOW");
+ UINT8 old_port_h = m_port_h;
+ UINT8 changed = data ^ old_port_h;
+
+ printf("[%08X] ", m_maincpu->m_shifted_pc);
+ if(changed & CUTOFF_TEST) printf("[H] CUTOFF_TEST: %s\n", data & CUTOFF_TEST ? "HIGH" : "LOW");
+ if(changed & CUTOFF_RESET) printf("[H] CUTOFF_RESET: %s\n", data & CUTOFF_RESET ? "HIGH" : "LOW");
+ if(changed & EX1_PWR_CHECK) printf("[H] EX1_PWR_CHECK: %s\n", data & EX1_PWR_CHECK ? "HIGH" : "LOW");
+ if(changed & EX1_HEAT) printf("[H] EX1_HEAT: %s\n", data & EX1_HEAT ? "HIGH" : "LOW");
+ if(changed & EX1_FAN) printf("[H] EX1_FAN: %s\n", data & EX1_FAN ? "HIGH" : "LOW");
+ if(changed & SD_WP) printf("[H] SD_WP: %s\n", data & SD_WP ? "HIGH" : "LOW");
+ if(changed & SD_CD) printf("[H] SD_CD: %s\n", data & SD_CD ? "HIGH" : "LOW");
#endif
- m_port_h = data;
- break;
- }
- case AVR8_IO_PORTJ:
- {
- if (data == m_port_j) break;
+ m_port_h = data;
+ break;
+ }
+ case AVR8_IO_PORTJ:
+ {
+ if (data == m_port_j) break;
#if LOG_PORTS
- UINT8 old_port_j = m_port_j;
- UINT8 changed = data ^ old_port_j;
-
- printf("[%08X] ", m_maincpu->m_shifted_pc);
- if(changed & BUTTON_CENTER) printf("[J] BUTTON_CENTER: %s\n", data & BUTTON_CENTER ? "HIGH" : "LOW");
- if(changed & BUTTON_RIGHT) printf("[J] BUTTON_RIGHT: %s\n", data & BUTTON_RIGHT ? "HIGH" : "LOW");
- if(changed & BUTTON_LEFT) printf("[J] BUTTON_LEFT: %s\n", data & BUTTON_LEFT ? "HIGH" : "LOW");
- if(changed & BUTTON_DOWN) printf("[J] BUTTON_DOWN: %s\n", data & BUTTON_DOWN ? "HIGH" : "LOW");
- if(changed & BUTTON_UP) printf("[J] BUTTON_UP: %s\n", data & BUTTON_UP ? "HIGH" : "LOW");
- if(changed & POTS_SCL) printf("[J] POTS_SCL: %s\n", data & POTS_SCL ? "HIGH" : "LOW");
- if(changed & B_AXIS_POT) printf("[J] B_AXIS_POT: %s\n", data & B_AXIS_POT ? "HIGH" : "LOW");
+ UINT8 old_port_j = m_port_j;
+ UINT8 changed = data ^ old_port_j;
+
+ printf("[%08X] ", m_maincpu->m_shifted_pc);
+ if(changed & BUTTON_CENTER) printf("[J] BUTTON_CENTER: %s\n", data & BUTTON_CENTER ? "HIGH" : "LOW");
+ if(changed & BUTTON_RIGHT) printf("[J] BUTTON_RIGHT: %s\n", data & BUTTON_RIGHT ? "HIGH" : "LOW");
+ if(changed & BUTTON_LEFT) printf("[J] BUTTON_LEFT: %s\n", data & BUTTON_LEFT ? "HIGH" : "LOW");
+ if(changed & BUTTON_DOWN) printf("[J] BUTTON_DOWN: %s\n", data & BUTTON_DOWN ? "HIGH" : "LOW");
+ if(changed & BUTTON_UP) printf("[J] BUTTON_UP: %s\n", data & BUTTON_UP ? "HIGH" : "LOW");
+ if(changed & POTS_SCL) printf("[J] POTS_SCL: %s\n", data & POTS_SCL ? "HIGH" : "LOW");
+ if(changed & B_AXIS_POT) printf("[J] B_AXIS_POT: %s\n", data & B_AXIS_POT ? "HIGH" : "LOW");
#endif
- m_port_j = data;
- break;
- }
- case AVR8_IO_PORTK:
- {
- if (data == m_port_k) break;
+ m_port_j = data;
+ break;
+ }
+ case AVR8_IO_PORTK:
+ {
+ if (data == m_port_k) break;
#if LOG_PORTS
- UINT8 old_port_k = m_port_k;
- UINT8 changed = data ^ old_port_k;
-
- printf("[%08X] ", m_maincpu->m_shifted_pc);
- if(changed & Z_AXIS_DIR) printf("[K] Z_AXIS_DIR: %s\n", data & Z_AXIS_DIR ? "HIGH" : "LOW");
- if(changed & Z_AXIS_STEP) printf("[K] Z_AXIS_STEP: %s\n", data & Z_AXIS_STEP ? "HIGH" : "LOW");
- if(changed & Z_AXIS_EN) printf("[K] Z_AXIS_EN: %s\n", data & Z_AXIS_EN ? "HIGH" : "LOW");
- if(changed & Z_AXIS_POT) printf("[K] Z_AXIS_POT: %s\n", data & Z_AXIS_POT ? "HIGH" : "LOW");
- if(changed & EX7_1280) printf("[K] EX7_1280: %s\n", data & EX7_1280 ? "HIGH" : "LOW");
- if(changed & EX6_1280) printf("[K] EX6_1280: %s\n", data & EX6_1280 ? "HIGH" : "LOW");
- if(changed & EX5_1280) printf("[K] EX5_1280: %s\n", data & EX5_1280 ? "HIGH" : "LOW");
- if(changed & HBP_THERM) printf("[K] HBP_THERM: %s\n", data & HBP_THERM ? "HIGH" : "LOW");
+ UINT8 old_port_k = m_port_k;
+ UINT8 changed = data ^ old_port_k;
+
+ printf("[%08X] ", m_maincpu->m_shifted_pc);
+ if(changed & Z_AXIS_DIR) printf("[K] Z_AXIS_DIR: %s\n", data & Z_AXIS_DIR ? "HIGH" : "LOW");
+ if(changed & Z_AXIS_STEP) printf("[K] Z_AXIS_STEP: %s\n", data & Z_AXIS_STEP ? "HIGH" : "LOW");
+ if(changed & Z_AXIS_EN) printf("[K] Z_AXIS_EN: %s\n", data & Z_AXIS_EN ? "HIGH" : "LOW");
+ if(changed & Z_AXIS_POT) printf("[K] Z_AXIS_POT: %s\n", data & Z_AXIS_POT ? "HIGH" : "LOW");
+ if(changed & EX7_1280) printf("[K] EX7_1280: %s\n", data & EX7_1280 ? "HIGH" : "LOW");
+ if(changed & EX6_1280) printf("[K] EX6_1280: %s\n", data & EX6_1280 ? "HIGH" : "LOW");
+ if(changed & EX5_1280) printf("[K] EX5_1280: %s\n", data & EX5_1280 ? "HIGH" : "LOW");
+ if(changed & HBP_THERM) printf("[K] HBP_THERM: %s\n", data & HBP_THERM ? "HIGH" : "LOW");
#endif
- m_port_k = data;
- break;
- }
- case AVR8_IO_PORTL:
- {
- if (data == m_port_l) break;
+ m_port_k = data;
+ break;
+ }
+ case AVR8_IO_PORTL:
+ {
+ if (data == m_port_l) break;
#if LOG_PORTS
- UINT8 old_port_l = m_port_l;
- UINT8 changed = data ^ old_port_l;
-
- printf("[%08X] ", m_maincpu->m_shifted_pc);
- if(changed & X_MIN) printf("[L] X_MIN: %s\n", data & X_MIN ? "HIGH" : "LOW");
- if(changed & X_MAX) printf("[L] X_MAX: %s\n", data & X_MAX ? "HIGH" : "LOW");
- if(changed & Y_MIN) printf("[L] Y_MIN: %s\n", data & Y_MIN ? "HIGH" : "LOW");
- if(changed & Y_MAX) printf("[L] Y_MAX: %s\n", data & Y_MAX ? "HIGH" : "LOW");
- if(changed & HBP) printf("[L] HBP: %s\n", data & HBP ? "HIGH" : "LOW");
- if(changed & EXTRA_FET) printf("[L] EXTRA_FET: %s\n", data & EXTRA_FET ? "HIGH" : "LOW");
- if(changed & Z_MIN) printf("[L] Z_MIN: %s\n", data & Z_MIN ? "HIGH" : "LOW");
- if(changed & Z_MAX) printf("[L] Z_MAX: %s\n", data & Z_MAX ? "HIGH" : "LOW");
+ UINT8 old_port_l = m_port_l;
+ UINT8 changed = data ^ old_port_l;
+
+ printf("[%08X] ", m_maincpu->m_shifted_pc);
+ if(changed & X_MIN) printf("[L] X_MIN: %s\n", data & X_MIN ? "HIGH" : "LOW");
+ if(changed & X_MAX) printf("[L] X_MAX: %s\n", data & X_MAX ? "HIGH" : "LOW");
+ if(changed & Y_MIN) printf("[L] Y_MIN: %s\n", data & Y_MIN ? "HIGH" : "LOW");
+ if(changed & Y_MAX) printf("[L] Y_MAX: %s\n", data & Y_MAX ? "HIGH" : "LOW");
+ if(changed & HBP) printf("[L] HBP: %s\n", data & HBP ? "HIGH" : "LOW");
+ if(changed & EXTRA_FET) printf("[L] EXTRA_FET: %s\n", data & EXTRA_FET ? "HIGH" : "LOW");
+ if(changed & Z_MIN) printf("[L] Z_MIN: %s\n", data & Z_MIN ? "HIGH" : "LOW");
+ if(changed & Z_MAX) printf("[L] Z_MAX: %s\n", data & Z_MAX ? "HIGH" : "LOW");
#endif
- m_port_l = data;
- break;
- }
- }
+ m_port_l = data;
+ break;
+ }
+ }
}
/****************************************************\
@@ -532,15 +532,15 @@ WRITE8_MEMBER(replicator_state::port_w)
\****************************************************/
static ADDRESS_MAP_START( replicator_prg_map, AS_PROGRAM, 8, replicator_state )
- AM_RANGE(0x0000, 0x1FFFF) AM_ROM
+ AM_RANGE(0x0000, 0x1FFFF) AM_ROM
ADDRESS_MAP_END
static ADDRESS_MAP_START( replicator_data_map, AS_DATA, 8, replicator_state )
- AM_RANGE(0x0200, 0x21FF) AM_RAM /* ATMEGA1280 Internal SRAM */
+ AM_RANGE(0x0200, 0x21FF) AM_RAM /* ATMEGA1280 Internal SRAM */
ADDRESS_MAP_END
static ADDRESS_MAP_START( replicator_io_map, AS_IO, 8, replicator_state )
- AM_RANGE(AVR8_IO_PORTA, AVR8_IO_PORTL) AM_READWRITE( port_r, port_w )
+ AM_RANGE(AVR8_IO_PORTA, AVR8_IO_PORTL) AM_READWRITE( port_r, port_w )
ADDRESS_MAP_END
/****************************************************\
@@ -548,12 +548,12 @@ ADDRESS_MAP_END
\****************************************************/
static INPUT_PORTS_START( replicator )
- PORT_START("keypad")
- PORT_BIT(0x00000001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("CENTER") PORT_CODE(KEYCODE_M)
- PORT_BIT(0x00000002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RIGHT") PORT_CODE(KEYCODE_D)
- PORT_BIT(0x00000004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("LEFT") PORT_CODE(KEYCODE_A)
- PORT_BIT(0x00000008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("DOWN") PORT_CODE(KEYCODE_S)
- PORT_BIT(0x00000010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("UP") PORT_CODE(KEYCODE_W)
+ PORT_START("keypad")
+ PORT_BIT(0x00000001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("CENTER") PORT_CODE(KEYCODE_M)
+ PORT_BIT(0x00000002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RIGHT") PORT_CODE(KEYCODE_D)
+ PORT_BIT(0x00000004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("LEFT") PORT_CODE(KEYCODE_A)
+ PORT_BIT(0x00000008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("DOWN") PORT_CODE(KEYCODE_S)
+ PORT_BIT(0x00000010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("UP") PORT_CODE(KEYCODE_W)
INPUT_PORTS_END
/****************************************************\
@@ -566,161 +566,161 @@ DRIVER_INIT_MEMBER(replicator_state, replicator)
void replicator_state::machine_reset()
{
- shift_register_value = 0;
- m_port_a = 0;
- m_port_b = 0;
- m_port_c = 0;
- m_port_d = 0;
- m_port_e = 0;
- m_port_f = 0;
- m_port_g = 0;
- m_port_h = 0;
- m_port_j = 0;
- m_port_k = 0;
- m_port_l = 0;
+ shift_register_value = 0;
+ m_port_a = 0;
+ m_port_b = 0;
+ m_port_c = 0;
+ m_port_d = 0;
+ m_port_e = 0;
+ m_port_f = 0;
+ m_port_g = 0;
+ m_port_h = 0;
+ m_port_j = 0;
+ m_port_k = 0;
+ m_port_l = 0;
}
PALETTE_INIT_MEMBER(replicator_state, replicator)
{
//These colors were picked with the color picker in Inkscape, based on a photo of the LCD used in the Replicator 1 3d printer:
- palette.set_pen_color(0, rgb_t(0xCA, 0xE7, 0xEB));
- palette.set_pen_color(1, rgb_t(0x78, 0xAB, 0xA8));
+ palette.set_pen_color(0, rgb_t(0xCA, 0xE7, 0xEB));
+ palette.set_pen_color(1, rgb_t(0x78, 0xAB, 0xA8));
}
static const gfx_layout hd44780_charlayout =
{
- 5, 8, /* 5 x 8 characters */
- 256, /* 256 characters */
- 1, /* 1 bits per pixel */
- { 0 }, /* no bitplanes */
- { 3, 4, 5, 6, 7},
- { 0, 8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8},
- 8*8 /* 8 bytes */
+ 5, 8, /* 5 x 8 characters */
+ 256, /* 256 characters */
+ 1, /* 1 bits per pixel */
+ { 0 }, /* no bitplanes */
+ { 3, 4, 5, 6, 7},
+ { 0, 8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8},
+ 8*8 /* 8 bytes */
};
static GFXDECODE_START( replicator )
- GFXDECODE_ENTRY( "hd44780:cgrom", 0x0000, hd44780_charlayout, 0, 1 )
+ GFXDECODE_ENTRY( "hd44780:cgrom", 0x0000, hd44780_charlayout, 0, 1 )
GFXDECODE_END
static MACHINE_CONFIG_START( replicator, replicator_state )
- MCFG_CPU_ADD("maincpu", ATMEGA1280, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(replicator_prg_map)
- MCFG_CPU_DATA_MAP(replicator_data_map)
- MCFG_CPU_IO_MAP(replicator_io_map)
-
- MCFG_CPU_AVR8_EEPROM("eeprom")
- MCFG_CPU_AVR8_LFUSE(0xFF)
- MCFG_CPU_AVR8_HFUSE(0xDA)
- MCFG_CPU_AVR8_EFUSE(0xF4)
- MCFG_CPU_AVR8_LOCK(0x0F)
-
- /*TODO: Add an ATMEGA8U2 for USB-Serial communications */
-
- /* video hardware */
- MCFG_SCREEN_ADD("screen", LCD)
- MCFG_SCREEN_REFRESH_RATE(50)
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
- MCFG_SCREEN_UPDATE_DEVICE("hd44780", hd44780_device, screen_update)
- MCFG_SCREEN_SIZE(120, 18*2) //4x20 chars
- MCFG_SCREEN_VISIBLE_AREA(0, 120-1, 0, 18*2-1)
- MCFG_SCREEN_PALETTE("palette")
-
- MCFG_PALETTE_ADD("palette", 2)
- MCFG_PALETTE_INIT_OWNER(replicator_state, replicator)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", replicator)
- MCFG_DEFAULT_LAYOUT(layout_lcd)
-
- MCFG_HD44780_ADD("hd44780")
- MCFG_HD44780_LCD_SIZE(4, 20)
-
- /* sound hardware */
- /* A piezo is connected to the PORT G bit 5 (OC0B pin driven by Timer/Counter #4) */
- MCFG_SPEAKER_STANDARD_MONO("buzzer")
- MCFG_SOUND_ADD("dac", DAC, 0)
- MCFG_SOUND_ROUTE(0, "buzzer", 1.00)
+ MCFG_CPU_ADD("maincpu", ATMEGA1280, MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(replicator_prg_map)
+ MCFG_CPU_DATA_MAP(replicator_data_map)
+ MCFG_CPU_IO_MAP(replicator_io_map)
+
+ MCFG_CPU_AVR8_EEPROM("eeprom")
+ MCFG_CPU_AVR8_LFUSE(0xFF)
+ MCFG_CPU_AVR8_HFUSE(0xDA)
+ MCFG_CPU_AVR8_EFUSE(0xF4)
+ MCFG_CPU_AVR8_LOCK(0x0F)
+
+ /*TODO: Add an ATMEGA8U2 for USB-Serial communications */
+
+ /* video hardware */
+ MCFG_SCREEN_ADD("screen", LCD)
+ MCFG_SCREEN_REFRESH_RATE(50)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
+ MCFG_SCREEN_UPDATE_DEVICE("hd44780", hd44780_device, screen_update)
+ MCFG_SCREEN_SIZE(120, 18*2) //4x20 chars
+ MCFG_SCREEN_VISIBLE_AREA(0, 120-1, 0, 18*2-1)
+ MCFG_SCREEN_PALETTE("palette")
+
+ MCFG_PALETTE_ADD("palette", 2)
+ MCFG_PALETTE_INIT_OWNER(replicator_state, replicator)
+ MCFG_GFXDECODE_ADD("gfxdecode", "palette", replicator)
+ MCFG_DEFAULT_LAYOUT(layout_lcd)
+
+ MCFG_HD44780_ADD("hd44780")
+ MCFG_HD44780_LCD_SIZE(4, 20)
+
+ /* sound hardware */
+ /* A piezo is connected to the PORT G bit 5 (OC0B pin driven by Timer/Counter #4) */
+ MCFG_SPEAKER_STANDARD_MONO("buzzer")
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "buzzer", 1.00)
MACHINE_CONFIG_END
ROM_START( replica1 )
- ROM_REGION( 0x20000, "maincpu", 0 )
- ROM_DEFAULT_BIOS("v750")
-
- /* Version 5.1 release:
- - Initial firmware release
- */
- ROM_SYSTEM_BIOS( 0, "v51", "V 5.1" )
- ROMX_LOAD("mighty-mb40-v5.1.bin", 0x0000, 0x10b90, CRC(20d65cd1) SHA1(da18c3eb5a29a6bc1eecd92eaae6063fe29d0305), ROM_BIOS(1))
-
- /* Version 5.2 release:
- - Nozzle Tolerance added to EEPROM
- - Updated onboard menus
- - X,Y calibration tool added
- */
- ROM_SYSTEM_BIOS( 1, "v52", "V 5.2" )
- ROMX_LOAD("mighty-mb40-v5.2.bin", 0x0000, 0x126c4, CRC(555e47cf) SHA1(9d24a3dbeddce16669bb4d29c3366220ddf15d2a), ROM_BIOS(2))
-
- /* Version 5.5 release:
- - Acceleration added to motor motion
- - Digipot updates
- */
- ROM_SYSTEM_BIOS( 2, "v55", "V 5.5" )
- ROMX_LOAD("mighty-mb40-v5.5.bin", 0x0000, 0x1a420, CRC(9327d7e4) SHA1(d734ba2bda12f50ec3ac0035ab11591909d9edde), ROM_BIOS(3))
-
- /* Version 6.2.0 release:
- - Bug fix release to firmware 6.0
- - Addresses wavy print issue above 1cm
- - Left extruder prints with makerware.
- */
- ROM_SYSTEM_BIOS( 3, "v620", "V 6.2.0" )
- ROMX_LOAD("mighty_one_v6.2.0.bin", 0x0000, 0x1cf54, CRC(00df6f48) SHA1(db05afc2e1ebc104fb04753634a911187e396556), ROM_BIOS(4))
-
- /* Version 7.0.0 release:
- - Major upgrade to Stepper Motor Smoothness (via Sailfish team)
- - X3G format introduced
- - Heaters default to leaving 'preheat' on more of the time
- */
- ROM_SYSTEM_BIOS( 4, "v700", "V 7.0.0" )
- ROMX_LOAD("mighty_one_v7.0.0.bin", 0x0000, 0x1cb52, CRC(aa2a5fcf) SHA1(934e642b0b2d007689249680bad03c9255ae016a), ROM_BIOS(5))
-
- /* Version 7.2.0 release:
- - Removes support for S3G files
- - X3G is the recognized format
- - Minor bug fixes
- */
- ROM_SYSTEM_BIOS( 5, "v720", "V 7.2.0" )
- ROMX_LOAD("mighty_one_v7.2.0.bin", 0x0000, 0x1cb80, CRC(5e546706) SHA1(ed4aaf7522d5a5beea7eb69bf2c85d7a89f8f188), ROM_BIOS(6))
-
- /* Version 7.3.0 release:
- - Pause at Z Height
- - Elapsed time displays during prints
- - Minor bug fixes
- */
- ROM_SYSTEM_BIOS( 6, "v730", "V 7.3.0" )
- ROMX_LOAD("mighty_one_v7.3.0.bin", 0x0000, 0x1d738, CRC(71811ff5) SHA1(6728ea600ab3ff4b589adca90b0d700d9b70bd18), ROM_BIOS(7))
-
- /* Version 7.4.0 (bugfix) release:
- - Fixes issues with Z Pause and elapsed print time
- */
- ROM_SYSTEM_BIOS( 7, "v740", "V 7.4.0" )
- ROMX_LOAD("mighty_one_v7.4.0.bin", 0x0000, 0x1b9e2, CRC(97b05a27) SHA1(76ca2c9c1db2e006e501c3177a8a1aa693dda0f9), ROM_BIOS(8))
-
- /* Version 7.5.0 (bugfix) release:
- - Fixes issue with Heat Hold
- */
- ROM_SYSTEM_BIOS( 8, "v750", "V 7.5.0" )
- ROMX_LOAD("mighty_one_v7.5.0.bin", 0x0000, 0x1b9c4, CRC(169d6709) SHA1(62b5aacd1bc46969042aea7a50531ec467a4ff1f), ROM_BIOS(9))
-
- /* Sailfish firmware image - Metam??quina experimental build v7.5.0 */
- ROM_SYSTEM_BIOS( 9, "v750mm", "V 7.5.0 - Metam??quina" )
- ROMX_LOAD("mighty_one_v7.5.0.mm.bin", 0x0000, 0x1ef9a, CRC(0d36d9e7) SHA1(a53899775b4c4eea87b6903758ebb75f06710a69), ROM_BIOS(10))
-
-
- /*Arduino MEGA bootloader */
- ROM_LOAD( "atmegaboot_168_atmega1280.bin", 0x1f000, 0x0f16, CRC(c041f8db) SHA1(d995ebf360a264cccacec65f6dc0c2257a3a9224) )
-
- /* on-die 4kbyte eeprom */
- ROM_REGION( 0x1000, "eeprom", ROMREGION_ERASEFF )
+ ROM_REGION( 0x20000, "maincpu", 0 )
+ ROM_DEFAULT_BIOS("v750")
+
+ /* Version 5.1 release:
+ - Initial firmware release
+ */
+ ROM_SYSTEM_BIOS( 0, "v51", "V 5.1" )
+ ROMX_LOAD("mighty-mb40-v5.1.bin", 0x0000, 0x10b90, CRC(20d65cd1) SHA1(da18c3eb5a29a6bc1eecd92eaae6063fe29d0305), ROM_BIOS(1))
+
+ /* Version 5.2 release:
+ - Nozzle Tolerance added to EEPROM
+ - Updated onboard menus
+ - X,Y calibration tool added
+ */
+ ROM_SYSTEM_BIOS( 1, "v52", "V 5.2" )
+ ROMX_LOAD("mighty-mb40-v5.2.bin", 0x0000, 0x126c4, CRC(555e47cf) SHA1(9d24a3dbeddce16669bb4d29c3366220ddf15d2a), ROM_BIOS(2))
+
+ /* Version 5.5 release:
+ - Acceleration added to motor motion
+ - Digipot updates
+ */
+ ROM_SYSTEM_BIOS( 2, "v55", "V 5.5" )
+ ROMX_LOAD("mighty-mb40-v5.5.bin", 0x0000, 0x1a420, CRC(9327d7e4) SHA1(d734ba2bda12f50ec3ac0035ab11591909d9edde), ROM_BIOS(3))
+
+ /* Version 6.2.0 release:
+ - Bug fix release to firmware 6.0
+ - Addresses wavy print issue above 1cm
+ - Left extruder prints with makerware.
+ */
+ ROM_SYSTEM_BIOS( 3, "v620", "V 6.2.0" )
+ ROMX_LOAD("mighty_one_v6.2.0.bin", 0x0000, 0x1cf54, CRC(00df6f48) SHA1(db05afc2e1ebc104fb04753634a911187e396556), ROM_BIOS(4))
+
+ /* Version 7.0.0 release:
+ - Major upgrade to Stepper Motor Smoothness (via Sailfish team)
+ - X3G format introduced
+ - Heaters default to leaving 'preheat' on more of the time
+ */
+ ROM_SYSTEM_BIOS( 4, "v700", "V 7.0.0" )
+ ROMX_LOAD("mighty_one_v7.0.0.bin", 0x0000, 0x1cb52, CRC(aa2a5fcf) SHA1(934e642b0b2d007689249680bad03c9255ae016a), ROM_BIOS(5))
+
+ /* Version 7.2.0 release:
+ - Removes support for S3G files
+ - X3G is the recognized format
+ - Minor bug fixes
+ */
+ ROM_SYSTEM_BIOS( 5, "v720", "V 7.2.0" )
+ ROMX_LOAD("mighty_one_v7.2.0.bin", 0x0000, 0x1cb80, CRC(5e546706) SHA1(ed4aaf7522d5a5beea7eb69bf2c85d7a89f8f188), ROM_BIOS(6))
+
+ /* Version 7.3.0 release:
+ - Pause at Z Height
+ - Elapsed time displays during prints
+ - Minor bug fixes
+ */
+ ROM_SYSTEM_BIOS( 6, "v730", "V 7.3.0" )
+ ROMX_LOAD("mighty_one_v7.3.0.bin", 0x0000, 0x1d738, CRC(71811ff5) SHA1(6728ea600ab3ff4b589adca90b0d700d9b70bd18), ROM_BIOS(7))
+
+ /* Version 7.4.0 (bugfix) release:
+ - Fixes issues with Z Pause and elapsed print time
+ */
+ ROM_SYSTEM_BIOS( 7, "v740", "V 7.4.0" )
+ ROMX_LOAD("mighty_one_v7.4.0.bin", 0x0000, 0x1b9e2, CRC(97b05a27) SHA1(76ca2c9c1db2e006e501c3177a8a1aa693dda0f9), ROM_BIOS(8))
+
+ /* Version 7.5.0 (bugfix) release:
+ - Fixes issue with Heat Hold
+ */
+ ROM_SYSTEM_BIOS( 8, "v750", "V 7.5.0" )
+ ROMX_LOAD("mighty_one_v7.5.0.bin", 0x0000, 0x1b9c4, CRC(169d6709) SHA1(62b5aacd1bc46969042aea7a50531ec467a4ff1f), ROM_BIOS(9))
+
+ /* Sailfish firmware image - Metam??quina experimental build v7.5.0 */
+ ROM_SYSTEM_BIOS( 9, "v750mm", "V 7.5.0 - Metam??quina" )
+ ROMX_LOAD("mighty_one_v7.5.0.mm.bin", 0x0000, 0x1ef9a, CRC(0d36d9e7) SHA1(a53899775b4c4eea87b6903758ebb75f06710a69), ROM_BIOS(10))
+
+
+ /*Arduino MEGA bootloader */
+ ROM_LOAD( "atmegaboot_168_atmega1280.bin", 0x1f000, 0x0f16, CRC(c041f8db) SHA1(d995ebf360a264cccacec65f6dc0c2257a3a9224) )
+
+ /* on-die 4kbyte eeprom */
+ ROM_REGION( 0x1000, "eeprom", ROMREGION_ERASEFF )
ROM_END
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c
index f738901900f..56c92e7b2e1 100644
--- a/src/mame/drivers/segac2.c
+++ b/src/mame/drivers/segac2.c
@@ -30,7 +30,7 @@
1992 Puyo Puyo Sega / Compile 317-0203 C2 171-5992A
1992 Tant-R (Japan) Sega 317-0211 C2
1992 Tant-R (Korea) Sega ? C2
- 1993 SegaSonic Popcorn Shop Sega 317-0140 C2
+ 1993 SegaSonic Popcorn Shop Sega 317-0140 C2
1994 PotoPoto (Japan) Sega 317-0218 C2
1994 Stack Columns (Japan) Sega 317-0219 C2
1994 Stack Columns (World) Sega 317-0223 C2
diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c
index 34be9d6ba5d..b2a9bb2baae 100644
--- a/src/mame/drivers/segas24.c
+++ b/src/mame/drivers/segas24.c
@@ -880,7 +880,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(segas24_state::irq_timer_cb)
if (irq_tmode == 1 || irq_tmode == 2)
{
- // m_screen->update_now();
+ // m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
}
}
diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c
index aa360f7f810..341a4360378 100644
--- a/src/mame/drivers/shougi.c
+++ b/src/mame/drivers/shougi.c
@@ -122,7 +122,7 @@ void shougi_state::machine_start()
{
m_nmi_enabled = 0;
m_r = 0;
-
+
save_item(NAME(m_nmi_enabled));
save_item(NAME(m_r));
}
@@ -236,7 +236,7 @@ WRITE8_MEMBER(shougi_state::control_w)
// 0: sharedram = sub
// 1: sharedram = main
break;
-
+
case 1:
m_nmi_enabled = data;
@@ -247,11 +247,11 @@ WRITE8_MEMBER(shougi_state::control_w)
m_subcpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
}
break;
-
+
case 4:
m_mcu->set_input_line(INPUT_LINE_HALT, data ? ASSERT_LINE : CLEAR_LINE);
break;
-
+
default:
// 7: ?????? connected to +5v via resistor
break;
diff --git a/src/mame/drivers/slotcarn.c b/src/mame/drivers/slotcarn.c
index b1cedc60b39..3d474f56f9a 100644
--- a/src/mame/drivers/slotcarn.c
+++ b/src/mame/drivers/slotcarn.c
@@ -82,7 +82,7 @@ WRITE8_MEMBER(slotcarn_state::palette_w)
{
int co;
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
data &= 0x0f;
@@ -158,7 +158,7 @@ MC6845_UPDATE_ROW( slotcarn_state::crtc_update_row )
WRITE_LINE_MEMBER(slotcarn_state::hsync_changed)
{
/* update any video up to the current scanline */
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
}
diff --git a/src/mame/drivers/subhuntr.c b/src/mame/drivers/subhuntr.c
index 76e9ced6e0d..a36f388ee70 100644
--- a/src/mame/drivers/subhuntr.c
+++ b/src/mame/drivers/subhuntr.c
@@ -2,19 +2,19 @@
// copyright-holders:David Haywood
/*
-QTY Type clock position function
-2x 2636 Programmable Video Interface
-1x 2650 OSC/2 = 1.7897725 MHz 8-bit Microprocessor - main
-1x oscillator 3.579545 MHz
+QTY Type clock position function
+2x 2636 Programmable Video Interface
+1x 2650 OSC/2 = 1.7897725 MHz 8-bit Microprocessor - main
+1x oscillator 3.579545 MHz
ROMs
-QTY Type position status
-4x 2708 6F,6H,6L,6N dumped
-1x N82S115 2B dumped
+QTY Type position status
+4x 2708 6F,6H,6L,6N dumped
+1x N82S115 2B dumped
RAMs
-QTY Type position
-2x 2101
+QTY Type position
+2x 2101
*/
@@ -33,7 +33,7 @@ public:
}
required_device<cpu_device> m_maincpu;
-
+
INTERRUPT_GEN_MEMBER(subhuntr_interrupt);
virtual void machine_start();
@@ -76,8 +76,8 @@ static ADDRESS_MAP_START( subhuntr_map, AS_PROGRAM, 8, subhuntr_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( subhuntr_io_map, AS_IO, 8, subhuntr_state )
-// AM_RANGE(S2650_CTRL_PORT, S2650_CTRL_PORT) AM_READWRITE( , )
-// AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READWRITE( , )
+// AM_RANGE(S2650_CTRL_PORT, S2650_CTRL_PORT) AM_READWRITE( , )
+// AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READWRITE( , )
AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("SENSE")
ADDRESS_MAP_END
@@ -136,10 +136,10 @@ static MACHINE_CONFIG_START( subhuntr, subhuntr_state )
MCFG_CPU_IO_MAP(subhuntr_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", subhuntr_state, subhuntr_interrupt)
-// MCFG_DEVICE_ADD("s2636", S2636, 0)
-// MCFG_S2636_WORKRAM_SIZE(0x100)
-// MCFG_S2636_OFFSETS(3, -21)
-// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+// MCFG_DEVICE_ADD("s2636", S2636, 0)
+// MCFG_S2636_WORKRAM_SIZE(0x100)
+// MCFG_S2636_OFFSETS(3, -21)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -150,7 +150,7 @@ static MACHINE_CONFIG_START( subhuntr, subhuntr_state )
MCFG_SCREEN_VISIBLE_AREA(1*8, 29*8-1, 2*8, 32*8-1)
MCFG_SCREEN_UPDATE_DRIVER(subhuntr_state, screen_update_subhuntr)
MCFG_SCREEN_PALETTE("palette")
-
+
MCFG_GFXDECODE_ADD("gfxdecode", "palette", subhuntr)
MCFG_PALETTE_ADD("palette", 26)
diff --git a/src/mame/drivers/timeplt.c b/src/mame/drivers/timeplt.c
index 77d4d7623bf..e5fdf8e2e35 100644
--- a/src/mame/drivers/timeplt.c
+++ b/src/mame/drivers/timeplt.c
@@ -452,7 +452,7 @@ static MACHINE_CONFIG_DERIVED( psurge, timeplt )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(psurge_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", timeplt_state, nmi_line_pulse)
-
+
MCFG_VIDEO_START_OVERRIDE(timeplt_state,psurge)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/unichamp.c b/src/mame/drivers/unichamp.c
index 99f711c2766..4507bcc4677 100644
--- a/src/mame/drivers/unichamp.c
+++ b/src/mame/drivers/unichamp.c
@@ -5,13 +5,13 @@
*
* Driver from plgDavid (David Viens)
*
- * Thanks to Sylvain De Chantal (Sly D.C.) for the 2 test units,
+ * Thanks to Sylvain De Chantal (Sly D.C.) for the 2 test units,
* carts and FAQ: http://www.ccjvq.com/slydc/index/faq/2711
*
* Thanks to Paul Robson for the GIC font rom.
* (http://worstconsole.blogspot.ca/2012/12/the-worstconsoleever.html)
* Note a spare dead GIC has been given to Lord Nightmare and should be sent for decap!
- *
+ *
* The Unisonc Champion is the only known GI "Gimini Mid-Range 8950 Programmable Game Set"
* to ever reach the market, and only in limited quantities (aprox 500 units ever built)
*
@@ -21,18 +21,18 @@
* EXEC ROM : 9501-01009 (40 pin) at 0x0800 (factory mapped)
*
* The GIC generates the CPU Clock, the video signals and the audio.
- * The CPU does NOT access the GIC directly.
- * One way CPU->GIC 'communication' takes place through 256 bytes of shared RAM
+ * The CPU does NOT access the GIC directly.
+ * One way CPU->GIC 'communication' takes place through 256 bytes of shared RAM
* (using two 4x256 TMS4043NL-2 (2112-1) Static Rams at U3 and U4)
*
- * In this design the GIC only allows the CPU to use the BUS (and shared RAM)
+ * In this design the GIC only allows the CPU to use the BUS (and shared RAM)
* a fraction of the frame time. (4.33ms for each 16.69ms, or 26% of the time)
* (the real ratio of clocks is 7752/29868 )
*
* Boot: When the GIC let go of !RESET_OUT the EXEC Rom pushes 0x800 onto
* the bus for the CPU to fetch and place in R7 to start execution.
- * This first CPU slice only last 3ms, then the GIC sets the CPU's BUSRQ low,
- * stalling it for 12.36ms, then sets it high for 4.33ms etc...
+ * This first CPU slice only last 3ms, then the GIC sets the CPU's BUSRQ low,
+ * stalling it for 12.36ms, then sets it high for 4.33ms etc...
* 59.95 times a second - NTSC
************************************************************************/
@@ -62,7 +62,7 @@ public:
virtual void machine_start();
virtual void machine_reset();
DECLARE_PALETTE_INIT(unichamp);
-
+
DECLARE_READ8_MEMBER(bext_r);
DECLARE_READ16_MEMBER(unichamp_gicram_r);
@@ -70,7 +70,7 @@ public:
DECLARE_READ16_MEMBER(unichamp_trapl_r);
DECLARE_WRITE16_MEMBER(unichamp_trapl_w);
-
+
UINT32 screen_update_unichamp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
protected:
@@ -86,20 +86,20 @@ PALETTE_INIT_MEMBER(unichamp_state, unichamp)
palette.set_pen_color(GIC_GREEN, rgb_t(0x62, 0x95, 0x88));//(from box shot)
palette.set_pen_color(GIC_WHITE, rgb_t(0xFF, 0xFF, 0xFF));
*/
-
+
//using from intv.c instead as suggested by RB
palette.set_pen_color(GIC_BLACK, rgb_t(0x00, 0x00, 0x00));
palette.set_pen_color(GIC_RED, rgb_t(0xFF, 0x3D, 0x10));
- //palette.set_pen_color(GIC_GREEN, rgb_t(0x38, 0x6B, 0x3F)); //intv's DARK GREEN
- palette.set_pen_color(GIC_GREEN, rgb_t(0x00, 0xA7, 0x56)); //intv's GREEN
- palette.set_pen_color(GIC_WHITE, rgb_t(0xFF, 0xFC, 0xFF));
+ //palette.set_pen_color(GIC_GREEN, rgb_t(0x38, 0x6B, 0x3F)); //intv's DARK GREEN
+ palette.set_pen_color(GIC_GREEN, rgb_t(0x00, 0xA7, 0x56)); //intv's GREEN
+ palette.set_pen_color(GIC_WHITE, rgb_t(0xFF, 0xFC, 0xFF));
}
static ADDRESS_MAP_START( unichamp_mem, AS_PROGRAM, 16, unichamp_state )
ADDRESS_MAP_GLOBAL_MASK(0x1FFF) //B13/B14/B15 are grounded!
AM_RANGE(0x0000, 0x00FF) AM_READWRITE(unichamp_gicram_r, unichamp_gicram_w)
- AM_RANGE(0x0100, 0x07FF) AM_READWRITE(unichamp_trapl_r, unichamp_trapl_w)
+ AM_RANGE(0x0100, 0x07FF) AM_READWRITE(unichamp_trapl_r, unichamp_trapl_w)
AM_RANGE(0x0800, 0x17FF) AM_ROM AM_REGION("maincpu", 0x0800 << 1) // Carts and EXE ROM, 10-bits wide
ADDRESS_MAP_END
@@ -112,8 +112,8 @@ static INPUT_PORTS_START( unichamp )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_S) PORT_CHAR('S')// P2 NO (EBCA3)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_UNUSED
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_UNUSED
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_UNUSED
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_UNUSED
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_UNUSED
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_UNUSED
INPUT_PORTS_END
@@ -129,7 +129,7 @@ READ8_MEMBER(unichamp_state::bext_r)
//and reads the ECBI input pin for HIGH or LOW signal to know whether or not to branch
//The unisonic control system couldnt be simpler in desing.
- //Each of the two player controllers has three buttons:
+ //Each of the two player controllers has three buttons:
//one tying !RESET(GIC pin 21) to ground when closed - resetting the WHOLE system.
//a YES button (connecting EBCA0 to EBCI for Player1 and EBC2 to EBCI for Player2)
//a NO button (connecting EBCA1 to EBCI for Player1 and EBC3 to EBCI for Player2)
@@ -138,7 +138,7 @@ READ8_MEMBER(unichamp_state::bext_r)
//EG: Any player can choose if one or two players are going to play the game for instance
UINT8 port = ioport("CTRLS")->read() & 0x0F; ////only lower nibble
-
+
//We need to return logical high or low on the EBCI pin
return (port & offset)>0?1:0;
}
@@ -152,8 +152,8 @@ DRIVER_INIT_MEMBER(unichamp_state,unichamp)
void unichamp_state::machine_start()
{
m_gic->set_shared_memory(m_ram);
-
- if (m_cart->exists()){
+
+ if (m_cart->exists()){
//flip endians in more "this surely exists in MAME" way?
//NOTE The unichamp roms have the same endianness as intv on disk and in memory
UINT8*ptr = m_cart->get_rom_base();
@@ -163,9 +163,9 @@ void unichamp_state::machine_start()
ptr[i] = ptr[i+1];
ptr[i+1] = TEMP;
}
-
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x1000, 0x1800,
- read16_delegate(FUNC(generic_slot_device::read16_rom),(generic_slot_device*)m_cart));
+
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x1000, 0x1800,
+ read16_delegate(FUNC(generic_slot_device::read16_rom),(generic_slot_device*)m_cart));
}
}
@@ -174,14 +174,14 @@ void unichamp_state::machine_reset()
{
/*
the intv driver did not explain this but from the CP1600 manual:
- When MSYNC* goes inactive (high), the bus control signals issue lAB,
- and the CPU inputs from the bus into the PC the starting address of the main program.
+ When MSYNC* goes inactive (high), the bus control signals issue lAB,
+ and the CPU inputs from the bus into the PC the starting address of the main program.
Note that the initialization address can be defined by the user at any desired bus address or
- can be the default address resulting from the logical state of the non-driven bus
+ can be the default address resulting from the logical state of the non-driven bus
*/
-
+
//The Unisonic EXEC ROM chip (9501-01009) is self mapped at 0x0800
- //The cart ROMS are self mapped to 0x1000
+ //The cart ROMS are self mapped to 0x1000
//upon boot the EXEC ROM puts 0x0800 on the bus for the CPU to use as first INT vector
m_maincpu->set_input_line_vector(CP1610_RESET, 0x0800);
@@ -221,54 +221,54 @@ WRITE16_MEMBER( unichamp_state::unichamp_trapl_w )
static MACHINE_CONFIG_START( unichamp, unichamp_state )
/* basic machine hardware */
-
+
//The CPU is really clocked this way:
- //MCFG_CPU_ADD("maincpu", CP1610, XTAL_3_579545MHz/4)
+ //MCFG_CPU_ADD("maincpu", CP1610, XTAL_3_579545MHz/4)
//But since it is only running 7752/29868 th's of the time...
//TODO find a more accurate method? (the emulation will me the same though)
- MCFG_CPU_ADD("maincpu", CP1610, (int)((7752.0/29868.0)*XTAL_3_579545MHz/4))
-
+ MCFG_CPU_ADD("maincpu", CP1610, (int)((7752.0/29868.0)*XTAL_3_579545MHz/4))
+
MCFG_CPU_PROGRAM_MAP(unichamp_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_CP1610_BEXT_CALLBACK(READ8(unichamp_state, bext_r))
-
+ MCFG_CP1610_BEXT_CALLBACK(READ8(unichamp_state, bext_r))
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS( XTAL_3_579545MHz,
- gic_device::LINE_CLOCKS,
- gic_device::START_ACTIVE_SCAN,
- gic_device::END_ACTIVE_SCAN,
- gic_device::LINES,
- gic_device::START_Y,
+ MCFG_SCREEN_RAW_PARAMS( XTAL_3_579545MHz,
+ gic_device::LINE_CLOCKS,
+ gic_device::START_ACTIVE_SCAN,
+ gic_device::END_ACTIVE_SCAN,
+ gic_device::LINES,
+ gic_device::START_Y,
gic_device::START_Y + gic_device::SCREEN_HEIGHT )
-
+
MCFG_SCREEN_UPDATE_DRIVER(unichamp_state, screen_update_unichamp)
MCFG_SCREEN_PALETTE("palette")
-
+
MCFG_PALETTE_ADD("palette", 4)
MCFG_PALETTE_INIT_OWNER(unichamp_state, unichamp)
-
+
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_GIC_ADD( "gic", XTAL_3_579545MHz, "screen" )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
-
+
/* cartridge */
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_linear_slot, "unichamp_cart")
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_SOFTWARE_LIST_ADD("cart_list", "unichamp")
-
+
MACHINE_CONFIG_END
-ROM_START(unichamp)
+ROM_START(unichamp)
ROM_REGION(0x10000<<1,"maincpu", ROMREGION_ERASEFF)
-
+
ROM_LOAD16_WORD( "9501-01009.u2", 0x0800<<1, 0x1000, CRC(49a0bd8f) SHA1(f4d126d3462ad351da4b75d76c75942d5a6f27ef))
//these below are for local tests. you can use them in softlist or -cart
- //ROM_LOAD16_WORD( "pac-02.bin", 0x1000<<1, 0x1000, CRC(fe3213be) SHA1(5b9c407fe86865f3454d4be824a7f2bf53478f73))
- //ROM_LOAD16_WORD( "pac-03.bin", 0x1000<<1, 0x1000, CRC(f81f04bd) SHA1(82e2a0fda1787d5835c457ee5745b0db0cebe079))
+ //ROM_LOAD16_WORD( "pac-02.bin", 0x1000<<1, 0x1000, CRC(fe3213be) SHA1(5b9c407fe86865f3454d4be824a7f2bf53478f73))
+ //ROM_LOAD16_WORD( "pac-03.bin", 0x1000<<1, 0x1000, CRC(f81f04bd) SHA1(82e2a0fda1787d5835c457ee5745b0db0cebe079))
//ROM_LOAD16_WORD( "pac-04.bin", 0x1000<<1, 0x1000, CRC(cac09841) SHA1(bc9db83f26ed0810938156db6b104b4576754225))
//ROM_LOAD16_WORD( "pac-05.bin", 0x1000<<1, 0x1000, CRC(d54a6090) SHA1(e85593096f43dcf14b08fd2c9fda277008a8df8b))
ROM_END
diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c
index d180791cf48..7c11760bf3d 100644
--- a/src/mame/drivers/vicdual.c
+++ b/src/mame/drivers/vicdual.c
@@ -207,7 +207,7 @@ int vicdual_state::is_cabinet_color()
WRITE8_MEMBER(vicdual_state::videoram_w)
{
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
m_videoram[offset] = data;
}
@@ -215,7 +215,7 @@ WRITE8_MEMBER(vicdual_state::videoram_w)
WRITE8_MEMBER(vicdual_state::characterram_w)
{
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
m_characterram[offset] = data;
}
diff --git a/src/mame/drivers/vpoker.c b/src/mame/drivers/vpoker.c
index 51fdff55379..5190ddabbfb 100644
--- a/src/mame/drivers/vpoker.c
+++ b/src/mame/drivers/vpoker.c
@@ -12,7 +12,7 @@
1) "Challenger Draw Poker", from Bend Electronics Co. Inc.
2) "VHI Draw Poker", from Video Horizons, Inc.
-
+
Both companies shared the same address and phone number:
63353 Nels Anderson Road. Bend, Oregon 97701.
Tel: 503-389-7626.
diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c
index 24a289bc04b..5f46efda43c 100644
--- a/src/mame/drivers/wecleman.c
+++ b/src/mame/drivers/wecleman.c
@@ -1689,7 +1689,7 @@ DRIVER_INIT_MEMBER(wecleman_state,hotchase)
GAMEL( 1986, wecleman, 0, wecleman, wecleman, wecleman_state, wecleman, ROT0, "Konami", "WEC Le Mans 24 (v2.00, set 1)", 0, layout_wecleman )
GAMEL( 1986, weclemana, wecleman, wecleman, wecleman, wecleman_state, wecleman, ROT0, "Konami", "WEC Le Mans 24 (v2.00, set 2)", 0, layout_wecleman ) // 1988 release (maybe date hacked?)
-GAMEL( 1986, weclemanb, wecleman, wecleman, wecleman, wecleman_state, wecleman, ROT0, "Konami", "WEC Le Mans 24 (v1.26)", 0, layout_wecleman )
+GAMEL( 1986, weclemanb, wecleman, wecleman, wecleman, wecleman_state, wecleman, ROT0, "Konami", "WEC Le Mans 24 (v1.26)", 0, layout_wecleman )
GAMEL( 1988, hotchase, 0, hotchase, hotchase, wecleman_state, hotchase, ROT0, "Konami", "Hot Chase (set 1)", 0, layout_wecleman )
GAMEL( 1988, hotchasea, hotchase, hotchase, hotchase, wecleman_state, hotchase, ROT0, "Konami", "Hot Chase (set 2)", 0, layout_wecleman )
diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h
index 10f025d8754..c034456299d 100644
--- a/src/mame/includes/hng64.h
+++ b/src/mame/includes/hng64.h
@@ -111,15 +111,15 @@ class hng64_state;
class hng64_poly_renderer : public poly_manager<float, hng64_poly_data, 7, HNG64_MAX_POLYGONS>
{
public:
- hng64_poly_renderer(hng64_state& state);
-
- void drawShaded(polygon *p);
- void render_scanline(INT32 scanline, const extent_t& extent, const hng64_poly_data& renderData, int threadid);
-
- hng64_state& state() { return m_state; }
- bitmap_rgb32& colorBuffer3d() { return m_colorBuffer3d; }
- float* depthBuffer3d() { return m_depthBuffer3d; }
-
+ hng64_poly_renderer(hng64_state& state);
+
+ void drawShaded(polygon *p);
+ void render_scanline(INT32 scanline, const extent_t& extent, const hng64_poly_data& renderData, int threadid);
+
+ hng64_state& state() { return m_state; }
+ bitmap_rgb32& colorBuffer3d() { return m_colorBuffer3d; }
+ float* depthBuffer3d() { return m_depthBuffer3d; }
+
private:
hng64_state& m_state;
@@ -318,14 +318,14 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(hng64_irq);
void do_dma(address_space &space);
- void hng64_mark_all_tiles_dirty(int tilemap);
+ void hng64_mark_all_tiles_dirty(int tilemap);
void hng64_mark_tile_dirty(int tilemap, int tile_index);
- void hng64_drawtilemap(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int tm);
+ void hng64_drawtilemap(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int tm);
- void hng64_tilemap_draw_roz_core(screen_device &screen, tilemap_t *tmap, const blit_parameters *blit,
- UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, int wraparound);
+ void hng64_tilemap_draw_roz_core(screen_device &screen, tilemap_t *tmap, const blit_parameters *blit,
+ UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, int wraparound);
- void hng64_tilemap_draw_roz(screen_device &screen, bitmap_rgb32 &dest, const rectangle &cliprect, tilemap_t *tmap,
+ void hng64_tilemap_draw_roz(screen_device &screen, bitmap_rgb32 &dest, const rectangle &cliprect, tilemap_t *tmap,
UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy,
int wraparound, UINT32 flags, UINT8 priority, hng64trans_t drawformat);
@@ -333,23 +333,23 @@ public:
UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy,
int wraparound, UINT32 flags, UINT8 priority, UINT8 priority_mask, hng64trans_t drawformat);
-
+
DECLARE_CUSTOM_INPUT_MEMBER(left_handle_r);
DECLARE_CUSTOM_INPUT_MEMBER(right_handle_r);
DECLARE_CUSTOM_INPUT_MEMBER(acc_down_r);
DECLARE_CUSTOM_INPUT_MEMBER(brake_down_r);
- hng64_poly_renderer* m_poly_renderer;
-
- TIMER_CALLBACK_MEMBER(hng64_3dfifo_processed);
+ hng64_poly_renderer* m_poly_renderer;
- UINT8 *m_texturerom;
+ TIMER_CALLBACK_MEMBER(hng64_3dfifo_processed);
+
+ UINT8 *m_texturerom;
UINT16* m_vertsrom;
int m_vertsrom_size;
- std::vector<polygon> m_polys; // HNG64_MAX_POLYGONS
-
- void clear3d();
+ std::vector<polygon> m_polys; // HNG64_MAX_POLYGONS
+
+ void clear3d();
void hng64_command3d(const UINT16* packet);
void draw_sprites(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void transition_control(bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -359,13 +359,13 @@ public:
void setCameraProjectionMatrix(const UINT16* packet);
void recoverPolygonBlock(const UINT16* packet, int& numPolys);
void printPacket(const UINT16* packet, int hex);
- float uToF(UINT16 input);
+ float uToF(UINT16 input);
void matmul4(float *product, const float *a, const float *b);
void vecmatmul4(float *product, const float *a, const float *b);
float vecDotProduct(const float *a, const float *b);
void setIdentity(float *matrix);
void normalize(float* x);
-
+
void reset_sound();
void reset_net();
@@ -399,5 +399,5 @@ public:
DECLARE_READ16_MEMBER(sound_comms_r);
DECLARE_WRITE16_MEMBER(sound_comms_w);
UINT16 main_latch[2];
- UINT16 sound_latch[2];
+ UINT16 sound_latch[2];
};
diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h
index 3772567084c..1e38f870d85 100644
--- a/src/mame/includes/m107.h
+++ b/src/mame/includes/m107.h
@@ -26,7 +26,7 @@ public:
m_palette(*this, "palette"),
m_spriteram(*this, "spriteram"),
m_vram_data(*this, "vram_data"),
- m_upd71059c(*this, "upd71059c")
+ m_upd71059c(*this, "upd71059c")
{ }
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h
index a4a3969565e..599c1545129 100644
--- a/src/mame/includes/m92.h
+++ b/src/mame/includes/m92.h
@@ -37,7 +37,7 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_screen(*this, "screen"),
m_palette(*this, "palette"),
- m_upd71059c(*this, "upd71059c")
+ m_upd71059c(*this, "upd71059c")
{ }
required_device<buffered_spriteram16_device> m_spriteram;
diff --git a/src/mame/includes/osborne1.h b/src/mame/includes/osborne1.h
index 2edf952c22c..1dce651223f 100644
--- a/src/mame/includes/osborne1.h
+++ b/src/mame/includes/osborne1.h
@@ -92,7 +92,7 @@ public:
/* video related */
UINT8 m_screen_pac;
UINT8 m_resolution;
- UINT8 m_hc_left;
+ UINT8 m_hc_left;
UINT8 m_new_start_x;
UINT8 m_new_start_y;
emu_timer *m_video_timer;
diff --git a/src/mame/layout/by17.lay b/src/mame/layout/by17.lay
index b3d42639157..b5b4cf178ce 100644
--- a/src/mame/layout/by17.lay
+++ b/src/mame/layout/by17.lay
@@ -255,11 +255,11 @@
<disk state="0"><color red="0.15" green="0.15" blue="0.00" /></disk>
<disk state="1"><color red="1.00" green="1.00" blue="0.00" /></disk>
</element>
- <element name="Lamp_Red" defstate="0"> <!-- Usually for Specials -->
+ <element name="Lamp_Red" defstate="0"> <!-- Usually for Specials -->
<disk state="0"><color red="0.15" green="0.00" blue="0.00" /></disk>
<disk state="1"><color red="1.00" green="0.00" blue="0.00" /></disk>
</element>
- <element name="Lamp_Amber" defstate="0"> <!-- Usually for Extra Ball-->
+ <element name="Lamp_Amber" defstate="0"> <!-- Usually for Extra Ball-->
<disk state="0"><color red="0.15" green="0.06" blue="0.00" /></disk>
<disk state="1"><color red="1.00" green="0.40" blue="0.00" /></disk>
</element>
@@ -517,7 +517,7 @@
<text string="3k"><color red="0.0" green="0.0" blue="0.0" /><bounds x="06" y="08" width="12" height="12" /></text>
</element>
- <element name="Lamp_Green_Arrow_04_2x" defstate="1"> <!-- Point at 4 o clock -->
+ <element name="Lamp_Green_Arrow_04_2x" defstate="1"> <!-- Point at 4 o clock -->
<rect state="1"><color red="0.00" green="1.00" blue="0.00" /><bounds x="00" y="00" width="08" height="03" /></rect>
<rect state="0"><color red="0.00" green="0.15" blue="0.00" /><bounds x="00" y="00" width="08" height="03" /></rect>
<rect state="1"><color red="0.00" green="1.00" blue="0.00" /><bounds x="05" y="03" width="08" height="03" /></rect>
@@ -539,7 +539,7 @@
<text string="2x"><color red="0.0" green="0.0" blue="0.0" /><bounds x="18" y="08" width="15" height="15" /></text>
</element>
- <element name="Lamp_Yellow_Arrow_04_3x" defstate="1"> <!-- Point at 4 o clock -->
+ <element name="Lamp_Yellow_Arrow_04_3x" defstate="1"> <!-- Point at 4 o clock -->
<rect state="1"><color red="1.00" green="1.00" blue="0.00" /><bounds x="00" y="00" width="08" height="03" /></rect>
<rect state="0"><color red="0.15" green="0.15" blue="0.00" /><bounds x="00" y="00" width="08" height="03" /></rect>
<rect state="1"><color red="1.00" green="1.00" blue="0.00" /><bounds x="05" y="03" width="08" height="03" /></rect>
@@ -561,7 +561,7 @@
<text string="3x"><color red="0.0" green="0.0" blue="0.0" /><bounds x="18" y="08" width="15" height="15" /></text>
</element>
- <element name="Lamp_White_Arrow_08_5x" defstate="1"> <!-- Point at 8 o clock -->
+ <element name="Lamp_White_Arrow_08_5x" defstate="1"> <!-- Point at 8 o clock -->
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="28" y="00" width="08" height="03" /></rect>
<rect state="0"><color red="0.15" green="0.15" blue="0.15" /><bounds x="28" y="00" width="08" height="03" /></rect>
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="23" y="03" width="08" height="03" /></rect>
@@ -583,7 +583,7 @@
<text string="5x"><color red="0.0" green="0.0" blue="0.0" /><bounds x="06" y="08" width="15" height="15" /></text>
</element>
- <element name="Lamp_White_Arrow_01" defstate="1"> <!-- Point at 1 o clock -->
+ <element name="Lamp_White_Arrow_01" defstate="1"> <!-- Point at 1 o clock -->
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="18" y="00" width="03" height="20" /></rect>
<rect state="0"><color red="0.15" green="0.15" blue="0.15" /><bounds x="18" y="00" width="03" height="20" /></rect>
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="15" y="02" width="03" height="17" /></rect>
@@ -604,7 +604,7 @@
<rect state="0"><color red="0.15" green="0.15" blue="0.15" /><bounds x="00" y="28" width="03" height="08" /></rect>
</element>
- <element name="Lamp_Amber_Arrow_08" defstate="1"> <!-- Point at 8 o clock -->
+ <element name="Lamp_Amber_Arrow_08" defstate="1"> <!-- Point at 8 o clock -->
<rect state="1"><color red="1.00" green="0.40" blue="0.00" /><bounds x="28" y="00" width="08" height="03" /></rect>
<rect state="0"><color red="0.15" green="0.06" blue="0.00" /><bounds x="28" y="00" width="08" height="03" /></rect>
<rect state="1"><color red="1.00" green="0.40" blue="0.00" /><bounds x="23" y="03" width="08" height="03" /></rect>
@@ -625,7 +625,7 @@
<rect state="0"><color red="0.15" green="0.06" blue="0.00" /><bounds x="00" y="18" width="20" height="03" /></rect>
</element>
- <element name="Lamp_Amber_Arrow_10" defstate="1"> <!-- Point at 10 o clock -->
+ <element name="Lamp_Amber_Arrow_10" defstate="1"> <!-- Point at 10 o clock -->
<rect state="1"><color red="1.00" green="0.40" blue="0.00" /><bounds x="28" y="18" width="08" height="03" /></rect>
<rect state="0"><color red="0.15" green="0.06" blue="0.00" /><bounds x="28" y="18" width="08" height="03" /></rect>
<rect state="1"><color red="1.00" green="0.40" blue="0.00" /><bounds x="23" y="15" width="08" height="03" /></rect>
@@ -646,7 +646,7 @@
<rect state="0"><color red="0.15" green="0.06" blue="0.00" /><bounds x="00" y="00" width="20" height="03" /></rect>
</element>
- <element name="Lamp_Red_Arrow_08" defstate="1"> <!-- Point at 8 o clock -->
+ <element name="Lamp_Red_Arrow_08" defstate="1"> <!-- Point at 8 o clock -->
<rect state="1"><color red="1.00" green="0.00" blue="0.00" /><bounds x="28" y="00" width="08" height="03" /></rect>
<rect state="0"><color red="0.15" green="0.00" blue="0.00" /><bounds x="28" y="00" width="08" height="03" /></rect>
<rect state="1"><color red="1.00" green="0.00" blue="0.00" /><bounds x="23" y="03" width="08" height="03" /></rect>
@@ -667,7 +667,7 @@
<rect state="0"><color red="0.15" green="0.00" blue="0.00" /><bounds x="00" y="18" width="20" height="03" /></rect>
</element>
- <element name="Lamp_White_Arrow_11_A" defstate="1"> <!-- Point at 11 o clock -->
+ <element name="Lamp_White_Arrow_11_A" defstate="1"> <!-- Point at 11 o clock -->
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="00" y="00" width="03" height="20" /></rect>
<rect state="0"><color red="0.15" green="0.15" blue="0.15" /><bounds x="00" y="00" width="03" height="20" /></rect>
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="03" y="02" width="03" height="17" /></rect>
@@ -689,7 +689,7 @@
<text string="A"><color red="0.0" green="0.0" blue="0.0" /><bounds x="-2" y="03" width="18" height="18" /></text>
</element>
- <element name="Lamp_White_Arrow_01_B" defstate="1"> <!-- Point at 1 o clock -->
+ <element name="Lamp_White_Arrow_01_B" defstate="1"> <!-- Point at 1 o clock -->
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="18" y="00" width="03" height="20" /></rect>
<rect state="0"><color red="0.15" green="0.15" blue="0.15" /><bounds x="18" y="00" width="03" height="20" /></rect>
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="15" y="02" width="03" height="17" /></rect>
@@ -996,7 +996,7 @@
<bezel element="Draw_White"><bounds x="000" y="480" width="640" height="001" /></bezel>
<bezel element="Draw_White"><bounds x="320" y="000" width="001" height="480" /></bezel>
<bezel element="Draw_White"><bounds x="320" y="320" width="320" height="001" /></bezel>
- <!-- <bezel element="Draw_White"><bounds x="159" y="000" width="001" height="480" /></bezel> -->
+ <!-- <bezel element="Draw_White"><bounds x="159" y="000" width="001" height="480" /></bezel> -->
<bezel element="Title_Bally"><bounds x="430" y="18" width="105" height="30" /></bezel>
@@ -1018,7 +1018,7 @@
<!-- Player 1 Score -->
- <bezel name="lamp14" element="Lamp_P1"><bounds x="330" y="55" width="15" height="15" /></bezel> <!-- Backbox ~ 1st Player Up -->
+ <bezel name="lamp14" element="Lamp_P1"><bounds x="330" y="55" width="15" height="15" /></bezel> <!-- Backbox ~ 1st Player Up -->
<bezel name="digit17" element="Digit"><bounds x="360" y="55" width="10" height="15" /></bezel>
<bezel name="digit16" element="Digit"><bounds x="374" y="55" width="10" height="15" /></bezel>
<bezel name="digit15" element="Digit"><bounds x="388" y="55" width="10" height="15" /></bezel>
@@ -1028,7 +1028,7 @@
<bezel name="digit11" element="Digit"><bounds x="444" y="55" width="10" height="15" /></bezel>
<!-- Player 2 Score -->
- <bezel name="lamp29" element="Lamp_P2"><bounds x="615" y="55" width="15" height="15" /></bezel> <!-- Backbox ~ 2nd Player Up -->
+ <bezel name="lamp29" element="Lamp_P2"><bounds x="615" y="55" width="15" height="15" /></bezel> <!-- Backbox ~ 2nd Player Up -->
<bezel name="digit27" element="Digit"><bounds x="506" y="55" width="10" height="15" /></bezel>
<bezel name="digit26" element="Digit"><bounds x="520" y="55" width="10" height="15" /></bezel>
<bezel name="digit25" element="Digit"><bounds x="534" y="55" width="10" height="15" /></bezel>
@@ -1038,7 +1038,7 @@
<bezel name="digit21" element="Digit"><bounds x="590" y="55" width="10" height="15" /></bezel>
<!-- Player 3 Score -->
- <bezel name="lamp44" element="Lamp_P3"><bounds x="330" y="250" width="15" height="15" /></bezel> <!-- Backbox ~ 3rd Player Up -->
+ <bezel name="lamp44" element="Lamp_P3"><bounds x="330" y="250" width="15" height="15" /></bezel> <!-- Backbox ~ 3rd Player Up -->
<bezel name="digit37" element="Digit"><bounds x="360" y="250" width="10" height="15" /></bezel>
<bezel name="digit36" element="Digit"><bounds x="374" y="250" width="10" height="15" /></bezel>
<bezel name="digit35" element="Digit"><bounds x="388" y="250" width="10" height="15" /></bezel>
@@ -1048,7 +1048,7 @@
<bezel name="digit31" element="Digit"><bounds x="444" y="250" width="10" height="15" /></bezel>
<!-- Player 4 Score -->
- <bezel name="lamp59" element="Lamp_P4"><bounds x="615" y="250" width="15" height="15" /></bezel> <!-- Backbox ~ 4th Player Up -->
+ <bezel name="lamp59" element="Lamp_P4"><bounds x="615" y="250" width="15" height="15" /></bezel> <!-- Backbox ~ 4th Player Up -->
<bezel name="digit47" element="Digit"><bounds x="506" y="250" width="10" height="15" /></bezel>
<bezel name="digit46" element="Digit"><bounds x="520" y="250" width="10" height="15" /></bezel>
<bezel name="digit45" element="Digit"><bounds x="534" y="250" width="10" height="15" /></bezel>
@@ -1059,21 +1059,21 @@
<!-- Credits and Ball In Play / Match -->
<bezel element="Text_Credit"><bounds x="542" y="142" width="48" height="8" /></bezel>
- <bezel name="lamp12" element="Ball_In_Play"><bounds x="586" y="105" width="50" height="11" /></bezel> <!-- Backbox ~ Ball In Play -->
- <bezel name="lamp25" element="Match"><bounds x="596" y="152" width="25" height="11" /></bezel> <!-- Backbox ~ Match -->
+ <bezel name="lamp12" element="Ball_In_Play"><bounds x="586" y="105" width="50" height="11" /></bezel> <!-- Backbox ~ Ball In Play -->
+ <bezel name="lamp25" element="Match"><bounds x="596" y="152" width="25" height="11" /></bezel> <!-- Backbox ~ Match -->
<bezel name="digit55" element="Digit"><bounds x="554" y="125" width="10" height="15" /></bezel>
<bezel name="digit54" element="Digit"><bounds x="568" y="125" width="10" height="15" /></bezel>
<bezel name="digit52" element="Digit"><bounds x="596" y="125" width="10" height="15" /></bezel>
<bezel name="digit51" element="Digit"><bounds x="610" y="125" width="10" height="15" /></bezel>
- <bezel name="lamp10" element="Shoot_Again"><bounds x="420" y="295" width="60" height="19" /></bezel> <!-- Backbox ~ Same Player Shoots Again -->
- <bezel name="lamp13" element="Lamp_1P"><bounds x="345" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 1 Player Game -->
- <bezel name="lamp28" element="Lamp_2P"><bounds x="360" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 2 Player Game -->
- <bezel name="lamp43" element="Lamp_3P"><bounds x="375" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 3 Player Game -->
- <bezel name="lamp58" element="Lamp_4P"><bounds x="390" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 4 Player Game -->
- <bezel name="lamp27" element="High_Score_To_Date"><bounds x="438" y="6" width="90" height="11" /></bezel> <!-- Backbox ~ High Score To Date -->
- <bezel name="lamp42" element="Game_Over"><bounds x="580" y="300" width="45" height="11" /></bezel> <!-- Backbox ~ Game Over -->
- <bezel name="lamp57" element="Tilt"><bounds x="480" y="297" width="50" height="16" /></bezel> <!-- Backbox ~ Tilt -->
+ <bezel name="lamp10" element="Shoot_Again"><bounds x="420" y="295" width="60" height="19" /></bezel> <!-- Backbox ~ Same Player Shoots Again -->
+ <bezel name="lamp13" element="Lamp_1P"><bounds x="345" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 1 Player Game -->
+ <bezel name="lamp28" element="Lamp_2P"><bounds x="360" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 2 Player Game -->
+ <bezel name="lamp43" element="Lamp_3P"><bounds x="375" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 3 Player Game -->
+ <bezel name="lamp58" element="Lamp_4P"><bounds x="390" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 4 Player Game -->
+ <bezel name="lamp27" element="High_Score_To_Date"><bounds x="438" y="6" width="90" height="11" /></bezel> <!-- Backbox ~ High Score To Date -->
+ <bezel name="lamp42" element="Game_Over"><bounds x="580" y="300" width="45" height="11" /></bezel> <!-- Backbox ~ Game Over -->
+ <bezel name="lamp57" element="Tilt"><bounds x="480" y="297" width="50" height="16" /></bezel> <!-- Backbox ~ Tilt -->
@@ -1196,7 +1196,7 @@
<bezel element="Text_Knocker"> <!-- Knocker --> <bounds x="322" y="342" width="40" height="10" /></bezel>
<!-- Misc Lamps -->
- <bezel name="lamp55" element="Credit_Indicator"><bounds x="23" y="456" width="70" height="21" /></bezel> <!-- Credit Indicator -->
+ <bezel name="lamp55" element="Credit_Indicator"><bounds x="23" y="456" width="70" height="21" /></bezel> <!-- Credit Indicator -->
<!-- Outhole -->
diff --git a/src/mame/layout/by17_matahari.lay b/src/mame/layout/by17_matahari.lay
index 908a984a057..60cc5ab8d4f 100644
--- a/src/mame/layout/by17_matahari.lay
+++ b/src/mame/layout/by17_matahari.lay
@@ -185,11 +185,11 @@
<disk state="0"><color red="0.15" green="0.15" blue="0.15" /></disk>
<disk state="1"><color red="1.00" green="1.00" blue="1.00" /></disk>
</element>
- <element name="Lamp_Red" defstate="0"> <!-- Usually for Specials -->
+ <element name="Lamp_Red" defstate="0"> <!-- Usually for Specials -->
<disk state="0"><color red="0.15" green="0.00" blue="0.00" /></disk>
<disk state="1"><color red="1.00" green="0.00" blue="0.00" /></disk>
</element>
- <element name="Lamp_Amber" defstate="0"> <!-- Usually for Extra Ball-->
+ <element name="Lamp_Amber" defstate="0"> <!-- Usually for Extra Ball-->
<disk state="0"><color red="0.15" green="0.06" blue="0.00" /></disk>
<disk state="1"><color red="1.00" green="0.40" blue="0.00" /></disk>
</element>
@@ -384,7 +384,7 @@
<text string="3k"><color red="0.0" green="0.0" blue="0.0" /><bounds x="06" y="08" width="12" height="12" /></text>
</element>
- <element name="Lamp_Green_Arrow_04_2x" defstate="1"> <!-- Point at 4 o clock -->
+ <element name="Lamp_Green_Arrow_04_2x" defstate="1"> <!-- Point at 4 o clock -->
<rect state="1"><color red="0.00" green="1.00" blue="0.00" /><bounds x="00" y="00" width="08" height="03" /></rect>
<rect state="0"><color red="0.00" green="0.15" blue="0.00" /><bounds x="00" y="00" width="08" height="03" /></rect>
<rect state="1"><color red="0.00" green="1.00" blue="0.00" /><bounds x="05" y="03" width="08" height="03" /></rect>
@@ -406,7 +406,7 @@
<text string="2x"><color red="0.0" green="0.0" blue="0.0" /><bounds x="18" y="08" width="15" height="15" /></text>
</element>
- <element name="Lamp_Yellow_Arrow_04_3x" defstate="1"> <!-- Point at 4 o clock -->
+ <element name="Lamp_Yellow_Arrow_04_3x" defstate="1"> <!-- Point at 4 o clock -->
<rect state="1"><color red="1.00" green="1.00" blue="0.00" /><bounds x="00" y="00" width="08" height="03" /></rect>
<rect state="0"><color red="0.15" green="0.15" blue="0.00" /><bounds x="00" y="00" width="08" height="03" /></rect>
<rect state="1"><color red="1.00" green="1.00" blue="0.00" /><bounds x="05" y="03" width="08" height="03" /></rect>
@@ -428,7 +428,7 @@
<text string="3x"><color red="0.0" green="0.0" blue="0.0" /><bounds x="18" y="08" width="15" height="15" /></text>
</element>
- <element name="Lamp_White_Arrow_08_5x" defstate="1"> <!-- Point at 8 o clock -->
+ <element name="Lamp_White_Arrow_08_5x" defstate="1"> <!-- Point at 8 o clock -->
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="28" y="00" width="08" height="03" /></rect>
<rect state="0"><color red="0.15" green="0.15" blue="0.15" /><bounds x="28" y="00" width="08" height="03" /></rect>
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="23" y="03" width="08" height="03" /></rect>
@@ -450,7 +450,7 @@
<text string="5x"><color red="0.0" green="0.0" blue="0.0" /><bounds x="06" y="08" width="15" height="15" /></text>
</element>
- <element name="Lamp_Amber_Arrow_08" defstate="1"> <!-- Point at 8 o clock -->
+ <element name="Lamp_Amber_Arrow_08" defstate="1"> <!-- Point at 8 o clock -->
<rect state="1"><color red="1.00" green="0.40" blue="0.00" /><bounds x="28" y="00" width="08" height="03" /></rect>
<rect state="0"><color red="0.15" green="0.06" blue="0.00" /><bounds x="28" y="00" width="08" height="03" /></rect>
<rect state="1"><color red="1.00" green="0.40" blue="0.00" /><bounds x="23" y="03" width="08" height="03" /></rect>
@@ -471,7 +471,7 @@
<rect state="0"><color red="0.15" green="0.06" blue="0.00" /><bounds x="00" y="18" width="20" height="03" /></rect>
</element>
- <element name="Lamp_White_Arrow_11_A" defstate="1"> <!-- Point at 11 o clock -->
+ <element name="Lamp_White_Arrow_11_A" defstate="1"> <!-- Point at 11 o clock -->
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="00" y="00" width="03" height="20" /></rect>
<rect state="0"><color red="0.15" green="0.15" blue="0.15" /><bounds x="00" y="00" width="03" height="20" /></rect>
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="03" y="02" width="03" height="17" /></rect>
@@ -493,7 +493,7 @@
<text string="A"><color red="0.0" green="0.0" blue="0.0" /><bounds x="-2" y="03" width="18" height="18" /></text>
</element>
- <element name="Lamp_White_Arrow_01_B" defstate="1"> <!-- Point at 1 o clock -->
+ <element name="Lamp_White_Arrow_01_B" defstate="1"> <!-- Point at 1 o clock -->
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="18" y="00" width="03" height="20" /></rect>
<rect state="0"><color red="0.15" green="0.15" blue="0.15" /><bounds x="18" y="00" width="03" height="20" /></rect>
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="15" y="02" width="03" height="17" /></rect>
@@ -710,7 +710,7 @@
<!-- Background -->
<backdrop element="Canvas"><bounds x="0" y="0" width="640" height="480" /></backdrop>
-
+
<bezel element="Draw_White"><bounds x="0" y="0" width="640" height="1" /></bezel>
<bezel element="Draw_White"><bounds x="0" y="0" width="1" height="480" /></bezel>
<bezel element="Draw_White"><bounds x="640" y="0" width="1" height="480" /></bezel>
@@ -735,7 +735,7 @@
<!-- Player 1 Score -->
- <bezel name="lamp14" element="Lamp_P1"><bounds x="330" y="55" width="15" height="15" /></bezel> <!-- Backbox ~ 1st Player Up -->
+ <bezel name="lamp14" element="Lamp_P1"><bounds x="330" y="55" width="15" height="15" /></bezel> <!-- Backbox ~ 1st Player Up -->
<bezel name="digit17" element="Digit"><bounds x="360" y="55" width="10" height="15" /></bezel>
<bezel name="digit16" element="Digit"><bounds x="374" y="55" width="10" height="15" /></bezel>
<bezel name="digit15" element="Digit"><bounds x="388" y="55" width="10" height="15" /></bezel>
@@ -745,7 +745,7 @@
<bezel name="digit11" element="Digit"><bounds x="444" y="55" width="10" height="15" /></bezel>
<!-- Player 2 Score -->
- <bezel name="lamp29" element="Lamp_P2"><bounds x="615" y="55" width="15" height="15" /></bezel> <!-- Backbox ~ 2nd Player Up -->
+ <bezel name="lamp29" element="Lamp_P2"><bounds x="615" y="55" width="15" height="15" /></bezel> <!-- Backbox ~ 2nd Player Up -->
<bezel name="digit27" element="Digit"><bounds x="506" y="55" width="10" height="15" /></bezel>
<bezel name="digit26" element="Digit"><bounds x="520" y="55" width="10" height="15" /></bezel>
<bezel name="digit25" element="Digit"><bounds x="534" y="55" width="10" height="15" /></bezel>
@@ -755,7 +755,7 @@
<bezel name="digit21" element="Digit"><bounds x="590" y="55" width="10" height="15" /></bezel>
<!-- Player 3 Score -->
- <bezel name="lamp44" element="Lamp_P3"><bounds x="330" y="250" width="15" height="15" /></bezel> <!-- Backbox ~ 3rd Player Up -->
+ <bezel name="lamp44" element="Lamp_P3"><bounds x="330" y="250" width="15" height="15" /></bezel> <!-- Backbox ~ 3rd Player Up -->
<bezel name="digit37" element="Digit"><bounds x="360" y="250" width="10" height="15" /></bezel>
<bezel name="digit36" element="Digit"><bounds x="374" y="250" width="10" height="15" /></bezel>
<bezel name="digit35" element="Digit"><bounds x="388" y="250" width="10" height="15" /></bezel>
@@ -765,7 +765,7 @@
<bezel name="digit31" element="Digit"><bounds x="444" y="250" width="10" height="15" /></bezel>
<!-- Player 4 Score -->
- <bezel name="lamp59" element="Lamp_P4"><bounds x="615" y="250" width="15" height="15" /></bezel> <!-- Backbox ~ 4th Player Up -->
+ <bezel name="lamp59" element="Lamp_P4"><bounds x="615" y="250" width="15" height="15" /></bezel> <!-- Backbox ~ 4th Player Up -->
<bezel name="digit47" element="Digit"><bounds x="506" y="250" width="10" height="15" /></bezel>
<bezel name="digit46" element="Digit"><bounds x="520" y="250" width="10" height="15" /></bezel>
<bezel name="digit45" element="Digit"><bounds x="534" y="250" width="10" height="15" /></bezel>
@@ -776,21 +776,21 @@
<!-- Credits and Ball In Play / Match -->
<bezel element="Text_Credit"><bounds x="542" y="142" width="48" height="8" /></bezel>
- <bezel name="lamp12" element="Ball_In_Play"><bounds x="586" y="105" width="50" height="11" /></bezel> <!-- Backbox ~ Ball In Play -->
- <bezel name="lamp25" element="Match"><bounds x="596" y="152" width="25" height="11" /></bezel> <!-- Backbox ~ Match -->
+ <bezel name="lamp12" element="Ball_In_Play"><bounds x="586" y="105" width="50" height="11" /></bezel> <!-- Backbox ~ Ball In Play -->
+ <bezel name="lamp25" element="Match"><bounds x="596" y="152" width="25" height="11" /></bezel> <!-- Backbox ~ Match -->
<bezel name="digit55" element="Digit"><bounds x="554" y="125" width="10" height="15" /></bezel>
<bezel name="digit54" element="Digit"><bounds x="568" y="125" width="10" height="15" /></bezel>
<bezel name="digit52" element="Digit"><bounds x="596" y="125" width="10" height="15" /></bezel>
<bezel name="digit51" element="Digit"><bounds x="610" y="125" width="10" height="15" /></bezel>
- <bezel name="lamp10" element="Shoot_Again"><bounds x="420" y="295" width="60" height="19" /></bezel> <!-- Backbox ~ Same Player Shoots Again -->
- <bezel name="lamp13" element="Lamp_1P"><bounds x="345" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 1 Player Game -->
- <bezel name="lamp28" element="Lamp_2P"><bounds x="360" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 2 Player Game -->
- <bezel name="lamp43" element="Lamp_3P"><bounds x="375" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 3 Player Game -->
- <bezel name="lamp58" element="Lamp_4P"><bounds x="390" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 4 Player Game -->
- <bezel name="lamp27" element="High_Score_To_Date"><bounds x="438" y="6" width="90" height="11" /></bezel> <!-- Backbox ~ High Score To Date -->
- <bezel name="lamp42" element="Game_Over"><bounds x="580" y="300" width="45" height="11" /></bezel> <!-- Backbox ~ Game Over -->
- <bezel name="lamp57" element="Tilt"><bounds x="480" y="297" width="50" height="16" /></bezel> <!-- Backbox ~ Tilt -->
+ <bezel name="lamp10" element="Shoot_Again"><bounds x="420" y="295" width="60" height="19" /></bezel> <!-- Backbox ~ Same Player Shoots Again -->
+ <bezel name="lamp13" element="Lamp_1P"><bounds x="345" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 1 Player Game -->
+ <bezel name="lamp28" element="Lamp_2P"><bounds x="360" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 2 Player Game -->
+ <bezel name="lamp43" element="Lamp_3P"><bounds x="375" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 3 Player Game -->
+ <bezel name="lamp58" element="Lamp_4P"><bounds x="390" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 4 Player Game -->
+ <bezel name="lamp27" element="High_Score_To_Date"><bounds x="438" y="6" width="90" height="11" /></bezel> <!-- Backbox ~ High Score To Date -->
+ <bezel name="lamp42" element="Game_Over"><bounds x="580" y="300" width="45" height="11" /></bezel> <!-- Backbox ~ Game Over -->
+ <bezel name="lamp57" element="Tilt"><bounds x="480" y="297" width="50" height="16" /></bezel> <!-- Backbox ~ Tilt -->
@@ -801,72 +801,72 @@
<bezel element="Text_60"><bounds x="552" y="418" width="30" height="11" /></bezel>
<!-- Lamps controlled by U1 on Lamp Driver Board -->
- <bezel name="lamp0" element="Lamp_White"><bounds x="330" y="375" width="8" height="8" /></bezel> <!-- U1 00 -->
- <bezel name="lamp1" element="Lamp_White"><bounds x="345" y="375" width="8" height="8" /></bezel> <!-- U1 01 -->
- <bezel name="lamp2" element="Lamp_White"><bounds x="360" y="375" width="8" height="8" /></bezel> <!-- U1 02 -->
- <bezel name="lamp3" element="Lamp_White"><bounds x="375" y="375" width="8" height="8" /></bezel> <!-- U1 03 -->
- <bezel name="lamp4" element="Lamp_White"><bounds x="390" y="375" width="8" height="8" /></bezel> <!-- U1 04 -->
- <bezel name="lamp5" element="Lamp_White"><bounds x="405" y="375" width="8" height="8" /></bezel> <!-- U1 05 -->
- <bezel name="lamp6" element="Lamp_White"><bounds x="420" y="375" width="8" height="8" /></bezel> <!-- U1 06 -->
- <bezel name="lamp7" element="Lamp_White"><bounds x="435" y="375" width="8" height="8" /></bezel> <!-- U1 07 -->
- <bezel name="lamp8" element="Lamp_White"><bounds x="450" y="375" width="8" height="8" /></bezel> <!-- U1 08 -->
- <bezel name="lamp9" element="Lamp_White"><bounds x="465" y="375" width="8" height="8" /></bezel> <!-- U1 09 -->
- <bezel name="lamp10" element="Lamp_White"><bounds x="480" y="375" width="8" height="8" /></bezel> <!-- U1 10 -->
- <bezel name="lamp11" element="Lamp_White"><bounds x="495" y="375" width="8" height="8" /></bezel> <!-- U1 11 -->
- <bezel name="lamp12" element="Lamp_White"><bounds x="510" y="375" width="8" height="8" /></bezel> <!-- U1 12 -->
- <bezel name="lamp13" element="Lamp_White"><bounds x="525" y="375" width="8" height="8" /></bezel> <!-- U1 13 -->
- <bezel name="lamp14" element="Lamp_White"><bounds x="540" y="375" width="8" height="8" /></bezel> <!-- U1 14 -->
+ <bezel name="lamp0" element="Lamp_White"><bounds x="330" y="375" width="8" height="8" /></bezel> <!-- U1 00 -->
+ <bezel name="lamp1" element="Lamp_White"><bounds x="345" y="375" width="8" height="8" /></bezel> <!-- U1 01 -->
+ <bezel name="lamp2" element="Lamp_White"><bounds x="360" y="375" width="8" height="8" /></bezel> <!-- U1 02 -->
+ <bezel name="lamp3" element="Lamp_White"><bounds x="375" y="375" width="8" height="8" /></bezel> <!-- U1 03 -->
+ <bezel name="lamp4" element="Lamp_White"><bounds x="390" y="375" width="8" height="8" /></bezel> <!-- U1 04 -->
+ <bezel name="lamp5" element="Lamp_White"><bounds x="405" y="375" width="8" height="8" /></bezel> <!-- U1 05 -->
+ <bezel name="lamp6" element="Lamp_White"><bounds x="420" y="375" width="8" height="8" /></bezel> <!-- U1 06 -->
+ <bezel name="lamp7" element="Lamp_White"><bounds x="435" y="375" width="8" height="8" /></bezel> <!-- U1 07 -->
+ <bezel name="lamp8" element="Lamp_White"><bounds x="450" y="375" width="8" height="8" /></bezel> <!-- U1 08 -->
+ <bezel name="lamp9" element="Lamp_White"><bounds x="465" y="375" width="8" height="8" /></bezel> <!-- U1 09 -->
+ <bezel name="lamp10" element="Lamp_White"><bounds x="480" y="375" width="8" height="8" /></bezel> <!-- U1 10 -->
+ <bezel name="lamp11" element="Lamp_White"><bounds x="495" y="375" width="8" height="8" /></bezel> <!-- U1 11 -->
+ <bezel name="lamp12" element="Lamp_White"><bounds x="510" y="375" width="8" height="8" /></bezel> <!-- U1 12 -->
+ <bezel name="lamp13" element="Lamp_White"><bounds x="525" y="375" width="8" height="8" /></bezel> <!-- U1 13 -->
+ <bezel name="lamp14" element="Lamp_White"><bounds x="540" y="375" width="8" height="8" /></bezel> <!-- U1 14 -->
<!-- Lamps controlled by U2 on Lamp Driver Board -->
- <bezel name="lamp15" element="Lamp_White"><bounds x="330" y="390" width="8" height="8" /></bezel> <!-- U2 00 -->
- <bezel name="lamp16" element="Lamp_White"><bounds x="345" y="390" width="8" height="8" /></bezel> <!-- U2 01 -->
- <bezel name="lamp17" element="Lamp_White"><bounds x="360" y="390" width="8" height="8" /></bezel> <!-- U2 02 -->
- <bezel name="lamp18" element="Lamp_White"><bounds x="375" y="390" width="8" height="8" /></bezel> <!-- U2 03 -->
- <bezel name="lamp19" element="Lamp_White"><bounds x="390" y="390" width="8" height="8" /></bezel> <!-- U2 04 -->
- <bezel name="lamp20" element="Lamp_White"><bounds x="405" y="390" width="8" height="8" /></bezel> <!-- U2 05 -->
- <bezel name="lamp21" element="Lamp_White"><bounds x="420" y="390" width="8" height="8" /></bezel> <!-- U2 06 -->
- <bezel name="lamp22" element="Lamp_White"><bounds x="435" y="390" width="8" height="8" /></bezel> <!-- U2 07 -->
- <bezel name="lamp23" element="Lamp_White"><bounds x="450" y="390" width="8" height="8" /></bezel> <!-- U2 08 -->
- <bezel name="lamp24" element="Lamp_White"><bounds x="465" y="390" width="8" height="8" /></bezel> <!-- U2 09 -->
- <bezel name="lamp25" element="Lamp_White"><bounds x="480" y="390" width="8" height="8" /></bezel> <!-- U2 10 -->
- <bezel name="lamp26" element="Lamp_White"><bounds x="495" y="390" width="8" height="8" /></bezel> <!-- U2 11 -->
- <bezel name="lamp27" element="Lamp_White"><bounds x="510" y="390" width="8" height="8" /></bezel> <!-- U2 12 -->
- <bezel name="lamp28" element="Lamp_White"><bounds x="525" y="390" width="8" height="8" /></bezel> <!-- U2 13 -->
- <bezel name="lamp29" element="Lamp_White"><bounds x="540" y="390" width="8" height="8" /></bezel> <!-- U2 14 -->
+ <bezel name="lamp15" element="Lamp_White"><bounds x="330" y="390" width="8" height="8" /></bezel> <!-- U2 00 -->
+ <bezel name="lamp16" element="Lamp_White"><bounds x="345" y="390" width="8" height="8" /></bezel> <!-- U2 01 -->
+ <bezel name="lamp17" element="Lamp_White"><bounds x="360" y="390" width="8" height="8" /></bezel> <!-- U2 02 -->
+ <bezel name="lamp18" element="Lamp_White"><bounds x="375" y="390" width="8" height="8" /></bezel> <!-- U2 03 -->
+ <bezel name="lamp19" element="Lamp_White"><bounds x="390" y="390" width="8" height="8" /></bezel> <!-- U2 04 -->
+ <bezel name="lamp20" element="Lamp_White"><bounds x="405" y="390" width="8" height="8" /></bezel> <!-- U2 05 -->
+ <bezel name="lamp21" element="Lamp_White"><bounds x="420" y="390" width="8" height="8" /></bezel> <!-- U2 06 -->
+ <bezel name="lamp22" element="Lamp_White"><bounds x="435" y="390" width="8" height="8" /></bezel> <!-- U2 07 -->
+ <bezel name="lamp23" element="Lamp_White"><bounds x="450" y="390" width="8" height="8" /></bezel> <!-- U2 08 -->
+ <bezel name="lamp24" element="Lamp_White"><bounds x="465" y="390" width="8" height="8" /></bezel> <!-- U2 09 -->
+ <bezel name="lamp25" element="Lamp_White"><bounds x="480" y="390" width="8" height="8" /></bezel> <!-- U2 10 -->
+ <bezel name="lamp26" element="Lamp_White"><bounds x="495" y="390" width="8" height="8" /></bezel> <!-- U2 11 -->
+ <bezel name="lamp27" element="Lamp_White"><bounds x="510" y="390" width="8" height="8" /></bezel> <!-- U2 12 -->
+ <bezel name="lamp28" element="Lamp_White"><bounds x="525" y="390" width="8" height="8" /></bezel> <!-- U2 13 -->
+ <bezel name="lamp29" element="Lamp_White"><bounds x="540" y="390" width="8" height="8" /></bezel> <!-- U2 14 -->
<!-- Lamps controlled by U3 on Lamp Driver Board -->
- <bezel name="lamp30" element="Lamp_White"><bounds x="330" y="405" width="8" height="8" /></bezel> <!-- U3 00 -->
- <bezel name="lamp31" element="Lamp_White"><bounds x="345" y="405" width="8" height="8" /></bezel> <!-- U3 01 -->
- <bezel name="lamp32" element="Lamp_White"><bounds x="360" y="405" width="8" height="8" /></bezel> <!-- U3 02 -->
- <bezel name="lamp33" element="Lamp_White"><bounds x="375" y="405" width="8" height="8" /></bezel> <!-- U3 03 -->
- <bezel name="lamp34" element="Lamp_White"><bounds x="390" y="405" width="8" height="8" /></bezel> <!-- U3 04 -->
- <bezel name="lamp35" element="Lamp_White"><bounds x="405" y="405" width="8" height="8" /></bezel> <!-- U3 05 -->
- <bezel name="lamp36" element="Lamp_White"><bounds x="420" y="405" width="8" height="8" /></bezel> <!-- U3 06 -->
- <bezel name="lamp37" element="Lamp_White"><bounds x="435" y="405" width="8" height="8" /></bezel> <!-- U3 07 -->
- <bezel name="lamp38" element="Lamp_White"><bounds x="450" y="405" width="8" height="8" /></bezel> <!-- U3 08 -->
- <bezel name="lamp39" element="Lamp_White"><bounds x="465" y="405" width="8" height="8" /></bezel> <!-- U3 09 -->
- <bezel name="lamp40" element="Lamp_White"><bounds x="480" y="405" width="8" height="8" /></bezel> <!-- U3 10 -->
- <bezel name="lamp41" element="Lamp_White"><bounds x="495" y="405" width="8" height="8" /></bezel> <!-- U3 11 -->
- <bezel name="lamp42" element="Lamp_White"><bounds x="510" y="405" width="8" height="8" /></bezel> <!-- U3 12 -->
- <bezel name="lamp43" element="Lamp_White"><bounds x="525" y="405" width="8" height="8" /></bezel> <!-- U3 13 -->
- <bezel name="lamp44" element="Lamp_White"><bounds x="540" y="405" width="8" height="8" /></bezel> <!-- U3 14 -->
+ <bezel name="lamp30" element="Lamp_White"><bounds x="330" y="405" width="8" height="8" /></bezel> <!-- U3 00 -->
+ <bezel name="lamp31" element="Lamp_White"><bounds x="345" y="405" width="8" height="8" /></bezel> <!-- U3 01 -->
+ <bezel name="lamp32" element="Lamp_White"><bounds x="360" y="405" width="8" height="8" /></bezel> <!-- U3 02 -->
+ <bezel name="lamp33" element="Lamp_White"><bounds x="375" y="405" width="8" height="8" /></bezel> <!-- U3 03 -->
+ <bezel name="lamp34" element="Lamp_White"><bounds x="390" y="405" width="8" height="8" /></bezel> <!-- U3 04 -->
+ <bezel name="lamp35" element="Lamp_White"><bounds x="405" y="405" width="8" height="8" /></bezel> <!-- U3 05 -->
+ <bezel name="lamp36" element="Lamp_White"><bounds x="420" y="405" width="8" height="8" /></bezel> <!-- U3 06 -->
+ <bezel name="lamp37" element="Lamp_White"><bounds x="435" y="405" width="8" height="8" /></bezel> <!-- U3 07 -->
+ <bezel name="lamp38" element="Lamp_White"><bounds x="450" y="405" width="8" height="8" /></bezel> <!-- U3 08 -->
+ <bezel name="lamp39" element="Lamp_White"><bounds x="465" y="405" width="8" height="8" /></bezel> <!-- U3 09 -->
+ <bezel name="lamp40" element="Lamp_White"><bounds x="480" y="405" width="8" height="8" /></bezel> <!-- U3 10 -->
+ <bezel name="lamp41" element="Lamp_White"><bounds x="495" y="405" width="8" height="8" /></bezel> <!-- U3 11 -->
+ <bezel name="lamp42" element="Lamp_White"><bounds x="510" y="405" width="8" height="8" /></bezel> <!-- U3 12 -->
+ <bezel name="lamp43" element="Lamp_White"><bounds x="525" y="405" width="8" height="8" /></bezel> <!-- U3 13 -->
+ <bezel name="lamp44" element="Lamp_White"><bounds x="540" y="405" width="8" height="8" /></bezel> <!-- U3 14 -->
<!-- Lamps controlled by U4 on Lamp Driver Board -->
- <bezel name="lamp45" element="Lamp_White"><bounds x="330" y="420" width="8" height="8" /></bezel> <!-- U4 00 -->
- <bezel name="lamp46" element="Lamp_White"><bounds x="345" y="420" width="8" height="8" /></bezel> <!-- U4 01 -->
- <bezel name="lamp47" element="Lamp_White"><bounds x="360" y="420" width="8" height="8" /></bezel> <!-- U4 02 -->
- <bezel name="lamp48" element="Lamp_White"><bounds x="375" y="420" width="8" height="8" /></bezel> <!-- U4 03 -->
- <bezel name="lamp49" element="Lamp_White"><bounds x="390" y="420" width="8" height="8" /></bezel> <!-- U4 04 -->
- <bezel name="lamp50" element="Lamp_White"><bounds x="405" y="420" width="8" height="8" /></bezel> <!-- U4 05 -->
- <bezel name="lamp51" element="Lamp_White"><bounds x="420" y="420" width="8" height="8" /></bezel> <!-- U4 06 -->
- <bezel name="lamp52" element="Lamp_White"><bounds x="435" y="420" width="8" height="8" /></bezel> <!-- U4 07 -->
- <bezel name="lamp53" element="Lamp_White"><bounds x="450" y="420" width="8" height="8" /></bezel> <!-- U4 08 -->
- <bezel name="lamp54" element="Lamp_White"><bounds x="465" y="420" width="8" height="8" /></bezel> <!-- U4 09 -->
- <bezel name="lamp55" element="Lamp_White"><bounds x="480" y="420" width="8" height="8" /></bezel> <!-- U4 10 -->
- <bezel name="lamp56" element="Lamp_White"><bounds x="495" y="420" width="8" height="8" /></bezel> <!-- U4 11 -->
- <bezel name="lamp57" element="Lamp_White"><bounds x="510" y="420" width="8" height="8" /></bezel> <!-- U4 12 -->
- <bezel name="lamp58" element="Lamp_White"><bounds x="525" y="420" width="8" height="8" /></bezel> <!-- U4 13 -->
- <bezel name="lamp59" element="Lamp_White"><bounds x="540" y="420" width="8" height="8" /></bezel> <!-- U4 14 -->
+ <bezel name="lamp45" element="Lamp_White"><bounds x="330" y="420" width="8" height="8" /></bezel> <!-- U4 00 -->
+ <bezel name="lamp46" element="Lamp_White"><bounds x="345" y="420" width="8" height="8" /></bezel> <!-- U4 01 -->
+ <bezel name="lamp47" element="Lamp_White"><bounds x="360" y="420" width="8" height="8" /></bezel> <!-- U4 02 -->
+ <bezel name="lamp48" element="Lamp_White"><bounds x="375" y="420" width="8" height="8" /></bezel> <!-- U4 03 -->
+ <bezel name="lamp49" element="Lamp_White"><bounds x="390" y="420" width="8" height="8" /></bezel> <!-- U4 04 -->
+ <bezel name="lamp50" element="Lamp_White"><bounds x="405" y="420" width="8" height="8" /></bezel> <!-- U4 05 -->
+ <bezel name="lamp51" element="Lamp_White"><bounds x="420" y="420" width="8" height="8" /></bezel> <!-- U4 06 -->
+ <bezel name="lamp52" element="Lamp_White"><bounds x="435" y="420" width="8" height="8" /></bezel> <!-- U4 07 -->
+ <bezel name="lamp53" element="Lamp_White"><bounds x="450" y="420" width="8" height="8" /></bezel> <!-- U4 08 -->
+ <bezel name="lamp54" element="Lamp_White"><bounds x="465" y="420" width="8" height="8" /></bezel> <!-- U4 09 -->
+ <bezel name="lamp55" element="Lamp_White"><bounds x="480" y="420" width="8" height="8" /></bezel> <!-- U4 10 -->
+ <bezel name="lamp56" element="Lamp_White"><bounds x="495" y="420" width="8" height="8" /></bezel> <!-- U4 11 -->
+ <bezel name="lamp57" element="Lamp_White"><bounds x="510" y="420" width="8" height="8" /></bezel> <!-- U4 12 -->
+ <bezel name="lamp58" element="Lamp_White"><bounds x="525" y="420" width="8" height="8" /></bezel> <!-- U4 13 -->
+ <bezel name="lamp59" element="Lamp_White"><bounds x="540" y="420" width="8" height="8" /></bezel> <!-- U4 14 -->
<bezel element="Text_Solenoids"><bounds x="382" y="437" width="100" height="11" /></bezel>
@@ -914,45 +914,45 @@
<!-- Misc Lamps -->
- <bezel name="lamp55" element="Credit_Indicator"><bounds x="23" y="456" width="70" height="21" /></bezel> <!-- Credit Indicator -->
+ <bezel name="lamp55" element="Credit_Indicator"><bounds x="23" y="456" width="70" height="21" /></bezel> <!-- Credit Indicator -->
- <bezel name="lamp52" element="Lamp_White_50k"><bounds x="009" y="322" width="09" height="09" /></bezel> <!-- 50,000 Outlane Left -->
- <bezel name="lamp37" element="Lamp_White_50k"><bounds x="301" y="322" width="09" height="09" /></bezel> <!-- 50,000 Outlane Right -->
+ <bezel name="lamp52" element="Lamp_White_50k"><bounds x="009" y="322" width="09" height="09" /></bezel> <!-- 50,000 Outlane Left -->
+ <bezel name="lamp37" element="Lamp_White_50k"><bounds x="301" y="322" width="09" height="09" /></bezel> <!-- 50,000 Outlane Right -->
<!-- Bonus End of Ball Lamps -->
- <bezel name="lamp0" element="Lamp_White_1k"> <bounds x="155" y="413" width="09" height="09" /></bezel> <!-- Bonus 1000 -->
- <bezel name="lamp15" element="Lamp_White_2k"> <bounds x="155" y="400" width="09" height="09" /></bezel> <!-- Bonus 2000 -->
- <bezel name="lamp30" element="Lamp_White_3k"> <bounds x="155" y="387" width="09" height="09" /></bezel> <!-- Bonus 3000 -->
- <bezel name="lamp45" element="Lamp_White_4k"> <bounds x="155" y="374" width="09" height="09" /></bezel> <!-- Bonus 4000 -->
- <bezel name="lamp1" element="Lamp_White_5k"> <bounds x="155" y="361" width="09" height="09" /></bezel> <!-- Bonus 5000 -->
- <bezel name="lamp16" element="Lamp_White_6k"> <bounds x="155" y="348" width="09" height="09" /></bezel> <!-- Bonus 6000 -->
- <bezel name="lamp31" element="Lamp_White_7k"> <bounds x="155" y="335" width="09" height="09" /></bezel> <!-- Bonus 7000 -->
- <bezel name="lamp46" element="Lamp_White_8k"> <bounds x="155" y="322" width="09" height="09" /></bezel> <!-- Bonus 8000 -->
- <bezel name="lamp2" element="Lamp_White_9k"> <bounds x="155" y="309" width="09" height="09" /></bezel> <!-- Bonus 9000 -->
- <bezel name="lamp17" element="Lamp_White_10k"><bounds x="140" y="292" width="12" height="12" /></bezel> <!-- Bonus 10000 -->
- <bezel name="lamp32" element="Lamp_White_20k"><bounds x="167" y="292" width="12" height="12" /></bezel> <!-- Bonus 20000 -->
+ <bezel name="lamp0" element="Lamp_White_1k"> <bounds x="155" y="413" width="09" height="09" /></bezel> <!-- Bonus 1000 -->
+ <bezel name="lamp15" element="Lamp_White_2k"> <bounds x="155" y="400" width="09" height="09" /></bezel> <!-- Bonus 2000 -->
+ <bezel name="lamp30" element="Lamp_White_3k"> <bounds x="155" y="387" width="09" height="09" /></bezel> <!-- Bonus 3000 -->
+ <bezel name="lamp45" element="Lamp_White_4k"> <bounds x="155" y="374" width="09" height="09" /></bezel> <!-- Bonus 4000 -->
+ <bezel name="lamp1" element="Lamp_White_5k"> <bounds x="155" y="361" width="09" height="09" /></bezel> <!-- Bonus 5000 -->
+ <bezel name="lamp16" element="Lamp_White_6k"> <bounds x="155" y="348" width="09" height="09" /></bezel> <!-- Bonus 6000 -->
+ <bezel name="lamp31" element="Lamp_White_7k"> <bounds x="155" y="335" width="09" height="09" /></bezel> <!-- Bonus 7000 -->
+ <bezel name="lamp46" element="Lamp_White_8k"> <bounds x="155" y="322" width="09" height="09" /></bezel> <!-- Bonus 8000 -->
+ <bezel name="lamp2" element="Lamp_White_9k"> <bounds x="155" y="309" width="09" height="09" /></bezel> <!-- Bonus 9000 -->
+ <bezel name="lamp17" element="Lamp_White_10k"><bounds x="140" y="292" width="12" height="12" /></bezel> <!-- Bonus 10000 -->
+ <bezel name="lamp32" element="Lamp_White_20k"><bounds x="167" y="292" width="12" height="12" /></bezel> <!-- Bonus 20000 -->
<!-- Bonus Multiplier Lamps -->
- <bezel name="lamp56" element="Lamp_Green_Arrow_04_2x"> <bounds x="111" y="317" width="20" height="12.5" /></bezel> <!-- 2X Bonus -->
- <bezel name="lamp41" element="Lamp_Yellow_Arrow_04_3x"><bounds x="111" y="337" width="20" height="12.5" /></bezel> <!-- 3X Bonus -->
- <bezel name="lamp26" element="Lamp_White_Arrow_08_5x"> <bounds x="188" y="317" width="20" height="12.5" /></bezel> <!-- 5X Bonus -->
- <bezel name="lamp40" element="Lamp_Amber_Arrow_08"> <bounds x="188" y="337" width="20" height="12.5" /></bezel> <!-- Extra Ball -->
+ <bezel name="lamp56" element="Lamp_Green_Arrow_04_2x"> <bounds x="111" y="317" width="20" height="12.5" /></bezel> <!-- 2X Bonus -->
+ <bezel name="lamp41" element="Lamp_Yellow_Arrow_04_3x"><bounds x="111" y="337" width="20" height="12.5" /></bezel> <!-- 3X Bonus -->
+ <bezel name="lamp26" element="Lamp_White_Arrow_08_5x"> <bounds x="188" y="317" width="20" height="12.5" /></bezel> <!-- 5X Bonus -->
+ <bezel name="lamp40" element="Lamp_Amber_Arrow_08"> <bounds x="188" y="337" width="20" height="12.5" /></bezel> <!-- Extra Ball -->
<!-- Saucer Lamps -->
- <bezel name="lamp24" element="Lamp_White_Arrow_Up_5x"> <bounds x="154" y="102" width="11" height="22" /></bezel> <!-- 5X Bonus Potential -->
- <bezel name="lamp39" element="Lamp_Yellow_Arrow_Up_3x"><bounds x="154" y="128" width="11" height="22" /></bezel> <!-- 3X Bonus Potential -->
- <bezel name="lamp54" element="Lamp_Green_Arrow_Up_2x"> <bounds x="154" y="154" width="11" height="22" /></bezel> <!-- 2X Bonus Potential -->
- <bezel element="Lamp_White_Arrow_Up_3k"> <bounds x="154" y="180" width="11" height="22" /></bezel> <!-- Upper 3000 -->
+ <bezel name="lamp24" element="Lamp_White_Arrow_Up_5x"> <bounds x="154" y="102" width="11" height="22" /></bezel> <!-- 5X Bonus Potential -->
+ <bezel name="lamp39" element="Lamp_Yellow_Arrow_Up_3x"><bounds x="154" y="128" width="11" height="22" /></bezel> <!-- 3X Bonus Potential -->
+ <bezel name="lamp54" element="Lamp_Green_Arrow_Up_2x"> <bounds x="154" y="154" width="11" height="22" /></bezel> <!-- 2X Bonus Potential -->
+ <bezel element="Lamp_White_Arrow_Up_3k"> <bounds x="154" y="180" width="11" height="22" /></bezel> <!-- Upper 3000 -->
<!-- "A" & "B" Potential Lamps -->
- <bezel name="lamp5" element="Lamp_White_1k"><bounds x="095" y="265" width="10" height="10" /></bezel> <!-- Upper 1000 -->
- <bezel name="lamp20" element="Lamp_White_2k"><bounds x="115" y="265" width="10" height="10" /></bezel> <!-- Upper 2000 -->
- <bezel name="lamp35" element="Lamp_White_3k"><bounds x="135" y="265" width="10" height="10" /></bezel> <!-- Upper 3000 -->
- <bezel name="lamp50" element="Lamp_White_4k"><bounds x="155" y="265" width="10" height="10" /></bezel> <!-- Upper 4000 -->
- <bezel name="lamp6" element="Lamp_White_5k"><bounds x="175" y="265" width="10" height="10" /></bezel> <!-- Upper 5000 -->
- <bezel name="lamp21" element="Lamp_Amber"> <bounds x="195" y="265" width="10" height="10" /></bezel> <!-- Extra Ball Potential -->
- <bezel name="lamp36" element="Lamp_Red"> <bounds x="215" y="265" width="10" height="10" /></bezel> <!-- Special Potential -->
+ <bezel name="lamp5" element="Lamp_White_1k"><bounds x="095" y="265" width="10" height="10" /></bezel> <!-- Upper 1000 -->
+ <bezel name="lamp20" element="Lamp_White_2k"><bounds x="115" y="265" width="10" height="10" /></bezel> <!-- Upper 2000 -->
+ <bezel name="lamp35" element="Lamp_White_3k"><bounds x="135" y="265" width="10" height="10" /></bezel> <!-- Upper 3000 -->
+ <bezel name="lamp50" element="Lamp_White_4k"><bounds x="155" y="265" width="10" height="10" /></bezel> <!-- Upper 4000 -->
+ <bezel name="lamp6" element="Lamp_White_5k"><bounds x="175" y="265" width="10" height="10" /></bezel> <!-- Upper 5000 -->
+ <bezel name="lamp21" element="Lamp_Amber"> <bounds x="195" y="265" width="10" height="10" /></bezel> <!-- Extra Ball Potential -->
+ <bezel name="lamp36" element="Lamp_Red"> <bounds x="215" y="265" width="10" height="10" /></bezel> <!-- Special Potential -->
<!-- Drop Target Lamps -->
- <bezel name="lamp47" element="Lamp_Red"><bounds x="153" y="225" width="14" height="14" /></bezel> <!-- Special Potential -->
+ <bezel name="lamp47" element="Lamp_Red"><bounds x="153" y="225" width="14" height="14" /></bezel> <!-- Special Potential -->
<!-- Outhole -->
<bezel name="solenoid6" element="Solenoid_Outhole"> <bounds x="150" y="455" width="58" height="22" /></bezel>
diff --git a/src/mame/layout/by17_pwerplay.lay b/src/mame/layout/by17_pwerplay.lay
index 3be5643e370..b8a77b925ad 100644
--- a/src/mame/layout/by17_pwerplay.lay
+++ b/src/mame/layout/by17_pwerplay.lay
@@ -198,11 +198,11 @@
<disk state="0"><color red="0.15" green="0.15" blue="0.15" /></disk>
<disk state="1"><color red="1.00" green="1.00" blue="1.00" /></disk>
</element>
- <element name="Lamp_Red" defstate="0"> <!-- Usually for Specials -->
+ <element name="Lamp_Red" defstate="0"> <!-- Usually for Specials -->
<disk state="0"><color red="0.15" green="0.00" blue="0.00" /></disk>
<disk state="1"><color red="1.00" green="0.00" blue="0.00" /></disk>
</element>
- <element name="Lamp_Amber" defstate="0"> <!-- Usually for Extra Ball-->
+ <element name="Lamp_Amber" defstate="0"> <!-- Usually for Extra Ball-->
<disk state="0"><color red="0.15" green="0.06" blue="0.00" /></disk>
<disk state="1"><color red="1.00" green="0.40" blue="0.00" /></disk>
</element>
@@ -540,14 +540,14 @@
<!-- Background -->
<backdrop element="Canvas"><bounds x="000" y="000" width="640" height="480" /></backdrop>
-
+
<bezel element="Draw_White"><bounds x="000" y="000" width="640" height="001" /></bezel>
<bezel element="Draw_White"><bounds x="000" y="000" width="001" height="480" /></bezel>
<bezel element="Draw_White"><bounds x="640" y="000" width="001" height="480" /></bezel>
<bezel element="Draw_White"><bounds x="000" y="480" width="640" height="001" /></bezel>
<bezel element="Draw_White"><bounds x="320" y="000" width="001" height="480" /></bezel>
<bezel element="Draw_White"><bounds x="320" y="320" width="320" height="001" /></bezel>
- <!-- <bezel element="Draw_White"><bounds x="159" y="000" width="001" height="480" /></bezel> -->
+ <!-- <bezel element="Draw_White"><bounds x="159" y="000" width="001" height="480" /></bezel> -->
<bezel element="Title_PowerPlay"><bounds x="430" y="18" width="105" height="30" /></bezel>
@@ -565,7 +565,7 @@
<!-- Player 1 Score -->
- <bezel name="lamp14" element="Lamp_P1"><bounds x="330" y="55" width="15" height="15" /></bezel> <!-- Backbox ~ 1st Player Up -->
+ <bezel name="lamp14" element="Lamp_P1"><bounds x="330" y="55" width="15" height="15" /></bezel> <!-- Backbox ~ 1st Player Up -->
<bezel name="digit17" element="Digit"><bounds x="360" y="55" width="10" height="15" /></bezel>
<bezel name="digit16" element="Digit"><bounds x="374" y="55" width="10" height="15" /></bezel>
<bezel name="digit15" element="Digit"><bounds x="388" y="55" width="10" height="15" /></bezel>
@@ -575,7 +575,7 @@
<bezel name="digit11" element="Digit"><bounds x="444" y="55" width="10" height="15" /></bezel>
<!-- Player 2 Score -->
- <bezel name="lamp29" element="Lamp_P2"><bounds x="615" y="55" width="15" height="15" /></bezel> <!-- Backbox ~ 2nd Player Up -->
+ <bezel name="lamp29" element="Lamp_P2"><bounds x="615" y="55" width="15" height="15" /></bezel> <!-- Backbox ~ 2nd Player Up -->
<bezel name="digit27" element="Digit"><bounds x="506" y="55" width="10" height="15" /></bezel>
<bezel name="digit26" element="Digit"><bounds x="520" y="55" width="10" height="15" /></bezel>
<bezel name="digit25" element="Digit"><bounds x="534" y="55" width="10" height="15" /></bezel>
@@ -585,7 +585,7 @@
<bezel name="digit21" element="Digit"><bounds x="590" y="55" width="10" height="15" /></bezel>
<!-- Player 3 Score -->
- <bezel name="lamp44" element="Lamp_P3"><bounds x="330" y="250" width="15" height="15" /></bezel> <!-- Backbox ~ 3rd Player Up -->
+ <bezel name="lamp44" element="Lamp_P3"><bounds x="330" y="250" width="15" height="15" /></bezel> <!-- Backbox ~ 3rd Player Up -->
<bezel name="digit37" element="Digit"><bounds x="360" y="250" width="10" height="15" /></bezel>
<bezel name="digit36" element="Digit"><bounds x="374" y="250" width="10" height="15" /></bezel>
<bezel name="digit35" element="Digit"><bounds x="388" y="250" width="10" height="15" /></bezel>
@@ -595,7 +595,7 @@
<bezel name="digit31" element="Digit"><bounds x="444" y="250" width="10" height="15" /></bezel>
<!-- Player 4 Score -->
- <bezel name="lamp59" element="Lamp_P4"><bounds x="615" y="250" width="15" height="15" /></bezel> <!-- Backbox ~ 4th Player Up -->
+ <bezel name="lamp59" element="Lamp_P4"><bounds x="615" y="250" width="15" height="15" /></bezel> <!-- Backbox ~ 4th Player Up -->
<bezel name="digit47" element="Digit"><bounds x="506" y="250" width="10" height="15" /></bezel>
<bezel name="digit46" element="Digit"><bounds x="520" y="250" width="10" height="15" /></bezel>
<bezel name="digit45" element="Digit"><bounds x="534" y="250" width="10" height="15" /></bezel>
@@ -606,21 +606,21 @@
<!-- Credits and Ball In Play / Match -->
<bezel element="Text_Credit"><bounds x="542" y="142" width="48" height="8" /></bezel>
- <bezel name="lamp12" element="Ball_In_Play"><bounds x="586" y="105" width="50" height="11" /></bezel> <!-- Backbox ~ Ball In Play -->
- <bezel name="lamp25" element="Match"><bounds x="596" y="152" width="25" height="11" /></bezel> <!-- Backbox ~ Match -->
+ <bezel name="lamp12" element="Ball_In_Play"><bounds x="586" y="105" width="50" height="11" /></bezel> <!-- Backbox ~ Ball In Play -->
+ <bezel name="lamp25" element="Match"><bounds x="596" y="152" width="25" height="11" /></bezel> <!-- Backbox ~ Match -->
<bezel name="digit55" element="Digit"><bounds x="554" y="125" width="10" height="15" /></bezel>
<bezel name="digit54" element="Digit"><bounds x="568" y="125" width="10" height="15" /></bezel>
<bezel name="digit52" element="Digit"><bounds x="596" y="125" width="10" height="15" /></bezel>
<bezel name="digit51" element="Digit"><bounds x="610" y="125" width="10" height="15" /></bezel>
- <bezel name="lamp10" element="Shoot_Again"><bounds x="420" y="295" width="60" height="19" /></bezel> <!-- Backbox ~ Same Player Shoots Again -->
- <bezel name="lamp13" element="Lamp_1P"><bounds x="345" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 1 Player Game -->
- <bezel name="lamp28" element="Lamp_2P"><bounds x="360" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 2 Player Game -->
- <bezel name="lamp43" element="Lamp_3P"><bounds x="375" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 3 Player Game -->
- <bezel name="lamp58" element="Lamp_4P"><bounds x="390" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 4 Player Game -->
- <bezel name="lamp27" element="High_Score_To_Date"><bounds x="438" y="6" width="90" height="11" /></bezel> <!-- Backbox ~ High Score To Date -->
- <bezel name="lamp42" element="Game_Over"><bounds x="580" y="300" width="45" height="11" /></bezel> <!-- Backbox ~ Game Over -->
- <bezel name="lamp57" element="Tilt"><bounds x="480" y="297" width="50" height="16" /></bezel> <!-- Backbox ~ Tilt -->
+ <bezel name="lamp10" element="Shoot_Again"><bounds x="420" y="295" width="60" height="19" /></bezel> <!-- Backbox ~ Same Player Shoots Again -->
+ <bezel name="lamp13" element="Lamp_1P"><bounds x="345" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 1 Player Game -->
+ <bezel name="lamp28" element="Lamp_2P"><bounds x="360" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 2 Player Game -->
+ <bezel name="lamp43" element="Lamp_3P"><bounds x="375" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 3 Player Game -->
+ <bezel name="lamp58" element="Lamp_4P"><bounds x="390" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 4 Player Game -->
+ <bezel name="lamp27" element="High_Score_To_Date"><bounds x="438" y="6" width="90" height="11" /></bezel> <!-- Backbox ~ High Score To Date -->
+ <bezel name="lamp42" element="Game_Over"><bounds x="580" y="300" width="45" height="11" /></bezel> <!-- Backbox ~ Game Over -->
+ <bezel name="lamp57" element="Tilt"><bounds x="480" y="297" width="50" height="16" /></bezel> <!-- Backbox ~ Tilt -->
@@ -745,37 +745,37 @@
<!-- Misc Lamps -->
<bezel name="lamp55" element="Credit_Indicator"><bounds x="23" y="456" width="70" height="21" /></bezel><!-- Credit Indicator -->
- <bezel name="lamp40" element="Lamp_Amber"><bounds x="100" y="330" width="13" height="13" /></bezel> <!-- Extra Ball -->
- <bezel name="lamp56" element="Lamp_Red"> <bounds x="009" y="318" width="09" height="09" /></bezel> <!-- Special Outlane Left -->
- <bezel name="lamp41" element="Lamp_Red"> <bounds x="301" y="318" width="09" height="09" /></bezel> <!-- Special Outlane Right -->
+ <bezel name="lamp40" element="Lamp_Amber"><bounds x="100" y="330" width="13" height="13" /></bezel> <!-- Extra Ball -->
+ <bezel name="lamp56" element="Lamp_Red"> <bounds x="009" y="318" width="09" height="09" /></bezel> <!-- Special Outlane Left -->
+ <bezel name="lamp41" element="Lamp_Red"> <bounds x="301" y="318" width="09" height="09" /></bezel> <!-- Special Outlane Right -->
<!-- Bonus End of Ball Lamps -->
- <bezel name="lamp0" element="Lamp_White_1k"> <bounds x="126" y="298" width="09" height="09" /></bezel> <!-- Bonus 1000 -->
- <bezel name="lamp15" element="Lamp_White_2k"> <bounds x="133" y="316" width="09" height="09" /></bezel> <!-- Bonus 2000 -->
- <bezel name="lamp30" element="Lamp_White_3k"> <bounds x="140" y="334" width="09" height="09" /></bezel> <!-- Bonus 3000 -->
- <bezel name="lamp45" element="Lamp_White_4k"> <bounds x="148" y="352" width="09" height="09" /></bezel> <!-- Bonus 4000 -->
- <bezel name="lamp1" element="Lamp_White_5k"> <bounds x="155" y="370" width="09" height="09" /></bezel> <!-- Bonus 5000 -->
- <bezel name="lamp16" element="Lamp_White_6k"> <bounds x="162" y="352" width="09" height="09" /></bezel> <!-- Bonus 6000 -->
- <bezel name="lamp31" element="Lamp_White_7k"> <bounds x="170" y="334" width="09" height="09" /></bezel> <!-- Bonus 7000 -->
- <bezel name="lamp46" element="Lamp_White_8k"> <bounds x="177" y="316" width="09" height="09" /></bezel> <!-- Bonus 8000 -->
- <bezel name="lamp2" element="Lamp_White_9k"> <bounds x="184" y="298" width="09" height="09" /></bezel> <!-- Bonus 9000 -->
- <bezel name="lamp17" element="Lamp_White_10k"><bounds x="154" y="320" width="12" height="12" /></bezel> <!-- Bonus 10000 -->
- <bezel name="lamp32" element="Lamp_White_20k"><bounds x="154" y="296" width="12" height="12" /></bezel> <!-- Bonus 20000 -->
+ <bezel name="lamp0" element="Lamp_White_1k"> <bounds x="126" y="298" width="09" height="09" /></bezel> <!-- Bonus 1000 -->
+ <bezel name="lamp15" element="Lamp_White_2k"> <bounds x="133" y="316" width="09" height="09" /></bezel> <!-- Bonus 2000 -->
+ <bezel name="lamp30" element="Lamp_White_3k"> <bounds x="140" y="334" width="09" height="09" /></bezel> <!-- Bonus 3000 -->
+ <bezel name="lamp45" element="Lamp_White_4k"> <bounds x="148" y="352" width="09" height="09" /></bezel> <!-- Bonus 4000 -->
+ <bezel name="lamp1" element="Lamp_White_5k"> <bounds x="155" y="370" width="09" height="09" /></bezel> <!-- Bonus 5000 -->
+ <bezel name="lamp16" element="Lamp_White_6k"> <bounds x="162" y="352" width="09" height="09" /></bezel> <!-- Bonus 6000 -->
+ <bezel name="lamp31" element="Lamp_White_7k"> <bounds x="170" y="334" width="09" height="09" /></bezel> <!-- Bonus 7000 -->
+ <bezel name="lamp46" element="Lamp_White_8k"> <bounds x="177" y="316" width="09" height="09" /></bezel> <!-- Bonus 8000 -->
+ <bezel name="lamp2" element="Lamp_White_9k"> <bounds x="184" y="298" width="09" height="09" /></bezel> <!-- Bonus 9000 -->
+ <bezel name="lamp17" element="Lamp_White_10k"><bounds x="154" y="320" width="12" height="12" /></bezel> <!-- Bonus 10000 -->
+ <bezel name="lamp32" element="Lamp_White_20k"><bounds x="154" y="296" width="12" height="12" /></bezel> <!-- Bonus 20000 -->
<!-- Bonus Multiplier Lamps -->
- <bezel name="lamp53" element="Lamp_2x"><bounds x="135" y="392" width="10" height="10" /></bezel> <!-- 2X Bonus -->
- <bezel name="lamp38" element="Lamp_3x"><bounds x="155" y="390" width="10" height="10" /></bezel> <!-- 3X Bonus -->
- <bezel name="lamp23" element="Lamp_5x"><bounds x="175" y="392" width="10" height="10" /></bezel> <!-- 5X Bonus -->
+ <bezel name="lamp53" element="Lamp_2x"><bounds x="135" y="392" width="10" height="10" /></bezel> <!-- 2X Bonus -->
+ <bezel name="lamp38" element="Lamp_3x"><bounds x="155" y="390" width="10" height="10" /></bezel> <!-- 3X Bonus -->
+ <bezel name="lamp23" element="Lamp_5x"><bounds x="175" y="392" width="10" height="10" /></bezel> <!-- 5X Bonus -->
<!-- Drop Target Lamps -->
- <bezel name="lamp4" element="Lamp_2x"> <bounds x="125" y="198" width="10" height="10" /></bezel> <!-- 2X Bonus Potential -->
- <bezel name="lamp19" element="Lamp_3x"> <bounds x="140" y="198" width="10" height="10" /></bezel> <!-- 3X Bonus Potential -->
- <bezel name="lamp34" element="Lamp_5x"> <bounds x="155" y="198" width="10" height="10" /></bezel> <!-- 5X Bonus Potential -->
- <bezel name="lamp49" element="Lamp_Amber"><bounds x="170" y="198" width="10" height="10" /></bezel> <!-- Extra Ball Potential -->
- <bezel name="lamp5" element="Lamp_Red"> <bounds x="185" y="198" width="10" height="10" /></bezel> <!-- Special Potential -->
+ <bezel name="lamp4" element="Lamp_2x"> <bounds x="125" y="198" width="10" height="10" /></bezel> <!-- 2X Bonus Potential -->
+ <bezel name="lamp19" element="Lamp_3x"> <bounds x="140" y="198" width="10" height="10" /></bezel> <!-- 3X Bonus Potential -->
+ <bezel name="lamp34" element="Lamp_5x"> <bounds x="155" y="198" width="10" height="10" /></bezel> <!-- 5X Bonus Potential -->
+ <bezel name="lamp49" element="Lamp_Amber"><bounds x="170" y="198" width="10" height="10" /></bezel> <!-- Extra Ball Potential -->
+ <bezel name="lamp5" element="Lamp_Red"> <bounds x="185" y="198" width="10" height="10" /></bezel> <!-- Special Potential -->
<!-- Saucer Lamps -->
- <bezel name="lamp6" element="Lamp_White_3k"> <bounds x="128" y="30" width="9" height="9" /></bezel> <!-- Upper 3000 -->
- <bezel name="lamp21" element="Lamp_White_6k"> <bounds x="142" y="42" width="9" height="9" /></bezel> <!-- Upper 6000 -->
- <bezel name="lamp36" element="Lamp_White_9k"> <bounds x="156" y="54" width="9" height="9" /></bezel> <!-- Upper 9000 -->
- <bezel name="lamp51" element="Lamp_White_12k"><bounds x="170" y="42" width="9" height="9" /></bezel> <!-- Upper 12000 -->
- <bezel name="lamp7" element="Lamp_White_15k"><bounds x="184" y="30" width="9" height="9" /></bezel> <!-- Upper 15000 -->
+ <bezel name="lamp6" element="Lamp_White_3k"> <bounds x="128" y="30" width="9" height="9" /></bezel> <!-- Upper 3000 -->
+ <bezel name="lamp21" element="Lamp_White_6k"> <bounds x="142" y="42" width="9" height="9" /></bezel> <!-- Upper 6000 -->
+ <bezel name="lamp36" element="Lamp_White_9k"> <bounds x="156" y="54" width="9" height="9" /></bezel> <!-- Upper 9000 -->
+ <bezel name="lamp51" element="Lamp_White_12k"><bounds x="170" y="42" width="9" height="9" /></bezel> <!-- Upper 12000 -->
+ <bezel name="lamp7" element="Lamp_White_15k"><bounds x="184" y="30" width="9" height="9" /></bezel> <!-- Upper 15000 -->
diff --git a/src/mame/layout/by35.lay b/src/mame/layout/by35.lay
index 8e69a4e6e01..9a8a6398ab1 100644
--- a/src/mame/layout/by35.lay
+++ b/src/mame/layout/by35.lay
@@ -256,11 +256,11 @@
<disk state="0"><color red="0.15" green="0.15" blue="0.00" /></disk>
<disk state="1"><color red="1.00" green="1.00" blue="0.00" /></disk>
</element>
- <element name="Lamp_Red" defstate="0"> <!-- Usually for Specials -->
+ <element name="Lamp_Red" defstate="0"> <!-- Usually for Specials -->
<disk state="0"><color red="0.15" green="0.00" blue="0.00" /></disk>
<disk state="1"><color red="1.00" green="0.00" blue="0.00" /></disk>
</element>
- <element name="Lamp_Amber" defstate="0"> <!-- Usually for Extra Ball-->
+ <element name="Lamp_Amber" defstate="0"> <!-- Usually for Extra Ball-->
<disk state="0"><color red="0.15" green="0.06" blue="0.00" /></disk>
<disk state="1"><color red="1.00" green="0.40" blue="0.00" /></disk>
</element>
@@ -518,7 +518,7 @@
<text string="3k"><color red="0.0" green="0.0" blue="0.0" /><bounds x="06" y="08" width="12" height="12" /></text>
</element>
- <element name="Lamp_Green_Arrow_04_2x" defstate="1"> <!-- Point at 4 o clock -->
+ <element name="Lamp_Green_Arrow_04_2x" defstate="1"> <!-- Point at 4 o clock -->
<rect state="1"><color red="0.00" green="1.00" blue="0.00" /><bounds x="00" y="00" width="08" height="03" /></rect>
<rect state="0"><color red="0.00" green="0.15" blue="0.00" /><bounds x="00" y="00" width="08" height="03" /></rect>
<rect state="1"><color red="0.00" green="1.00" blue="0.00" /><bounds x="05" y="03" width="08" height="03" /></rect>
@@ -540,7 +540,7 @@
<text string="2x"><color red="0.0" green="0.0" blue="0.0" /><bounds x="18" y="08" width="15" height="15" /></text>
</element>
- <element name="Lamp_Yellow_Arrow_04_3x" defstate="1"> <!-- Point at 4 o clock -->
+ <element name="Lamp_Yellow_Arrow_04_3x" defstate="1"> <!-- Point at 4 o clock -->
<rect state="1"><color red="1.00" green="1.00" blue="0.00" /><bounds x="00" y="00" width="08" height="03" /></rect>
<rect state="0"><color red="0.15" green="0.15" blue="0.00" /><bounds x="00" y="00" width="08" height="03" /></rect>
<rect state="1"><color red="1.00" green="1.00" blue="0.00" /><bounds x="05" y="03" width="08" height="03" /></rect>
@@ -562,7 +562,7 @@
<text string="3x"><color red="0.0" green="0.0" blue="0.0" /><bounds x="18" y="08" width="15" height="15" /></text>
</element>
- <element name="Lamp_White_Arrow_08_5x" defstate="1"> <!-- Point at 8 o clock -->
+ <element name="Lamp_White_Arrow_08_5x" defstate="1"> <!-- Point at 8 o clock -->
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="28" y="00" width="08" height="03" /></rect>
<rect state="0"><color red="0.15" green="0.15" blue="0.15" /><bounds x="28" y="00" width="08" height="03" /></rect>
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="23" y="03" width="08" height="03" /></rect>
@@ -584,7 +584,7 @@
<text string="5x"><color red="0.0" green="0.0" blue="0.0" /><bounds x="06" y="08" width="15" height="15" /></text>
</element>
- <element name="Lamp_White_Arrow_01" defstate="1"> <!-- Point at 1 o clock -->
+ <element name="Lamp_White_Arrow_01" defstate="1"> <!-- Point at 1 o clock -->
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="18" y="00" width="03" height="20" /></rect>
<rect state="0"><color red="0.15" green="0.15" blue="0.15" /><bounds x="18" y="00" width="03" height="20" /></rect>
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="15" y="02" width="03" height="17" /></rect>
@@ -605,7 +605,7 @@
<rect state="0"><color red="0.15" green="0.15" blue="0.15" /><bounds x="00" y="28" width="03" height="08" /></rect>
</element>
- <element name="Lamp_Amber_Arrow_08" defstate="1"> <!-- Point at 8 o clock -->
+ <element name="Lamp_Amber_Arrow_08" defstate="1"> <!-- Point at 8 o clock -->
<rect state="1"><color red="1.00" green="0.40" blue="0.00" /><bounds x="28" y="00" width="08" height="03" /></rect>
<rect state="0"><color red="0.15" green="0.06" blue="0.00" /><bounds x="28" y="00" width="08" height="03" /></rect>
<rect state="1"><color red="1.00" green="0.40" blue="0.00" /><bounds x="23" y="03" width="08" height="03" /></rect>
@@ -626,7 +626,7 @@
<rect state="0"><color red="0.15" green="0.06" blue="0.00" /><bounds x="00" y="18" width="20" height="03" /></rect>
</element>
- <element name="Lamp_Amber_Arrow_10" defstate="1"> <!-- Point at 10 o clock -->
+ <element name="Lamp_Amber_Arrow_10" defstate="1"> <!-- Point at 10 o clock -->
<rect state="1"><color red="1.00" green="0.40" blue="0.00" /><bounds x="28" y="18" width="08" height="03" /></rect>
<rect state="0"><color red="0.15" green="0.06" blue="0.00" /><bounds x="28" y="18" width="08" height="03" /></rect>
<rect state="1"><color red="1.00" green="0.40" blue="0.00" /><bounds x="23" y="15" width="08" height="03" /></rect>
@@ -647,7 +647,7 @@
<rect state="0"><color red="0.15" green="0.06" blue="0.00" /><bounds x="00" y="00" width="20" height="03" /></rect>
</element>
- <element name="Lamp_Red_Arrow_08" defstate="1"> <!-- Point at 8 o clock -->
+ <element name="Lamp_Red_Arrow_08" defstate="1"> <!-- Point at 8 o clock -->
<rect state="1"><color red="1.00" green="0.00" blue="0.00" /><bounds x="28" y="00" width="08" height="03" /></rect>
<rect state="0"><color red="0.15" green="0.00" blue="0.00" /><bounds x="28" y="00" width="08" height="03" /></rect>
<rect state="1"><color red="1.00" green="0.00" blue="0.00" /><bounds x="23" y="03" width="08" height="03" /></rect>
@@ -668,7 +668,7 @@
<rect state="0"><color red="0.15" green="0.00" blue="0.00" /><bounds x="00" y="18" width="20" height="03" /></rect>
</element>
- <element name="Lamp_White_Arrow_11_A" defstate="1"> <!-- Point at 11 o clock -->
+ <element name="Lamp_White_Arrow_11_A" defstate="1"> <!-- Point at 11 o clock -->
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="00" y="00" width="03" height="20" /></rect>
<rect state="0"><color red="0.15" green="0.15" blue="0.15" /><bounds x="00" y="00" width="03" height="20" /></rect>
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="03" y="02" width="03" height="17" /></rect>
@@ -690,7 +690,7 @@
<text string="A"><color red="0.0" green="0.0" blue="0.0" /><bounds x="-2" y="03" width="18" height="18" /></text>
</element>
- <element name="Lamp_White_Arrow_01_B" defstate="1"> <!-- Point at 1 o clock -->
+ <element name="Lamp_White_Arrow_01_B" defstate="1"> <!-- Point at 1 o clock -->
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="18" y="00" width="03" height="20" /></rect>
<rect state="0"><color red="0.15" green="0.15" blue="0.15" /><bounds x="18" y="00" width="03" height="20" /></rect>
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="15" y="02" width="03" height="17" /></rect>
@@ -1001,7 +1001,7 @@
<bezel element="Draw_White"><bounds x="000" y="480" width="640" height="001" /></bezel>
<bezel element="Draw_White"><bounds x="320" y="000" width="001" height="480" /></bezel>
<bezel element="Draw_White"><bounds x="320" y="320" width="320" height="001" /></bezel>
- <!-- <bezel element="Draw_White"><bounds x="159" y="000" width="001" height="480" /></bezel> -->
+ <!-- <bezel element="Draw_White"><bounds x="159" y="000" width="001" height="480" /></bezel> -->
<bezel element="Title_Bally"><bounds x="430" y="18" width="105" height="30" /></bezel>
@@ -1024,7 +1024,7 @@
<!-- Player 1 Score -->
- <bezel name="lamp14" element="Lamp_P1"><bounds x="330" y="55" width="15" height="15" /></bezel> <!-- Backbox ~ 1st Player Up -->
+ <bezel name="lamp14" element="Lamp_P1"><bounds x="330" y="55" width="15" height="15" /></bezel> <!-- Backbox ~ 1st Player Up -->
<bezel name="digit17" element="Digit"><bounds x="360" y="55" width="10" height="15" /></bezel>
<bezel name="digit16" element="Digit"><bounds x="374" y="55" width="10" height="15" /></bezel>
<bezel name="digit15" element="Digit"><bounds x="388" y="55" width="10" height="15" /></bezel>
@@ -1034,7 +1034,7 @@
<bezel name="digit11" element="Digit"><bounds x="444" y="55" width="10" height="15" /></bezel>
<!-- Player 2 Score -->
- <bezel name="lamp29" element="Lamp_P2"><bounds x="615" y="55" width="15" height="15" /></bezel> <!-- Backbox ~ 2nd Player Up -->
+ <bezel name="lamp29" element="Lamp_P2"><bounds x="615" y="55" width="15" height="15" /></bezel> <!-- Backbox ~ 2nd Player Up -->
<bezel name="digit27" element="Digit"><bounds x="506" y="55" width="10" height="15" /></bezel>
<bezel name="digit26" element="Digit"><bounds x="520" y="55" width="10" height="15" /></bezel>
<bezel name="digit25" element="Digit"><bounds x="534" y="55" width="10" height="15" /></bezel>
@@ -1044,7 +1044,7 @@
<bezel name="digit21" element="Digit"><bounds x="590" y="55" width="10" height="15" /></bezel>
<!-- Player 3 Score -->
- <bezel name="lamp44" element="Lamp_P3"><bounds x="330" y="250" width="15" height="15" /></bezel> <!-- Backbox ~ 3rd Player Up -->
+ <bezel name="lamp44" element="Lamp_P3"><bounds x="330" y="250" width="15" height="15" /></bezel> <!-- Backbox ~ 3rd Player Up -->
<bezel name="digit37" element="Digit"><bounds x="360" y="250" width="10" height="15" /></bezel>
<bezel name="digit36" element="Digit"><bounds x="374" y="250" width="10" height="15" /></bezel>
<bezel name="digit35" element="Digit"><bounds x="388" y="250" width="10" height="15" /></bezel>
@@ -1054,7 +1054,7 @@
<bezel name="digit31" element="Digit"><bounds x="444" y="250" width="10" height="15" /></bezel>
<!-- Player 4 Score -->
- <bezel name="lamp59" element="Lamp_P4"><bounds x="615" y="250" width="15" height="15" /></bezel> <!-- Backbox ~ 4th Player Up -->
+ <bezel name="lamp59" element="Lamp_P4"><bounds x="615" y="250" width="15" height="15" /></bezel> <!-- Backbox ~ 4th Player Up -->
<bezel name="digit47" element="Digit"><bounds x="506" y="250" width="10" height="15" /></bezel>
<bezel name="digit46" element="Digit"><bounds x="520" y="250" width="10" height="15" /></bezel>
<bezel name="digit45" element="Digit"><bounds x="534" y="250" width="10" height="15" /></bezel>
@@ -1065,21 +1065,21 @@
<!-- Credits and Ball In Play / Match -->
<bezel element="Text_Credit"><bounds x="542" y="142" width="48" height="8" /></bezel>
- <bezel name="lamp12" element="Ball_In_Play"><bounds x="586" y="105" width="50" height="11" /></bezel> <!-- Backbox ~ Ball In Play -->
- <bezel name="lamp25" element="Match"><bounds x="596" y="152" width="25" height="11" /></bezel> <!-- Backbox ~ Match -->
+ <bezel name="lamp12" element="Ball_In_Play"><bounds x="586" y="105" width="50" height="11" /></bezel> <!-- Backbox ~ Ball In Play -->
+ <bezel name="lamp25" element="Match"><bounds x="596" y="152" width="25" height="11" /></bezel> <!-- Backbox ~ Match -->
<bezel name="digit55" element="Digit"><bounds x="554" y="125" width="10" height="15" /></bezel>
<bezel name="digit54" element="Digit"><bounds x="568" y="125" width="10" height="15" /></bezel>
<bezel name="digit52" element="Digit"><bounds x="596" y="125" width="10" height="15" /></bezel>
<bezel name="digit51" element="Digit"><bounds x="610" y="125" width="10" height="15" /></bezel>
- <bezel name="lamp10" element="Shoot_Again"><bounds x="420" y="295" width="60" height="19" /></bezel> <!-- Backbox ~ Same Player Shoots Again -->
- <bezel name="lamp13" element="Lamp_1P"><bounds x="345" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 1 Player Game -->
- <bezel name="lamp28" element="Lamp_2P"><bounds x="360" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 2 Player Game -->
- <bezel name="lamp43" element="Lamp_3P"><bounds x="375" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 3 Player Game -->
- <bezel name="lamp58" element="Lamp_4P"><bounds x="390" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 4 Player Game -->
- <bezel name="lamp27" element="High_Score_To_Date"><bounds x="438" y="6" width="90" height="11" /></bezel> <!-- Backbox ~ High Score To Date -->
- <bezel name="lamp42" element="Game_Over"><bounds x="580" y="300" width="45" height="11" /></bezel> <!-- Backbox ~ Game Over -->
- <bezel name="lamp57" element="Tilt"><bounds x="480" y="297" width="50" height="16" /></bezel> <!-- Backbox ~ Tilt -->
+ <bezel name="lamp10" element="Shoot_Again"><bounds x="420" y="295" width="60" height="19" /></bezel> <!-- Backbox ~ Same Player Shoots Again -->
+ <bezel name="lamp13" element="Lamp_1P"><bounds x="345" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 1 Player Game -->
+ <bezel name="lamp28" element="Lamp_2P"><bounds x="360" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 2 Player Game -->
+ <bezel name="lamp43" element="Lamp_3P"><bounds x="375" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 3 Player Game -->
+ <bezel name="lamp58" element="Lamp_4P"><bounds x="390" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 4 Player Game -->
+ <bezel name="lamp27" element="High_Score_To_Date"><bounds x="438" y="6" width="90" height="11" /></bezel> <!-- Backbox ~ High Score To Date -->
+ <bezel name="lamp42" element="Game_Over"><bounds x="580" y="300" width="45" height="11" /></bezel> <!-- Backbox ~ Game Over -->
+ <bezel name="lamp57" element="Tilt"><bounds x="480" y="297" width="50" height="16" /></bezel> <!-- Backbox ~ Tilt -->
diff --git a/src/mame/layout/by35_playboy.lay b/src/mame/layout/by35_playboy.lay
index f8d18474c6e..51c544f2207 100644
--- a/src/mame/layout/by35_playboy.lay
+++ b/src/mame/layout/by35_playboy.lay
@@ -216,11 +216,11 @@
<disk state="0"><color red="0.15" green="0.15" blue="0.15" /></disk>
<disk state="1"><color red="1.00" green="1.00" blue="1.00" /></disk>
</element>
- <element name="Lamp_Red" defstate="0"> <!-- Usually for Specials -->
+ <element name="Lamp_Red" defstate="0"> <!-- Usually for Specials -->
<disk state="0"><color red="0.15" green="0.00" blue="0.00" /></disk>
<disk state="1"><color red="1.00" green="0.00" blue="0.00" /></disk>
</element>
- <element name="Lamp_Amber" defstate="0"> <!-- Usually for Extra Ball-->
+ <element name="Lamp_Amber" defstate="0"> <!-- Usually for Extra Ball-->
<disk state="0"><color red="0.15" green="0.06" blue="0.00" /></disk>
<disk state="1"><color red="1.00" green="0.40" blue="0.00" /></disk>
</element>
@@ -409,7 +409,7 @@
</element>
- <element name="Lamp_Red_Arrow_08" defstate="1"> <!-- Point at 8 o clock -->
+ <element name="Lamp_Red_Arrow_08" defstate="1"> <!-- Point at 8 o clock -->
<rect state="1"><color red="1.00" green="0.00" blue="0.00" /><bounds x="28" y="00" width="08" height="03" /></rect>
<rect state="0"><color red="0.15" green="0.00" blue="0.00" /><bounds x="28" y="00" width="08" height="03" /></rect>
<rect state="1"><color red="1.00" green="0.00" blue="0.00" /><bounds x="23" y="03" width="08" height="03" /></rect>
@@ -430,7 +430,7 @@
<rect state="0"><color red="0.15" green="0.00" blue="0.00" /><bounds x="00" y="18" width="20" height="03" /></rect>
</element>
- <element name="Lamp_Amber_Arrow_10" defstate="1"> <!-- Point at 10 o clock -->
+ <element name="Lamp_Amber_Arrow_10" defstate="1"> <!-- Point at 10 o clock -->
<rect state="1"><color red="1.00" green="0.40" blue="0.00" /><bounds x="28" y="18" width="08" height="03" /></rect>
<rect state="0"><color red="0.15" green="0.06" blue="0.00" /><bounds x="28" y="18" width="08" height="03" /></rect>
<rect state="1"><color red="1.00" green="0.40" blue="0.00" /><bounds x="23" y="15" width="08" height="03" /></rect>
@@ -451,7 +451,7 @@
<rect state="0"><color red="0.15" green="0.06" blue="0.00" /><bounds x="00" y="00" width="20" height="03" /></rect>
</element>
- <element name="Lamp_White_Arrow_01" defstate="1"> <!-- Point at 1 o clock -->
+ <element name="Lamp_White_Arrow_01" defstate="1"> <!-- Point at 1 o clock -->
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="18" y="00" width="03" height="20" /></rect>
<rect state="0"><color red="0.15" green="0.15" blue="0.15" /><bounds x="18" y="00" width="03" height="20" /></rect>
<rect state="1"><color red="1.00" green="1.00" blue="1.00" /><bounds x="15" y="02" width="03" height="17" /></rect>
@@ -527,7 +527,7 @@
<disk state="0"><color red="0.0" green="0.25" blue="0.0" /></disk>
<disk state="1"><color red="0.0" green="1.00" blue="0.0" /></disk>
</element>
-
+
<!-- Solenoids -->
@@ -633,14 +633,14 @@
<!-- Background -->
<backdrop element="Canvas"><bounds x="000" y="000" width="640" height="480" /></backdrop>
-
+
<bezel element="Draw_White"><bounds x="000" y="000" width="640" height="001" /></bezel>
<bezel element="Draw_White"><bounds x="000" y="000" width="001" height="480" /></bezel>
<bezel element="Draw_White"><bounds x="640" y="000" width="001" height="480" /></bezel>
<bezel element="Draw_White"><bounds x="000" y="480" width="640" height="001" /></bezel>
<bezel element="Draw_White"><bounds x="320" y="000" width="001" height="480" /></bezel>
<bezel element="Draw_White"><bounds x="320" y="320" width="320" height="001" /></bezel>
- <!-- <bezel element="Draw_White"><bounds x="159" y="000" width="001" height="480" /></bezel> -->
+ <!-- <bezel element="Draw_White"><bounds x="159" y="000" width="001" height="480" /></bezel> -->
<bezel element="Title_Playboy"><bounds x="430" y="18" width="105" height="30" /></bezel>
@@ -658,7 +658,7 @@
<!-- Player 1 Score -->
- <bezel name="lamp14" element="Lamp_P1"><bounds x="330" y="55" width="15" height="15" /></bezel> <!-- Backbox ~ 1st Player Up -->
+ <bezel name="lamp14" element="Lamp_P1"><bounds x="330" y="55" width="15" height="15" /></bezel> <!-- Backbox ~ 1st Player Up -->
<bezel name="digit17" element="Digit"><bounds x="360" y="55" width="10" height="15" /></bezel>
<bezel name="digit16" element="Digit"><bounds x="374" y="55" width="10" height="15" /></bezel>
<bezel name="digit15" element="Digit"><bounds x="388" y="55" width="10" height="15" /></bezel>
@@ -668,7 +668,7 @@
<bezel name="digit11" element="Digit"><bounds x="444" y="55" width="10" height="15" /></bezel>
<!-- Player 2 Score -->
- <bezel name="lamp29" element="Lamp_P2"><bounds x="615" y="55" width="15" height="15" /></bezel> <!-- Backbox ~ 2nd Player Up -->
+ <bezel name="lamp29" element="Lamp_P2"><bounds x="615" y="55" width="15" height="15" /></bezel> <!-- Backbox ~ 2nd Player Up -->
<bezel name="digit27" element="Digit"><bounds x="506" y="55" width="10" height="15" /></bezel>
<bezel name="digit26" element="Digit"><bounds x="520" y="55" width="10" height="15" /></bezel>
<bezel name="digit25" element="Digit"><bounds x="534" y="55" width="10" height="15" /></bezel>
@@ -678,7 +678,7 @@
<bezel name="digit21" element="Digit"><bounds x="590" y="55" width="10" height="15" /></bezel>
<!-- Player 3 Score -->
- <bezel name="lamp44" element="Lamp_P3"><bounds x="330" y="250" width="15" height="15" /></bezel> <!-- Backbox ~ 3rd Player Up -->
+ <bezel name="lamp44" element="Lamp_P3"><bounds x="330" y="250" width="15" height="15" /></bezel> <!-- Backbox ~ 3rd Player Up -->
<bezel name="digit37" element="Digit"><bounds x="360" y="250" width="10" height="15" /></bezel>
<bezel name="digit36" element="Digit"><bounds x="374" y="250" width="10" height="15" /></bezel>
<bezel name="digit35" element="Digit"><bounds x="388" y="250" width="10" height="15" /></bezel>
@@ -688,7 +688,7 @@
<bezel name="digit31" element="Digit"><bounds x="444" y="250" width="10" height="15" /></bezel>
<!-- Player 4 Score -->
- <bezel name="lamp59" element="Lamp_P4"><bounds x="615" y="250" width="15" height="15" /></bezel> <!-- Backbox ~ 4th Player Up -->
+ <bezel name="lamp59" element="Lamp_P4"><bounds x="615" y="250" width="15" height="15" /></bezel> <!-- Backbox ~ 4th Player Up -->
<bezel name="digit47" element="Digit"><bounds x="506" y="250" width="10" height="15" /></bezel>
<bezel name="digit46" element="Digit"><bounds x="520" y="250" width="10" height="15" /></bezel>
<bezel name="digit45" element="Digit"><bounds x="534" y="250" width="10" height="15" /></bezel>
@@ -699,21 +699,21 @@
<!-- Credits and Ball In Play / Match -->
<bezel element="Text_Credit"><bounds x="542" y="142" width="48" height="8" /></bezel>
- <bezel name="lamp12" element="Ball_In_Play"><bounds x="586" y="105" width="50" height="11" /></bezel> <!-- Backbox ~ Ball In Play -->
- <bezel name="lamp25" element="Match"><bounds x="596" y="152" width="25" height="11" /></bezel> <!-- Backbox ~ Match -->
+ <bezel name="lamp12" element="Ball_In_Play"><bounds x="586" y="105" width="50" height="11" /></bezel> <!-- Backbox ~ Ball In Play -->
+ <bezel name="lamp25" element="Match"><bounds x="596" y="152" width="25" height="11" /></bezel> <!-- Backbox ~ Match -->
<bezel name="digit55" element="Digit"><bounds x="554" y="125" width="10" height="15" /></bezel>
<bezel name="digit54" element="Digit"><bounds x="568" y="125" width="10" height="15" /></bezel>
<bezel name="digit52" element="Digit"><bounds x="596" y="125" width="10" height="15" /></bezel>
<bezel name="digit51" element="Digit"><bounds x="610" y="125" width="10" height="15" /></bezel>
- <bezel name="lamp10" element="Shoot_Again"><bounds x="420" y="295" width="60" height="19" /></bezel> <!-- Backbox ~ Same Player Shoots Again -->
- <bezel name="lamp13" element="Lamp_1P"><bounds x="345" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 1 Player Game -->
- <bezel name="lamp28" element="Lamp_2P"><bounds x="360" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 2 Player Game -->
- <bezel name="lamp43" element="Lamp_3P"><bounds x="375" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 3 Player Game -->
- <bezel name="lamp58" element="Lamp_4P"><bounds x="390" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 4 Player Game -->
- <bezel name="lamp27" element="High_Score_To_Date"><bounds x="438" y="6" width="90" height="11" /></bezel> <!-- Backbox ~ High Score To Date -->
- <bezel name="lamp42" element="Game_Over"><bounds x="580" y="300" width="45" height="11" /></bezel> <!-- Backbox ~ Game Over -->
- <bezel name="lamp57" element="Tilt"><bounds x="480" y="297" width="50" height="16" /></bezel> <!-- Backbox ~ Tilt -->
+ <bezel name="lamp10" element="Shoot_Again"><bounds x="420" y="295" width="60" height="19" /></bezel> <!-- Backbox ~ Same Player Shoots Again -->
+ <bezel name="lamp13" element="Lamp_1P"><bounds x="345" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 1 Player Game -->
+ <bezel name="lamp28" element="Lamp_2P"><bounds x="360" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 2 Player Game -->
+ <bezel name="lamp43" element="Lamp_3P"><bounds x="375" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 3 Player Game -->
+ <bezel name="lamp58" element="Lamp_4P"><bounds x="390" y="297" width="15" height="15" /></bezel> <!-- Backbox ~ 4 Player Game -->
+ <bezel name="lamp27" element="High_Score_To_Date"><bounds x="438" y="6" width="90" height="11" /></bezel> <!-- Backbox ~ High Score To Date -->
+ <bezel name="lamp42" element="Game_Over"><bounds x="580" y="300" width="45" height="11" /></bezel> <!-- Backbox ~ Game Over -->
+ <bezel name="lamp57" element="Tilt"><bounds x="480" y="297" width="50" height="16" /></bezel> <!-- Backbox ~ Tilt -->
@@ -724,72 +724,72 @@
<bezel element="Text_60"><bounds x="552" y="418" width="30" height="11" /></bezel>
<!-- Lamps controlled by U1 on Lamp Driver Board -->
- <bezel name="lamp0" element="Lamp_White"><bounds x="330" y="375" width="8" height="8" /></bezel> <!-- U1 00 -->
- <bezel name="lamp1" element="Lamp_White"><bounds x="345" y="375" width="8" height="8" /></bezel> <!-- U1 01 -->
- <bezel name="lamp2" element="Lamp_White"><bounds x="360" y="375" width="8" height="8" /></bezel> <!-- U1 02 -->
- <bezel name="lamp3" element="Lamp_White"><bounds x="375" y="375" width="8" height="8" /></bezel> <!-- U1 03 -->
- <bezel name="lamp4" element="Lamp_White"><bounds x="390" y="375" width="8" height="8" /></bezel> <!-- U1 04 -->
- <bezel name="lamp5" element="Lamp_White"><bounds x="405" y="375" width="8" height="8" /></bezel> <!-- U1 05 -->
- <bezel name="lamp6" element="Lamp_White"><bounds x="420" y="375" width="8" height="8" /></bezel> <!-- U1 06 -->
- <bezel name="lamp7" element="Lamp_White"><bounds x="435" y="375" width="8" height="8" /></bezel> <!-- U1 07 -->
- <bezel name="lamp8" element="Lamp_White"><bounds x="450" y="375" width="8" height="8" /></bezel> <!-- U1 08 -->
- <bezel name="lamp9" element="Lamp_White"><bounds x="465" y="375" width="8" height="8" /></bezel> <!-- U1 09 -->
- <bezel name="lamp10" element="Lamp_White"><bounds x="480" y="375" width="8" height="8" /></bezel> <!-- U1 10 -->
- <bezel name="lamp11" element="Lamp_White"><bounds x="495" y="375" width="8" height="8" /></bezel> <!-- U1 11 -->
- <bezel name="lamp12" element="Lamp_White"><bounds x="510" y="375" width="8" height="8" /></bezel> <!-- U1 12 -->
- <bezel name="lamp13" element="Lamp_White"><bounds x="525" y="375" width="8" height="8" /></bezel> <!-- U1 13 -->
- <bezel name="lamp14" element="Lamp_White"><bounds x="540" y="375" width="8" height="8" /></bezel> <!-- U1 14 -->
+ <bezel name="lamp0" element="Lamp_White"><bounds x="330" y="375" width="8" height="8" /></bezel> <!-- U1 00 -->
+ <bezel name="lamp1" element="Lamp_White"><bounds x="345" y="375" width="8" height="8" /></bezel> <!-- U1 01 -->
+ <bezel name="lamp2" element="Lamp_White"><bounds x="360" y="375" width="8" height="8" /></bezel> <!-- U1 02 -->
+ <bezel name="lamp3" element="Lamp_White"><bounds x="375" y="375" width="8" height="8" /></bezel> <!-- U1 03 -->
+ <bezel name="lamp4" element="Lamp_White"><bounds x="390" y="375" width="8" height="8" /></bezel> <!-- U1 04 -->
+ <bezel name="lamp5" element="Lamp_White"><bounds x="405" y="375" width="8" height="8" /></bezel> <!-- U1 05 -->
+ <bezel name="lamp6" element="Lamp_White"><bounds x="420" y="375" width="8" height="8" /></bezel> <!-- U1 06 -->
+ <bezel name="lamp7" element="Lamp_White"><bounds x="435" y="375" width="8" height="8" /></bezel> <!-- U1 07 -->
+ <bezel name="lamp8" element="Lamp_White"><bounds x="450" y="375" width="8" height="8" /></bezel> <!-- U1 08 -->
+ <bezel name="lamp9" element="Lamp_White"><bounds x="465" y="375" width="8" height="8" /></bezel> <!-- U1 09 -->
+ <bezel name="lamp10" element="Lamp_White"><bounds x="480" y="375" width="8" height="8" /></bezel> <!-- U1 10 -->
+ <bezel name="lamp11" element="Lamp_White"><bounds x="495" y="375" width="8" height="8" /></bezel> <!-- U1 11 -->
+ <bezel name="lamp12" element="Lamp_White"><bounds x="510" y="375" width="8" height="8" /></bezel> <!-- U1 12 -->
+ <bezel name="lamp13" element="Lamp_White"><bounds x="525" y="375" width="8" height="8" /></bezel> <!-- U1 13 -->
+ <bezel name="lamp14" element="Lamp_White"><bounds x="540" y="375" width="8" height="8" /></bezel> <!-- U1 14 -->
<!-- Lamps controlled by U2 on Lamp Driver Board -->
- <bezel name="lamp15" element="Lamp_White"><bounds x="330" y="390" width="8" height="8" /></bezel> <!-- U2 00 -->
- <bezel name="lamp16" element="Lamp_White"><bounds x="345" y="390" width="8" height="8" /></bezel> <!-- U2 01 -->
- <bezel name="lamp17" element="Lamp_White"><bounds x="360" y="390" width="8" height="8" /></bezel> <!-- U2 02 -->
- <bezel name="lamp18" element="Lamp_White"><bounds x="375" y="390" width="8" height="8" /></bezel> <!-- U2 03 -->
- <bezel name="lamp19" element="Lamp_White"><bounds x="390" y="390" width="8" height="8" /></bezel> <!-- U2 04 -->
- <bezel name="lamp20" element="Lamp_White"><bounds x="405" y="390" width="8" height="8" /></bezel> <!-- U2 05 -->
- <bezel name="lamp21" element="Lamp_White"><bounds x="420" y="390" width="8" height="8" /></bezel> <!-- U2 06 -->
- <bezel name="lamp22" element="Lamp_White"><bounds x="435" y="390" width="8" height="8" /></bezel> <!-- U2 07 -->
- <bezel name="lamp23" element="Lamp_White"><bounds x="450" y="390" width="8" height="8" /></bezel> <!-- U2 08 -->
- <bezel name="lamp24" element="Lamp_White"><bounds x="465" y="390" width="8" height="8" /></bezel> <!-- U2 09 -->
- <bezel name="lamp25" element="Lamp_White"><bounds x="480" y="390" width="8" height="8" /></bezel> <!-- U2 10 -->
- <bezel name="lamp26" element="Lamp_White"><bounds x="495" y="390" width="8" height="8" /></bezel> <!-- U2 11 -->
- <bezel name="lamp27" element="Lamp_White"><bounds x="510" y="390" width="8" height="8" /></bezel> <!-- U2 12 -->
- <bezel name="lamp28" element="Lamp_White"><bounds x="525" y="390" width="8" height="8" /></bezel> <!-- U2 13 -->
- <bezel name="lamp29" element="Lamp_White"><bounds x="540" y="390" width="8" height="8" /></bezel> <!-- U2 14 -->
+ <bezel name="lamp15" element="Lamp_White"><bounds x="330" y="390" width="8" height="8" /></bezel> <!-- U2 00 -->
+ <bezel name="lamp16" element="Lamp_White"><bounds x="345" y="390" width="8" height="8" /></bezel> <!-- U2 01 -->
+ <bezel name="lamp17" element="Lamp_White"><bounds x="360" y="390" width="8" height="8" /></bezel> <!-- U2 02 -->
+ <bezel name="lamp18" element="Lamp_White"><bounds x="375" y="390" width="8" height="8" /></bezel> <!-- U2 03 -->
+ <bezel name="lamp19" element="Lamp_White"><bounds x="390" y="390" width="8" height="8" /></bezel> <!-- U2 04 -->
+ <bezel name="lamp20" element="Lamp_White"><bounds x="405" y="390" width="8" height="8" /></bezel> <!-- U2 05 -->
+ <bezel name="lamp21" element="Lamp_White"><bounds x="420" y="390" width="8" height="8" /></bezel> <!-- U2 06 -->
+ <bezel name="lamp22" element="Lamp_White"><bounds x="435" y="390" width="8" height="8" /></bezel> <!-- U2 07 -->
+ <bezel name="lamp23" element="Lamp_White"><bounds x="450" y="390" width="8" height="8" /></bezel> <!-- U2 08 -->
+ <bezel name="lamp24" element="Lamp_White"><bounds x="465" y="390" width="8" height="8" /></bezel> <!-- U2 09 -->
+ <bezel name="lamp25" element="Lamp_White"><bounds x="480" y="390" width="8" height="8" /></bezel> <!-- U2 10 -->
+ <bezel name="lamp26" element="Lamp_White"><bounds x="495" y="390" width="8" height="8" /></bezel> <!-- U2 11 -->
+ <bezel name="lamp27" element="Lamp_White"><bounds x="510" y="390" width="8" height="8" /></bezel> <!-- U2 12 -->
+ <bezel name="lamp28" element="Lamp_White"><bounds x="525" y="390" width="8" height="8" /></bezel> <!-- U2 13 -->
+ <bezel name="lamp29" element="Lamp_White"><bounds x="540" y="390" width="8" height="8" /></bezel> <!-- U2 14 -->
<!-- Lamps controlled by U3 on Lamp Driver Board -->
- <bezel name="lamp30" element="Lamp_White"><bounds x="330" y="405" width="8" height="8" /></bezel> <!-- U3 00 -->
- <bezel name="lamp31" element="Lamp_White"><bounds x="345" y="405" width="8" height="8" /></bezel> <!-- U3 01 -->
- <bezel name="lamp32" element="Lamp_White"><bounds x="360" y="405" width="8" height="8" /></bezel> <!-- U3 02 -->
- <bezel name="lamp33" element="Lamp_White"><bounds x="375" y="405" width="8" height="8" /></bezel> <!-- U3 03 -->
- <bezel name="lamp34" element="Lamp_White"><bounds x="390" y="405" width="8" height="8" /></bezel> <!-- U3 04 -->
- <bezel name="lamp35" element="Lamp_White"><bounds x="405" y="405" width="8" height="8" /></bezel> <!-- U3 05 -->
- <bezel name="lamp36" element="Lamp_White"><bounds x="420" y="405" width="8" height="8" /></bezel> <!-- U3 06 -->
- <bezel name="lamp37" element="Lamp_White"><bounds x="435" y="405" width="8" height="8" /></bezel> <!-- U3 07 -->
- <bezel name="lamp38" element="Lamp_White"><bounds x="450" y="405" width="8" height="8" /></bezel> <!-- U3 08 -->
- <bezel name="lamp39" element="Lamp_White"><bounds x="465" y="405" width="8" height="8" /></bezel> <!-- U3 09 -->
- <bezel name="lamp40" element="Lamp_White"><bounds x="480" y="405" width="8" height="8" /></bezel> <!-- U3 10 -->
- <bezel name="lamp41" element="Lamp_White"><bounds x="495" y="405" width="8" height="8" /></bezel> <!-- U3 11 -->
- <bezel name="lamp42" element="Lamp_White"><bounds x="510" y="405" width="8" height="8" /></bezel> <!-- U3 12 -->
- <bezel name="lamp43" element="Lamp_White"><bounds x="525" y="405" width="8" height="8" /></bezel> <!-- U3 13 -->
- <bezel name="lamp44" element="Lamp_White"><bounds x="540" y="405" width="8" height="8" /></bezel> <!-- U3 14 -->
+ <bezel name="lamp30" element="Lamp_White"><bounds x="330" y="405" width="8" height="8" /></bezel> <!-- U3 00 -->
+ <bezel name="lamp31" element="Lamp_White"><bounds x="345" y="405" width="8" height="8" /></bezel> <!-- U3 01 -->
+ <bezel name="lamp32" element="Lamp_White"><bounds x="360" y="405" width="8" height="8" /></bezel> <!-- U3 02 -->
+ <bezel name="lamp33" element="Lamp_White"><bounds x="375" y="405" width="8" height="8" /></bezel> <!-- U3 03 -->
+ <bezel name="lamp34" element="Lamp_White"><bounds x="390" y="405" width="8" height="8" /></bezel> <!-- U3 04 -->
+ <bezel name="lamp35" element="Lamp_White"><bounds x="405" y="405" width="8" height="8" /></bezel> <!-- U3 05 -->
+ <bezel name="lamp36" element="Lamp_White"><bounds x="420" y="405" width="8" height="8" /></bezel> <!-- U3 06 -->
+ <bezel name="lamp37" element="Lamp_White"><bounds x="435" y="405" width="8" height="8" /></bezel> <!-- U3 07 -->
+ <bezel name="lamp38" element="Lamp_White"><bounds x="450" y="405" width="8" height="8" /></bezel> <!-- U3 08 -->
+ <bezel name="lamp39" element="Lamp_White"><bounds x="465" y="405" width="8" height="8" /></bezel> <!-- U3 09 -->
+ <bezel name="lamp40" element="Lamp_White"><bounds x="480" y="405" width="8" height="8" /></bezel> <!-- U3 10 -->
+ <bezel name="lamp41" element="Lamp_White"><bounds x="495" y="405" width="8" height="8" /></bezel> <!-- U3 11 -->
+ <bezel name="lamp42" element="Lamp_White"><bounds x="510" y="405" width="8" height="8" /></bezel> <!-- U3 12 -->
+ <bezel name="lamp43" element="Lamp_White"><bounds x="525" y="405" width="8" height="8" /></bezel> <!-- U3 13 -->
+ <bezel name="lamp44" element="Lamp_White"><bounds x="540" y="405" width="8" height="8" /></bezel> <!-- U3 14 -->
<!-- Lamps controlled by U4 on Lamp Driver Board -->
- <bezel name="lamp45" element="Lamp_White"><bounds x="330" y="420" width="8" height="8" /></bezel> <!-- U4 00 -->
- <bezel name="lamp46" element="Lamp_White"><bounds x="345" y="420" width="8" height="8" /></bezel> <!-- U4 01 -->
- <bezel name="lamp47" element="Lamp_White"><bounds x="360" y="420" width="8" height="8" /></bezel> <!-- U4 02 -->
- <bezel name="lamp48" element="Lamp_White"><bounds x="375" y="420" width="8" height="8" /></bezel> <!-- U4 03 -->
- <bezel name="lamp49" element="Lamp_White"><bounds x="390" y="420" width="8" height="8" /></bezel> <!-- U4 04 -->
- <bezel name="lamp50" element="Lamp_White"><bounds x="405" y="420" width="8" height="8" /></bezel> <!-- U4 05 -->
- <bezel name="lamp51" element="Lamp_White"><bounds x="420" y="420" width="8" height="8" /></bezel> <!-- U4 06 -->
- <bezel name="lamp52" element="Lamp_White"><bounds x="435" y="420" width="8" height="8" /></bezel> <!-- U4 07 -->
- <bezel name="lamp53" element="Lamp_White"><bounds x="450" y="420" width="8" height="8" /></bezel> <!-- U4 08 -->
- <bezel name="lamp54" element="Lamp_White"><bounds x="465" y="420" width="8" height="8" /></bezel> <!-- U4 09 -->
- <bezel name="lamp55" element="Lamp_White"><bounds x="480" y="420" width="8" height="8" /></bezel> <!-- U4 10 -->
- <bezel name="lamp56" element="Lamp_White"><bounds x="495" y="420" width="8" height="8" /></bezel> <!-- U4 11 -->
- <bezel name="lamp57" element="Lamp_White"><bounds x="510" y="420" width="8" height="8" /></bezel> <!-- U4 12 -->
- <bezel name="lamp58" element="Lamp_White"><bounds x="525" y="420" width="8" height="8" /></bezel> <!-- U4 13 -->
- <bezel name="lamp59" element="Lamp_White"><bounds x="540" y="420" width="8" height="8" /></bezel> <!-- U4 14 -->
+ <bezel name="lamp45" element="Lamp_White"><bounds x="330" y="420" width="8" height="8" /></bezel> <!-- U4 00 -->
+ <bezel name="lamp46" element="Lamp_White"><bounds x="345" y="420" width="8" height="8" /></bezel> <!-- U4 01 -->
+ <bezel name="lamp47" element="Lamp_White"><bounds x="360" y="420" width="8" height="8" /></bezel> <!-- U4 02 -->
+ <bezel name="lamp48" element="Lamp_White"><bounds x="375" y="420" width="8" height="8" /></bezel> <!-- U4 03 -->
+ <bezel name="lamp49" element="Lamp_White"><bounds x="390" y="420" width="8" height="8" /></bezel> <!-- U4 04 -->
+ <bezel name="lamp50" element="Lamp_White"><bounds x="405" y="420" width="8" height="8" /></bezel> <!-- U4 05 -->
+ <bezel name="lamp51" element="Lamp_White"><bounds x="420" y="420" width="8" height="8" /></bezel> <!-- U4 06 -->
+ <bezel name="lamp52" element="Lamp_White"><bounds x="435" y="420" width="8" height="8" /></bezel> <!-- U4 07 -->
+ <bezel name="lamp53" element="Lamp_White"><bounds x="450" y="420" width="8" height="8" /></bezel> <!-- U4 08 -->
+ <bezel name="lamp54" element="Lamp_White"><bounds x="465" y="420" width="8" height="8" /></bezel> <!-- U4 09 -->
+ <bezel name="lamp55" element="Lamp_White"><bounds x="480" y="420" width="8" height="8" /></bezel> <!-- U4 10 -->
+ <bezel name="lamp56" element="Lamp_White"><bounds x="495" y="420" width="8" height="8" /></bezel> <!-- U4 11 -->
+ <bezel name="lamp57" element="Lamp_White"><bounds x="510" y="420" width="8" height="8" /></bezel> <!-- U4 12 -->
+ <bezel name="lamp58" element="Lamp_White"><bounds x="525" y="420" width="8" height="8" /></bezel> <!-- U4 13 -->
+ <bezel name="lamp59" element="Lamp_White"><bounds x="540" y="420" width="8" height="8" /></bezel> <!-- U4 14 -->
<bezel element="Text_Solenoids"><bounds x="382" y="437" width="100" height="11" /></bezel>
@@ -837,14 +837,14 @@
<!-- Misc Lamps -->
- <bezel name="lamp55" element="Credit_Indicator"> <bounds x="023" y="456" width="70" height="21" /></bezel> <!-- Credit Indicator -->
- <bezel name="lamp40" element="Lamp_Amber"> <bounds x="153.5" y="420" width="12" height="12" /></bezel> <!-- Extra Ball -->
- <bezel name="lamp49" element="Lamp_Red"> <bounds x="209" y="192" width="14" height="14" /></bezel> <!-- Special Drop Targets -->
- <bezel name="lamp47" element="Lamp_Red"> <bounds x="155" y="023" width="09" height="9" /></bezel> <!-- Special 1 - 5 Keys -->
- <bezel name="lamp56" element="Lamp_White_25k"> <bounds x="009" y="333" width="09" height="9" /></bezel> <!-- 25,000 Outlane Left -->
- <bezel name="lamp41" element="Lamp_White_25k"> <bounds x="301" y="333" width="09" height="9" /></bezel> <!-- 25,000 Outlane Right -->
- <bezel name="lamp53" element="Lamp_Amber_Arrow_10"><bounds x="055" y="198" width="20" height="12.5" /></bezel> <!-- Extra Ball Potential Rollover Button -->
- <bezel name="lamp38" element="Lamp_Red_Arrow_08"> <bounds x="055" y="148" width="20" height="12.5" /></bezel> <!-- Special Potential Rollover Button -->
+ <bezel name="lamp55" element="Credit_Indicator"> <bounds x="023" y="456" width="70" height="21" /></bezel> <!-- Credit Indicator -->
+ <bezel name="lamp40" element="Lamp_Amber"> <bounds x="153.5" y="420" width="12" height="12" /></bezel> <!-- Extra Ball -->
+ <bezel name="lamp49" element="Lamp_Red"> <bounds x="209" y="192" width="14" height="14" /></bezel> <!-- Special Drop Targets -->
+ <bezel name="lamp47" element="Lamp_Red"> <bounds x="155" y="023" width="09" height="9" /></bezel> <!-- Special 1 - 5 Keys -->
+ <bezel name="lamp56" element="Lamp_White_25k"> <bounds x="009" y="333" width="09" height="9" /></bezel> <!-- 25,000 Outlane Left -->
+ <bezel name="lamp41" element="Lamp_White_25k"> <bounds x="301" y="333" width="09" height="9" /></bezel> <!-- 25,000 Outlane Right -->
+ <bezel name="lamp53" element="Lamp_Amber_Arrow_10"><bounds x="055" y="198" width="20" height="12.5" /></bezel> <!-- Extra Ball Potential Rollover Button -->
+ <bezel name="lamp38" element="Lamp_Red_Arrow_08"> <bounds x="055" y="148" width="20" height="12.5" /></bezel> <!-- Special Potential Rollover Button -->
<!-- Bonus End of Ball Lamps -->
<bezel name="lamp0" element="Lamp_White_1k"> <bounds x="126" y="395" width="09" height="09" /></bezel>
<bezel name="lamp15" element="Lamp_White_2k"> <bounds x="126" y="380" width="09" height="09" /></bezel>
@@ -858,22 +858,22 @@
<bezel name="lamp17" element="Lamp_White_10k"><bounds x="184" y="395" width="09" height="09" /></bezel>
<bezel name="lamp32" element="Lamp_White_20k"><bounds x="154" y="330" width="12" height="12" /></bezel>
<!-- Bonus Multiplier Lamps -->
- <bezel name="lamp51" element="Lamp_2x"><bounds x="134" y="318" width="14" height="14" /></bezel> <!-- 2X Bonus -->
- <bezel name="lamp36" element="Lamp_3x"><bounds x="172" y="318" width="14" height="14" /></bezel> <!-- 3X Bonus -->
- <bezel name="lamp21" element="Lamp_5x"><bounds x="153" y="310" width="14" height="14" /></bezel> <!-- 5X Bonus -->
+ <bezel name="lamp51" element="Lamp_2x"><bounds x="134" y="318" width="14" height="14" /></bezel> <!-- 2X Bonus -->
+ <bezel name="lamp36" element="Lamp_3x"><bounds x="172" y="318" width="14" height="14" /></bezel> <!-- 3X Bonus -->
+ <bezel name="lamp21" element="Lamp_5x"><bounds x="153" y="310" width="14" height="14" /></bezel> <!-- 5X Bonus -->
<!-- Grotto Lamps -->
- <bezel name="lamp19" element="Lamp_White_25k"><bounds x="17" y="090" width="12" height="12" /></bezel> <!-- 25,000 Grotto -->
- <bezel name="lamp5" element="Lamp_White_1"> <bounds x="09" y="132" width="09" height="09" /></bezel> <!-- 1 -->
- <bezel name="lamp20" element="Lamp_White_2"> <bounds x="09" y="147" width="09" height="09" /></bezel> <!-- 2 -->
- <bezel name="lamp35" element="Lamp_White_3"> <bounds x="09" y="162" width="09" height="09" /></bezel> <!-- 3 -->
- <bezel name="lamp50" element="Lamp_White_4"> <bounds x="09" y="177" width="09" height="09" /></bezel> <!-- 4 -->
- <bezel name="lamp6" element="Lamp_White_5"> <bounds x="09" y="192" width="09" height="09" /></bezel> <!-- 5 -->
+ <bezel name="lamp19" element="Lamp_White_25k"><bounds x="17" y="090" width="12" height="12" /></bezel> <!-- 25,000 Grotto -->
+ <bezel name="lamp5" element="Lamp_White_1"> <bounds x="09" y="132" width="09" height="09" /></bezel> <!-- 1 -->
+ <bezel name="lamp20" element="Lamp_White_2"> <bounds x="09" y="147" width="09" height="09" /></bezel> <!-- 2 -->
+ <bezel name="lamp35" element="Lamp_White_3"> <bounds x="09" y="162" width="09" height="09" /></bezel> <!-- 3 -->
+ <bezel name="lamp50" element="Lamp_White_4"> <bounds x="09" y="177" width="09" height="09" /></bezel> <!-- 4 -->
+ <bezel name="lamp6" element="Lamp_White_5"> <bounds x="09" y="192" width="09" height="09" /></bezel> <!-- 5 -->
<!-- Playmate of the Month Lamps -->
- <bezel name="lamp7" element="Lamp_White_March"> <bounds x="56" y="225" width="21" height="18" /></bezel> <!-- March -->
- <bezel name="lamp22" element="Lamp_White_May"> <bounds x="50" y="244" width="13" height="18" /></bezel> <!-- May -->
- <bezel name="lamp37" element="Lamp_White_January"> <bounds x="44" y="263" width="29" height="18" /></bezel> <!-- January -->
- <bezel name="lamp52" element="Lamp_White_July"> <bounds x="38" y="282" width="16" height="18" /></bezel> <!-- July -->
- <bezel name="lamp8" element="Lamp_White_September"><bounds x="32" y="301" width="37" height="18" /></bezel> <!-- September -->
+ <bezel name="lamp7" element="Lamp_White_March"> <bounds x="56" y="225" width="21" height="18" /></bezel> <!-- March -->
+ <bezel name="lamp22" element="Lamp_White_May"> <bounds x="50" y="244" width="13" height="18" /></bezel> <!-- May -->
+ <bezel name="lamp37" element="Lamp_White_January"> <bounds x="44" y="263" width="29" height="18" /></bezel> <!-- January -->
+ <bezel name="lamp52" element="Lamp_White_July"> <bounds x="38" y="282" width="16" height="18" /></bezel> <!-- July -->
+ <bezel name="lamp8" element="Lamp_White_September"><bounds x="32" y="301" width="37" height="18" /></bezel> <!-- September -->
diff --git a/src/mame/machine/apollo.c b/src/mame/machine/apollo.c
index 90a8bbaa6e6..3a02c7dab1f 100644
--- a/src/mame/machine/apollo.c
+++ b/src/mame/machine/apollo.c
@@ -970,7 +970,7 @@ bool apollo_ni::call_load()
CLOG1(("apollo_ni::call_load: %s", filename()));
UINT64 size = length();
- if (size != 32)
+ if (size != 32)
{
CLOG(("apollo_ni::call_load: %s has unexpected file size %" I64FMT "d", filename(), size));
}
diff --git a/src/mame/machine/electron.c b/src/mame/machine/electron.c
index 225f4da5a7a..5ed4ca1e07a 100644
--- a/src/mame/machine/electron.c
+++ b/src/mame/machine/electron.c
@@ -249,7 +249,7 @@ WRITE8_MEMBER(electron_state::electron_ula_w)
{
/* GUESS
* the Advanced Users manual says this is the correct algorithm
- * but the divider is wrong(?), says 16 but results in high pitch,
+ * but the divider is wrong(?), says 16 but results in high pitch,
* 32 is more close
*/
m_beeper->set_frequency( 1000000 / ( 32 * ( data + 1 ) ) );
diff --git a/src/mame/machine/mm1kb.c b/src/mame/machine/mm1kb.c
index eb951c0cee3..5097eb78225 100644
--- a/src/mame/machine/mm1kb.c
+++ b/src/mame/machine/mm1kb.c
@@ -43,7 +43,7 @@ const rom_entry *mm1_keyboard_t::device_rom_region() const
static const char *const mm1_kb_sample_names[] =
{
"*MM1_keyboard",
- "beep", // beep at 2.6 kHz
+ "beep", // beep at 2.6 kHz
"power_switch", // not actually on the keyboard, but close enough :)
0
};
diff --git a/src/mame/machine/mm1kb.h b/src/mame/machine/mm1kb.h
index 1b635810887..8ccd11d3249 100644
--- a/src/mame/machine/mm1kb.h
+++ b/src/mame/machine/mm1kb.h
@@ -87,8 +87,8 @@ private:
int m_drive;
UINT8 m_data;
- static bool first_time; // for power switch sound
- emu_timer *m_scan_timer; // scan timer
+ static bool first_time; // for power switch sound
+ emu_timer *m_scan_timer; // scan timer
};
diff --git a/src/mame/machine/psxcd.c b/src/mame/machine/psxcd.c
index b4d67f31251..8db3c84c72b 100644
--- a/src/mame/machine/psxcd.c
+++ b/src/mame/machine/psxcd.c
@@ -1244,86 +1244,85 @@ int psxcd_device::add_system_event(int type, UINT64 t, command_result *ptr)
*
*/
ROM_START( psxcd )
- ROM_REGION( 0x10000, "cdrom_mcu", 0 )
-
- /* Retail PlayStation CD-ROM Firmware:
- *
- * Still missing:
- * SCPH-1001, 3000, 3500, 5003, 5502, 5503, 7000W, 7001, 7002, 7003, 7503, 9003, 100, 101, 102 and 103.
- */
-
- ROM_SYSTEM_BIOS( 0, "SCPH-1000-later", "SCPH-1000 NTSC:J (Later Ver.) [424660]" )
- ROMX_LOAD( "424660.bin", 0x0000, 0x4200, CRC(f82a2a46) SHA1(095434948d4c71cdfaa069e91053443887a6d139), ROM_BIOS(1) )
-
- ROM_SYSTEM_BIOS( 1, "SCPH-1000-early", "SCPH-1000 NTSC:J (Early Ver.) [424666]" )
- ROMX_LOAD( "424666.bin", 0x0000, 0x4200, CRC(60bc954e) SHA1(80674353daf95ffb4bd15cc4bb8cfa713370dd45), ROM_BIOS(2) )
-
- ROM_SYSTEM_BIOS( 2, "SCPH-1002-early", "SCPH-1002 PAL (Early PU-8) [424684]" )
- ROMX_LOAD( "424684.bin", 0x0000, 0x4200, CRC(84d46b2a) SHA1(9b06b1d407b784095ddbd45aeabafd689d2ee347), ROM_BIOS(3) )
-
- /* Chip markings: C 1021 / SC430916PB / G63C 185 / JSAB9624F */
- ROM_SYSTEM_BIOS( 3, "SCPH-5000", "SCPH-5000 NTSC:J [SC430916]" )
- ROMX_LOAD( "sc430916.s19", 0x0000, 0xb195, CRC(487c8a40) SHA1(0ae8348fb43ab80845b0166494edc3e1565a3ef7), ROM_BIOS(4) )
-
- /* Chip markings: C 1030 / SC430925PB / G63C 185 / JSBK9708C
- Board Type: PU-18 / 1-664-537-11 */
- ROM_SYSTEM_BIOS( 4, "SCPH-5500", "SCPH-5500 NTSC:J [SC430925]" )
- ROMX_LOAD( "sc430925.s19", 0x0000, 0xb195, CRC(c09aa0c2) SHA1(b9ad66cc8ea4d6e2eb2709ffb77c9647f679097a), ROM_BIOS(5) )
-
- /* Chip markings: C 2030 / SC430930PB / G63C 185 / SSJZ9748A
- Board Type: PU-18 / 1-664-537-62 */
- ROM_SYSTEM_BIOS( 5, "SCPH-5501", "SCPH-5501 NTSC:U/C [SC430930]" )
- ROMX_LOAD( "sc430930.s19", 0x0000, 0xb195, CRC(587b84c2) SHA1(556c3adc37e4eb64fd463c54f7a310c483e0e835), ROM_BIOS(6) )
-
- /* ROM dump is the same as SCPH-5552 */
- ROM_SYSTEM_BIOS( 6, "SCPH-5502", "SCPH-5502 PAL [SC430929]" )
- ROMX_LOAD( "sc430929.bin", 0x0000, 0x4200, CRC(ba87a3e0) SHA1(f23458d13a518616a8592b8ddd668c052bc9be5a), ROM_BIOS(7) )
-
- ROM_SYSTEM_BIOS( 7, "SCPH-5903", "SCPH-5903 NTSC:J [SC430924PB]" )
- ROMX_LOAD( "sc430924.s19", 0x0000, 0xb195, CRC(dbe694b2) SHA1(ac72cb616b1449fe29e52faf6aad389118852d73), ROM_BIOS(8) )
-
- /* Chip markings: C 1040 / SC430934PB / G63C 185 / SSDG9745D */
- ROM_SYSTEM_BIOS( 8, "SCPH-7000", "SCPH-7000 NTSC:J [SC430934]" )
- ROMX_LOAD( "sc430934.s19", 0x0000, 0xb195, CRC(6443740c) SHA1(d9734c7135c75dbe7733079a2d4244a28c9e966e), ROM_BIOS(9) )
-
- /* Chip markings: C 1050 / SC430938PB / G63C 185 / SSAM9850C */
- ROM_SYSTEM_BIOS( 9, "SCPH-7500", "SCPH-7500 NTSC:J [SC430938]" )
- ROMX_LOAD( "sc430938.s19", 0x0000, 0xb195, CRC(9744977a) SHA1(f017d34a98a8a023f6752ba9ed749bb9e2b836d5), ROM_BIOS(10) )
-
- /* Chip markings: C 2050 / SC430940PB / G63C 185 / SSDL9838A */
- ROM_SYSTEM_BIOS( 10, "SCPH-7501", "SCPH-7501 NTSC:U/C [SC430940]" )
- ROMX_LOAD( "sc430940.s19", 0x0000, 0xb195, CRC(fd1c6ee7) SHA1(e72b5093a3e25de1548be7668179ff3e001e3ec5), ROM_BIOS(11) )
-
- ROM_SYSTEM_BIOS( 11, "SCPH-7502", "SCPH-7502 PAL [SC430939]" )
- ROMX_LOAD( "sc430939.bin", 0x0000, 0x4200, CRC(9eafb045) SHA1(25d98454e567e064c06f840d57f763fb7c8b7219), ROM_BIOS(12) )
-
- ROM_SYSTEM_BIOS( 12, "SCPH-9000", "SCPH-9000 NTSC:J [SC430942]" )
- ROMX_LOAD( "sc430942.bin", 0x0000, 0x4200, NO_DUMP, ROM_BIOS(13) )
-
- /* Chip markings: C 2060 / SC430944PB / G63C 185 / SSBR9924C */
- ROM_SYSTEM_BIOS( 13, "SCPH-9001", "SCPH-9001 NTSC:U/C [SC430944]" )
- ROMX_LOAD( "sc430944.s19", 0x0000, 0xb195, CRC(24011dfd) SHA1(db72ba02466942d1a1a07c4d855edd18f84de92e), ROM_BIOS(14) )
-
- ROM_SYSTEM_BIOS( 14, "SCPH-9002", "SCPH-9002 PAL [SC430943]" )
- ROMX_LOAD( "sc430943.bin", 0x0000, 0x4200, CRC(2669a1a7) SHA1(62999e7f8429f381e19d44d2399b6017959f4f13), ROM_BIOS(15) )
-
- /* Development PlayStation CD-ROM Firmware:
- *
- * Still missing:
- * DTL-H1000, 1000H, 1001, 1001H, 1002, 1100, 1101, 1102, 1200, 1201, 2000, 2500, 2700, 3000, 3001 and 3002.
- */
-
- /* Chip markings: D 2021 / SC430920PB / G63C 185 / JSAA9810A
- * Note: Although this is a PAL unit, the ID string in the
- * code is "for US/AEP", so it may be the same for all the
- * debug consoles.
- */
- ROM_SYSTEM_BIOS( 15, "DTL-H1202", "DTL-H1202 PAL [SC430920]" )
- ROMX_LOAD( "sc430920.s19", 0x0000, 0xb195, CRC(8380a5a2) SHA1(6fe45fd6fb96b12a25a45f39b5efd0be5e3f3e86), ROM_BIOS(16) )
+ ROM_REGION( 0x10000, "cdrom_mcu", 0 )
+
+ /* Retail PlayStation CD-ROM Firmware:
+ *
+ * Still missing:
+ * SCPH-1001, 3000, 3500, 5003, 5502, 5503, 7000W, 7001, 7002, 7003, 7503, 9003, 100, 101, 102 and 103.
+ */
+
+ ROM_SYSTEM_BIOS( 0, "SCPH-1000-later", "SCPH-1000 NTSC:J (Later Ver.) [424660]" )
+ ROMX_LOAD( "424660.bin", 0x0000, 0x4200, CRC(f82a2a46) SHA1(095434948d4c71cdfaa069e91053443887a6d139), ROM_BIOS(1) )
+
+ ROM_SYSTEM_BIOS( 1, "SCPH-1000-early", "SCPH-1000 NTSC:J (Early Ver.) [424666]" )
+ ROMX_LOAD( "424666.bin", 0x0000, 0x4200, CRC(60bc954e) SHA1(80674353daf95ffb4bd15cc4bb8cfa713370dd45), ROM_BIOS(2) )
+
+ ROM_SYSTEM_BIOS( 2, "SCPH-1002-early", "SCPH-1002 PAL (Early PU-8) [424684]" )
+ ROMX_LOAD( "424684.bin", 0x0000, 0x4200, CRC(84d46b2a) SHA1(9b06b1d407b784095ddbd45aeabafd689d2ee347), ROM_BIOS(3) )
+
+ /* Chip markings: C 1021 / SC430916PB / G63C 185 / JSAB9624F */
+ ROM_SYSTEM_BIOS( 3, "SCPH-5000", "SCPH-5000 NTSC:J [SC430916]" )
+ ROMX_LOAD( "sc430916.s19", 0x0000, 0xb195, CRC(487c8a40) SHA1(0ae8348fb43ab80845b0166494edc3e1565a3ef7), ROM_BIOS(4) )
+
+ /* Chip markings: C 1030 / SC430925PB / G63C 185 / JSBK9708C
+ Board Type: PU-18 / 1-664-537-11 */
+ ROM_SYSTEM_BIOS( 4, "SCPH-5500", "SCPH-5500 NTSC:J [SC430925]" )
+ ROMX_LOAD( "sc430925.s19", 0x0000, 0xb195, CRC(c09aa0c2) SHA1(b9ad66cc8ea4d6e2eb2709ffb77c9647f679097a), ROM_BIOS(5) )
+
+ /* Chip markings: C 2030 / SC430930PB / G63C 185 / SSJZ9748A
+ Board Type: PU-18 / 1-664-537-62 */
+ ROM_SYSTEM_BIOS( 5, "SCPH-5501", "SCPH-5501 NTSC:U/C [SC430930]" )
+ ROMX_LOAD( "sc430930.s19", 0x0000, 0xb195, CRC(587b84c2) SHA1(556c3adc37e4eb64fd463c54f7a310c483e0e835), ROM_BIOS(6) )
+
+ /* ROM dump is the same as SCPH-5552 */
+ ROM_SYSTEM_BIOS( 6, "SCPH-5502", "SCPH-5502 PAL [SC430929]" )
+ ROMX_LOAD( "sc430929.bin", 0x0000, 0x4200, CRC(ba87a3e0) SHA1(f23458d13a518616a8592b8ddd668c052bc9be5a), ROM_BIOS(7) )
+
+ ROM_SYSTEM_BIOS( 7, "SCPH-5903", "SCPH-5903 NTSC:J [SC430924PB]" )
+ ROMX_LOAD( "sc430924.s19", 0x0000, 0xb195, CRC(dbe694b2) SHA1(ac72cb616b1449fe29e52faf6aad389118852d73), ROM_BIOS(8) )
+
+ /* Chip markings: C 1040 / SC430934PB / G63C 185 / SSDG9745D */
+ ROM_SYSTEM_BIOS( 8, "SCPH-7000", "SCPH-7000 NTSC:J [SC430934]" )
+ ROMX_LOAD( "sc430934.s19", 0x0000, 0xb195, CRC(6443740c) SHA1(d9734c7135c75dbe7733079a2d4244a28c9e966e), ROM_BIOS(9) )
+
+ /* Chip markings: C 1050 / SC430938PB / G63C 185 / SSAM9850C */
+ ROM_SYSTEM_BIOS( 9, "SCPH-7500", "SCPH-7500 NTSC:J [SC430938]" )
+ ROMX_LOAD( "sc430938.s19", 0x0000, 0xb195, CRC(9744977a) SHA1(f017d34a98a8a023f6752ba9ed749bb9e2b836d5), ROM_BIOS(10) )
+
+ /* Chip markings: C 2050 / SC430940PB / G63C 185 / SSDL9838A */
+ ROM_SYSTEM_BIOS( 10, "SCPH-7501", "SCPH-7501 NTSC:U/C [SC430940]" )
+ ROMX_LOAD( "sc430940.s19", 0x0000, 0xb195, CRC(fd1c6ee7) SHA1(e72b5093a3e25de1548be7668179ff3e001e3ec5), ROM_BIOS(11) )
+
+ ROM_SYSTEM_BIOS( 11, "SCPH-7502", "SCPH-7502 PAL [SC430939]" )
+ ROMX_LOAD( "sc430939.bin", 0x0000, 0x4200, CRC(9eafb045) SHA1(25d98454e567e064c06f840d57f763fb7c8b7219), ROM_BIOS(12) )
+
+ ROM_SYSTEM_BIOS( 12, "SCPH-9000", "SCPH-9000 NTSC:J [SC430942]" )
+ ROMX_LOAD( "sc430942.bin", 0x0000, 0x4200, NO_DUMP, ROM_BIOS(13) )
+
+ /* Chip markings: C 2060 / SC430944PB / G63C 185 / SSBR9924C */
+ ROM_SYSTEM_BIOS( 13, "SCPH-9001", "SCPH-9001 NTSC:U/C [SC430944]" )
+ ROMX_LOAD( "sc430944.s19", 0x0000, 0xb195, CRC(24011dfd) SHA1(db72ba02466942d1a1a07c4d855edd18f84de92e), ROM_BIOS(14) )
+
+ ROM_SYSTEM_BIOS( 14, "SCPH-9002", "SCPH-9002 PAL [SC430943]" )
+ ROMX_LOAD( "sc430943.bin", 0x0000, 0x4200, CRC(2669a1a7) SHA1(62999e7f8429f381e19d44d2399b6017959f4f13), ROM_BIOS(15) )
+
+ /* Development PlayStation CD-ROM Firmware:
+ *
+ * Still missing:
+ * DTL-H1000, 1000H, 1001, 1001H, 1002, 1100, 1101, 1102, 1200, 1201, 2000, 2500, 2700, 3000, 3001 and 3002.
+ */
+
+ /* Chip markings: D 2021 / SC430920PB / G63C 185 / JSAA9810A
+ * Note: Although this is a PAL unit, the ID string in the
+ * code is "for US/AEP", so it may be the same for all the
+ * debug consoles.
+ */
+ ROM_SYSTEM_BIOS( 15, "DTL-H1202", "DTL-H1202 PAL [SC430920]" )
+ ROMX_LOAD( "sc430920.s19", 0x0000, 0xb195, CRC(8380a5a2) SHA1(6fe45fd6fb96b12a25a45f39b5efd0be5e3f3e86), ROM_BIOS(16) )
ROM_END
const rom_entry *psxcd_device::device_rom_region() const
{
return ROM_NAME( psxcd );
}
-
diff --git a/src/mame/mess.lst b/src/mame/mess.lst
index 5d4cafa3c01..59e2dfc09b6 100644
--- a/src/mame/mess.lst
+++ b/src/mame/mess.lst
@@ -81,7 +81,7 @@ pico // 1994 Sega Pico (Europe)
picou // 1994 Sega Pico (USA)
picoj // 1993 Sega Pico (Japan)
copera // 1993 Sega / Yamaha
-sawatte //
+sawatte //
segacd // 1992 Sega Sega CD (USA)
megacd // 1993 Sega Mega-CD (Europe)
megacda // 1993 Sega Mega-CD (Asia)
@@ -1664,7 +1664,7 @@ hs
// Exidy, Inc.
sorcerer // Sorcerer
-sorcerer2 // monitor 1.1 1979
+sorcerer2 // monitor 1.1 1979
sorcererd // Sorcerer with floppies
// Galaksija
diff --git a/src/mame/video/apple2.c b/src/mame/video/apple2.c
index 56419e0f46a..bdee351796a 100644
--- a/src/mame/video/apple2.c
+++ b/src/mame/video/apple2.c
@@ -1317,7 +1317,7 @@ void a2_video_device::hgr_update(screen_device &screen, bitmap_ind16 &bitmap, co
for (b = 0; b < 7; b++)
{
v = (w & 1);
- w >>= 1;
+ w >>= 1;
*(p++) = v ? GREEN : BLACK;
*(p++) = v ? GREEN : BLACK;
}
diff --git a/src/mame/video/btoads.c b/src/mame/video/btoads.c
index 7bbbfbcd014..4d55df20460 100644
--- a/src/mame/video/btoads.c
+++ b/src/mame/video/btoads.c
@@ -93,7 +93,7 @@ WRITE16_MEMBER( btoads_state::display_control_w )
WRITE16_MEMBER( btoads_state::scroll0_w )
{
/* allow multiple changes during display */
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
/* upper bits are Y scroll, lower bits are X scroll */
@@ -107,7 +107,7 @@ WRITE16_MEMBER( btoads_state::scroll0_w )
WRITE16_MEMBER( btoads_state::scroll1_w )
{
/* allow multiple changes during display */
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
/* upper bits are Y scroll, lower bits are X scroll */
diff --git a/src/mame/video/cloak.c b/src/mame/video/cloak.c
index 18551ff6b52..7b06f7d9efe 100644
--- a/src/mame/video/cloak.c
+++ b/src/mame/video/cloak.c
@@ -92,7 +92,7 @@ void cloak_state::set_current_bitmap_videoram_pointer()
WRITE8_MEMBER(cloak_state::cloak_clearbmp_w)
{
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
m_bitmap_videoram_selected = data & 0x01;
diff --git a/src/mame/video/decbac06.h b/src/mame/video/decbac06.h
index 057fc720bc5..853079b64cc 100644
--- a/src/mame/video/decbac06.h
+++ b/src/mame/video/decbac06.h
@@ -30,7 +30,7 @@ public:
int m_tile_region_16;
// some bootlegs (eg midresb / midresbj) don't appear to actually support the alt modes, they set them and end up with broken gfx on later levels.
- bool m_supports_8x8;
+ bool m_supports_8x8;
bool m_supports_16x16;
bool m_supports_rc_scroll;
diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c
index 484be075692..a17b45b527a 100644
--- a/src/mame/video/dkong.c
+++ b/src/mame/video/dkong.c
@@ -876,7 +876,7 @@ TIMER_CALLBACK_MEMBER(dkong_state::scanline_callback)
radarscp_scanline(scanline);
/* update any video up to the current scanline */
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
scanline = (scanline+1) % VTOTAL;
diff --git a/src/mame/video/galaxian.c b/src/mame/video/galaxian.c
index 1e84b9b0a9a..e3beb486c6a 100644
--- a/src/mame/video/galaxian.c
+++ b/src/mame/video/galaxian.c
@@ -480,7 +480,7 @@ WRITE8_MEMBER(galaxian_state::galaxian_videoram_w)
{
UINT8 *videoram = m_videoram;
/* update any video up to the current scanline */
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
/* store the data and mark the corresponding tile dirty */
@@ -492,7 +492,7 @@ WRITE8_MEMBER(galaxian_state::galaxian_videoram_w)
WRITE8_MEMBER(galaxian_state::galaxian_objram_w)
{
/* update any video up to the current scanline */
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
/* store the data */
@@ -643,7 +643,7 @@ WRITE8_MEMBER(galaxian_state::galaxian_flip_screen_x_w)
{
if (m_flipscreen_x != (data & 0x01))
{
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
/* when the direction changes, we count a different number of clocks */
@@ -660,7 +660,7 @@ WRITE8_MEMBER(galaxian_state::galaxian_flip_screen_y_w)
{
if (m_flipscreen_y != (data & 0x01))
{
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
m_flipscreen_y = data & 0x01;
@@ -686,7 +686,7 @@ WRITE8_MEMBER(galaxian_state::galaxian_stars_enable_w)
{
if ((m_stars_enabled ^ data) & 0x01)
{
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
}
@@ -706,7 +706,7 @@ WRITE8_MEMBER(galaxian_state::scramble_background_enable_w)
{
if ((m_background_enable ^ data) & 0x01)
{
- // m_screen->update_now();
+ // m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
}
@@ -718,7 +718,7 @@ WRITE8_MEMBER(galaxian_state::scramble_background_red_w)
{
if ((m_background_red ^ data) & 0x01)
{
- // m_screen->update_now();
+ // m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
}
@@ -730,7 +730,7 @@ WRITE8_MEMBER(galaxian_state::scramble_background_green_w)
{
if ((m_background_green ^ data) & 0x01)
{
- // m_screen->update_now();
+ // m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
}
@@ -742,7 +742,7 @@ WRITE8_MEMBER(galaxian_state::scramble_background_blue_w)
{
if ((m_background_blue ^ data) & 0x01)
{
- // m_screen->update_now();
+ // m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
}
diff --git a/src/mame/video/gic.c b/src/mame/video/gic.c
index 30461b5b9eb..994e97e16f8 100644
--- a/src/mame/video/gic.c
+++ b/src/mame/video/gic.c
@@ -6,15 +6,15 @@
GI AY-3-8800-1 (Datasheet exists as AY-3-8500-1 Graphics Interface Chip)
For the GIMINI "Challenger" programmable game system.
-
+
Really only ever used in the Unisonic Champion 2711
More LA tests made by plgDavid on hardware pretty much confirmed what is found
in the AY-3-8950-1 datasheet, but with more fine grained detail.
- the GIC does not have internal ram of any sort apart from shift registers,
+ the GIC does not have internal ram of any sort apart from shift registers,
instead it relies on the external shared ram, (see page 7-85) Appendix AY-3-8950-1
-
+
Unverified on LA (since the video pins are all connected into a composite mix):
at line 46 it lowers GIC_BUSY, until line 240
@@ -22,10 +22,10 @@
It will read the external ram areas continuously while GIC_BUSY is low (for 12.36ms)
(NOTE: OCTAL)
-
+
000,001,002,003,004,005, 110,111,112,113,114,115,116,117,120,121,122,123,124,125 (15 times - No first bg line?)
006,007,010,011,012,013, 110,111,112,113,114,115,116,117,120,121,122,123,124,125 (16 times)
-
+
014,015,016,017,020,021, 125,126,127,130,131,132,133,134,135,136,137,140,141,142 (16 times)
022,023,024,025,026,027, 125,126,127,130,131,132,133,134,135,136,137,140,141,142 (16 times)
@@ -46,15 +46,15 @@
for a total of (12*20*16) = 3840 RAM reads (3 clocks per read at 1.79MHz)
Then it relingishes control to the CPU by raising BUSREQ.
-
+
Cloking in more detail: (in 1.79MHz clocks)
boot:
- busy:1 5360 clocks
- busy:0 22116 clocks
- busy:1 7752 clocks
- busy:0 22116 clocks
- busy:1 7752 clocks
- (...)
+ busy:1 5360 clocks
+ busy:0 22116 clocks
+ busy:1 7752 clocks
+ busy:0 22116 clocks
+ busy:1 7752 clocks
+ (...)
There are NO IRQ handshakes, just BUSREQ sync shared RAM
@@ -72,7 +72,7 @@ const device_type GIC = &device_creator<gic_device>;
//A real AY-3-8800-1 (dead) is going to decap for a good dump
ROM_START( gic_font )
ROM_REGION( 0x200, "cgrom", 0 )
- ROM_LOAD( "ay-3-8800-1.bin", 0x0000, 0x200, BAD_DUMP CRC(d9f11d2b) SHA1(60ef45d51d102cd3af78787008d9aed848137bee))
+ ROM_LOAD( "ay-3-8800-1.bin", 0x0000, 0x200, BAD_DUMP CRC(d9f11d2b) SHA1(60ef45d51d102cd3af78787008d9aed848137bee))
ROM_END
@@ -86,9 +86,9 @@ gic_device::gic_device(const machine_config &mconfig, const char *tag, device_t
, device_video_interface(mconfig, *this)
, m_cgrom(0)
, m_audiocnt(0)
- , m_audioval(0)
- , m_audioreset(0)
- , m_ram(0)
+ , m_audioval(0)
+ , m_audioreset(0)
+ , m_ram(0)
{
}
@@ -97,11 +97,11 @@ gic_device::gic_device(const machine_config &mconfig, device_type type, const ch
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
, device_sound_interface(mconfig, *this)
, device_video_interface(mconfig, *this)
- , m_cgrom(0)
+ , m_cgrom(0)
, m_audiocnt(0)
, m_audioval(0)
- , m_audioreset(0)
- , m_ram(0)
+ , m_audioreset(0)
+ , m_ram(0)
{
}
@@ -126,7 +126,7 @@ void gic_device::device_start()
m_vblank_timer->adjust( m_screen->time_until_pos(1, END_ACTIVE_SCAN + 18 ), 0, m_screen->scan_period() );
// allocate the audio stream
- m_stream = stream_alloc( 0, 1, clock()/(2*228) );
+ m_stream = stream_alloc( 0, 1, clock()/(2*228) );
}
@@ -137,22 +137,21 @@ void gic_device::device_start()
void gic_device::device_reset()
{
m_audiocnt=0;
- m_audioval=0;
+ m_audioval=0;
m_audioreset=0;
}
#define GIC_CLUB 28
#define GIC_SPACE 0
-
+
void gic_device::draw_char_left(int startx, int starty, UINT8 code, bitmap_ind16 &bitmap){
-
UINT8*ptr = &m_cgrom[code*GIC_CHAR_H];
-
+
for (size_t y=0;y<GIC_CHAR_H;y++){
- UINT8 current = *ptr++;
+ UINT8 current = *ptr++;
UINT8 nextx=0;
- UINT8 curry= starty+y;
- for(UINT8 x=0x20;x!=0;x=x/2){
+ UINT8 curry= starty+y;
+ for(UINT8 x=0x20;x!=0;x=x/2){
if (current&x)
m_bitmap.pix16(curry,startx+nextx) = GIC_WHITE;
nextx++;
@@ -161,23 +160,22 @@ void gic_device::draw_char_left(int startx, int starty, UINT8 code, bitmap_ind16
}
void gic_device::draw_char_right(int startx, int starty, UINT8 code, bitmap_ind16 &bitmap, int bg_col){
-
UINT8*ptr = &m_cgrom[code*GIC_CHAR_H];
-
+
for (size_t y=0;y<GIC_CHAR_H;y++){
- UINT8 current = *ptr++;
+ UINT8 current = *ptr++;
UINT8 nextx=0;
UINT8 curry= starty+y;
m_bitmap.pix16(curry,startx+nextx) = bg_col;
- nextx++;
- for(UINT8 x=0x20;x!=0;x=x/2){
- m_bitmap.pix16(curry,startx+nextx) = (current&x)?GIC_WHITE:bg_col;
+ nextx++;
+ for(UINT8 x=0x20;x!=0;x=x/2){
+ m_bitmap.pix16(curry,startx+nextx) = (current&x)?GIC_WHITE:bg_col;
nextx++;
}
m_bitmap.pix16(curry,startx+nextx) = bg_col;
- nextx++;
- m_bitmap.pix16(curry,startx+nextx) = bg_col;
+ nextx++;
+ m_bitmap.pix16(curry,startx+nextx) = bg_col;
}
}
@@ -187,15 +185,15 @@ UINT32 gic_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap, co
size_t XSTART = BORDER_SIZE;
size_t YSTART = START_ACTIVE_SCAN;
-
+
//left hand side first
UINT8 current=0;
for(UINT8 cy=0;cy<GIC_LEFT_H;cy++){
for(UINT8 cx=0;cx<GIC_LEFT_W;cx++){
draw_char_left(XSTART+(cx*GIC_CHAR_W),
- YSTART+(cy*GIC_CHAR_H),
- m_ram[current],
- m_bitmap);
+ YSTART+(cy*GIC_CHAR_H),
+ m_ram[current],
+ m_bitmap);
current++;
}
}
@@ -203,39 +201,39 @@ UINT32 gic_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap, co
//right hand side is next
current=0x48;//110 octal
XSTART+=(GIC_LEFT_W*GIC_CHAR_W)+1;
-
+
for(UINT8 cy=0;cy<GIC_RIGHT_H;cy++){
for(UINT8 cx=0;cx<GIC_RIGHT_W;cx++){
//complex case
UINT8 data = m_ram[current++];
-
+
size_t currX = (XSTART+ (cx*(3+GIC_CHAR_W)));
size_t currUP = (YSTART+ (cy*(2*GIC_CHAR_H)));
size_t currLOW = (YSTART+GIC_CHAR_H+(cy*(2*GIC_CHAR_H)));
-
+
switch(data&0xC0){
case 0x00:{
//lower rectangle only, normal char
draw_char_right(currX,currLOW,data,m_bitmap,GIC_GREEN);
}break;
-
+
//White block
case 0xC0:{
//upper rectangle
- draw_char_right(currX,currUP, GIC_SPACE,m_bitmap,GIC_WHITE);
- //lower rectangle
+ draw_char_right(currX,currUP, GIC_SPACE,m_bitmap,GIC_WHITE);
+ //lower rectangle
draw_char_right(currX,currLOW,GIC_SPACE,m_bitmap,GIC_WHITE);
}break;
-
+
//Draw a card
case 0x40:{
- int bgColor = (data&0x10)?GIC_RED:GIC_BLACK;
+ int bgColor = (data&0x10)?GIC_RED:GIC_BLACK;
//upper rectangle
- draw_char_right(currX,currUP, (data&0xF)+0x30,m_bitmap,bgColor);
- //lower rectangle
- draw_char_right(currX,currLOW,GIC_CLUB+((data&0x30)>>4),m_bitmap,bgColor);
+ draw_char_right(currX,currUP, (data&0xF)+0x30,m_bitmap,bgColor);
+ //lower rectangle
+ draw_char_right(currX,currLOW,GIC_CLUB+((data&0x30)>>4),m_bitmap,bgColor);
}break;
-
+
default:printf("gic unknown char! %02X\n",data); break;
}
}
@@ -254,7 +252,7 @@ void gic_device::device_timer(emu_timer &timer, device_timer_id id, int param, v
case TIMER_VBLANK:
//flag the audio to reset
m_audioreset = 1;//phase need to reset! on next clock/228
- break;
+ break;
}
}
@@ -264,20 +262,20 @@ void gic_device::sound_stream_update(sound_stream &stream, stream_sample_t **inp
{
stream_sample_t *buffer = outputs[0];
- //Audio is basic and badly implemented (doubt that was the intent)
+ //Audio is basic and badly implemented (doubt that was the intent)
//The datasheet list the 3 different frequencies the GIC can generate: 500,1000 and 2000Hz
- //but it is clear (for an audio guy at least) that the resulting spectrum
+ //but it is clear (for an audio guy at least) that the resulting spectrum
//is not a pure square wav. In fact, the counter is reset on vertical sync!
//http://twitter.com/plgDavid/status/527269086016077825
- //...thus creating a buzzing sound.
+ //...thus creating a buzzing sound.
- //Dumping the audio pin value each time
+ //Dumping the audio pin value each time
// either (PHI2 made a 0->1 transition (1.789MHz)
// or (PHI1 made a 1->1 transition (1.789MHz)
- //I found that the granularity of audio transitions
+ //I found that the granularity of audio transitions
//(including phase resets and silences) was 228 clocks
//The audio subsystem thus runs at 1.789MHz/228 = 7849.88Hz
-
+
//when 1
//normal period:912 clocks (228*4)
//hi for 456 clocks
@@ -295,41 +293,41 @@ void gic_device::sound_stream_update(sound_stream &stream, stream_sample_t **inp
//hi for 912 (228*4)
//when 4
//normal period lasts 3648 clocks (228*16)
- //hi for 1824(228*8)
- //lo for 1824(228*8)
+ //hi for 1824(228*8)
+ //lo for 1824(228*8)
//Reset period:
- //lo for 1824(228*8)
+ //lo for 1824(228*8)
//hi for 2508(228*11)
//lo for 1824(228*8)
//hi for 1824(228*8)
-
+
if(!m_ram) return;
UINT8 audioByte = m_ram[GIC_AUDIO_BYTE]*2;
-
+
if(!audioByte){
for(size_t i = 0; i < samples; i++)
- *buffer++ = 0;
+ *buffer++ = 0;
- m_audioval = 0;
- m_audiocnt = 0;
- m_audioreset = 0;
- return;//early
+ m_audioval = 0;
+ m_audiocnt = 0;
+ m_audioreset = 0;
+ return;//early
+ }
+
+ //forced resynch @ 59.95Hz
+ if(m_audioreset){
+ m_audioval = 0;//forced low
+ m_audiocnt = 0;
+ m_audioreset = 0;
}
-
- //forced resynch @ 59.95Hz
- if(m_audioreset){
- m_audioval = 0;//forced low
- m_audiocnt = 0;
- m_audioreset = 0;
- }
for(size_t i=0; i < samples; i++){
- m_audiocnt++;
+ m_audiocnt++;
if(m_audiocnt >= audioByte){
m_audioval = !m_audioval;
m_audiocnt=0;
}
*buffer++ = m_audioval<<13;
- }
+ }
}
diff --git a/src/mame/video/gic.h b/src/mame/video/gic.h
index 0df8958a2ab..50715c61b0b 100644
--- a/src/mame/video/gic.h
+++ b/src/mame/video/gic.h
@@ -6,7 +6,7 @@
GI AY-3-8800-1 (Datasheet exists as AY-3-8500-1 Graphics Interface Chip)
For the GIMINI "Challenger" programmable game system.
-
+
Really only ever used in the Unisonic Champion 2711
***************************************************************************/
@@ -25,7 +25,7 @@
#define MCFG_GIC_ADD(_tag, _clock, _screen_tag) \
MCFG_DEVICE_ADD(_tag, GIC, _clock) \
- MCFG_VIDEO_SET_SCREEN(_screen_tag)
+ MCFG_VIDEO_SET_SCREEN(_screen_tag)
/***************************************************************************
TYPE DEFINITIONS
@@ -49,8 +49,8 @@
#define GIC_RIGHT_W 13
class gic_device : public device_t
- , public device_sound_interface
- , public device_video_interface
+ , public device_sound_interface
+ , public device_video_interface
{
public:
// construction/destruction
@@ -68,7 +68,7 @@ public:
//plgDavid please change this to a MESS friendly handshake
void set_shared_memory(const UINT8*m){ m_ram = m;};
-
+
// Global constants (non mesured figures)
static const int START_ACTIVE_SCAN = 10;
static const int BORDER_SIZE = GIC_CHAR_W*3;
@@ -86,7 +86,7 @@ protected:
// optional information overrides
virtual const rom_entry *device_rom_region() const;
-
+
// device_sound_interface overrides
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
@@ -95,16 +95,16 @@ protected:
void draw_char_left (int x, int y, UINT8 code, bitmap_ind16 &bitmap);
void draw_char_right(int x, int y, UINT8 code, bitmap_ind16 &bitmap,int bg_col);
-
+
bitmap_ind16 m_bitmap;
UINT8 * m_cgrom; // internal chargen ROM
-
+
emu_timer *m_vblank_timer;
sound_stream *m_stream;
-
+
int m_audiocnt;
- int m_audioval;
- int m_audioreset;
+ int m_audioval;
+ int m_audioreset;
const UINT8* m_ram;
};
diff --git a/src/mame/video/gyruss.c b/src/mame/video/gyruss.c
index bf1038ac72b..3f0a77465a9 100644
--- a/src/mame/video/gyruss.c
+++ b/src/mame/video/gyruss.c
@@ -93,7 +93,7 @@ PALETTE_INIT_MEMBER(gyruss_state, gyruss)
WRITE8_MEMBER(gyruss_state::gyruss_spriteram_w)
{
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
m_spriteram[offset] = data;
}
diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c
index fe9bfcd8d9b..63bbff6e2f6 100644
--- a/src/mame/video/hng64.c
+++ b/src/mame/video/hng64.c
@@ -168,8 +168,8 @@ WRITE32_MEMBER(hng64_state::hng64_videoram_w)
{
hng64_mark_tile_dirty(3, offset&0x3fff);
}
- // Offsets 0x40000 - 0x58000 are for "floor" scanline control
-
+ // Offsets 0x40000 - 0x58000 are for "floor" scanline control
+
/* 400000 - 7fffff is scroll regs etc. */
}
@@ -435,9 +435,9 @@ void hng64_state::hng64_tilemap_draw_roz_primask(screen_device &screen, bitmap_r
{
blit_parameters blit;
- // notes:
- // - startx and starty MUST be UINT32 for calculations to work correctly
- // - srcbitmap->width and height are assumed to be a power of 2 to speed up wraparound
+ // notes:
+ // - startx and starty MUST be UINT32 for calculations to work correctly
+ // - srcbitmap->width and height are assumed to be a power of 2 to speed up wraparound
// skip if disabled
//if (!tmap->enable)
@@ -474,7 +474,7 @@ inline void hng64_state::hng64_tilemap_draw_roz(screen_device &screen, bitmap_rg
* -------+-1098-7654-3210-9876-5432-1098-7654-3210-+----------------
* 0 | ---- -Cdd ---- -??Z ---- ---- ---- ---- | C = global complex zoom
| 0000 0011 - road edge alt 1 | dd = global tilemap dimension selector
- | 0000 0111 - road edge alt 2 | ? = Always Set?
+ | 0000 0111 - road edge alt 2 | ? = Always Set?
| | Z = Global Zoom Disable?
* 1 | oooo oooo oooo oooo ---- ---- ---- ---- | unknown - 0001 is a popular value. Explore.
* 1 | ---- ---- ---- ---- oooo oooo oooo oooo | unknown - untouched in sams64 games, initialized elsewhere
@@ -514,21 +514,21 @@ inline void hng64_state::hng64_tilemap_draw_roz(screen_device &screen, bitmap_rg
// b = 4bpp/8bpp (seems correct) (beast busters, samsh64, sasm64 2, xrally switch it for some screens)
// r = tile size (seems correct)
// e = tilemap enable bit according to sams64_2
- // z = z depth/priority? tilemaps might also be affected by min / max clip values somewhere?
+ // z = z depth/priority? tilemaps might also be affected by min / max clip values somewhere?
// (debug layer on buriki has priority 0x020, which would be highest)
*/
void hng64_state::hng64_drawtilemap(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int tm)
{
- // Useful bits from the global tilemap flags
- const UINT32& global_tileregs = m_videoregs[0x00];
+ // Useful bits from the global tilemap flags
+ const UINT32& global_tileregs = m_videoregs[0x00];
const int global_dimensions = (global_tileregs & 0x03000000) >> 24;
- const int global_alt_scroll_register_format = global_tileregs & 0x04000000;
- const int global_zoom_disable = global_tileregs & 0x00010000;
-
- // Debug blending on/off based on m_additive_tilemap_debug
- int debug_blend_enabled = 0;
+ const int global_alt_scroll_register_format = global_tileregs & 0x04000000;
+ const int global_zoom_disable = global_tileregs & 0x00010000;
+
+ // Debug blending on/off based on m_additive_tilemap_debug
+ int debug_blend_enabled = 0;
if ((m_additive_tilemap_debug&(1 << tm)))
debug_blend_enabled = 1;
@@ -537,9 +537,9 @@ void hng64_state::hng64_drawtilemap(screen_device &screen, bitmap_rgb32 &bitmap,
popmessage("unsupported global_dimensions on tilemaps");
#endif
- // Determine which tilemap registers and scroll base this tilemap uses
- UINT16 tileregs = 0;
- UINT16 scrollbase = 0;
+ // Determine which tilemap registers and scroll base this tilemap uses
+ UINT16 tileregs = 0;
+ UINT16 scrollbase = 0;
if (tm==0)
{
scrollbase = (m_videoregs[0x04]&0x3fff0000)>>16;
@@ -561,21 +561,21 @@ void hng64_state::hng64_drawtilemap(screen_device &screen, bitmap_rgb32 &bitmap,
tileregs = (m_videoregs[0x03]&0x0000ffff)>>0;
}
- // Useful bits from the tilemap registers
- const UINT8 mosaicValueBits = (tileregs & 0xf000) >> 12; (void)mosaicValueBits;
- const UINT8 floorModeBit = (tileregs & 0x0800) >> 11;
- const UINT8 bppBit = (tileregs & 0x0400) >> 10;
- const UINT8 bigTilemapBit = (tileregs & 0x0200) >> 9;
- const UINT8 tilemapEnableBit = (tileregs & 0x0040) >> 6; (void)tilemapEnableBit;
-
- // Tilemap drawing enable (sams64_2 demo mode says this is legit)
- //if (!tilemapEnableBit)
- //{
- // return;
- //}
-
- // Select the proper tilemap size
- tilemap_t* tilemap = NULL;
+ // Useful bits from the tilemap registers
+ const UINT8 mosaicValueBits = (tileregs & 0xf000) >> 12; (void)mosaicValueBits;
+ const UINT8 floorModeBit = (tileregs & 0x0800) >> 11;
+ const UINT8 bppBit = (tileregs & 0x0400) >> 10;
+ const UINT8 bigTilemapBit = (tileregs & 0x0200) >> 9;
+ const UINT8 tilemapEnableBit = (tileregs & 0x0040) >> 6; (void)tilemapEnableBit;
+
+ // Tilemap drawing enable (sams64_2 demo mode says this is legit)
+ //if (!tilemapEnableBit)
+ //{
+ // return;
+ //}
+
+ // Select the proper tilemap size
+ tilemap_t* tilemap = NULL;
if (global_dimensions==0)
{
if (bigTilemapBit) tilemap = m_tilemap[tm].m_tilemap_16x16;
@@ -588,7 +588,7 @@ void hng64_state::hng64_drawtilemap(screen_device &screen, bitmap_rgb32 &bitmap,
}
// Set the transmask so our manual copy is correct
- int transmask = 0x00;
+ int transmask = 0x00;
if (bppBit)
transmask = 0xff;
else
@@ -596,53 +596,53 @@ void hng64_state::hng64_drawtilemap(screen_device &screen, bitmap_rgb32 &bitmap,
if (floorModeBit == 0x0000)
{
- // floor mode
- // life would be easier if the roz we're talking about for complex zoom wasn't setting this as well
-
- // fprintf(stderr, "Tilemap %d is a floor using :\n", tm);
- const UINT32 floorAddress = 0x40000 + (scrollbase << 4);
-
- // TODO: The row count is correct, but how is this layer clipped? m_tcram?
-
- // See how many lines we have in the data region
- // DEBUG: Change this to a loop that goes over each line and draws them - it's just for visualization now
- //int lineCount = 0;
- //for (int ii = 0; ii < 0x2000/4; ii += 4)
- //{
- // const int realAddress = floorAddress/4;
- // if (m_videoram[realAddress+ii] == 0xffffff00 && m_videoram[realAddress+ii+1] == 0xffffff00)
- // continue;
- // if (m_videoram[realAddress+ii] == 0x00000000 && m_videoram[realAddress+ii+1] == 0x00000000)
- // continue;
- //
- // lineCount++;
- //}
- //printf("lines %d\n", lineCount);
-
- // Buriki uses a 2x mosaic effect on its floor, so its line count is half
- // (but so does fatfurwa - maybe it overdraws a bunch of pixels?)
- //if (m_mcu_type == BURIKI_MCU)
- // lineCount *= 2;
-
- // DEBUG - draw a horizontal green line where the uppermost line of the floor is drawn
- const rectangle &visarea = screen.visible_area();
- //if (lineCount < visarea.height())
- //{
- // for (int ii = 0; ii < visarea.width(); ii++)
- // bitmap.pix32((visarea.height()-lineCount), ii) = 0xff00ff00;
- //}
-
- // HACK : Clear RAM - this is "needed" in fatfurwa since it doesn't clear its own ram (buriki does)
- // Figure out what the difference between the two programs is. It's possible writing to
- // the linescroll ram fills a buffer and it's cleared automatically between frames?
- for (int ii = 0; ii < 0x2000/4; ii++)
- {
- const int realAddress = floorAddress/4;
- m_videoram[realAddress+ii] = 0x00000000;
- }
-
-
- // Floor mode - per pixel simple / complex modes? -- every other line?
+ // floor mode
+ // life would be easier if the roz we're talking about for complex zoom wasn't setting this as well
+
+ // fprintf(stderr, "Tilemap %d is a floor using :\n", tm);
+ const UINT32 floorAddress = 0x40000 + (scrollbase << 4);
+
+ // TODO: The row count is correct, but how is this layer clipped? m_tcram?
+
+ // See how many lines we have in the data region
+ // DEBUG: Change this to a loop that goes over each line and draws them - it's just for visualization now
+ //int lineCount = 0;
+ //for (int ii = 0; ii < 0x2000/4; ii += 4)
+ //{
+ // const int realAddress = floorAddress/4;
+ // if (m_videoram[realAddress+ii] == 0xffffff00 && m_videoram[realAddress+ii+1] == 0xffffff00)
+ // continue;
+ // if (m_videoram[realAddress+ii] == 0x00000000 && m_videoram[realAddress+ii+1] == 0x00000000)
+ // continue;
+ //
+ // lineCount++;
+ //}
+ //printf("lines %d\n", lineCount);
+
+ // Buriki uses a 2x mosaic effect on its floor, so its line count is half
+ // (but so does fatfurwa - maybe it overdraws a bunch of pixels?)
+ //if (m_mcu_type == BURIKI_MCU)
+ // lineCount *= 2;
+
+ // DEBUG - draw a horizontal green line where the uppermost line of the floor is drawn
+ const rectangle &visarea = screen.visible_area();
+ //if (lineCount < visarea.height())
+ //{
+ // for (int ii = 0; ii < visarea.width(); ii++)
+ // bitmap.pix32((visarea.height()-lineCount), ii) = 0xff00ff00;
+ //}
+
+ // HACK : Clear RAM - this is "needed" in fatfurwa since it doesn't clear its own ram (buriki does)
+ // Figure out what the difference between the two programs is. It's possible writing to
+ // the linescroll ram fills a buffer and it's cleared automatically between frames?
+ for (int ii = 0; ii < 0x2000/4; ii++)
+ {
+ const int realAddress = floorAddress/4;
+ m_videoram[realAddress+ii] = 0x00000000;
+ }
+
+
+ // Floor mode - per pixel simple / complex modes? -- every other line?
// (there doesn't seem to be enough data in Buriki for every line at least)
rectangle clip = visarea;
@@ -650,16 +650,16 @@ void hng64_state::hng64_drawtilemap(screen_device &screen, bitmap_rgb32 &bitmap,
{
// Logic would dictate that this should be the 'complex' scroll register layout,
// but per-line. That doesn't work however.
- //
+ //
// You only have line data for the number of lines on the screen, not enough for
// the complex register layout
- //
+ //
// HOWEVER, using the code below doesn't work either. This might be because
// they have mosaic turned on, and it adopts a new meaning in linescroll modes?
- //
+ //
// The code below could also be wrong, and rowscroll simply acts the same in all
// modes, this is hard to know because ss64_2 barely uses it.
- //
+ //
// buriki line data is at 20146000 (physical)
#if HNG64_VIDEO_DEBUG
@@ -668,9 +668,9 @@ void hng64_state::hng64_drawtilemap(screen_device &screen, bitmap_rgb32 &bitmap,
}
else // 'simple' mode with linescroll, used in some ss64_2 levels (assumed to be correct, but doesn't do much with it.. so could be wrong)
{
- INT32 xtopleft, xmiddle;
- INT32 ytopleft, ymiddle;
-
+ INT32 xtopleft, xmiddle;
+ INT32 ytopleft, ymiddle;
+
for (int line=0; line < 448; line++)
{
clip.min_y = clip.max_y = line;
@@ -913,7 +913,6 @@ void hng64_state::hng64_drawtilemap(screen_device &screen, bitmap_rgb32 &bitmap,
UINT32 hng64_state::screen_update_hng64(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
-
#if 1
// press in sams64_2 attract mode for a nice debug screen from the game
// not sure how functional it is, and it doesn't appear to test everything (rowscroll modes etc.)
@@ -939,16 +938,16 @@ UINT32 hng64_state::screen_update_hng64(screen_device &screen, bitmap_rgb32 &bit
#endif
- // Initialize some buffers
+ // Initialize some buffers
bitmap.fill(m_tcram[0x50/4] & 0x10000 ? m_palette->black_pen() : m_palette->pen(0), cliprect); //FIXME: Is the register correct? check with HW tests
screen.priority().fill(0x00, cliprect);
- // If the screen is disabled, don't draw anything (m_screen_dis is a shady variable at best)
+ // If the screen is disabled, don't draw anything (m_screen_dis is a shady variable at best)
if (m_screen_dis)
return 0;
// If the auto-animation mask or bits have changed search for tiles using them and mark as dirty
- const UINT32 animmask = m_videoregs[0x0b];
+ const UINT32 animmask = m_videoregs[0x0b];
const UINT32 animbits = m_videoregs[0x0c];
if ((m_old_animmask != animmask) || (m_old_animbits != animbits))
{
@@ -977,13 +976,13 @@ UINT32 hng64_state::screen_update_hng64(screen_device &screen, bitmap_rgb32 &bit
m_old_animbits = animbits;
}
- // If any magic bits have been touched, mark every tilemap dirty
- UINT16 tileflags[4];
- tileflags[0] = m_videoregs[0x02] >> 16;
+ // If any magic bits have been touched, mark every tilemap dirty
+ UINT16 tileflags[4];
+ tileflags[0] = m_videoregs[0x02] >> 16;
tileflags[1] = m_videoregs[0x02] & 0xffff;
tileflags[2] = m_videoregs[0x03] >> 16;
tileflags[3] = m_videoregs[0x03] & 0xffff;
- const UINT16 IMPORTANT_DIRTY_TILEFLAG_MASK = 0x0600;
+ const UINT16 IMPORTANT_DIRTY_TILEFLAG_MASK = 0x0600;
for (int i = 0; i < 4; i++)
{
if ((m_old_tileflags[i] & IMPORTANT_DIRTY_TILEFLAG_MASK) != (tileflags[i] & IMPORTANT_DIRTY_TILEFLAG_MASK))
@@ -993,7 +992,7 @@ UINT32 hng64_state::screen_update_hng64(screen_device &screen, bitmap_rgb32 &bit
}
}
- // Draw the four tilemaps
+ // Draw the four tilemaps
hng64_drawtilemap(screen,bitmap,cliprect, 3);
hng64_drawtilemap(screen,bitmap,cliprect, 2);
hng64_drawtilemap(screen,bitmap,cliprect, 1);
@@ -1021,13 +1020,13 @@ UINT32 hng64_state::screen_update_hng64(screen_device &screen, bitmap_rgb32 &bit
}
}
- // Draw the sprites on top of everything
+ // Draw the sprites on top of everything
draw_sprites(screen, bitmap, cliprect);
- // Layer the global frame buffer operations on top of everything
- // transition_control(bitmap, cliprect);
+ // Layer the global frame buffer operations on top of everything
+ // transition_control(bitmap, cliprect);
+
-
#if HNG64_VIDEO_DEBUG
if (0)
popmessage("%08x %08x %08x %08x %08x", m_spriteregs[0], m_spriteregs[1], m_spriteregs[2], m_spriteregs[3], m_spriteregs[4]);
@@ -1036,14 +1035,14 @@ UINT32 hng64_state::screen_update_hng64(screen_device &screen, bitmap_rgb32 &bit
popmessage("%08x %08x TR(%04x %04x %04x %04x) SB(%04x %04x %04x %04x) %08x %08x %08x %08x %08x AA(%08x %08x) %08x",
m_videoregs[0x00],
m_videoregs[0x01],
- (m_videoregs[0x02]>>16)&0xffff,
- (m_videoregs[0x02]>>0)&0xffff, // ss64_2 debug mode indicates that 0x0040 is enable!
- (m_videoregs[0x03]>>16)&0xffff, // buriki agrees (debug data on text layer) xrally agress (pink layer)
- (m_videoregs[0x03]>>0)&0xffff, // fatal fury doesn't (all backgrounds have it set) joy
- (m_videoregs[0x04]>>16)&0xffff,
- (m_videoregs[0x04]>>0)&0xffff,
- (m_videoregs[0x05]>>16)&0xffff,
- (m_videoregs[0x05]>>0)&0xffff,
+ (m_videoregs[0x02]>>16)&0xffff,
+ (m_videoregs[0x02]>>0)&0xffff, // ss64_2 debug mode indicates that 0x0040 is enable!
+ (m_videoregs[0x03]>>16)&0xffff, // buriki agrees (debug data on text layer) xrally agress (pink layer)
+ (m_videoregs[0x03]>>0)&0xffff, // fatal fury doesn't (all backgrounds have it set) joy
+ (m_videoregs[0x04]>>16)&0xffff,
+ (m_videoregs[0x04]>>0)&0xffff,
+ (m_videoregs[0x05]>>16)&0xffff,
+ (m_videoregs[0x05]>>0)&0xffff,
m_videoregs[0x06],
m_videoregs[0x07],
m_videoregs[0x08],
@@ -1107,7 +1106,7 @@ UINT32 hng64_state::screen_update_hng64(screen_device &screen, bitmap_rgb32 &bit
popmessage("blend changed %02x", m_additive_tilemap_debug);
}
#endif
-
+
return 0;
}
diff --git a/src/mame/video/hng64_3d.c b/src/mame/video/hng64_3d.c
index 92aad5cbc5f..868f871fcf8 100644
--- a/src/mame/video/hng64_3d.c
+++ b/src/mame/video/hng64_3d.c
@@ -58,11 +58,11 @@ WRITE16_MEMBER(hng64_state::dl_w)
WRITE32_MEMBER(hng64_state::dl_upload_w)
{
- // Data is:
- // 00000b50 for the sams64 games
- // 00000f00 for everything else
- // TODO: different param for the two sams64 games, less FIFO to process?
-
+ // Data is:
+ // 00000b50 for the sams64 games
+ // 00000f00 for everything else
+ // TODO: different param for the two sams64 games, less FIFO to process?
+
// This is written after the game uploads 16 packets, each 16 words long
// We're assuming it to be a 'send to 3d hardware' trigger.
// This can be called multiple times per frame (at least 2, as long as it gets the expected interrupt / status flags)
@@ -73,7 +73,7 @@ g_profiler.start(PROFILER_USER1);
hng64_command3d(&m_dl[packetStart]);
}
- // Schedule a small amount of time to let the 3d hardware rasterize the display buffer
+ // Schedule a small amount of time to let the 3d hardware rasterize the display buffer
machine().scheduler().timer_set(m_maincpu->cycles_to_attotime(0x200*8), timer_expired_delegate(FUNC(hng64_state::hng64_3dfifo_processed), this));
g_profiler.stop();
}
@@ -85,14 +85,14 @@ TIMER_CALLBACK_MEMBER(hng64_state::hng64_3dfifo_processed)
WRITE32_MEMBER(hng64_state::dl_control_w)
{
- // This could be a multiple display list thing, but the palette seems to be lost between lists?
- // Many games briefly set this to 0x4 on startup. Maybe there are 3 display lists?
- // The sams64 games briefly set this value to 0x0c00 on boot. Maybe there are 4 lists and they can be combined?
- if (data & 0x01)
- m_activeDisplayList = 0;
- else if (data & 0x02)
- m_activeDisplayList = 1;
-
+ // This could be a multiple display list thing, but the palette seems to be lost between lists?
+ // Many games briefly set this to 0x4 on startup. Maybe there are 3 display lists?
+ // The sams64 games briefly set this value to 0x0c00 on boot. Maybe there are 4 lists and they can be combined?
+ if (data & 0x01)
+ m_activeDisplayList = 0;
+ else if (data & 0x02)
+ m_activeDisplayList = 1;
+
// printf("dl_control_w %08x %08x\n", data, mem_mask);
//
// if(data & 2) // swap buffers
@@ -274,8 +274,8 @@ void hng64_state::setCameraProjectionMatrix(const UINT16* packet)
const float top = uToF(packet[12]);
const float bottom = uToF(packet[13]);
- // TODO: It's unclear how the 3 values combine to make a near clipping plane
- const float near_ = uToF(packet[6]) + (uToF(packet[6]) * uToF(packet[4]));
+ // TODO: It's unclear how the 3 values combine to make a near clipping plane
+ const float near_ = uToF(packet[6]) + (uToF(packet[6]) * uToF(packet[4]));
const float far_ = 0.9f; // uToF(packet[9]) + (uToF(packet[9]) * uToF(packet[7]));
m_projectionMatrix[0] = (2.0f*near_)/(right-left);
@@ -303,8 +303,8 @@ void hng64_state::setCameraProjectionMatrix(const UINT16* packet)
// Polygon rasterization.
void hng64_state::recoverPolygonBlock(const UINT16* packet, int& numPolys)
{
- //printPacket(packet, 1);
-
+ //printPacket(packet, 1);
+
/*//////////////
// PACKET FORMAT
// [0] - 0100 ... ID
@@ -369,7 +369,7 @@ void hng64_state::recoverPolygonBlock(const UINT16* packet, int& numPolys)
UINT32 size[4];
UINT32 address[4];
UINT32 megaOffset;
- polygon lastPoly = { 0 };
+ polygon lastPoly = { 0 };
//////////////////////////////////////////////////////////
@@ -493,9 +493,9 @@ void hng64_state::recoverPolygonBlock(const UINT16* packet, int& numPolys)
continue;
}
- // Syntactical simplification
- polygon& currentPoly = m_polys[numPolys];
-
+ // Syntactical simplification
+ polygon& currentPoly = m_polys[numPolys];
+
// Debug - Colors polygons with certain flags bright blue! ajg
currentPoly.debugColor = 0;
//currentPoly.debugColor = tdColor;
@@ -743,7 +743,7 @@ void hng64_state::recoverPolygonBlock(const UINT16* packet, int& numPolys)
////////////////////////////////////
// Perform the world transformations...
// TODO: We can eliminate this step with a matrix stack (maybe necessary?)
- // Note: fatfurwa's helicopter tracking in scene 3 of its intro shows one of these matrices isn't quite correct
+ // Note: fatfurwa's helicopter tracking in scene 3 of its intro shows one of these matrices isn't quite correct
setIdentity(m_modelViewMatrix);
if (m_mcu_type != SAMSHO_MCU)
{
@@ -798,11 +798,11 @@ void hng64_state::recoverPolygonBlock(const UINT16* packet, int& numPolys)
// Cast a ray out of the camera towards the polygon's point in eyespace.
vecmatmul4(cullRay, modelViewMatrix, currentPoly.vert[0].worldCoords);
normalize(cullRay);
-
+
// Dot product that with the normal to see if you're negative...
vecmatmul4(cullNorm, modelViewMatrix, currentPoly.faceNormal);
-
- const float backfaceCullResult = vecDotProduct(cullRay, cullNorm);
+
+ const float backfaceCullResult = vecDotProduct(cullRay, cullNorm);
if (backfaceCullResult < 0.0f)
currentPoly.visible = 1;
else
@@ -811,7 +811,7 @@ void hng64_state::recoverPolygonBlock(const UINT16* packet, int& numPolys)
// BEHIND-THE-CAMERA CULL //
- float cullRay[4];
+ float cullRay[4];
vecmatmul4(cullRay, m_modelViewMatrix, currentPoly.vert[0].worldCoords);
if (cullRay[2] > 0.0f) // Camera is pointing down -Z
{
@@ -822,63 +822,63 @@ void hng64_state::recoverPolygonBlock(const UINT16* packet, int& numPolys)
// TRANSFORM THE TRIANGLE INTO HOMOGENEOUS SCREEN SPACE //
if (currentPoly.visible)
{
- hng64_clip_vertex clipVerts[10];
-
- // Transform and project each vertex into pre-divided homogeneous coordinates
+ hng64_clip_vertex clipVerts[10];
+
+ // Transform and project each vertex into pre-divided homogeneous coordinates
for (int m = 0; m < currentPoly.n; m++)
{
- float eyeCoords[4]; // World coordinates transformed by the modelViewMatrix
+ float eyeCoords[4]; // World coordinates transformed by the modelViewMatrix
vecmatmul4(eyeCoords, m_modelViewMatrix, currentPoly.vert[m].worldCoords);
vecmatmul4(currentPoly.vert[m].clipCoords, m_projectionMatrix, eyeCoords);
-
- clipVerts[m].x = currentPoly.vert[m].clipCoords[0];
- clipVerts[m].y = currentPoly.vert[m].clipCoords[1];
- clipVerts[m].z = currentPoly.vert[m].clipCoords[2];
- clipVerts[m].w = currentPoly.vert[m].clipCoords[3];
- clipVerts[m].p[0] = currentPoly.vert[m].texCoords[0];
- clipVerts[m].p[1] = currentPoly.vert[m].texCoords[1];
- clipVerts[m].p[2] = currentPoly.vert[m].light[0];
- clipVerts[m].p[3] = currentPoly.vert[m].light[1];
- clipVerts[m].p[4] = currentPoly.vert[m].light[2];
+
+ clipVerts[m].x = currentPoly.vert[m].clipCoords[0];
+ clipVerts[m].y = currentPoly.vert[m].clipCoords[1];
+ clipVerts[m].z = currentPoly.vert[m].clipCoords[2];
+ clipVerts[m].w = currentPoly.vert[m].clipCoords[3];
+ clipVerts[m].p[0] = currentPoly.vert[m].texCoords[0];
+ clipVerts[m].p[1] = currentPoly.vert[m].texCoords[1];
+ clipVerts[m].p[2] = currentPoly.vert[m].light[0];
+ clipVerts[m].p[3] = currentPoly.vert[m].light[1];
+ clipVerts[m].p[4] = currentPoly.vert[m].light[2];
}
if (currentPoly.visible)
{
- // Clip against all edges of the view frustum
- int num_vertices = frustum_clip_all<float, 5>(clipVerts, currentPoly.n, clipVerts);
-
- // Copy the results of
- currentPoly.n = num_vertices;
- for (int m = 0; m < num_vertices; m++)
- {
- currentPoly.vert[m].clipCoords[0] = clipVerts[m].x;
- currentPoly.vert[m].clipCoords[1] = clipVerts[m].y;
- currentPoly.vert[m].clipCoords[2] = clipVerts[m].z;
- currentPoly.vert[m].clipCoords[3] = clipVerts[m].w;
- currentPoly.vert[m].texCoords[0] = clipVerts[m].p[0];
- currentPoly.vert[m].texCoords[1] = clipVerts[m].p[1];
- currentPoly.vert[m].light[0] = clipVerts[m].p[2];
- currentPoly.vert[m].light[1] = clipVerts[m].p[3];
- currentPoly.vert[m].light[2] = clipVerts[m].p[4];
- }
-
- const rectangle& visarea = m_screen->visible_area();
+ // Clip against all edges of the view frustum
+ int num_vertices = frustum_clip_all<float, 5>(clipVerts, currentPoly.n, clipVerts);
+
+ // Copy the results of
+ currentPoly.n = num_vertices;
+ for (int m = 0; m < num_vertices; m++)
+ {
+ currentPoly.vert[m].clipCoords[0] = clipVerts[m].x;
+ currentPoly.vert[m].clipCoords[1] = clipVerts[m].y;
+ currentPoly.vert[m].clipCoords[2] = clipVerts[m].z;
+ currentPoly.vert[m].clipCoords[3] = clipVerts[m].w;
+ currentPoly.vert[m].texCoords[0] = clipVerts[m].p[0];
+ currentPoly.vert[m].texCoords[1] = clipVerts[m].p[1];
+ currentPoly.vert[m].light[0] = clipVerts[m].p[2];
+ currentPoly.vert[m].light[1] = clipVerts[m].p[3];
+ currentPoly.vert[m].light[2] = clipVerts[m].p[4];
+ }
+
+ const rectangle& visarea = m_screen->visible_area();
for (int m = 0; m < currentPoly.n; m++)
{
// Convert into normalized device coordinates...
- float ndCoords[4]; // Normalized device coordinates/clipCoordinates (x/w, y/w, z/w)
+ float ndCoords[4]; // Normalized device coordinates/clipCoordinates (x/w, y/w, z/w)
ndCoords[0] = currentPoly.vert[m].clipCoords[0] / currentPoly.vert[m].clipCoords[3];
ndCoords[1] = currentPoly.vert[m].clipCoords[1] / currentPoly.vert[m].clipCoords[3];
ndCoords[2] = currentPoly.vert[m].clipCoords[2] / currentPoly.vert[m].clipCoords[3];
ndCoords[3] = currentPoly.vert[m].clipCoords[3];
// Final pixel values are garnered here :
- float windowCoords[4]; // Mapped ndCoordinates to screen space
+ float windowCoords[4]; // Mapped ndCoordinates to screen space
windowCoords[0] = (ndCoords[0]+1.0f) * ((float)(visarea.max_x) / 2.0f) + 0.0f;
windowCoords[1] = (ndCoords[1]+1.0f) * ((float)(visarea.max_y) / 2.0f) + 0.0f;
windowCoords[2] = (ndCoords[2]+1.0f) * 0.5f;
- // Flip Y
+ // Flip Y
windowCoords[1] = (float)visarea.max_y - windowCoords[1];
// Store the points in a list for later use...
@@ -899,9 +899,9 @@ void hng64_state::recoverPolygonBlock(const UINT16* packet, int& numPolys)
}
// note 0x0102 packets are only 8 words, it appears they can be in either the upper or lower half of the 16 word packet.
-// We currently only draw 0x0102 packets where both halves contain 0x0102 (2 calls), but this causes graphics to vanish in
+// We currently only draw 0x0102 packets where both halves contain 0x0102 (2 calls), but this causes graphics to vanish in
// xrally because in some cases the 0x0102 packet only exists in the upper or lower half with another value (often 0x0000 - NOP) in the other.
-// If we also treat (0x0000 - NOP) as 8 word instead of 16 so that we can access a 0x0102 in the 2nd half of the 16 word packet
+// If we also treat (0x0000 - NOP) as 8 word instead of 16 so that we can access a 0x0102 in the 2nd half of the 16 word packet
// then we end up with other invalid packets in the 2nd half which should be ignored.
// This would suggest our processing if flawed in other ways, or there is something else to indicate packet length.
@@ -991,7 +991,7 @@ void hng64_state::hng64_command3d(const UINT16* packet)
void hng64_state::clear3d()
{
// Reset the buffers...
- const rectangle& visarea = m_screen->visible_area();
+ const rectangle& visarea = m_screen->visible_area();
for (int i = 0; i < (visarea.max_x)*(visarea.max_y); i++)
{
m_poly_renderer->depthBuffer3d()[i] = 100.0f;
diff --git a/src/mame/video/m72.c b/src/mame/video/m72.c
index b215759473a..61d03d3857c 100644
--- a/src/mame/video/m72.c
+++ b/src/mame/video/m72.c
@@ -12,7 +12,7 @@
inline void m72_state::m72_m81_get_tile_info(tile_data &tileinfo,int tile_index,const UINT16 *vram,int gfxnum)
{
int code,attr,color,pri;
-
+
// word 0 word 1
// fftt tttt tttt tttt ---- ---- zz-? pppp
@@ -149,7 +149,7 @@ VIDEO_START_MEMBER(m72_state,xmultipl)
m_fg_tilemap->set_scrolldx(4,64);
m_fg_tilemap->set_scrolldy(-128, 0);
-
+
m_bg_tilemap->set_scrolldx(6,0);
m_bg_tilemap->set_scrolldy(-128,-128);
@@ -202,7 +202,7 @@ VIDEO_START_MEMBER(m72_state,m82)
m_fg_tilemap->set_scrolldx(4,0);
m_fg_tilemap->set_scrolldy(-128,-128);
-
+
m_bg_tilemap->set_scrolldx(6-256,0);
m_bg_tilemap->set_scrolldy(-128,-128);
@@ -345,7 +345,7 @@ WRITE16_MEMBER(m72_state::videoram2_w)
WRITE16_MEMBER(m72_state::irq_line_w)
{
COMBINE_DATA(&m_raster_irq_position);
-// printf("m_raster_irq_position %04x\n", m_raster_irq_position);
+// printf("m_raster_irq_position %04x\n", m_raster_irq_position);
}
WRITE16_MEMBER(m72_state::scrollx1_w)
@@ -435,14 +435,14 @@ WRITE16_MEMBER(m72_state::m82_gfx_ctrl_w)
if (data & 0xff00) m_m82_rowscroll = 1;
else m_m82_rowscroll = 0;
}
-// printf("m82_gfx_ctrl_w %04x\n", data);
+// printf("m82_gfx_ctrl_w %04x\n", data);
}
WRITE16_MEMBER(m72_state::m82_tm_ctrl_w)
{
COMBINE_DATA(&m_m82_tmcontrol);
-// printf("tmcontrol %04x\n", m_m82_tmcontrol);
+// printf("tmcontrol %04x\n", m_m82_tmcontrol);
}
diff --git a/src/mame/video/meadows.c b/src/mame/video/meadows.c
index d378f15a7cf..e4c920c58d3 100644
--- a/src/mame/video/meadows.c
+++ b/src/mame/video/meadows.c
@@ -64,7 +64,7 @@ WRITE8_MEMBER(meadows_state::meadows_videoram_w)
WRITE8_MEMBER(meadows_state::meadows_spriteram_w)
{
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
m_spriteram[offset] = data;
}
diff --git a/src/mame/video/mikromik.c b/src/mame/video/mikromik.c
index f0c93b80f7a..1972efdb910 100644
--- a/src/mame/video/mikromik.c
+++ b/src/mame/video/mikromik.c
@@ -12,15 +12,15 @@ I8275_DRAW_CHARACTER_MEMBER( mm1_state::crtc_display_pixels )
{
UINT8 romdata = m_char_rom->base()[(charcode << 4) | linecount];
- int gpa0 = BIT(gpa, 0); // general purpose attribute 0
- int llen = m_llen; // light enable
- int compl_in = rvv; // reverse video
- int hlt_in = hlgt; // highlight;
- int color; // 0 = black, 1 = dk green, 2 = lt green; on MikroMikko 1, "highlight" is actually the darker shade of green
+ int gpa0 = BIT(gpa, 0); // general purpose attribute 0
+ int llen = m_llen; // light enable
+ int compl_in = rvv; // reverse video
+ int hlt_in = hlgt; // highlight;
+ int color; // 0 = black, 1 = dk green, 2 = lt green; on MikroMikko 1, "highlight" is actually the darker shade of green
int i, qh, video_in;
- int d7 = BIT(romdata, 7); // save MSB (1 indicates that this is a Visual Attribute or Special Code instead of a normal display character)
- int d6 = BIT(romdata, 6); // save also first and last char bitmap bits before shifting out the MSB
+ int d7 = BIT(romdata, 7); // save MSB (1 indicates that this is a Visual Attribute or Special Code instead of a normal display character)
+ int d6 = BIT(romdata, 6); // save also first and last char bitmap bits before shifting out the MSB
int d0 = BIT(romdata, 0);
UINT8 data = (romdata << 1) | (d7 & d0); // get rid of MSB, duplicate LSB for special characters
@@ -29,7 +29,7 @@ I8275_DRAW_CHARACTER_MEMBER( mm1_state::crtc_display_pixels )
if (HORIZONTAL_CHARACTER_PIXELS == 10)
{
// Hack to stretch 8 pixels wide character bitmap to 10 pixels on screen.
- // This was needed because high res graphics use 800 pixels wide bitmap but
+ // This was needed because high res graphics use 800 pixels wide bitmap but
// 80 chars * 8 pixels is only 640 -> characters would cover only 80% of the screen width.
// Step 1: Instead of 8, set MCFG_I8275_CHARACTER_WIDTH(10) at the end of this file
// Step 2: Make sure i8275_device::recompute_parameters() is called in i8275_device::device_start()
diff --git a/src/mame/video/model3.c b/src/mame/video/model3.c
index a9340181902..33ed150f227 100644
--- a/src/mame/video/model3.c
+++ b/src/mame/video/model3.c
@@ -1613,7 +1613,7 @@ void model3_state::draw_model(UINT32 addr)
clip_vert[i].z = p[i][2];
clip_vert[i].w = p[i][3];
- clip_vert[i].p[0] = vertex[i].u * texture_coord_scale * 256.0f; // 8 bits of subtexel accuracy for bilinear filtering
+ clip_vert[i].p[0] = vertex[i].u * texture_coord_scale * 256.0f; // 8 bits of subtexel accuracy for bilinear filtering
clip_vert[i].p[1] = vertex[i].v * texture_coord_scale * 256.0f;
// transform vertex normal
@@ -1656,7 +1656,7 @@ void model3_state::draw_model(UINT32 addr)
}
/* clip against all edges of the view frustum */
- num_vertices = frustum_clip_all<float, 4>(clip_vert, num_vertices, clip_vert);
+ num_vertices = frustum_clip_all<float, 4>(clip_vert, num_vertices, clip_vert);
/* divide by W, transform to screen coords */
for(i=0; i < num_vertices; i++)
@@ -2038,9 +2038,9 @@ void model3_renderer::draw_opaque_triangles(const m3_triangle* tris, int num_tri
v[i].y = tri->v[i].y;
v[i].p[0] = tri->v[i].w;
v[i].p[1] = 1.0f / tri->v[i].w;
- v[i].p[2] = tri->v[i].p[0];
- v[i].p[3] = tri->v[i].p[1];
- v[i].p[4] = tri->v[i].p[2];
+ v[i].p[2] = tri->v[i].p[0];
+ v[i].p[3] = tri->v[i].p[1];
+ v[i].p[4] = tri->v[i].p[2];
}
model3_polydata &extra = object_data_alloc();
@@ -2068,7 +2068,7 @@ void model3_renderer::draw_opaque_triangles(const m3_triangle* tris, int num_tri
v[i].x = tri->v[i].x;
v[i].y = tri->v[i].y;
v[i].p[0] = tri->v[i].w;
- v[i].p[1] = tri->v[i].p[2];
+ v[i].p[1] = tri->v[i].p[2];
}
model3_polydata &extra = object_data_alloc();
@@ -2103,7 +2103,7 @@ void model3_renderer::draw_alpha_triangles(const m3_triangle* tris, int num_tris
v[i].y = tri->v[i].y;
v[i].p[0] = tri->v[i].w;
v[i].p[1] = 1.0f / tri->v[i].w;
- v[i].p[2] = tri->v[i].p[0];
+ v[i].p[2] = tri->v[i].p[0];
v[i].p[3] = tri->v[i].p[1];
v[i].p[4] = tri->v[i].p[2];
}
diff --git a/src/mame/video/qix.c b/src/mame/video/qix.c
index 5bd717ecbc3..a42fd44fc4e 100644
--- a/src/mame/video/qix.c
+++ b/src/mame/video/qix.c
@@ -99,7 +99,7 @@ WRITE8_MEMBER(qix_state::qix_videoram_w)
{
/* update the screen in case the game is writing "behind" the beam -
Zookeeper likes to do this */
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
/* add in the upper bit of the address latch */
@@ -114,7 +114,7 @@ WRITE8_MEMBER(qix_state::slither_videoram_w)
{
/* update the screen in case the game is writing "behind" the beam -
Zookeeper likes to do this */
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
/* add in the upper bit of the address latch */
@@ -152,7 +152,7 @@ READ8_MEMBER(qix_state::qix_addresslatch_r)
WRITE8_MEMBER(qix_state::qix_addresslatch_w)
{
/* update the screen in case the game is writing "behind" the beam */
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
/* compute the value at the address latch */
@@ -166,7 +166,7 @@ WRITE8_MEMBER(qix_state::qix_addresslatch_w)
WRITE8_MEMBER(qix_state::slither_addresslatch_w)
{
/* update the screen in case the game is writing "behind" the beam */
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
/* compute the value at the address latch */
@@ -196,7 +196,7 @@ WRITE8_MEMBER(qix_state::qix_paletteram_w)
if (((offset >> 8) == m_palette_bank) &&
(old_data != data))
{
- // m_screen->update_now();
+ // m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
}
diff --git a/src/mame/video/sega16sp.c b/src/mame/video/sega16sp.c
index e7ca8d7cd7a..cb92a10a212 100644
--- a/src/mame/video/sega16sp.c
+++ b/src/mame/video/sega16sp.c
@@ -1041,7 +1041,6 @@ sega_outrun_sprite_device::sega_outrun_sprite_device(const machine_config &mconf
sega_xboard_sprite_device::sega_xboard_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: sega_outrun_sprite_device(mconfig, tag, owner, clock, true, "sega_xboard_sprite", __FILE__)
{
-
}
@@ -1086,7 +1085,7 @@ void sega_outrun_sprite_device::draw(bitmap_ind16 &bitmap, const rectangle &clip
// ----cccc cccc---- Sprite color palette
// -------- ----llll 4-bit pixel data
//
-
+
set_origin(m_xoffs, m_yoffs);
// render the sprites in order
diff --git a/src/mame/video/segaic16.c b/src/mame/video/segaic16.c
index a4826571cb4..8ac02ea654b 100644
--- a/src/mame/video/segaic16.c
+++ b/src/mame/video/segaic16.c
@@ -529,7 +529,7 @@ void draw_virtual_tilemap(screen_device &screen, struct tilemap_info *info, bitm
temp = bottommax;
bottommax = topmin;
topmin = temp;
-
+
if (leftmin != -1) leftmin = width - 1 - leftmin;
if (leftmax != -1) leftmax = width - 1 - leftmax;
if (rightmin != -1) rightmin = width - 1 - rightmin;
diff --git a/src/mame/video/spacefb.c b/src/mame/video/spacefb.c
index 94499a825c3..72b0c11ca05 100644
--- a/src/mame/video/spacefb.c
+++ b/src/mame/video/spacefb.c
@@ -19,7 +19,7 @@
WRITE8_MEMBER(spacefb_state::port_0_w)
{
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
m_port_0 = data;
}
@@ -27,7 +27,7 @@ WRITE8_MEMBER(spacefb_state::port_0_w)
WRITE8_MEMBER(spacefb_state::port_2_w)
{
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
m_port_2 = data;
}
diff --git a/src/mame/video/system1.c b/src/mame/video/system1.c
index e88587e69ea..f326cb1d5b3 100644
--- a/src/mame/video/system1.c
+++ b/src/mame/video/system1.c
@@ -190,21 +190,21 @@ WRITE8_MEMBER(system1_state::system1_videomode_w)
READ8_MEMBER(system1_state::system1_mixer_collision_r)
{
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
return m_mix_collide[offset & 0x3f] | 0x7e | (m_mix_collide_summary << 7);
}
WRITE8_MEMBER(system1_state::system1_mixer_collision_w)
{
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
m_mix_collide[offset & 0x3f] = 0;
}
WRITE8_MEMBER(system1_state::system1_mixer_collision_reset_w)
{
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
m_mix_collide_summary = 0;
}
@@ -219,21 +219,21 @@ WRITE8_MEMBER(system1_state::system1_mixer_collision_reset_w)
READ8_MEMBER(system1_state::system1_sprite_collision_r)
{
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
return m_sprite_collide[offset & 0x3ff] | 0x7e | (m_sprite_collide_summary << 7);
}
WRITE8_MEMBER(system1_state::system1_sprite_collision_w)
{
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
m_sprite_collide[offset & 0x3ff] = 0;
}
WRITE8_MEMBER(system1_state::system1_sprite_collision_reset_w)
{
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
m_sprite_collide_summary = 0;
}
diff --git a/src/mame/video/timeplt.c b/src/mame/video/timeplt.c
index ab2e11bcec4..afd493a8b92 100644
--- a/src/mame/video/timeplt.c
+++ b/src/mame/video/timeplt.c
@@ -125,8 +125,8 @@ TILE_GET_INFO_MEMBER(timeplt_state::get_chkun_tile_info)
void timeplt_state::video_start()
{
m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(timeplt_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32);
- m_video_enable = 0;
-
+ m_video_enable = 0;
+
save_item(NAME(m_video_enable));
}
diff --git a/src/mame/video/tp84.c b/src/mame/video/tp84.c
index cf95dafbc4f..80b3d00a95f 100644
--- a/src/mame/video/tp84.c
+++ b/src/mame/video/tp84.c
@@ -106,7 +106,7 @@ PALETTE_INIT_MEMBER(tp84_state, tp84)
WRITE8_MEMBER(tp84_state::tp84_spriteram_w)
{
/* the game multiplexes the sprites, so update now */
-// m_screen->update_now();
+// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
m_spriteram[offset] = data;
}
diff --git a/src/osd/modules/render/d3d/d3dhlsl.c b/src/osd/modules/render/d3d/d3dhlsl.c
index f3dad935d3e..00603e45e82 100644
--- a/src/osd/modules/render/d3d/d3dhlsl.c
+++ b/src/osd/modules/render/d3d/d3dhlsl.c
@@ -2266,9 +2266,9 @@ static void get_vector(const char *data, int count, float *out, int report_error
/*-------------------------------------------------
- slider_alloc - allocate a new slider entry
- currently duplicated from ui.c, this could
- be done in a more ideal way.
+ slider_alloc - allocate a new slider entry
+ currently duplicated from ui.c, this could
+ be done in a more ideal way.
-------------------------------------------------*/
static slider_state *slider_alloc(running_machine &machine, const char *title, INT32 minval, INT32 defval, INT32 maxval, INT32 incval, slider_update update, void *arg)
diff --git a/src/osd/osdmini/minifile.c b/src/osd/osdmini/minifile.c
index 2883b81c731..b55a3ad77e9 100644
--- a/src/osd/osdmini/minifile.c
+++ b/src/osd/osdmini/minifile.c
@@ -107,7 +107,7 @@ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 l
file_error osd_openpty(osd_file **file, char *name, size_t name_len)
{
- return FILERR_FAILURE;
+ return FILERR_FAILURE;
}
//============================================================
diff --git a/src/osd/osdnet.c b/src/osd/osdnet.c
index 9fd92311ea7..4c167251cea 100644
--- a/src/osd/osdnet.c
+++ b/src/osd/osdnet.c
@@ -50,7 +50,7 @@ osd_netdev::~osd_netdev()
{
m_stop = true;
// nasty hack to prevent Segmentation fault on emulation stop
-// m_timer->reset();
+// m_timer->reset();
}
int osd_netdev::send(UINT8 *buf, int len)
diff --git a/src/osd/sdl/sdlfile.c b/src/osd/sdl/sdlfile.c
index a93d5623412..7e3226d497a 100644
--- a/src/osd/sdl/sdlfile.c
+++ b/src/osd/sdl/sdlfile.c
@@ -365,18 +365,18 @@ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 c
file_error osd_openpty(osd_file **file, char *name, size_t name_len)
{
- file_error res;
- UINT64 filesize;
+ file_error res;
+ UINT64 filesize;
- if ((res = osd_open(sdlfile_ptty_identifier , 0 , file , &filesize)) != FILERR_NONE) {
- return res;
- }
+ if ((res = osd_open(sdlfile_ptty_identifier , 0 , file , &filesize)) != FILERR_NONE) {
+ return res;
+ }
- if ((res = sdl_slave_name_ptty(*file , name , name_len)) != FILERR_NONE) {
- osd_close(*file);
- }
+ if ((res = sdl_slave_name_ptty(*file , name , name_len)) != FILERR_NONE) {
+ osd_close(*file);
+ }
- return res;
+ return res;
}
//============================================================
diff --git a/src/osd/sdl/sdlptty_os2.c b/src/osd/sdl/sdlptty_os2.c
index e7d76965238..6c31caf897f 100644
--- a/src/osd/sdl/sdlptty_os2.c
+++ b/src/osd/sdl/sdlptty_os2.c
@@ -35,5 +35,5 @@ file_error sdl_close_ptty(osd_file *file)
file_error sdl_slave_name_ptty(osd_file *file)
{
- return FILERR_ACCESS_DENIED;
+ return FILERR_ACCESS_DENIED;
}
diff --git a/src/osd/sdl/sdlptty_unix.c b/src/osd/sdl/sdlptty_unix.c
index 6b618314d72..abe4ba8db0b 100644
--- a/src/osd/sdl/sdlptty_unix.c
+++ b/src/osd/sdl/sdlptty_unix.c
@@ -40,91 +40,91 @@ const char *sdlfile_ptty_identifier = "/dev/pts";
file_error sdl_open_ptty(const char *path, UINT32 openflags, osd_file **file, UINT64 *filesize)
{
- int master;
- int aslave;
- struct termios tios;
- int oldflags;
-
- memset(&tios , 0 , sizeof(tios));
- cfmakeraw(&tios);
-
- if (openpty(&master, &aslave, NULL, &tios, NULL) >= 0)
- {
- oldflags = fcntl(master, F_GETFL, 0);
- if (oldflags == -1) {
- close(master);
- return FILERR_FAILURE;
- }
-
- fcntl(master, F_SETFL, oldflags | O_NONBLOCK);
- close(aslave);
- (*file)->handle = master;
- *filesize = 0;
- }
- else
- {
- return FILERR_ACCESS_DENIED;
- }
-
- return FILERR_NONE;
+ int master;
+ int aslave;
+ struct termios tios;
+ int oldflags;
+
+ memset(&tios , 0 , sizeof(tios));
+ cfmakeraw(&tios);
+
+ if (openpty(&master, &aslave, NULL, &tios, NULL) >= 0)
+ {
+ oldflags = fcntl(master, F_GETFL, 0);
+ if (oldflags == -1) {
+ close(master);
+ return FILERR_FAILURE;
+ }
+
+ fcntl(master, F_SETFL, oldflags | O_NONBLOCK);
+ close(aslave);
+ (*file)->handle = master;
+ *filesize = 0;
+ }
+ else
+ {
+ return FILERR_ACCESS_DENIED;
+ }
+
+ return FILERR_NONE;
}
file_error sdl_read_ptty(osd_file *file, void *buffer, UINT64 offset, UINT32 count, UINT32 *actual)
{
- ssize_t result;
+ ssize_t result;
- result = read(file->handle, buffer, count);
+ result = read(file->handle, buffer, count);
- if (result < 0)
- {
- return error_to_file_error(errno);
- }
+ if (result < 0)
+ {
+ return error_to_file_error(errno);
+ }
- if (actual != NULL )
- {
- *actual = result;
- }
+ if (actual != NULL )
+ {
+ *actual = result;
+ }
- return FILERR_NONE;
+ return FILERR_NONE;
}
file_error sdl_write_ptty(osd_file *file, const void *buffer, UINT64 offset, UINT32 count, UINT32 *actual)
{
- ssize_t result;
- result = write(file->handle, buffer, count);
+ ssize_t result;
+ result = write(file->handle, buffer, count);
- if (result < 0)
- {
- return error_to_file_error(errno);
- }
+ if (result < 0)
+ {
+ return error_to_file_error(errno);
+ }
- if (actual != NULL )
- {
- *actual = result;
- }
+ if (actual != NULL )
+ {
+ *actual = result;
+ }
- return FILERR_NONE;
+ return FILERR_NONE;
}
file_error sdl_close_ptty(osd_file *file)
{
- close(file->handle);
- osd_free(file);
+ close(file->handle);
+ osd_free(file);
- return FILERR_NONE;
+ return FILERR_NONE;
}
file_error sdl_slave_name_ptty(osd_file *file , char *name , size_t name_len)
{
- const char *slave_name = ptsname(file->handle);
+ const char *slave_name = ptsname(file->handle);
- if (slave_name == NULL || strlen(slave_name) >= name_len) {
- return FILERR_INVALID_ACCESS;
- }
+ if (slave_name == NULL || strlen(slave_name) >= name_len) {
+ return FILERR_INVALID_ACCESS;
+ }
- strcpy(name , slave_name);
+ strcpy(name , slave_name);
- return FILERR_NONE;
+ return FILERR_NONE;
}
#else
@@ -134,27 +134,27 @@ const char *sdlfile_ptty_identifier = "";
file_error sdl_open_ptty(const char *path, UINT32 openflags, osd_file **file, UINT64 *filesize)
{
- return FILERR_ACCESS_DENIED;
+ return FILERR_ACCESS_DENIED;
}
file_error sdl_read_ptty(osd_file *file, void *buffer, UINT64 offset, UINT32 count, UINT32 *actual)
{
- return FILERR_ACCESS_DENIED;
+ return FILERR_ACCESS_DENIED;
}
file_error sdl_write_ptty(osd_file *file, const void *buffer, UINT64 offset, UINT32 count, UINT32 *actual)
{
- return FILERR_ACCESS_DENIED;
+ return FILERR_ACCESS_DENIED;
}
file_error sdl_close_ptty(osd_file *file)
{
- return FILERR_ACCESS_DENIED;
+ return FILERR_ACCESS_DENIED;
}
file_error sdl_slave_name_ptty(osd_file *file)
{
- return FILERR_ACCESS_DENIED;
+ return FILERR_ACCESS_DENIED;
}
#endif
diff --git a/src/osd/windows/winfile.c b/src/osd/windows/winfile.c
index 2ac5cddaee3..86ce65a0ef7 100644
--- a/src/osd/windows/winfile.c
+++ b/src/osd/windows/winfile.c
@@ -241,7 +241,7 @@ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 l
file_error osd_openpty(osd_file **file, char *name, size_t name_len)
{
- return FILERR_FAILURE;
+ return FILERR_FAILURE;
}
//============================================================
diff --git a/src/version.c b/src/version.c
index 06c276e0ff8..3ed45cbfb40 100644
--- a/src/version.c
+++ b/src/version.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#define BARE_BUILD_VERSION "0.166"
+#define BARE_BUILD_VERSION "0.167"
extern const char bare_build_version[];
extern const char build_version[];