summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2015-04-29 08:18:54 +0200
committerGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2015-04-29 08:18:54 +0200
commit76b978d039f922ed84796deb999389ebb1579191 (patch)
tree90e4fe3efe7a18b896e49fd7fb65ba7a144cac0f
parent64219f27d20c0f6f2dc8c168c8c19ba9420f889d (diff)
Cleanups and version bumpmame0161
-rw-r--r--hash/cpc_cass.xml40
-rwxr-xr-xhash/msx1_cass.xml30
-rw-r--r--hash/msx2p_flop.xml6
-rw-r--r--hash/msxr_flop.xml6
-rw-r--r--hash/n64dd.xml2
-rw-r--r--hash/nes.xml2
-rw-r--r--src/emu/bus/a800/a800_slot.c2
-rw-r--r--src/emu/bus/abcbus/abc890.h2
-rw-r--r--src/emu/bus/abcbus/fd2.c18
-rw-r--r--src/emu/bus/abcbus/fd2.h2
-rw-r--r--src/emu/bus/abcbus/lux4105.h2
-rw-r--r--src/emu/bus/abcbus/memcard.h2
-rw-r--r--src/emu/bus/abcbus/ram.h2
-rw-r--r--src/emu/bus/arcadia/slot.c2
-rw-r--r--src/emu/bus/cbmiec/c1541.c10
-rw-r--r--src/emu/bus/gameboy/gb_slot.h2
-rw-r--r--src/emu/bus/gameboy/mbc.c20
-rw-r--r--src/emu/bus/gameboy/mbc.h22
-rw-r--r--src/emu/bus/ieee488/c2040.c36
-rw-r--r--src/emu/bus/ieee488/c2040fdc.c2
-rw-r--r--src/emu/bus/ieee488/c8050.h4
-rw-r--r--src/emu/bus/ieee488/c8050fdc.c4
-rw-r--r--src/emu/bus/ieee488/c8280.c8
-rw-r--r--src/emu/bus/ieee488/c8280.h2
-rw-r--r--src/emu/bus/isa/svga_cirrus.c2
-rw-r--r--src/emu/bus/nes/nes_pcb.inc2
-rw-r--r--src/emu/bus/nubus/nubus_specpdq.c2
-rw-r--r--src/emu/bus/nubus/pds30_mc30.c2
-rw-r--r--src/emu/bus/nubus/pds30_procolor816.c2
-rw-r--r--src/emu/bus/ti99_peb/hfdc.c48
-rw-r--r--src/emu/bus/ti99_peb/hfdc.h6
-rw-r--r--src/emu/cpu/dsp16/dsp16dis.c2
-rw-r--r--src/emu/cpu/m68000/m68kops.c2
-rw-r--r--src/emu/cpu/mcs51/mcs51.h2
-rw-r--r--src/emu/cpu/mips/mips3.h4
-rw-r--r--src/emu/cpu/nec/v53.c4
-rw-r--r--src/emu/cpu/sh4/sh4.c4
-rw-r--r--src/emu/cpu/sh4/sh4.h6
-rw-r--r--src/emu/cpu/tms0980/tms0980.c2
-rw-r--r--src/emu/debug/debugcpu.h2
-rw-r--r--src/emu/diimage.c2
-rw-r--r--src/emu/drivenum.c6
-rw-r--r--src/emu/imagedev/harddriv.c2
-rw-r--r--src/emu/info.c2
-rw-r--r--src/emu/machine/hdc9234.c14
-rw-r--r--src/emu/machine/hdc9234.h2
-rw-r--r--src/emu/machine/mos6530n.c2
-rw-r--r--src/emu/machine/mos6530n.h2
-rw-r--r--src/emu/machine/pci9050.c28
-rw-r--r--src/emu/machine/pci9050.h8
-rw-r--r--src/emu/machine/ti99_hd.c110
-rw-r--r--src/emu/machine/ti99_hd.h48
-rw-r--r--src/emu/machine/vrc4373.h18
-rw-r--r--src/emu/machine/z80pio.c6
-rw-r--r--src/emu/netlist/devices/net_lib.c2
-rw-r--r--src/emu/netlist/devices/nld_74175.c4
-rw-r--r--src/emu/netlist/devices/nld_74175.h3
-rw-r--r--src/emu/netlist/devices/nld_74192.h4
-rw-r--r--src/emu/netlist/devices/nld_74193.h2
-rw-r--r--src/emu/netlist/devices/nld_82S16.c36
-rw-r--r--src/emu/netlist/devices/nld_82S16.h3
-rw-r--r--src/emu/netlist/devices/nld_9312.c2
-rw-r--r--src/emu/netlist/devices/nld_9312.h3
-rw-r--r--src/emu/netlist/devices/nld_legacy.c1
-rw-r--r--src/emu/netlist/devices/nld_signal.h4
-rw-r--r--src/emu/netlist/devices/nld_truthtable.h2
-rw-r--r--src/emu/netlist/nl_base.c2
-rw-r--r--src/emu/netlist/nl_base.h2
-rw-r--r--src/emu/netlist/nl_config.h2
-rw-r--r--src/emu/netlist/nl_dice_compat.h14
-rw-r--r--src/emu/sound/discrete.h2
-rw-r--r--src/emu/sound/es1373.c3
-rw-r--r--src/emu/sound/es1373.h8
-rw-r--r--src/emu/sound/l7a1045_l6028_dsp_a.c134
-rw-r--r--src/emu/sound/l7a1045_l6028_dsp_a.h2
-rw-r--r--src/emu/video.c2
-rw-r--r--src/emu/video/clgd542x.c39
-rw-r--r--src/emu/video/clgd542x.h13
-rw-r--r--src/emu/video/pc_vga.c2
-rw-r--r--src/emu/video/pc_vga.h4
-rw-r--r--src/lib/formats/c3040_dsk.c6
-rw-r--r--src/lib/formats/c4040_dsk.c6
-rw-r--r--src/lib/formats/c8280_dsk.c46
-rw-r--r--src/lib/formats/flopimg.c8
-rw-r--r--src/lib/formats/imd_dsk.c22
-rw-r--r--src/lib/util/corestr.c4
-rw-r--r--src/lib/util/hashing.c2
-rw-r--r--src/lib/util/zippath.c2
-rw-r--r--src/mame/audio/hng64.c2
-rw-r--r--src/mame/audio/wiping.c4
-rw-r--r--src/mame/audio/wiping.h2
-rw-r--r--src/mame/drivers/bagman.c4
-rw-r--r--src/mame/drivers/bfm_sc5sw.c67
-rw-r--r--src/mame/drivers/cardline.c4
-rw-r--r--src/mame/drivers/cv1k.c2
-rw-r--r--src/mame/drivers/galaxian.c2
-rw-r--r--src/mame/drivers/gambl186.c86
-rw-r--r--src/mame/drivers/gei.c1
-rw-r--r--src/mame/drivers/headonb.c4
-rw-r--r--src/mame/drivers/hexion.c1
-rw-r--r--src/mame/drivers/jackie.c10
-rw-r--r--src/mame/drivers/model2.c10
-rw-r--r--src/mame/drivers/nl_breakout.c2690
-rw-r--r--src/mame/drivers/peplus.c2
-rw-r--r--src/mame/drivers/pgm.c4
-rw-r--r--src/mame/drivers/pong.c2
-rw-r--r--src/mame/drivers/rotaryf.c4
-rw-r--r--src/mame/drivers/roul.c10
-rw-r--r--src/mame/drivers/segasp.c79
-rw-r--r--src/mame/drivers/seta.c2
-rw-r--r--src/mame/drivers/sf.c8
-rw-r--r--src/mame/drivers/shangha3.c2
-rw-r--r--src/mame/drivers/shanghai.c2
-rw-r--r--src/mame/drivers/shangkid.c4
-rw-r--r--src/mame/drivers/sigmab98.c84
-rw-r--r--src/mame/drivers/spoker.c4
-rw-r--r--src/mame/drivers/ssfindo.c4
-rw-r--r--src/mame/drivers/suprnova.c2
-rw-r--r--src/mame/drivers/ttchamp.c18
-rw-r--r--src/mame/drivers/twins.c6
-rw-r--r--src/mame/drivers/vamphalf.c10
-rw-r--r--src/mame/drivers/vicdual.c2
-rw-r--r--src/mame/drivers/vroulet.c8
-rw-r--r--src/mame/includes/cheekyms.h10
-rw-r--r--src/mame/includes/clshroad.h2
-rw-r--r--src/mame/includes/hng64.h2
-rw-r--r--src/mame/includes/n64.h10
-rw-r--r--src/mame/includes/pitnrun.h2
-rw-r--r--src/mame/includes/powerins.h2
-rw-r--r--src/mame/includes/quizdna.h4
-rw-r--r--src/mame/includes/sbugger.h8
-rw-r--r--src/mame/includes/segasp.h3
-rw-r--r--src/mame/includes/shangha3.h8
-rw-r--r--src/mame/includes/shangkid.h2
-rw-r--r--src/mame/includes/shaolins.h10
-rw-r--r--src/mame/includes/spcforce.h8
-rw-r--r--src/mame/includes/splash.h6
-rw-r--r--src/mame/includes/toobin.h2
-rw-r--r--src/mame/includes/victory.h12
-rw-r--r--src/mame/includes/vigilant.h8
-rw-r--r--src/mame/machine/awboard.c2
-rw-r--r--src/mame/machine/awboard.h4
-rw-r--r--src/mame/machine/iteagle_fpga.c3
-rw-r--r--src/mame/machine/midikbd.c8
-rw-r--r--src/mame/machine/n64.c2
-rw-r--r--src/mame/mame.lst30
-rw-r--r--src/mame/video/hng64_3d.c2
-rw-r--r--src/mame/video/pitnrun.c2
-rw-r--r--src/mame/video/quizdna.c2
-rw-r--r--src/mame/video/sauro.c2
-rw-r--r--src/mame/video/shangha3.c2
-rw-r--r--src/mame/video/shaolins.c2
-rw-r--r--src/mame/video/vigilant.c2
-rw-r--r--src/mess/drivers/abc80.c6
-rw-r--r--src/mess/drivers/gba.c4
-rw-r--r--src/mess/drivers/hh_hmcs40.c12
-rw-r--r--src/mess/drivers/hh_pic16.c2
-rw-r--r--src/mess/drivers/hh_tms1k.c40
-rw-r--r--src/mess/drivers/hh_ucom4.c26
-rw-r--r--src/mess/drivers/msx.c6
-rw-r--r--src/mess/drivers/pc88va.c4
-rw-r--r--src/mess/drivers/pegasus.c2
-rw-r--r--src/mess/drivers/spc1000.c10
-rw-r--r--src/mess/includes/abc80.h4
-rw-r--r--src/mess/layout/ssimon.lay2
-rw-r--r--src/mess/machine/pce_cd.c2
-rw-r--r--src/mess/machine/pce_cd.h2
-rw-r--r--src/osd/modules/sound/coreaudio_sound.c30
-rw-r--r--src/osd/osdcomm.h2
-rw-r--r--src/osd/sdl/sdlprefix.h1
-rw-r--r--src/osd/windows/video.c2
-rw-r--r--src/tools/regrep.c2
-rw-r--r--src/ume/dummy.lst2
-rw-r--r--src/version.c2
174 files changed, 2196 insertions, 2236 deletions
diff --git a/hash/cpc_cass.xml b/hash/cpc_cass.xml
index 2e3eee67468..69c76541031 100644
--- a/hash/cpc_cass.xml
+++ b/hash/cpc_cass.xml
@@ -3,7 +3,7 @@
<!-- Amstrad CPC 464 / 464+ etc. Tapes -->
-<!--
+<!--
List Revision History:
@@ -18,7 +18,7 @@ STILL TO DO:
-->
-<!--
+<!--
The following tapes have only been made available as separate data blocks and they need to be properly dumped.
Please stick to using the floppy versions for the time being...
@@ -101,7 +101,7 @@ Please stick to using the floppy versions for the time being...
-->
-<!--
+<!--
Loading Instructions are documented in the <info> field below. Typically these consist, when the system has a disk drive
(as the MESS drivers do have by default), in typing
@@ -109,16 +109,16 @@ Please stick to using the floppy versions for the time being...
and then in typing
run""
and press return. The latter part can be replaced by using the CPC keyboard shortcut 'Ctrl' + the numeric keypad 'Enter'
- (in both the real system and MESS, such shortcut is equivalent to the RUN"" command).
+ (in both the real system and MESS, such shortcut is equivalent to the RUN"" command).
Notice that the '|' key necessary for the former part is mapper to the key on the left of 'P' of your keyboard (corresponding
to '{' in most English keyboards).
- To start/stop the tape you can either use the emulation shortcuts for Tape Play and Tape Stop by default mapped to
- 'F2' and 'Shift'+'F2', or use the Tape Control options in the MESS internal menu, accessible by entering partial keyboard
+ To start/stop the tape you can either use the emulation shortcuts for Tape Play and Tape Stop by default mapped to
+ 'F2' and 'Shift'+'F2', or use the Tape Control options in the MESS internal menu, accessible by entering partial keyboard
mode (press 'Scroll Lock' on your keyboard) and then pressing 'TAB'.
Notice that you can speed up the loading process by pressing the FFWD key (by default mapped to 'Insert' on your keyboard)
- or by unthrottling emulation until the tape is fully loaded.
+ or by unthrottling emulation until the tape is fully loaded.
-->
@@ -127,9 +127,9 @@ Please stick to using the floppy versions for the time being...
<softwarelist name="cpc_cass" description="Amstrad CPC cassettes">
-<!--
+<!--
- Games
+ Games
-->
@@ -450,7 +450,7 @@ Please stick to using the floppy versions for the time being...
<year>1985</year>
<publisher>Amsoft</publisher>
<info name="usage" value="Load with |TAPE and then RUN&quot;&quot;" />
- <info name="alt_title" value="3D Boxkampf" /> <part name="cass1" interface="cpc_cass">
+ <info name="alt_title" value="3D Boxkampf" /> <part name="cass1" interface="cpc_cass">
<dataarea name="cass" size="58470">
<rom name="3d boxing (uk) (1985) [original] [tape].cdt" size="58470" crc="19182316" sha1="adc783a37568ae81fcaa3c7a0af80b08258c038c" offset="0" />
</dataarea>
@@ -30818,7 +30818,7 @@ Please stick to using the floppy versions for the time being...
<software name="saicombt" supported="no">
<description>Sai Combat (UK)</description>
<year>1986</year>
- <publisher>Mirrorsoft / Silverbird</publisher> <!-- Both releases contain the same tape! -->
+ <publisher>Mirrorsoft / Silverbird</publisher> <!-- Both releases contain the same tape! -->
<info name="usage" value="Load with |TAPE and then RUN&quot;&quot;" />
<part name="cass1" interface="cpc_cass">
<dataarea name="cass" size="71691">
@@ -38331,7 +38331,7 @@ Please stick to using the floppy versions for the time being...
</dataarea>
</part>
</software>
-
+
<software name="troglo" supported="no">
<description>Troglo (Spa)</description>
<year>1986</year>
@@ -43825,7 +43825,7 @@ Covertapes
<description>Advanced Lawnmowing Simulator (UK)</description>
<year>2010</year>
<publisher>&lt;homebrew&gt;</publisher>
- <info name="developer" value="Devilmarkus" />
+ <info name="developer" value="Devilmarkus" />
<info name="usage" value="Load with |TAPE and then RUN&quot;&quot;" />
<part name="cass1" interface="cpc_cass">
<dataarea name="cass" size="27727">
@@ -43903,7 +43903,7 @@ Covertapes
<description>Blue Angel 69 (UK)</description>
<year>2010</year>
<publisher>&lt;homebrew&gt;</publisher>
- <info name="developer" value="Kevin Thacker" />
+ <info name="developer" value="Kevin Thacker" />
<info name="usage" value="Load with |TAPE and then RUN&quot;&quot;" />
<part name="cass1" interface="cpc_cass">
<dataarea name="cass" size="81485">
@@ -43921,7 +43921,7 @@ Covertapes
<description>Breaking Baud Demo (UK)</description>
<year>2014</year>
<publisher>&lt;homebrew&gt;</publisher>
- <info name="developer" value="Doz" />
+ <info name="developer" value="Doz" />
<info name="usage" value="Load with |TAPE and then RUN&quot;&quot;" />
<part name="cass1" interface="cpc_cass">
<dataarea name="cass" size="110186">
@@ -44147,7 +44147,7 @@ Covertapes
<description>Jetpac (UK, v1.1, Converted from ZX)</description>
<year>2014</year>
<publisher>&lt;homebrew&gt;</publisher>
- <info name="developer" value="40CRISIS" />
+ <info name="developer" value="40CRISIS" />
<info name="usage" value="Load with |TAPE and then RUN&quot;&quot;" />
<part name="cass1" interface="cpc_cass">
<dataarea name="cass" size="18811">
@@ -44160,7 +44160,7 @@ Covertapes
<description>Jetpac (UK, Converted from ZX)</description>
<year>2014</year>
<publisher>&lt;homebrew&gt;</publisher>
- <info name="developer" value="40CRISIS" />
+ <info name="developer" value="40CRISIS" />
<info name="usage" value="Load with |TAPE and then RUN&quot;&quot;" />
<part name="cass1" interface="cpc_cass">
<dataarea name="cass" size="18247">
@@ -44575,10 +44575,10 @@ Covertapes
-<!--
+<!--
+
+ Misc tapes not confirmed at CPC-Power
- Misc tapes not confirmed at CPC-Power
-
-->
diff --git a/hash/msx1_cass.xml b/hash/msx1_cass.xml
index c372c1cb779..ef088d156cc 100755
--- a/hash/msx1_cass.xml
+++ b/hash/msx1_cass.xml
@@ -3,11 +3,11 @@
<softwarelist name="msx1_cass" description="MSX1 cassettes">
<!--
- TODO
- Proper regions (TOSEC is VERY incorrect on this)
- Test TOSEC "bad" dumps, make sure they aren't marked wrong (and re-add them in case they are not bad)
- Add images from "UnRenamed MSX"
- Japanese alt titles
+ TODO
+ Proper regions (TOSEC is VERY incorrect on this)
+ Test TOSEC "bad" dumps, make sure they aren't marked wrong (and re-add them in case they are not bad)
+ Add images from "UnRenamed MSX"
+ Japanese alt titles
-->
@@ -87,7 +87,7 @@
</software>
<!-- Games -->
-
+
<software name="genius">
<!-- listing printout published in Japan "POPCOM" '87/7 issue -->
<description>Genius (Jpn)</description>
@@ -215,7 +215,7 @@
<dataarea name="cass" size="32138">
<rom name="4x4 off-road racing (1988)(u.s. gold)(gb)(side a)[a][bload'cas-',r].cas" size="32138" crc="b9f3390f" sha1="b3bcd03ae18b44a71b7577306de88253d539c03f" offset="0" />
</dataarea>
- </part>
+ </part>
<part name="cass2" interface="msx_cass">
<feature name="part_id" value="Side B"/>
<dataarea name="cass" size="38434">
@@ -1710,7 +1710,7 @@
<year>1988</year>
<publisher>Eurosoft</publisher>
<info name="usage" value="Load with RUN&quot;CAS:&quot;"/>
-
+
<part name="cass1" interface="msx_cass">
<dataarea name="cass" size="69176">
<rom name="blow up (1988)(eurosoft)(nl)[run'cas-'].cas" size="69176" crc="6771c9b1" sha1="bb002e82bc95b6226e26db2e0bb33dbdc309a93d" offset="0" />
@@ -1723,7 +1723,7 @@
<year>1988</year>
<publisher>Eurosoft</publisher>
<info name="usage" value="Load with RUN&quot;CAS:&quot;"/>
-
+
<part name="cass1" interface="msx_cass">
<dataarea name="cass" size="56880">
<rom name="blow up (1988)(eurosoft)(nl)[a][run'cas-'].cas" size="56880" crc="c6e667c3" sha1="2322d52e266f30f4699eac6aae06b4dcabad168c" offset="0" />
@@ -2342,7 +2342,7 @@
</dataarea>
</part>
</software>
-
+
<software name="camelot">
<description>Camelot Warriors (Spa)</description>
<year>1986</year>
@@ -9881,7 +9881,7 @@
</part>
</software>
- <!-- 1st Edition? -->
+ <!-- 1st Edition? -->
<software name="nonamedb" cloneof="nonamed">
<description>Nonamed (Spa, Alt 2)</description>
<year>1986</year>
@@ -12796,7 +12796,7 @@
</part>
</software>
- <software name="smugglrs"> <!-- requires gunstick -->
+ <software name="smugglrs"> <!-- requires gunstick -->
<description>Space Smugglers (Spa)</description>
<year>1989</year>
<publisher>MHT Ingenieros</publisher>
@@ -15124,7 +15124,7 @@
<dataarea name="cass" size="52208">
<rom name="winter events (1987)(anco software)(gb)(side b)[martos].cas" size="52208" crc="5e34d1f8" sha1="cf87f620d15a16f4fda690110cd0cdc92e179b5a" offset="0" />
</dataarea>
- </part>
+ </part>
</software>
<software name="wingames">
@@ -15394,7 +15394,7 @@
<year>1985</year>
<publisher>Mr. Micro</publisher>
<info name="usage" value="Load with BLOAD&quot;CAS:&quot;,R"/>
-
+
<part name="cass1" interface="msx_cass">
<dataarea name="cass" size="63472">
<rom name="zakil wood (1985)(mr. micro)[bload'cas-',r].cas" size="63472" crc="d49d41df" sha1="bb9c4e1dcecc27bc5ef35705a4abac48d63119e6" offset="0" />
@@ -15407,7 +15407,7 @@
<year>1987</year>
<publisher>Eaglesoft</publisher>
<info name="usage" value="Load with RUN&quot;CAS:&quot;"/>
-
+
<part name="cass1" interface="msx_cass">
<dataarea name="cass" size="34616">
<rom name="zanac (1987)(eaglesoft)(nl)[run'cas-'].cas" size="34616" crc="33ac6012" sha1="0a40388be3878ed654898869a78de40d694b2ad8" offset="0" />
diff --git a/hash/msx2p_flop.xml b/hash/msx2p_flop.xml
index c5e3e8d009a..e60b732e9f4 100644
--- a/hash/msx2p_flop.xml
+++ b/hash/msx2p_flop.xml
@@ -3,19 +3,19 @@
<softwarelist name="msx2p_flop" description="MSX2+ floppies">
-<!--
+<!--
Disks to sort:
EVA Player for Sunrise ATA-IDE
-->
-<!--
+<!--
Known undumped:
Destiny-1
NBX 3.2
- Super Zeologue
+ Super Zeologue
Shuumatsunosugoshikata / The world is drawing to an W/end
Doozle (Dutch tool)
Mouse Master ( http://www.generation-msx.nl/software/msx-club-gouda/mouse-master/release/2542/ )
diff --git a/hash/msxr_flop.xml b/hash/msxr_flop.xml
index 3457b1aa42e..bc2c6dc1cbd 100644
--- a/hash/msxr_flop.xml
+++ b/hash/msxr_flop.xml
@@ -3,7 +3,7 @@
<softwarelist name="msxr_flop" description="MSX Turbo-R floppies">
-<!--
+<!--
Disks to sort:
Win2000 installer by Italo Valerio
@@ -12,11 +12,11 @@ Disks to sort:
Telebasic - Issue 01
XSC Compression Program
MSX-DOS Help by Miri Software
- GFX9000 Tool Disk
+ GFX9000 Tool Disk
-->
-<!--
+<!--
Known undumped:
pure v1.22 PCM editor
diff --git a/hash/n64dd.xml b/hash/n64dd.xml
index 7ea1a787e97..1535a981225 100644
--- a/hash/n64dd.xml
+++ b/hash/n64dd.xml
@@ -22,7 +22,7 @@
<info name="usage" value="Requires F-Zero X cart" />
<info name="serial" value="NUD-EFZJ-JPN" />
<info name="release" value="20000421" />
- <info name="alt_title" value="エフ ゼロ エックス エクスパンションキット" />
+ <info name="alt_title" value="エフ ゼロ エックス エクスパンションキット" />
<part name="disk" interface="n64dd_disk">
<dataarea name="rom" size="70627520">
<rom name="f-zero x expansion kit [nud-efzj-jpn].bin" size="70627520" crc="9ab91e71" sha1="7b39677dad61b2fb91eb2ede756fbd3b49f15afe" offset="0" />
diff --git a/hash/nes.xml b/hash/nes.xml
index f931689f95d..e23320e0c76 100644
--- a/hash/nes.xml
+++ b/hash/nes.xml
@@ -52494,7 +52494,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
<publisher>Caltron</publisher>
<part name="cart" interface="nes_cart">
<feature name="slot" value="cnrom" />
- <feature name="pcb" value="NES-CNROM" /> <!-- NTDEC-N71506x ? -->
+ <feature name="pcb" value="NES-CNROM" /> <!-- NTDEC-N71506x ? -->
<feature name="mirroring" value="horizontal" />
<dataarea name="chr" size="16384">
<rom name="adam &amp; eve (megasoft).chr" size="16384" crc="61cfe60d" sha1="d234813a34bdd8ef94ec63851c199e0c669ea1e3" offset="00000" status="baddump" />
diff --git a/src/emu/bus/a800/a800_slot.c b/src/emu/bus/a800/a800_slot.c
index adbe023271a..028fa02b2a0 100644
--- a/src/emu/bus/a800/a800_slot.c
+++ b/src/emu/bus/a800/a800_slot.c
@@ -62,7 +62,7 @@ device_a800_cart_interface::~device_a800_cart_interface ()
void device_a800_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
- {
+ {
m_rom = device().machine().memory().region_alloc(std::string(tag).append(A800SLOT_ROM_REGION_TAG).c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
diff --git a/src/emu/bus/abcbus/abc890.h b/src/emu/bus/abcbus/abc890.h
index 0bc29b02ad7..3d808ec5a28 100644
--- a/src/emu/bus/abcbus/abc890.h
+++ b/src/emu/bus/abcbus/abc890.h
@@ -26,7 +26,7 @@
// ======================> abc890_t
class abc890_t : public device_t,
- public device_abcbus_card_interface
+ public device_abcbus_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/abcbus/fd2.c b/src/emu/bus/abcbus/fd2.c
index a792b0d88ab..0d5d8c3d93b 100644
--- a/src/emu/bus/abcbus/fd2.c
+++ b/src/emu/bus/abcbus/fd2.c
@@ -100,7 +100,7 @@ WRITE8_MEMBER( abc_fd2_t::status_w )
3
4
5
- 6
+ 6
7
*/
@@ -154,11 +154,11 @@ READ8_MEMBER( abc_fd2_t::pio_pb_r )
bit description
- 0
- 1
- 2
- 3
- 4
+ 0
+ 1
+ 2
+ 3
+ 4
5 DRQ
6 HLD
7 INTRQ
@@ -185,9 +185,9 @@ WRITE8_MEMBER( abc_fd2_t::pio_pb_w )
2 TG43
3 MON
4 HLT
- 5
- 6
- 7
+ 5
+ 6
+ 7
*/
diff --git a/src/emu/bus/abcbus/fd2.h b/src/emu/bus/abcbus/fd2.h
index e41fa8d66e5..d0774818dbb 100644
--- a/src/emu/bus/abcbus/fd2.h
+++ b/src/emu/bus/abcbus/fd2.h
@@ -31,7 +31,7 @@
// ======================> abc_fd2_t
class abc_fd2_t : public device_t,
- public device_abcbus_card_interface
+ public device_abcbus_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/abcbus/lux4105.h b/src/emu/bus/abcbus/lux4105.h
index 2615655272c..d00511a727b 100644
--- a/src/emu/bus/abcbus/lux4105.h
+++ b/src/emu/bus/abcbus/lux4105.h
@@ -36,7 +36,7 @@
// ======================> luxor_4105_device
class luxor_4105_device : public device_t,
- public device_abcbus_card_interface
+ public device_abcbus_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/abcbus/memcard.h b/src/emu/bus/abcbus/memcard.h
index d7b9aac41b4..e901ac5050c 100644
--- a/src/emu/bus/abcbus/memcard.h
+++ b/src/emu/bus/abcbus/memcard.h
@@ -26,7 +26,7 @@
// ======================> abc_memory_card_t
class abc_memory_card_t : public device_t,
- public device_abcbus_card_interface
+ public device_abcbus_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/abcbus/ram.h b/src/emu/bus/abcbus/ram.h
index 3f3a1efda72..64f3265422d 100644
--- a/src/emu/bus/abcbus/ram.h
+++ b/src/emu/bus/abcbus/ram.h
@@ -26,7 +26,7 @@
// ======================> abc80_16kb_ram_card_t
class abc80_16kb_ram_card_t : public device_t,
- public device_abcbus_card_interface
+ public device_abcbus_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/arcadia/slot.c b/src/emu/bus/arcadia/slot.c
index 16b84601ac5..4d3d5e26012 100644
--- a/src/emu/bus/arcadia/slot.c
+++ b/src/emu/bus/arcadia/slot.c
@@ -48,7 +48,7 @@ device_arcadia_cart_interface::~device_arcadia_cart_interface()
void device_arcadia_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
- {
+ {
m_rom = device().machine().memory().region_alloc(std::string(tag).append(EA2001SLOT_ROM_REGION_TAG).c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
}
diff --git a/src/emu/bus/cbmiec/c1541.c b/src/emu/bus/cbmiec/c1541.c
index ec5b2cb504d..94e594752f2 100644
--- a/src/emu/bus/cbmiec/c1541.c
+++ b/src/emu/bus/cbmiec/c1541.c
@@ -336,7 +336,7 @@ ROM_END
const rom_entry *fsd1_device::device_rom_region() const
{
- return ROM_NAME( fsd1 );
+ return ROM_NAME( fsd1 );
}
@@ -353,8 +353,8 @@ ROM_START( fsd2 )
ROMX_LOAD( "fsd2b.u3", 0x0000, 0x4000, CRC(b39e4600) SHA1(991132fcc6e70e9a428062ae76055a150f2f7ac6), ROM_BIOS(2) )
ROM_SYSTEM_BIOS( 2, "jiffydos", "JiffyDOS v5.0" )
ROMX_LOAD( "jiffydos v5.0.u3", 0x0000, 0x4000, CRC(46c3302c) SHA1(e3623658cb7af30c9d3bce2ba3b6ad5ee89ac1b8), ROM_BIOS(3) )
- ROM_SYSTEM_BIOS( 3, "rexdos", "REX-DOS" )
- ROMX_LOAD( "rdos.bin", 0x0000, 0x4000, CRC(8ad6dba1) SHA1(f279d327d5e16ea1b62fb18514fb679d0b442941), ROM_BIOS(4) )
+ ROM_SYSTEM_BIOS( 3, "rexdos", "REX-DOS" )
+ ROMX_LOAD( "rdos.bin", 0x0000, 0x4000, CRC(8ad6dba1) SHA1(f279d327d5e16ea1b62fb18514fb679d0b442941), ROM_BIOS(4) )
ROM_END
@@ -475,7 +475,7 @@ ROM_END
const rom_entry *indus_gt_t::device_rom_region() const
{
- return ROM_NAME( indusgt );
+ return ROM_NAME( indusgt );
}
@@ -1064,7 +1064,7 @@ sx1541_device::sx1541_device(const machine_config &mconfig, const char *tag, dev
//-------------------------------------------------
fsd1_device::fsd1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : base_c1541_device(mconfig, FSD1, "FSD-1", tag, owner, clock, "fsd1", __FILE__) { }
+ : base_c1541_device(mconfig, FSD1, "FSD-1", tag, owner, clock, "fsd1", __FILE__) { }
//-------------------------------------------------
diff --git a/src/emu/bus/gameboy/gb_slot.h b/src/emu/bus/gameboy/gb_slot.h
index c04220323a4..61a7a7d8350 100644
--- a/src/emu/bus/gameboy/gb_slot.h
+++ b/src/emu/bus/gameboy/gb_slot.h
@@ -69,7 +69,7 @@ public:
void rom_map_setup(UINT32 size);
void ram_map_setup(UINT8 banks);
- virtual void set_additional_wirings(UINT8 mask, int shift) { } // MBC-1 will then overwrite this!
+ virtual void set_additional_wirings(UINT8 mask, int shift) { } // MBC-1 will then overwrite this!
void set_has_timer(bool val) { has_timer = val; }
void set_has_rumble(bool val) { has_rumble = val; }
void set_has_battery(bool val) { has_battery = val; }
diff --git a/src/emu/bus/gameboy/mbc.c b/src/emu/bus/gameboy/mbc.c
index a303910055e..9d1e5aef40e 100644
--- a/src/emu/bus/gameboy/mbc.c
+++ b/src/emu/bus/gameboy/mbc.c
@@ -25,7 +25,7 @@ const device_type GB_ROM_MBC7 = &device_creator<gb_rom_mbc7_device>;
const device_type GB_ROM_M161_M12 = &device_creator<gb_rom_m161_device>;
const device_type GB_ROM_MMM01 = &device_creator<gb_rom_mmm01_device>;
const device_type GB_ROM_SACHEN1 = &device_creator<gb_rom_sachen1_device>;
-const device_type GB_ROM_SACHEN2 = &device_creator<gb_rom_sachen1_device>; // Just a placeholder for the moment...
+const device_type GB_ROM_SACHEN2 = &device_creator<gb_rom_sachen1_device>; // Just a placeholder for the moment...
const device_type GB_ROM_188IN1 = &device_creator<gb_rom_188in1_device>;
const device_type GB_ROM_SINTAX = &device_creator<gb_rom_sintax_device>;
const device_type GB_ROM_CHONGWU = &device_creator<gb_rom_chongwu_device>;
@@ -322,18 +322,18 @@ WRITE8_MEMBER(gb_rom_mbc1_device::write_bank)
// the mapper only uses inputs A13-A15
switch (offset & 0xe000)
{
- case 0x0000: // RAM Enable Register
+ case 0x0000: // RAM Enable Register
m_ram_enable = ((data & 0x0f) == 0x0a) ? 1 : 0;
break;
- case 0x2000: // ROM Bank Register
+ case 0x2000: // ROM Bank Register
data &= 0x1f;
m_latch_bank2 = data ? data : 1;
m_latch_bank2 &= m_mask;
break;
- case 0x4000: // RAM Bank Register
+ case 0x4000: // RAM Bank Register
m_ram_bank = data & 0x3;
break;
- case 0x6000: // MBC1 Mode Register
+ case 0x6000: // MBC1 Mode Register
default:
m_mode = (data & 0x1) ? MODE_4M_256k : MODE_16M_8k;
break;
@@ -647,10 +647,10 @@ WRITE8_MEMBER(gb_rom_m161_device::write_bank)
{
switch (offset & 0xe000)
{
- case 0x4000: // Base Bank Register
+ case 0x4000: // Base Bank Register
m_base_bank = data << 1;
break;
- case 0x2000: // Tetris writes 1 here when selected...
+ case 0x2000: // Tetris writes 1 here when selected...
default:
break;
}
@@ -715,18 +715,18 @@ READ8_MEMBER(gb_rom_sachen1_device::read_rom)
WRITE8_MEMBER(gb_rom_sachen1_device::write_bank)
{
- if (offset < 0x2000) // Base ROM Bank register
+ if (offset < 0x2000) // Base ROM Bank register
{
if ((m_latch_bank2 & 0x30) == 0x30 && data)
m_base_bank = data & 0x0f;
//logerror("write to base bank %X - %X\n", data, (m_base_bank & m_mask) | (m_latch_bank2 & ~m_mask));
}
- else if (offset < 0x4000) // ROM Bank Register
+ else if (offset < 0x4000) // ROM Bank Register
{
m_latch_bank2 = data ? data : 1;
//logerror("write to latch %X - %X\n", data, (m_base_bank & m_mask) | (m_latch_bank2 & ~m_mask));
}
- else if (offset < 0x6000) // ROM bank mask register
+ else if (offset < 0x6000) // ROM bank mask register
{
if ((m_latch_bank2 & 0x30) == 0x30)
m_mask = data;
diff --git a/src/emu/bus/gameboy/mbc.h b/src/emu/bus/gameboy/mbc.h
index bda06a65523..1d9e35c7ba9 100644
--- a/src/emu/bus/gameboy/mbc.h
+++ b/src/emu/bus/gameboy/mbc.h
@@ -33,12 +33,12 @@ public:
class gb_rom_mbc1_device : public gb_rom_mbc_device
{
public:
-
+
enum {
MODE_16M_8k = 0, /// 16Mbit ROM, 8kBit RAM
MODE_4M_256k = 1, /// 4Mbit ROM, 256kBit RAM
};
-
+
// construction/destruction
gb_rom_mbc1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
gb_rom_mbc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@@ -46,7 +46,7 @@ public:
// device-level overrides
virtual void device_start() { shared_start(); save_item(NAME(m_mode)); };
virtual void device_reset() { shared_reset(); m_mode = MODE_16M_8k; };
- virtual void set_additional_wirings(UINT8 mask, int shift) { m_mask = mask; m_shift = shift; } // these get set at cart loading
+ virtual void set_additional_wirings(UINT8 mask, int shift) { m_mask = mask; m_shift = shift; } // these get set at cart loading
virtual DECLARE_READ8_MEMBER(read_rom);
virtual DECLARE_WRITE8_MEMBER(write_bank);
@@ -156,19 +156,19 @@ public:
class gb_rom_m161_device : public gb_rom_mbc_device
{
public:
-
+
// construction/destruction
gb_rom_m161_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start();
virtual void device_reset();
-
+
virtual DECLARE_READ8_MEMBER(read_rom);
virtual DECLARE_WRITE8_MEMBER(write_bank);
virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_ram) { }
-
+
UINT8 m_base_bank;
};
@@ -194,19 +194,19 @@ public:
class gb_rom_sachen1_device : public gb_rom_mbc1_device
{
public:
-
+
// construction/destruction
gb_rom_sachen1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start();
virtual void device_reset();
-
+
virtual DECLARE_READ8_MEMBER(read_rom);
virtual DECLARE_WRITE8_MEMBER(write_bank);
virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_ram) { }
-
+
UINT8 m_base_bank, m_mask;
};
diff --git a/src/emu/bus/ieee488/c2040.c b/src/emu/bus/ieee488/c2040.c
index 4eb7c265660..273756742a5 100644
--- a/src/emu/bus/ieee488/c2040.c
+++ b/src/emu/bus/ieee488/c2040.c
@@ -11,29 +11,29 @@
/*
- 2040/3040 disk initialization
- -----------------------------
- You need to initialize each diskette before trying to access it
- or you will get a DISK ID MISMATCH error upon disk commands.
- On the 4040 this is done automatically by the DOS.
+ 2040/3040 disk initialization
+ -----------------------------
+ You need to initialize each diskette before trying to access it
+ or you will get a DISK ID MISMATCH error upon disk commands.
+ On the 4040 this is done automatically by the DOS.
- open 15,8,15:print 15,"i":close 15
+ open 15,8,15:print 15,"i":close 15
- List directory
- --------------
- directory / diR
+ List directory
+ --------------
+ directory / diR
- Format disk
- -----------
- header "label,id",d0,i01
+ Format disk
+ -----------
+ header "label,id",d0,i01
- Load file
- ---------
- dload "name" / dL"name
+ Load file
+ ---------
+ dload "name" / dL"name
- Save file
- ---------
- dsave "name" / dS"name
+ Save file
+ ---------
+ dsave "name" / dS"name
*/
diff --git a/src/emu/bus/ieee488/c2040fdc.c b/src/emu/bus/ieee488/c2040fdc.c
index 026d0a37757..3881ff643f6 100644
--- a/src/emu/bus/ieee488/c2040fdc.c
+++ b/src/emu/bus/ieee488/c2040fdc.c
@@ -11,7 +11,7 @@
/*
- TODO:
+ TODO:
- write protect
- separate read/write methods
diff --git a/src/emu/bus/ieee488/c8050.h b/src/emu/bus/ieee488/c8050.h
index 7d2ffdf0275..db87bffeab3 100644
--- a/src/emu/bus/ieee488/c8050.h
+++ b/src/emu/bus/ieee488/c8050.h
@@ -32,7 +32,7 @@
// ======================> c8050_device
class c8050_device : public device_t,
- public device_ieee488_interface
+ public device_ieee488_interface
{
public:
// construction/destruction
@@ -53,7 +53,7 @@ public:
DECLARE_WRITE8_MEMBER( via_pb_w );
DECLARE_READ8_MEMBER( pi_r );
DECLARE_WRITE8_MEMBER( pi_w );
-
+
DECLARE_FLOPPY_FORMATS( floppy_formats );
protected:
diff --git a/src/emu/bus/ieee488/c8050fdc.c b/src/emu/bus/ieee488/c8050fdc.c
index b45a1c5810f..86aea2522fc 100644
--- a/src/emu/bus/ieee488/c8050fdc.c
+++ b/src/emu/bus/ieee488/c8050fdc.c
@@ -11,7 +11,7 @@
/*
- TODO:
+ TODO:
- write protect
- 75,format speed error,01,00,0
@@ -221,7 +221,7 @@ void c8050_fdc_t::ds_w(int ds)
void c8050_fdc_t::set_floppy(floppy_connector *floppy0, floppy_connector *floppy1)
{
m_floppy0 = floppy0->get_device();
-
+
if (floppy1) {
m_floppy1 = floppy1->get_device();
}
diff --git a/src/emu/bus/ieee488/c8280.c b/src/emu/bus/ieee488/c8280.c
index 8787fb99487..0265f0983d1 100644
--- a/src/emu/bus/ieee488/c8280.c
+++ b/src/emu/bus/ieee488/c8280.c
@@ -477,12 +477,12 @@ READ8_MEMBER( c8280_device::fk5_r )
bit description
- 0
- 1
- 2
+ 0
+ 1
+ 2
3 DCHG
4 TSID
- 5
+ 5
6 0
7 0
diff --git a/src/emu/bus/ieee488/c8280.h b/src/emu/bus/ieee488/c8280.h
index 917d6bbf1e2..ecb519ace7d 100644
--- a/src/emu/bus/ieee488/c8280.h
+++ b/src/emu/bus/ieee488/c8280.h
@@ -30,7 +30,7 @@
// ======================> c8280_device
class c8280_device : public device_t,
- public device_ieee488_interface
+ public device_ieee488_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/isa/svga_cirrus.c b/src/emu/bus/isa/svga_cirrus.c
index 888b56bdb5c..03e2413e984 100644
--- a/src/emu/bus/isa/svga_cirrus.c
+++ b/src/emu/bus/isa/svga_cirrus.c
@@ -93,7 +93,7 @@ void isa16_svga_cirrus_device::device_reset()
/*
- Generic CL-GD542x video card
+ Generic CL-GD542x video card
*/
ROM_START( clgd542x )
diff --git a/src/emu/bus/nes/nes_pcb.inc b/src/emu/bus/nes/nes_pcb.inc
index 8674f6a1b6c..d96420d5cbd 100644
--- a/src/emu/bus/nes/nes_pcb.inc
+++ b/src/emu/bus/nes/nes_pcb.inc
@@ -313,7 +313,7 @@ static const nes_pcb pcb_list[] =
{ "bmc_hik_kof", UNSUPPORTED_BOARD },
{ "onebus", UNSUPPORTED_BOARD },
{ "coolboy", UNSUPPORTED_BOARD },
- { "btl_900218", UNSUPPORTED_BOARD }, // pirate The Lord of King, to be emulated soon
+ { "btl_900218", UNSUPPORTED_BOARD }, // pirate The Lord of King, to be emulated soon
{ "a9746", UNSUPPORTED_BOARD },
{ "dance2k", UNSUPPORTED_BOARD },
{ "pec586", UNSUPPORTED_BOARD },
diff --git a/src/emu/bus/nubus/nubus_specpdq.c b/src/emu/bus/nubus/nubus_specpdq.c
index f7c3abc2998..8a928177706 100644
--- a/src/emu/bus/nubus/nubus_specpdq.c
+++ b/src/emu/bus/nubus/nubus_specpdq.c
@@ -83,7 +83,7 @@ const rom_entry *nubus_specpdq_device::device_rom_region() const
nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NUBUS_SPECPDQ, "SuperMac Spectrum PDQ video card", tag, owner, clock, "nb_spdq", __FILE__),
device_video_interface(mconfig, *this),
- device_nubus_card_interface(mconfig, *this),
+ device_nubus_card_interface(mconfig, *this),
m_palette(*this, "palette")
{
m_assembled_tag = std::string(tag).append(":").append(SPECPDQ_SCREEN_NAME);
diff --git a/src/emu/bus/nubus/pds30_mc30.c b/src/emu/bus/nubus/pds30_mc30.c
index 87067bf4602..43b078ed588 100644
--- a/src/emu/bus/nubus/pds30_mc30.c
+++ b/src/emu/bus/nubus/pds30_mc30.c
@@ -65,7 +65,7 @@ const rom_entry *nubus_xceedmc30_device::device_rom_region() const
nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PDS030_XCEEDMC30, "Micron/XCEED Technology MacroColor 30", tag, owner, clock, "pd3_mclr", __FILE__),
device_video_interface(mconfig, *this),
- device_nubus_card_interface(mconfig, *this)
+ device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = std::string(tag).append(":").append(XCEEDMC30_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
diff --git a/src/emu/bus/nubus/pds30_procolor816.c b/src/emu/bus/nubus/pds30_procolor816.c
index f615ae2e988..7fca7b81bfa 100644
--- a/src/emu/bus/nubus/pds30_procolor816.c
+++ b/src/emu/bus/nubus/pds30_procolor816.c
@@ -68,7 +68,7 @@ const rom_entry *nubus_procolor816_device::device_rom_region() const
nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PDS030_PROCOLOR816, "Lapis ProColor Server 8*16", tag, owner, clock, "pd3_pc16", __FILE__),
device_video_interface(mconfig, *this),
- device_nubus_card_interface(mconfig, *this)
+ device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = std::string(tag).append(":").append(PROCOLOR816_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
diff --git a/src/emu/bus/ti99_peb/hfdc.c b/src/emu/bus/ti99_peb/hfdc.c
index 42bec79a255..b4ca2c415b7 100644
--- a/src/emu/bus/ti99_peb/hfdc.c
+++ b/src/emu/bus/ti99_peb/hfdc.c
@@ -74,7 +74,7 @@
#define CLK_ADDR 0x0fe0
#define RAM_ADDR 0x1000
-#define TRACE_EMU 1
+#define TRACE_EMU 1
#define TRACE_CRU 0
#define TRACE_COMP 0
#define TRACE_RAM 0
@@ -574,15 +574,15 @@ void myarc_hfdc_device::signal_drive_status()
if ((m_current_floppy != NULL) && (!m_current_floppy->trk00_r()))
reply |= HDC_DS_TRK00;
}
- else
+ else
{
if ((m_output1_latch & 0xe0)!=0)
{
if (m_current_harddisk != NULL)
{
- if (m_current_harddisk->ready_r()==ASSERT_LINE)
+ if (m_current_harddisk->ready_r()==ASSERT_LINE)
{
- m_status_latch |= HDC_DS_READY;
+ m_status_latch |= HDC_DS_READY;
set_bits(m_status_latch, HDC_DS_SKCOM, m_current_harddisk->seek_complete_r()==ASSERT_LINE);
set_bits(m_status_latch, HDC_DS_TRK00, m_current_harddisk->trk00_r()==ASSERT_LINE);
}
@@ -632,13 +632,13 @@ WRITE8_MEMBER( myarc_hfdc_device::auxbus_out )
m_output1_latch = data;
- if ((data & 0x10) != 0) connect_floppy_unit(bit_to_index(data & 0x0f)); // Floppy selected
+ if ((data & 0x10) != 0) connect_floppy_unit(bit_to_index(data & 0x0f)); // Floppy selected
else
{
index = bit_to_index((data>>4) & 0x0f);
- if (index > 0) connect_harddisk_unit(index-1); // HD selected; index >= 1
- else
+ if (index > 0) connect_harddisk_unit(index-1); // HD selected; index >= 1
+ else
{
disconnect_floppy_drives();
disconnect_hard_drives();
@@ -668,7 +668,7 @@ WRITE8_MEMBER( myarc_hfdc_device::auxbus_out )
m_current_floppy->dir_w((data & 0x20)==0);
m_current_floppy->stp_w((data & 0x10)==0);
}
-
+
if (m_current_harddisk != NULL)
{
// Dir = 0 -> outward
@@ -695,10 +695,10 @@ void myarc_hfdc_device::connect_floppy_unit(int index)
{
disconnect_floppy_drives();
if (TRACE_LINES) logerror("%s: Select floppy drive DSK%d\n", tag(), index+1);
-
+
// Connect new drive
m_current_floppy = m_floppy_unit[index];
-
+
// We don't use the READY line of floppy drives.
// READY is asserted when DSKx = 1
// The controller fetches the state with the auxbus access
@@ -709,8 +709,8 @@ void myarc_hfdc_device::connect_floppy_unit(int index)
logerror("%s: Connection to DSK%d failed because no drive is connected\n", tag(), index+1);
m_hdc9234->connect_floppy_drive(m_floppy_unit[index]);
}
-
- // We can only run a floppy or a harddisk at a time, not both
+
+ // We can only run a floppy or a harddisk at a time, not both
disconnect_hard_drives();
}
@@ -720,10 +720,10 @@ void myarc_hfdc_device::connect_harddisk_unit(int index)
{
disconnect_hard_drives();
if (TRACE_LINES) logerror("%s: Select hard disk WDS%d\n", tag(), index+1);
-
+
// Connect new drive
m_current_harddisk = m_harddisk_unit[index];
-
+
if (TRACE_LINES) logerror("%s: Connect index callback WDS%d\n", tag(), index+1);
if (m_current_harddisk != NULL)
{
@@ -735,7 +735,7 @@ void myarc_hfdc_device::connect_harddisk_unit(int index)
m_hdc9234->connect_hard_drive(m_current_harddisk);
}
- // We can only run a floppy or a harddisk at a time, not both
+ // We can only run a floppy or a harddisk at a time, not both
disconnect_floppy_drives();
}
@@ -756,7 +756,7 @@ void myarc_hfdc_device::disconnect_hard_drives()
if (m_current_harddisk != NULL)
{
m_current_harddisk->setup_index_pulse_cb(mfm_harddisk_device::index_pulse_cb());
- m_current_harddisk->setup_seek_complete_cb(mfm_harddisk_device::seek_complete_cb());
+ m_current_harddisk->setup_seek_complete_cb(mfm_harddisk_device::seek_complete_cb());
m_current_harddisk = NULL;
}
}
@@ -917,15 +917,15 @@ void myarc_hfdc_device::device_config_complete()
m_harddisk_unit[i] = NULL;
}
m_floppy_unit[3] = NULL;
-
+
// Seems to be null when doing a "-listslots"
- if (subdevice("f1")!=NULL)
+ if (subdevice("f1")!=NULL)
{
m_floppy_unit[0] = static_cast<floppy_connector*>(subdevice("f1"))->get_device();
m_floppy_unit[1] = static_cast<floppy_connector*>(subdevice("f2"))->get_device();
m_floppy_unit[2] = static_cast<floppy_connector*>(subdevice("f3"))->get_device();
m_floppy_unit[3] = static_cast<floppy_connector*>(subdevice("f4"))->get_device();
-
+
m_harddisk_unit[0] = static_cast<mfm_harddisk_connector*>(subdevice("h1"))->get_device();
m_harddisk_unit[1] = static_cast<mfm_harddisk_connector*>(subdevice("h2"))->get_device();
m_harddisk_unit[2] = static_cast<mfm_harddisk_connector*>(subdevice("h3"))->get_device();
@@ -993,8 +993,8 @@ static SLOT_INTERFACE_START( hfdc_floppies )
SLOT_INTERFACE_END
static SLOT_INTERFACE_START( hfdc_harddisks )
- SLOT_INTERFACE( "generic", MFM_HD_GENERIC ) // Generic high-level emulation
-// SLOT_INTERFACE( "seagatemfm", MFM_HD_SEAGATE ) // Seagate ST-225 and others
+ SLOT_INTERFACE( "generic", MFM_HD_GENERIC ) // Generic high-level emulation
+// SLOT_INTERFACE( "seagatemfm", MFM_HD_SEAGATE ) // Seagate ST-225 and others
SLOT_INTERFACE_END
MACHINE_CONFIG_FRAGMENT( ti99_hfdc )
@@ -1015,7 +1015,7 @@ MACHINE_CONFIG_FRAGMENT( ti99_hfdc )
MCFG_MFM_HARDDISK_ADD("h1", hfdc_harddisks, NULL)
MCFG_MFM_HARDDISK_ADD("h2", hfdc_harddisks, NULL)
MCFG_MFM_HARDDISK_ADD("h3", hfdc_harddisks, NULL)
-
+
MCFG_DEVICE_ADD(CLOCK_TAG, MM58274C, 0)
MCFG_MM58274C_MODE24(1) // 24 hour
MCFG_MM58274C_DAY1(0) // sunday
@@ -1478,8 +1478,8 @@ MACHINE_CONFIG_FRAGMENT( ti99_hfdc_legacy )
MCFG_DEVICE_ADD(CLOCK_TAG, MM58274C, 0)
MCFG_MM58274C_MODE24(1) // 24 hour
MCFG_MM58274C_DAY1(0) // sunday
-
- MCFG_MFMHD_3_DRIVES_ADD() // add hard disks
+
+ MCFG_MFMHD_3_DRIVES_ADD() // add hard disks
MACHINE_CONFIG_END
ROM_START( ti99_hfdc_legacy )
diff --git a/src/emu/bus/ti99_peb/hfdc.h b/src/emu/bus/ti99_peb/hfdc.h
index 5ba2d816be1..a22ede259d9 100644
--- a/src/emu/bus/ti99_peb/hfdc.h
+++ b/src/emu/bus/ti99_peb/hfdc.h
@@ -52,7 +52,7 @@ public:
protected:
void device_config_complete();
-
+
private:
void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
void device_start();
@@ -70,7 +70,7 @@ private:
void floppy_index_callback(floppy_image_device *floppy, int state);
void harddisk_index_callback(mfm_harddisk_device *harddisk, int state);
void harddisk_skcom_callback(mfm_harddisk_device *harddisk, int state);
-
+
// Operate the floppy motors
void set_floppy_motors_running(bool run);
@@ -184,7 +184,7 @@ private:
/* Connector for a MFM hard disk. See also floppy.c */
class mfm_harddisk_connector : public device_t,
- public device_slot_interface
+ public device_slot_interface
{
public:
mfm_harddisk_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
diff --git a/src/emu/cpu/dsp16/dsp16dis.c b/src/emu/cpu/dsp16/dsp16dis.c
index 2aed7e0f0b8..09d6e2d149a 100644
--- a/src/emu/cpu/dsp16/dsp16dis.c
+++ b/src/emu/cpu/dsp16/dsp16dis.c
@@ -101,7 +101,7 @@ std::string disasmF2Field(const UINT8& F2, const UINT8& D, const UINT8& S)
case 0x05: strprintf(ret, "a%d = a%d << 8", D, S); break;
case 0x06: strprintf(ret, "a%d = a%d >> 16", D, S); break;
case 0x07: strprintf(ret, "a%d = a%d << 16", D, S); break;
-
+
case 0x08: strprintf(ret, "a%d = p", D); break;
case 0x09: strprintf(ret, "a%dh = a%dh + 1", D, S); break;
case 0x0a: strprintf(ret, "RESERVED"); break;
diff --git a/src/emu/cpu/m68000/m68kops.c b/src/emu/cpu/m68000/m68kops.c
index cbb37a99d28..436df1df763 100644
--- a/src/emu/cpu/m68000/m68kops.c
+++ b/src/emu/cpu/m68000/m68kops.c
@@ -34882,5 +34882,3 @@ void m68ki_build_opcode_table(void)
/* ======================================================================== */
/* ============================== END OF FILE ============================= */
/* ======================================================================== */
-
-
diff --git a/src/emu/cpu/mcs51/mcs51.h b/src/emu/cpu/mcs51/mcs51.h
index efca4c8de16..d02bb02797d 100644
--- a/src/emu/cpu/mcs51/mcs51.h
+++ b/src/emu/cpu/mcs51/mcs51.h
@@ -150,7 +150,7 @@ protected:
UINT8 m_irq_active; /* mask which irq levels are serviced */
UINT8 m_irq_prio[8]; /* interrupt priority */
- UINT8 m_forced_inputs[4]; /* allow read even if configured as output */
+ UINT8 m_forced_inputs[4]; /* allow read even if configured as output */
int m_icount;
diff --git a/src/emu/cpu/mips/mips3.h b/src/emu/cpu/mips/mips3.h
index 5d5d61354d7..e527b4715b4 100644
--- a/src/emu/cpu/mips/mips3.h
+++ b/src/emu/cpu/mips/mips3.h
@@ -396,8 +396,8 @@ private:
/* memory accesses */
bool m_bigendian;
- UINT32 m_byte_xor;
- UINT32 m_word_xor;
+ UINT32 m_byte_xor;
+ UINT32 m_word_xor;
data_accessors m_memory;
/* cache memory */
diff --git a/src/emu/cpu/nec/v53.c b/src/emu/cpu/nec/v53.c
index 36e8d9da5a4..bbec2d042e3 100644
--- a/src/emu/cpu/nec/v53.c
+++ b/src/emu/cpu/nec/v53.c
@@ -477,8 +477,8 @@ static MACHINE_CONFIG_FRAGMENT( v53 )
MCFG_DEVICE_ADD("pit", PIT8254, 0) // functionality identical to uPD71054
MCFG_PIT8253_CLK0(16000000) // manual implicitly claims that these runs at same speed as the CPU
- MCFG_PIT8253_CLK1(16000000)
- MCFG_PIT8253_CLK2(16000000)
+ MCFG_PIT8253_CLK1(16000000)
+ MCFG_PIT8253_CLK2(16000000)
MCFG_PIT8253_OUT0_HANDLER(WRITELINE( v53_base_device, tcu_out0_trampoline_cb ))
MCFG_PIT8253_OUT1_HANDLER(WRITELINE( v53_base_device, tcu_out1_trampoline_cb ))
MCFG_PIT8253_OUT2_HANDLER(WRITELINE( v53_base_device, tcu_out2_trampoline_cb ))
diff --git a/src/emu/cpu/sh4/sh4.c b/src/emu/cpu/sh4/sh4.c
index eed99ceca33..3b294fcf503 100644
--- a/src/emu/cpu/sh4/sh4.c
+++ b/src/emu/cpu/sh4/sh4.c
@@ -100,8 +100,8 @@ sh34_base_device::sh34_base_device(const machine_config &mconfig, device_type ty
#if SH4_USE_FASTRAM_OPTIMIZATION
, m_bigendian(endianness == ENDIANNESS_BIG)
, m_byte_xor(m_bigendian ? BYTE8_XOR_BE(0) : BYTE8_XOR_LE(0))
- , m_word_xor(m_bigendian ? WORD2_XOR_BE(0) : WORD2_XOR_LE(0))
- , m_dword_xor(m_bigendian ? DWORD_XOR_BE(0) : DWORD_XOR_LE(0))
+ , m_word_xor(m_bigendian ? WORD2_XOR_BE(0) : WORD2_XOR_LE(0))
+ , m_dword_xor(m_bigendian ? DWORD_XOR_BE(0) : DWORD_XOR_LE(0))
, m_fastram_select(0)
#endif
{
diff --git a/src/emu/cpu/sh4/sh4.h b/src/emu/cpu/sh4/sh4.h
index e7ad4fd9cb0..5a621b8cfc7 100644
--- a/src/emu/cpu/sh4/sh4.h
+++ b/src/emu/cpu/sh4/sh4.h
@@ -693,9 +693,9 @@ protected:
#if SH4_USE_FASTRAM_OPTIMIZATION
/* fast RAM */
bool m_bigendian;
- UINT32 m_byte_xor;
- UINT32 m_word_xor;
- UINT32 m_dword_xor;
+ UINT32 m_byte_xor;
+ UINT32 m_word_xor;
+ UINT32 m_dword_xor;
UINT32 m_fastram_select;
struct
{
diff --git a/src/emu/cpu/tms0980/tms0980.c b/src/emu/cpu/tms0980/tms0980.c
index 142f894cdf4..3c1db6c8a3d 100644
--- a/src/emu/cpu/tms0980/tms0980.c
+++ b/src/emu/cpu/tms0980/tms0980.c
@@ -3,7 +3,7 @@
/*
TMS0980/TMS1000-family MCU cores
-
+
TODO:
- emulate TMS1600 L-pins
- fix debugger disasm view
diff --git a/src/emu/debug/debugcpu.h b/src/emu/debug/debugcpu.h
index 1cfacc267b0..2f1f90c4ef7 100644
--- a/src/emu/debug/debugcpu.h
+++ b/src/emu/debug/debugcpu.h
@@ -236,7 +236,7 @@ public:
void registerpoint_enable_all(bool enable = true );
// hotspots
- bool hotspot_tracking_enabled() const { return !m_hotspots.empty(); }
+ bool hotspot_tracking_enabled() const { return !m_hotspots.empty(); }
void hotspot_track(int numspots, int threshhold);
// comments
diff --git a/src/emu/diimage.c b/src/emu/diimage.c
index 060e2a1b040..e4c40167114 100644
--- a/src/emu/diimage.c
+++ b/src/emu/diimage.c
@@ -805,7 +805,7 @@ bool device_image_interface::load_software(software_list_device &swlist, const c
int separator = tag4.find_first_of('%');
if (separator != -1)
{
- // we are loading a clone through softlists, split the setname from the parentname
+ // we are loading a clone through softlists, split the setname from the parentname
tag5.assign(tag4.substr(separator + 1, tag4.length() - separator + 1));
tag4.erase(separator, tag4.length() - separator);
}
diff --git a/src/emu/drivenum.c b/src/emu/drivenum.c
index 9491f223a2e..6d1590c030b 100644
--- a/src/emu/drivenum.c
+++ b/src/emu/drivenum.c
@@ -134,7 +134,7 @@ driver_enumerator::driver_enumerator(emu_options &options)
m_included(s_driver_count),
m_config(s_driver_count)
{
- memset(&m_included[0], 0, s_driver_count);
+ memset(&m_included[0], 0, s_driver_count);
memset(&m_config[0], 0, s_driver_count*sizeof(m_config[0]));
include_all();
}
@@ -147,7 +147,7 @@ driver_enumerator::driver_enumerator(emu_options &options, const char *string)
m_included(s_driver_count),
m_config(s_driver_count)
{
- memset(&m_included[0], 0, s_driver_count);
+ memset(&m_included[0], 0, s_driver_count);
memset(&m_config[0], 0, s_driver_count*sizeof(m_config[0]));
filter(string);
}
@@ -160,7 +160,7 @@ driver_enumerator::driver_enumerator(emu_options &options, const game_driver &dr
m_included(s_driver_count),
m_config(s_driver_count)
{
- memset(&m_included[0], 0, s_driver_count);
+ memset(&m_included[0], 0, s_driver_count);
memset(&m_config[0], 0, s_driver_count*sizeof(m_config[0]));
filter(driver);
}
diff --git a/src/emu/imagedev/harddriv.c b/src/emu/imagedev/harddriv.c
index 73baeb54e14..9f88760f1d7 100644
--- a/src/emu/imagedev/harddriv.c
+++ b/src/emu/imagedev/harddriv.c
@@ -49,7 +49,7 @@ harddisk_image_device::harddisk_image_device(const machine_config &mconfig, cons
//-------------------------------------------------
// harddisk_image_device - constructor for subclasses
-//-------------------------------------------------
+//-------------------------------------------------
harddisk_image_device::harddisk_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_image_interface(mconfig, *this),
diff --git a/src/emu/info.c b/src/emu/info.c
index 9cb59d5c0cc..462b94ab652 100644
--- a/src/emu/info.c
+++ b/src/emu/info.c
@@ -1080,7 +1080,7 @@ void info_xml_creator::output_switches(const ioport_list &portlist, const char *
std::string output;
std::string newtag(port->tag()), oldtag(":");
- newtag = newtag.substr(newtag.find(oldtag.append(root_tag).c_str()) + oldtag.length());
+ newtag = newtag.substr(newtag.find(oldtag.append(root_tag).c_str()) + oldtag.length());
// output the switch name information
std::string normalized_field_name(xml_normalize_string(field->name()));
diff --git a/src/emu/machine/hdc9234.c b/src/emu/machine/hdc9234.c
index f3b6077db3f..c77783e463c 100644
--- a/src/emu/machine/hdc9234.c
+++ b/src/emu/machine/hdc9234.c
@@ -240,7 +240,7 @@ enum
{
GEN_TIMER = 1,
COM_TIMER /*,
- LIVE_TIMER */
+ LIVE_TIMER */
};
/*
@@ -1820,7 +1820,7 @@ void hdc9234_device::live_run()
the requested data are read.
limit: if unlimited (attotime::never), run up to the end of the track and wait there
otherwise, used to replay the read/write operation up to the point where the event happened
-
+
THIS IS THE FLOPPY-ONLY LIVE_RUN
*/
void hdc9234_device::live_run_until(attotime limit)
@@ -2632,12 +2632,12 @@ void hdc9234_device::live_run_until(attotime limit)
the requested data are read.
limit: if unlimited (attotime::never), run up to the end of the track and wait there
otherwise, used to replay the read/write operation up to the point where the event happened
-
+
THIS IS THE HARDDISK-ONLY LIVE_RUN
*/
void hdc9234_device::live_run_hd_until(attotime limit)
{
-// int slot = 0;
+// int slot = 0;
logerror("%s: live_run_hd\n", tag());
if (m_live_state.state == IDLE || m_live_state.next_state != -1)
@@ -2656,7 +2656,7 @@ void hdc9234_device::live_run_hd_until(attotime limit)
{
case SEARCH_IDAM:
break;
- }
+ }
return;
}
}
@@ -3411,8 +3411,8 @@ void hdc9234_device::device_timer(emu_timer &timer, device_timer_id id, int para
process_command();
break;
/* case LIVE_TIMER:
- live_run();
- break; */
+ live_run();
+ break; */
}
}
diff --git a/src/emu/machine/hdc9234.h b/src/emu/machine/hdc9234.h
index a933f6b1959..8317545c552 100644
--- a/src/emu/machine/hdc9234.h
+++ b/src/emu/machine/hdc9234.h
@@ -227,7 +227,7 @@ private:
// Analyses the track until the given time
void live_run_until(attotime limit);
-
+
// Same for hard disks
void live_run_hd_until(attotime limit);
diff --git a/src/emu/machine/mos6530n.c b/src/emu/machine/mos6530n.c
index 70af89279bd..64e13126a1c 100644
--- a/src/emu/machine/mos6530n.c
+++ b/src/emu/machine/mos6530n.c
@@ -247,7 +247,7 @@ void mos6530_t::update_pb()
}
else
{
- m_out_pb_cb(data);
+ m_out_pb_cb(data);
}
}
diff --git a/src/emu/machine/mos6530n.h b/src/emu/machine/mos6530n.h
index 88cd4a56558..22be75989b4 100644
--- a/src/emu/machine/mos6530n.h
+++ b/src/emu/machine/mos6530n.h
@@ -46,7 +46,7 @@
//**************************************************************************
#define MCFG_MOS6530n_IRQ_CB(_write) \
- devcb = &mos6530_t::set_irq_wr_callback(*device, DEVCB_##_write);
+ devcb = &mos6530_t::set_irq_wr_callback(*device, DEVCB_##_write);
#define MCFG_MOS6530n_IN_PA_CB(_read) \
devcb = &mos6530_t::set_pa_rd_callback(*device, DEVCB_##_read);
diff --git a/src/emu/machine/pci9050.c b/src/emu/machine/pci9050.c
index 258118df1fd..ed8e58e2497 100644
--- a/src/emu/machine/pci9050.c
+++ b/src/emu/machine/pci9050.c
@@ -1,9 +1,9 @@
/*********************************************************************
pci9050.c - PLX PCI9050 PCI to 4x Local Bus Bridge
-
- by R. Belmont
-
+
+ by R. Belmont
+
PCI spaces:
0 - (config memory) not used
1 - (config I/O) config regs
@@ -11,12 +11,12 @@
3 - local bus 2 window
4 - local bus 3 window
5 - local bus 4 window
-
+
PCI9050 is located, mapped, and initialized at BFC00700.
-
- The boot ROM then copies ROM to RAM, jumps to RAM, and starts trying to
+
+ The boot ROM then copies ROM to RAM, jumps to RAM, and starts trying to
access Zeus 2 video through the mapped windows.
-
+
*********************************************************************/
#include "pci9050.h"
@@ -66,12 +66,12 @@ void pci9050_device::device_start()
pci_device::device_start();
- add_map(0x100, M_MEM, FUNC(pci9050_device::map)); // map 0 is our config registers, mem space
- add_map(0x100, M_IO, FUNC(pci9050_device::map)); // map 1 is our config registers, i/o space
+ add_map(0x100, M_MEM, FUNC(pci9050_device::map)); // map 0 is our config registers, mem space
+ add_map(0x100, M_IO, FUNC(pci9050_device::map)); // map 1 is our config registers, i/o space
for(int i=0; i<4; i++)
if(m_names[i])
- // add_map(0, M_MEM | M_DISABLED, m_maps[i], m_names[i], m_devices[i]);
+ // add_map(0, M_MEM | M_DISABLED, m_maps[i], m_names[i], m_devices[i]);
add_map(0, M_MEM | M_DISABLED, trampolines[i], m_names[i]);
else
add_map(0, M_MEM | M_DISABLED, FUNC(pci9050_device::empty));
@@ -119,8 +119,8 @@ void pci9050_device::remap_local(int id)
int size = 2 << lsize;
if(csbase & 0x0fffffff & ~(size-1)) {
logerror("PCI9050 local bus %d disabled due to unimplemented post-decode remapping\n", id);
- // set_map_flags(id+2, M_MEM | M_DISABLED);
- // return;
+ // set_map_flags(id+2, M_MEM | M_DISABLED);
+ // return;
}
UINT32 mask = ~(size - 1);
@@ -131,8 +131,8 @@ void pci9050_device::remap_local(int id)
if((lasrr & mask) != mask) {
logerror("PCI9050 local bus %d disabled due to unimplemented pci mirroring\n", id);
- // set_map_flags(id+2, M_MEM | M_DISABLED);
- // return;
+ // set_map_flags(id+2, M_MEM | M_DISABLED);
+ // return;
}
set_map_size(id+2, size);
diff --git a/src/emu/machine/pci9050.h b/src/emu/machine/pci9050.h
index 88167adbb03..556290ad81c 100644
--- a/src/emu/machine/pci9050.h
+++ b/src/emu/machine/pci9050.h
@@ -1,9 +1,9 @@
/*********************************************************************
pci9050.h - PLX PCI9050 PCI to 4x Local Bus Bridge
-
- by R. Belmont
-
+
+ by R. Belmont
+
*********************************************************************/
#ifndef _PCI9050_H
@@ -17,7 +17,7 @@
#define MCFG_PCI9050_SET_MAP(id, map) \
downcast<pci9050_device *>(device)->set_map(id, ADDRESS_MAP_NAME(map), #map, owner);
-class pci9050_device :
+class pci9050_device :
public pci_device
{
public:
diff --git a/src/emu/machine/ti99_hd.c b/src/emu/machine/ti99_hd.c
index 87946c42990..96627f0978d 100644
--- a/src/emu/machine/ti99_hd.c
+++ b/src/emu/machine/ti99_hd.c
@@ -11,7 +11,7 @@
References:
[1] ST225 OEM Manual, Seagate
-
+
**************************************************************************/
#include "emu.h"
@@ -31,7 +31,7 @@
#define GAP4 340
#define SYNC 13
-enum
+enum
{
INDEX_TM = 0,
SPINUP_TM,
@@ -47,7 +47,7 @@ enum
mfm_harddisk_device::mfm_harddisk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: harddisk_image_device(mconfig, type, name, tag, owner, clock, shortname, source),
- device_slot_card_interface(mconfig, *this)
+ device_slot_card_interface(mconfig, *this)
{
}
@@ -56,7 +56,7 @@ void mfm_harddisk_device::device_start()
m_index_timer = timer_alloc(INDEX_TM);
m_spinup_timer = timer_alloc(SPINUP_TM);
m_seek_timer = timer_alloc(SEEK_TM);
-
+
// MFM drives have a revolution rate of 3600 rpm (i.e. 60/sec)
m_index_timer->adjust(attotime::from_hz(60), 0, attotime::from_hz(60));
@@ -112,12 +112,12 @@ void mfm_harddisk_device::device_timer(emu_timer &timer, device_timer_id id, int
case STEP_MOVING:
// Head has reached final position
// Check whether we have a new delta
- if (m_track_delta == 0)
+ if (m_track_delta == 0)
{
// Start the settle timer
m_step_phase = STEP_SETTLE;
m_seek_timer->adjust(attotime::from_usec(16800));
- logerror("%s: Arrived at target track %d, settling ...\n", tag(), m_current_cylinder);
+ logerror("%s: Arrived at target track %d, settling ...\n", tag(), m_current_cylinder);
}
break;
case STEP_SETTLE:
@@ -126,7 +126,7 @@ void mfm_harddisk_device::device_timer(emu_timer &timer, device_timer_id id, int
else
{
// Seek completed
- logerror("%s: Settling done at cylinder %d, seek complete\n", tag(), m_current_cylinder);
+ logerror("%s: Settling done at cylinder %d, seek complete\n", tag(), m_current_cylinder);
m_seek_complete = true;
m_seek_complete_cb(this, ASSERT_LINE);
m_step_phase = STEP_COLLECT;
@@ -136,11 +136,11 @@ void mfm_harddisk_device::device_timer(emu_timer &timer, device_timer_id id, int
}
}
-void mfm_harddisk_device::head_move()
+void mfm_harddisk_device::head_move()
{
int steps = m_track_delta;
- if (steps < 0) steps = -steps;
- logerror("%s: Moving head by %d step(s) %s\n", tag(), steps, (m_track_delta<0)? "outward" : "inward");
+ if (steps < 0) steps = -steps;
+ logerror("%s: Moving head by %d step(s) %s\n", tag(), steps, (m_track_delta<0)? "outward" : "inward");
int disttime = steps*200;
m_step_phase = STEP_MOVING;
@@ -153,72 +153,72 @@ void mfm_harddisk_device::head_move()
m_track_delta = 0;
}
-void mfm_harddisk_device::direction_in_w(line_state line)
+void mfm_harddisk_device::direction_in_w(line_state line)
{
m_seek_inward = (line == ASSERT_LINE);
logerror("%s: Setting seek direction %s\n", tag(), m_seek_inward? "inward" : "outward");
}
/*
- According to the specs [1]:
-
- "4.3.1 BUFFERED SEEK: To minimize access time, pulses may be issued at an
- accelerated rate and buffered in a counter. Initiation of a seek starts
- immediately after the first pulse is received. Head motion occurs during
- pulse accumulation, and the seek is completed following receipt of all pulses."
-
- "8.1.3 SEEKING: Upon receiving a Step pulse, the MPU (microprocessor unit)
+ According to the specs [1]:
+
+ "4.3.1 BUFFERED SEEK: To minimize access time, pulses may be issued at an
+ accelerated rate and buffered in a counter. Initiation of a seek starts
+ immediately after the first pulse is received. Head motion occurs during
+ pulse accumulation, and the seek is completed following receipt of all pulses."
+
+ "8.1.3 SEEKING: Upon receiving a Step pulse, the MPU (microprocessor unit)
pauses for 250 usec to allow for additional pulses before executing the seek
- operation. Every incoming pulse resets the 250 usec timer. The seek will
- not begin until the last pulse is received."
-
- WTF? Oh come on, Seagate, be consistent at least in a single document.
-
- ================================
-
- Step behaviour:
- During all waiting times, further step_w invocations increase the counter
-
- - Leading edge increments the counter c and sets the timer to 250us (mode=collect)
- - When the timer expires (mode=collect):
+ operation. Every incoming pulse resets the 250 usec timer. The seek will
+ not begin until the last pulse is received."
+
+ WTF? Oh come on, Seagate, be consistent at least in a single document.
+
+ ================================
+
+ Step behaviour:
+ During all waiting times, further step_w invocations increase the counter
+
+ - Leading edge increments the counter c and sets the timer to 250us (mode=collect)
+ - When the timer expires (mode=collect):
(1)- Calculate the stepping time: time = c*200us; save the counter
- - Start the timer (mode=move)
- - When the timer expires (mode=move)
- - Add the track delta to the current track position
- - Subtract the delta from the current counter
- - When the counter is not zero (pulses arrived in the meantime), go to (1)
- - When the counter is zero, set the timer to 16.8 ms (mode=settle)
- - When the timer expires (mode=settle)
- - When the counter is not zero, go to (1)
- - When the counter is zero, signal seek_complete; done
-
+ - Start the timer (mode=move)
+ - When the timer expires (mode=move)
+ - Add the track delta to the current track position
+ - Subtract the delta from the current counter
+ - When the counter is not zero (pulses arrived in the meantime), go to (1)
+ - When the counter is zero, set the timer to 16.8 ms (mode=settle)
+ - When the timer expires (mode=settle)
+ - When the counter is not zero, go to (1)
+ - When the counter is zero, signal seek_complete; done
+
Step timing:
- per track = 20 ms max, full seek: 150 ms max (615 tracks); both including settling time
- We assume t(1) = 17; t(615)=140
- t(i) = s+d*i
- s=(615*t(1)-t(615))/614
- d=t(1)-s
- s=16800 us, d=200 us
-*/
-
-void mfm_harddisk_device::step_w(line_state line)
+ per track = 20 ms max, full seek: 150 ms max (615 tracks); both including settling time
+ We assume t(1) = 17; t(615)=140
+ t(i) = s+d*i
+ s=(615*t(1)-t(615))/614
+ d=t(1)-s
+ s=16800 us, d=200 us
+*/
+
+void mfm_harddisk_device::step_w(line_state line)
{
// Leading edge
if (line == ASSERT_LINE && m_step_line == CLEAR_LINE)
{
- if (m_seek_complete)
+ if (m_seek_complete)
{
- m_step_phase = STEP_COLLECT;
+ m_step_phase = STEP_COLLECT;
m_seek_complete = false;
m_seek_complete_cb(this, CLEAR_LINE);
}
// Counter will be adjusted according to the direction (+-1)
- m_track_delta += (m_seek_inward)? +1 : -1;
+ m_track_delta += (m_seek_inward)? +1 : -1;
logerror("%s: Got seek pulse; track delta %d\n", tag(), m_track_delta);
- if (m_track_delta < -670 || m_track_delta > 670)
+ if (m_track_delta < -670 || m_track_delta > 670)
{
- logerror("%s: Excessive step pulses - doing auto-truncation\n", tag());
+ logerror("%s: Excessive step pulses - doing auto-truncation\n", tag());
m_autotruncation = true;
}
m_seek_timer->adjust(attotime::from_usec(250));
diff --git a/src/emu/machine/ti99_hd.h b/src/emu/machine/ti99_hd.h
index b31f5420fb3..bdeb80c8118 100644
--- a/src/emu/machine/ti99_hd.h
+++ b/src/emu/machine/ti99_hd.h
@@ -18,7 +18,7 @@
#include "imagedev/harddriv.h"
class mfm_harddisk_device : public harddisk_image_device,
- public device_slot_card_interface
+ public device_slot_card_interface
{
public:
mfm_harddisk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
@@ -30,34 +30,34 @@ public:
void setup_seek_complete_cb(seek_complete_cb cb);
// Active low lines. We're using ASSERT=0 / CLEAR=1
- line_state ready_r() { return m_ready? ASSERT_LINE : CLEAR_LINE; }
- line_state seek_complete_r() { return m_seek_complete? ASSERT_LINE : CLEAR_LINE; } ;
- line_state trk00_r() { return m_current_cylinder==0? ASSERT_LINE : CLEAR_LINE; }
+ line_state ready_r() { return m_ready? ASSERT_LINE : CLEAR_LINE; }
+ line_state seek_complete_r() { return m_seek_complete? ASSERT_LINE : CLEAR_LINE; } ;
+ line_state trk00_r() { return m_current_cylinder==0? ASSERT_LINE : CLEAR_LINE; }
// Step
- void step_w(line_state line);
- void direction_in_w(line_state line);
-
+ void step_w(line_state line);
+ void direction_in_w(line_state line);
+
protected:
- void device_start();
- void device_reset();
- emu_timer *m_index_timer, *m_spinup_timer, *m_seek_timer;
- index_pulse_cb m_index_pulse_cb;
- seek_complete_cb m_seek_complete_cb;
- void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
+ void device_start();
+ void device_reset();
+ emu_timer *m_index_timer, *m_spinup_timer, *m_seek_timer;
+ index_pulse_cb m_index_pulse_cb;
+ seek_complete_cb m_seek_complete_cb;
+ void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
private:
- bool m_ready;
- int m_current_cylinder;
- int m_track_delta;
- int m_step_phase;
- bool m_seek_complete;
- bool m_seek_inward;
- //bool m_seeking;
- bool m_autotruncation;
- line_state m_step_line; // keep the last state
-
- void head_move();
+ bool m_ready;
+ int m_current_cylinder;
+ int m_track_delta;
+ int m_step_phase;
+ bool m_seek_complete;
+ bool m_seek_inward;
+ //bool m_seeking;
+ bool m_autotruncation;
+ line_state m_step_line; // keep the last state
+
+ void head_move();
};
class mfm_hd_generic_device : public mfm_harddisk_device
diff --git a/src/emu/machine/vrc4373.h b/src/emu/machine/vrc4373.h
index 51c774d4f9a..b620e9f6d20 100644
--- a/src/emu/machine/vrc4373.h
+++ b/src/emu/machine/vrc4373.h
@@ -45,15 +45,15 @@
#define NREG_PCIEN (0x074/4)
#define NREG_PMIR (0x078/4)
-#define DMA_BUSY 0x80000000
-#define DMA_INT_EN 0x40000000
-#define DMA_RW 0x20000000
-#define DMA_GO 0x10000000
-#define DMA_SUS 0x08000000
-#define DMA_INC 0x04000000
-#define DMA_MIO 0x02000000
-#define DMA_RST 0x01000000
-#define DMA_BLK_SIZE 0x000fffff
+#define DMA_BUSY 0x80000000
+#define DMA_INT_EN 0x40000000
+#define DMA_RW 0x20000000
+#define DMA_GO 0x10000000
+#define DMA_SUS 0x08000000
+#define DMA_INC 0x04000000
+#define DMA_MIO 0x02000000
+#define DMA_RST 0x01000000
+#define DMA_BLK_SIZE 0x000fffff
class vrc4373_device : public pci_host_device {
diff --git a/src/emu/machine/z80pio.c b/src/emu/machine/z80pio.c
index b53b3fe6158..ea5da25e221 100644
--- a/src/emu/machine/z80pio.c
+++ b/src/emu/machine/z80pio.c
@@ -11,9 +11,9 @@
/*
- TODO:
+ TODO:
- - if port A is bidirectional, port B does not issue interrupts in bit mode
+ - if port A is bidirectional, port B does not issue interrupts in bit mode
*/
@@ -255,7 +255,7 @@ void z80pio_device::check_interrupts()
for (int index = PORT_A; index < PORT_COUNT; index++)
{
if (LOG) logerror("Z80PIO '%s' Port %c IE %s IP %s IUS %s\n", tag(), 'A' + index, m_port[index].m_ie ? "1":"0", m_port[index].m_ip ? "1":"0", m_port[index].m_ius ? "1":"0");
-
+
if (!ius && m_port[index].m_ie && m_port[index].m_ip)
{
state = ASSERT_LINE;
diff --git a/src/emu/netlist/devices/net_lib.c b/src/emu/netlist/devices/net_lib.c
index ef0873d376a..93efac4c1a7 100644
--- a/src/emu/netlist/devices/net_lib.c
+++ b/src/emu/netlist/devices/net_lib.c
@@ -122,7 +122,7 @@ void nl_initialize_factory(netlist_factory_t &factory)
ENTRY(74175, TTL_74175, "-")
ENTRY(74192, TTL_74192, "-")
ENTRY(74193, TTL_74193, "-")
- //ENTRY(74279, TTL_74279, "-") // only dip available
+ //ENTRY(74279, TTL_74279, "-") // only dip available
ENTRY(SN74LS629, SN74LS629, "CAP")
ENTRY(82S16, TTL_82S16, "-")
ENTRY(9310, TTL_9310, "-")
diff --git a/src/emu/netlist/devices/nld_74175.c b/src/emu/netlist/devices/nld_74175.c
index b84f4d458ee..6d4db58703d 100644
--- a/src/emu/netlist/devices/nld_74175.c
+++ b/src/emu/netlist/devices/nld_74175.c
@@ -32,7 +32,7 @@ NETLIB_UPDATE(74175)
NETLIB_START(74175)
{
- register_input("CLK", m_CLK);
+ register_input("CLK", m_CLK);
register_input("CLRQ", m_CLRQ);
register_input("D1", m_D[0]);
@@ -60,7 +60,7 @@ NETLIB_RESET(74175)
NETLIB_START(74175_dip)
{
- register_input("9", m_CLK);
+ register_input("9", m_CLK);
register_input("1", m_CLRQ);
register_input("4", m_D[0]);
diff --git a/src/emu/netlist/devices/nld_74175.h b/src/emu/netlist/devices/nld_74175.h
index 9c138755a50..28e7bc96d4e 100644
--- a/src/emu/netlist/devices/nld_74175.h
+++ b/src/emu/netlist/devices/nld_74175.h
@@ -39,8 +39,7 @@
#include "nld_signal.h"
#define TTL_74175(_name) \
- NET_REGISTER_DEV(74175, _name) \
-
+ NET_REGISTER_DEV(74175, _name)
#define TTL_74175_DIP(_name) \
NET_REGISTER_DEV(74175_dip, _name)
diff --git a/src/emu/netlist/devices/nld_74192.h b/src/emu/netlist/devices/nld_74192.h
index 017d51f558b..bc4a11a5360 100644
--- a/src/emu/netlist/devices/nld_74192.h
+++ b/src/emu/netlist/devices/nld_74192.h
@@ -4,7 +4,7 @@
* nld_74192.h
*
* DM74192: Synchronous 4-Bit Binary Counter with Dual Clock
- * Decade counter
+ * Decade counter
*
* FIXME: This should be merged with the 74193 which counts to 16
*
@@ -31,7 +31,7 @@
#include "../nl_base.h"
-#define TTL_74192(_name) \
+#define TTL_74192(_name) \
NET_REGISTER_DEV(74192, _name)
#define TTL_74192_DIP(_name) \
diff --git a/src/emu/netlist/devices/nld_74193.h b/src/emu/netlist/devices/nld_74193.h
index 92d97c1f6fb..fc2a7de8105 100644
--- a/src/emu/netlist/devices/nld_74193.h
+++ b/src/emu/netlist/devices/nld_74193.h
@@ -28,7 +28,7 @@
#include "../nl_base.h"
-#define TTL_74193(_name) \
+#define TTL_74193(_name) \
NET_REGISTER_DEV(74193, _name)
#define TTL_74193_DIP(_name) \
diff --git a/src/emu/netlist/devices/nld_82S16.c b/src/emu/netlist/devices/nld_82S16.c
index 4981377d366..047f90f9589 100644
--- a/src/emu/netlist/devices/nld_82S16.c
+++ b/src/emu/netlist/devices/nld_82S16.c
@@ -32,14 +32,14 @@ NETLIB_UPDATE(82S16)
NETLIB_START(82S16)
{
- register_input("A0", m_A[0]);
- register_input("A1", m_A[1]);
- register_input("A2", m_A[2]);
- register_input("A3", m_A[3]);
- register_input("A4", m_A[4]);
- register_input("A5", m_A[5]);
- register_input("A6", m_A[6]);
- register_input("A7", m_A[7]);
+ register_input("A0", m_A[0]);
+ register_input("A1", m_A[1]);
+ register_input("A2", m_A[2]);
+ register_input("A3", m_A[3]);
+ register_input("A4", m_A[4]);
+ register_input("A5", m_A[5]);
+ register_input("A6", m_A[6]);
+ register_input("A7", m_A[7]);
register_input("CE1Q", m_CE1Q);
register_input("CE2Q", m_CE2Q);
@@ -63,16 +63,16 @@ NETLIB_RESET(82S16)
NETLIB_START(82S16_dip)
{
- register_input("2", m_A[0]);
- register_input("1", m_A[1]);
- register_input("15", m_A[2]);
- register_input("14", m_A[3]);
- register_input("7", m_A[4]);
- register_input("9", m_A[5]);
- register_input("10", m_A[6]);
- register_input("11", m_A[7]);
-
- register_input("3", m_CE1Q);
+ register_input("2", m_A[0]);
+ register_input("1", m_A[1]);
+ register_input("15", m_A[2]);
+ register_input("14", m_A[3]);
+ register_input("7", m_A[4]);
+ register_input("9", m_A[5]);
+ register_input("10", m_A[6]);
+ register_input("11", m_A[7]);
+
+ register_input("3", m_CE1Q);
register_input("4", m_CE2Q);
register_input("5", m_CE3Q);
diff --git a/src/emu/netlist/devices/nld_82S16.h b/src/emu/netlist/devices/nld_82S16.h
index 652fbbc13a1..6992e252ca3 100644
--- a/src/emu/netlist/devices/nld_82S16.h
+++ b/src/emu/netlist/devices/nld_82S16.h
@@ -27,8 +27,7 @@
#include "../nl_base.h"
#define TTL_82S16(_name) \
- NET_REGISTER_DEV(82S16, _name) \
-
+ NET_REGISTER_DEV(82S16, _name)
#define TTL_82S16_DIP(_name) \
NET_REGISTER_DEV(82S16_dip, _name)
diff --git a/src/emu/netlist/devices/nld_9312.c b/src/emu/netlist/devices/nld_9312.c
index 6651848e3a9..2bdaf0714d5 100644
--- a/src/emu/netlist/devices/nld_9312.c
+++ b/src/emu/netlist/devices/nld_9312.c
@@ -24,7 +24,7 @@
nld_9312::truthtable_t nld_9312::m_ttbl;
/* FIXME: Data changes are propagating faster than changing selects A,B,C
- * Please refer to data sheet.
+ * Please refer to data sheet.
* This would require a state machine, thus we do not
* do this right now.
*/
diff --git a/src/emu/netlist/devices/nld_9312.h b/src/emu/netlist/devices/nld_9312.h
index 98fd0c7177d..677197d00cf 100644
--- a/src/emu/netlist/devices/nld_9312.h
+++ b/src/emu/netlist/devices/nld_9312.h
@@ -40,8 +40,7 @@
#include "nld_signal.h"
#define TTL_9312(_name) \
- NET_REGISTER_DEV(9312, _name) \
-
+ NET_REGISTER_DEV(9312, _name)
//#if (USE_TRUTHTABLE)
#include "nld_truthtable.h"
NETLIB_TRUTHTABLE(9312, 12, 2, 0);
diff --git a/src/emu/netlist/devices/nld_legacy.c b/src/emu/netlist/devices/nld_legacy.c
index 31feeef4515..554476c52c3 100644
--- a/src/emu/netlist/devices/nld_legacy.c
+++ b/src/emu/netlist/devices/nld_legacy.c
@@ -53,7 +53,6 @@ NETLIB_RESET(nicDelay)
NETLIB_UPDATE_PARAM(nicDelay)
{
-
}
NETLIB_UPDATE(nicDelay)
diff --git a/src/emu/netlist/devices/nld_signal.h b/src/emu/netlist/devices/nld_signal.h
index 59d9880cc5e..591d45287bc 100644
--- a/src/emu/netlist/devices/nld_signal.h
+++ b/src/emu/netlist/devices/nld_signal.h
@@ -78,7 +78,7 @@ public:
// FIXME: this check is needed because update is called during startup as well
//if (m_active == 0 && netlist().use_deactivate())
- // return;
+ // return;
for (int i = 0; i< _numdev; i++)
{
@@ -152,7 +152,7 @@ public:
// FIXME: this check is needed because update is called during startup as well
//if (m_active == 0 && netlist().use_deactivate())
- // return;
+ // return;
m_i[0].activate();
m_i[1].activate();
diff --git a/src/emu/netlist/devices/nld_truthtable.h b/src/emu/netlist/devices/nld_truthtable.h
index bfb66f827b3..a503a77d856 100644
--- a/src/emu/netlist/devices/nld_truthtable.h
+++ b/src/emu/netlist/devices/nld_truthtable.h
@@ -186,7 +186,7 @@ public:
{
// FIXME: this check is needed because update is called during startup as well
//if (m_active == 0 && UNEXPECTED(netlist().use_deactivate()))
- // return;
+ // return;
UINT32 state = 0;
for (int i = 0; i < m_NI; i++)
diff --git a/src/emu/netlist/nl_base.c b/src/emu/netlist/nl_base.c
index ca66ff57025..c545c29e914 100644
--- a/src/emu/netlist/nl_base.c
+++ b/src/emu/netlist/nl_base.c
@@ -139,7 +139,7 @@ netlist_base_t::netlist_base_t()
: netlist_object_t(NETLIST, GENERIC),
m_stop(netlist_time::zero),
// FIXME:: Use a parameter to set this on a schematics per schematics basis
- m_use_deactivate(USE_DEACTIVE_DEVICE),
+ m_use_deactivate(USE_DEACTIVE_DEVICE),
m_time(netlist_time::zero),
m_queue(*this),
m_mainclock(NULL),
diff --git a/src/emu/netlist/nl_base.h b/src/emu/netlist/nl_base.h
index 11267d69aa6..4e83546c184 100644
--- a/src/emu/netlist/nl_base.h
+++ b/src/emu/netlist/nl_base.h
@@ -1216,7 +1216,7 @@ protected:
private:
netlist_time m_stop; // target time for current queue processing
- bool m_use_deactivate;
+ bool m_use_deactivate;
netlist_time m_time;
netlist_queue_t m_queue;
diff --git a/src/emu/netlist/nl_config.h b/src/emu/netlist/nl_config.h
index 26d5f5620b1..f4154c1f102 100644
--- a/src/emu/netlist/nl_config.h
+++ b/src/emu/netlist/nl_config.h
@@ -37,7 +37,7 @@
#define USE_DEACTIVE_DEVICE (0)
-#define USE_TRUTHTABLE (0)
+#define USE_TRUTHTABLE (0)
// The following adds about 10% performance ...
diff --git a/src/emu/netlist/nl_dice_compat.h b/src/emu/netlist/nl_dice_compat.h
index 1b72f93a0b2..552797cfbc9 100644
--- a/src/emu/netlist/nl_dice_compat.h
+++ b/src/emu/netlist/nl_dice_compat.h
@@ -110,22 +110,21 @@ public:
#define CHIP_9602_Mono(_name, _pdesc) \
CHIP(# _name, 9602) \
- NET_C(VCC, _name.16) \
- NET_C(GND, _name.8) \
+ NET_C(VCC, _name.16) \
+ NET_C(GND, _name.8) \
RES(_name ## _R1, (_pdesc)->r1) \
CAP(_name ## _C1, (_pdesc)->c1) \
RES(_name ## _R2, (_pdesc)->r2) \
NET_C(_name.1, _name ## _C1.1) \
NET_C(_name.2, _name ## _C1.2) \
NET_C(_name.2, _name ## _R1.2) \
- NET_C(VCC, _name ## _R1.1) \
+ NET_C(VCC, _name ## _R1.1) \
if (((_pdesc)->c2)>1e-15) { \
CAP(_name ## _C2, (_pdesc)->c2) \
NET_C(_name.15, _name ## _C2.1) \
NET_C(_name.14, _name ## _C2.2) }\
NET_C(_name.14, _name ## _R2.2) \
- NET_C(VCC, _name ## _R2.1) \
-
+ NET_C(VCC, _name ## _R2.1)
#define CHIP_SERIES_RC(_name, _pdesc) \
RES(_name ## _R, (_pdesc)->r) \
CAP(_name ## _C, (_pdesc)->c) \
@@ -153,7 +152,7 @@ public:
ALIAS(_name.3, _name.QQ)
/* FIXME: Alternative implementation using capacitor.
- * This is a transitional implementation
+ * This is a transitional implementation
*/
inline int CAPACITOR_tc(const double c, const double r)
@@ -166,7 +165,6 @@ inline int CAPACITOR_tc(const double c, const double r)
#define CHIP_CAPACITOR(_name, _pdesc) \
NETDEV_DELAY(_name) \
NETDEV_PARAMI(_name, L_TO_H, CAPACITOR_tc((_pdesc)->c, (_pdesc)->r)) \
- NETDEV_PARAMI(_name, H_TO_HL, CAPACITOR_tc((_pdesc)->c, (_pdesc)->r)) \
-
+ NETDEV_PARAMI(_name, H_TO_HL, CAPACITOR_tc((_pdesc)->c, (_pdesc)->r))
#endif /* NL_DICE_COMPAT_H_ */
diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h
index 621ad77749c..ef674da5e8d 100644
--- a/src/emu/sound/discrete.h
+++ b/src/emu/sound/discrete.h
@@ -4128,7 +4128,7 @@ enum {
#define IS_VALUE_A_NODE(val) (((val) > NODE_START) && ((val) <= NODE_END))
// Optional node such as used in CR_FILTER
-#define OPT_NODE(val) (int) val
+#define OPT_NODE(val) (int) val
/*************************************
*
* Enumerated values for Node types
diff --git a/src/emu/sound/es1373.c b/src/emu/sound/es1373.c
index af4054e241e..8b4a65456d4 100644
--- a/src/emu/sound/es1373.c
+++ b/src/emu/sound/es1373.c
@@ -2,7 +2,7 @@
#define LOG_ES (0)
#define LOG_ES_REG (0)
-#define LOG_ES_FILE (0)
+#define LOG_ES_FILE (0)
static MACHINE_CONFIG_FRAGMENT( es1373 )
@@ -122,7 +122,6 @@ void es1373_device::device_timer(emu_timer &timer, device_timer_id tid, int para
//-------------------------------------------------
void es1373_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
{
-
if (m_dac1.enable) {
logerror("%s: sound_stream_update DAC1 not implemented yet\n", tag());
}
diff --git a/src/emu/sound/es1373.h b/src/emu/sound/es1373.h
index ad30b0d8c67..4436c9ffdc0 100644
--- a/src/emu/sound/es1373.h
+++ b/src/emu/sound/es1373.h
@@ -66,10 +66,10 @@
#define SCTRL_P2_S_MASK 0x0000000C
#define SCTRL_P1_S_MASK 0x00000003
-#define SCTRL_8BIT_MONO 0x0
-#define SCTRL_8BIT_STEREO 0x1
-#define SCTRL_16BIT_MONO 0x2
-#define SCTRL_16BIT_STEREO 0x3
+#define SCTRL_8BIT_MONO 0x0
+#define SCTRL_8BIT_STEREO 0x1
+#define SCTRL_16BIT_MONO 0x2
+#define SCTRL_16BIT_STEREO 0x3
#define ES_PCI_READ 0
#define ES_PCI_WRITE 1
diff --git a/src/emu/sound/l7a1045_l6028_dsp_a.c b/src/emu/sound/l7a1045_l6028_dsp_a.c
index d53e2085d4a..8d8effe6d2a 100644
--- a/src/emu/sound/l7a1045_l6028_dsp_a.c
+++ b/src/emu/sound/l7a1045_l6028_dsp_a.c
@@ -1,84 +1,84 @@
/***************************************************************************
L7A1045 L6028 DSP-A
- (QFP120 package)
+ (QFP120 package)
- this is the audio chip used on the following
- SNK Hyper NeoGeo 64 (arcade platform)
- AKAI MPC3000 (synth)
+ this is the audio chip used on the following
+ SNK Hyper NeoGeo 64 (arcade platform)
+ AKAI MPC3000 (synth)
- both are driven by a V53, the MPC3000 isn't dumped.
+ both are driven by a V53, the MPC3000 isn't dumped.
- appears to write a register number and channel/voice using
- l7a1045_sound_select_w (offset 0)
- format:
+ appears to write a register number and channel/voice using
+ l7a1045_sound_select_w (offset 0)
+ format:
- ---- rrrr ---c cccc
- r = register, c = channel
+ ---- rrrr ---c cccc
+ r = register, c = channel
- the channel select appears to address 32 different voices (5-bits)
- the register select appears to use 4-bits with 0x0 to 0xa being valid
+ the channel select appears to address 32 different voices (5-bits)
+ the register select appears to use 4-bits with 0x0 to 0xa being valid
- the registers data is written / read using offsets 1,2,3 after
- setting the register + channel, this gives 3 16-bit values for
- each register.
+ the registers data is written / read using offsets 1,2,3 after
+ setting the register + channel, this gives 3 16-bit values for
+ each register.
- register format:
+ register format:
- offset 3 offset 2 offset 1
- fedcba9876543210 | fedcba9876543210 | fedcba9876543210
+ offset 3 offset 2 offset 1
+ fedcba9876543210 | fedcba9876543210 | fedcba9876543210
- 0 ---------------- ---------------- ----------------
+ 0 ---------------- ---------------- ----------------
- 1 ---------------- ---------------- ----------------
+ 1 ---------------- ---------------- ----------------
- 2 ---------------- ---------------- ----------------
+ 2 ---------------- ---------------- ----------------
- 3 ---------------- ---------------- ----------------
+ 3 ---------------- ---------------- ----------------
- 4 ---------------- ---------------- ----------------
+ 4 ---------------- ---------------- ----------------
- 5 ---------------- ---------------- ----------------
+ 5 ---------------- ---------------- ----------------
- 6 ---------------- ---------------- ----------------
+ 6 ---------------- ---------------- ----------------
- 7 ---------------- ---------------- llllllllrrrrrrrr left/right volume
+ 7 ---------------- ---------------- llllllllrrrrrrrr left/right volume
- 8 ---------------- ---------------- ---------------- (read only?)
+ 8 ---------------- ---------------- ---------------- (read only?)
- 9 ---------------- ---------------- ---------------- (read only?)
+ 9 ---------------- ---------------- ---------------- (read only?)
- a ---------------- ---------------- ----------------
+ a ---------------- ---------------- ----------------
- Registers are not yet understood.
+ Registers are not yet understood.
- probably sample start, end, loop positions, panning etc.
- like CPS3, Qsound etc.
+ probably sample start, end, loop positions, panning etc.
+ like CPS3, Qsound etc.
- case 0x00:
- case 0x01:
- case 0x02:
- case 0x03: // 00003fffffff (startup only?)
- case 0x04: // doesn't use 6
- case 0x05: // 00003fffffff (mostly, often)
- case 0x06: // 00007ff0ffff mostly
- case 0x07: // 0000000f0708 etc. (low values)
- case 0x08: // doesn't write to 2/4/6 with this set??
- case 0x09: // doesn't write to 2/4/6 with this set??
- case 0x0a: // random looking values
+ case 0x00:
+ case 0x01:
+ case 0x02:
+ case 0x03: // 00003fffffff (startup only?)
+ case 0x04: // doesn't use 6
+ case 0x05: // 00003fffffff (mostly, often)
+ case 0x06: // 00007ff0ffff mostly
+ case 0x07: // 0000000f0708 etc. (low values)
+ case 0x08: // doesn't write to 2/4/6 with this set??
+ case 0x09: // doesn't write to 2/4/6 with this set??
+ case 0x0a: // random looking values
- Some of the other ports on the HNG64 sound CPU may also be tied
- to this chip, this isn't yet clear.
- Port $8 bit 8 is keyon, low byte is sound status related (masked with 0x7f)
+ Some of the other ports on the HNG64 sound CPU may also be tied
+ to this chip, this isn't yet clear.
+ Port $8 bit 8 is keyon, low byte is sound status related (masked with 0x7f)
- Sample data format TBA
+ Sample data format TBA
+
+ TODO:
+ - Sample format needs to be double checked;
+ - Octave Control/BPM/Pitch, right now XRally Network BGM wants 66150 Hz which is definitely too fast for Terry Bogard speech;
+ - Key Off;
+ - ADSR (registers 2 & 4?);
- TODO:
- - Sample format needs to be double checked;
- - Octave Control/BPM/Pitch, right now XRally Network BGM wants 66150 Hz which is definitely too fast for Terry Bogard speech;
- - Key Off;
- - ADSR (registers 2 & 4?);
-
***************************************************************************/
#include "emu.h"
@@ -132,7 +132,7 @@ void l7a1045_sound_device::sound_stream_update(sound_stream &stream, stream_samp
/* Clear the buffers */
memset(outputs[0], 0, samples*sizeof(*outputs[0]));
memset(outputs[1], 0, samples*sizeof(*outputs[1]));
-
+
for (int i = 0; i < 32; i++)
{
if (m_key & (1 << i))
@@ -142,7 +142,7 @@ void l7a1045_sound_device::sound_stream_update(sound_stream &stream, stream_samp
UINT32 start = vptr->start;
UINT32 end = vptr->end;
UINT32 step = 0x400;
-
+
UINT32 pos = vptr->pos;
UINT32 frac = vptr->frac;
@@ -150,7 +150,7 @@ void l7a1045_sound_device::sound_stream_update(sound_stream &stream, stream_samp
{
INT32 sample;
UINT8 data;
-
+
pos += (frac >> 12);
frac &= 0xfff;
@@ -205,7 +205,7 @@ READ16_MEMBER( l7a1045_sound_device::l7a1045_sound_r )
printf("sound_select_r?\n");
else
return sound_data_r(space,offset -1,mem_mask);
-
+
return 0xffff;
}
@@ -238,7 +238,7 @@ WRITE16_MEMBER(l7a1045_sound_device::sound_data_w)
l7a1045_voice *vptr = &m_voice[m_audiochannel];
//if(m_audioregister != 0 && m_audioregister != 1 && m_audioregister != 7)
- // printf("%04x %04x (%04x %04x)\n",offset,data,m_audioregister,m_audiochannel);
+ // printf("%04x %04x (%04x %04x)\n",offset,data,m_audioregister,m_audiochannel);
m_audiodat[m_audioregister][m_audiochannel].dat[offset] = data;
@@ -277,9 +277,9 @@ WRITE16_MEMBER(l7a1045_sound_device::sound_data_w)
vptr->end &= m_rom_size - 1;
}
-
+
break;
-
+
case 0x07:
vptr->r_volume = (m_audiodat[m_audioregister][m_audiochannel].dat[0] & 0xff);
@@ -302,11 +302,11 @@ READ16_MEMBER(l7a1045_sound_device::sound_data_r)
switch(m_audioregister)
{
- case 0x00:
+ case 0x00:
{
UINT32 current_addr;
UINT16 res;
-
+
current_addr = vptr->start + vptr->pos;
if(offset == 0)
res = (current_addr & 0xf) << 12; // TODO: frac
@@ -314,11 +314,11 @@ READ16_MEMBER(l7a1045_sound_device::sound_data_r)
res = (current_addr & 0xffff0) >> 4;
else
res = (current_addr & 0xf00000) >> 20;
-
+
return res;
}
}
-
+
return 0;
}
@@ -333,16 +333,14 @@ WRITE16_MEMBER(l7a1045_sound_device::sound_status_w)
{
printf("%08x START\n",vptr->start);
printf("%08x END\n",vptr->end);
-
+
for(int i=0;i<0x10;i++)
printf("%02x (%02x) = %04x%04x%04x\n",m_audiochannel,i,m_audiodat[i][m_audiochannel].dat[2],m_audiodat[i][m_audiochannel].dat[1],m_audiodat[i][m_audiochannel].dat[0]);
}
#endif
-
+
vptr->frac = 0;
vptr->pos = 0;
m_key |= 1 << m_audiochannel;
}
}
-
-
diff --git a/src/emu/sound/l7a1045_l6028_dsp_a.h b/src/emu/sound/l7a1045_l6028_dsp_a.h
index 1754556e855..da0cbb41c13 100644
--- a/src/emu/sound/l7a1045_l6028_dsp_a.h
+++ b/src/emu/sound/l7a1045_l6028_dsp_a.h
@@ -30,7 +30,7 @@ public:
l7a1045_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~l7a1045_sound_device() { }
-// void set_base(INT8* base) { m_base = base; }
+// void set_base(INT8* base) { m_base = base; }
DECLARE_WRITE16_MEMBER( l7a1045_sound_w );
DECLARE_READ16_MEMBER( l7a1045_sound_r );
diff --git a/src/emu/video.c b/src/emu/video.c
index bee4f24282d..55e596d36bc 100644
--- a/src/emu/video.c
+++ b/src/emu/video.c
@@ -1215,7 +1215,7 @@ file_error video_manager::open_next(emu_file &file, const char *extension)
for (int seq = 0; ; seq++)
{
// build up the filename
- fname.assign(snapstr);
+ fname.assign(snapstr);
strprintf(seqtext, "%04d", seq);
strreplace(fname, "%i", seqtext.c_str());
diff --git a/src/emu/video/clgd542x.c b/src/emu/video/clgd542x.c
index 30b96110290..0bee39533cb 100644
--- a/src/emu/video/clgd542x.c
+++ b/src/emu/video/clgd542x.c
@@ -1,6 +1,6 @@
/*
- Cirrus Logic GD542x/3x video chipsets
+ Cirrus Logic GD542x/3x video chipsets
*/
@@ -126,7 +126,7 @@ void cirrus_gd5428_device::device_reset()
m_blt_source = m_blt_dest = m_blt_source_current = m_blt_dest_current = 0;
memset(m_ext_palette, 0, sizeof(m_ext_palette));
m_ext_palette_enabled = false;
-// m_ext_palette[15].red = m_ext_palette[15].green = m_ext_palette[15].blue = 0xff; // default? Win3.1 doesn't seem to touch the extended DAC, or at least, it enables it, then immediately disables it then sets a palette...
+// m_ext_palette[15].red = m_ext_palette[15].green = m_ext_palette[15].blue = 0xff; // default? Win3.1 doesn't seem to touch the extended DAC, or at least, it enables it, then immediately disables it then sets a palette...
}
UINT32 cirrus_gd5428_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
@@ -201,7 +201,7 @@ UINT32 cirrus_gd5428_device::screen_update(screen_device &screen, bitmap_rgb32 &
}
}
}
- return 0;
+ return 0;
}
void cirrus_gd5428_device::cirrus_define_video_mode()
@@ -209,7 +209,7 @@ void cirrus_gd5428_device::cirrus_define_video_mode()
UINT8 divisor = 1;
float clock;
UINT8 clocksel = (vga.miscellaneous_output & 0xc) >> 2;
-
+
svga.rgb8_en = 0;
svga.rgb15_en = 0;
svga.rgb16_en = 0;
@@ -226,7 +226,7 @@ void cirrus_gd5428_device::cirrus_define_video_mode()
clock = 14.31818f * ((float)numerator / ((float)denominator * mul));
clock *= 1000000;
}
-
+
if (!gc_locked && (vga.sequencer.data[0x07] & 0x01))
{
switch(vga.sequencer.data[0x07] & 0x0E)
@@ -247,7 +247,7 @@ UINT16 cirrus_gd5428_device::offset()
if (svga.rgb8_en == 1) // guess
off <<= 2;
-// popmessage("Offset: %04x %s %s ** -- actual: %04x",vga.crtc.offset,vga.crtc.dw?"DW":"--",vga.crtc.word_mode?"BYTE":"WORD",off);
+// popmessage("Offset: %04x %s %s ** -- actual: %04x",vga.crtc.offset,vga.crtc.dw?"DW":"--",vga.crtc.word_mode?"BYTE":"WORD",off);
return off;
}
@@ -259,7 +259,7 @@ void cirrus_gd5428_device::start_bitblt()
m_blt_source_current = m_blt_source;
m_blt_dest_current = m_blt_dest;
-
+
for(y=0;y<m_blt_height;y++)
{
for(x=0;x<m_blt_width;x++)
@@ -289,13 +289,13 @@ void cirrus_gd5428_device::copy_pixel()
{
UINT8 src = vga.memory[m_blt_source_current % vga.svga_intf.vram_size];
UINT8 dst = vga.memory[m_blt_dest_current % vga.svga_intf.vram_size];
-
+
if(m_blt_mode & 0x40) // enable 8x8 pattern
{
if(m_blt_mode & 0x80) // colour expand
src = (vga.memory[m_blt_source % vga.svga_intf.vram_size] >> (abs((int)(m_blt_source_current - m_blt_source)) % 8)) & 0x01 ? 0xff : 0x00;
}
-
+
switch(m_blt_rop)
{
case 0x00: // BLACK
@@ -728,7 +728,7 @@ READ8_MEMBER(cirrus_gd5428_device::port_03c0_r)
vga.dac.read_index++;
}
}
- }
+ }
break;
case 0x0f:
res = cirrus_gc_reg_read(vga.gc.index);
@@ -767,9 +767,9 @@ WRITE8_MEMBER(cirrus_gd5428_device::port_03c0_w)
break;
}
vga.dac.dirty=1;
- if (vga.dac.state==3)
+ if (vga.dac.state==3)
{
- vga.dac.state=0;
+ vga.dac.state=0;
vga.dac.write_index++;
}
}
@@ -985,14 +985,14 @@ READ8_MEMBER(cirrus_gd5428_device::mem_r)
// Is the display address adjusted automatically when not using Chain-4 addressing? The GD542x BIOS doesn't do it, but Virtual Pool expects it.
if(!(vga.sequencer.data[4] & 0x8))
- addr <<= 2;
+ addr <<= 2;
if(svga.rgb8_en || svga.rgb15_en || svga.rgb16_en || svga.rgb24_en)
{
UINT8 data = 0;
if(gc_mode_ext & 0x01)
{
- if(offset & 0x10000)
+ if(offset & 0x10000)
return 0;
if(offset < 0x8000)
offset &= 0x7fff;
@@ -1069,7 +1069,7 @@ READ8_MEMBER(cirrus_gd5428_device::mem_r)
{
// TODO: Lines up in 16-colour mode, likely different for 256-colour modes (docs say video addresses are shifted right 3 places)
UINT8 i,data;
-// UINT8 bits = ((gc_mode_ext & 0x08) && (vga.gc.write_mode == 1)) ? 8 : 4;
+// UINT8 bits = ((gc_mode_ext & 0x08) && (vga.gc.write_mode == 1)) ? 8 : 4;
data = 0;
//printf("%08x\n",offset);
@@ -1119,11 +1119,11 @@ WRITE8_MEMBER(cirrus_gd5428_device::mem_w)
// Is the display address adjusted automatically when using Chain-4 addressing? The GD542x BIOS doesn't do it, but Virtual Pool expects it.
if(!(vga.sequencer.data[4] & 0x8))
- addr <<= 2;
+ addr <<= 2;
if(svga.rgb8_en || svga.rgb15_en || svga.rgb16_en || svga.rgb24_en)
{
- if(offset & 0x10000)
+ if(offset & 0x10000)
return;
if(gc_mode_ext & 0x01)
{
@@ -1163,7 +1163,7 @@ WRITE8_MEMBER(cirrus_gd5428_device::mem_w)
}
return;
}
-
+
if(vga.sequencer.data[4] & 0x8)
vga.memory[(offset+addr) % vga.svga_intf.vram_size] = data;
else
@@ -1208,7 +1208,7 @@ WRITE8_MEMBER(cirrus_gd5428_device::mem_w)
{
// TODO: Lines up in 16-colour mode, likely different for 256-colour modes (docs say video addresses are shifted right 3 places)
UINT8 i;
-// UINT8 bits = ((gc_mode_ext & 0x08) && (vga.gc.write_mode == 1)) ? 8 : 4;
+// UINT8 bits = ((gc_mode_ext & 0x08) && (vga.gc.write_mode == 1)) ? 8 : 4;
for(i=0;i<4;i++)
{
@@ -1227,4 +1227,3 @@ WRITE8_MEMBER(cirrus_gd5428_device::mem_w)
}
}
}
-
diff --git a/src/emu/video/clgd542x.h b/src/emu/video/clgd542x.h
index d78fb44b85c..9288abcf669 100644
--- a/src/emu/video/clgd542x.h
+++ b/src/emu/video/clgd542x.h
@@ -1,6 +1,6 @@
/*
- Cirrus Logic GD542x/3x video chipsets
+ Cirrus Logic GD542x/3x video chipsets
*/
@@ -39,11 +39,11 @@ protected:
UINT8 gc_bank_1;
bool gc_locked;
UINT8 m_lock_reg;
-
+
UINT8 m_cr19;
UINT8 m_cr1a;
UINT8 m_cr1b;
-
+
// hardware cursor
UINT16 m_cursor_x;
UINT16 m_cursor_y;
@@ -64,13 +64,13 @@ protected:
UINT16 m_blt_width;
UINT32 m_blt_source_current;
UINT32 m_blt_dest_current;
-
+
UINT8 m_scratchpad1;
UINT8 m_scratchpad2;
UINT8 m_scratchpad3;
UINT8 m_vclk_num[4];
UINT8 m_vclk_denom[4];
-
+
inline UINT8 cirrus_vga_latch_write(int offs, UINT8 data);
private:
void cirrus_define_video_mode();
@@ -80,7 +80,7 @@ private:
void cirrus_gc_reg_write(UINT8 index, UINT8 data);
UINT8 cirrus_crtc_reg_read(UINT8 index);
void cirrus_crtc_reg_write(UINT8 index, UINT8 data);
-
+
void start_bitblt();
void copy_pixel();
};
@@ -96,4 +96,3 @@ protected:
// device type definition
extern const device_type CIRRUS_GD5428;
extern const device_type CIRRUS_GD5430;
-
diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c
index 382e3dd33f9..82302bef6ec 100644
--- a/src/emu/video/pc_vga.c
+++ b/src/emu/video/pc_vga.c
@@ -5547,5 +5547,3 @@ READ16_MEMBER(mach8_device::mach8_config2_r)
{
return 0x0002;
}
-
-
diff --git a/src/emu/video/pc_vga.h b/src/emu/video/pc_vga.h
index 6d7fada64c5..c88b995ecab 100644
--- a/src/emu/video/pc_vga.h
+++ b/src/emu/video/pc_vga.h
@@ -175,8 +175,8 @@ protected:
/**/ UINT8 sldiv;
/**/ UINT8 map14;
/**/ UINT8 map13;
- /**/ UINT8 irq_clear;
- /**/ UINT8 irq_disable;
+ /**/ UINT8 irq_clear;
+ /**/ UINT8 irq_disable;
} crtc;
struct
diff --git a/src/lib/formats/c3040_dsk.c b/src/lib/formats/c3040_dsk.c
index dd1d3ee5817..9fb6669ab20 100644
--- a/src/lib/formats/c3040_dsk.c
+++ b/src/lib/formats/c3040_dsk.c
@@ -51,9 +51,9 @@ const int c3040_format::c3040_sectors_per_track[] =
const int c3040_format::c3040_gap2[] =
{
11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, // 1-17
- 8, 8, 8, 8, 8, 8, 8, // 18-24
- 15, 15, 15, 15, 15, 15, // 25-30
- 12, 12, 12, 12, 12 // 31-35
+ 8, 8, 8, 8, 8, 8, 8, // 18-24
+ 15, 15, 15, 15, 15, 15, // 25-30
+ 12, 12, 12, 12, 12 // 31-35
};
floppy_image_format_t::desc_e* c3040_format::get_sector_desc(const format &f, int &current_size, int sector_count, UINT8 id1, UINT8 id2, int gap_2)
diff --git a/src/lib/formats/c4040_dsk.c b/src/lib/formats/c4040_dsk.c
index 4def7e0c581..9e6dff7f627 100644
--- a/src/lib/formats/c4040_dsk.c
+++ b/src/lib/formats/c4040_dsk.c
@@ -41,9 +41,9 @@ const c4040_format::format c4040_format::file_formats[] = {
const int c4040_format::c4040_gap2[] =
{
11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, // 1-17
- 19, 19, 19, 19, 19, 19, 19, // 18-24
- 15, 15, 15, 15, 15, 15, // 25-30
- 12, 12, 12, 12, 12 // 31-35
+ 19, 19, 19, 19, 19, 19, 19, // 18-24
+ 15, 15, 15, 15, 15, 15, // 25-30
+ 12, 12, 12, 12, 12 // 31-35
};
floppy_image_format_t::desc_e* c4040_format::get_sector_desc(const format &f, int &current_size, int sector_count, UINT8 id1, UINT8 id2, int gap_2)
diff --git a/src/lib/formats/c8280_dsk.c b/src/lib/formats/c8280_dsk.c
index b6a25dcc924..cb39b5c3ea5 100644
--- a/src/lib/formats/c8280_dsk.c
+++ b/src/lib/formats/c8280_dsk.c
@@ -30,32 +30,32 @@ const char *c8280_format::extensions() const
}
const c8280_format::format c8280_format::formats[] = {
- // 80x4e 12x00 3xf6 fc
+ // 80x4e 12x00 3xf6 fc
// 50x4e 12x00 3xf5 fe 2x00 01 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
// 54x4e 12x00 3xf5 fe 2x00 02 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
// 54x4e 12x00 3xf5 fe 2x00 03 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 04 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 05 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 06 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 07 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 08 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 09 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 0a 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 0b 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 0c 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 0d 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 0e 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 0f 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 10 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 11 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 12 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 13 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 14 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 15 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 16 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 17 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 18 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
- // 54x4e 12x00 3xf5 fe 2x00 19 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 04 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 05 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 06 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 07 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 08 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 09 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 0a 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 0b 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 0c 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 0d 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 0e 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 0f 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 10 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 11 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 12 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 13 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 14 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 15 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 16 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 17 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 18 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
+ // 54x4e 12x00 3xf5 fe 2x00 19 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
// 54x4e 12x00 3xf5 fe 2x00 1a 01 f7 22x4e 12x00 3xf5 fb 256xaa f7
// 653x4e
{
diff --git a/src/lib/formats/flopimg.c b/src/lib/formats/flopimg.c
index 4588d717c00..35ab1af359d 100644
--- a/src/lib/formats/flopimg.c
+++ b/src/lib/formats/flopimg.c
@@ -2835,7 +2835,7 @@ void floppy_image_format_t::extract_sectors_from_bitstream_gcr5(const UINT8 *bit
for(int i=0; i<track_size; i++) {
int bit = sbit_r(bitstream, i);
shift_reg = ((shift_reg << 1) | bit) & 0x3ff;
-
+
if (sync && !bit) {
UINT8 id = sbyte_gcr5_r(bitstream, i, track_size);
@@ -2844,7 +2844,7 @@ void floppy_image_format_t::extract_sectors_from_bitstream_gcr5(const UINT8 *bit
if(hblk_count < 100)
hblk[hblk_count++] = i-10;
break;
-
+
case 0x07:
if(dblk_count < 100)
dblk[dblk_count++] = i-10;
@@ -2914,7 +2914,7 @@ void floppy_image_format_t::extract_sectors_from_bitstream_victor_gcr5(const UIN
for(int i=0; i<track_size; i++) {
int bit = sbit_r(bitstream, i);
shift_reg = ((shift_reg << 1) | bit) & 0x3ff;
-
+
if (sync && !bit) {
UINT8 id = sbyte_gcr5_r(bitstream, i, track_size);
@@ -2923,7 +2923,7 @@ void floppy_image_format_t::extract_sectors_from_bitstream_victor_gcr5(const UIN
if(hblk_count < 100)
hblk[hblk_count++] = i-10;
break;
-
+
case 0x08:
if(dblk_count < 100)
dblk[dblk_count++] = i-10;
diff --git a/src/lib/formats/imd_dsk.c b/src/lib/formats/imd_dsk.c
index 97942e29826..8600590c735 100644
--- a/src/lib/formats/imd_dsk.c
+++ b/src/lib/formats/imd_dsk.c
@@ -137,15 +137,15 @@ static floperr_t imd_read_indexed_sector(floppy_image_legacy *floppy, int head,
static floperr_t imd_expand_file(floppy_image_legacy *floppy , UINT64 offset , size_t amount)
{
- if (amount == 0) {
- return FLOPPY_ERROR_SUCCESS;
- }
+ if (amount == 0) {
+ return FLOPPY_ERROR_SUCCESS;
+ }
- UINT64 file_size = floppy_image_size(floppy);
+ UINT64 file_size = floppy_image_size(floppy);
- if (offset > file_size) {
- return FLOPPY_ERROR_INTERNAL;
- }
+ if (offset > file_size) {
+ return FLOPPY_ERROR_INTERNAL;
+ }
UINT64 size_after_off = file_size - offset;
@@ -466,10 +466,10 @@ bool imd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
for(int i=0; i<sector_count; i++) {
UINT8 stype = img[pos++];
- sects[i].track = tnum ? tnum[i] : track;
- sects[i].head = hnum ? hnum[i] : head;
- sects[i].sector = snum[i];
- sects[i].size = ssize;
+ sects[i].track = tnum ? tnum[i] : track;
+ sects[i].head = hnum ? hnum[i] : head;
+ sects[i].sector = snum[i];
+ sects[i].size = ssize;
sects[i].actual_size = actual_size;
if(stype == 0 || stype > 8) {
diff --git a/src/lib/util/corestr.c b/src/lib/util/corestr.c
index 7e42e235065..8a78a672ac6 100644
--- a/src/lib/util/corestr.c
+++ b/src/lib/util/corestr.c
@@ -193,7 +193,7 @@ char *core_i64_format(UINT64 value, UINT8 mindigits, bool is_octal)
}
/*-------------------------------------------------
- std::string helpers
+ std::string helpers
-------------------------------------------------*/
#include <algorithm>
@@ -312,4 +312,4 @@ int strreplace(std::string &str, const std::string& search, const std::string& r
str.erase(curindex, searchlen).insert(curindex, replace);
}
return matches;
-} \ No newline at end of file
+}
diff --git a/src/lib/util/hashing.c b/src/lib/util/hashing.c
index b4e2b7a9d6d..1481de34a12 100644
--- a/src/lib/util/hashing.c
+++ b/src/lib/util/hashing.c
@@ -167,7 +167,7 @@ bool crc32_t::from_string(const char *string, int length)
//-------------------------------------------------
const char *crc32_t::as_string(std::string &buffer) const
-{
+{
strprintf(buffer, "%08x", m_raw);
return buffer.c_str();
}
diff --git a/src/lib/util/zippath.c b/src/lib/util/zippath.c
index fdb5a3b957d..e4433ac0fc4 100644
--- a/src/lib/util/zippath.c
+++ b/src/lib/util/zippath.c
@@ -332,7 +332,7 @@ file_error zippath_fopen(const char *filename, UINT32 openflags, core_file *&fil
temp2.assign(mainpath).append(PATH_SEPARATOR).append(subpath);
subpath.assign(temp2);
}
- else
+ else
{
mainpath = mainpath.substr(temp.length());
subpath.assign(mainpath);
diff --git a/src/mame/audio/hng64.c b/src/mame/audio/hng64.c
index 4c765318501..b2ce91fe6ef 100644
--- a/src/mame/audio/hng64.c
+++ b/src/mame/audio/hng64.c
@@ -353,7 +353,7 @@ WRITE_LINE_MEMBER(hng64_state::tcu_tm2_cb)
//m_audiocpu->set_input_line(1, state? ASSERT_LINE :CLEAR_LINE);
//m_audiocpu->set_input_line(2, state? ASSERT_LINE :CLEAR_LINE);
-
+
// NOT ACCURATE, just so that all the interrupts get triggered for now.
#if 0
static int i;
diff --git a/src/mame/audio/wiping.c b/src/mame/audio/wiping.c
index d47980e8a8a..307134b212c 100644
--- a/src/mame/audio/wiping.c
+++ b/src/mame/audio/wiping.c
@@ -69,9 +69,9 @@ void wiping_sound_device::device_start()
voice->wave = &m_sound_prom[0];
voice->counter = 0;
}
-
+
save_item(NAME(m_soundregs));
-
+
for (int i = 0; i < MAX_VOICES; i++)
{
save_item(NAME(m_channel_list[i].frequency), i);
diff --git a/src/mame/audio/wiping.h b/src/mame/audio/wiping.h
index e87b7399568..7be62108cd4 100644
--- a/src/mame/audio/wiping.h
+++ b/src/mame/audio/wiping.h
@@ -27,7 +27,7 @@ protected:
// sound stream update overrides
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
-
+
private:
// internal state
diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c
index f118cfa7cd9..8afc75a859e 100644
--- a/src/mame/drivers/bagman.c
+++ b/src/mame/drivers/bagman.c
@@ -574,7 +574,7 @@ static MACHINE_CONFIG_START( botanic, bagman_state )
MCFG_PALETTE_ADD("palette", 64)
MCFG_PALETTE_INIT_OWNER(bagman_state,bagman)
-
+
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -589,7 +589,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( squaitsa, botanic )
MCFG_MACHINE_START_OVERRIDE(bagman_state, squaitsa)
-
+
MCFG_SOUND_MODIFY("aysnd")
MCFG_AY8910_PORT_A_READ_CB(READ8(bagman_state, dial_input_p1_r))
MCFG_AY8910_PORT_B_READ_CB(READ8(bagman_state, dial_input_p2_r))
diff --git a/src/mame/drivers/bfm_sc5sw.c b/src/mame/drivers/bfm_sc5sw.c
index eea393d2321..010d8cbefa0 100644
--- a/src/mame/drivers/bfm_sc5sw.c
+++ b/src/mame/drivers/bfm_sc5sw.c
@@ -12217,7 +12217,7 @@ ROM_START( sc5nunsme )
ROM_END
-
+
ROM_START( sc5_3512 )
ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD16_BYTE( "95426966.lo", 0x000001, 0x080000, CRC(70401984) SHA1(30c409ecba15e8ca8eedc67b677808ec2afde83a) )
@@ -12386,8 +12386,8 @@ ROM_START( sc5_3514 )
ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 )
ROM_LOAD( "95009083.bin", 0x000000, 0x100000, CRC(f88b86e7) SHA1(626f6aaeb5e71de113e0b7715cf68386adbe5f86) )
ROM_LOAD( "95009084.bin", 0x100000, 0x100000, CRC(db16a8ff) SHA1(0fb5b7a5cc16e30a17cd85279b31443215135657) )
-ROM_END
-
+ROM_END
+
ROM_START( sc5_3517 )
ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD16_BYTE( "95428070.lo", 0x000001, 0x080000, CRC(f367368d) SHA1(80be2ab2bae77e7d2eb275a09c0f66e88c61431f) )
@@ -12414,8 +12414,8 @@ ROM_START( sc5_3517 )
ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 )
ROM_LOAD( "95009087.bin", 0x000000, 0x100000, CRC(f6c4afa6) SHA1(0891cf1e8514fea6f676c27e0fef3e1098315f9d) )
ROM_LOAD( "95009088.bin", 0x100000, 0x100000, CRC(03340dd1) SHA1(71043502f18e0d74794700abf0a479d0da8a2718) )
-ROM_END
-
+ROM_END
+
ROM_START( sc5_3524 )
ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD16_BYTE( "95428074.lo", 0x000001, 0x080000, CRC(56c27552) SHA1(99a10071112cdb8096f9f82c07925ee246ba309d) )
@@ -12429,8 +12429,8 @@ ROM_START( sc5_3524 )
ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 )
ROM_LOAD( "95009075.bin", 0x000000, 0x100000, CRC(ebf64ae7) SHA1(c7e696acdbf2565959d9b7c76544738d467747f8) )
ROM_LOAD( "95009076.bin", 0x100000, 0x100000, CRC(c066ee96) SHA1(ded6c8e778fe2f7055a006a49cc500184902d14b) )
-ROM_END
-
+ROM_END
+
ROM_START( sc5_3515 )
ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD16_BYTE( "95428102.lo", 0x000001, 0x080000, CRC(928d7368) SHA1(fe0f0e267086c70396a7767010ccb63fc04314a1) )
@@ -12440,8 +12440,8 @@ ROM_START( sc5_3515 )
ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 )
ROM_LOAD( "95009096.bin", 0x000000, 0x100000, CRC(169abeea) SHA1(86e5509ac9b8d4c683e518cbcbadf7cfc5513a03) )
ROM_LOAD( "95009097.bin", 0x100000, 0x100000, CRC(ead286a6) SHA1(823e59c7c4ddecf65f84011dcc2ec37533cfcd5c) )
-ROM_END
-
+ROM_END
+
ROM_START( sc5_3511 )
ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF ) // PR3548 (PR3511)
ROM_LOAD16_BYTE( "95428124.lo", 0x000001, 0x080000, CRC(1fe615f3) SHA1(1a78c964824e01c8bd1ab44dd81feb8229d85cb9) )
@@ -12480,7 +12480,7 @@ ROM_START( sc5_3511 )
ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 )
ROM_LOAD( "95009059.bin", 0x000000, 0x100000, CRC(a3264545) SHA1(94b324c93edad7975ee152a7daaf7f6d7b91cb5e) )
ROM_LOAD( "95009060.bin", 0x100000, 0x100000, CRC(3cb58cf3) SHA1(f1eaeba8633c42ef43b4b32deb154f0683d8d42a) )
-ROM_END
+ROM_END
ROM_START( sc5_3513 )
ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF )
@@ -12522,8 +12522,8 @@ ROM_START( sc5_3513 )
ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 )
ROM_LOAD( "95009079.bin", 0x000000, 0x100000, CRC(4c7d4c93) SHA1(0660160ced0b43c420ed8abd3572c11feb45065a) )
ROM_LOAD( "95009080.bin", 0x100000, 0x100000, CRC(08052a11) SHA1(44f76e02edaedf9ee4a11d7eb433df3127133c91) )
-ROM_END
-
+ROM_END
+
ROM_START( sc5_3516 )
ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD16_BYTE( "95428155.hi", 0x000000, 0x080000, CRC(07def814) SHA1(34aaa04ea1e5b3c3c2ce86a2405cc367ed1c1c49) )
@@ -12544,7 +12544,7 @@ ROM_START( sc5_3516 )
ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 )
ROM_LOAD( "95009085.bin", 0x000000, 0x100000, CRC(b1d06a53) SHA1(f552a8996bb6da21493e742e274edadbfc39a7ce) )
ROM_LOAD( "95009086.bin", 0x100000, 0x100000, CRC(d686d21c) SHA1(041aa809d97a29a9cf9677ecf58bee0d3b33d3c9) )
-ROM_END
+ROM_END
ROM_START( sc5_3530 )
ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF )
@@ -12558,7 +12558,7 @@ ROM_START( sc5_3530 )
ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 )
ROM_LOAD( "95009226.bin", 0x000000, 0x100000, CRC(d2a48a2b) SHA1(16f5e56af424ba78bc3378984ef5caaa65dcd8ae) )
ROM_LOAD( "95009227.bin", 0x100000, 0x100000, CRC(f6eae9c0) SHA1(73092581d314e91e3472d95aa1a4cf0fea03d333) )
-ROM_END
+ROM_END
ROM_START( sc5_3552 )
ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF )
@@ -12575,8 +12575,8 @@ ROM_START( sc5_3552 )
ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 )
ROM_LOAD( "95009218.bin", 0x000000, 0x100000, CRC(07abc1b6) SHA1(b180e47dc0c17feb447563c3dc907aee2f10940f) )
ROM_LOAD( "95009219.bin", 0x100000, 0x100000, CRC(ba796f0a) SHA1(f0e772b0bde828c8491f19a52d42591749aea79a) )
-ROM_END
-
+ROM_END
+
ROM_START( sc5_3551 )
ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD16_BYTE( "95429166.lo", 0x000001, 0x080000, CRC(6a3e04bd) SHA1(337293ae08aa701fb69d8611c272dade257a06a7) )
@@ -12615,7 +12615,7 @@ ROM_START( sc5_3551 )
ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 )
ROM_LOAD( "95009210.bin", 0x000000, 0x100000, CRC(ac43a79b) SHA1(e987337506d10f0d430eebbe9e736c905ea06ffd) )
ROM_LOAD( "95009211.bin", 0x100000, 0x100000, CRC(f2cc0e0f) SHA1(29fbf4cc573bd5eceda6d8b722b2708f5b2fb3d5) )
-ROM_END
+ROM_END
ROM_START( sc5_3525 )
@@ -12631,7 +12631,7 @@ ROM_START( sc5_3525 )
ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 )
ROM_LOAD( "95009214.bin", 0x000000, 0x100000, CRC(0802e651) SHA1(6ef9e02fb62693109119f69315615cc854a9ec06) )
ROM_LOAD( "95009215.bin", 0x100000, 0x100000, CRC(7b7796a3) SHA1(4283a74ff62d0ecf4beaae5e1c8805e3bf8a2e25) )
-ROM_END
+ROM_END
ROM_START( sc5_3553 )
ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF )
@@ -12659,7 +12659,7 @@ ROM_START( sc5_3553 )
ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 )
ROM_LOAD( "95009234.bin", 0x000000, 0x100000, CRC(5604cf0e) SHA1(48d04af6e6bfa77828bd26fdcf60a9b70cfc7f84) )
ROM_LOAD( "95009235.bin", 0x100000, 0x100000, CRC(ec2f7228) SHA1(2921c80c29bff886c7a35b382b5569dd9636cd67) )
-ROM_END
+ROM_END
ROM_START( sc5_3555 )
ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF )
@@ -12691,7 +12691,7 @@ ROM_START( sc5_3555 )
ROM_LOAD( "95009242.bin", 0x000000, 0x100000, CRC(d8695bed) SHA1(26225772f008c52a8e4af239bb19f68911ea09dc) )
ROM_LOAD( "95009243.bin", 0x000000, 0x100000, CRC(16d039ce) SHA1(097dfc1bbcbd0c2ce096246f4f4a82110b989fd0) )
-ROM_END
+ROM_END
ROM_START( sc5_3519 )
ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF )
@@ -12723,7 +12723,7 @@ ROM_START( sc5_3519 )
ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 )
ROM_LOAD( "95009208.bin", 0x000000, 0x100000, CRC(f6450dbf) SHA1(3c48a2ca3cd08bff0d47e7b98c7d1d16b537b216) )
ROM_LOAD( "95009209.bin", 0x100000, 0x100000, CRC(c4b8b089) SHA1(e305f4fbaad2f4b6f96303fcefe2caf60fa8566d) )
-ROM_END
+ROM_END
ROM_START( sc5_3510 )
ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF )
@@ -12759,7 +12759,7 @@ ROM_START( sc5_3510 )
ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 )
ROM_LOAD( "95009063.bin", 0x000000, 0x100000, CRC(52b4e9a1) SHA1(2ff66ed13b2307ebc24500b920585f9cf04b0f4e) )
ROM_LOAD( "95009064.bin", 0x100000, 0x100000, CRC(1a94524b) SHA1(f5fa0904682888131ae359671ceeff0336adf5dd) )
-ROM_END
+ROM_END
ROM_START( sc5_3557 )
ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF )
@@ -12781,7 +12781,7 @@ ROM_START( sc5_3557 )
ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 )
ROM_LOAD( "95009238.bin", 0x000000, 0x100000, CRC(fba0d54b) SHA1(e1dc6404f54b08a6c20c37fae135ff550574d523) )
ROM_LOAD( "95009239.bin", 0x100000, 0x100000, CRC(f7770307) SHA1(00363906064bdd67e800944df3f8d85236d8bc4c) )
-ROM_END
+ROM_END
ROM_START( sc5_3451 )
ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF )
@@ -13109,7 +13109,7 @@ ROM_START( sc5unsrt )
ROM_LOAD( "95008125.bin", 0x000000, 0x100000, CRC(ad1d69d5) SHA1(66d07488fdec6b1c65b41e20d74d5add22746334) )
ROM_LOAD( "95008126.bin", 0x100000, 0x100000, CRC(28f979a8) SHA1(ce480ab19b3066343bf88d2fda78dc6a71cd61e2) )
ROM_END
-#endif
+#endif
extern int find_project_string(running_machine &machine, int addrxor, int mode);
@@ -15448,22 +15448,3 @@ GAME( 200?, sc5_z057 ,0, bfm_sc5, bfm_sc5, bfm_sc5_state, sc5, ROT0, "
GAME( 200?, sc5_z058 ,0, bfm_sc5, bfm_sc5, bfm_sc5_state, sc5, ROT0, "BFM","Wok 'n' Roll (Scorpion 5)", GAME_IS_SKELETON_MECHANICAL )
GAME( 200?, sc5_z059 ,0, bfm_sc5, bfm_sc5, bfm_sc5_state, sc5, ROT0, "BFM","Aladdin (Scorpion 5)", GAME_IS_SKELETON_MECHANICAL )
GAME( 200?, sc5_z060 ,0, bfm_sc5, bfm_sc5, bfm_sc5_state, sc5, ROT0, "BFM","Hard Dk (Scorpion 5)", GAME_IS_SKELETON_MECHANICAL )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/mame/drivers/cardline.c b/src/mame/drivers/cardline.c
index 1ee1cfc6b71..5f51b6eff64 100644
--- a/src/mame/drivers/cardline.c
+++ b/src/mame/drivers/cardline.c
@@ -14,7 +14,7 @@
XTAL 4 MHz
TODO:
- Really understand ASIC chip
+ Really understand ASIC chip
***********************************/
@@ -103,7 +103,7 @@ MC6845_UPDATE_ROW( cardline_state::crtc_update_row )
// how this works.
if(m_video & 1)
- gfx_ofs = 0;
+ gfx_ofs = 0;
if(m_video & 2)
gfx_ofs = 0x1000;
diff --git a/src/mame/drivers/cv1k.c b/src/mame/drivers/cv1k.c
index fa09d9fd124..3d807e588d5 100644
--- a/src/mame/drivers/cv1k.c
+++ b/src/mame/drivers/cv1k.c
@@ -193,7 +193,7 @@ public:
m_eepromout(*this, "EEPROMOUT"),
m_idleramoffs(0),
m_idlepc(0)
- { }
+ { }
required_device<sh34_base_device> m_maincpu;
required_device<epic12_device> m_blitter;
diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c
index 8a1ce50a8d1..fce5634d3b2 100644
--- a/src/mame/drivers/galaxian.c
+++ b/src/mame/drivers/galaxian.c
@@ -5246,7 +5246,7 @@ static MACHINE_CONFIG_DERIVED( jumpbug, galaxian_base )
MCFG_CPU_PROGRAM_MAP(jumpbug_map)
/* sound hardware */
- MCFG_SOUND_ADD("8910.0", AY8910, GALAXIAN_PIXEL_CLOCK/3/2/2) /* matches PCB video - unconfirmed */
+ MCFG_SOUND_ADD("8910.0", AY8910, GALAXIAN_PIXEL_CLOCK/3/2/2) /* matches PCB video - unconfirmed */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gambl186.c b/src/mame/drivers/gambl186.c
index 1ff6c7a07db..7225b1c6733 100644
--- a/src/mame/drivers/gambl186.c
+++ b/src/mame/drivers/gambl186.c
@@ -41,7 +41,7 @@ public:
m_maincpu(*this, "maincpu") { }
required_device<cpu_device> m_maincpu;
- int m_comms_state;
+ int m_comms_state;
int m_comms_ind;
UINT8 m_comms_data[1002];
@@ -60,52 +60,52 @@ ADDRESS_MAP_END
READ16_MEMBER(gambl186_state::comms_r)
{
- if ((offset == 0) && ACCESSING_BITS_0_7) //port 680 == data
- {
- if ((m_comms_state == 0x16) && (m_comms_ind < sizeof(m_comms_data)))
- {
- return m_comms_data[m_comms_ind++];
- }
- }
- else if (offset == 1) //port 681 == status
- {
- if (m_comms_state == 0x16) //read mode?
- {
- return 2;
- }
- else if (m_comms_state == 0x31) //write mode?
- {
- return 4;
- }
- }
-
- return 0;
+ if ((offset == 0) && ACCESSING_BITS_0_7) //port 680 == data
+ {
+ if ((m_comms_state == 0x16) && (m_comms_ind < sizeof(m_comms_data)))
+ {
+ return m_comms_data[m_comms_ind++];
+ }
+ }
+ else if (offset == 1) //port 681 == status
+ {
+ if (m_comms_state == 0x16) //read mode?
+ {
+ return 2;
+ }
+ else if (m_comms_state == 0x31) //write mode?
+ {
+ return 4;
+ }
+ }
+
+ return 0;
}
WRITE16_MEMBER(gambl186_state::comms_w)
{
- if (offset == 0)
- {
- if ((m_comms_state == 0x31) && (m_comms_ind < (sizeof(m_comms_data) - 2)))
- {
- m_comms_data[++m_comms_ind] = (UINT8) ~data;
- }
- }
- else if (offset == 1)
- {
- if (m_comms_state != data)
- {
- m_comms_ind = 0;
- }
-
- m_comms_state = data;
-
- if (data == 0x4e) //reset?
- {
- m_comms_data[0] = 5;
- m_comms_data[sizeof(m_comms_data) - 1] = 0xec;
- }
- }
+ if (offset == 0)
+ {
+ if ((m_comms_state == 0x31) && (m_comms_ind < (sizeof(m_comms_data) - 2)))
+ {
+ m_comms_data[++m_comms_ind] = (UINT8) ~data;
+ }
+ }
+ else if (offset == 1)
+ {
+ if (m_comms_state != data)
+ {
+ m_comms_ind = 0;
+ }
+
+ m_comms_state = data;
+
+ if (data == 0x4e) //reset?
+ {
+ m_comms_data[0] = 5;
+ m_comms_data[sizeof(m_comms_data) - 1] = 0xec;
+ }
+ }
}
static ADDRESS_MAP_START( gambl186_io, AS_IO, 16, gambl186_state )
diff --git a/src/mame/drivers/gei.c b/src/mame/drivers/gei.c
index 83178101eb9..42abfaf9c24 100644
--- a/src/mame/drivers/gei.c
+++ b/src/mame/drivers/gei.c
@@ -2017,4 +2017,3 @@ GAME( 1992, sexappl, 0, findout, sexappl, driver_device, 0, ROT0
GAME( 1992, geimulti, 0, geimulti, geimulti, gei_state, geimulti, ROT0, "Grayhound Electronics", "GEI Multi Game", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND )
GAME( 1992, sprtauth, 0, sprtauth, sprtauth, gei_state, geimulti, ROT0, "Classic Games", "Sports Authority", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND )
-
diff --git a/src/mame/drivers/headonb.c b/src/mame/drivers/headonb.c
index 87e516c3b99..b6ae831871a 100644
--- a/src/mame/drivers/headonb.c
+++ b/src/mame/drivers/headonb.c
@@ -51,9 +51,9 @@ public:
DECLARE_WRITE8_MEMBER(video_ram_w);
virtual void video_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
TILE_GET_INFO_MEMBER(get_tile_info);
};
diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c
index 380d2646e1c..fd72a9ac3ad 100644
--- a/src/mame/drivers/hexion.c
+++ b/src/mame/drivers/hexion.c
@@ -332,4 +332,3 @@ ROM_END
GAME( 1992, hexion, 0, hexion, hexion, driver_device, 0, ROT0, "Konami", "Hexion (Japan ver JAB)", 0 )
GAME( 1992, hexionb,hexion, hexionb,hexion, driver_device, 0, ROT0, "bootleg (Impeuropex Corp.)", "Hexion (Asia ver AAA, bootleg)", 0 ) // we're missing an original Asia AAA
-
diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c
index 10c6dcd46df..65f06fb3b2b 100644
--- a/src/mame/drivers/jackie.c
+++ b/src/mame/drivers/jackie.c
@@ -107,23 +107,23 @@ public:
DECLARE_READ8_MEMBER(igs_irqack_r);
DECLARE_WRITE8_MEMBER(igs_irqack_w);
DECLARE_READ8_MEMBER(expram_r);
-
+
void unk_reg_lo_w( int offset, UINT8 data, int reg );
void unk_reg_hi_w( int offset, UINT8 data, int reg );
void show_out();
-
+
DECLARE_CUSTOM_INPUT_MEMBER(hopper_r);
-
+
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_reel1_tile_info);
TILE_GET_INFO_MEMBER(get_reel2_tile_info);
TILE_GET_INFO_MEMBER(get_reel3_tile_info);
-
+
DECLARE_DRIVER_INIT(jackie);
virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(irq);
};
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index 9249539364e..2c7d3a5af34 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -2733,7 +2733,7 @@ ROM_START( zeroguna ) /* Zero Gunner (Export), Model 2A */
MODEL2_CPU_BOARD
MODEL2A_VID_BOARD
-
+
// 1997 317-5038-COM Model 2
ROM_PARAMETER( ":315_5881:key", "042c0d13" )
ROM_END
@@ -2768,7 +2768,7 @@ ROM_START( zerogunaj ) /* Zero Gunner (Japan), Model 2A - Sega game ID# 833-1134
MODEL2_CPU_BOARD
MODEL2A_VID_BOARD
-
+
// 1997 317-5038-COM Model 2
ROM_PARAMETER( ":315_5881:key", "042c0d13" )
ROM_END
@@ -3572,7 +3572,7 @@ ROM_START( dynamcop ) /* Dynamite Cop (Export), Model 2A, Sega Game ID# 833-1134
MODEL2_CPU_BOARD
MODEL2A_VID_BOARD
-
+
// 1998 317-0236-COM Model 2
ROM_PARAMETER( ":315_5881:key", "2c2a4a93" )
ROM_END
@@ -3623,7 +3623,7 @@ ROM_START( dyndeka2 ) /* Dynamite Deka 2 (Japan), Model 2A */
MODEL2_CPU_BOARD
MODEL2A_VID_BOARD
-
+
// 1998 317-0236-COM Model 2
ROM_PARAMETER( ":315_5881:key", "2c2a4a93" )
ROM_END
@@ -4314,7 +4314,7 @@ ROM_START( pltkidsa ) /* Pilot Kids, Model 2A */
MODEL2_CPU_BOARD
MODEL2A_VID_BOARD
-
+
// 1998 317-5044-COM Model 2
ROM_PARAMETER( ":315_5881:key", "042e2dc1" )
ROM_END
diff --git a/src/mame/drivers/nl_breakout.c b/src/mame/drivers/nl_breakout.c
index 70478e740cf..8cb7701f8ae 100644
--- a/src/mame/drivers/nl_breakout.c
+++ b/src/mame/drivers/nl_breakout.c
@@ -77,13 +77,13 @@
//2 555 timers
static Astable555Desc b2_555_desc(OHM(560.0), M_OHM(1.8), U_FARAD(0.1));
-static Mono555Desc c9_555_desc(OHM(47000.0), U_FARAD(1.0)); // R33, C21
+static Mono555Desc c9_555_desc(OHM(47000.0), U_FARAD(1.0)); // R33, C21
//check these values
//static Paddle1HorizontalDesc pad1_desc(15047.0, 47.0, &c9_555_desc);
static CapacitorDesc c32_desc(U_FARAD(0.1));
-static CapacitorDesc c36_desc(N_FARAD(1.0)); //0.001uF = 1nF
+static CapacitorDesc c36_desc(N_FARAD(1.0)); //0.001uF = 1nF
static CapacitorDesc c37_desc(P_FARAD(330.0));
#if 0
@@ -92,33 +92,33 @@ static BufferDesc pad_en_buf_desc(DELAY_NS(15.0), DELAY_NS(15.0)); // Prevents 1
#if 0
static VIDEO_DESC( breakout )
- VIDEO_RESISTANCE(1, K_OHM(0.0))
- VIDEO_RESISTANCE(2, K_OHM(3.9))
- VIDEO_RESISTANCE(3, K_OHM(3.9))
- VIDEO_RESISTANCE(4, K_OHM(3.9))
- VIDEO_RESISTANCE(5, K_OHM(3.9))
- VIDEO_RESISTANCE(6, K_OHM(3.9))
- //VIDEO_RESISTANCE(Video::HBLANK_PIN, K_OHM(0.0))
- VIDEO_ORIENTATION(ROTATE_90)
- VIDEO_CONTRAST(4.0)
-
- // Values guessed based on screenshots. TODO: Make more accurate
- // X, Y, W, H, R, G, B
- VIDEO_OVERLAY( 15.570e-6, 0.0, 1.911e-6, -1.0, 0.80, 0.15, 0.05 ) // Red Bricks
- VIDEO_OVERLAY( 17.481e-6, 0.0, 1.956e-6, -1.0, 0.95, 0.65, 0.05 ) // Amber Bricks
- VIDEO_OVERLAY( 19.437e-6, 0.0, 1.956e-6, -1.0, 0.05, 0.65, 0.25 ) // Green Bricks
- VIDEO_OVERLAY( 21.393e-6, 0.0, 1.955e-6, -1.0, 0.95, 0.95, 0.20 ) // Yellow Bricks
- VIDEO_OVERLAY( 51.345e-6, 0.0, 1.956e-6, -1.0, 0.05, 0.65, 0.95 ) // Blue Paddle
-
- // TODO: Different overlays for cocktail cabinet
+ VIDEO_RESISTANCE(1, K_OHM(0.0))
+ VIDEO_RESISTANCE(2, K_OHM(3.9))
+ VIDEO_RESISTANCE(3, K_OHM(3.9))
+ VIDEO_RESISTANCE(4, K_OHM(3.9))
+ VIDEO_RESISTANCE(5, K_OHM(3.9))
+ VIDEO_RESISTANCE(6, K_OHM(3.9))
+ //VIDEO_RESISTANCE(Video::HBLANK_PIN, K_OHM(0.0))
+ VIDEO_ORIENTATION(ROTATE_90)
+ VIDEO_CONTRAST(4.0)
+
+ // Values guessed based on screenshots. TODO: Make more accurate
+ // X, Y, W, H, R, G, B
+ VIDEO_OVERLAY( 15.570e-6, 0.0, 1.911e-6, -1.0, 0.80, 0.15, 0.05 ) // Red Bricks
+ VIDEO_OVERLAY( 17.481e-6, 0.0, 1.956e-6, -1.0, 0.95, 0.65, 0.05 ) // Amber Bricks
+ VIDEO_OVERLAY( 19.437e-6, 0.0, 1.956e-6, -1.0, 0.05, 0.65, 0.25 ) // Green Bricks
+ VIDEO_OVERLAY( 21.393e-6, 0.0, 1.955e-6, -1.0, 0.95, 0.95, 0.20 ) // Yellow Bricks
+ VIDEO_OVERLAY( 51.345e-6, 0.0, 1.956e-6, -1.0, 0.05, 0.65, 0.95 ) // Blue Paddle
+
+ // TODO: Different overlays for cocktail cabinet
VIDEO_DESC_END
static AUDIO_DESC( breakout )
- AUDIO_RESISTANCE(1, K_OHM(47.0))
- AUDIO_RESISTANCE(2, K_OHM(47.0))
- AUDIO_RESISTANCE(3, K_OHM(47.0))
- AUDIO_RESISTANCE(4, K_OHM(47.0))
- AUDIO_GAIN(3.0)
+ AUDIO_RESISTANCE(1, K_OHM(47.0))
+ AUDIO_RESISTANCE(2, K_OHM(47.0))
+ AUDIO_RESISTANCE(3, K_OHM(47.0))
+ AUDIO_RESISTANCE(4, K_OHM(47.0))
+ AUDIO_GAIN(3.0)
VIDEO_DESC_END
#endif
@@ -138,7 +138,7 @@ static Dipswitch53137Desc dipswitch1_desc("bonus_credit", "Bonus Credit", 3, "No
CIRCUIT_LAYOUT( breakout )
#if 0
- CHIP("S1", 53137, &dipswitch1_desc)
+ CHIP("S1", 53137, &dipswitch1_desc)
CHIP("S2", DIPSWITCH, &dipswitch2_desc)
CHIP("S3", DIPSWITCH, &dipswitch3_desc)
CHIP("S4", DIPSWITCH, &dipswitch4_desc)
@@ -150,27 +150,27 @@ CIRCUIT_LAYOUT( breakout )
SWITCH(S1_3)
SWITCH(S1_4)
- SWITCH(S2) // Cocktail
- SWITCH(S3) // 2 Plays / 25c
- SWITCH2(S4) // Three Balls / 5 Balls
+ SWITCH(S2) // Cocktail
+ SWITCH(S3) // 2 Plays / 25c
+ SWITCH2(S4) // Three Balls / 5 Balls
- SOLVER(Solver, 48000)
- PARAM(Solver.ACCURACY, 1e-8) // less accuracy and diode will not work
- //CHIP("CLOCK", CLOCK_14_318_MHZ)
- MAINCLOCK(Y1, 14318000.0)
+ SOLVER(Solver, 48000)
+ PARAM(Solver.ACCURACY, 1e-8) // less accuracy and diode will not work
+ //CHIP("CLOCK", CLOCK_14_318_MHZ)
+ MAINCLOCK(Y1, 14318000.0)
- ANALOG_INPUT(V5, 5)
- ALIAS(VCC, V5)
+ ANALOG_INPUT(V5, 5)
+ ALIAS(VCC, V5)
//#define VCC "V5", Q
#define GNDD "GND", Q
- //CHIP("Y1", CLOCK_14_318_MHZ) //Y1
+ //CHIP("Y1", CLOCK_14_318_MHZ) //Y1
CHIP_CAPACITOR(C32, &c32_desc)
CHIP_CAPACITOR(C36, &c36_desc)
- CHIP_CAPACITOR(C37, &c37_desc)
+ CHIP_CAPACITOR(C37, &c37_desc)
#if 0
- CHIP("PAD_EN_BUF", BUFFER, &pad_en_buf_desc)
+ CHIP("PAD_EN_BUF", BUFFER, &pad_en_buf_desc)
#endif
CHIP("A3", 7474)
CHIP("A4", 7408)
@@ -179,7 +179,7 @@ CIRCUIT_LAYOUT( breakout )
CHIP_9602_Mono(A7, &a7_desc)
CHIP_9602_Mono(A8, &a8_desc)
- CHIP_555_Astable(B2, &b2_555_desc)
+ CHIP_555_Astable(B2, &b2_555_desc)
CHIP("B3", 7402)
CHIP("B4", 9316)
CHIP("B5", 74193)
@@ -195,7 +195,7 @@ CIRCUIT_LAYOUT( breakout )
CHIP("C6", 7486)
CHIP("C7", 9316)
CHIP("C8", 9316)
- //CHIP_555_Mono(C9, &c9_555_desc)
+ //CHIP_555_Mono(C9, &c9_555_desc)
NE555_DIP(C9)
CHIP("D2", 7432)
CHIP("D3", 7474)
@@ -204,7 +204,7 @@ CIRCUIT_LAYOUT( breakout )
CHIP("D6", 7408)
CHIP("D7", 7411)
CHIP("D8", 7400)
-// CHIP("D9", 4016) //quad bilateral switch
+// CHIP("D9", 4016) //quad bilateral switch
CHIP("E1", 7404)
CHIP("E2", 7486)
@@ -232,7 +232,7 @@ CIRCUIT_LAYOUT( breakout )
CHIP("H4", 7400)
CHIP("H5", 9312)
CHIP("H6", 9310)
- CHIP("H7", 7408) //sometimes looks like N7 on schematic
+ CHIP("H7", 7408) //sometimes looks like N7 on schematic
CHIP("H8", 7474)
CHIP("H9", 7474)
@@ -253,18 +253,18 @@ CIRCUIT_LAYOUT( breakout )
CHIP("K5", 9312)
CHIP("K6", 9310)
CHIP("K7", 7486)
- CHIP("K8", 7474) //TODO: one more than bom?
+ CHIP("K8", 7474) //TODO: one more than bom?
CHIP("K9", 74107)
CHIP("L1", 9316)
CHIP("L2", 7486)
- CHIP("L3", 82S16) //RAM
+ CHIP("L3", 82S16) //RAM
CHIP("L4", 7411)
CHIP("L5", 9312)
CHIP("L6", 9310)
CHIP("L7", 7486)
CHIP("L8", 74193)
- CHIP("L9", 7400) //TODO: 1 more chip than on bom?
+ CHIP("L9", 7400) //TODO: 1 more chip than on bom?
CHIP("M1", 9316)
CHIP("M2", 7483)
@@ -281,27 +281,27 @@ CIRCUIT_LAYOUT( breakout )
CHIP("N4", 7411)
CHIP("N5", 9312)
CHIP("N6", 9310)
- CHIP("N7", 7408) //sometimes looks like H7 on schematic
+ CHIP("N7", 7408) //sometimes looks like H7 on schematic
CHIP_9602_Mono(N8, &n8_desc)
CHIP("N9", 74192)
- //LM380 //speaker amplifier
- //LM323 //regulator
+ //LM380 //speaker amplifier
+ //LM323 //regulator
// CHIP("CREDIT_LIGHT1", LAMP)
// CHIP("CREDIT_LIGHT2", LAMP)
// CHIP("SERVE_LIGHT", LAMP)
#if 0
- CHIP("PAD1", PADDLE1_HORIZONTAL_INPUT, &pad1_desc)
- PADDLE_CONNECTION("PAD1", "C9")
+ CHIP("PAD1", PADDLE1_HORIZONTAL_INPUT, &pad1_desc)
+ PADDLE_CONNECTION("PAD1", "C9")
#endif
- CHIP_LATCH(LATCH)
- //CHIP("COIN1", COIN_INPUT)
+ CHIP_LATCH(LATCH)
+ //CHIP("COIN1", COIN_INPUT)
CHIP_INPUT_ACTIVE_LOW(COIN1)
- //CHIP("COIN2", COIN_INPUT)
+ //CHIP("COIN2", COIN_INPUT)
CHIP_INPUT_ACTIVE_LOW(COIN2)
//CHIP("START", START_INPUT)
@@ -309,1291 +309,1291 @@ CIRCUIT_LAYOUT( breakout )
CHIP_INPUT_ACTIVE_HIGH(START2)
//CHIP("SERVE", BUTTONS1_INPUT)
- CHIP_INPUT_ACTIVE_LOW(SERVE) // Active low?
+ CHIP_INPUT_ACTIVE_LOW(SERVE) // Active low?
- //TODO: coin2 and start 2
+ //TODO: coin2 and start 2
#if 0
- VIDEO(breakout)
- AUDIO(breakout)
+ VIDEO(breakout)
+ AUDIO(breakout)
#endif
#ifdef DEBUG
CHIP("LOG1", VCD_LOG, &vcd_log_desc)
#endif
- //HSYNC and VSYNC
- #define H1_d "L1", 14
- #define H2_d "L1", 13
- #define H4_d "L1", 12
- #define H8_d "L1", 11
- #define H8_n "J2", 2
- #define H16_d "K1", 14
- #define H16_n "J2", 6
- #define H32_d "K1", 13
- #define H32_n "J2", 4
- #define H64_d "K1", 12
- #define H128_d "K1", 11
-
- #define V1_d "M1", 14
- #define V2_d "M1", 13
- #define V4_d "M1", 12
- #define V8_d "M1", 11
- #define V16_d "N1", 14
- #define V16_n "J2", 10
- #define V32_d "N1", 13
- #define V64_d "N1", 12
- #define V64I "H7", 11
- #define V64_n "M9", 10
- #define V128_d "N1", 11
-
- #define H1 "L2", 8
- #define H2 "L2", 11
- #define H4 "L2", 3
- #define H8 "L2", 6
- #define H16 "K2", 8
- #define H32 "K2", 11
- #define H64 "K2", 3
- #define H128 "K2", 6
-
- //#define V1
- #define V2 "M3", 3
- #define V4 "M3", 6
- #define V8 "M3", 11
- #define V16 "N3", 8
- #define V32 "N3", 3
- #define V64 "N3", 6
- #define V128 "N3", 11
-
- #define HSYNC "J1", 2
- #define HSYNC_n "J1", 3
- #define VSYNC "J1", 7
- #define VSYNC_n "J1", 6
- #define PSYNC "J1", 11
- #define PSYNC_n "J1", 10
- #define BSYNC "J1", 15
- #define BSYNC_n "J1", 14
-
- #define BALL "D7", 6
- #define BALL_DISPLAY "A4", 6
- #define PLAYFIELD "H4", 3
- #define SCORE "D3", 5
- #define VERT_TRIG_n "H1", 8
-
- #define DICECLOCK "H1", 11
- #define SCLOCK "K1", 15
- #define CKBH "F1", 13
-
- #define PAD_n "K3", 8
- #define PAD_EN_n "C2", 8
-
- //#define P VCC
- #define P "V5", Q
-
- #define COIN "L9", 6
- #define COIN1_n "F8", 5
- #define COIN2_n "H9", 5
- #define CREDIT_1_OR_2 "L9", 3
- #define CREDIT_1_OR_2_n "F9", 8
- #define CREDIT2 "F9", 6
- #define CREDIT2_n "M8", 8
- #define CR_START1 "E8", 5
- #define CR_START1_n "E8", 6 //Schematic shows E8.6 as positive CR_START1, but this can't be right?
- #define CR_START2 "E8", 9
- #define CR_START2_n "E8", 8
- #define CSW1 "F9", 12
- #define CSW2 "F9", 2
-
- #define P2_CONDITIONAL "H1", 3
- #define P2_CONDITIONAL_dash "H7", 8
- #define PLAYER_2 "B4", 14
- #define PLAYER_2_n "M9", 8
-
- #define START_GAME "D8", 6
- #define START_GAME1_n "M9", 4
- #define START_GAME_n "M9", 6
-
- #define BG1_n "K8", 9
- #define BG1 "K8", 8
- #define BG2_n "K8", 5
- #define BG2 "K8", 6
-
- #define FREE_GAME_TONE "N7", 3
- #define BONUS_COIN "L9", 11
-
- //#define Q "E9", 6
- #define LAT_Q "E9", 6
- #define Q_n "LATCH", 3
- #define SBD_n "D2", 11
-
- #define PLAY_CP "D2", 8
- #define PLGM2_n "F7", 7
- #define VB_HIT_n "A5", 6
-
- #define SERVE_n "SERVE", 1
- #define SERVE_WAIT "A3", 9
- #define SERVE_WAIT_n "A3", 8
-
- #define BRICK_DISPLAY "E3", 1
- #define BRICK_HIT "E6", 5
- #define BRICK_HIT_n "E6", 6
-
- //#define EGL "A4", 3
- #define EGL "C37" , 2
- #define EGL_n "C5", 2
-
- #define RAM_PLAYER1 "E7", 4
- #define A1 "H6", 14
- #define B1 "H6", 13
- #define C1 "H6", 12
- #define D1 "H6", 11
- #define E1 "J6", 14
- #define F1 "J6", 13
- #define G1 "J6", 12
- #define H01 "J6", 11
- #define I1 "K6", 14
- #define J1 "K6", 13
- #define K1 "K6", 12
- #define L1 "K6", 11
- #define A2 "N6", 14
- #define B2 "N6", 13
- #define C2 "N6", 12
- #define D2 "N6", 11
- #define E2 "M6", 14
- #define F2 "M6", 13
- #define G2 "M6", 12
- #define H02 "M6", 11 //TODO: better name for these signals
- #define I2 "L6", 14
- #define J2 "L6", 13
- #define K2 "L6", 12
- #define L2 "L6", 11
-
- #define CX0 "C6", 11
- #define CX1 "C6", 6
- #define X0 "C5", 10
- #define X1 "B6", 3
- #define X2 "C6", 3
- #define Y0 "B6", 11
- #define Y1 "B6", 6
- #define Y2 "A6", 6
- #define DN "C4", 3
- #define PC "D4", 12
- #define PD "D4", 11
- #define SU_n "D5", 8
- #define V_SLOW "C5", 8
-
- #define PLNR "E3", 4
- #define SCI_n "H4", 6
- #define SFL_n "E9", 12 //score flash
- #define TOP_n "E9", 2
-
- #define BP_HIT_n "A5", 8
- #define BTB_HIT_n "C3", 3
-
- #define SET_BRICKS "D3", 9
- #define SET_BRICKS_n "D3", 8
-
- #define BALL_A "B4", 13
- #define BALL_B "B4", 12
- #define BALL_C "B4", 11
-
- #define FPD1 "F3", 10
- #define FPD1_n "F3", 9
- #define FPD2 "F3", 6
- #define FPD2_n "F3", 7
-
- #define COUNT "N7", 11
- #define COUNT_1 "N7", 8
- #define COUNT_2 "N7", 6
-
- #define ATTRACT "E6", 8
- #define ATTRACT_n "E6", 9
-
- #define BRICK_SOUND "B8", 14
- #define P_HIT_SOUND "B7", 12
- #define VB_HIT_SOUND "B7", 11
-
- #define LH_SIDE "J3", 13
- #define RH_SIDE "H2", 3
- #define TOP_BOUND "K4", 6
+ //HSYNC and VSYNC
+ #define H1_d "L1", 14
+ #define H2_d "L1", 13
+ #define H4_d "L1", 12
+ #define H8_d "L1", 11
+ #define H8_n "J2", 2
+ #define H16_d "K1", 14
+ #define H16_n "J2", 6
+ #define H32_d "K1", 13
+ #define H32_n "J2", 4
+ #define H64_d "K1", 12
+ #define H128_d "K1", 11
+
+ #define V1_d "M1", 14
+ #define V2_d "M1", 13
+ #define V4_d "M1", 12
+ #define V8_d "M1", 11
+ #define V16_d "N1", 14
+ #define V16_n "J2", 10
+ #define V32_d "N1", 13
+ #define V64_d "N1", 12
+ #define V64I "H7", 11
+ #define V64_n "M9", 10
+ #define V128_d "N1", 11
+
+ #define H1 "L2", 8
+ #define H2 "L2", 11
+ #define H4 "L2", 3
+ #define H8 "L2", 6
+ #define H16 "K2", 8
+ #define H32 "K2", 11
+ #define H64 "K2", 3
+ #define H128 "K2", 6
+
+ //#define V1
+ #define V2 "M3", 3
+ #define V4 "M3", 6
+ #define V8 "M3", 11
+ #define V16 "N3", 8
+ #define V32 "N3", 3
+ #define V64 "N3", 6
+ #define V128 "N3", 11
+
+ #define HSYNC "J1", 2
+ #define HSYNC_n "J1", 3
+ #define VSYNC "J1", 7
+ #define VSYNC_n "J1", 6
+ #define PSYNC "J1", 11
+ #define PSYNC_n "J1", 10
+ #define BSYNC "J1", 15
+ #define BSYNC_n "J1", 14
+
+ #define BALL "D7", 6
+ #define BALL_DISPLAY "A4", 6
+ #define PLAYFIELD "H4", 3
+ #define SCORE "D3", 5
+ #define VERT_TRIG_n "H1", 8
+
+ #define DICECLOCK "H1", 11
+ #define SCLOCK "K1", 15
+ #define CKBH "F1", 13
+
+ #define PAD_n "K3", 8
+ #define PAD_EN_n "C2", 8
+
+ //#define P VCC
+ #define P "V5", Q
+
+ #define COIN "L9", 6
+ #define COIN1_n "F8", 5
+ #define COIN2_n "H9", 5
+ #define CREDIT_1_OR_2 "L9", 3
+ #define CREDIT_1_OR_2_n "F9", 8
+ #define CREDIT2 "F9", 6
+ #define CREDIT2_n "M8", 8
+ #define CR_START1 "E8", 5
+ #define CR_START1_n "E8", 6 //Schematic shows E8.6 as positive CR_START1, but this can't be right?
+ #define CR_START2 "E8", 9
+ #define CR_START2_n "E8", 8
+ #define CSW1 "F9", 12
+ #define CSW2 "F9", 2
+
+ #define P2_CONDITIONAL "H1", 3
+ #define P2_CONDITIONAL_dash "H7", 8
+ #define PLAYER_2 "B4", 14
+ #define PLAYER_2_n "M9", 8
+
+ #define START_GAME "D8", 6
+ #define START_GAME1_n "M9", 4
+ #define START_GAME_n "M9", 6
+
+ #define BG1_n "K8", 9
+ #define BG1 "K8", 8
+ #define BG2_n "K8", 5
+ #define BG2 "K8", 6
+
+ #define FREE_GAME_TONE "N7", 3
+ #define BONUS_COIN "L9", 11
+
+ //#define Q "E9", 6
+ #define LAT_Q "E9", 6
+ #define Q_n "LATCH", 3
+ #define SBD_n "D2", 11
+
+ #define PLAY_CP "D2", 8
+ #define PLGM2_n "F7", 7
+ #define VB_HIT_n "A5", 6
+
+ #define SERVE_n "SERVE", 1
+ #define SERVE_WAIT "A3", 9
+ #define SERVE_WAIT_n "A3", 8
+
+ #define BRICK_DISPLAY "E3", 1
+ #define BRICK_HIT "E6", 5
+ #define BRICK_HIT_n "E6", 6
+
+ //#define EGL "A4", 3
+ #define EGL "C37" , 2
+ #define EGL_n "C5", 2
+
+ #define RAM_PLAYER1 "E7", 4
+ #define A1 "H6", 14
+ #define B1 "H6", 13
+ #define C1 "H6", 12
+ #define D1 "H6", 11
+ #define E1 "J6", 14
+ #define F1 "J6", 13
+ #define G1 "J6", 12
+ #define H01 "J6", 11
+ #define I1 "K6", 14
+ #define J1 "K6", 13
+ #define K1 "K6", 12
+ #define L1 "K6", 11
+ #define A2 "N6", 14
+ #define B2 "N6", 13
+ #define C2 "N6", 12
+ #define D2 "N6", 11
+ #define E2 "M6", 14
+ #define F2 "M6", 13
+ #define G2 "M6", 12
+ #define H02 "M6", 11 //TODO: better name for these signals
+ #define I2 "L6", 14
+ #define J2 "L6", 13
+ #define K2 "L6", 12
+ #define L2 "L6", 11
+
+ #define CX0 "C6", 11
+ #define CX1 "C6", 6
+ #define X0 "C5", 10
+ #define X1 "B6", 3
+ #define X2 "C6", 3
+ #define Y0 "B6", 11
+ #define Y1 "B6", 6
+ #define Y2 "A6", 6
+ #define DN "C4", 3
+ #define PC "D4", 12
+ #define PD "D4", 11
+ #define SU_n "D5", 8
+ #define V_SLOW "C5", 8
+
+ #define PLNR "E3", 4
+ #define SCI_n "H4", 6
+ #define SFL_n "E9", 12 //score flash
+ #define TOP_n "E9", 2
+
+ #define BP_HIT_n "A5", 8
+ #define BTB_HIT_n "C3", 3
+
+ #define SET_BRICKS "D3", 9
+ #define SET_BRICKS_n "D3", 8
+
+ #define BALL_A "B4", 13
+ #define BALL_B "B4", 12
+ #define BALL_C "B4", 11
+
+ #define FPD1 "F3", 10
+ #define FPD1_n "F3", 9
+ #define FPD2 "F3", 6
+ #define FPD2_n "F3", 7
+
+ #define COUNT "N7", 11
+ #define COUNT_1 "N7", 8
+ #define COUNT_2 "N7", 6
+
+ #define ATTRACT "E6", 8
+ #define ATTRACT_n "E6", 9
+
+ #define BRICK_SOUND "B8", 14
+ #define P_HIT_SOUND "B7", 12
+ #define VB_HIT_SOUND "B7", 11
+
+ #define LH_SIDE "J3", 13
+ #define RH_SIDE "H2", 3
+ #define TOP_BOUND "K4", 6
// CONNECTION(CREDIT_1_OR_2, "CREDIT_LIGHT1", 1)
// CONNECTION(CREDIT2, "CREDIT_LIGHT2", 1)
// CONNECTION(SERVE_WAIT_n, "SERVE_LIGHT", 1)
- //Audio
- CONNECTION("M9", 2, "F6", 5)
- CONNECTION("M9", 2, "F7", 15)
- CONNECTION("F6", 13, "F7", 14)
- CONNECTION(START_GAME_n, "F6", 11)
- CONNECTION(P, "F6", 15)
- CONNECTION(P, "F6", 1)
- CONNECTION(P, "F6", 10)
- CONNECTION(P, "F6", 9)
- CONNECTION(GNDD, "F6", 14)
- CONNECTION("F7", 13, "J9", 2)
- CONNECTION(VSYNC, "J9", 1)
- CONNECTION("A7", 9, "J9", 13)
- CONNECTION("J9", 12, "F6", 4)
- CONNECTION("J9", 12, "A7", 11)
- CONNECTION(GNDD, "A7", 12)
- CONNECTION(ATTRACT_n, "A7", 13)
- CONNECTION("J9", 12, "A8", 11)
- CONNECTION(GNDD, "A8", 12)
- CONNECTION(ATTRACT_n, "A8", 13)
- CONNECTION(VB_HIT_n, "A7", 5)
- CONNECTION(GNDD, "A7", 4)
- CONNECTION(ATTRACT_n, "A7", 3)
- CONNECTION(BP_HIT_n, "A8", 5)
- CONNECTION(GNDD, "A8", 4)
- CONNECTION(ATTRACT_n, "A8", 3)
- CONNECTION("A8", 6, "B9", 13)
- CONNECTION(P_HIT_SOUND, "B9", 12)
- CONNECTION("A8", 10, "B9", 10)
- CONNECTION(BRICK_SOUND, "B9", 9)
- CONNECTION("A7", 6, "B9", 4)
- CONNECTION(VB_HIT_SOUND, "B9", 5)
+ //Audio
+ CONNECTION("M9", 2, "F6", 5)
+ CONNECTION("M9", 2, "F7", 15)
+ CONNECTION("F6", 13, "F7", 14)
+ CONNECTION(START_GAME_n, "F6", 11)
+ CONNECTION(P, "F6", 15)
+ CONNECTION(P, "F6", 1)
+ CONNECTION(P, "F6", 10)
+ CONNECTION(P, "F6", 9)
+ CONNECTION(GNDD, "F6", 14)
+ CONNECTION("F7", 13, "J9", 2)
+ CONNECTION(VSYNC, "J9", 1)
+ CONNECTION("A7", 9, "J9", 13)
+ CONNECTION("J9", 12, "F6", 4)
+ CONNECTION("J9", 12, "A7", 11)
+ CONNECTION(GNDD, "A7", 12)
+ CONNECTION(ATTRACT_n, "A7", 13)
+ CONNECTION("J9", 12, "A8", 11)
+ CONNECTION(GNDD, "A8", 12)
+ CONNECTION(ATTRACT_n, "A8", 13)
+ CONNECTION(VB_HIT_n, "A7", 5)
+ CONNECTION(GNDD, "A7", 4)
+ CONNECTION(ATTRACT_n, "A7", 3)
+ CONNECTION(BP_HIT_n, "A8", 5)
+ CONNECTION(GNDD, "A8", 4)
+ CONNECTION(ATTRACT_n, "A8", 3)
+ CONNECTION("A8", 6, "B9", 13)
+ CONNECTION(P_HIT_SOUND, "B9", 12)
+ CONNECTION("A8", 10, "B9", 10)
+ CONNECTION(BRICK_SOUND, "B9", 9)
+ CONNECTION("A7", 6, "B9", 4)
+ CONNECTION(VB_HIT_SOUND, "B9", 5)
#if 0
- CONNECTION(GND, "S1", 1)
- CONNECTION(P, "S1", 2)
- CONNECTION(GND, "S1", 4)
- CONNECTION(P, "S1", 3)
- CONNECTION(GND, "S1", 12)
- CONNECTION(P, "S1", 11)
- CONNECTION(GND, "S1", 9)
- CONNECTION(P, "S1", 10)
+ CONNECTION(GND, "S1", 1)
+ CONNECTION(P, "S1", 2)
+ CONNECTION(GND, "S1", 4)
+ CONNECTION(P, "S1", 3)
+ CONNECTION(GND, "S1", 12)
+ CONNECTION(P, "S1", 11)
+ CONNECTION(GND, "S1", 9)
+ CONNECTION(P, "S1", 10)
#endif
- NET_C(S1_1.1, GND)
- NET_C(S1_2.1, GND)
- NET_C(S1_3.1, GND)
- NET_C(S1_4.1, GND)
-
- RES(R7, RES_K(2.7))
- RES(R8, RES_K(2.7))
- RES(R9, RES_K(2.7))
- RES(R10, RES_K(2.7))
-
- NET_C(R7.1, V5)
- NET_C(R8.1, V5)
- NET_C(R9.1, V5)
- NET_C(R10.1, V5)
-
- NET_C(S1_1.2, R7.2)
- NET_C(S1_2.2, R8.2)
- NET_C(S1_3.2, R9.2)
- NET_C(S1_4.2, R10.2)
-
- //Free Game Selector
- CONNECTION(I1, "K7", 2)
- //CONNECTION("S1", 15, "K7", 1)
- CONNECTION("S1_1", 2, "K7", 1)
- CONNECTION(J1, "K7", 12)
- //CONNECTION("S1", 14, "K7", 13)
- CONNECTION("S1_2", 2, "K7", 13)
- CONNECTION(K1, "K7", 5)
- //CONNECTION("S1", 6, "K7", 4)
- CONNECTION("S1_3", 2, "K7", 4)
- CONNECTION(L1, "K7", 9)
- //CONNECTION("S1", 7, "K7", 10)
- CONNECTION("S1_4", 2, "K7", 10)
-
- CONNECTION(I2, "L7", 2)
- //CONNECTION("S1", 15, "L7", 1)
- CONNECTION("S1_1", 2, "L7", 1)
- CONNECTION(J2, "L7", 12)
- //CONNECTION("S1", 14, "L7", 13)
- CONNECTION("S1_2", 2, "L7", 13)
- CONNECTION(K2, "L7", 5)
- //CONNECTION("S1", 6, "L7", 4)
- CONNECTION("S1_3", 2, "L7", 4)
- CONNECTION(L2, "L7", 9)
- //CONNECTION("S1", 7, "L7", 10)
- CONNECTION("S1_4", 2, "L7", 10)
-
-
- CONNECTION("K7", 3, "J7", 13)
- CONNECTION("K7", 11, "J7", 12)
- CONNECTION("K7", 6, "J7", 10)
- CONNECTION("K7", 8, "J7", 9)
-
- CONNECTION("L7", 3, "J7", 1)
- CONNECTION("L7", 11, "J7", 2)
- CONNECTION("L7", 6, "J7", 4)
- CONNECTION("L7", 8, "J7", 5)
-
- CONNECTION(START_GAME1_n, "J8", 12)
- CONNECTION(BG1_n, "J8", 11)
- CONNECTION("J7", 8, "J8", 10)
-
- CONNECTION(START_GAME1_n, "J8", 2)
- CONNECTION(BG2_n, "J8", 3)
- CONNECTION("J7", 6, "J8", 1)
-
- CONNECTION("J8", 9, "K8", 12)
- CONNECTION(EGL, "K8", 11)
- CONNECTION(P, "K8", 13)
- CONNECTION(LAT_Q, "K8", 10)
-
- CONNECTION("J8", 4, "K8", 2)
- CONNECTION(EGL, "K8", 3)
- CONNECTION(P, "K8", 1)
- CONNECTION(LAT_Q, "K8", 4)
-
- CONNECTION(P, "K9", 8)
- CONNECTION("J8", 9, "K9", 9)
- CONNECTION(GNDD, "K9", 11)
- CONNECTION(HSYNC_n, "K9", 10)
-
- CONNECTION(P, "K9", 1)
- CONNECTION("J8", 4, "K9", 12)
- CONNECTION(GNDD, "K9", 4)
- CONNECTION(HSYNC_n, "K9", 13)
-
- CONNECTION("K9", 6, "L9", 12)
- CONNECTION("K9", 2, "L9", 13)
-
- CONNECTION(P, "N8", 5)
- CONNECTION(BONUS_COIN, "N8", 4)
- CONNECTION(ATTRACT_n, "N8", 3)
-
- CONNECTION(V4_d, "N7", 2)
- CONNECTION("N8", 6, "N7", 1)
- //
- CONNECTION(GNDD, "M2", 13)
- CONNECTION(V1_d, "M2", 10)
- CONNECTION(V2_d, "M2", 8)
- CONNECTION(V4_d, "M2", 3)
- CONNECTION(V8_d, "M2", 1)
- CONNECTION(GNDD, "M2", 11)
- CONNECTION(P2_CONDITIONAL, "M2", 7)
- CONNECTION(GNDD, "M2", 4)
- CONNECTION(GNDD, "M2", 16)
-
- CONNECTION("M2", 14, "N2", 13)
- CONNECTION(V16_d, "N2", 10)
- CONNECTION(V32_d, "N2", 8)
- CONNECTION(V64_d, "N2", 3)
- CONNECTION(V128_d, "N2", 1)
- CONNECTION(GNDD, "N2", 11)
- CONNECTION(P2_CONDITIONAL, "N2", 7)
- CONNECTION(GNDD, "N2", 4)
- CONNECTION(GNDD, "N2", 16)
-
- CONNECTION("M2", 6, "M3", 2)
- CONNECTION(P2_CONDITIONAL, "M3", 1)
- CONNECTION("M2", 2, "M3", 5)
- CONNECTION(P2_CONDITIONAL, "M3", 4)
- CONNECTION("M2", 15, "M3", 12)
- CONNECTION(P2_CONDITIONAL, "M3", 13)
-
- CONNECTION(P2_CONDITIONAL, "N3", 10)
- CONNECTION("N2", 9, "N3", 9)
- CONNECTION(P2_CONDITIONAL, "N3", 1)
- CONNECTION("N2", 6, "N3", 2)
- CONNECTION(P2_CONDITIONAL, "N3", 4)
- CONNECTION("N2", 2, "N3", 5)
- CONNECTION(P2_CONDITIONAL, "N3", 13)
- CONNECTION("N2", 15, "N3", 12)
-
- CONNECTION(H1_d, "L2", 9)
- CONNECTION(P2_CONDITIONAL, "L2", 10)
- CONNECTION(H2_d, "L2", 12)
- CONNECTION(P2_CONDITIONAL, "L2", 13)
- CONNECTION(H4_d, "L2", 2)
- CONNECTION(P2_CONDITIONAL, "L2", 1)
- CONNECTION(H8_d, "L2", 5)
- CONNECTION(P2_CONDITIONAL, "L2", 4)
-
- CONNECTION(P2_CONDITIONAL, "K2", 10)
- CONNECTION(H16_d, "K2", 9)
- CONNECTION(P2_CONDITIONAL, "K2", 13)
- CONNECTION(H32_d, "K2", 12)
- CONNECTION(P2_CONDITIONAL, "K2", 1)
- CONNECTION(H64_d, "K2", 2)
- CONNECTION(P2_CONDITIONAL, "K2", 4)
- CONNECTION(H128_d, "K2", 5)
-
-
- CONNECTION(V64, "M9", 11)
- CONNECTION(H16, "J2", 5)
- CONNECTION(H32, "J2", 3)
- CONNECTION(V16, "J2", 11)
- CONNECTION(H8, "J2", 1)
-
- CONNECTION(DICECLOCK, "J1", 9)
- CONNECTION(SCLOCK, "J1", 4)
- CONNECTION("N4", 6, "J1", 5)
- CONNECTION(PAD_n, "J1", 12)
- CONNECTION(BALL_DISPLAY, "J1", 13)
- CONNECTION(P, "J1", 1)
-
- CONNECTION(P, "K1", 1)
- CONNECTION(P, "K1", 3)
- CONNECTION(P, "K1", 4)
- CONNECTION(P, "K1", 5)
- CONNECTION(P, "K1", 6)
- CONNECTION(P, "K1", 9)
- CONNECTION(P, "K1", 10)
- CONNECTION(DICECLOCK, "K1", 2)
- CONNECTION("L1", 15, "K1", 7)
-
- CONNECTION(P, "L1", 1)
- CONNECTION(P, "L1", 3)
- CONNECTION(GNDD, "L1", 4)
- CONNECTION(P, "L1", 5)
- CONNECTION(GNDD, "L1", 6)
- CONNECTION(VERT_TRIG_n, "L1", 9)
- CONNECTION(P, "L1", 10)
- CONNECTION(DICECLOCK, "L1", 2)
- CONNECTION(P, "L1", 7)
-
- CONNECTION(P, "N1", 1)
- CONNECTION(P, "N1", 10)
- CONNECTION(P, "N1", 3)
- CONNECTION(P, "N1", 4)
- CONNECTION(P, "N1", 5)
- CONNECTION(P, "N1", 6)
- CONNECTION(P, "N1", 9)
- CONNECTION(DICECLOCK, "N1", 2)
- CONNECTION("H2", 6, "N1", 7)
-
- CONNECTION("M1", 15, "H2", 5)
- CONNECTION("L1", 15, "H2", 4)
-
- CONNECTION(V128_d, "N4", 5)
- CONNECTION(V64_d, "N4", 3)
- CONNECTION(V32_d, "N4", 4)
- CONNECTION("N4", 6, "H1", 10)
- CONNECTION(VSYNC_n, "H1", 9)
-
- CONNECTION(P, "M1", 1)
- CONNECTION(GNDD, "M1", 3)
- CONNECTION(GNDD, "M1", 4)
- CONNECTION(P, "M1", 5)
- CONNECTION(GNDD, "M1", 6)
- CONNECTION(VERT_TRIG_n, "M1", 9)
- CONNECTION(DICECLOCK, "M1", 2)
- CONNECTION("L1", 15, "M1", 7)
- CONNECTION("K1", 15, "M1", 10)
-
-
- //9312 circuit
- CONNECTION(PLAYER_2, "M9", 9)
- CONNECTION(BALL_A, "C5", 5)
- CONNECTION(BALL_A, "C4", 13)
- CONNECTION(BALL_B, "C4", 12)
- CONNECTION(BALL_A, "A4", 13)
- CONNECTION(BALL_B, "A4", 12)
- CONNECTION(BALL_C, "C4", 10)
- CONNECTION("A4", 11, "C4", 9)
-
- CONNECTION(A2, "N5", 1)
- CONNECTION(E2, "N5", 2)
- CONNECTION(I2, "N5", 3)
- CONNECTION("C5", 6, "N5", 4)
- CONNECTION(A1, "N5", 5)
- CONNECTION(E1, "N5", 6)
- CONNECTION(I1, "N5", 7)
- CONNECTION(PLAYER_2_n, "N5", 9)
- CONNECTION(H32_n, "N5", 10)
- CONNECTION(V16, "N5", 11)
- CONNECTION(V64, "N5", 12)
- CONNECTION(V128, "N5", 13)
-
- CONNECTION(B2, "M5", 1)
- CONNECTION(F2, "M5", 2)
- CONNECTION(J2, "M5", 3)
- CONNECTION("C4", 11, "M5", 4)
- CONNECTION(B1, "M5", 5)
- CONNECTION(F1, "M5", 6)
- CONNECTION(J1, "M5", 7)
- CONNECTION(PLAYER_2, "M5", 9)
- CONNECTION(H32_n, "M5", 10)
- CONNECTION(V16, "M5", 11)
- CONNECTION(V64, "M5", 12)
- CONNECTION(V128, "M5", 13)
-
- CONNECTION(C2, "L5", 1)
- CONNECTION(G2, "L5", 2)
- CONNECTION(K2, "L5", 3)
- CONNECTION("C4", 8, "L5", 4)
- CONNECTION(C1, "L5", 5)
- CONNECTION(G1, "L5", 6)
- CONNECTION(K1, "L5", 7)
- CONNECTION(GNDD, "L5", 9)
- CONNECTION(H32_n, "L5", 10)
- CONNECTION(V16, "L5", 11)
- CONNECTION(V64, "L5", 12)
- CONNECTION(V128, "L5", 13)
-
- CONNECTION(D2, "K5", 1)
- CONNECTION(H02, "K5", 2)
- CONNECTION(L2, "K5", 3)
- CONNECTION(GNDD, "K5", 4)
- CONNECTION(D1, "K5", 5)
- CONNECTION(H01, "K5", 6)
- CONNECTION(L1, "K5", 7)
- CONNECTION(GNDD, "K5", 9)
- CONNECTION(H32_n, "K5", 10)
- CONNECTION(V16, "K5", 11)
- CONNECTION(V64, "K5", 12)
- CONNECTION(V128, "K5", 13)
-
- CONNECTION(P, "J5", 4)
- CONNECTION(P, "J5", 3)
- CONNECTION("N5", 15, "J5", 7)
- CONNECTION("M5", 15, "J5", 1)
- CONNECTION("L5", 15, "J5", 2)
- CONNECTION("K5", 15, "J5", 6)
- CONNECTION(H32, "J5", 5)
-
- CONNECTION("J5", 13, "H5", 1)
- CONNECTION(GNDD, "H5", 2)
- CONNECTION(GNDD, "H5", 3)
- CONNECTION("J5", 14, "H5", 4)
- CONNECTION(GNDD, "H5", 5)
- CONNECTION(GNDD, "H5", 6)
- CONNECTION("J5", 10, "H5", 7)
- CONNECTION(GNDD, "H5", 9)
-
- CONNECTION(V4, "K4", 12)
- CONNECTION(V8, "K4", 13)
-
- CONNECTION("K4", 11, "H5", 10)
- CONNECTION(H2, "H5", 11)
- CONNECTION(H4, "H5", 12)
- CONNECTION(H8, "H5", 13)
-
- CONNECTION(H2, "L4", 3)
- CONNECTION(H4, "L4", 5)
- CONNECTION(H8, "L4", 4)
-
- CONNECTION("J5", 12 , "J4", 1)
- CONNECTION("J5", 11, "J4", 2)
- CONNECTION(GNDD, "J4", 3)
- CONNECTION(GNDD, "J4", 4)
- CONNECTION("J5", 15, "J4", 5)
- CONNECTION("J5", 9, "J4", 6)
- CONNECTION(GNDD, "J4", 7)
- CONNECTION(GNDD, "J4", 9)
- CONNECTION("L4", 6, "J4", 10)
- CONNECTION(H8, "J4", 11)
- CONNECTION(V4, "J4", 12)
- CONNECTION(V8, "J4", 13)
-
- CONNECTION("H5", 14, "H4", 13)
- CONNECTION("J4", 14, "H4", 12)
-
- //PADDLES
- CONNECTION(ATTRACT_n, "B2", 4)
-
- CONNECTION("B2", 3, "E9", 13)
- CONNECTION(PLAYER_2_n, "M3", 9)
- CONNECTION(V128, "M3", 10)
- CONNECTION(H64, "J3", 8)
- CONNECTION(H128, "J3", 9)
- CONNECTION(V32, "E3", 5)
- CONNECTION(V16_n, "E3", 6)
-
- CONNECTION(SFL_n, "M8", 1)
- CONNECTION("M3", 8, "M8", 2)
- CONNECTION(PLNR, "M8", 13)
- CONNECTION("J3", 10, "E9", 1)
- CONNECTION(V64, "E2", 5)
- CONNECTION(V32, "E2", 4)
- CONNECTION(PLNR, "E2", 10)
- CONNECTION(H16, "E2", 9)
-
- CONNECTION("M8", 12, "M8", 3)
- CONNECTION(TOP_n, "M8", 4)
- CONNECTION(TOP_n, "M8", 5)
- CONNECTION("H4", 11, "F2", 11)
- CONNECTION("E2", 6, "F2", 10)
- CONNECTION("E2", 8, "F2", 9)
-
- CONNECTION("M8", 6, "H4", 5)
- CONNECTION("F2", 8, "H4", 4)
+ NET_C(S1_1.1, GND)
+ NET_C(S1_2.1, GND)
+ NET_C(S1_3.1, GND)
+ NET_C(S1_4.1, GND)
+
+ RES(R7, RES_K(2.7))
+ RES(R8, RES_K(2.7))
+ RES(R9, RES_K(2.7))
+ RES(R10, RES_K(2.7))
+
+ NET_C(R7.1, V5)
+ NET_C(R8.1, V5)
+ NET_C(R9.1, V5)
+ NET_C(R10.1, V5)
+
+ NET_C(S1_1.2, R7.2)
+ NET_C(S1_2.2, R8.2)
+ NET_C(S1_3.2, R9.2)
+ NET_C(S1_4.2, R10.2)
+
+ //Free Game Selector
+ CONNECTION(I1, "K7", 2)
+ //CONNECTION("S1", 15, "K7", 1)
+ CONNECTION("S1_1", 2, "K7", 1)
+ CONNECTION(J1, "K7", 12)
+ //CONNECTION("S1", 14, "K7", 13)
+ CONNECTION("S1_2", 2, "K7", 13)
+ CONNECTION(K1, "K7", 5)
+ //CONNECTION("S1", 6, "K7", 4)
+ CONNECTION("S1_3", 2, "K7", 4)
+ CONNECTION(L1, "K7", 9)
+ //CONNECTION("S1", 7, "K7", 10)
+ CONNECTION("S1_4", 2, "K7", 10)
+
+ CONNECTION(I2, "L7", 2)
+ //CONNECTION("S1", 15, "L7", 1)
+ CONNECTION("S1_1", 2, "L7", 1)
+ CONNECTION(J2, "L7", 12)
+ //CONNECTION("S1", 14, "L7", 13)
+ CONNECTION("S1_2", 2, "L7", 13)
+ CONNECTION(K2, "L7", 5)
+ //CONNECTION("S1", 6, "L7", 4)
+ CONNECTION("S1_3", 2, "L7", 4)
+ CONNECTION(L2, "L7", 9)
+ //CONNECTION("S1", 7, "L7", 10)
+ CONNECTION("S1_4", 2, "L7", 10)
+
+
+ CONNECTION("K7", 3, "J7", 13)
+ CONNECTION("K7", 11, "J7", 12)
+ CONNECTION("K7", 6, "J7", 10)
+ CONNECTION("K7", 8, "J7", 9)
+
+ CONNECTION("L7", 3, "J7", 1)
+ CONNECTION("L7", 11, "J7", 2)
+ CONNECTION("L7", 6, "J7", 4)
+ CONNECTION("L7", 8, "J7", 5)
+
+ CONNECTION(START_GAME1_n, "J8", 12)
+ CONNECTION(BG1_n, "J8", 11)
+ CONNECTION("J7", 8, "J8", 10)
+
+ CONNECTION(START_GAME1_n, "J8", 2)
+ CONNECTION(BG2_n, "J8", 3)
+ CONNECTION("J7", 6, "J8", 1)
+
+ CONNECTION("J8", 9, "K8", 12)
+ CONNECTION(EGL, "K8", 11)
+ CONNECTION(P, "K8", 13)
+ CONNECTION(LAT_Q, "K8", 10)
+
+ CONNECTION("J8", 4, "K8", 2)
+ CONNECTION(EGL, "K8", 3)
+ CONNECTION(P, "K8", 1)
+ CONNECTION(LAT_Q, "K8", 4)
+
+ CONNECTION(P, "K9", 8)
+ CONNECTION("J8", 9, "K9", 9)
+ CONNECTION(GNDD, "K9", 11)
+ CONNECTION(HSYNC_n, "K9", 10)
+
+ CONNECTION(P, "K9", 1)
+ CONNECTION("J8", 4, "K9", 12)
+ CONNECTION(GNDD, "K9", 4)
+ CONNECTION(HSYNC_n, "K9", 13)
+
+ CONNECTION("K9", 6, "L9", 12)
+ CONNECTION("K9", 2, "L9", 13)
+
+ CONNECTION(P, "N8", 5)
+ CONNECTION(BONUS_COIN, "N8", 4)
+ CONNECTION(ATTRACT_n, "N8", 3)
+
+ CONNECTION(V4_d, "N7", 2)
+ CONNECTION("N8", 6, "N7", 1)
+ //
+ CONNECTION(GNDD, "M2", 13)
+ CONNECTION(V1_d, "M2", 10)
+ CONNECTION(V2_d, "M2", 8)
+ CONNECTION(V4_d, "M2", 3)
+ CONNECTION(V8_d, "M2", 1)
+ CONNECTION(GNDD, "M2", 11)
+ CONNECTION(P2_CONDITIONAL, "M2", 7)
+ CONNECTION(GNDD, "M2", 4)
+ CONNECTION(GNDD, "M2", 16)
+
+ CONNECTION("M2", 14, "N2", 13)
+ CONNECTION(V16_d, "N2", 10)
+ CONNECTION(V32_d, "N2", 8)
+ CONNECTION(V64_d, "N2", 3)
+ CONNECTION(V128_d, "N2", 1)
+ CONNECTION(GNDD, "N2", 11)
+ CONNECTION(P2_CONDITIONAL, "N2", 7)
+ CONNECTION(GNDD, "N2", 4)
+ CONNECTION(GNDD, "N2", 16)
+
+ CONNECTION("M2", 6, "M3", 2)
+ CONNECTION(P2_CONDITIONAL, "M3", 1)
+ CONNECTION("M2", 2, "M3", 5)
+ CONNECTION(P2_CONDITIONAL, "M3", 4)
+ CONNECTION("M2", 15, "M3", 12)
+ CONNECTION(P2_CONDITIONAL, "M3", 13)
+
+ CONNECTION(P2_CONDITIONAL, "N3", 10)
+ CONNECTION("N2", 9, "N3", 9)
+ CONNECTION(P2_CONDITIONAL, "N3", 1)
+ CONNECTION("N2", 6, "N3", 2)
+ CONNECTION(P2_CONDITIONAL, "N3", 4)
+ CONNECTION("N2", 2, "N3", 5)
+ CONNECTION(P2_CONDITIONAL, "N3", 13)
+ CONNECTION("N2", 15, "N3", 12)
+
+ CONNECTION(H1_d, "L2", 9)
+ CONNECTION(P2_CONDITIONAL, "L2", 10)
+ CONNECTION(H2_d, "L2", 12)
+ CONNECTION(P2_CONDITIONAL, "L2", 13)
+ CONNECTION(H4_d, "L2", 2)
+ CONNECTION(P2_CONDITIONAL, "L2", 1)
+ CONNECTION(H8_d, "L2", 5)
+ CONNECTION(P2_CONDITIONAL, "L2", 4)
+
+ CONNECTION(P2_CONDITIONAL, "K2", 10)
+ CONNECTION(H16_d, "K2", 9)
+ CONNECTION(P2_CONDITIONAL, "K2", 13)
+ CONNECTION(H32_d, "K2", 12)
+ CONNECTION(P2_CONDITIONAL, "K2", 1)
+ CONNECTION(H64_d, "K2", 2)
+ CONNECTION(P2_CONDITIONAL, "K2", 4)
+ CONNECTION(H128_d, "K2", 5)
+
+
+ CONNECTION(V64, "M9", 11)
+ CONNECTION(H16, "J2", 5)
+ CONNECTION(H32, "J2", 3)
+ CONNECTION(V16, "J2", 11)
+ CONNECTION(H8, "J2", 1)
+
+ CONNECTION(DICECLOCK, "J1", 9)
+ CONNECTION(SCLOCK, "J1", 4)
+ CONNECTION("N4", 6, "J1", 5)
+ CONNECTION(PAD_n, "J1", 12)
+ CONNECTION(BALL_DISPLAY, "J1", 13)
+ CONNECTION(P, "J1", 1)
+
+ CONNECTION(P, "K1", 1)
+ CONNECTION(P, "K1", 3)
+ CONNECTION(P, "K1", 4)
+ CONNECTION(P, "K1", 5)
+ CONNECTION(P, "K1", 6)
+ CONNECTION(P, "K1", 9)
+ CONNECTION(P, "K1", 10)
+ CONNECTION(DICECLOCK, "K1", 2)
+ CONNECTION("L1", 15, "K1", 7)
+
+ CONNECTION(P, "L1", 1)
+ CONNECTION(P, "L1", 3)
+ CONNECTION(GNDD, "L1", 4)
+ CONNECTION(P, "L1", 5)
+ CONNECTION(GNDD, "L1", 6)
+ CONNECTION(VERT_TRIG_n, "L1", 9)
+ CONNECTION(P, "L1", 10)
+ CONNECTION(DICECLOCK, "L1", 2)
+ CONNECTION(P, "L1", 7)
+
+ CONNECTION(P, "N1", 1)
+ CONNECTION(P, "N1", 10)
+ CONNECTION(P, "N1", 3)
+ CONNECTION(P, "N1", 4)
+ CONNECTION(P, "N1", 5)
+ CONNECTION(P, "N1", 6)
+ CONNECTION(P, "N1", 9)
+ CONNECTION(DICECLOCK, "N1", 2)
+ CONNECTION("H2", 6, "N1", 7)
+
+ CONNECTION("M1", 15, "H2", 5)
+ CONNECTION("L1", 15, "H2", 4)
+
+ CONNECTION(V128_d, "N4", 5)
+ CONNECTION(V64_d, "N4", 3)
+ CONNECTION(V32_d, "N4", 4)
+ CONNECTION("N4", 6, "H1", 10)
+ CONNECTION(VSYNC_n, "H1", 9)
+
+ CONNECTION(P, "M1", 1)
+ CONNECTION(GNDD, "M1", 3)
+ CONNECTION(GNDD, "M1", 4)
+ CONNECTION(P, "M1", 5)
+ CONNECTION(GNDD, "M1", 6)
+ CONNECTION(VERT_TRIG_n, "M1", 9)
+ CONNECTION(DICECLOCK, "M1", 2)
+ CONNECTION("L1", 15, "M1", 7)
+ CONNECTION("K1", 15, "M1", 10)
+
+
+ //9312 circuit
+ CONNECTION(PLAYER_2, "M9", 9)
+ CONNECTION(BALL_A, "C5", 5)
+ CONNECTION(BALL_A, "C4", 13)
+ CONNECTION(BALL_B, "C4", 12)
+ CONNECTION(BALL_A, "A4", 13)
+ CONNECTION(BALL_B, "A4", 12)
+ CONNECTION(BALL_C, "C4", 10)
+ CONNECTION("A4", 11, "C4", 9)
+
+ CONNECTION(A2, "N5", 1)
+ CONNECTION(E2, "N5", 2)
+ CONNECTION(I2, "N5", 3)
+ CONNECTION("C5", 6, "N5", 4)
+ CONNECTION(A1, "N5", 5)
+ CONNECTION(E1, "N5", 6)
+ CONNECTION(I1, "N5", 7)
+ CONNECTION(PLAYER_2_n, "N5", 9)
+ CONNECTION(H32_n, "N5", 10)
+ CONNECTION(V16, "N5", 11)
+ CONNECTION(V64, "N5", 12)
+ CONNECTION(V128, "N5", 13)
+
+ CONNECTION(B2, "M5", 1)
+ CONNECTION(F2, "M5", 2)
+ CONNECTION(J2, "M5", 3)
+ CONNECTION("C4", 11, "M5", 4)
+ CONNECTION(B1, "M5", 5)
+ CONNECTION(F1, "M5", 6)
+ CONNECTION(J1, "M5", 7)
+ CONNECTION(PLAYER_2, "M5", 9)
+ CONNECTION(H32_n, "M5", 10)
+ CONNECTION(V16, "M5", 11)
+ CONNECTION(V64, "M5", 12)
+ CONNECTION(V128, "M5", 13)
+
+ CONNECTION(C2, "L5", 1)
+ CONNECTION(G2, "L5", 2)
+ CONNECTION(K2, "L5", 3)
+ CONNECTION("C4", 8, "L5", 4)
+ CONNECTION(C1, "L5", 5)
+ CONNECTION(G1, "L5", 6)
+ CONNECTION(K1, "L5", 7)
+ CONNECTION(GNDD, "L5", 9)
+ CONNECTION(H32_n, "L5", 10)
+ CONNECTION(V16, "L5", 11)
+ CONNECTION(V64, "L5", 12)
+ CONNECTION(V128, "L5", 13)
+
+ CONNECTION(D2, "K5", 1)
+ CONNECTION(H02, "K5", 2)
+ CONNECTION(L2, "K5", 3)
+ CONNECTION(GNDD, "K5", 4)
+ CONNECTION(D1, "K5", 5)
+ CONNECTION(H01, "K5", 6)
+ CONNECTION(L1, "K5", 7)
+ CONNECTION(GNDD, "K5", 9)
+ CONNECTION(H32_n, "K5", 10)
+ CONNECTION(V16, "K5", 11)
+ CONNECTION(V64, "K5", 12)
+ CONNECTION(V128, "K5", 13)
+
+ CONNECTION(P, "J5", 4)
+ CONNECTION(P, "J5", 3)
+ CONNECTION("N5", 15, "J5", 7)
+ CONNECTION("M5", 15, "J5", 1)
+ CONNECTION("L5", 15, "J5", 2)
+ CONNECTION("K5", 15, "J5", 6)
+ CONNECTION(H32, "J5", 5)
+
+ CONNECTION("J5", 13, "H5", 1)
+ CONNECTION(GNDD, "H5", 2)
+ CONNECTION(GNDD, "H5", 3)
+ CONNECTION("J5", 14, "H5", 4)
+ CONNECTION(GNDD, "H5", 5)
+ CONNECTION(GNDD, "H5", 6)
+ CONNECTION("J5", 10, "H5", 7)
+ CONNECTION(GNDD, "H5", 9)
+
+ CONNECTION(V4, "K4", 12)
+ CONNECTION(V8, "K4", 13)
+
+ CONNECTION("K4", 11, "H5", 10)
+ CONNECTION(H2, "H5", 11)
+ CONNECTION(H4, "H5", 12)
+ CONNECTION(H8, "H5", 13)
+
+ CONNECTION(H2, "L4", 3)
+ CONNECTION(H4, "L4", 5)
+ CONNECTION(H8, "L4", 4)
+
+ CONNECTION("J5", 12 , "J4", 1)
+ CONNECTION("J5", 11, "J4", 2)
+ CONNECTION(GNDD, "J4", 3)
+ CONNECTION(GNDD, "J4", 4)
+ CONNECTION("J5", 15, "J4", 5)
+ CONNECTION("J5", 9, "J4", 6)
+ CONNECTION(GNDD, "J4", 7)
+ CONNECTION(GNDD, "J4", 9)
+ CONNECTION("L4", 6, "J4", 10)
+ CONNECTION(H8, "J4", 11)
+ CONNECTION(V4, "J4", 12)
+ CONNECTION(V8, "J4", 13)
+
+ CONNECTION("H5", 14, "H4", 13)
+ CONNECTION("J4", 14, "H4", 12)
+
+ //PADDLES
+ CONNECTION(ATTRACT_n, "B2", 4)
+
+ CONNECTION("B2", 3, "E9", 13)
+ CONNECTION(PLAYER_2_n, "M3", 9)
+ CONNECTION(V128, "M3", 10)
+ CONNECTION(H64, "J3", 8)
+ CONNECTION(H128, "J3", 9)
+ CONNECTION(V32, "E3", 5)
+ CONNECTION(V16_n, "E3", 6)
+
+ CONNECTION(SFL_n, "M8", 1)
+ CONNECTION("M3", 8, "M8", 2)
+ CONNECTION(PLNR, "M8", 13)
+ CONNECTION("J3", 10, "E9", 1)
+ CONNECTION(V64, "E2", 5)
+ CONNECTION(V32, "E2", 4)
+ CONNECTION(PLNR, "E2", 10)
+ CONNECTION(H16, "E2", 9)
+
+ CONNECTION("M8", 12, "M8", 3)
+ CONNECTION(TOP_n, "M8", 4)
+ CONNECTION(TOP_n, "M8", 5)
+ CONNECTION("H4", 11, "F2", 11)
+ CONNECTION("E2", 6, "F2", 10)
+ CONNECTION("E2", 8, "F2", 9)
+
+ CONNECTION("M8", 6, "H4", 5)
+ CONNECTION("F2", 8, "H4", 4)
#if 0
- CONNECTION(PAD_EN_n, "PAD_EN_BUF", 1)
+ CONNECTION(PAD_EN_n, "PAD_EN_BUF", 1)
- CONNECTION("PAD_EN_BUF", 2, "C9", 4)
- CONNECTION("PAD_EN_BUF", 2, "C9", 2)
+ CONNECTION("PAD_EN_BUF", 2, "C9", 4)
+ CONNECTION("PAD_EN_BUF", 2, "C9", 2)
#else
- // NOTE: Stabilizing CAP C20 not modelled.
- CONNECTION(PAD_EN_n, "C9", 4)
- CONNECTION(PAD_EN_n, "C9", 2)
- NET_C(C9.8, V5)
- NET_C(C9.1, GND)
- RES(R53, RES_K(12)) // 12k
- CAP(C21, CAP_U(1))
- NET_C(GND, C21.2, R53.2)
- NET_C(C21.1, R53.1, C9.6, C9.7)
+ // NOTE: Stabilizing CAP C20 not modelled.
+ CONNECTION(PAD_EN_n, "C9", 4)
+ CONNECTION(PAD_EN_n, "C9", 2)
+ NET_C(C9.8, V5)
+ NET_C(C9.1, GND)
+ RES(R53, RES_K(12)) // 12k
+ CAP(C21, CAP_U(1))
+ NET_C(GND, C21.2, R53.2)
+ NET_C(C21.1, R53.1, C9.6, C9.7)
#endif
- CONNECTION(BTB_HIT_n, "C5", 3)
- CONNECTION(P, "F5", 10)
- CONNECTION(P, "F5", 12)
- CONNECTION("C5", 4, "F5", 11)
- CONNECTION(SERVE_WAIT_n, "F5", 13)
- CONNECTION(H64, "E5", 13)
- CONNECTION("F5", 9, "E5", 12)
- CONNECTION(H128, "E5", 10)
- CONNECTION("F5", 8, "E5", 9)
- CONNECTION("E5", 11, "E4", 12)
- CONNECTION("E5", 8, "E4", 13)
- CONNECTION("E4", 11, "D4", 2)
- CONNECTION(P, "D4", 3)
- CONNECTION(P, "D4", 4)
- CONNECTION(P, "D4", 5)
- CONNECTION(P, "D4", 6)
- CONNECTION(P, "D4", 9)
- CONNECTION(P, "D4", 10)
- CONNECTION("C3", 11, "D4", 7)
- CONNECTION(VSYNC_n, "D4", 1)
-
- CONNECTION("D4", 15, "E4", 10)
- CONNECTION("H7", 6, "E4", 9)
- CONNECTION("C9", 3, "H7", 5)
- CONNECTION(PAD_EN_n, "H7", 4)
- CONNECTION("E4", 8, "C3", 12)
- CONNECTION(ATTRACT_n, "C3", 13)
- CONNECTION(H8, "J3", 2)
- CONNECTION(H32, "J3", 3)
-
- CONNECTION("C3", 11, "K3", 12)
- CONNECTION(H128, "K3", 5)
- CONNECTION(H64, "K3", 6)
- CONNECTION(H16, "K3", 11)
- CONNECTION(H4, "K3", 4)
- CONNECTION("J3", 1, "K3", 1)
- CONNECTION(P, "K3", 3)
- CONNECTION(P, "K3", 2)
-
- CONNECTION(V16_d, "D7", 1)
- CONNECTION(V64_d, "D7", 13)
- CONNECTION(V128_d, "D7", 2)
- CONNECTION("D7", 12, "H1", 4)
- CONNECTION(V8_d, "H1", 5)
- CONNECTION("H1", 6, "C2", 4)
- CONNECTION("H1", 6, "C2", 5)
- CONNECTION(V32_d, "J2", 9)
- CONNECTION("J2", 8, "C2", 10)
- CONNECTION("C2", 6, "C2", 9)
-
-
- //SCORE
- CONNECTION(SCI_n, "D3", 4)
- CONNECTION(GNDD, "D3", 2)
- CONNECTION(GNDD, "D3", 3)
- CONNECTION(GNDD, "D3", 1)
-
- //PLAYER2_CONDITIONAL
- CONNECTION(PLAYER_2, "H7", 10)
+ CONNECTION(BTB_HIT_n, "C5", 3)
+ CONNECTION(P, "F5", 10)
+ CONNECTION(P, "F5", 12)
+ CONNECTION("C5", 4, "F5", 11)
+ CONNECTION(SERVE_WAIT_n, "F5", 13)
+ CONNECTION(H64, "E5", 13)
+ CONNECTION("F5", 9, "E5", 12)
+ CONNECTION(H128, "E5", 10)
+ CONNECTION("F5", 8, "E5", 9)
+ CONNECTION("E5", 11, "E4", 12)
+ CONNECTION("E5", 8, "E4", 13)
+ CONNECTION("E4", 11, "D4", 2)
+ CONNECTION(P, "D4", 3)
+ CONNECTION(P, "D4", 4)
+ CONNECTION(P, "D4", 5)
+ CONNECTION(P, "D4", 6)
+ CONNECTION(P, "D4", 9)
+ CONNECTION(P, "D4", 10)
+ CONNECTION("C3", 11, "D4", 7)
+ CONNECTION(VSYNC_n, "D4", 1)
+
+ CONNECTION("D4", 15, "E4", 10)
+ CONNECTION("H7", 6, "E4", 9)
+ CONNECTION("C9", 3, "H7", 5)
+ CONNECTION(PAD_EN_n, "H7", 4)
+ CONNECTION("E4", 8, "C3", 12)
+ CONNECTION(ATTRACT_n, "C3", 13)
+ CONNECTION(H8, "J3", 2)
+ CONNECTION(H32, "J3", 3)
+
+ CONNECTION("C3", 11, "K3", 12)
+ CONNECTION(H128, "K3", 5)
+ CONNECTION(H64, "K3", 6)
+ CONNECTION(H16, "K3", 11)
+ CONNECTION(H4, "K3", 4)
+ CONNECTION("J3", 1, "K3", 1)
+ CONNECTION(P, "K3", 3)
+ CONNECTION(P, "K3", 2)
+
+ CONNECTION(V16_d, "D7", 1)
+ CONNECTION(V64_d, "D7", 13)
+ CONNECTION(V128_d, "D7", 2)
+ CONNECTION("D7", 12, "H1", 4)
+ CONNECTION(V8_d, "H1", 5)
+ CONNECTION("H1", 6, "C2", 4)
+ CONNECTION("H1", 6, "C2", 5)
+ CONNECTION(V32_d, "J2", 9)
+ CONNECTION("J2", 8, "C2", 10)
+ CONNECTION("C2", 6, "C2", 9)
+
+
+ //SCORE
+ CONNECTION(SCI_n, "D3", 4)
+ CONNECTION(GNDD, "D3", 2)
+ CONNECTION(GNDD, "D3", 3)
+ CONNECTION(GNDD, "D3", 1)
+
+ //PLAYER2_CONDITIONAL
+ CONNECTION(PLAYER_2, "H7", 10)
#if 0
- CONNECTION(GNDD, "S2", 1)
- CONNECTION(P, "S2", 2)
- CONNECTION("S2", 3, "H7", 9)
+ CONNECTION(GNDD, "S2", 1)
+ CONNECTION(P, "S2", 2)
+ CONNECTION("S2", 3, "H7", 9)
#else
- NET_C(S2.2, GND)
- NET_C(S2.1, H7.9)
- RES(R18, RES_K(1))
- NET_C(R18.2, V5)
- NET_C(R18.1, S2.1)
+ NET_C(S2.2, GND)
+ NET_C(S2.1, H7.9)
+ RES(R18, RES_K(1))
+ NET_C(R18.2, V5)
+ NET_C(R18.1, S2.1)
#endif
- //A-L 1 and 2
- CONNECTION(SET_BRICKS_n, "B3", 2)
- CONNECTION(H2, "B3", 3)
- CONNECTION("B3", 1, "E7", 6)
- CONNECTION(PLAYER_2, "E7", 5)
- CONNECTION(P, "N6", 9)
- CONNECTION(P, "M6", 9)
- CONNECTION(P, "L6", 9)
- CONNECTION(P, "H6", 9)
- CONNECTION(P, "J6", 9)
- CONNECTION(P, "K6", 9)
-
- CONNECTION(P, "N6", 10)
- CONNECTION(PLAYER_2, "N6", 7)
- CONNECTION(COUNT_2, "N6", 2)
- CONNECTION(START_GAME_n, "N6", 1)
-
- CONNECTION("N6", 15, "M6", 10)
- CONNECTION(PLAYER_2, "M6", 7)
- CONNECTION(COUNT_2, "M6", 2)
- CONNECTION(START_GAME_n, "M6", 1)
-
- CONNECTION("M6", 15, "L6", 10)
- CONNECTION(PLAYER_2, "L6", 7)
- CONNECTION(COUNT_2, "L6", 2)
- CONNECTION(START_GAME_n, "L6", 1)
-
- CONNECTION(P, "H6", 10)
- CONNECTION(RAM_PLAYER1, "H6", 7)
- CONNECTION(COUNT_1, "H6", 2)
- CONNECTION(START_GAME_n, "H6", 1)
-
- CONNECTION("H6", 15, "J6", 10)
- CONNECTION(RAM_PLAYER1, "J6", 7)
- CONNECTION(COUNT_1, "J6", 2)
- CONNECTION(START_GAME_n, "J6", 1)
-
- CONNECTION("J6", 15, "K6", 10)
- CONNECTION(RAM_PLAYER1, "K6", 7)
- CONNECTION(COUNT_1, "K6", 2)
- CONNECTION(START_GAME_n, "K6", 1)
-
-
- //CX0 and CX1
- CONNECTION(BRICK_HIT, "H2", 9)
- CONNECTION(H16_n, "H2", 10)
- CONNECTION(P, "D5", 10)
- CONNECTION(P, "D5", 12)
- CONNECTION("H2", 8, "D5", 11)
- CONNECTION(SERVE_WAIT_n, "D5", 13)
- CONNECTION(X0, "C6", 13)
- CONNECTION("D5", 9, "C6", 12)
- CONNECTION("D5", 9, "D6", 12)
- CONNECTION(DN, "D6", 13)
- CONNECTION("D6", 11, "C6", 4)
- CONNECTION(X1, "C6", 5)
-
- //COUNT1 and COUNT2
- CONNECTION(P, "N8", 11)
- CONNECTION(BRICK_HIT, "N8", 12)
- CONNECTION(ATTRACT_n, "N8", 13)
- CONNECTION("N8", 9, "N9", 11)
- CONNECTION(P, "N9", 15)
- CONNECTION(P, "N9", 5)
-
- CONNECTION(COUNT, "N9", 4)
- CONNECTION(START_GAME, "N9", 14)
- CONNECTION(H8_n, "N9", 1)
- CONNECTION(H16_n, "N9", 10)
- CONNECTION(GNDD, "N9", 9)
-
- CONNECTION("N9", 13, "N7", 13)
- CONNECTION(SCLOCK, "N7", 12)
-
- CONNECTION(PLAYER_2, "N7", 5)
- CONNECTION(COUNT, "N7", 4)
-
- CONNECTION(COUNT, "M9", 1)
- CONNECTION(COUNT, "N7", 10)
- CONNECTION(RAM_PLAYER1, "N7", 9)
-
-
- //Ball Logic
- CONNECTION(P, "C7", 1)
- CONNECTION(P, "C7", 10)
- CONNECTION(P, "C7", 7)
- CONNECTION(CX0, "C7", 3)
- CONNECTION(CX1, "C7", 4)
- CONNECTION(X2, "C7", 5)
- CONNECTION(GNDD, "C7", 6)
- CONNECTION("D8", 8, "C7", 9)
- CONNECTION("C7", 15, "C8", 7)
- CONNECTION("C7", 11, "C8", 10)
- CONNECTION("C7", 12, "D7", 10)
- CONNECTION("C7", 13, "D7", 11)
- CONNECTION(DICECLOCK, "C7", 2)
-
- CONNECTION(P, "C8", 1)
- CONNECTION(P, "C8", 3)
- CONNECTION(P, "C8", 4)
- CONNECTION(P, "C8", 5)
- CONNECTION(P, "C8", 6)
- CONNECTION(P, "C8", 9)
- CONNECTION(DICECLOCK, "C8", 2)
- CONNECTION("C8", 15, "B7", 7)
- CONNECTION("C7", 15, "B7", 10)
-
- CONNECTION(P, "B7", 1)
- CONNECTION(Y0, "B7", 3)
- CONNECTION(Y1, "B7", 4)
- CONNECTION(Y2, "B7", 5)
- CONNECTION(GNDD, "B7", 6)
- CONNECTION("D8", 8, "B7", 9)
- CONNECTION(DICECLOCK, "B7", 2)
- CONNECTION("B7", 15, "B8", 7)
-
- CONNECTION(VB_HIT_SOUND, "D7", 9)
-
- CONNECTION(P, "B8", 1)
- CONNECTION(P, "B8", 3)
- CONNECTION(P, "B8", 4)
- CONNECTION(P, "B8", 5)
- CONNECTION(P, "B8", 6)
- CONNECTION(P, "B8", 9)
- CONNECTION("C8", 15, "B8", 10)
- CONNECTION(DICECLOCK, "B8", 2)
-
- CONNECTION("B8", 15, "D8", 10)
- CONNECTION("B7", 15, "D8", 9)
-
- CONNECTION("D7", 8, "D7", 5)
- CONNECTION(P_HIT_SOUND, "D7", 4)
- CONNECTION("B8", 15, "D7", 3)
-
- //Clock Generator
- CONNECTION(CKBH, "H1", 12)
- CONNECTION("F1", 14, "H1", 13)
- CONNECTION("F1", 15, "E1", 5)
-
- CONNECTION(P, "F1", 1)
- CONNECTION(P, "F1", 7)
- CONNECTION(P, "F1", 10)
- CONNECTION(GNDD, "F1", 3)
- CONNECTION(P, "F1", 4)
- CONNECTION(GNDD, "F1", 5)
- CONNECTION(GNDD, "F1", 6)
- CONNECTION("E1", 6, "F1", 9)
-
- //CONNECTION("Y1", 1, "F1", 2)
- NET_C(Y1.Q, F1.2)
-
- // RH and LH Sides
- CONNECTION(V128, "N4", 1)
- CONNECTION(V64, "N4", 2)
- CONNECTION(V16, "N4", 13)
- CONNECTION("N4", 12, "N4", 11)
- CONNECTION(V8, "N4", 10)
- CONNECTION(V4, "N4", 9)
- CONNECTION("N4", 8, "H2", 2)
- CONNECTION(V32, "H2", 1)
- CONNECTION("N4", 8, "J2", 13)
- CONNECTION("J2", 12, "J3", 11)
- CONNECTION(V32, "J3", 12)
-
- // Top Bound
- CONNECTION(H128, "H3", 4)
- CONNECTION(H64, "H3", 5)
- CONNECTION(H32, "H3", 3)
- CONNECTION("H3", 6, "L4", 9)
- CONNECTION(H16, "L4", 10)
- CONNECTION(H8, "L4", 11)
- CONNECTION("L4", 8, "K4", 5)
- CONNECTION(VSYNC_n, "K4", 4)
-
- //Cabinet type
-
- // Coin Circuit
- CONNECTION("COIN1", 1, "F9", 13)
-
- CONNECTION(CSW1, "F9", 11)
- //CONNECTION("F9", 10, "F9", 13) //TODO: causes lots of bouncing, commented out since this trace is not implemented in gotcha
-
- CONNECTION(V64, "H7", 12)
- CONNECTION(V64, "H7", 13)
-
- CONNECTION(CSW1, "F8", 10)
- CONNECTION("F9", 10, "F8", 12)
- CONNECTION(V64I, "F8", 11)
- CONNECTION(P, "F8", 13)
- CONNECTION(P, "F8", 1)
- CONNECTION(V64I, "F8", 3)
- CONNECTION("F8", 9, "F8", 2)
- CONNECTION(CSW1, "F8", 4)
-
- CONNECTION("F8", 6, "H8", 12)
- CONNECTION(P, "H8", 10)
- CONNECTION(V16_d, "H8", 11)
- CONNECTION(P, "H8", 13)
- CONNECTION("H8", 9, "J8", 15)
- CONNECTION("H8", 9, "J9", 9)
- CONNECTION(V16_d, "J8", 14)
- CONNECTION("J8", 13, "J9", 10)
+ //A-L 1 and 2
+ CONNECTION(SET_BRICKS_n, "B3", 2)
+ CONNECTION(H2, "B3", 3)
+ CONNECTION("B3", 1, "E7", 6)
+ CONNECTION(PLAYER_2, "E7", 5)
+ CONNECTION(P, "N6", 9)
+ CONNECTION(P, "M6", 9)
+ CONNECTION(P, "L6", 9)
+ CONNECTION(P, "H6", 9)
+ CONNECTION(P, "J6", 9)
+ CONNECTION(P, "K6", 9)
+
+ CONNECTION(P, "N6", 10)
+ CONNECTION(PLAYER_2, "N6", 7)
+ CONNECTION(COUNT_2, "N6", 2)
+ CONNECTION(START_GAME_n, "N6", 1)
+
+ CONNECTION("N6", 15, "M6", 10)
+ CONNECTION(PLAYER_2, "M6", 7)
+ CONNECTION(COUNT_2, "M6", 2)
+ CONNECTION(START_GAME_n, "M6", 1)
+
+ CONNECTION("M6", 15, "L6", 10)
+ CONNECTION(PLAYER_2, "L6", 7)
+ CONNECTION(COUNT_2, "L6", 2)
+ CONNECTION(START_GAME_n, "L6", 1)
+
+ CONNECTION(P, "H6", 10)
+ CONNECTION(RAM_PLAYER1, "H6", 7)
+ CONNECTION(COUNT_1, "H6", 2)
+ CONNECTION(START_GAME_n, "H6", 1)
+
+ CONNECTION("H6", 15, "J6", 10)
+ CONNECTION(RAM_PLAYER1, "J6", 7)
+ CONNECTION(COUNT_1, "J6", 2)
+ CONNECTION(START_GAME_n, "J6", 1)
+
+ CONNECTION("J6", 15, "K6", 10)
+ CONNECTION(RAM_PLAYER1, "K6", 7)
+ CONNECTION(COUNT_1, "K6", 2)
+ CONNECTION(START_GAME_n, "K6", 1)
+
+
+ //CX0 and CX1
+ CONNECTION(BRICK_HIT, "H2", 9)
+ CONNECTION(H16_n, "H2", 10)
+ CONNECTION(P, "D5", 10)
+ CONNECTION(P, "D5", 12)
+ CONNECTION("H2", 8, "D5", 11)
+ CONNECTION(SERVE_WAIT_n, "D5", 13)
+ CONNECTION(X0, "C6", 13)
+ CONNECTION("D5", 9, "C6", 12)
+ CONNECTION("D5", 9, "D6", 12)
+ CONNECTION(DN, "D6", 13)
+ CONNECTION("D6", 11, "C6", 4)
+ CONNECTION(X1, "C6", 5)
+
+ //COUNT1 and COUNT2
+ CONNECTION(P, "N8", 11)
+ CONNECTION(BRICK_HIT, "N8", 12)
+ CONNECTION(ATTRACT_n, "N8", 13)
+ CONNECTION("N8", 9, "N9", 11)
+ CONNECTION(P, "N9", 15)
+ CONNECTION(P, "N9", 5)
+
+ CONNECTION(COUNT, "N9", 4)
+ CONNECTION(START_GAME, "N9", 14)
+ CONNECTION(H8_n, "N9", 1)
+ CONNECTION(H16_n, "N9", 10)
+ CONNECTION(GNDD, "N9", 9)
+
+ CONNECTION("N9", 13, "N7", 13)
+ CONNECTION(SCLOCK, "N7", 12)
+
+ CONNECTION(PLAYER_2, "N7", 5)
+ CONNECTION(COUNT, "N7", 4)
+
+ CONNECTION(COUNT, "M9", 1)
+ CONNECTION(COUNT, "N7", 10)
+ CONNECTION(RAM_PLAYER1, "N7", 9)
+
+
+ //Ball Logic
+ CONNECTION(P, "C7", 1)
+ CONNECTION(P, "C7", 10)
+ CONNECTION(P, "C7", 7)
+ CONNECTION(CX0, "C7", 3)
+ CONNECTION(CX1, "C7", 4)
+ CONNECTION(X2, "C7", 5)
+ CONNECTION(GNDD, "C7", 6)
+ CONNECTION("D8", 8, "C7", 9)
+ CONNECTION("C7", 15, "C8", 7)
+ CONNECTION("C7", 11, "C8", 10)
+ CONNECTION("C7", 12, "D7", 10)
+ CONNECTION("C7", 13, "D7", 11)
+ CONNECTION(DICECLOCK, "C7", 2)
+
+ CONNECTION(P, "C8", 1)
+ CONNECTION(P, "C8", 3)
+ CONNECTION(P, "C8", 4)
+ CONNECTION(P, "C8", 5)
+ CONNECTION(P, "C8", 6)
+ CONNECTION(P, "C8", 9)
+ CONNECTION(DICECLOCK, "C8", 2)
+ CONNECTION("C8", 15, "B7", 7)
+ CONNECTION("C7", 15, "B7", 10)
+
+ CONNECTION(P, "B7", 1)
+ CONNECTION(Y0, "B7", 3)
+ CONNECTION(Y1, "B7", 4)
+ CONNECTION(Y2, "B7", 5)
+ CONNECTION(GNDD, "B7", 6)
+ CONNECTION("D8", 8, "B7", 9)
+ CONNECTION(DICECLOCK, "B7", 2)
+ CONNECTION("B7", 15, "B8", 7)
+
+ CONNECTION(VB_HIT_SOUND, "D7", 9)
+
+ CONNECTION(P, "B8", 1)
+ CONNECTION(P, "B8", 3)
+ CONNECTION(P, "B8", 4)
+ CONNECTION(P, "B8", 5)
+ CONNECTION(P, "B8", 6)
+ CONNECTION(P, "B8", 9)
+ CONNECTION("C8", 15, "B8", 10)
+ CONNECTION(DICECLOCK, "B8", 2)
+
+ CONNECTION("B8", 15, "D8", 10)
+ CONNECTION("B7", 15, "D8", 9)
+
+ CONNECTION("D7", 8, "D7", 5)
+ CONNECTION(P_HIT_SOUND, "D7", 4)
+ CONNECTION("B8", 15, "D7", 3)
+
+ //Clock Generator
+ CONNECTION(CKBH, "H1", 12)
+ CONNECTION("F1", 14, "H1", 13)
+ CONNECTION("F1", 15, "E1", 5)
+
+ CONNECTION(P, "F1", 1)
+ CONNECTION(P, "F1", 7)
+ CONNECTION(P, "F1", 10)
+ CONNECTION(GNDD, "F1", 3)
+ CONNECTION(P, "F1", 4)
+ CONNECTION(GNDD, "F1", 5)
+ CONNECTION(GNDD, "F1", 6)
+ CONNECTION("E1", 6, "F1", 9)
+
+ //CONNECTION("Y1", 1, "F1", 2)
+ NET_C(Y1.Q, F1.2)
+
+ // RH and LH Sides
+ CONNECTION(V128, "N4", 1)
+ CONNECTION(V64, "N4", 2)
+ CONNECTION(V16, "N4", 13)
+ CONNECTION("N4", 12, "N4", 11)
+ CONNECTION(V8, "N4", 10)
+ CONNECTION(V4, "N4", 9)
+ CONNECTION("N4", 8, "H2", 2)
+ CONNECTION(V32, "H2", 1)
+ CONNECTION("N4", 8, "J2", 13)
+ CONNECTION("J2", 12, "J3", 11)
+ CONNECTION(V32, "J3", 12)
+
+ // Top Bound
+ CONNECTION(H128, "H3", 4)
+ CONNECTION(H64, "H3", 5)
+ CONNECTION(H32, "H3", 3)
+ CONNECTION("H3", 6, "L4", 9)
+ CONNECTION(H16, "L4", 10)
+ CONNECTION(H8, "L4", 11)
+ CONNECTION("L4", 8, "K4", 5)
+ CONNECTION(VSYNC_n, "K4", 4)
+
+ //Cabinet type
+
+ // Coin Circuit
+ CONNECTION("COIN1", 1, "F9", 13)
+
+ CONNECTION(CSW1, "F9", 11)
+ //CONNECTION("F9", 10, "F9", 13) //TODO: causes lots of bouncing, commented out since this trace is not implemented in gotcha
+
+ CONNECTION(V64, "H7", 12)
+ CONNECTION(V64, "H7", 13)
+
+ CONNECTION(CSW1, "F8", 10)
+ CONNECTION("F9", 10, "F8", 12)
+ CONNECTION(V64I, "F8", 11)
+ CONNECTION(P, "F8", 13)
+ CONNECTION(P, "F8", 1)
+ CONNECTION(V64I, "F8", 3)
+ CONNECTION("F8", 9, "F8", 2)
+ CONNECTION(CSW1, "F8", 4)
+
+ CONNECTION("F8", 6, "H8", 12)
+ CONNECTION(P, "H8", 10)
+ CONNECTION(V16_d, "H8", 11)
+ CONNECTION(P, "H8", 13)
+ CONNECTION("H8", 9, "J8", 15)
+ CONNECTION("H8", 9, "J9", 9)
+ CONNECTION(V16_d, "J8", 14)
+ CONNECTION("J8", 13, "J9", 10)
#if 0
- CONNECTION(P, "S3", 1)
- CONNECTION(V4_d, "S3", 2)
- CONNECTION("S3", 3, "J9", 11)
+ CONNECTION(P, "S3", 1)
+ CONNECTION(V4_d, "S3", 2)
+ CONNECTION("S3", 3, "J9", 11)
#else
- CONNECTION(V4_d, "S3", 1)
- CONNECTION("S3", 2, "J9", 11)
- RES(R15, RES_K(1))
- NET_C(R15.1, V5)
- NET_C(R15.2, S3.2)
+ CONNECTION(V4_d, "S3", 1)
+ CONNECTION("S3", 2, "J9", 11)
+ RES(R15, RES_K(1))
+ NET_C(R15.1, V5)
+ NET_C(R15.2, S3.2)
#endif
- CONNECTION("J9", 8, "L9", 5)
- CONNECTION("J9", 6, "L9", 4)
-
- //COIN2 circuit
- CONNECTION("COIN2", 1, "F9", 1)
- //CONNECTION(GNDD, "F9", 1) //TODO: coin2 not implemented
-
- CONNECTION(CSW2, "F9", 3)
- CONNECTION(CSW2, "H9", 10)
- CONNECTION("F9", 4, "H9", 12)
- CONNECTION(V64_n, "H9", 11)
- CONNECTION(V64_n, "H9", 3)
- CONNECTION(P, "H9", 13)
- CONNECTION("H9", 9, "H9", 2)
- CONNECTION(CSW2, "H9", 4)
- CONNECTION(P, "H9", 1)
-
- CONNECTION(P, "H8", 4)
- CONNECTION("H9", 6, "H8", 2)
- CONNECTION(V16_d, "H8", 3)
- CONNECTION(P, "H8", 1)
- CONNECTION("H8", 5, "J8", 6)
- CONNECTION(V16_d, "J8", 5)
- CONNECTION(P, "J9", 3)
- CONNECTION("H8", 5, "J9", 5)
- CONNECTION("J8", 7, "J9", 4)
-
- CONNECTION(P2_CONDITIONAL_dash, "E9", 9)
- CONNECTION("E9", 8, "H1", 1)
- CONNECTION("E9", 8, "H1", 2)
-
- //Start2 Input
- //CONNECTION("START", 2, "E9", 11)
- CONNECTION("START2", 1, "E9", 11)
- CONNECTION("E9", 10, "E8", 12)
- CONNECTION(P, "E8", 10)
- CONNECTION(V64I, "E8", 11)
-
- CONNECTION(V128_d, "F7", 2)
- CONNECTION(V128_d, "F7", 3)
- CONNECTION(CREDIT2_n, "F7", 1)
- CONNECTION(ATTRACT_n, "E7", 12)
- CONNECTION("F7", 4, "E7", 11)
- CONNECTION("E7", 13, "E8", 13)
-
- //Start1 Input
- //CONNECTION("START", 1, "E9", 3)
- CONNECTION("START1", 1, "E9", 3)
- CONNECTION("E9", 4, "E8", 2)
- CONNECTION(P, "E8", 4)
- CONNECTION(V64_d, "E8", 3)
-
-
- CONNECTION(CREDIT_1_OR_2_n, "E7", 2)
- CONNECTION(ATTRACT_n, "E7", 3)
- CONNECTION("E7", 1, "E8", 1)
-
- CONNECTION(CR_START1_n, "D8", 4) // Schematic shows CR_START1 ?
- CONNECTION(CR_START2_n, "D8", 5)
-
-
- CONNECTION(START_GAME, "M9", 3)
- CONNECTION(START_GAME, "M9", 5)
-
- CONNECTION(V32, "D6", 4)
- CONNECTION(ATTRACT, "D6", 5)
- CONNECTION(P, "E6", 10)
- CONNECTION(START_GAME, "E6", 12)
- CONNECTION("D6", 6, "E6", 11)
- CONNECTION("D6", 3, "E6", 13)
-
- //TODO: hows this whole latch stuff work? what about Q_n going to COIN1_n and COIN2_n
- CONNECTION(CREDIT_1_OR_2_n, "D8", 13)
- CONNECTION(EGL, "D8", 12)
- CONNECTION("LATCH", 1, "D8", 11) //set
- CONNECTION("LATCH", 2, COIN1_n) //reset
- //CONNECTION("LATCH", 3, COIN2_n) //set //TODO: coin2 here
- CONNECTION( "LATCH", 3, "E9", 5) //output
-
-
- CONNECTION(LAT_Q, "D6", 1)
- CONNECTION(EGL_n, "D6", 2)
-
- //Serve
- CONNECTION(H64, "J3", 6)
- CONNECTION(H32, "J3", 5)
- CONNECTION("J3", 4, "L4", 13)
- CONNECTION(H128, "L4", 2)
- CONNECTION(H16, "L4", 1)
-
- CONNECTION(BALL_DISPLAY, "H2", 13)
- CONNECTION(H128, "H2", 12)
- CONNECTION("H2", 11, "C3", 9)
- CONNECTION(HSYNC, "C3", 10)
- CONNECTION("C3", 8, "B3", 5)
- CONNECTION(H8_d, "B3", 6)
- CONNECTION("B3", 4, "C3", 4)
- CONNECTION(H4, "C3", 5)
- CONNECTION("C3", 6, "A4", 9)
- CONNECTION(START_GAME1_n, "A4", 10)
-
- CONNECTION(SERVE_WAIT_n, "D2", 13)
-
- CONNECTION(SERVE_n, "D2", 12)
- CONNECTION(SERVE_n, "A3", 4)
- CONNECTION(P, "A3", 2)
- CONNECTION(ATTRACT, "A3", 3)
- CONNECTION(SERVE_WAIT, "A3", 1)
-
- CONNECTION(BALL, "E1", 13)
- CONNECTION("E1", 12, "B3", 8)
- CONNECTION("A3", 6, "B3", 9)
- CONNECTION("B3", 10, "B3", 11)
- CONNECTION(SERVE_WAIT_n, "B3", 12)
- CONNECTION("B3", 13, "A3", 12)
- CONNECTION("A4", 8, "A3", 10)
- CONNECTION("L4", 12, "A3", 11)
- CONNECTION(P, "A3", 13)
-
- //Set Bricks
- CONNECTION(P, "D3", 10)
- CONNECTION(P, "D3", 12)
- CONNECTION(START_GAME, "D3", 11)
- CONNECTION(SERVE_n, "D3", 13)
-
- //Playfield
- CONNECTION(LH_SIDE, "H3", 1)
- CONNECTION(TOP_BOUND, "H3", 13)
- CONNECTION(RH_SIDE, "H3", 2)
- CONNECTION("H3", 12, "H4", 2)
- CONNECTION("E1", 2, "C36", 1)
- CONNECTION("C36", 2, "H4", 1)
-
- CONNECTION(BALL_DISPLAY, "A5", 10)
- CONNECTION(PSYNC, "A5", 9)
- CONNECTION(BSYNC, "C3", 2)
- CONNECTION(TOP_BOUND, "C3", 1)
-
- CONNECTION(PC, "C4", 4)
- CONNECTION(PD, "C4", 5)
- CONNECTION(BP_HIT_n, "C5", 13)
- CONNECTION(PD, "A5", 1)
- CONNECTION("C5", 12, "A5", 2)
- CONNECTION(BSYNC, "A5", 5)
- CONNECTION(VSYNC, "A5", 4)
-
- CONNECTION("C5", 12, "A5", 13)
- CONNECTION("A5", 3, "A5", 12)
-
- CONNECTION(BRICK_HIT, "D5", 3)
- CONNECTION("E5", 3, "D5", 1)
- CONNECTION("D5", 6, "D5", 2)
- CONNECTION(BP_HIT_n, "D5", 4)
-
- CONNECTION(P, "A6", 10)
- CONNECTION("C4", 6, "A6", 12)
- CONNECTION(BP_HIT_n, "A6", 11)
- CONNECTION(P, "A6", 13)
-
- CONNECTION("A5", 3, "A6", 4)
- CONNECTION(V16_d, "A6", 2)
- CONNECTION(VB_HIT_n, "A6", 3)
- CONNECTION("A5", 11, "A6", 1)
-
- CONNECTION(P2_CONDITIONAL, "C6", 1)
- CONNECTION("D5", 5, "C6", 2)
- CONNECTION("D5", 6, "C4", 2)
- CONNECTION(P2_CONDITIONAL, "C4", 1)
-
- CONNECTION(V_SLOW, "B6", 12)
- CONNECTION("A6", 8, "B6", 13)
- CONNECTION(V_SLOW, "C6", 10)
- CONNECTION("A6", 5, "C6", 9)
-
- CONNECTION(Y0, "B6", 4)
- CONNECTION("C6", 8, "B6", 5)
-
- CONNECTION(X2, "D6", 10)
- CONNECTION("B6", 8, "D6", 9)
- CONNECTION("B5", 7, "B6", 9)
- CONNECTION("B5", 6, "B6", 10)
- CONNECTION(X0, "B6", 1)
- CONNECTION(X2, "B6", 2)
-
- CONNECTION("B5", 6, "C5", 11)
- CONNECTION("B5", 7, "C5", 9)
-
- CONNECTION(SU_n, "B5", 11)
- CONNECTION(P, "B5", 15)
- CONNECTION(P, "B5", 1)
- CONNECTION(P, "B5", 10)
- CONNECTION(P, "B5", 9)
- CONNECTION(P, "B5", 4)
- CONNECTION("D6", 8, "B5", 5)
- CONNECTION(SERVE_WAIT, "B5", 14)
-
- CONNECTION(BTB_HIT_n, "E5", 1)
- CONNECTION(SBD_n, "E5", 2)
-
- CONNECTION(BP_HIT_n, "E5", 4)
- CONNECTION(BTB_HIT_n, "E5", 5)
- CONNECTION("E5", 6, "F7", 11)
- CONNECTION("E5", 6, "F7", 12)
- CONNECTION(BRICK_HIT_n, "F7", 10)
- CONNECTION("F7", 9, "C2", 2)
- CONNECTION(BALL_DISPLAY, "C2", 1)
- CONNECTION("L3", 6, "E3", 11)
- CONNECTION("C2", 3, "E3", 12)
-
- CONNECTION(SET_BRICKS_n, "E6", 4)
- CONNECTION("E3", 13, "E6", 2)
- CONNECTION(CKBH, "E6", 3)
- CONNECTION("E3", 13, "D2", 2)
- CONNECTION(SET_BRICKS, "D2", 1)
- CONNECTION("D2", 3, "E6", 1)
-
- CONNECTION(BRICK_DISPLAY, "E1", 1)
- CONNECTION(H1, "K4", 9)
- CONNECTION(H2, "K4", 10)
- CONNECTION("K4", 8, "E3", 2)
- CONNECTION("L3", 6, "E3", 3)
-
- CONNECTION(ATTRACT_n, "C2", 13)
- CONNECTION(SET_BRICKS_n, "C2", 12)
- CONNECTION("C2", 11, "H3", 10)
- CONNECTION(FPD1, "H3", 9)
- CONNECTION(FPD2, "H3", 11)
- CONNECTION("H3", 8, "E1", 3)
- CONNECTION("E1", 4, "C32", 1)
- CONNECTION("C32", 2, "L3", 13)
- CONNECTION(H4, "L3", 2)
- CONNECTION(H8, "L3", 1)
- CONNECTION(H16, "L3", 15)
- CONNECTION(V32, "L3", 14)
- CONNECTION(V64, "L3", 7)
- CONNECTION(V128, "L3", 9)
- CONNECTION(V16, "L3", 10)
- CONNECTION(RAM_PLAYER1, "L3", 11)
- CONNECTION(H32, "L3", 3)
- CONNECTION(H128, "L3", 4)
- CONNECTION("H4", 8, "L3", 5)
-
- CONNECTION(V2, "M4", 5)
- CONNECTION(V4, "M4", 4)
- CONNECTION(V8, "M4", 3)
- CONNECTION("M4", 6, "H4", 9)
- CONNECTION(VSYNC_n, "K4", 2)
- CONNECTION(H64, "K4", 1)
- CONNECTION("K4", 3, "H4", 10)
- CONNECTION(FPD1_n, "F2", 13)
- CONNECTION(BRICK_HIT_n, "F2", 2)
- CONNECTION(FPD2_n, "F2", 1)
-
- CONNECTION("F2", 12, "L3", 12)
-
- //FPD circuits
- CONNECTION(K2, "M4", 2)
- CONNECTION(G2, "M4", 13)
- CONNECTION(D2, "M4", 1)
- CONNECTION(K1, "M4", 9)
- CONNECTION(G1, "M4", 10)
- CONNECTION(D1, "M4", 11)
- CONNECTION(BP_HIT_n, "E4", 2)
- CONNECTION("M4", 12, "E4", 1)
- CONNECTION(BP_HIT_n, "E4", 4)
- CONNECTION("M4", 8, "E4", 5)
-
- CONNECTION(P, "F4", 4)
- CONNECTION(P, "F4", 2)
- CONNECTION("E4", 3, "F4", 3)
- CONNECTION(START_GAME1_n, "F4", 1)
-
- CONNECTION(P, "F4", 10)
- CONNECTION(P, "F4", 12)
- CONNECTION("E4", 6, "F4", 11)
- CONNECTION(START_GAME1_n, "F4", 13)
-
- CONNECTION("F4", 6, "F3", 5)
- CONNECTION(GNDD, "F3", 4)
- CONNECTION("F4", 8, "F3", 11)
- CONNECTION(GNDD, "F3", 12)
-
- CONNECTION(P, "F3", 3)
- CONNECTION(P, "F3", 13)
-
-
- //CREDIT_COUNTER
- CONNECTION(BONUS_COIN, "E7", 8)
- CONNECTION(COIN, "E7", 9)
- CONNECTION(CR_START1_n, "H7", 2)
- CONNECTION(V8, "D8", 1)
- CONNECTION(CR_START2, "D8", 2)
- CONNECTION("D8", 3, "H7", 1)
-
- CONNECTION("L8", 12, "L8", 11) // not on schematic, on rollover load 16, keeps you from losing all credits
- CONNECTION(P, "L8", 15)
- CONNECTION(P, "L8", 1)
- CONNECTION(P, "L8", 10)
- CONNECTION(P, "L8", 9)
- CONNECTION("E7", 10, "L8", 5)
- CONNECTION("H7", 3, "L8", 4)
-
- CONNECTION(LAT_Q, "L9", 10)
- CONNECTION("L8", 13, "L9", 9)
- CONNECTION("L9", 8, "L8", 14)
- CONNECTION("L8", 7, "M8", 9)
- CONNECTION("L8", 6, "M8", 10)
- CONNECTION("L8", 2, "M8", 11)
- CONNECTION("L8", 3, "M9", 13)
-
- CONNECTION(CREDIT2_n, "F9", 5)
- CONNECTION(CREDIT2_n, "L9", 2)
- CONNECTION("M9", 12, "L9", 1)
- CONNECTION(CREDIT_1_OR_2, "F9", 9)
-
- //PLGM2_n
- CONNECTION(CR_START1_n, "F7", 6)
- CONNECTION(CR_START2_n, "F7", 5)
-
- //PLAY_CP
- CONNECTION(PLGM2_n, "F2", 5)
- CONNECTION(PLAYER_2, "F2", 4)
- CONNECTION(H1, "F2", 3)
-
- CONNECTION(P, "F5", 4)
- CONNECTION(P, "F5", 2)
- CONNECTION(SERVE_WAIT, "F5", 3)
- CONNECTION(H128, "F5", 1)
- CONNECTION("F2", 6, "D2", 9)
- CONNECTION("F5", 5, "D2", 10)
-
- //EGL
- CONNECTION(P, "B4", 10)
- CONNECTION(P, "B4", 7)
- CONNECTION(P, "B4", 9)
- CONNECTION(PLAY_CP, "B4", 2)
-
- CONNECTION(EGL, "C5", 1)
-
-
-
- CONNECTION(START_GAME1_n, "B4", 1)
- CONNECTION(BALL_A, "A4", 2)
- CONNECTION(BALL_B, "S4", 1) // Three balls
- CONNECTION(BALL_C, "S4", 2) // Five balls
- //CONNECTION("S4", 3, "A4", 1)
- NET_C(S4.Q, A4.1)
- CONNECTION("A4", 3, "C37", 1)
-
- CONNECTION(SERVE_WAIT_n, "A4", 5)
- CONNECTION(BALL, "A4", 4)
-
- // Ball Circuit
-
-
- // Video Summing
- CONNECTION(V16_d, "D2", 4)
- CONNECTION(V8_d, "D2", 5)
- CONNECTION("D2", 6, "E3", 8)
- CONNECTION(VSYNC_n, "E3", 9)
- CONNECTION(HSYNC_n, "E2", 12)
- CONNECTION("E3", 10, "E2", 13)
- CONNECTION(PSYNC, "B9", 1)
- CONNECTION(VSYNC_n, "B9", 2)
+ CONNECTION("J9", 8, "L9", 5)
+ CONNECTION("J9", 6, "L9", 4)
+
+ //COIN2 circuit
+ CONNECTION("COIN2", 1, "F9", 1)
+ //CONNECTION(GNDD, "F9", 1) //TODO: coin2 not implemented
+
+ CONNECTION(CSW2, "F9", 3)
+ CONNECTION(CSW2, "H9", 10)
+ CONNECTION("F9", 4, "H9", 12)
+ CONNECTION(V64_n, "H9", 11)
+ CONNECTION(V64_n, "H9", 3)
+ CONNECTION(P, "H9", 13)
+ CONNECTION("H9", 9, "H9", 2)
+ CONNECTION(CSW2, "H9", 4)
+ CONNECTION(P, "H9", 1)
+
+ CONNECTION(P, "H8", 4)
+ CONNECTION("H9", 6, "H8", 2)
+ CONNECTION(V16_d, "H8", 3)
+ CONNECTION(P, "H8", 1)
+ CONNECTION("H8", 5, "J8", 6)
+ CONNECTION(V16_d, "J8", 5)
+ CONNECTION(P, "J9", 3)
+ CONNECTION("H8", 5, "J9", 5)
+ CONNECTION("J8", 7, "J9", 4)
+
+ CONNECTION(P2_CONDITIONAL_dash, "E9", 9)
+ CONNECTION("E9", 8, "H1", 1)
+ CONNECTION("E9", 8, "H1", 2)
+
+ //Start2 Input
+ //CONNECTION("START", 2, "E9", 11)
+ CONNECTION("START2", 1, "E9", 11)
+ CONNECTION("E9", 10, "E8", 12)
+ CONNECTION(P, "E8", 10)
+ CONNECTION(V64I, "E8", 11)
+
+ CONNECTION(V128_d, "F7", 2)
+ CONNECTION(V128_d, "F7", 3)
+ CONNECTION(CREDIT2_n, "F7", 1)
+ CONNECTION(ATTRACT_n, "E7", 12)
+ CONNECTION("F7", 4, "E7", 11)
+ CONNECTION("E7", 13, "E8", 13)
+
+ //Start1 Input
+ //CONNECTION("START", 1, "E9", 3)
+ CONNECTION("START1", 1, "E9", 3)
+ CONNECTION("E9", 4, "E8", 2)
+ CONNECTION(P, "E8", 4)
+ CONNECTION(V64_d, "E8", 3)
+
+
+ CONNECTION(CREDIT_1_OR_2_n, "E7", 2)
+ CONNECTION(ATTRACT_n, "E7", 3)
+ CONNECTION("E7", 1, "E8", 1)
+
+ CONNECTION(CR_START1_n, "D8", 4) // Schematic shows CR_START1 ?
+ CONNECTION(CR_START2_n, "D8", 5)
+
+
+ CONNECTION(START_GAME, "M9", 3)
+ CONNECTION(START_GAME, "M9", 5)
+
+ CONNECTION(V32, "D6", 4)
+ CONNECTION(ATTRACT, "D6", 5)
+ CONNECTION(P, "E6", 10)
+ CONNECTION(START_GAME, "E6", 12)
+ CONNECTION("D6", 6, "E6", 11)
+ CONNECTION("D6", 3, "E6", 13)
+
+ //TODO: hows this whole latch stuff work? what about Q_n going to COIN1_n and COIN2_n
+ CONNECTION(CREDIT_1_OR_2_n, "D8", 13)
+ CONNECTION(EGL, "D8", 12)
+ CONNECTION("LATCH", 1, "D8", 11) //set
+ CONNECTION("LATCH", 2, COIN1_n) //reset
+ //CONNECTION("LATCH", 3, COIN2_n) //set //TODO: coin2 here
+ CONNECTION( "LATCH", 3, "E9", 5) //output
+
+
+ CONNECTION(LAT_Q, "D6", 1)
+ CONNECTION(EGL_n, "D6", 2)
+
+ //Serve
+ CONNECTION(H64, "J3", 6)
+ CONNECTION(H32, "J3", 5)
+ CONNECTION("J3", 4, "L4", 13)
+ CONNECTION(H128, "L4", 2)
+ CONNECTION(H16, "L4", 1)
+
+ CONNECTION(BALL_DISPLAY, "H2", 13)
+ CONNECTION(H128, "H2", 12)
+ CONNECTION("H2", 11, "C3", 9)
+ CONNECTION(HSYNC, "C3", 10)
+ CONNECTION("C3", 8, "B3", 5)
+ CONNECTION(H8_d, "B3", 6)
+ CONNECTION("B3", 4, "C3", 4)
+ CONNECTION(H4, "C3", 5)
+ CONNECTION("C3", 6, "A4", 9)
+ CONNECTION(START_GAME1_n, "A4", 10)
+
+ CONNECTION(SERVE_WAIT_n, "D2", 13)
+
+ CONNECTION(SERVE_n, "D2", 12)
+ CONNECTION(SERVE_n, "A3", 4)
+ CONNECTION(P, "A3", 2)
+ CONNECTION(ATTRACT, "A3", 3)
+ CONNECTION(SERVE_WAIT, "A3", 1)
+
+ CONNECTION(BALL, "E1", 13)
+ CONNECTION("E1", 12, "B3", 8)
+ CONNECTION("A3", 6, "B3", 9)
+ CONNECTION("B3", 10, "B3", 11)
+ CONNECTION(SERVE_WAIT_n, "B3", 12)
+ CONNECTION("B3", 13, "A3", 12)
+ CONNECTION("A4", 8, "A3", 10)
+ CONNECTION("L4", 12, "A3", 11)
+ CONNECTION(P, "A3", 13)
+
+ //Set Bricks
+ CONNECTION(P, "D3", 10)
+ CONNECTION(P, "D3", 12)
+ CONNECTION(START_GAME, "D3", 11)
+ CONNECTION(SERVE_n, "D3", 13)
+
+ //Playfield
+ CONNECTION(LH_SIDE, "H3", 1)
+ CONNECTION(TOP_BOUND, "H3", 13)
+ CONNECTION(RH_SIDE, "H3", 2)
+ CONNECTION("H3", 12, "H4", 2)
+ CONNECTION("E1", 2, "C36", 1)
+ CONNECTION("C36", 2, "H4", 1)
+
+ CONNECTION(BALL_DISPLAY, "A5", 10)
+ CONNECTION(PSYNC, "A5", 9)
+ CONNECTION(BSYNC, "C3", 2)
+ CONNECTION(TOP_BOUND, "C3", 1)
+
+ CONNECTION(PC, "C4", 4)
+ CONNECTION(PD, "C4", 5)
+ CONNECTION(BP_HIT_n, "C5", 13)
+ CONNECTION(PD, "A5", 1)
+ CONNECTION("C5", 12, "A5", 2)
+ CONNECTION(BSYNC, "A5", 5)
+ CONNECTION(VSYNC, "A5", 4)
+
+ CONNECTION("C5", 12, "A5", 13)
+ CONNECTION("A5", 3, "A5", 12)
+
+ CONNECTION(BRICK_HIT, "D5", 3)
+ CONNECTION("E5", 3, "D5", 1)
+ CONNECTION("D5", 6, "D5", 2)
+ CONNECTION(BP_HIT_n, "D5", 4)
+
+ CONNECTION(P, "A6", 10)
+ CONNECTION("C4", 6, "A6", 12)
+ CONNECTION(BP_HIT_n, "A6", 11)
+ CONNECTION(P, "A6", 13)
+
+ CONNECTION("A5", 3, "A6", 4)
+ CONNECTION(V16_d, "A6", 2)
+ CONNECTION(VB_HIT_n, "A6", 3)
+ CONNECTION("A5", 11, "A6", 1)
+
+ CONNECTION(P2_CONDITIONAL, "C6", 1)
+ CONNECTION("D5", 5, "C6", 2)
+ CONNECTION("D5", 6, "C4", 2)
+ CONNECTION(P2_CONDITIONAL, "C4", 1)
+
+ CONNECTION(V_SLOW, "B6", 12)
+ CONNECTION("A6", 8, "B6", 13)
+ CONNECTION(V_SLOW, "C6", 10)
+ CONNECTION("A6", 5, "C6", 9)
+
+ CONNECTION(Y0, "B6", 4)
+ CONNECTION("C6", 8, "B6", 5)
+
+ CONNECTION(X2, "D6", 10)
+ CONNECTION("B6", 8, "D6", 9)
+ CONNECTION("B5", 7, "B6", 9)
+ CONNECTION("B5", 6, "B6", 10)
+ CONNECTION(X0, "B6", 1)
+ CONNECTION(X2, "B6", 2)
+
+ CONNECTION("B5", 6, "C5", 11)
+ CONNECTION("B5", 7, "C5", 9)
+
+ CONNECTION(SU_n, "B5", 11)
+ CONNECTION(P, "B5", 15)
+ CONNECTION(P, "B5", 1)
+ CONNECTION(P, "B5", 10)
+ CONNECTION(P, "B5", 9)
+ CONNECTION(P, "B5", 4)
+ CONNECTION("D6", 8, "B5", 5)
+ CONNECTION(SERVE_WAIT, "B5", 14)
+
+ CONNECTION(BTB_HIT_n, "E5", 1)
+ CONNECTION(SBD_n, "E5", 2)
+
+ CONNECTION(BP_HIT_n, "E5", 4)
+ CONNECTION(BTB_HIT_n, "E5", 5)
+ CONNECTION("E5", 6, "F7", 11)
+ CONNECTION("E5", 6, "F7", 12)
+ CONNECTION(BRICK_HIT_n, "F7", 10)
+ CONNECTION("F7", 9, "C2", 2)
+ CONNECTION(BALL_DISPLAY, "C2", 1)
+ CONNECTION("L3", 6, "E3", 11)
+ CONNECTION("C2", 3, "E3", 12)
+
+ CONNECTION(SET_BRICKS_n, "E6", 4)
+ CONNECTION("E3", 13, "E6", 2)
+ CONNECTION(CKBH, "E6", 3)
+ CONNECTION("E3", 13, "D2", 2)
+ CONNECTION(SET_BRICKS, "D2", 1)
+ CONNECTION("D2", 3, "E6", 1)
+
+ CONNECTION(BRICK_DISPLAY, "E1", 1)
+ CONNECTION(H1, "K4", 9)
+ CONNECTION(H2, "K4", 10)
+ CONNECTION("K4", 8, "E3", 2)
+ CONNECTION("L3", 6, "E3", 3)
+
+ CONNECTION(ATTRACT_n, "C2", 13)
+ CONNECTION(SET_BRICKS_n, "C2", 12)
+ CONNECTION("C2", 11, "H3", 10)
+ CONNECTION(FPD1, "H3", 9)
+ CONNECTION(FPD2, "H3", 11)
+ CONNECTION("H3", 8, "E1", 3)
+ CONNECTION("E1", 4, "C32", 1)
+ CONNECTION("C32", 2, "L3", 13)
+ CONNECTION(H4, "L3", 2)
+ CONNECTION(H8, "L3", 1)
+ CONNECTION(H16, "L3", 15)
+ CONNECTION(V32, "L3", 14)
+ CONNECTION(V64, "L3", 7)
+ CONNECTION(V128, "L3", 9)
+ CONNECTION(V16, "L3", 10)
+ CONNECTION(RAM_PLAYER1, "L3", 11)
+ CONNECTION(H32, "L3", 3)
+ CONNECTION(H128, "L3", 4)
+ CONNECTION("H4", 8, "L3", 5)
+
+ CONNECTION(V2, "M4", 5)
+ CONNECTION(V4, "M4", 4)
+ CONNECTION(V8, "M4", 3)
+ CONNECTION("M4", 6, "H4", 9)
+ CONNECTION(VSYNC_n, "K4", 2)
+ CONNECTION(H64, "K4", 1)
+ CONNECTION("K4", 3, "H4", 10)
+ CONNECTION(FPD1_n, "F2", 13)
+ CONNECTION(BRICK_HIT_n, "F2", 2)
+ CONNECTION(FPD2_n, "F2", 1)
+
+ CONNECTION("F2", 12, "L3", 12)
+
+ //FPD circuits
+ CONNECTION(K2, "M4", 2)
+ CONNECTION(G2, "M4", 13)
+ CONNECTION(D2, "M4", 1)
+ CONNECTION(K1, "M4", 9)
+ CONNECTION(G1, "M4", 10)
+ CONNECTION(D1, "M4", 11)
+ CONNECTION(BP_HIT_n, "E4", 2)
+ CONNECTION("M4", 12, "E4", 1)
+ CONNECTION(BP_HIT_n, "E4", 4)
+ CONNECTION("M4", 8, "E4", 5)
+
+ CONNECTION(P, "F4", 4)
+ CONNECTION(P, "F4", 2)
+ CONNECTION("E4", 3, "F4", 3)
+ CONNECTION(START_GAME1_n, "F4", 1)
+
+ CONNECTION(P, "F4", 10)
+ CONNECTION(P, "F4", 12)
+ CONNECTION("E4", 6, "F4", 11)
+ CONNECTION(START_GAME1_n, "F4", 13)
+
+ CONNECTION("F4", 6, "F3", 5)
+ CONNECTION(GNDD, "F3", 4)
+ CONNECTION("F4", 8, "F3", 11)
+ CONNECTION(GNDD, "F3", 12)
+
+ CONNECTION(P, "F3", 3)
+ CONNECTION(P, "F3", 13)
+
+
+ //CREDIT_COUNTER
+ CONNECTION(BONUS_COIN, "E7", 8)
+ CONNECTION(COIN, "E7", 9)
+ CONNECTION(CR_START1_n, "H7", 2)
+ CONNECTION(V8, "D8", 1)
+ CONNECTION(CR_START2, "D8", 2)
+ CONNECTION("D8", 3, "H7", 1)
+
+ CONNECTION("L8", 12, "L8", 11) // not on schematic, on rollover load 16, keeps you from losing all credits
+ CONNECTION(P, "L8", 15)
+ CONNECTION(P, "L8", 1)
+ CONNECTION(P, "L8", 10)
+ CONNECTION(P, "L8", 9)
+ CONNECTION("E7", 10, "L8", 5)
+ CONNECTION("H7", 3, "L8", 4)
+
+ CONNECTION(LAT_Q, "L9", 10)
+ CONNECTION("L8", 13, "L9", 9)
+ CONNECTION("L9", 8, "L8", 14)
+ CONNECTION("L8", 7, "M8", 9)
+ CONNECTION("L8", 6, "M8", 10)
+ CONNECTION("L8", 2, "M8", 11)
+ CONNECTION("L8", 3, "M9", 13)
+
+ CONNECTION(CREDIT2_n, "F9", 5)
+ CONNECTION(CREDIT2_n, "L9", 2)
+ CONNECTION("M9", 12, "L9", 1)
+ CONNECTION(CREDIT_1_OR_2, "F9", 9)
+
+ //PLGM2_n
+ CONNECTION(CR_START1_n, "F7", 6)
+ CONNECTION(CR_START2_n, "F7", 5)
+
+ //PLAY_CP
+ CONNECTION(PLGM2_n, "F2", 5)
+ CONNECTION(PLAYER_2, "F2", 4)
+ CONNECTION(H1, "F2", 3)
+
+ CONNECTION(P, "F5", 4)
+ CONNECTION(P, "F5", 2)
+ CONNECTION(SERVE_WAIT, "F5", 3)
+ CONNECTION(H128, "F5", 1)
+ CONNECTION("F2", 6, "D2", 9)
+ CONNECTION("F5", 5, "D2", 10)
+
+ //EGL
+ CONNECTION(P, "B4", 10)
+ CONNECTION(P, "B4", 7)
+ CONNECTION(P, "B4", 9)
+ CONNECTION(PLAY_CP, "B4", 2)
+
+ CONNECTION(EGL, "C5", 1)
+
+
+
+ CONNECTION(START_GAME1_n, "B4", 1)
+ CONNECTION(BALL_A, "A4", 2)
+ CONNECTION(BALL_B, "S4", 1) // Three balls
+ CONNECTION(BALL_C, "S4", 2) // Five balls
+ //CONNECTION("S4", 3, "A4", 1)
+ NET_C(S4.Q, A4.1)
+ CONNECTION("A4", 3, "C37", 1)
+
+ CONNECTION(SERVE_WAIT_n, "A4", 5)
+ CONNECTION(BALL, "A4", 4)
+
+ // Ball Circuit
+
+
+ // Video Summing
+ CONNECTION(V16_d, "D2", 4)
+ CONNECTION(V8_d, "D2", 5)
+ CONNECTION("D2", 6, "E3", 8)
+ CONNECTION(VSYNC_n, "E3", 9)
+ CONNECTION(HSYNC_n, "E2", 12)
+ CONNECTION("E3", 10, "E2", 13)
+ CONNECTION(PSYNC, "B9", 1)
+ CONNECTION(VSYNC_n, "B9", 2)
#if 0
- //CONNECTION("VIDEO", 1, "E2", 11)
- CONNECTION("VIDEO", 2, PLAYFIELD)
- CONNECTION("VIDEO", 3, BSYNC)
- CONNECTION("VIDEO", 4, SCORE)
- CONNECTION("VIDEO", 5, "B9", 3)
- //CONNECTION("VIDEO", 6, P)
-
- CONNECTION("VIDEO", Video::HBLANK_PIN, HSYNC)
- CONNECTION("VIDEO", Video::VBLANK_PIN, "E3", 10)
+ //CONNECTION("VIDEO", 1, "E2", 11)
+ CONNECTION("VIDEO", 2, PLAYFIELD)
+ CONNECTION("VIDEO", 3, BSYNC)
+ CONNECTION("VIDEO", 4, SCORE)
+ CONNECTION("VIDEO", 5, "B9", 3)
+ //CONNECTION("VIDEO", 6, P)
+
+ CONNECTION("VIDEO", Video::HBLANK_PIN, HSYNC)
+ CONNECTION("VIDEO", Video::VBLANK_PIN, "E3", 10)
#else
RES(R41, RES_K(3.9))
//RES(R42, RES_K(3.9))
@@ -1617,58 +1617,58 @@ CIRCUIT_LAYOUT( breakout )
#endif
#if 0
- // Audio Summing
- CONNECTION("AUDIO", 1, "B9", 11)
- CONNECTION("AUDIO", 2, "B9", 8)
- CONNECTION("AUDIO", 3, FREE_GAME_TONE)
- CONNECTION("AUDIO", 4, "B9", 6)
+ // Audio Summing
+ CONNECTION("AUDIO", 1, "B9", 11)
+ CONNECTION("AUDIO", 2, "B9", 8)
+ CONNECTION("AUDIO", 3, FREE_GAME_TONE)
+ CONNECTION("AUDIO", 4, "B9", 6)
#else
- RES(R36, RES_K(47))
- RES(R37, RES_K(47))
- RES(R38, RES_K(47))
- RES(R39, RES_K(47))
- CONNECTION("R36", 2, "B9", 11)
- CONNECTION("R38", 2, "B9", 8)
- CONNECTION("R39", 2, FREE_GAME_TONE)
- CONNECTION("R37", 2, "B9", 6)
- NET_C(R36.1, R37.1, R38.1, R39.1)
- ALIAS(sound, R36.1)
+ RES(R36, RES_K(47))
+ RES(R37, RES_K(47))
+ RES(R38, RES_K(47))
+ RES(R39, RES_K(47))
+ CONNECTION("R36", 2, "B9", 11)
+ CONNECTION("R38", 2, "B9", 8)
+ CONNECTION("R39", 2, FREE_GAME_TONE)
+ CONNECTION("R37", 2, "B9", 6)
+ NET_C(R36.1, R37.1, R38.1, R39.1)
+ ALIAS(sound, R36.1)
#endif
- /* Not connected pins */
+ /* Not connected pins */
- NET_C(ttlhigh, B4.3, B4.4, B4.5, B4.6)
- NET_C(ttlhigh, N6.3, N6.4, N6.5, N6.6)
- NET_C(ttlhigh, M6.3, M6.4, M6.5, M6.6)
- NET_C(ttlhigh, L6.3, L6.4, L6.5, L6.6)
+ NET_C(ttlhigh, B4.3, B4.4, B4.5, B4.6)
+ NET_C(ttlhigh, N6.3, N6.4, N6.5, N6.6)
+ NET_C(ttlhigh, M6.3, M6.4, M6.5, M6.6)
+ NET_C(ttlhigh, L6.3, L6.4, L6.5, L6.6)
- NET_C(ttlhigh, H6.3, H6.4, H6.5, H6.6)
- NET_C(ttlhigh, K6.3, K6.4, K6.5, K6.6)
- NET_C(ttlhigh, J6.3, J6.4, J6.5, J6.6)
+ NET_C(ttlhigh, H6.3, H6.4, H6.5, H6.6)
+ NET_C(ttlhigh, K6.3, K6.4, K6.5, K6.6)
+ NET_C(ttlhigh, J6.3, J6.4, J6.5, J6.6)
- NET_C(ttlhigh, E1.9, E1.11)
- NET_C(ttlhigh, E2.1, E2.2)
+ NET_C(ttlhigh, E1.9, E1.11)
+ NET_C(ttlhigh, E2.1, E2.2)
#ifdef DEBUG
- // RAM access
- /*CONNECTION("LOG1", 3, H4) //A
- CONNECTION("LOG1", 4, H8) //B
- CONNECTION("LOG1", 5, H16) //C
- CONNECTION("LOG1", 6, V32) //D
- CONNECTION("LOG1", 7, V64) //E
- CONNECTION("LOG1", 8, V128) //F
- CONNECTION("LOG1", 9, V16) //G
- CONNECTION("LOG1", 10, RAM_PLAYER1) //H
- CONNECTION("LOG1", 11, H32) //I
- CONNECTION("LOG1", 12, H128) //J
- CONNECTION("LOG1", 13, "H4", 8) //K
- CONNECTION("LOG1", 14, "E1", 4) //L
- CONNECTION("LOG1", 15, "F2", 12) //M
- CONNECTION("LOG1", 16, "L3", 6)*/ //N
+ // RAM access
+ /*CONNECTION("LOG1", 3, H4) //A
+ CONNECTION("LOG1", 4, H8) //B
+ CONNECTION("LOG1", 5, H16) //C
+ CONNECTION("LOG1", 6, V32) //D
+ CONNECTION("LOG1", 7, V64) //E
+ CONNECTION("LOG1", 8, V128) //F
+ CONNECTION("LOG1", 9, V16) //G
+ CONNECTION("LOG1", 10, RAM_PLAYER1) //H
+ CONNECTION("LOG1", 11, H32) //I
+ CONNECTION("LOG1", 12, H128) //J
+ CONNECTION("LOG1", 13, "H4", 8) //K
+ CONNECTION("LOG1", 14, "E1", 4) //L
+ CONNECTION("LOG1", 15, "F2", 12) //M
+ CONNECTION("LOG1", 16, "L3", 6)*/ //N
#endif
- // POTS
+ // POTS
POT2(POTP1, RES_K(6)) // 5k
PARAM(POTP1, 0) // Log Dial ...
RES(R33, 47)
diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c
index a0cc446a552..fa327b65a21 100644
--- a/src/mame/drivers/peplus.c
+++ b/src/mame/drivers/peplus.c
@@ -7909,7 +7909,7 @@ SA$ - Sequential ACE$ pays the same as RF
ROM_LOAD( "mgo-cg2172.u78", 0x08000, 0x8000, CRC(fff049bc) SHA1(d4b340e0c932db767cade56a55b649c80750fee4) )
ROM_LOAD( "mbo-cg2172.u79", 0x10000, 0x8000, CRC(1665c6be) SHA1(4650b9d8336434ce531c31b63e7780b47ef4e985) )
ROM_LOAD( "mxo-cg2172.u80", 0x18000, 0x8000, CRC(cc9d64e4) SHA1(4bf78e49150ca6fb4a05f3320f712bbbabcacf56) )
-
+
ROM_REGION( 0x200, "proms", 0 )
ROM_LOAD( "capx2172.u43", 0x0000, 0x0200, CRC(c9b4f1da) SHA1(c911da564cfb33218441de0f91e67a02191d76c2) ) /* Philips N82S147N */
ROM_END
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index 2b4f7637638..15b5af8e4a2 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -4263,10 +4263,10 @@ GAME( 2001, ddp2101c, ddp2, pgm_arm_type2, pgm, pgm_arm_type2_state,
GAME( 2001, ddp2100c, ddp2, pgm_arm_type2, pgm, pgm_arm_type2_state, ddp2, ROT270, "IGS", "DoDonPachi II - Bee Storm (China, ver. 100)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE )
-// japan region only? service mode calls it Dragon World 2001 so I'm leaving that title in the description
+// japan region only? service mode calls it Dragon World 2001 so I'm leaving that title in the description
GAME( 2001, dw2001, pgm, pgm_arm_type2, dw2001, pgm_arm_type2_state, dw2001, ROT0, "IGS", "Chuugokuryuu 2001 [Dragon World 2001] (V100?, Japan)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) // 02/21/01 16:05:16
-// japan region only? service mode calls it Dragon World Pretty Chance so I'm leaving that title in the description
+// japan region only? service mode calls it Dragon World Pretty Chance so I'm leaving that title in the description
GAME( 2001, dwpc, pgm, pgm_arm_type2, dw2001, pgm_arm_type2_state, dwpc, ROT0, "IGS", "Chuugokuryuu Pretty Chance [Dragon World Pretty Chance] (V101, Japan)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) // 09/26/01 10:23:26
// we bypass the internal ARM rom on these, ideally it should still be dumped tho! the region screens show a blank string where the internal ROM revision would otherwise be displayed
diff --git a/src/mame/drivers/pong.c b/src/mame/drivers/pong.c
index 38fa5267f5c..ed4da1cbd07 100644
--- a/src/mame/drivers/pong.c
+++ b/src/mame/drivers/pong.c
@@ -391,7 +391,7 @@ ROM_START( pong ) /* dummy to satisfy game entry*/
ROM_END
ROM_START( breakout )
- ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
+ ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
ROM_END
ROM_START( pongf ) /* dummy to satisfy game entry*/
diff --git a/src/mame/drivers/rotaryf.c b/src/mame/drivers/rotaryf.c
index f99c4b62bd8..5976f98804d 100644
--- a/src/mame/drivers/rotaryf.c
+++ b/src/mame/drivers/rotaryf.c
@@ -40,11 +40,11 @@ public:
bool m_flipscreen;
UINT8 m_last;
-
+
virtual void machine_start();
UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-
+
TIMER_DEVICE_CALLBACK_MEMBER(rotaryf_interrupt);
};
diff --git a/src/mame/drivers/roul.c b/src/mame/drivers/roul.c
index 21ee92c6018..bcd6a8df2e7 100644
--- a/src/mame/drivers/roul.c
+++ b/src/mame/drivers/roul.c
@@ -79,19 +79,19 @@ public:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_soundcpu;
-
+
UINT8 m_reg[0x10];
UINT8 *m_videobuf;
UINT8 m_lamp_old;
-
+
DECLARE_READ8_MEMBER(blitter_status_r);
DECLARE_WRITE8_MEMBER(blitter_cmd_w);
DECLARE_WRITE8_MEMBER(sound_latch_w);
DECLARE_WRITE8_MEMBER(ball_w);
-
+
virtual void video_start();
DECLARE_PALETTE_INIT(roul);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
@@ -223,7 +223,7 @@ ADDRESS_MAP_END
void roul_state::video_start()
{
m_videobuf = auto_alloc_array_clear(machine(), UINT8, VIDEOBUF_SIZE);
-
+
save_item(NAME(m_reg));
save_pointer(NAME(m_videobuf), VIDEOBUF_SIZE);
save_item(NAME(m_lamp_old));
diff --git a/src/mame/drivers/segasp.c b/src/mame/drivers/segasp.c
index d3bbe906ac3..ff275f23ed4 100644
--- a/src/mame/drivers/segasp.c
+++ b/src/mame/drivers/segasp.c
@@ -33,34 +33,34 @@ G1 bus PIO or DMA, or directly via banked area 0x0100xxxx in SH4 address space.
todo: make this actually readable, we don't support unicode source files
- Title PCB ID REV CF ID Dumped Region PIC MAIN BD Serial
-Battle Police ???-????? no ???-????-???? AAFE-xxxxxxxxxxx
-Beetle DASH!! ???-????? no ???-????-???? AAFE-xxxxxxxxxxx
-Bingo Galaxy ???-????? no ???-????-???? AAFE-01E10924916, AAFE-01D67304905, Medal
-Bingo Parade ???-????? no ???-????-???? AAFE-xxxxxxxxxxx, Medal
-Brick People / Block People 834-14881 ROM ALL 253-5508-0558 AAFE-01F67905202, AAFE-01F68275202
-Dinosaur King 834-14493-01 D ROM US 253-5508-0408 AAFE-01D1132xxxx, AAFE-01D15924816
-Dinosaur King - Operation: Dinosaur Rescue 837-14434-91 MDA-C0021? ROM US/EXP 253-5508-0408 AAFE-01A30164715, AAFE-01B92094811
+ Title PCB ID REV CF ID Dumped Region PIC MAIN BD Serial
+Battle Police ???-????? no ???-????-???? AAFE-xxxxxxxxxxx
+Beetle DASH!! ???-????? no ???-????-???? AAFE-xxxxxxxxxxx
+Bingo Galaxy ???-????? no ???-????-???? AAFE-01E10924916, AAFE-01D67304905, Medal
+Bingo Parade ???-????? no ???-????-???? AAFE-xxxxxxxxxxx, Medal
+Brick People / Block People 834-14881 ROM ALL 253-5508-0558 AAFE-01F67905202, AAFE-01F68275202
+Dinosaur King 834-14493-01 D ROM US 253-5508-0408 AAFE-01D1132xxxx, AAFE-01D15924816
+Dinosaur King - Operation: Dinosaur Rescue 837-14434-91 MDA-C0021? ROM US/EXP 253-5508-0408 AAFE-01A30164715, AAFE-01B92094811
- 834-14662-01
-Dinosaur King 2 ???-????? no 253-5508-0408 AAFE-xxxxxxxxxxx
-Dinosaur King 2 Ver 2.5 834-14792-02 F MDA-C0047 CF EXP 253-5508-0408 AAFE-01D73384904
-Disney: Magical Dream Dance on Stage ???-????? no ???-????-???? AAFE-xxxxxxxxxxx
-Future Police Patrol Chase ???-????? no ???-????-???? AAFE-xxxxxxxxxxx
-Issyouni Turbo Drive ???-????? no ???-????-???? AAFE-01E91305101
-Issyouni Wan Wan ???-????? no ???-????-???? AAFE-xxxxxxxxxxx
-King of Beetle: Battle Terminal ???-????? no ???-????-???? AAFE-xxxxxxxxxxx
-Love & Berry Ver 1.003 834-14661-02 ROM EXP 253-5508-0446 AAFE-01D84934906
-Love & Berry Ver 2.000 834-14661-02 ROM EXP 253-5508-0446 AAFE-01D8493xxxx
-Love & Berry 3 EXP Ver 1.002 834-14661-01 MDA-C0042 CF US/EXP 253-5508-0446 AAFE-01D64704904
-Marine & Marine ???-????? no ???-????-???? AAFE-xxxxxxxxxxx
-Mirage World ???-????? no ???-????-???? AAFE-xxxxxxxxxxx, Medal
-Monopoly: The Medal ???-????? no ???-????-???? AAFE-xxxxxxxxxxx, Medal
-Monopoly: The Medal 2nd Edition ???-????? no ???-????-???? AAFE-xxxxxxxxxxx, Medal
-Mushiking 2K6 2ND ???-????? no ???-????-???? AAFE-xxxxxxxxxxx
-Mushiking 2K7 1ST ???-????? no ???-????-???? AAFE-xxxxxxxxxxx
-Tetris Giant / Tetris Dekaris 834-14970 G MDA-C0076 CF ALL 253-5508-0604 AAFE-01G03025212
-Tetris Giant / Tetris Dekaris Ver.2.000 834-14970 G ROM ALL 253-5508-0604 AAFE-xxxxxxxxxxx
-Thomas: The Tank Engine ???-????? no ???-????-???? AAFE-xxxxxxxxxxx
+Dinosaur King 2 ???-????? no 253-5508-0408 AAFE-xxxxxxxxxxx
+Dinosaur King 2 Ver 2.5 834-14792-02 F MDA-C0047 CF EXP 253-5508-0408 AAFE-01D73384904
+Disney: Magical Dream Dance on Stage ???-????? no ???-????-???? AAFE-xxxxxxxxxxx
+Future Police Patrol Chase ???-????? no ???-????-???? AAFE-xxxxxxxxxxx
+Issyouni Turbo Drive ???-????? no ???-????-???? AAFE-01E91305101
+Issyouni Wan Wan ???-????? no ???-????-???? AAFE-xxxxxxxxxxx
+King of Beetle: Battle Terminal ???-????? no ???-????-???? AAFE-xxxxxxxxxxx
+Love & Berry Ver 1.003 834-14661-02 ROM EXP 253-5508-0446 AAFE-01D84934906
+Love & Berry Ver 2.000 834-14661-02 ROM EXP 253-5508-0446 AAFE-01D8493xxxx
+Love & Berry 3 EXP Ver 1.002 834-14661-01 MDA-C0042 CF US/EXP 253-5508-0446 AAFE-01D64704904
+Marine & Marine ???-????? no ???-????-???? AAFE-xxxxxxxxxxx
+Mirage World ???-????? no ???-????-???? AAFE-xxxxxxxxxxx, Medal
+Monopoly: The Medal ???-????? no ???-????-???? AAFE-xxxxxxxxxxx, Medal
+Monopoly: The Medal 2nd Edition ???-????? no ???-????-???? AAFE-xxxxxxxxxxx, Medal
+Mushiking 2K6 2ND ???-????? no ???-????-???? AAFE-xxxxxxxxxxx
+Mushiking 2K7 1ST ???-????? no ???-????-???? AAFE-xxxxxxxxxxx
+Tetris Giant / Tetris Dekaris 834-14970 G MDA-C0076 CF ALL 253-5508-0604 AAFE-01G03025212
+Tetris Giant / Tetris Dekaris Ver.2.000 834-14970 G ROM ALL 253-5508-0604 AAFE-xxxxxxxxxxx
+Thomas: The Tank Engine ???-????? no ???-????-???? AAFE-xxxxxxxxxxx
REV PCB IC6s Flash AU1500
D 171-8278D 315-6370 8x 128Mbit AMD
@@ -80,7 +80,7 @@ READ64_MEMBER(segasp_state::sn_93c46a_r)
/* bit 3 is EEPROM data */
res = m_eeprom->do_read() << 4;
- res |= (ioport("DSW")->read() << 4) & 0xC0; // note: only old REV D PCB have DSW 3-4 here, newer does not, always 0 readed
+ res |= (ioport("DSW")->read() << 4) & 0xC0; // note: only old REV D PCB have DSW 3-4 here, newer does not, always 0 readed
return res;
}
@@ -128,16 +128,16 @@ READ64_MEMBER(segasp_state::sp_io_r)
switch (reg)
{
- case 0x00/4: // CN9 17-24 IN_PORT 0 (IN)
+ case 0x00/4: // CN9 17-24 IN_PORT 0 (IN)
retval = ioport("IN_PORT0")->read();
break;
- case 0x04/4: // CN9 41-48 IN_PORT 1 (IN)
+ case 0x04/4: // CN9 41-48 IN_PORT 1 (IN)
retval = ioport("IN_PORT1")->read();
break;
- case 0x08/4: // CN9 25-32 (I/O)
+ case 0x08/4: // CN9 25-32 (I/O)
retval = ioport("IN_PORT3")->read();
break;
- case 0x18/4: // IN_PORT 2
+ case 0x18/4: // IN_PORT 2
// bit 0:3 - DIPSW 1-4
// bit 4:5 - TEST/SERVICE SW, CN9 5-6 (old rev PCB only)
retval = ioport("DSW")->read();
@@ -165,15 +165,15 @@ static ADDRESS_MAP_START( segasp_map, AS_PROGRAM, 64, segasp_state )
AM_RANGE(0x00600000, 0x006007ff) AM_MIRROR(0x02000000) AM_READWRITE(dc_modem_r, dc_modem_w )
AM_RANGE(0x00700000, 0x00707fff) AM_MIRROR(0x02000000) AM_READWRITE32(dc_aica_reg_r, dc_aica_reg_w, U64(0xffffffffffffffff))
AM_RANGE(0x00710000, 0x0071000f) AM_MIRROR(0x02000000) AM_DEVREADWRITE16("aicartc", aicartc_device, read, write, U64(0x0000ffff0000ffff) )
-
+
AM_RANGE(0x00800000, 0x00ffffff) AM_MIRROR(0x02000000) AM_READWRITE(naomi_arm_r, naomi_arm_w ) // sound RAM (8 MB)
-
+
/* External Device */
AM_RANGE(0x01000000, 0x0100ffff) AM_RAM // - banked access to ROM board address space
AM_RANGE(0x01010100, 0x01010127) AM_READ(sp_io_r)
AM_RANGE(0x01010128, 0x0101012f) AM_READWRITE(sp_eeprom_r, sp_eeprom_w )
AM_RANGE(0x01010150, 0x01010157) AM_READ(sp_rombdflg_r)
-// AM_RANGE(0x01010000, 0x010101ff) // I/O regs
+// AM_RANGE(0x01010000, 0x010101ff) // I/O regs
/* Area 1 */
AM_RANGE(0x04000000, 0x04ffffff) AM_MIRROR(0x02000000) AM_RAM AM_SHARE("dc_texture_ram") // texture memory 64 bit access
@@ -220,7 +220,7 @@ INPUT_PORTS_START( segasp )
PORT_DIPNAME( 0x04, 0x04, "Monitor" ) PORT_DIPLOCATION("SW:3")
PORT_DIPSETTING( 0x04, "31 kHz" )
PORT_DIPSETTING( 0x00, "15 kHz" )
- PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW:4") // Must be ON, with off BIOS bootstrap will deadloop
+ PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW:4") // Must be ON, with off BIOS bootstrap will deadloop
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -266,7 +266,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( segasp, naomi_aw_base, segasp_state )
MCFG_EEPROM_SERIAL_93C46_ADD("sp_eeprom")
// todo, not exactly NaomiM4 (see notes at top of driver) use custom board type here instead
- MCFG_X76F100_ADD("naomibd_eeprom") // actually not present
+ MCFG_X76F100_ADD("naomibd_eeprom") // actually not present
MCFG_NAOMI_M4_BOARD_ADD("rom_board", ":pic_readout", "naomibd_eeprom", ":boardid", WRITE8(dc_state, g1_irq))
MACHINE_CONFIG_END
@@ -280,8 +280,7 @@ MACHINE_CONFIG_END
ROM_SYSTEM_BIOS( 1, "bios1", "BOOT VER 2.00" ) \
ROM_LOAD16_WORD_SWAP_BIOS( 1, "epr-24328.ic50", 0x000000, 0x200000, CRC(25f2ef00) SHA1(e58dec9f171e52b3ded213b3fcd9a0de8a438076) ) \
ROM_SYSTEM_BIOS( 2, "bios2", "BOOT VER 2.01" ) \
- ROM_LOAD16_WORD_SWAP_BIOS( 2, "epr-24328a.ic50", 0x000000, 0x200000, CRC(03ec3805) SHA1(a8fbaea826ca257be0b2b86952f247254929e046) ) \
-
+ ROM_LOAD16_WORD_SWAP_BIOS( 2, "epr-24328a.ic50", 0x000000, 0x200000, CRC(03ec3805) SHA1(a8fbaea826ca257be0b2b86952f247254929e046) )
// Network/Media Board firmware VER 1.19(VxWorks), 1st half contain original 1.10 version
#define SEGASP_NETFIRM \
ROM_REGION( 0x200000, "netcpu", 0) \
@@ -290,7 +289,7 @@ MACHINE_CONFIG_END
// keep M4 board code happy for now
#define SEGASP_MISC \
ROM_REGION( 0x04, "boardid", ROMREGION_ERASEVAL(0x04)) \
- ROM_REGION( 0x84, "naomibd_eeprom", ROMREGION_ERASEFF ) \
+ ROM_REGION( 0x84, "naomibd_eeprom", ROMREGION_ERASEFF ) \
ROM_REGION16_BE( 0x80, "main_eeprom", 0 ) \
ROM_LOAD16_WORD( "mb_serial.ic57", 0x0000, 0x0080, CRC(e1e3c009) SHA1(66bc636c527389c3338f631d78c788b4bd4e93be) )
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index 181b6848e27..a7476405ea6 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -10480,7 +10480,7 @@ ROM_START( daiohc ) /* Found on a 93111A PCB - same PCB as War of Areo & J. J. S
ROM_REGION( 0x200000, "gfx1", 0 ) /* Sprites */
ROM_LOAD( "9.u9", 0x000000, 0x080000, CRC(4444cbd4) SHA1(e039cd7e7093d399bc39aa4d355a03250e087fb3) ) /* connects to U63 & U64 through a riser card */
ROM_LOAD( "10.u10", 0x080000, 0x080000, CRC(1d88d20b) SHA1(3cf95041d0876a4ef378651783e53cee1994ed3d) )
- ROM_LOAD( "11.u11", 0x100000, 0x080000, CRC(3e41de61) SHA1(7d3ddf3780bbe99b13937d75cbdbfb58449301a6) )
+ ROM_LOAD( "11.u11", 0x100000, 0x080000, CRC(3e41de61) SHA1(7d3ddf3780bbe99b13937d75cbdbfb58449301a6) )
ROM_LOAD( "12.u12", 0x180000, 0x080000, CRC(f35e3341) SHA1(9260460e1823d157201de02557c7136ef898cfb3) )
ROM_REGION( 0x200000, "gfx2", 0 ) /* Layer 1 */
diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c
index 956659a1d32..85ac3eb5d79 100644
--- a/src/mame/drivers/sf.c
+++ b/src/mame/drivers/sf.c
@@ -140,7 +140,7 @@ WRITE8_MEMBER(sf_state::soundcmd_w)
WRITE8_MEMBER(sf_state::sound2_bank_w)
{
- membank("bank1")->set_entry(data);
+ membank("bank1")->set_entry(data);
}
WRITE8_MEMBER(sf_state::msm1_5205_w)
@@ -395,7 +395,7 @@ static INPUT_PORTS_START( sfan )
PORT_MODIFY("DSW1")
PORT_DIPUNUSED_DIPLOC( 0x0100, 0x0100, "DSW2.13E:1" ) // Flip Screen not available
-
+
PORT_MODIFY("DSW2")
PORT_DIPNAME( 0x0400, 0x0400, "Number of Countries Selected" ) PORT_DIPLOCATION("DSW4.11E:3")
PORT_DIPSETTING( 0x0400, "4" )
@@ -523,8 +523,8 @@ void sf_state::machine_start()
save_item(NAME(m_active));
save_item(NAME(m_bgscroll));
save_item(NAME(m_fgscroll));
-
- membank("bank1")->configure_entries(0, 256, memregion("audio2")->base() + 0x8000, 0x8000);
+
+ membank("bank1")->configure_entries(0, 256, memregion("audio2")->base() + 0x8000, 0x8000);
}
void sf_state::machine_reset()
diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c
index 08ecb26007d..3dd81edd456 100644
--- a/src/mame/drivers/shangha3.c
+++ b/src/mame/drivers/shangha3.c
@@ -715,7 +715,7 @@ ROM_END
DRIVER_INIT_MEMBER(shangha3_state,shangha3)
{
m_do_shadows = 1;
-
+
save_item(NAME(m_prot_count));
}
diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c
index 1ee06de0fb4..c31c61607b4 100644
--- a/src/mame/drivers/shanghai.c
+++ b/src/mame/drivers/shanghai.c
@@ -43,7 +43,7 @@ public:
DECLARE_PALETTE_INIT(shanghai);
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
INTERRUPT_GEN_MEMBER(interrupt);
};
diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c
index a554facbc14..6b106733c0e 100644
--- a/src/mame/drivers/shangkid.c
+++ b/src/mame/drivers/shangkid.c
@@ -122,7 +122,7 @@ READ8_MEMBER(shangkid_state::soundlatch_r)
DRIVER_INIT_MEMBER(shangkid_state,chinhero)
{
m_gfx_type = 0;
-
+
save_item(NAME(m_bbx_sound_enable));
save_item(NAME(m_sound_latch));
}
@@ -134,7 +134,7 @@ DRIVER_INIT_MEMBER(shangkid_state,shangkid)
/* set up banking */
membank("bank1")->configure_entries(0, 2, memregion("maincpu")->base() + 0x8000, 0x8000);
membank("bank2")->configure_entries(0, 2, memregion("audiocpu")->base() + 0x0000, 0x10000);
-
+
save_item(NAME(m_bbx_sound_enable));
save_item(NAME(m_sound_latch));
}
diff --git a/src/mame/drivers/sigmab98.c b/src/mame/drivers/sigmab98.c
index 92951212b8b..e6468423f32 100644
--- a/src/mame/drivers/sigmab98.c
+++ b/src/mame/drivers/sigmab98.c
@@ -21,14 +21,14 @@ http://www.nicozon.net/watch/sm14334996
Dumped games:
-1997 Minna Atsumare! Dodge Hero b9802 https://youtu.be/2eXDQnKCT6A
-1997 Itazura Daisuki! Sushimaru Kun b9803 https://youtu.be/nhvbZ71KWr8
-1997 GeGeGe no Kitarou Youkai Slot b9804
-1997 Burning Sanrinsya b9805
-1997 PEPSI Man b9806 https://youtu.be/p3cbZ67m4lo
-1998 Transformers Beast Wars II b9808
-1997 Uchuu Tokkyuu Medalian b9809 https://youtu.be/u813kBOZbwI
-2000 Minna Ganbare! Dash Hero b9811
+1997 Minna Atsumare! Dodge Hero b9802 https://youtu.be/2eXDQnKCT6A
+1997 Itazura Daisuki! Sushimaru Kun b9803 https://youtu.be/nhvbZ71KWr8
+1997 GeGeGe no Kitarou Youkai Slot b9804
+1997 Burning Sanrinsya b9805
+1997 PEPSI Man b9806 https://youtu.be/p3cbZ67m4lo
+1998 Transformers Beast Wars II b9808
+1997 Uchuu Tokkyuu Medalian b9809 https://youtu.be/u813kBOZbwI
+2000 Minna Ganbare! Dash Hero b9811
--------------------------------------------------------------------------------------
@@ -48,11 +48,11 @@ is "Treasure Fall" (despite the cart label is "Treasure Hall").
Dumped games:
-2000 Animal Catch https://youtu.be/U4L5EwWbxqw
-2000 Itazura Monkey https://youtu.be/GHxiqUQRpV8
-2000 Pye-nage Taikai https://youtu.be/oL2OIbrv-KI
-2000 Taihou de Doboon https://youtu.be/loPP3jt0Ob0
-2001 Hae Hae Ka Ka Ka https://youtu.be/37IxYCg0tic
+2000 Animal Catch https://youtu.be/U4L5EwWbxqw
+2000 Itazura Monkey https://youtu.be/GHxiqUQRpV8
+2000 Pye-nage Taikai https://youtu.be/oL2OIbrv-KI
+2000 Taihou de Doboon https://youtu.be/loPP3jt0Ob0
+2001 Hae Hae Ka Ka Ka https://youtu.be/37IxYCg0tic
Games with the same cabinet which might be on the same hardware:
@@ -127,10 +127,10 @@ public:
{ }
required_device<cpu_device> m_maincpu;
- optional_device<buffered_spriteram8_device> m_buffered_spriteram; // not on sammymdl?
- optional_shared_ptr<UINT8> m_spriteram; // optional as some games allocate it themselves (due to banking)
- optional_shared_ptr<UINT8> m_vregs; // optional as some games allocate it themselves (due to banking)
- optional_shared_ptr<UINT8> m_vtable; // optional as some games allocate it themselves (due to banking)
+ optional_device<buffered_spriteram8_device> m_buffered_spriteram; // not on sammymdl?
+ optional_shared_ptr<UINT8> m_spriteram; // optional as some games allocate it themselves (due to banking)
+ optional_shared_ptr<UINT8> m_vregs; // optional as some games allocate it themselves (due to banking)
+ optional_shared_ptr<UINT8> m_vtable; // optional as some games allocate it themselves (due to banking)
required_shared_ptr<UINT8> m_nvram;
required_device<eeprom_serial_93cxx_device> m_eeprom;
required_device<gfxdecode_device> m_gfxdecode;
@@ -316,9 +316,9 @@ void sigmab98_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec
sy = (s[ 0x06 ] & 0x03) * 256 + s[ 0x07 ];
- zoom = (s[ 0x08 ] & 0xff) * 256 + s[ 0x09 ]; // 0x100 means no zoom
+ zoom = (s[ 0x08 ] & 0xff) * 256 + s[ 0x09 ]; // 0x100 means no zoom
-// rot = (s[ 0x0a ] & 0xff) * 256 + s[ 0x0b ]; // unimplemented!
+// rot = (s[ 0x0a ] & 0xff) * 256 + s[ 0x0b ]; // unimplemented!
dx = (s[ 0x0c ] & 0xff) * 256 + s[ 0x0d ];
dy = (s[ 0x0e ] & 0xff) * 256 + s[ 0x0f ];
@@ -430,7 +430,7 @@ WRITE8_MEMBER(sigmab98_state::vregs_w)
switch (offset)
{
- case 0x1b: // background color
+ case 0x1b: // background color
case 0x1d:
{
int x = (m_vregs[0x1d] << 8) + m_vregs[0x1b];
@@ -440,8 +440,8 @@ WRITE8_MEMBER(sigmab98_state::vregs_w)
m_palette->set_pen_color(0x100, pal5bit(r), pal5bit(g), pal5bit(b));
break;
}
-// default:
-// logerror("%s: unknown video reg written: %02x = %02x\n", machine().describe_context(), offset, data);
+// default:
+// logerror("%s: unknown video reg written: %02x = %02x\n", machine().describe_context(), offset, data);
}
}
@@ -460,13 +460,13 @@ READ8_MEMBER(sigmab98_state::d013_r)
// bit 5 must go 0->1 (vblank?)
// bit 2 must set (sprite buffered? triggered by pulsing bit 3 of port C6?)
return (m_screen->vblank() ? 0x20 : 0) | 0x04;
-// return machine().rand();
+// return machine().rand();
}
READ8_MEMBER(sigmab98_state::d021_r)
{
// bit 5 must be 0?
return 0;
-// return machine().rand();
+// return machine().rand();
}
@@ -587,7 +587,7 @@ static ADDRESS_MAP_START( dodghero_mem_map, AS_PROGRAM, 8, sigmab98_state )
AM_RANGE( 0xd813, 0xd813 ) AM_READ(d013_r)
AM_RANGE( 0xd821, 0xd821 ) AM_READ(d021_r)
AM_RANGE( 0xd800, 0xd821 ) AM_READWRITE(vregs_r, vregs_w) AM_SHARE("vregs")
- AM_RANGE( 0xd800, 0xdfff ) AM_RAMBANK("rambank") // not used, where is it mapped?
+ AM_RANGE( 0xd800, 0xdfff ) AM_RAMBANK("rambank") // not used, where is it mapped?
AM_RANGE( 0xe000, 0xefff ) AM_RAM AM_SHARE("nvram") // battery
@@ -877,9 +877,9 @@ static ADDRESS_MAP_START( dashhero_io_map, AS_IO, 8, sigmab98_state )
// AM_RANGE( 0xa2, 0xa3 )
AM_RANGE( 0xa4, 0xa5 ) AM_READWRITE(dashhero_regs2_r, dashhero_regs2_w )
- AM_RANGE( 0xc0, 0xc0 ) AM_READ_PORT( "EEPROM" ) AM_WRITE(eeprom_w)
+ AM_RANGE( 0xc0, 0xc0 ) AM_READ_PORT( "EEPROM" ) AM_WRITE(eeprom_w)
AM_RANGE( 0xc2, 0xc2 ) AM_READ_PORT( "BUTTON" )
- AM_RANGE( 0xc4, 0xc4 ) AM_READ_PORT( "PAYOUT" ) AM_WRITE(c4_w )
+ AM_RANGE( 0xc4, 0xc4 ) AM_READ_PORT( "PAYOUT" ) AM_WRITE(c4_w )
AM_RANGE( 0xc6, 0xc6 ) AM_WRITE(c6_w )
AM_RANGE( 0xc8, 0xc8 ) AM_WRITE(c8_w )
@@ -1401,7 +1401,7 @@ WRITE8_MEMBER(sigmab98_state::itazuram_rombank_w)
m_rombank = data;
switch (data)
{
-// case 0x0f: // demo mode, after title
+// case 0x0f: // demo mode, after title
case 0x14: // 3800 IS ROM
membank("rombank0")->set_base(rom + 0x8000);
@@ -2081,7 +2081,7 @@ static MACHINE_CONFIG_DERIVED( dashhero, sigmab98 )
MCFG_CPU_PROGRAM_MAP( gegege_mem_map )
MCFG_CPU_IO_MAP( dashhero_io_map )
- MCFG_DEVICE_REMOVE("nvram") // FIXME: does not survive between sessions otherwise
+ MCFG_DEVICE_REMOVE("nvram") // FIXME: does not survive between sessions otherwise
MACHINE_CONFIG_END
@@ -2135,7 +2135,7 @@ static MACHINE_CONFIG_START( sammymdl, sigmab98_state )
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG)
-// MCFG_BUFFERED_SPRITERAM8_ADD("spriteram")
+// MCFG_BUFFERED_SPRITERAM8_ADD("spriteram")
// sound hardware
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -2291,12 +2291,12 @@ DRIVER_INIT_MEMBER(sigmab98_state,gegege)
UINT8 *rom = memregion("maincpu")->base();
// Related to d013
-// rom[0x0bdd] = 0xc9;
+// rom[0x0bdd] = 0xc9;
-// rom[0x0bf9] = 0xc9;
+// rom[0x0bf9] = 0xc9;
-// rom[0x0dec] = 0x00;
-// rom[0x0ded] = 0x00;
+// rom[0x0dec] = 0x00;
+// rom[0x0ded] = 0x00;
// EEPROM timing checks
rom[0x8138] = 0x00;
@@ -2378,12 +2378,12 @@ DRIVER_INIT_MEMBER(sigmab98_state,pepsiman)
UINT8 *rom = memregion("maincpu")->base();
// Related to d013
-// rom[0x058a] = 0xc9;
+// rom[0x058a] = 0xc9;
-// rom[0x05a6] = 0xc9;
+// rom[0x05a6] = 0xc9;
-// rom[0xa00e] = 0x00;
-// rom[0xa00f] = 0x00;
+// rom[0xa00e] = 0x00;
+// rom[0xa00f] = 0x00;
// EEPROM timing checks
rom[0x8138] = 0x00;
@@ -2469,12 +2469,12 @@ DRIVER_INIT_MEMBER(sigmab98_state,ucytokyu)
UINT8 *rom = memregion("maincpu")->base();
// Related to d013
-// rom[0x0bfa] = 0xc9;
+// rom[0x0bfa] = 0xc9;
-// rom[0x0c16] = 0xc9;
+// rom[0x0c16] = 0xc9;
-// rom[0xa43a] = 0x00;
-// rom[0xa43b] = 0x00;
+// rom[0xa43a] = 0x00;
+// rom[0xa43b] = 0x00;
// EEPROM timing checks
rom[0x8138] = 0x00;
diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c
index 3d8eb5c3489..8882971ca9a 100644
--- a/src/mame/drivers/spoker.c
+++ b/src/mame/drivers/spoker.c
@@ -39,7 +39,7 @@ public:
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
-
+
required_shared_ptr<UINT8> m_bg_tile_ram;
tilemap_t *m_bg_tilemap;
@@ -78,7 +78,7 @@ public:
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
diff --git a/src/mame/drivers/ssfindo.c b/src/mame/drivers/ssfindo.c
index 70d609bb88e..00e0b1f5fa0 100644
--- a/src/mame/drivers/ssfindo.c
+++ b/src/mame/drivers/ssfindo.c
@@ -235,7 +235,7 @@ public:
// driver init configuration
UINT32 m_flashType;
int m_iocr_hack;
-
+
// common
UINT32 m_PS7500_IO[MAXIO];
UINT32 m_PS7500_FIFO[256];
@@ -888,7 +888,7 @@ DRIVER_INIT_MEMBER(ssfindo_state,common)
m_speedup = 0;
m_PS7500timer0 = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ssfindo_state::PS7500_Timer0_callback),this));
m_PS7500timer1 = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ssfindo_state::PS7500_Timer1_callback),this));
-
+
save_item(NAME(m_PS7500_IO));
save_item(NAME(m_PS7500_FIFO));
}
diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c
index 8934acfb03b..3c8dbd68caf 100644
--- a/src/mame/drivers/suprnova.c
+++ b/src/mame/drivers/suprnova.c
@@ -998,7 +998,7 @@ DRIVER_INIT_MEMBER(skns_state,galpans3) { machine().device<sknsspr_device>("sp
ROM_SYSTEM_BIOS( 4, "korea", "Korea" ) \
ROM_LOAD_BIOS( 4, "sknsk1.u10", 0x000000, 0x080000, CRC(ff1c9f79) SHA1(a51e598d43e76d37da69b1f094c111273bdfc94a) ) \
ROM_SYSTEM_BIOS( 5, "japanmod", "Japan (No Region Lock)" ) /* hack */ \
- ROM_LOAD_BIOS( 5, "supernova_modbios.u10", 0x000000, 0x080000, CRC(b8d3190c) SHA1(62c9a4a075fd944e89fe95c6b46046101eb6de1c) )
+ ROM_LOAD_BIOS( 5, "supernova_modbios.u10", 0x000000, 0x080000, CRC(b8d3190c) SHA1(62c9a4a075fd944e89fe95c6b46046101eb6de1c) )
#define SKNS_JAPAN \
SKNS_BIOS \
diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c
index 6a6a969a200..12f0d3f4896 100644
--- a/src/mame/drivers/ttchamp.c
+++ b/src/mame/drivers/ttchamp.c
@@ -261,10 +261,10 @@ WRITE16_MEMBER(ttchamp_state::paldat_w)
READ16_MEMBER(ttchamp_state::ttchamp_pic_r)
{
-// printf("%06x: read from PIC (%04x)\n", space.device().safe_pc(),mem_mask);
+// printf("%06x: read from PIC (%04x)\n", space.device().safe_pc(),mem_mask);
if (picmodex == PIC_SET_READLATCH)
{
-// printf("read data %02x from %02x\n", m_pic_latched, m_pic_readaddr);
+// printf("read data %02x from %02x\n", m_pic_latched, m_pic_readaddr);
picmodex = PIC_IDLE;
return m_pic_latched << 8;
@@ -276,29 +276,29 @@ READ16_MEMBER(ttchamp_state::ttchamp_pic_r)
WRITE16_MEMBER(ttchamp_state::ttchamp_pic_w)
{
-// printf("%06x: write to PIC %04x (%04x) (%d)\n", space.device().safe_pc(),data,mem_mask, picmodex);
+// printf("%06x: write to PIC %04x (%04x) (%d)\n", space.device().safe_pc(),data,mem_mask, picmodex);
if (picmodex == PIC_IDLE)
{
if (data == 0x11)
{
picmodex = PIC_SET_READADDRESS;
-// printf("state = SET_READADDRESS\n");
+// printf("state = SET_READADDRESS\n");
}
else if (data == 0x12)
{
picmodex = PIC_SET_WRITELATCH;
-// printf("latch write data.. \n" );
+// printf("latch write data.. \n" );
}
else if (data == 0x20)
{
picmodex = PIC_SET_WRITEADDRESS;
-// printf("state = PIC_SET_WRITEADDRESS\n");
+// printf("state = PIC_SET_WRITEADDRESS\n");
}
else if (data == 0x21) // write latched data
{
picmodex = PIC_IDLE;
m_bakram[m_pic_writeaddr] = m_pic_writelatched;
- // printf("wrote %02x to %02x\n", m_pic_writelatched, m_pic_writeaddr);
+ // printf("wrote %02x to %02x\n", m_pic_writelatched, m_pic_writeaddr);
}
else if (data == 0x22) // next data to latch
{
@@ -306,12 +306,12 @@ WRITE16_MEMBER(ttchamp_state::ttchamp_pic_w)
// address by 1 to give correct results? maybe it can read 'previous' data' too?
m_pic_latched = m_bakram[m_pic_readaddr>>1];
-// printf("latch read data %02x from %02x\n",m_pic_latched, m_pic_readaddr );
+// printf("latch read data %02x from %02x\n",m_pic_latched, m_pic_readaddr );
picmodex = PIC_SET_READLATCH; // waiting to read...
}
else
{
-// printf("unknown\n");
+// printf("unknown\n");
}
}
else if (picmodex == PIC_SET_READADDRESS)
diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c
index 8f58e5b4b91..2efa996a04a 100644
--- a/src/mame/drivers/twins.c
+++ b/src/mame/drivers/twins.c
@@ -513,10 +513,10 @@ WRITE16_MEMBER(twins_state::spider_port_1c_w)
// otherwise you get garbage sprites between rounds and the bg incorrectly wiped
UINT16* vram;
-// if (m_videorambank & 1)
+// if (m_videorambank & 1)
vram = m_videoram2;
-// else
-// vram = m_videoram;
+// else
+// vram = m_videoram;
for (int i = 0; i < 0x8000; i++)
{
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index 487b1a773c5..712a2ddcf59 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -2692,7 +2692,7 @@ DRIVER_INIT_MEMBER(vamphalf_state,misncrft)
// Configure the QS1000 ROM banking. Care must be taken not to overlap the 256b internal RAM
machine().device("qs1000:cpu")->memory().space(AS_IO).install_read_bank(0x0100, 0xffff, "data");
membank("qs1000:data")->configure_entries(0, 16, memregion("qs1000:cpu")->base()+0x100, 0x8000-0x100);
-
+
save_item(NAME(m_qs1000_data));
}
@@ -2752,7 +2752,7 @@ DRIVER_INIT_MEMBER(vamphalf_state,wyvernwg)
// Configure the QS1000 ROM banking. Care must be taken not to overlap the 256b internal RAM
machine().device("qs1000:cpu")->memory().space(AS_IO).install_read_bank(0x0100, 0xffff, "data");
membank("qs1000:data")->configure_entries(0, 16, memregion("qs1000:cpu")->base()+0x100, 0x8000-0x100);
-
+
save_item(NAME(m_qs1000_data));
save_item(NAME(m_semicom_prot_idx));
save_item(NAME(m_semicom_prot_which));
@@ -2777,7 +2777,7 @@ DRIVER_INIT_MEMBER(vamphalf_state,yorijori)
// Configure the QS1000 ROM banking. Care must be taken not to overlap the 256b internal RAM
machine().device("qs1000:cpu")->memory().space(AS_IO).install_read_bank(0x0100, 0xffff, "data");
membank("qs1000:data")->configure_entries(0, 16, memregion("qs1000:cpu")->base()+0x100, 0x8000-0x100);
-
+
save_item(NAME(m_qs1000_data));
}
@@ -2794,7 +2794,7 @@ DRIVER_INIT_MEMBER(vamphalf_state,finalgdr)
m_semicom_prot_idx = 8;
m_semicom_prot_data[0] = 2;
m_semicom_prot_data[1] = 3;
-
+
save_item(NAME(m_finalgdr_backupram_bank));
save_pointer(NAME(m_finalgdr_backupram), 0x80*0x100);
save_item(NAME(m_semicom_prot_idx));
@@ -2815,7 +2815,7 @@ DRIVER_INIT_MEMBER(vamphalf_state,mrkicker)
m_semicom_prot_idx = 8;
m_semicom_prot_data[0] = 2;
m_semicom_prot_data[1] = 3;
-
+
save_item(NAME(m_semicom_prot_idx));
save_item(NAME(m_semicom_prot_which));
}
diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c
index 744c48f1ba2..9fd5ce8b4df 100644
--- a/src/mame/drivers/vicdual.c
+++ b/src/mame/drivers/vicdual.c
@@ -1123,7 +1123,7 @@ WRITE8_MEMBER(vicdual_state::alphaho_io_w)
static ADDRESS_MAP_START( vicdual_dualgame_map, AS_PROGRAM, 8, vicdual_state )
- AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x4000) AM_ROM
+ AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x4000) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x7000) AM_RAM_WRITE(vicdual_videoram_w) AM_SHARE("videoram")
AM_RANGE(0x8400, 0x87ff) AM_MIRROR(0x7000) AM_RAM
AM_RANGE(0x8800, 0x8fff) AM_MIRROR(0x7000) AM_RAM_WRITE(vicdual_characterram_w) AM_SHARE("characterram")
diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c
index 24dc5bd0c6d..a7d3241c701 100644
--- a/src/mame/drivers/vroulet.c
+++ b/src/mame/drivers/vroulet.c
@@ -64,18 +64,18 @@ public:
required_shared_ptr<UINT8> m_ball;
tilemap_t *m_bg_tilemap;
-
+
DECLARE_WRITE8_MEMBER(paletteram_w);
DECLARE_WRITE8_MEMBER(videoram_w);
DECLARE_WRITE8_MEMBER(colorram_w);
DECLARE_WRITE8_MEMBER(ppi8255_a_w);
DECLARE_WRITE8_MEMBER(ppi8255_b_w);
DECLARE_WRITE8_MEMBER(ppi8255_c_w);
-
+
TILE_GET_INFO_MEMBER(get_bg_tile_info);
-
+
virtual void video_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h
index fe3634e5aad..4c29084979e 100644
--- a/src/mame/includes/cheekyms.h
+++ b/src/mame/includes/cheekyms.h
@@ -34,21 +34,21 @@ public:
/* video-related */
tilemap_t *m_cm_tilemap;
bitmap_ind16 *m_bitmap_buffer;
-
+
UINT8 m_irq_mask;
DECLARE_WRITE8_MEMBER(port_40_w);
DECLARE_WRITE8_MEMBER(port_80_w);
-
+
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
INTERRUPT_GEN_MEMBER(vblank_irq);
-
+
TILE_GET_INFO_MEMBER(get_tile_info);
-
+
virtual void machine_start();
virtual void video_start();
DECLARE_PALETTE_INIT(cheekyms);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_element *gfx, int flip );
};
diff --git a/src/mame/includes/clshroad.h b/src/mame/includes/clshroad.h
index a845e52f707..c4bdc9de7ec 100644
--- a/src/mame/includes/clshroad.h
+++ b/src/mame/includes/clshroad.h
@@ -28,7 +28,7 @@ public:
DECLARE_WRITE8_MEMBER(flipscreen_w);
DECLARE_WRITE8_MEMBER(vram_0_w);
DECLARE_WRITE8_MEMBER(vram_1_w);
-
+
TILE_GET_INFO_MEMBER(get_tile_info_0a);
TILE_GET_INFO_MEMBER(get_tile_info_0b);
TILEMAP_MAPPER_MEMBER(tilemap_scan_rows_extra);
diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h
index fdf341c1f0c..6f83990a298 100644
--- a/src/mame/includes/hng64.h
+++ b/src/mame/includes/hng64.h
@@ -389,6 +389,6 @@ public:
DECLARE_READ16_MEMBER(sound_comms_r);
DECLARE_WRITE16_MEMBER(sound_comms_w);
UINT16 main_latch[2],sound_latch[2];
-
+
std::vector<polygon> polys;//(1024*5);
};
diff --git a/src/mame/includes/n64.h b/src/mame/includes/n64.h
index ffad8cca5bf..8fd6324bcf9 100644
--- a/src/mame/includes/n64.h
+++ b/src/mame/includes/n64.h
@@ -339,16 +339,16 @@ extern const device_type N64PERIPH;
#define DD_SEQ_MICRO_INT_MASK 0x80000000
#define DD_SEQ_MICRO_PC_ENABLE 0x40000000
-#define SECTORS_PER_BLOCK 85
-#define BLOCKS_PER_TRACK 2
+#define SECTORS_PER_BLOCK 85
+#define BLOCKS_PER_TRACK 2
const unsigned int ddZoneSecSize[16] = {232,216,208,192,176,160,144,128,
- 216,208,192,176,160,144,128,112};
+ 216,208,192,176,160,144,128,112};
const unsigned int ddZoneTrackSize[16] = {158,158,149,149,149,149,149,114,
- 158,158,149,149,149,149,149,114};
+ 158,158,149,149,149,149,149,114};
const unsigned int ddStartOffset[16] =
{0x0,0x5F15E0,0xB79D00,0x10801A0,0x1523720,0x1963D80,0x1D414C0,0x20BBCE0,
- 0x23196E0,0x28A1E00,0x2DF5DC0,0x3299340,0x36D99A0,0x3AB70E0,0x3E31900,0x4149200};
+ 0x23196E0,0x28A1E00,0x2DF5DC0,0x3299340,0x36D99A0,0x3AB70E0,0x3E31900,0x4149200};
diff --git a/src/mame/includes/pitnrun.h b/src/mame/includes/pitnrun.h
index 5f1cc06c470..c87c30ce82d 100644
--- a/src/mame/includes/pitnrun.h
+++ b/src/mame/includes/pitnrun.h
@@ -60,7 +60,7 @@ public:
TILE_GET_INFO_MEMBER(get_tile_info1);
TILE_GET_INFO_MEMBER(get_tile_info2);
-
+
INTERRUPT_GEN_MEMBER(nmi_source);
TIMER_CALLBACK_MEMBER(mcu_real_data_r);
TIMER_CALLBACK_MEMBER(mcu_real_data_w);
diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h
index 7332262c572..e4d069b8eda 100644
--- a/src/mame/includes/powerins.h
+++ b/src/mame/includes/powerins.h
@@ -12,7 +12,7 @@ public:
m_vctrl_0(*this, "vctrl_0"),
m_vram_0(*this, "vram_0"),
m_vram_1(*this, "vram_1"),
- m_spriteram(*this, "spriteram") { }
+ m_spriteram(*this, "spriteram") { }
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/includes/quizdna.h b/src/mame/includes/quizdna.h
index b819f58d6d1..ed4dbba10ae 100644
--- a/src/mame/includes/quizdna.h
+++ b/src/mame/includes/quizdna.h
@@ -15,7 +15,7 @@ public:
required_shared_ptr<UINT8> m_spriteram;
required_shared_ptr<UINT8> m_generic_paletteram_8;
-
+
UINT8 *m_bg_ram;
UINT8 *m_fg_ram;
tilemap_t *m_bg_tilemap;
@@ -32,7 +32,7 @@ public:
DECLARE_WRITE8_MEMBER(screen_ctrl_w);
DECLARE_WRITE8_MEMBER(paletteram_xBGR_RRRR_GGGG_BBBB_w);
DECLARE_WRITE8_MEMBER(rombank_w);
-
+
// game specific
DECLARE_WRITE8_MEMBER(gekiretu_rombank_w);
diff --git a/src/mame/includes/sbugger.h b/src/mame/includes/sbugger.h
index 117937e7c80..5fe32af9d6b 100644
--- a/src/mame/includes/sbugger.h
+++ b/src/mame/includes/sbugger.h
@@ -15,14 +15,14 @@ public:
required_shared_ptr<UINT8> m_videoram;
tilemap_t *m_tilemap;
-
+
DECLARE_WRITE8_MEMBER(videoram_w);
DECLARE_WRITE8_MEMBER(videoram_attr_w);
-
+
TILE_GET_INFO_MEMBER(get_tile_info);
-
+
virtual void video_start();
DECLARE_PALETTE_INIT(sbugger);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
diff --git a/src/mame/includes/segasp.h b/src/mame/includes/segasp.h
index a63e904ee1d..29d2fbf3fd7 100644
--- a/src/mame/includes/segasp.h
+++ b/src/mame/includes/segasp.h
@@ -12,7 +12,7 @@ public:
segasp_state(const machine_config &mconfig, device_type type, const char *tag)
: naomi_state(mconfig, type, tag),
m_sp_eeprom(*this, "sp_eeprom")
- { }
+ { }
required_device<eeprom_serial_93cxx_device> m_sp_eeprom;
DECLARE_READ64_MEMBER(sp_eeprom_r);
@@ -24,4 +24,3 @@ public:
protected:
};
-
diff --git a/src/mame/includes/shangha3.h b/src/mame/includes/shangha3.h
index 20ce889c66a..3276f9c54e2 100644
--- a/src/mame/includes/shangha3.h
+++ b/src/mame/includes/shangha3.h
@@ -25,7 +25,7 @@ public:
// driver init configuration
int m_do_shadows;
UINT8 m_drawmode_table[16];
-
+
int m_prot_count;
UINT16 m_gfxlist_addr;
bitmap_ind16 m_rawbitmap;
@@ -40,14 +40,14 @@ public:
DECLARE_READ16_MEMBER(shangha3_prot_r);
DECLARE_WRITE16_MEMBER(shangha3_prot_w);
DECLARE_WRITE16_MEMBER(shangha3_coinctrl_w);
-
+
// heberpop specific
DECLARE_WRITE16_MEMBER(heberpop_coinctrl_w);
DECLARE_WRITE16_MEMBER(heberpop_sound_command_w); // used by blocken too
-
+
// blocken specific
DECLARE_WRITE16_MEMBER(blocken_coinctrl_w);
-
+
DECLARE_DRIVER_INIT(shangha3);
DECLARE_DRIVER_INIT(heberpop);
virtual void video_start();
diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h
index 263092adb9d..d43fda6d39d 100644
--- a/src/mame/includes/shangkid.h
+++ b/src/mame/includes/shangkid.h
@@ -35,7 +35,7 @@ public:
DECLARE_READ8_MEMBER(soundlatch_r);
DECLARE_WRITE8_MEMBER(videoram_w);
DECLARE_WRITE8_MEMBER(ay8910_portb_w);
-
+
// game specific
DECLARE_WRITE8_MEMBER(chinhero_ay8910_porta_w);
DECLARE_WRITE8_MEMBER(shangkid_ay8910_porta_w);
diff --git a/src/mame/includes/shaolins.h b/src/mame/includes/shaolins.h
index bb57a0efdc4..991112162e8 100644
--- a/src/mame/includes/shaolins.h
+++ b/src/mame/includes/shaolins.h
@@ -8,7 +8,7 @@ public:
m_palette(*this, "palette"),
m_spriteram(*this, "spriteram"),
m_colorram(*this, "colorram"),
- m_videoram(*this, "videoram") { }
+ m_videoram(*this, "videoram") { }
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
@@ -27,14 +27,14 @@ public:
DECLARE_WRITE8_MEMBER(palettebank_w);
DECLARE_WRITE8_MEMBER(scroll_w);
DECLARE_WRITE8_MEMBER(nmi_w);
-
+
TILE_GET_INFO_MEMBER(get_bg_tile_info);
-
+
virtual void video_start();
DECLARE_PALETTE_INIT(shaolins);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
TIMER_DEVICE_CALLBACK_MEMBER(interrupt);
};
diff --git a/src/mame/includes/spcforce.h b/src/mame/includes/spcforce.h
index 4295a47a48f..35c4047d1ed 100644
--- a/src/mame/includes/spcforce.h
+++ b/src/mame/includes/spcforce.h
@@ -34,7 +34,7 @@ public:
int m_sn2_ready;
int m_sn3_ready;
UINT8 m_irq_mask;
-
+
DECLARE_WRITE8_MEMBER(SN76496_latch_w);
DECLARE_READ8_MEMBER(SN76496_select_r);
DECLARE_WRITE8_MEMBER(SN76496_select_w);
@@ -45,11 +45,11 @@ public:
DECLARE_WRITE8_MEMBER(soundtrigger_w);
DECLARE_WRITE8_MEMBER(irq_mask_w);
DECLARE_WRITE8_MEMBER(flip_screen_w);
-
+
virtual void machine_start();
DECLARE_PALETTE_INIT(spcforce);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
INTERRUPT_GEN_MEMBER(vblank_irq);
};
diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h
index 2f5344e411f..e289e01dbda 100644
--- a/src/mame/includes/splash.h
+++ b/src/mame/includes/splash.h
@@ -42,12 +42,12 @@ public:
// driver init configuration
int m_bitmap_type;
int m_sprite_attr2_shift;
-
+
tilemap_t *m_bg_tilemap[2];
// splash specific
int m_adpcm_data;
-
+
//roldfrog specific
int m_ret;
int m_vblank_irq;
@@ -118,7 +118,7 @@ public:
void draw_bitmap(bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect);
void funystrp_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect);
-
+
INTERRUPT_GEN_MEMBER(roldfrog_interrupt);
void roldfrog_update_irq( );
};
diff --git a/src/mame/includes/toobin.h b/src/mame/includes/toobin.h
index 301b9552bf0..3eb3adb6e3f 100644
--- a/src/mame/includes/toobin.h
+++ b/src/mame/includes/toobin.h
@@ -39,7 +39,7 @@ public:
DECLARE_WRITE16_MEMBER(xscroll_w);
DECLARE_WRITE16_MEMBER(yscroll_w);
DECLARE_WRITE16_MEMBER(slip_w);
-
+
TILE_GET_INFO_MEMBER(get_alpha_tile_info);
TILE_GET_INFO_MEMBER(get_playfield_tile_info);
diff --git a/src/mame/includes/victory.h b/src/mame/includes/victory.h
index 9fe00f0240d..a7337c1afe0 100644
--- a/src/mame/includes/victory.h
+++ b/src/mame/includes/victory.h
@@ -48,7 +48,7 @@ public:
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_charram;
-
+
UINT16 m_paletteram[0x40];
UINT8 *m_bgbitmap;
UINT8 *m_fgbitmap;
@@ -66,19 +66,19 @@ public:
UINT8 m_scrolly;
UINT8 m_video_control;
struct micro_t m_micro;
-
+
DECLARE_WRITE8_MEMBER(lamp_control_w);
DECLARE_WRITE8_MEMBER(paletteram_w);
DECLARE_READ8_MEMBER(video_control_r);
DECLARE_WRITE8_MEMBER(video_control_w);
-
+
virtual void video_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
INTERRUPT_GEN_MEMBER(vblank_interrupt);
TIMER_CALLBACK_MEMBER(bgcoll_irq_callback);
-
+
void update_irq();
void set_palette();
int command2();
diff --git a/src/mame/includes/vigilant.h b/src/mame/includes/vigilant.h
index 637632cec14..342b6c8c287 100644
--- a/src/mame/includes/vigilant.h
+++ b/src/mame/includes/vigilant.h
@@ -34,20 +34,20 @@ public:
// common
DECLARE_WRITE8_MEMBER(bank_select_w);
DECLARE_WRITE8_MEMBER(paletteram_w);
-
+
// vigilant and buccanrs
DECLARE_WRITE8_MEMBER(vigilant_out2_w);
DECLARE_WRITE8_MEMBER(vigilant_horiz_scroll_w);
DECLARE_WRITE8_MEMBER(vigilant_rear_horiz_scroll_w);
DECLARE_WRITE8_MEMBER(vigilant_rear_color_w);
-
+
// kikcubic
DECLARE_WRITE8_MEMBER(kikcubic_coin_w);
-
+
virtual void machine_start();
virtual void video_start();
virtual void video_reset();
-
+
UINT32 screen_update_vigilant(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_kikcubic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void update_background();
diff --git a/src/mame/machine/awboard.c b/src/mame/machine/awboard.c
index 71417221c98..dc45183008e 100644
--- a/src/mame/machine/awboard.c
+++ b/src/mame/machine/awboard.c
@@ -269,7 +269,7 @@ READ16_MEMBER(aw_rom_board::pio_r)
WRITE16_MEMBER(aw_rom_board::pio_w)
{
// write to ROM board address space, including FlashROM programming using CFI (TODO)
- if (epr_offset == 0x7fffff) // special register which changes ROMBD addressing
+ if (epr_offset == 0x7fffff) // special register which changes ROMBD addressing
adjust_off = data;
epr_offset++;
}
diff --git a/src/mame/machine/awboard.h b/src/mame/machine/awboard.h
index 23575e7a43d..c47b2aa4b23 100644
--- a/src/mame/machine/awboard.h
+++ b/src/mame/machine/awboard.h
@@ -22,8 +22,8 @@ public:
DECLARE_WRITE16_MEMBER(mpr_first_file_index_w); // 5f7010
DECLARE_WRITE16_MEMBER(mpr_file_offsetl_w); // 5f7014
DECLARE_WRITE16_MEMBER(mpr_file_offseth_w); // 5f7018
- DECLARE_READ16_MEMBER(pio_r); // 5f7080
- DECLARE_WRITE16_MEMBER(pio_w); // 5f7080
+ DECLARE_READ16_MEMBER(pio_r); // 5f7080
+ DECLARE_WRITE16_MEMBER(pio_w); // 5f7080
protected:
virtual void device_start();
diff --git a/src/mame/machine/iteagle_fpga.c b/src/mame/machine/iteagle_fpga.c
index 4dbec2afde9..df236ff21c2 100644
--- a/src/mame/machine/iteagle_fpga.c
+++ b/src/mame/machine/iteagle_fpga.c
@@ -109,7 +109,7 @@ void iteagle_fpga_device::update_sequence(UINT32 data)
m_fpga_regs[offset] = (m_fpga_regs[offset]&0xFFFFFF00) | ((val1 + m_seq_rem1 + m_seq_rem2)&0xFF);
} else {
val1 = ((m_seq & 0x2)<<6) | ((m_seq & 0x4)<<4) | ((m_seq & 0x8)<<2) | ((m_seq & 0x10)<<0)
- | ((m_seq & 0x20)>>2) | ((m_seq & 0x40)>>4) | ((m_seq & 0x80)>>6) | ((m_seq & 0x100)>>8);
+ | ((m_seq & 0x20)>>2) | ((m_seq & 0x40)>>4) | ((m_seq & 0x80)>>6) | ((m_seq & 0x100)>>8);
m_seq = (m_seq>>8) | ((feed&0xff)<<16);
m_fpga_regs[offset] = (m_fpga_regs[offset]&0xFFFFFF00) | ((val1 + m_seq_rem1 + m_seq_rem2) & 0xff);
}
@@ -155,7 +155,6 @@ READ32_MEMBER( iteagle_fpga_device::fpga_r )
WRITE32_MEMBER( iteagle_fpga_device::fpga_w )
{
-
COMBINE_DATA(&m_fpga_regs[offset]);
switch (offset) {
case 0x04/4:
diff --git a/src/mame/machine/midikbd.c b/src/mame/machine/midikbd.c
index 2ceb68ae23f..2c9fef21e28 100644
--- a/src/mame/machine/midikbd.c
+++ b/src/mame/machine/midikbd.c
@@ -45,16 +45,16 @@ void midi_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, in
0x52, // A2#
0x53, // B2
};
-
+
int i;
-
+
UINT32 kbstate = m_keyboard->read();
if(kbstate != m_keyboard_state)
{
for (i=0; i < 24; i++)
{
int kbnote = keyboard_notes[i];
-
+
if ((m_keyboard_state & (1 << i)) != 0 && (kbstate & (1 << i)) == 0)
{
// key was on, now off -> send Note Off message
@@ -74,7 +74,7 @@ void midi_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, in
else
// no messages, send Active Sense message instead
push_tx(0xfe);
-
+
m_keyboard_state = kbstate;
if(is_transmit_register_empty())
tra_complete();
diff --git a/src/mame/machine/n64.c b/src/mame/machine/n64.c
index ed3834707eb..b033527b0bd 100644
--- a/src/mame/machine/n64.c
+++ b/src/mame/machine/n64.c
@@ -2264,7 +2264,7 @@ void n64_periphs::dd_read_sector()
for(int i = 0; i < ddZoneSecSize[dd_zone]/4; i++)
{
dd_sector_data[i] = sector[(i*4 + 0)] << 24 | sector[(i*4 + 1)] << 16 |
- sector[(i*4 + 2)] << 8 | sector[(i*4 + 3)];
+ sector[(i*4 + 2)] << 8 | sector[(i*4 + 3)];
}
return;
}
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 2ba9830d4e4..f307f5a5380 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -323,7 +323,7 @@ scrambler // bootleg
explorer // bootleg
strfbomb // bootleg
scrambp // bootleg (Billport S.A.)
-scramce // bootleg (Centromatic S.A.)
+scramce // bootleg (Centromatic S.A.)
scrampt // bootleg (Petaco S.A.)
scramrf // bootleg (Recreativos Franco)
atlantis // (c) 1981 Comsoft
@@ -2291,7 +2291,7 @@ puzznic // C20 (c) 1989 Taito Corporation (Japan)
puzznicj // C20 (c) 1989 Taito Corporation (Japan)
puzznici // bootleg
puzznicb // bootleg
-puzznicba // bootleg
+puzznicba // bootleg
horshoes // C47 (c) 1990 Taito America Corporation (US)
palamed // C63 (c) 1990 Taito Corporation (Japan)
cachat // ??? (c) 1993 Taito Corporation (Japan)
@@ -4337,7 +4337,7 @@ nsub // 268-275 (c) 1980 Sega
samurai // 289-302 + upgrades (c) 1980 Sega
invinco // 310-318 (c) 1979 Sega
invds // 367-382 (c) 1979 Sega
-carhntds //
+carhntds //
tranqgun // 413-428 (c) 1980 Sega
// 450-465 Tranquilizer Gun (different version?)
// ???-??? Car Hunt / Deep Scan
@@ -5527,9 +5527,9 @@ starhrpr // 2009.07.27 Star Horse Progress Returns (satellite)
// NAOMI based (System SP)
segasp
-lovebery // 2004.10 Oshare Majo Love and Berry / Fashionable Witch Love and Berry
+lovebery // 2004.10 Oshare Majo Love and Berry / Fashionable Witch Love and Berry
lovebero
-dinoking // 2005.09 Kodai Ouja Kyouryuu King / Ancient Ruler Dinosaur King
+dinoking // 2005.09 Kodai Ouja Kyouryuu King / Ancient Ruler Dinosaur King
dinokior
// 2007.06 Issyo ni Wanwan
// 2007.06 Konchuu Dash!!
@@ -6475,7 +6475,7 @@ chqflag // GX717 (c) 1988
chqflagj // GX717 (c) 1988 (Japan)
ultraman // GX910 (c) 1991 Banpresto/Bandai
hexion // GX122 (c) 1992
-hexionb // bootleg
+hexionb // bootleg
lethalen // GX191 (c) 1992
lethalenub // GX191 (c) 1992
lethalenua // GX191 (c) 1992
@@ -7866,7 +7866,7 @@ gangwarsj // Alpha-68K96V (c) 1989 Alpha Denshi Co.
gangwarsu // Alpha-68K96V (c) 1989 Alpha Denshi Co.
gangwarsb // bootleg
sbasebal // Alpha-68K96V (c) 1989 SNK of America licensed from Alpha
-sbasebalj // Alpha-68K96V
+sbasebalj // Alpha-68K96V
tnextspc // A8003 'NS' (c) 1989 - MASKROM
tnextspc2 // A8003 'NS' (c) 1989 - EPROMs
tnextspcj // A8003 'NS' (c) 1989 - Japan
@@ -8274,7 +8274,7 @@ cartfury // (c) 2000 Midway Games
// Midway Quicksilver
hydrthnd // (c) 1999 Midway Games
offrthnd // (c) 2000 Midway Games
-arctthnd // (c) 2001 Midway Games
+arctthnd // (c) 2001 Midway Games
ultarctc // (c) 2001 Midway Games
ultarctcup // (c) 2001 Midway Games
@@ -9560,7 +9560,7 @@ redhawk // (c) 1997 New Vision Ent. license
redhawke // (c) 1997 Excellent Co., Ltd license
redhawki // (c) 1997 Haedong Corp. license
redhawkb // (c) 1997
-redhawkk // (c) 1997
+redhawkk // (c) 1997
grdnstrm // (c) 1998 Apples Industries license
grdnstrmv // (c) 1998 Apples Industries license
grdnstrmk // (c) 1998 (Korea)
@@ -9881,7 +9881,7 @@ drgw2j //
drgw2hk //
drgw3 // (c) 1998 Dragon World 3
drgw3105 //
-drgw3103 //
+drgw3103 //
drgw3100 //
dwex // (c) 1998 Dragon World 3 EX
killbld // (c) 1998 The Killing Blade
@@ -10368,7 +10368,7 @@ jokpokerc // (c) 1983 Greyhound Electronics
superbwl // (c) 1982 Greyhound Electronics
amuse // (c) 1982 Greyhound Electronics
amuse1 // (c) 1982 Greyhound Electronics
-amuse1a // (c) 1983 Greyhound Electronics
+amuse1a // (c) 1983 Greyhound Electronics
gs4002 // (c) 1982 G.E.I.
gs4002a // (c) 1982 G.E.I.
gepoker // (c) 1984 Greyhound Electronics
@@ -12929,7 +12929,7 @@ tank // (c) 1974 Atari
pong // (c) 1972 Atari
pongd // (c) 1975 Atari
pongf // (c) 1972 Atari
-breakout // (c) 1976 Atari
+breakout // (c) 1976 Atari
//coupedem
//goal4
//gotchaat
@@ -17056,7 +17056,7 @@ sc4s6cb //
sc4s6cc //
sc4s6cd //
sc4s6ce //
-sc4s6cf //
+sc4s6cf //
sc4sdr // Super Diamonds & Rubies (Bellfruit)
sc4sdra //
sc4sdrb //
@@ -17155,7 +17155,7 @@ sc4ticlb // Treasure Island Club (Bellfruit)
sc4ticlba //
sc4ticlbb //
sc4ticlbc //
-sc4ticlbd //
+sc4ticlbd //
sc4ttomb // Treasure Tomb (Bellfruit)
sc4ttomba //
sc4ttombb //
@@ -17274,7 +17274,7 @@ sc4legd //
sc4lege //
sc4legf //
sc4legg //
-sc4legh //
+sc4legh //
sc4legcb // Who Wants To Be A Legionnaire Club (Bellfruit)
sc4legcba //
sc4legcbb //
diff --git a/src/mame/video/hng64_3d.c b/src/mame/video/hng64_3d.c
index ab05fd53a33..56c66cbe5c0 100644
--- a/src/mame/video/hng64_3d.c
+++ b/src/mame/video/hng64_3d.c
@@ -56,7 +56,7 @@ g_profiler.start(PROFILER_USER1);
}
machine().scheduler().timer_set(m_maincpu->cycles_to_attotime(0x200*8), timer_expired_delegate(FUNC(hng64_state::hng64_3dfifo_processed),this));
-g_profiler.stop();
+g_profiler.stop();
}
TIMER_CALLBACK_MEMBER(hng64_state::hng64_3dfifo_processed )
diff --git a/src/mame/video/pitnrun.c b/src/mame/video/pitnrun.c
index 078e177b3aa..62f5c82a3d8 100644
--- a/src/mame/video/pitnrun.c
+++ b/src/mame/video/pitnrun.c
@@ -163,7 +163,7 @@ void pitnrun_state::video_start()
m_tmp_bitmap[2] = auto_bitmap_ind16_alloc(machine(),128,128);
m_tmp_bitmap[3] = auto_bitmap_ind16_alloc(machine(),128,128);
spotlights();
-
+
save_item(NAME(m_h_heed));
save_item(NAME(m_v_heed));
save_item(NAME(m_ha));
diff --git a/src/mame/video/quizdna.c b/src/mame/video/quizdna.c
index dff8198bb49..fe48799e159 100644
--- a/src/mame/video/quizdna.c
+++ b/src/mame/video/quizdna.c
@@ -58,7 +58,7 @@ void quizdna_state::video_start()
m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(quizdna_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,16,8,32,32 );
m_fg_tilemap->set_transparent_pen(0 );
-
+
save_pointer(NAME(m_bg_ram), 0x2000);
save_pointer(NAME(m_fg_ram), 0x1000);
save_item(NAME(m_bg_xscroll));
diff --git a/src/mame/video/sauro.c b/src/mame/video/sauro.c
index a0951820837..262e7536ba7 100644
--- a/src/mame/video/sauro.c
+++ b/src/mame/video/sauro.c
@@ -87,7 +87,7 @@ VIDEO_START_MEMBER(sauro_state,sauro)
m_fg_tilemap->set_transparent_pen(0);
m_palette_bank = 0;
-
+
save_item(NAME(m_palette_bank));
}
diff --git a/src/mame/video/shangha3.c b/src/mame/video/shangha3.c
index c872fb5f6db..a54b5771a9d 100644
--- a/src/mame/video/shangha3.c
+++ b/src/mame/video/shangha3.c
@@ -80,7 +80,7 @@ void shangha3_state::video_start()
for (i = 0;i < 128;i++)
m_palette->shadow_table()[i] = i+128;
}
-
+
save_item(NAME(m_gfxlist_addr));
save_item(NAME(m_rawbitmap));
}
diff --git a/src/mame/video/shaolins.c b/src/mame/video/shaolins.c
index afe34f881f7..32d9785e4f5 100644
--- a/src/mame/video/shaolins.c
+++ b/src/mame/video/shaolins.c
@@ -140,7 +140,7 @@ void shaolins_state::video_start()
8, 8, 32, 32);
m_bg_tilemap->set_scroll_cols(32);
-
+
save_item(NAME(m_palettebank));
save_item(NAME(m_nmi_enable));
}
diff --git a/src/mame/video/vigilant.c b/src/mame/video/vigilant.c
index 8290fdc7409..f0f6c9c44e8 100644
--- a/src/mame/video/vigilant.c
+++ b/src/mame/video/vigilant.c
@@ -20,7 +20,7 @@ static const rectangle bottomvisiblearea(16*8, 48*8-1, 6*8, 32*8-1);
void vigilant_state::video_start()
{
m_bg_bitmap = auto_bitmap_ind16_alloc(machine(),512*4,256);
-
+
save_item(NAME(m_horiz_scroll_low));
save_item(NAME(m_horiz_scroll_high));
save_item(NAME(m_rear_horiz_scroll_low));
diff --git a/src/mess/drivers/abc80.c b/src/mess/drivers/abc80.c
index c53e8bb1d23..686ae144b8d 100644
--- a/src/mess/drivers/abc80.c
+++ b/src/mess/drivers/abc80.c
@@ -394,8 +394,8 @@ WRITE8_MEMBER( abc80_state::kbd_w )
/*
DEVICE_INPUT_DEFAULTS_START( abc830_slow )
- DEVICE_INPUT_DEFAULTS("SW1", 0x0f, 0x03)
- DEVICE_INPUT_DEFAULTS("S1", 0x01, 0x01)
+ DEVICE_INPUT_DEFAULTS("SW1", 0x0f, 0x03)
+ DEVICE_INPUT_DEFAULTS("S1", 0x01, 0x01)
DEVICE_INPUT_DEFAULTS_END
*/
@@ -555,7 +555,7 @@ static MACHINE_CONFIG_START( abc80, abc80_state )
MCFG_ABC80_KEYBOARD_KEYDOWN_CALLBACK(WRITELINE(abc80_state, keydown_w))
MCFG_ABCBUS_SLOT_ADD(ABCBUS_TAG, abc80_cards, "abcexp")
-
+
MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, NULL)
MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
MCFG_GENERIC_KEYBOARD_CB(WRITE8(abc80_state, kbd_w))
diff --git a/src/mess/drivers/gba.c b/src/mess/drivers/gba.c
index d36760b65c7..da9f891ba8a 100644
--- a/src/mess/drivers/gba.c
+++ b/src/mess/drivers/gba.c
@@ -161,7 +161,7 @@ void gba_state::dma_exec(FPTR ch)
else
{
// if (dst >= 0x6000000 && dst <= 0x6017fff)
-// printf("DMA exec: ch %d from %08x to %08x, mode %04x, count %04x (%s)\n", (int)ch, src, dst, ctrl, cnt, ((ctrl>>10) & 1) ? "32" : "16");
+// printf("DMA exec: ch %d from %08x to %08x, mode %04x, count %04x (%s)\n", (int)ch, src, dst, ctrl, cnt, ((ctrl>>10) & 1) ? "32" : "16");
}
for (int i = 0; i < cnt; i++)
@@ -1559,7 +1559,7 @@ WRITE32_MEMBER(gba_state::gba_io_w)
ch = offset / 3;
-// printf("%08x: DMA(%d): %x to reg %d (mask %08x)\n", space.device().safe_pc(), ch, data, offset%3, ~mem_mask);
+// printf("%08x: DMA(%d): %x to reg %d (mask %08x)\n", space.device().safe_pc(), ch, data, offset%3, ~mem_mask);
if (((offset % 3) == 2) && ((~mem_mask & 0xffff0000) == 0))
{
diff --git a/src/mess/drivers/hh_hmcs40.c b/src/mess/drivers/hh_hmcs40.c
index b657e330b62..c8efaad5854 100644
--- a/src/mess/drivers/hh_hmcs40.c
+++ b/src/mess/drivers/hh_hmcs40.c
@@ -25,7 +25,7 @@
@73 HD38800A 1982, Bandai(Mattel) Star Hawk (PT-317B)
@77 HD38800A 1982, Bandai Frisky Tom (PT-327A)
@88 HD38800A 1984, Tomy Tron (THN-02)
-
+
@01 HD38800B 1982, Gakken Crazy Kong
@23 HD38800B 1982, Tomy Kingman (THF-01II)
*24 HD38800B 1982, Actronics(Hanzawa) Wanted G-Man
@@ -795,7 +795,7 @@ MACHINE_CONFIG_END
* PCBs are labeled Kaken, PT-317B
* Hitachi HD38800A73 MCU
* cyan/red VFD display Futaba DM-41ZK, with partial color overlay + bezel
-
+
Kaken was a subsidiary of Bandai. The original Japanese release is unknown,
was it canceled and only released in the USA?
@@ -1084,7 +1084,7 @@ WRITE16_MEMBER(bdoramon_state::grid_w)
// D8-D15: vfd matrix grid
m_grid = data >> 8 & 0xff;
-
+
// D0-D3: plate 15-18 (update display there)
plate_w(space, 4, data & 0xf);
}
@@ -1233,7 +1233,7 @@ MACHINE_CONFIG_END
Coleco Alien Attack (manufactured in Taiwan)
* Hitachi HD38800A25 MCU
* cyan/red VFD display Futaba DM-19Z 1J
-
+
It looks like Coleco took Gakken's Heiankyo Alien and turned it into a more
action-oriented game.
@@ -1960,7 +1960,7 @@ MACHINE_CONFIG_END
* PCB labels ENTEX PAC-MAN PB-093/094 80-210149/50/51
* Hitachi QFP HD38820A23 MCU
* cyan/red VFD display Futaba DM-28Z 1G(cyan Pac-Man) or DM-28 1K(orange Pac-Man)
-
+
2 VFD revisions are known, the difference is Pac-Man's color: cyan or red.
NOTE!: MESS external artwork is recommended
@@ -2406,7 +2406,7 @@ MACHINE_CONFIG_END
* PCB label MEL-001 Baseball Rev. B
* Hitachi QFP HD38820A09 MCU
* cyan/red/green VFD display Futaba DM-24ZK 1G, with etched overlay
-
+
To start the game in 2-player mode, simply turn the game on. For 1-player,
turn the game on while holding the 1-key and use the visitor's side keypad
to play offsense.
diff --git a/src/mess/drivers/hh_pic16.c b/src/mess/drivers/hh_pic16.c
index 091d1827741..fe5bed0aed7 100644
--- a/src/mess/drivers/hh_pic16.c
+++ b/src/mess/drivers/hh_pic16.c
@@ -148,7 +148,7 @@ void hh_pic16_state::display_update()
int state = active_state[y] >> x & 1;
char buf1[0x10]; // lampyx
char buf2[0x10]; // y.x
-
+
if (x == m_display_maxx)
{
// always-on if selected
diff --git a/src/mess/drivers/hh_tms1k.c b/src/mess/drivers/hh_tms1k.c
index 5c531cc5e26..6af4ff64e89 100644
--- a/src/mess/drivers/hh_tms1k.c
+++ b/src/mess/drivers/hh_tms1k.c
@@ -195,7 +195,7 @@ void hh_tms1k_state::display_update()
int state = active_state[y] >> x & 1;
char buf1[0x10]; // lampyx
char buf2[0x10]; // y.x
-
+
if (x == m_display_maxx)
{
// always-on if selected
@@ -669,7 +669,7 @@ WRITE16_MEMBER(h2hbaseb_state::write_r)
{
// R10: speaker out
m_speaker->level_w(data >> 10 & 1);
-
+
// R4-R7: input mux
m_inp_mux = data >> 4 & 0xf;
@@ -803,10 +803,10 @@ WRITE16_MEMBER(h2hfootb_state::write_r)
{
// R10: speaker out
m_speaker->level_w(data >> 10 & 1);
-
+
// R0-R8: input mux
m_inp_mux = data & 0x1ff;
-
+
// R0-R8: select led
// R9: led between digits
m_r = data;
@@ -829,7 +829,7 @@ READ8_MEMBER(h2hfootb_state::read_k)
for (int i = 0; i < 4; i++)
if (m_inp_matrix[i]->read() & m_inp_mux)
k |= 1 << i;
-
+
return k;
}
@@ -1530,7 +1530,7 @@ void einvader_state::prepare_display()
// R7-R9 are 7segs
for (int y = 7; y < 10; y++)
m_display_segmask[y] = 0x7f;
-
+
display_matrix(8, 10, m_o, m_r);
}
@@ -1656,7 +1656,7 @@ void raisedvl_state::prepare_display()
// R0-R2 are 7segs
for (int y = 0; y < 3; y++)
m_display_segmask[y] = 0x7f;
-
+
display_matrix(7, 10, m_o, m_r);
}
@@ -1664,10 +1664,10 @@ WRITE16_MEMBER(raisedvl_state::write_r)
{
// R10: speaker out
m_speaker->level_w(data >> 10 & 1);
-
+
// R0,R1: input mux
m_inp_mux = data & 3;
-
+
// R0-R9: led select
m_r = data;
prepare_display();
@@ -1795,10 +1795,10 @@ WRITE16_MEMBER(gpoker_state::write_r)
{
// R15: enable beeper
m_beeper->set_state(data >> 15 & 1);
-
+
// R0-R6: input mux
m_inp_mux = data & 0x7f;
-
+
// R0-R10: select digit
// R11-R14: card symbols
m_r = data;
@@ -2018,7 +2018,7 @@ MACHINE_CONFIG_END
Ideal Electronic Detective
* TMS0980NLL MP6100A (die labeled 0980B-00)
* 10-digit 7seg LED display, 1bit sound
-
+
hardware (and concept) is very similar to Parker Bros Stop Thief
This is an electronic board game. It requires game cards with suspect info,
@@ -2306,7 +2306,7 @@ WRITE16_MEMBER(astro_state::write_r)
{
// R0-R7: input mux
m_inp_mux = data & 0xff;
-
+
// R0-R9: led select
m_r = data;
prepare_display();
@@ -2636,13 +2636,13 @@ WRITE16_MEMBER(ssimon_state::write_r)
{
// R0-R3,R9,R10: input mux
m_inp_mux = (data & 0xf) | (data >> 5 & 0x30);
-
+
// R4: yellow lamps
// R5: green lamps
// R6: blue lamps
// R7: red lamps
display_matrix(4, 1, data >> 4, 1);
-
+
// R8: speaker out
m_speaker->level_w(data >> 8 & 1);
}
@@ -2753,7 +2753,7 @@ MACHINE_CONFIG_END
* SN75494N Hex digit LED driver, 1 lamp, 3-level sound
* gearbox with magnetic clutch, 1 IR led+sensor, 2 motors(middle wheels)
* 24-button keypad, ext in/out ports
-
+
Big Trak is a programmable toy car, up to 16 steps. Supported commands include
driving and turning, firing a photon cannon(hey, have some imagination!),
and I/O ports. The output port was used for powering the dump truck accessory.
@@ -2800,7 +2800,7 @@ WRITE16_MEMBER(bigtrak_state::write_r)
{
// R0-R5,R8: input mux (keypad, ext in enable)
m_inp_mux = (data & 0x3f) | (data >> 2 & 0x40);
-
+
// R6: N/C
// R7: IR led on
// R9: lamp on
@@ -2996,11 +2996,11 @@ READ8_MEMBER(cnsector_state::read_k)
COMBAT INFORMATION CENTER
[NEXT SHIP] [RECALL] [MOVE SHIP]
-
+
[LEFT] [RIGHT] o [SLOWER] [FASTER]
STEERING EVASIVE SUB SPEED o (on/off switch)
NAVIGATIONAL PROGRAMMING |
-
+
[RANGE] [AIM] [FIRE] o [TEACH MODE]
SONAR CONTROL SUB FINDER
*/
@@ -3186,7 +3186,7 @@ MACHINE_CONFIG_END
The TMS1400CR MCU has the same pinout as a standard TMS1100. The hardware
outside of the MCU is exactly the same as Merlin.
-
+
The included minigames are:
1: Three Shells
2: Hi/Lo
diff --git a/src/mess/drivers/hh_ucom4.c b/src/mess/drivers/hh_ucom4.c
index 2a755133655..3aa5b42d7dc 100644
--- a/src/mess/drivers/hh_ucom4.c
+++ b/src/mess/drivers/hh_ucom4.c
@@ -4,9 +4,9 @@
NEC uCOM4 MCU tabletops/handhelds or other simple devices,
most of them are VFD electronic games/toys.
-
+
Commonly used VFD(vacuum fluorescent display) are by NEC or Futaba.
-
+
NEC FIP9AM20T (example, Epoch Astro Command)
grcss
@@ -264,7 +264,7 @@ UINT8 hh_ucom4_state::read_inputs(int columns)
* PCB label Emix Corp. ET-02
* NEC uCOM-44 MCU, labeled EMIX D552C 017
* cyan VFD display Emix-101, with blue color overlay
-
+
This is Bambino's first game, it is not known if ET-01 exists. Emix Corp.
wasn't initially a toy company, the first release was through Tomy. Emix
created the Bambino brand afterwards. It is claimed to be the first
@@ -380,7 +380,7 @@ MACHINE_CONFIG_END
* PCB label Emix Corp. ET-03
* NEC uCOM-43 MCU, labeled D553C 031
* cyan VFD display Emix-102, with bezel
-
+
The game was rereleased in 1982 as Classic Football, with an improved VFD.
Press the Kick button to start the game, an automatic sequence follows.
@@ -452,7 +452,7 @@ READ8_MEMBER(ssfball_state::input_b_r)
[A] [B] [C] [PASS] [KICK/
^FORMATION^ DISPLAY]
-
+
[^]
[<>]
(game lvl sw) [v]
@@ -522,7 +522,7 @@ MACHINE_CONFIG_END
* PCB label Emix Corp. ET-10/08 (PCB is for 2 possible games)
* NEC uCOM-44 MCU, labeled D552C 043
* cyan VFD display Emix-105, with bezel overlay
-
+
Press the Display button twice to start the game. Action won't start until
player 1 presses one of the directional keys. In 2-player mode, player 2
controls the goalkeeper, defensive players are still controlled by the CPU.
@@ -573,7 +573,7 @@ WRITE8_MEMBER(bmsoccer_state::plate_w)
// E012,F012,G012,H,I: vfd matrix plate
int shift = (offset - NEC_UCOM4_PORTE) * 4;
m_plate = (m_plate & ~(0xf << shift)) | (data << shift);
-
+
// E3: grid 8
if (offset == NEC_UCOM4_PORTE)
grid_w(space, offset, data >> 3 & 1);
@@ -688,7 +688,7 @@ WRITE8_MEMBER(bmsafari_state::plate_w)
// E012,H,I: vfd matrix plate
int shift = (offset == NEC_UCOM4_PORTE) ? 8 : (offset - NEC_UCOM4_PORTH) * 4;
m_plate = (m_plate & ~(0xf << shift)) | (data << shift);
-
+
// E3: grid 0
if (offset == NEC_UCOM4_PORTE)
grid_w(space, offset, data >> 3 & 1);
@@ -754,7 +754,7 @@ MACHINE_CONFIG_END
* PCB label Emix Corp. ET-12
* NEC uCOM-43 MCU, labeled D553C 055
* cyan VFD display Emix-104, with blue or green color overlay
-
+
This is basically a revamp of their earlier Boxing game (ET-06), case and
buttons are exactly the same.
@@ -1143,7 +1143,7 @@ WRITE8_MEMBER(efball_state::grid_w)
// H2: speaker out
if (offset == NEC_UCOM4_PORTH)
m_speaker->level_w(data >> 2 & 1);
-
+
// F,G,H01: vfd matrix grid
int shift = (offset - NEC_UCOM4_PORTF) * 4;
m_grid = (m_grid & ~(0xf << shift)) | (data << shift);
@@ -1257,7 +1257,7 @@ WRITE8_MEMBER(galaxy2_state::grid_w)
// E3: speaker out
if (offset == NEC_UCOM4_PORTE)
m_speaker->level_w(data >> 3 & 1);
-
+
// C,D,E01: vfd matrix grid
int shift = (offset - NEC_UCOM4_PORTC) * 4;
m_grid = (m_grid & ~(0xf << shift)) | (data << shift);
@@ -1557,7 +1557,7 @@ WRITE8_MEMBER(mvbfree_state::grid_w)
// E23,F,G,H: vfd matrix grid
int shift = (offset - NEC_UCOM4_PORTE) * 4;
m_grid = (m_grid & ~(0xf << shift)) | (data << shift);
-
+
// E01: plate 0,1
if (offset == NEC_UCOM4_PORTE)
plate_w(space, 2 + NEC_UCOM4_PORTC, data & 3);
@@ -1735,7 +1735,7 @@ MACHINE_CONFIG_END
Press the Serve button to start, then hit the ball by pressing one of the
positional buttons when the ball flies over it.
-
+
NOTE!: MESS external artwork is recommended
***************************************************************************/
diff --git a/src/mess/drivers/msx.c b/src/mess/drivers/msx.c
index 5f47632305c..f5e7014d255 100644
--- a/src/mess/drivers/msx.c
+++ b/src/mess/drivers/msx.c
@@ -1258,14 +1258,14 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( msx2p_floplist )
MCFG_SOFTWARE_LIST_ADD("flop_list", "msx2p_flop")
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx2_flp_l", "msx2_flop")
- MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx1_flp_l", "msx1_flop") // maybe not?
+ MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx1_flp_l", "msx1_flop") // maybe not?
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( msxr_floplist )
MCFG_SOFTWARE_LIST_ADD("flop_list", "msxr_flop")
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx2p_flp_l", "msx2p_flop")
- MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx2_flp_l", "msx2_flop") // maybe not?
- MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx1_flp_l", "msx1_flop") // maybe not?
+ MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx2_flp_l", "msx2_flop") // maybe not?
+ MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx1_flp_l", "msx1_flop") // maybe not?
MACHINE_CONFIG_END
FLOPPY_FORMATS_MEMBER( msx_state::floppy_formats )
diff --git a/src/mess/drivers/pc88va.c b/src/mess/drivers/pc88va.c
index b2eb7413f7b..33d350af686 100644
--- a/src/mess/drivers/pc88va.c
+++ b/src/mess/drivers/pc88va.c
@@ -1727,9 +1727,9 @@ WRITE_LINE_MEMBER( pc88va_state::fdc_irq )
WRITE_LINE_MEMBER(pc88va_state::pc88va_hlda_w)
{
-// m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE);
+// m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE);
- m_dmac->hack_w(state);
+ m_dmac->hack_w(state);
// printf("%02x HLDA\n",state);
}
diff --git a/src/mess/drivers/pegasus.c b/src/mess/drivers/pegasus.c
index dc74d93eff0..b39777f045c 100644
--- a/src/mess/drivers/pegasus.c
+++ b/src/mess/drivers/pegasus.c
@@ -383,7 +383,7 @@ static GFXDECODE_START( pegasus )
GFXDECODE_END
-// An encrypted single rom starts with 02, decrypted with 20.
+// An encrypted single rom starts with 02, decrypted with 20.
// The 2nd and 3rd part of a multi-rom set will have no obvious byte,
// so we check the first 4 bytes for a signature, and decrypt if found.
void pegasus_state::pegasus_decrypt_rom(UINT8 *ROM)
diff --git a/src/mess/drivers/spc1000.c b/src/mess/drivers/spc1000.c
index 071dfe9d731..246a5f494bf 100644
--- a/src/mess/drivers/spc1000.c
+++ b/src/mess/drivers/spc1000.c
@@ -24,14 +24,14 @@ NOTE: 2014-09-13: added code from someone's modified MESS driver for floppy
2014-10-11: Replaced above code with MESS-compliant code [Meeso Kim]
-
-IMPORTANT NOTE for tape usage: you *FIRST* press PLAY on the tape drive
- (e.g. by pressing F2 in partial emulated keyboard mode) and *THEN* you
+
+IMPORTANT NOTE for tape usage: you *FIRST* press PLAY on the tape drive
+ (e.g. by pressing F2 in partial emulated keyboard mode) and *THEN* you
type LOAD on the BASIC prompt!
Otherwise, the system turns the tape motor ON but it does not receive any
data from tape, and it turns it OFF before the user can press PLAY.
-
-
+
+
****************************************************************************/
/*
* SAMSUNG SPC-1000 Series (info from zannylim)
diff --git a/src/mess/includes/abc80.h b/src/mess/includes/abc80.h
index bdbb0743438..4e169b4903e 100644
--- a/src/mess/includes/abc80.h
+++ b/src/mess/includes/abc80.h
@@ -58,8 +58,8 @@
#define Z80PIO_TAG "cd67"
#define SN76477_TAG "g8"
#define RS232_TAG "ser"
-#define CASSETTE_TAG "cassette"
-#define KEYBOARD_TAG "keyboard"
+#define CASSETTE_TAG "cassette"
+#define KEYBOARD_TAG "keyboard"
#define TIMER_CASSETTE_TAG "cass"
class abc80_state : public driver_device
diff --git a/src/mess/layout/ssimon.lay b/src/mess/layout/ssimon.lay
index b37b7a3600e..38540fbfaf4 100644
--- a/src/mess/layout/ssimon.lay
+++ b/src/mess/layout/ssimon.lay
@@ -77,7 +77,7 @@
<bezel element="static_black">
<bounds left="0" right="47" top="0" bottom="53" />
</bezel>
-
+
<!-- lamps -->
<bezel name="lamp3" element="lamp_r" inputtag="IN.1" inputmask="0x08">
diff --git a/src/mess/machine/pce_cd.c b/src/mess/machine/pce_cd.c
index 03e5b8cfdf7..ffec0a7e5b4 100644
--- a/src/mess/machine/pce_cd.c
+++ b/src/mess/machine/pce_cd.c
@@ -232,7 +232,7 @@ void pce_cd_device::late_setup()
void pce_cd_device::nvram_init(nvram_device &nvram, void *data, size_t size)
{
static const UINT8 init[8] = { 0x48, 0x55, 0x42, 0x4d, 0x00, 0xa0, 0x10, 0x80 };
-
+
memset(data, 0x00, size);
memcpy(data, init, sizeof(init));
}
diff --git a/src/mess/machine/pce_cd.h b/src/mess/machine/pce_cd.h
index 580884c8f86..bf2b29423b9 100644
--- a/src/mess/machine/pce_cd.h
+++ b/src/mess/machine/pce_cd.h
@@ -61,7 +61,7 @@ public:
DECLARE_READ8_MEMBER(acard_r);
void nvram_init(nvram_device &nvram, void *data, size_t size);
-
+
private:
void adpcm_stop(UINT8 irq_flag);
void adpcm_play();
diff --git a/src/osd/modules/sound/coreaudio_sound.c b/src/osd/modules/sound/coreaudio_sound.c
index 9090a937826..e6039d0c233 100644
--- a/src/osd/modules/sound/coreaudio_sound.c
+++ b/src/osd/modules/sound/coreaudio_sound.c
@@ -847,9 +847,9 @@ bool sound_coreaudio::extract_effect_info(
CFTypeRef subtype_val = NULL;
CFTypeRef manufacturer_val = NULL;
if (CFDictionaryContainsKey(desc, CFSTR("ComponentType"))
- && CFDictionaryContainsKey(desc, CFSTR("ComponentSubType"))
- && CFDictionaryContainsKey(desc, CFSTR("ComponentManufacturer"))
- && CFDictionaryContainsKey(desc, CFSTR("ClassInfo")))
+ && CFDictionaryContainsKey(desc, CFSTR("ComponentSubType"))
+ && CFDictionaryContainsKey(desc, CFSTR("ComponentManufacturer"))
+ && CFDictionaryContainsKey(desc, CFSTR("ClassInfo")))
{
type_val = CFDictionaryGetValue(desc, CFSTR("ComponentType"));
subtype_val = CFDictionaryGetValue(desc, CFSTR("ComponentSubType"));
@@ -857,8 +857,8 @@ bool sound_coreaudio::extract_effect_info(
class_info = CFDictionaryGetValue(desc, CFSTR("ClassInfo"));
}
else if (CFDictionaryContainsKey(desc, CFSTR(kAUPresetTypeKey))
- && CFDictionaryContainsKey(desc, CFSTR(kAUPresetSubtypeKey))
- && CFDictionaryContainsKey(desc, CFSTR(kAUPresetManufacturerKey)))
+ && CFDictionaryContainsKey(desc, CFSTR(kAUPresetSubtypeKey))
+ && CFDictionaryContainsKey(desc, CFSTR(kAUPresetManufacturerKey)))
{
type_val = CFDictionaryGetValue(desc, CFSTR(kAUPresetTypeKey));
subtype_val = CFDictionaryGetValue(desc, CFSTR(kAUPresetSubtypeKey));
@@ -875,16 +875,16 @@ bool sound_coreaudio::extract_effect_info(
SInt64 type_int, subtype_int, manufacturer_int;
if ((NULL == type_val)
- || (NULL == subtype_val)
- || (NULL == manufacturer_val)
- || (NULL == class_info)
- || (CFNumberGetTypeID() != CFGetTypeID(type_val))
- || (CFNumberGetTypeID() != CFGetTypeID(subtype_val))
- || (CFNumberGetTypeID() != CFGetTypeID(manufacturer_val))
- || (CFDictionaryGetTypeID() != CFGetTypeID(class_info))
- || !CFNumberGetValue((CFNumberRef)type_val, kCFNumberSInt64Type, &type_int)
- || !CFNumberGetValue((CFNumberRef)subtype_val, kCFNumberSInt64Type, &subtype_int)
- || !CFNumberGetValue((CFNumberRef)manufacturer_val, kCFNumberSInt64Type, &manufacturer_int))
+ || (NULL == subtype_val)
+ || (NULL == manufacturer_val)
+ || (NULL == class_info)
+ || (CFNumberGetTypeID() != CFGetTypeID(type_val))
+ || (CFNumberGetTypeID() != CFGetTypeID(subtype_val))
+ || (CFNumberGetTypeID() != CFGetTypeID(manufacturer_val))
+ || (CFDictionaryGetTypeID() != CFGetTypeID(class_info))
+ || !CFNumberGetValue((CFNumberRef)type_val, kCFNumberSInt64Type, &type_int)
+ || !CFNumberGetValue((CFNumberRef)subtype_val, kCFNumberSInt64Type, &subtype_int)
+ || !CFNumberGetValue((CFNumberRef)manufacturer_val, kCFNumberSInt64Type, &manufacturer_int))
{
osd_printf_error(
"%s is not a valid AudioUnit effect description: incorrect property type(s)\n",
diff --git a/src/osd/osdcomm.h b/src/osd/osdcomm.h
index ddcb0bc9490..2df16b8db02 100644
--- a/src/osd/osdcomm.h
+++ b/src/osd/osdcomm.h
@@ -226,7 +226,7 @@ typedef UINT32 FPTR;
#ifdef _MSC_VER
#include <malloc.h>
#if _MSC_VER == 1900 // < VS2015
-#define __LINE__Var 0
+#define __LINE__Var 0
#endif
#if _MSC_VER < 1900 // < VS2015
#define snprintf _snprintf
diff --git a/src/osd/sdl/sdlprefix.h b/src/osd/sdl/sdlprefix.h
index ed1b2e11204..f46bf2a22df 100644
--- a/src/osd/sdl/sdlprefix.h
+++ b/src/osd/sdl/sdlprefix.h
@@ -81,4 +81,3 @@ struct _IO_FILE {}; //_IO_FILE is an opaque type in the emscripten libc which m
#endif
#endif /* SDLMAME_UNIX */
-
diff --git a/src/osd/windows/video.c b/src/osd/windows/video.c
index e52d09c7374..d135d7a2bc9 100644
--- a/src/osd/windows/video.c
+++ b/src/osd/windows/video.c
@@ -135,7 +135,7 @@ void win_monitor_info::refresh()
char *temp = utf8_from_tstring(m_info.szDevice);
if (temp) strncpy(m_name, temp, sizeof(m_name));
-
+
osd_free(temp);
m_pos_size = RECT_to_osd_rect(m_info.rcMonitor);
diff --git a/src/tools/regrep.c b/src/tools/regrep.c
index a550f86e61b..8c2beddf0ed 100644
--- a/src/tools/regrep.c
+++ b/src/tools/regrep.c
@@ -254,7 +254,7 @@ int main(int argc, char *argv[])
return 1;
}
std::string tempfooter(tempheader);
- tempfooter = tempfooter.substr(result + 14);
+ tempfooter = tempfooter.substr(result + 14);
tempfooter = tempheader.substr(0, result);
/* loop over arguments and read the files */
diff --git a/src/ume/dummy.lst b/src/ume/dummy.lst
index 2c9c7698de6..a7f56072e22 100644
--- a/src/ume/dummy.lst
+++ b/src/ume/dummy.lst
@@ -7,4 +7,4 @@
******************************************************************************/
-coleco \ No newline at end of file
+coleco
diff --git a/src/version.c b/src/version.c
index da26f7e0bbe..5a6d9acefbc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#define BARE_BUILD_VERSION "0.160"
+#define BARE_BUILD_VERSION "0.161"
extern const char bare_build_version[];
extern const char build_version[];