summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2015-07-29 08:34:21 +0200
committerGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2015-07-29 08:34:21 +0200
commit1b452e3bfb48e9c77e705a60ab285c382d457e8a (patch)
treeec86ee0e176d53492a6f034a473c728cc6896ad7
parentb038bdab5ba511f2af2c23e24b3508062a42b3b3 (diff)
Cleanups and version bumpmame0164
-rw-r--r--hash/a7800.xml216
-rw-r--r--hash/cgenie_cass.xml2
-rw-r--r--hash/gameking.xml26
-rw-r--r--hash/gameking3.xml42
-rw-r--r--hash/i7000_card.xml4
-rw-r--r--hash/ibm5170_cdrom.xml36
-rw-r--r--hash/msx2_flop.xml30
-rw-r--r--hash/nes.xml66
-rw-r--r--hash/pet_cass.xml4
-rw-r--r--hash/pet_flop.xml20
-rw-r--r--hash/pet_rom.xml4
-rw-r--r--hash/svi318_flop.xml10
-rw-r--r--src/emu/bus/c64/c128_partner.c18
-rw-r--r--src/emu/bus/c64/c128_partner.h4
-rw-r--r--src/emu/bus/cbmiec/c1526.h4
-rw-r--r--src/emu/bus/cbmiec/vic1515.h2
-rw-r--r--src/emu/bus/cbmiec/vic1520.h2
-rw-r--r--src/emu/bus/cpc/ddi1.c3
-rw-r--r--src/emu/bus/msx_cart/ascii.c1
-rw-r--r--src/emu/bus/msx_cart/moonsound.c9
-rw-r--r--src/emu/cpu/hphybrid/hphybrid.c1620
-rw-r--r--src/emu/cpu/hphybrid/hphybrid.h4
-rw-r--r--src/emu/cpu/m68000/m68kcpu.c12
-rw-r--r--src/emu/cpu/rsp/rsp.c8
-rw-r--r--src/emu/cpu/rsp/rspcp2.c258
-rw-r--r--src/emu/cpu/rsp/rspcp2.h20
-rw-r--r--src/emu/cpu/rsp/vadd.h1
-rw-r--r--src/emu/cpu/rsp/vcl.h2
-rw-r--r--src/emu/cpu/rsp/vmudh.h1
-rw-r--r--src/emu/cpu/rsp/vmulh.h1
-rw-r--r--src/emu/cpu/rsp/vrcpsq.h2
-rw-r--r--src/emu/cpu/rsp/vrsq.h2
-rw-r--r--src/emu/cpu/sh2/sh2.c20
-rw-r--r--src/emu/cpu/sh2/sh2.h12
-rw-r--r--src/emu/cpu/sh2/sh2comn.c9
-rw-r--r--src/emu/cpu/sm510/sm510.c30
-rw-r--r--src/emu/cpu/sm510/sm510.h10
-rw-r--r--src/emu/cpu/sm510/sm510d.c8
-rw-r--r--src/emu/cpu/sm510/sm510op.c4
-rw-r--r--src/emu/cpu/sm510/sm511core.c8
-rw-r--r--src/emu/cpu/ucom4/ucom4.h2
-rw-r--r--src/emu/cpu/ucom4/ucom4op.c2
-rw-r--r--src/emu/machine/68230pit.c214
-rw-r--r--src/emu/machine/68230pit.h4
-rw-r--r--src/emu/machine/atapihle.c2
-rw-r--r--src/emu/machine/nvram.c1
-rw-r--r--src/emu/machine/pci.c2
-rw-r--r--src/emu/machine/saturn.c2
-rw-r--r--src/emu/machine/smpc.c4
-rw-r--r--src/emu/machine/stvcd.c2
-rw-r--r--src/emu/machine/tms6100.c4
-rw-r--r--src/emu/machine/wd_fdc.h2
-rw-r--r--src/emu/mconfig.h2
-rw-r--r--src/emu/netlist/analog/nld_opamps.c27
-rw-r--r--src/emu/netlist/devices/net_lib.c4
-rw-r--r--src/emu/netlist/devices/nld_log.h2
-rw-r--r--src/emu/netlist/devices/nld_system.h6
-rw-r--r--src/emu/netlist/macro/nlm_cd4xxx.c14
-rw-r--r--src/emu/netlist/macro/nlm_opamp.c4
-rw-r--r--src/emu/netlist/macro/nlm_opamp.h6
-rw-r--r--src/emu/netlist/macro/nlm_other.c4
-rw-r--r--src/emu/netlist/macro/nlm_other.h4
-rw-r--r--src/emu/netlist/macro/nlm_ttl74xx.c4
-rw-r--r--src/emu/netlist/macro/nlm_ttl74xx.h4
-rw-r--r--src/emu/netlist/nl_base.c2
-rw-r--r--src/emu/netlist/nl_base.h6
-rw-r--r--src/emu/netlist/nl_factory.c2
-rw-r--r--src/emu/netlist/nl_setup.h2
-rw-r--r--src/emu/netlist/plib/palloc.h4
-rw-r--r--src/emu/netlist/plib/pconfig.h3
-rw-r--r--src/emu/netlist/plib/plists.h24
-rw-r--r--src/emu/netlist/plib/pstate.c1
-rw-r--r--src/emu/netlist/solver/mat_cr.h2
-rw-r--r--src/emu/netlist/solver/vector_base.h1
-rw-r--r--src/emu/netlist/tools/nl_convert.c2
-rw-r--r--src/emu/schedule.c1
-rw-r--r--src/emu/screen.h10
-rw-r--r--src/emu/sound/c140.c6
-rw-r--r--src/emu/sound/discrete.c1
-rw-r--r--src/emu/sound/scsp.c2
-rw-r--r--src/emu/sound/tms36xx.c2
-rw-r--r--src/emu/sound/ymf278b.c2
-rw-r--r--src/emu/video/hd44780.h16
-rw-r--r--src/emu/video/i82730.c6
-rw-r--r--src/emu/video/i82730.h4
-rw-r--r--src/emu/video/mb_vcu.c2
-rw-r--r--src/emu/video/rgbsse.h4
-rw-r--r--src/emu/video/vooddefs.h10
-rw-r--r--src/mame/arcade.lst48
-rw-r--r--src/mame/audio/seibu.h24
-rw-r--r--src/mame/drivers/aerofgt.c8
-rw-r--r--src/mame/drivers/aleisttl.c2
-rw-r--r--src/mame/drivers/appoooh.c2
-rw-r--r--src/mame/drivers/arkanoid.c64
-rw-r--r--src/mame/drivers/atarisy1.c2
-rw-r--r--src/mame/drivers/atarisy2.c34
-rw-r--r--src/mame/drivers/bmcpokr.c2
-rw-r--r--src/mame/drivers/chihiro.c2
-rw-r--r--src/mame/drivers/coolridr.c58
-rw-r--r--src/mame/drivers/cps2.c8
-rw-r--r--src/mame/drivers/ddenlovr.c6
-rw-r--r--src/mame/drivers/deadang.c2
-rw-r--r--src/mame/drivers/deco32.c8
-rw-r--r--src/mame/drivers/destroyr.c2
-rw-r--r--src/mame/drivers/dreamwld.c14
-rw-r--r--src/mame/drivers/dynax.c4
-rw-r--r--src/mame/drivers/firebeat.c124
-rw-r--r--src/mame/drivers/galaxian.c1
-rw-r--r--src/mame/drivers/gladiatr.c2
-rw-r--r--src/mame/drivers/gstriker.c4
-rw-r--r--src/mame/drivers/itech8.c10
-rw-r--r--src/mame/drivers/mazerbla.c4
-rw-r--r--src/mame/drivers/mcr3.c2
-rw-r--r--src/mame/drivers/midyunit.c42
-rw-r--r--src/mame/drivers/mmagic.c66
-rw-r--r--src/mame/drivers/model3.c2
-rw-r--r--src/mame/drivers/namcona1.c2
-rw-r--r--src/mame/drivers/naomi.c3
-rw-r--r--src/mame/drivers/naughtyb.c4
-rw-r--r--src/mame/drivers/nbmj9195.c2
-rw-r--r--src/mame/drivers/nycaptor.c2
-rw-r--r--src/mame/drivers/pcktgal.c2
-rw-r--r--src/mame/drivers/photon2.c4
-rw-r--r--src/mame/drivers/poolshrk.c2
-rw-r--r--src/mame/drivers/rainbow.c82
-rw-r--r--src/mame/drivers/sbowling.c2
-rw-r--r--src/mame/drivers/segas32.c8
-rw-r--r--src/mame/drivers/segaybd.c6
-rw-r--r--src/mame/drivers/silvmil.c14
-rw-r--r--src/mame/drivers/suna8.c2
-rw-r--r--src/mame/drivers/system1.c6
-rw-r--r--src/mame/drivers/system16.c8
-rw-r--r--src/mame/drivers/taitoair.c28
-rw-r--r--src/mame/drivers/thedealr.c74
-rw-r--r--src/mame/drivers/tnzs.c2
-rw-r--r--src/mame/drivers/ttchamp.c4
-rw-r--r--src/mame/drivers/turbo.c10
-rw-r--r--src/mame/drivers/vegas.c12
-rw-r--r--src/mame/drivers/xyonix.c4
-rw-r--r--src/mame/includes/cclimber.h2
-rw-r--r--src/mame/includes/deco32.h4
-rw-r--r--src/mame/includes/itech8.h4
-rw-r--r--src/mame/includes/micro3d.h20
-rw-r--r--src/mame/includes/nbmj9195.h2
-rw-r--r--src/mame/includes/pcktgal.h2
-rw-r--r--src/mame/includes/taitoair.h4
-rw-r--r--src/mame/machine/awboard.c10
-rw-r--r--src/mame/machine/dc.c1
-rw-r--r--src/mame/machine/fd1089.c2
-rw-r--r--src/mame/machine/m1comm.c4
-rw-r--r--src/mame/machine/mc8123.h1
-rw-r--r--src/mame/machine/pgmcrypt.c2
-rw-r--r--src/mame/machine/s32comm.c142
-rw-r--r--src/mame/machine/s32comm.h18
-rw-r--r--src/mame/machine/segacrp2.c2
-rw-r--r--src/mame/machine/segacrp2.h2
-rw-r--r--src/mame/mess.lst2
-rw-r--r--src/mame/video/deco32.c10
-rw-r--r--src/mame/video/hexion.c2
-rw-r--r--src/mame/video/itech8.c2
-rw-r--r--src/mame/video/namcona1.c4
-rw-r--r--src/mame/video/naughtyb.c2
-rw-r--r--src/mame/video/nbmj9195.c6
-rw-r--r--src/mame/video/segas32.c4
-rw-r--r--src/mame/video/shadfrce.c3
-rw-r--r--src/mame/video/starcrus.c2
-rw-r--r--src/mame/video/taitoair.c32
-rw-r--r--src/mame/video/tank8.c2
-rw-r--r--src/mame/video/vsystem_spr.c6
-rw-r--r--src/mess/drivers/apple2.c4
-rw-r--r--src/mess/drivers/casloopy.c2
-rw-r--r--src/mess/drivers/coleco.c2
-rw-r--r--src/mess/drivers/daruma.c144
-rw-r--r--src/mess/drivers/force68k.c110
-rw-r--r--src/mess/drivers/hh_sm510.c4
-rw-r--r--src/mess/drivers/hp64k.c396
-rw-r--r--src/mess/drivers/i7000.c238
-rw-r--r--src/mess/drivers/icatel.c26
-rw-r--r--src/mess/drivers/rainbow.c30
-rw-r--r--src/mess/drivers/rambo.c284
-rw-r--r--src/mess/drivers/rc759.c18
-rw-r--r--src/mess/drivers/sdk80.c48
-rw-r--r--src/mess/drivers/smc777.c38
-rw-r--r--src/mess/drivers/tb303.c24
-rw-r--r--src/mess/drivers/xbox.c52
-rw-r--r--src/mess/layout/tb303.lay2
-rw-r--r--src/mess/machine/amstrad.c2
-rw-r--r--src/tools/nltool.c1
-rw-r--r--src/tools/nlwav.c67
-rw-r--r--src/version.c2
190 files changed, 2783 insertions, 2812 deletions
diff --git a/hash/a7800.xml b/hash/a7800.xml
index c9419c1f050..e6707a568ce 100644
--- a/hash/a7800.xml
+++ b/hash/a7800.xml
@@ -2370,112 +2370,112 @@ almost nothing like the prototype.
</software>
<!-- XM board enhanced -->
- <!-- from http://atariage.com/forums/topic/204250-donkey-kong-xm-pre-order-and-demo/ -->
-
- <!-- these ones are listed as 'working in MESS' but are apparently the only images that work on real hardware too -->
- <software name="dkongxm">
- <description>Donkey Kong (PAL, Demo, XM enhanced, V1.2)</description>
- <year>2012</year>
- <publisher>&lt;homebrew&gt;</publisher>
- <info name="programmer" value="TEP392" />
- <sharedfeat name="compatibility" value="PAL"/>
- <part name="cart" interface="a7800_cart">
- <feature name="slot" value="a78_sg9" />
- <dataarea name="rom" size="147456">
- <rom name="dkxm_demo_v12_pal.bin" size="147456" crc="9f6c0600" sha1="18409eace880dda3646792f9ec050a87a3b1b382" offset="0" />
- </dataarea>
- </part>
- </software>
-
- <software name="dkongxmu" cloneof="dkongxm">
- <description>Donkey Kong (NTSC, Demo, XM enhanced, V1.2)</description>
- <year>2012</year>
- <publisher>&lt;homebrew&gt;</publisher>
- <info name="programmer" value="TEP392" />
- <sharedfeat name="compatibility" value="NTSC"/>
- <part name="cart" interface="a7800_cart">
- <feature name="slot" value="a78_sg9" />
- <dataarea name="rom" size="147456">
- <rom name="dkxm_demo_v12_ntsc.bin" size="147456" crc="8b06bb4b" sha1="3129cbc91dc8f223f00db5c3273a4a330320be99" offset="0" />
- </dataarea>
- </part>
- </software>
-
- <!-- these are listed as 'with HSC emulation' and are designed for the prosystem emulator, they simulate some of the HSC features -->
- <!-- remove them? -->
-
- <software name="dkongxmps" cloneof="dkongxm" supported="no">
- <description>Donkey Kong (PAL, Demo, XM enhanced, V1.2, for prosystem emulator)</description>
- <year>2012</year>
- <publisher>&lt;homebrew&gt;</publisher>
- <info name="programmer" value="TEP392" />
- <sharedfeat name="compatibility" value="PAL"/>
- <part name="cart" interface="a7800_cart">
- <feature name="slot" value="a78_sg9" />
- <dataarea name="rom" size="147456">
- <rom name="dkxm_final_demo_pal_hsc.bin" size="147456" crc="6510b674" sha1="65b723b470d287af51e9888813149c43fb11ac26" offset="0" />
- </dataarea>
- </part>
- </software>
-
- <software name="dkongxmups" cloneof="dkongxm" supported="no">
- <description>Donkey Kong (NTSC, Demo, XM enhanced, V1.2, for prosystem emulator)</description>
- <year>2012</year>
- <publisher>&lt;homebrew&gt;</publisher>
- <info name="programmer" value="TEP392" />
- <sharedfeat name="compatibility" value="NTSC"/>
- <part name="cart" interface="a7800_cart">
- <feature name="slot" value="a78_sg9" />
- <dataarea name="rom" size="147456">
- <rom name="dkxm_final_demo_ntsc_hsc.bin" size="147456" crc="2c67fea7" sha1="7825c1946e3c7492fa9bbfae33029cd68c0d1135" offset="0" />
- </dataarea>
- </part>
- </software>
-
-
-
- <!-- an older version? sound is broken, did it work on the real hardware? -->
- <software name="dkongxmo" cloneof="dkongxm" supported="no">
- <description>Donkey Kong (PAL, Demo, XM enhanced, older)</description>
- <year>2012</year>
- <publisher>&lt;homebrew&gt;</publisher>
- <info name="programmer" value="TEP392" />
- <sharedfeat name="compatibility" value="PAL"/>
- <part name="cart" interface="a7800_cart">
- <feature name="slot" value="a78_sg9" />
- <dataarea name="rom" size="147456">
- <rom name="dkxm_final_demo_pal.bin" size="147456" crc="d362712e" sha1="118c462d6698bd23c378785f80062fdd7d65ca00" offset="0" />
- </dataarea>
- </part>
- </software>
-
- <software name="dkongxmou" cloneof="dkongxm" supported="no" >
- <description>Donkey Kong (NTSC, Demo, XM enhanced, older)</description>
- <year>2012</year>
- <publisher>&lt;homebrew&gt;</publisher>
- <info name="programmer" value="TEP392" />
- <sharedfeat name="compatibility" value="NTSC"/>
- <part name="cart" interface="a7800_cart">
- <feature name="slot" value="a78_sg9" />
- <dataarea name="rom" size="147456">
- <rom name="dkxm_final_demo_ntsc.bin" size="147456" crc="6e170055" sha1="f4da231312da06ff9e8af5681b5013b14886b455" offset="0" />
- </dataarea>
- </part>
- </software>
-
- <!-- this one is meant to detect PAL / NTSC and runs on an A7800 CC2 development board, without sound? based off older code? -->
- <software name="dkongxmcc" cloneof="dkongxm" supported="no">
- <description>Donkey Kong (PAL/NTSC, Demo, XM enhanced, older, for CC2 board)</description>
- <year>2012</year>
- <publisher>&lt;homebrew&gt;</publisher>
- <info name="programmer" value="TEP392" />
- <part name="cart" interface="a7800_cart">
- <feature name="slot" value="a78_sg9" />
- <dataarea name="rom" size="147456">
- <rom name="dkxm_final_demo.bin" size="0x20000" crc="fd503bd4" sha1="454d754a0c4603323e476d9418f343a6a1a0d017" offset="0x4000" />
- <rom size="0x4000" offset="0x0000" loadflag="continue" />
- </dataarea>
- </part>
- </software>
-
+ <!-- from http://atariage.com/forums/topic/204250-donkey-kong-xm-pre-order-and-demo/ -->
+
+ <!-- these ones are listed as 'working in MESS' but are apparently the only images that work on real hardware too -->
+ <software name="dkongxm">
+ <description>Donkey Kong (PAL, Demo, XM enhanced, V1.2)</description>
+ <year>2012</year>
+ <publisher>&lt;homebrew&gt;</publisher>
+ <info name="programmer" value="TEP392" />
+ <sharedfeat name="compatibility" value="PAL"/>
+ <part name="cart" interface="a7800_cart">
+ <feature name="slot" value="a78_sg9" />
+ <dataarea name="rom" size="147456">
+ <rom name="dkxm_demo_v12_pal.bin" size="147456" crc="9f6c0600" sha1="18409eace880dda3646792f9ec050a87a3b1b382" offset="0" />
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="dkongxmu" cloneof="dkongxm">
+ <description>Donkey Kong (NTSC, Demo, XM enhanced, V1.2)</description>
+ <year>2012</year>
+ <publisher>&lt;homebrew&gt;</publisher>
+ <info name="programmer" value="TEP392" />
+ <sharedfeat name="compatibility" value="NTSC"/>
+ <part name="cart" interface="a7800_cart">
+ <feature name="slot" value="a78_sg9" />
+ <dataarea name="rom" size="147456">
+ <rom name="dkxm_demo_v12_ntsc.bin" size="147456" crc="8b06bb4b" sha1="3129cbc91dc8f223f00db5c3273a4a330320be99" offset="0" />
+ </dataarea>
+ </part>
+ </software>
+
+ <!-- these are listed as 'with HSC emulation' and are designed for the prosystem emulator, they simulate some of the HSC features -->
+ <!-- remove them? -->
+
+ <software name="dkongxmps" cloneof="dkongxm" supported="no">
+ <description>Donkey Kong (PAL, Demo, XM enhanced, V1.2, for prosystem emulator)</description>
+ <year>2012</year>
+ <publisher>&lt;homebrew&gt;</publisher>
+ <info name="programmer" value="TEP392" />
+ <sharedfeat name="compatibility" value="PAL"/>
+ <part name="cart" interface="a7800_cart">
+ <feature name="slot" value="a78_sg9" />
+ <dataarea name="rom" size="147456">
+ <rom name="dkxm_final_demo_pal_hsc.bin" size="147456" crc="6510b674" sha1="65b723b470d287af51e9888813149c43fb11ac26" offset="0" />
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="dkongxmups" cloneof="dkongxm" supported="no">
+ <description>Donkey Kong (NTSC, Demo, XM enhanced, V1.2, for prosystem emulator)</description>
+ <year>2012</year>
+ <publisher>&lt;homebrew&gt;</publisher>
+ <info name="programmer" value="TEP392" />
+ <sharedfeat name="compatibility" value="NTSC"/>
+ <part name="cart" interface="a7800_cart">
+ <feature name="slot" value="a78_sg9" />
+ <dataarea name="rom" size="147456">
+ <rom name="dkxm_final_demo_ntsc_hsc.bin" size="147456" crc="2c67fea7" sha1="7825c1946e3c7492fa9bbfae33029cd68c0d1135" offset="0" />
+ </dataarea>
+ </part>
+ </software>
+
+
+
+ <!-- an older version? sound is broken, did it work on the real hardware? -->
+ <software name="dkongxmo" cloneof="dkongxm" supported="no">
+ <description>Donkey Kong (PAL, Demo, XM enhanced, older)</description>
+ <year>2012</year>
+ <publisher>&lt;homebrew&gt;</publisher>
+ <info name="programmer" value="TEP392" />
+ <sharedfeat name="compatibility" value="PAL"/>
+ <part name="cart" interface="a7800_cart">
+ <feature name="slot" value="a78_sg9" />
+ <dataarea name="rom" size="147456">
+ <rom name="dkxm_final_demo_pal.bin" size="147456" crc="d362712e" sha1="118c462d6698bd23c378785f80062fdd7d65ca00" offset="0" />
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="dkongxmou" cloneof="dkongxm" supported="no" >
+ <description>Donkey Kong (NTSC, Demo, XM enhanced, older)</description>
+ <year>2012</year>
+ <publisher>&lt;homebrew&gt;</publisher>
+ <info name="programmer" value="TEP392" />
+ <sharedfeat name="compatibility" value="NTSC"/>
+ <part name="cart" interface="a7800_cart">
+ <feature name="slot" value="a78_sg9" />
+ <dataarea name="rom" size="147456">
+ <rom name="dkxm_final_demo_ntsc.bin" size="147456" crc="6e170055" sha1="f4da231312da06ff9e8af5681b5013b14886b455" offset="0" />
+ </dataarea>
+ </part>
+ </software>
+
+ <!-- this one is meant to detect PAL / NTSC and runs on an A7800 CC2 development board, without sound? based off older code? -->
+ <software name="dkongxmcc" cloneof="dkongxm" supported="no">
+ <description>Donkey Kong (PAL/NTSC, Demo, XM enhanced, older, for CC2 board)</description>
+ <year>2012</year>
+ <publisher>&lt;homebrew&gt;</publisher>
+ <info name="programmer" value="TEP392" />
+ <part name="cart" interface="a7800_cart">
+ <feature name="slot" value="a78_sg9" />
+ <dataarea name="rom" size="147456">
+ <rom name="dkxm_final_demo.bin" size="0x20000" crc="fd503bd4" sha1="454d754a0c4603323e476d9418f343a6a1a0d017" offset="0x4000" />
+ <rom size="0x4000" offset="0x0000" loadflag="continue" />
+ </dataarea>
+ </part>
+ </software>
+
</softwarelist>
diff --git a/hash/cgenie_cass.xml b/hash/cgenie_cass.xml
index f77be698f80..ba21742dae9 100644
--- a/hash/cgenie_cass.xml
+++ b/hash/cgenie_cass.xml
@@ -88,7 +88,7 @@ distributor of the Colour Genie EG2000 computers.
</software>
<!-- Missing: Break Out -->
- <!-- Missing: Colour-Assembler -->
+ <!-- Missing: Colour-Assembler -->
<software name="colcom" supported="yes">
<description>Colour Basic Compiler 3.05</description>
diff --git a/hash/gameking.xml b/hash/gameking.xml
index 1a142f87cf0..84a01b7414c 100644
--- a/hash/gameking.xml
+++ b/hash/gameking.xml
@@ -17,18 +17,18 @@
</part>
</software>
- <software name="4in1a" supported="no">
- <description>4 in 1 Vol. 8</description>
- <year>200?</year>
- <publisher>TimeTop</publisher>
- <part name="cart" interface="gameking_cart">
- <dataarea name="rom" size="524288">
- <rom name="4in1_vol8.bin" size="524288" crc="6741847e" sha1="b561ca1b52e3492f86e7558722c8c8956e845bc5" offset="0x00000" />
- </dataarea>
- </part>
- </software>
-
- <software name="2004" supported="no">
+ <software name="4in1a" supported="no">
+ <description>4 in 1 Vol. 8</description>
+ <year>200?</year>
+ <publisher>TimeTop</publisher>
+ <part name="cart" interface="gameking_cart">
+ <dataarea name="rom" size="524288">
+ <rom name="4in1_vol8.bin" size="524288" crc="6741847e" sha1="b561ca1b52e3492f86e7558722c8c8956e845bc5" offset="0x00000" />
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="2004" supported="no">
<description>2004</description>
<year>200?</year>
<publisher>TimeTop</publisher>
@@ -238,5 +238,5 @@
</software>
-
+
</softwarelist>
diff --git a/hash/gameking3.xml b/hash/gameking3.xml
index 3b674de0a9c..656d1d3b903 100644
--- a/hash/gameking3.xml
+++ b/hash/gameking3.xml
@@ -5,26 +5,26 @@
<softwarelist name="gameking3" description="TimeTop GameKing 3 cartridges">
- <software name="urgent" supported="no">
- <description>Urgent Action</description>
- <year>200?</year>
- <publisher>TimeTop</publisher>
- <part name="cart" interface="gameking_cart">
- <dataarea name="rom" size="524288">
- <rom name="urgenaction.gk3" size="524288" crc="dcf935f8" sha1="9c1375c622caab9e328ee66434087a18a16ea036" offset="0x00000" />
- </dataarea>
- </part>
- </software>
+ <software name="urgent" supported="no">
+ <description>Urgent Action</description>
+ <year>200?</year>
+ <publisher>TimeTop</publisher>
+ <part name="cart" interface="gameking_cart">
+ <dataarea name="rom" size="524288">
+ <rom name="urgenaction.gk3" size="524288" crc="dcf935f8" sha1="9c1375c622caab9e328ee66434087a18a16ea036" offset="0x00000" />
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="adventr" supported="no">
+ <description>Adventure</description>
+ <year>200?</year>
+ <publisher>TimeTop</publisher>
+ <part name="cart" interface="gameking_cart">
+ <dataarea name="rom" size="524288">
+ <rom name="adventure.gk3" size="524288" crc="70082274" sha1="83b164719b2c2d5c133ca05c9fac0102b0d88e4c" offset="0x00000" />
+ </dataarea>
+ </part>
+ </software>
- <software name="adventr" supported="no">
- <description>Adventure</description>
- <year>200?</year>
- <publisher>TimeTop</publisher>
- <part name="cart" interface="gameking_cart">
- <dataarea name="rom" size="524288">
- <rom name="adventure.gk3" size="524288" crc="70082274" sha1="83b164719b2c2d5c133ca05c9fac0102b0d88e4c" offset="0x00000" />
- </dataarea>
- </part>
- </software>
-
</softwarelist>
diff --git a/hash/i7000_card.xml b/hash/i7000_card.xml
index 8ea5feb708c..934575f4194 100644
--- a/hash/i7000_card.xml
+++ b/hash/i7000_card.xml
@@ -62,9 +62,9 @@ cartridges data available in this softlist.
<part name="card" interface="i7000_card">
<dataarea name="rom" size="0x6000">
<rom name="i-7107_set_vt52_v1.0_r02_25_02_86_1.rom" size="0x2000" crc="ead3f48e" sha1="ec7951591cab8e8c2cb22f7e6352c709d24b9706" offset="0x0000" />
- <!-- the 2nd EPROM connector is unpopulated -->
+ <!-- the 2nd EPROM connector is unpopulated -->
<rom name="i-7107_set_vt52_v1.0_r02_25_02_86_2.rom" size="0x2000" crc="da848ec0" sha1="7ed1898de94c7382c081ec3a78f60a6850daa25a" offset="0x4000" />
- <!-- the 4th EPROM connector is unpopulated -->
+ <!-- the 4th EPROM connector is unpopulated -->
</dataarea>
</part>
</software>
diff --git a/hash/ibm5170_cdrom.xml b/hash/ibm5170_cdrom.xml
index c45a4079679..cdcef4ea965 100644
--- a/hash/ibm5170_cdrom.xml
+++ b/hash/ibm5170_cdrom.xml
@@ -95,8 +95,8 @@
</part>
</software>
- <!-- Untouched image from original CD created with an ASUS DRW-1814BLT (EAC drive sample read offset reported as +6)
- If you subtract 0x18 (4 * 6) bytes from a .wav extracted from this CHD the audio matches a rip done with EAC (verified) -->
+ <!-- Untouched image from original CD created with an ASUS DRW-1814BLT (EAC drive sample read offset reported as +6)
+ If you subtract 0x18 (4 * 6) bytes from a .wav extracted from this CHD the audio matches a rip done with EAC (verified) -->
<software name="kingsq6e">
<description>King's Quest VI (Windows 3.1 enhanced)</description>
<year>1993</year>
@@ -109,8 +109,8 @@
</part>
</software>
- <!-- Untouched image from original CD created with an ASUS DRW-1814BLT (EAC drive sample read offset reported as +6)
- If you subtract 0x18 (4 * 6) bytes from a .wav extracted from this CHD the audio matches a rip done with EAC (verified) -->
+ <!-- Untouched image from original CD created with an ASUS DRW-1814BLT (EAC drive sample read offset reported as +6)
+ If you subtract 0x18 (4 * 6) bytes from a .wav extracted from this CHD the audio matches a rip done with EAC (verified) -->
<software name="krondor">
<description>Betrayal at Krondor (1994 release, CDDA)</description>
<year>1994</year>
@@ -122,7 +122,7 @@
</diskarea>
</part>
</software>
-
+
<software name="krondora" cloneof="krondor">
<description>Betrayal at Krondor (1998 release, no CDDA)</description>
<year>1998</year>
@@ -135,9 +135,9 @@
</part>
</software>
- <!-- various Windows CDROMs
- so far the listed discs should all be full english language retail discs, this can be expanded later -->
-
+ <!-- various Windows CDROMs
+ so far the listed discs should all be full english language retail discs, this can be expanded later -->
+
<software name="win95">
<description>Windows 95 (en 4.00.950)</description>
<year>1995</year>
@@ -161,7 +161,7 @@
</diskarea>
</part>
</software>
-
+
<software name="win95b">
<description>Windows 95 OSR2 (en 4.00.1111.osr2)</description> <!-- aka Windows 95B -->
<year>1995</year>
@@ -172,9 +172,9 @@
<disk name="win95_4.00.1111_osr2_en" sha1="e15bd9a4e2c930bd4913996a2d9d11d1567635f5" />
</diskarea>
</part>
- </software>
-
- <software name="win95c">
+ </software>
+
+ <software name="win95c">
<description>Windows 95 OSR2.5 (en 4.03.1216.osr2.5)</description> <!-- aka Windows 95C -->
<year>1995</year>
<publisher>Microsoft</publisher>
@@ -184,9 +184,9 @@
<disk name="win95_4.03.1216_osr2_5_en" sha1="b000931531cedcbb3f9a00d13d315406cf7c2d52" />
</diskarea>
</part>
- </software>
-
- <software name="win98">
+ </software>
+
+ <software name="win98">
<description>Windows 98 (en 4.10.1998) (Retail Full)</description> <!-- aka Windows 98 First Edition -->
<year>1998</year>
<publisher>Microsoft</publisher>
@@ -198,7 +198,7 @@
</part>
</software>
- <software name="win98se">
+ <software name="win98se">
<description>Windows 98 Second Edition (en 4.10.2222) (Retail Full)</description>
<year>1998</year>
<publisher>Microsoft</publisher>
@@ -210,7 +210,7 @@
</part>
</software>
- <software name="winme">
+ <software name="winme">
<description>Windows ME (en 4.90.3000) (Retail Full)</description> <!-- aka Millennium Edition -->
<year>1999</year>
<publisher>Microsoft</publisher>
@@ -222,7 +222,7 @@
</part>
</software>
- <software name="win2kps4">
+ <software name="win2kps4">
<description>Windows 2000 Professional (with Service Pack 4) (en 5.00.2195.6717)</description>
<year>1999</year>
<publisher>Microsoft</publisher>
diff --git a/hash/msx2_flop.xml b/hash/msx2_flop.xml
index 00c7bc7c54e..8d55a917e99 100644
--- a/hash/msx2_flop.xml
+++ b/hash/msx2_flop.xml
@@ -11175,21 +11175,21 @@ The following floppies came with the machines.
<description>The Tower? of Cabin - Cabin Panic (Jpn)</description>
<year>1992</year>
<publisher>Micro Cabin</publisher>
- <part name="flop1" interface="floppy_3_5">
- <dataarea name="flop" size="737280">
- <rom name="tower of cabin, the (1992)(micro cabin)(jp)(disk 1 of 3).dsk" size="737280" crc="0471dbee" sha1="0e8d2b0177bd601e84c71735b4b498be2818085f" offset="0" />
- </dataarea>
- </part>
- <part name="flop2" interface="floppy_3_5">
- <dataarea name="flop" size="737280">
- <rom name="tower of cabin, the (1992)(micro cabin)(jp)(disk 2 of 3).dsk" size="737280" crc="0d3afd17" sha1="d8cb95e558065b19f21f434a97a4a59b1892fc1a" offset="0" />
- </dataarea>
- </part>
- <part name="flop3" interface="floppy_3_5">
- <dataarea name="flop" size="737280">
- <rom name="tower of cabin, the (1992)(micro cabin)(jp)(disk 3 of 3).dsk" size="737280" crc="9ad7d280" sha1="ed0e55d97817e9d98d563fdeb634cc6443564840" offset="0" />
- </dataarea>
- </part>
+ <part name="flop1" interface="floppy_3_5">
+ <dataarea name="flop" size="737280">
+ <rom name="tower of cabin, the (1992)(micro cabin)(jp)(disk 1 of 3).dsk" size="737280" crc="0471dbee" sha1="0e8d2b0177bd601e84c71735b4b498be2818085f" offset="0" />
+ </dataarea>
+ </part>
+ <part name="flop2" interface="floppy_3_5">
+ <dataarea name="flop" size="737280">
+ <rom name="tower of cabin, the (1992)(micro cabin)(jp)(disk 2 of 3).dsk" size="737280" crc="0d3afd17" sha1="d8cb95e558065b19f21f434a97a4a59b1892fc1a" offset="0" />
+ </dataarea>
+ </part>
+ <part name="flop3" interface="floppy_3_5">
+ <dataarea name="flop" size="737280">
+ <rom name="tower of cabin, the (1992)(micro cabin)(jp)(disk 3 of 3).dsk" size="737280" crc="9ad7d280" sha1="ed0e55d97817e9d98d563fdeb634cc6443564840" offset="0" />
+ </dataarea>
+ </part>
</software>
<software name="towercaba" cloneof="towercab">
diff --git a/hash/nes.xml b/hash/nes.xml
index b477cc2fd51..c3dd3d6749c 100644
--- a/hash/nes.xml
+++ b/hash/nes.xml
@@ -79879,39 +79879,39 @@ that the real dumps might surface -->
</dataarea>
</part>
</software>
-
- <software name="mc_cb280" supported="no">
- <description>Coolboy RS-18 (280-in-1)</description>
- <year>19??</year>
- <publisher>&lt;unknown&gt;</publisher>
- <part name="cart" interface="nes_cart">
- <!--<feature name="slot" value="coolboy" />
- <feature name="pcb" value="UNL-COOLBOY" /> -->
- <dataarea name="prg" size="4194304">
- <rom name="w25q32.u5" size="4194304" crc="c9541bdf" sha1="f0ce46f18658ca5dbed881e5a80460e59820bbd0" offset="00000" />
- </dataarea>
- <!-- ?? -->
- <dataarea name="vram" size="131072">
- </dataarea>
- </part>
- </software>
-
- <software name="mc_samur" supported="no">
- <!-- a VT03 OneBus based system -->
- <description>Samurai (60-in-1)</description>
- <year>2006</year>
- <publisher>Team Hummer</publisher>
- <part name="cart" interface="nes_cart">
- <dataarea name="prg" size="2097152">
- <rom name="29lv160b.bin" size="2097152" crc="7dac8efe" sha1="ffb27ebb4299d5b9a4b976c418fcc7695200060c" offset="00000" />
- </dataarea>
- <!-- ?? -->
- <dataarea name="vram" size="131072">
- </dataarea>
- </part>
- </software>
-
- <software name="mc_sg360" supported="no">
+
+ <software name="mc_cb280" supported="no">
+ <description>Coolboy RS-18 (280-in-1)</description>
+ <year>19??</year>
+ <publisher>&lt;unknown&gt;</publisher>
+ <part name="cart" interface="nes_cart">
+ <!--<feature name="slot" value="coolboy" />
+ <feature name="pcb" value="UNL-COOLBOY" /> -->
+ <dataarea name="prg" size="4194304">
+ <rom name="w25q32.u5" size="4194304" crc="c9541bdf" sha1="f0ce46f18658ca5dbed881e5a80460e59820bbd0" offset="00000" />
+ </dataarea>
+ <!-- ?? -->
+ <dataarea name="vram" size="131072">
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="mc_samur" supported="no">
+ <!-- a VT03 OneBus based system -->
+ <description>Samurai (60-in-1)</description>
+ <year>2006</year>
+ <publisher>Team Hummer</publisher>
+ <part name="cart" interface="nes_cart">
+ <dataarea name="prg" size="2097152">
+ <rom name="29lv160b.bin" size="2097152" crc="7dac8efe" sha1="ffb27ebb4299d5b9a4b976c418fcc7695200060c" offset="00000" />
+ </dataarea>
+ <!-- ?? -->
+ <dataarea name="vram" size="131072">
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="mc_sg360" supported="no">
<description>Super Game 360-in-1</description>
<year>19??</year>
<publisher>&lt;unknown&gt;</publisher>
diff --git a/hash/pet_cass.xml b/hash/pet_cass.xml
index 09179d09a33..b72e3dcb304 100644
--- a/hash/pet_cass.xml
+++ b/hash/pet_cass.xml
@@ -2635,7 +2635,7 @@
<software name="ppdm2">
<description>The Pet Professor Whole Numbers Fractions Decimals D-M-2</description>
<year>1979</year>
-
+
<!-- pet2001n16 Side A: DEC.MULT.2-PP -->
<publisher>Cow Bay Computing</publisher>
<part name="cass" interface="cbm_cass">
@@ -2700,7 +2700,7 @@
<software name="ppds2">
<description>The Pet Professor Whole Numbers Fractions Decimals D-S-2</description>
<year>1979</year>
-
+
<!-- pet2001n16 Side A: DEC.SUB.2-PP -->
<publisher>Cow Bay Computing</publisher>
<part name="cass" interface="cbm_cass">
diff --git a/hash/pet_flop.xml b/hash/pet_flop.xml
index 54425074044..f47efa77d98 100644
--- a/hash/pet_flop.xml
+++ b/hash/pet_flop.xml
@@ -168,16 +168,16 @@
<!--
VisiCalc(R) PET 2001, CBM 2001
Program Diskette and CBM 8032 32K
- [VisiCorp logo] for 2040 and 4040
+ [VisiCorp logo] for 2040 and 4040
One of the VisiTM programs Diskette Drives
from VisiCorp by Software Arts, Inc.
- VisiCorpTM
- PERSONAL SOFTWARETM
+ VisiCorpTM
+ PERSONAL SOFTWARETM
Program Copyright (C) 1979, 1981
Software Arts, Inc. All Rights Reserved
- 20910-5511
+ 20910-5511
-->
<part name="flop1" interface="floppy_5_25">
<dataarea name="flop" size="174848">
@@ -201,16 +201,16 @@
<!--
VisiCalc(R) PET 2001, CBM 2001
Program Diskette CBM 8032 and CBM 8096
- [VisiCorp logo] for 8050 Diskette Drive
+ [VisiCorp logo] for 8050 Diskette Drive
One of the VisiTM programs by Software Arts, Inc.
from VisiCorp
- VisiCorpTM
- PERSONAL SOFTWARETM
+ VisiCorpTM
+ PERSONAL SOFTWARETM
Program Copyright (C) 1979, 1982
Software Arts, Inc. All Rights Reserved
- 20910-5612
+ 20910-5612
-->
<part name="flop1" interface="floppy_5_25">
<dataarea name="flop" size="533248">
@@ -825,7 +825,7 @@
<info name="serial" value="CP2-620-580" />
<!--
- C P / M ( R ) V e r s i o n 2 . 2
+ C P / M ( R ) V e r s i o n 2 . 2
( C ) 1 9 7 6 - 1 9 8 0 D i g i t a l R e s e a r c h
s e r i a l # C P 2 - 6 2 0 - 5 8 0 # #
8050 format / 4040 on back (C) 1982 Madison Computer
@@ -849,7 +849,7 @@
<year>2012</year>
<publisher>Steve Gray</publisher>
<!-- These disks contain some programs typed in from the HSG manual,
- along with new programs that were written in 2012. -->
+ along with new programs that were written in 2012. -->
<part name="flop1" interface="floppy_5_25">
<dataarea name="flop" size="174848">
diff --git a/hash/pet_rom.xml b/hash/pet_rom.xml
index 94cbcf4ec16..630a009d685 100644
--- a/hash/pet_rom.xml
+++ b/hash/pet_rom.xml
@@ -292,9 +292,9 @@
<part name="rom" interface="pet_b000_rom">
<!--
TODO: The screen fills with garbage when run like this:
- $ mame64 pet2001n32 toolkit2
+ $ mame64 pet2001n32 toolkit2
and started with:
- SYS 45056
+ SYS 45056
We need to check this and should add notes with the emulator
options required to run the various versions of Toolkit.
-->
diff --git a/hash/svi318_flop.xml b/hash/svi318_flop.xml
index cec4a987cd9..cfd205ceddc 100644
--- a/hash/svi318_flop.xml
+++ b/hash/svi318_flop.xml
@@ -54,7 +54,7 @@ Rädda disketten (198x)(sv)
<dataarea name="flop" size="172032">
<rom name="cpmss.dsk" size="172032" crc="cb7f1edb" sha1="676b5752141acaba7f1056909ed75be53ff388ff" offset="0" />
</dataarea>
- </part>
+ </part>
</software>
<software name="cpm224ds">
@@ -65,7 +65,7 @@ Rädda disketten (198x)(sv)
<dataarea name="flop" size="346112">
<rom name="cpmds.dsk" size="346112" crc="f7323e1a" sha1="7bfd8c46f8361cb31e9f4f640448cddaad91c55b" offset="0" />
</dataarea>
- </part>
+ </part>
</software>
<software name="diskbas">
@@ -76,9 +76,9 @@ Rädda disketten (198x)(sv)
<dataarea name="flop" size="346112">
<rom name="diskbasic10.dsk" size="346112" crc="0744ac56" sha1="eef7d033263d1cc2703d019bf062b1a02b641570" offset="0" />
</dataarea>
- </part>
+ </part>
</software>
-
+
<software name="zcpr3">
<description>Z-CPR3</description>
<year>1985?</year>
@@ -87,7 +87,7 @@ Rädda disketten (198x)(sv)
<dataarea name="flop" size="172032">
<rom name="zcpr3.dsk" size="172032" crc="a6ea5b81" sha1="c08a6743e713fe8f3b8b694cd92fc70680fc6f66" offset="0" />
</dataarea>
- </part>
+ </part>
</software>
</softwarelist>
diff --git a/src/emu/bus/c64/c128_partner.c b/src/emu/bus/c64/c128_partner.c
index 3b261d24796..07848e1c7d9 100644
--- a/src/emu/bus/c64/c128_partner.c
+++ b/src/emu/bus/c64/c128_partner.c
@@ -11,15 +11,15 @@
PCB Layout
----------
- |---------------|
- |LS74 SW CN|
- |LS09 LS273|
- |LS139 RAM |
- |LS133 |
- | LS240 |
- |LS33 ROM |
- |LS09 |
- |||||||||||||||
+ |---------------|
+ |LS74 SW CN|
+ |LS09 LS273|
+ |LS139 RAM |
+ |LS133 |
+ | LS240 |
+ |LS33 ROM |
+ |LS09 |
+ |||||||||||||||
ROM - Toshiba TMM24128AP 16Kx8 EPROM (blank label)
RAM - Sony CXK5864PN-15L 8Kx8 SRAM
diff --git a/src/emu/bus/c64/c128_partner.h b/src/emu/bus/c64/c128_partner.h
index 442557cb4ec..b91c92026dd 100644
--- a/src/emu/bus/c64/c128_partner.h
+++ b/src/emu/bus/c64/c128_partner.h
@@ -24,8 +24,8 @@
// ======================> partner128_t
class partner128_t : public device_t,
- public device_c64_expansion_card_interface,
- public device_vcs_control_port_interface
+ public device_c64_expansion_card_interface,
+ public device_vcs_control_port_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/cbmiec/c1526.h b/src/emu/bus/cbmiec/c1526.h
index 7296f10630a..c6389bf4662 100644
--- a/src/emu/bus/cbmiec/c1526.h
+++ b/src/emu/bus/cbmiec/c1526.h
@@ -40,7 +40,7 @@ protected:
// ======================> c1526_t
class c1526_t : public c1526_base_t,
- public device_cbm_iec_interface
+ public device_cbm_iec_interface
{
public:
// construction/destruction
@@ -62,7 +62,7 @@ protected:
// ======================> c4023_t
class c4023_t : public c1526_base_t,
- public device_ieee488_interface
+ public device_ieee488_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/cbmiec/vic1515.h b/src/emu/bus/cbmiec/vic1515.h
index 109255aa147..cd3d4554994 100644
--- a/src/emu/bus/cbmiec/vic1515.h
+++ b/src/emu/bus/cbmiec/vic1515.h
@@ -24,7 +24,7 @@
// ======================> vic1515_t
class vic1515_t : public device_t,
- public device_cbm_iec_interface
+ public device_cbm_iec_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/cbmiec/vic1520.h b/src/emu/bus/cbmiec/vic1520.h
index 6fd404fc391..4169164d0ae 100644
--- a/src/emu/bus/cbmiec/vic1520.h
+++ b/src/emu/bus/cbmiec/vic1520.h
@@ -24,7 +24,7 @@
// ======================> vic1520_t
class vic1520_t : public device_t,
- public device_cbm_iec_interface
+ public device_cbm_iec_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/cpc/ddi1.c b/src/emu/bus/cpc/ddi1.c
index b2440021310..b7d7e5a74de 100644
--- a/src/emu/bus/cpc/ddi1.c
+++ b/src/emu/bus/cpc/ddi1.c
@@ -125,7 +125,7 @@ WRITE8_MEMBER(cpc_ddi1_device::fdc_w)
READ8_MEMBER(cpc_ddi1_device::fdc_r)
{
UINT8 data = 0xff;
-
+
switch(offset)
{
case 0x00:
@@ -137,4 +137,3 @@ READ8_MEMBER(cpc_ddi1_device::fdc_r)
}
return data;
}
-
diff --git a/src/emu/bus/msx_cart/ascii.c b/src/emu/bus/msx_cart/ascii.c
index c4b21fa8f86..cb3aebf0d4d 100644
--- a/src/emu/bus/msx_cart/ascii.c
+++ b/src/emu/bus/msx_cart/ascii.c
@@ -533,4 +533,3 @@ WRITE8_MEMBER(msx_cart_msxwrite::write_cart)
break;
}
}
-
diff --git a/src/emu/bus/msx_cart/moonsound.c b/src/emu/bus/msx_cart/moonsound.c
index 244226bf367..d2b222f07de 100644
--- a/src/emu/bus/msx_cart/moonsound.c
+++ b/src/emu/bus/msx_cart/moonsound.c
@@ -41,10 +41,10 @@ static MACHINE_CONFIG_FRAGMENT( moonsound )
MCFG_YMF278B_IRQ_HANDLER(WRITELINE(msx_cart_moonsound,irq_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MCFG_SOUND_ROUTE(2, "lspeaker", 0.40)
- MCFG_SOUND_ROUTE(3, "rspeaker", 0.40)
- MCFG_SOUND_ROUTE(4, "lspeaker", 0.40)
- MCFG_SOUND_ROUTE(5, "rspeaker", 0.40)
+ MCFG_SOUND_ROUTE(2, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(3, "rspeaker", 0.40)
+ MCFG_SOUND_ROUTE(4, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(5, "rspeaker", 0.40)
MACHINE_CONFIG_END
@@ -124,4 +124,3 @@ READ8_MEMBER(msx_cart_moonsound::read_c0)
LOG(("moonsound: read 0xc0\n"));
return 0x00;
}
-
diff --git a/src/emu/cpu/hphybrid/hphybrid.c b/src/emu/cpu/hphybrid/hphybrid.c
index 03a36549b60..027a37e03ed 100644
--- a/src/emu/cpu/hphybrid/hphybrid.c
+++ b/src/emu/cpu/hphybrid/hphybrid.c
@@ -6,18 +6,18 @@
#include "hphybrid.h"
enum {
- HPHYBRID_A,
- HPHYBRID_B,
- HPHYBRID_C,
- HPHYBRID_D,
- HPHYBRID_P,
- HPHYBRID_R,
- HPHYBRID_IV,
- HPHYBRID_PA,
- HPHYBRID_DMAPA,
- HPHYBRID_DMAMA,
- HPHYBRID_DMAC,
- HPHYBRID_I
+ HPHYBRID_A,
+ HPHYBRID_B,
+ HPHYBRID_C,
+ HPHYBRID_D,
+ HPHYBRID_P,
+ HPHYBRID_R,
+ HPHYBRID_IV,
+ HPHYBRID_PA,
+ HPHYBRID_DMAPA,
+ HPHYBRID_DMAMA,
+ HPHYBRID_DMAC,
+ HPHYBRID_I
};
#define BIT_MASK(n) (1U << (n))
@@ -51,111 +51,111 @@ const device_type HP_5061_3011 = &device_creator<hp_5061_3011_cpu_device>;
WRITE_LINE_MEMBER(hp_hybrid_cpu_device::dmar_w)
{
- if (state) {
- BIT_SET(m_flags , HPHYBRID_DMAR_BIT);
- } else {
- BIT_CLR(m_flags , HPHYBRID_DMAR_BIT);
- }
+ if (state) {
+ BIT_SET(m_flags , HPHYBRID_DMAR_BIT);
+ } else {
+ BIT_CLR(m_flags , HPHYBRID_DMAR_BIT);
+ }
}
hp_hybrid_cpu_device::hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
- m_program_config("program", ENDIANNESS_BIG, 16, 16, -1),
- m_io_config("io", ENDIANNESS_BIG, 16, 6, -1)
+ m_program_config("program", ENDIANNESS_BIG, 16, 16, -1),
+ m_io_config("io", ENDIANNESS_BIG, 16, 6, -1)
{
}
void hp_hybrid_cpu_device::device_start()
{
- m_reg_A = 0;
- m_reg_B = 0;
- m_reg_P = HP_RESET_ADDR;
- m_reg_R = 0;
- m_reg_C = 0;
- m_reg_D = 0;
- m_reg_IV = 0;
- m_reg_PA[ 0 ] = 0;
- m_reg_PA[ 1 ] = 0;
- m_reg_PA[ 2 ] = 0;
- m_flags = 0;
- m_dmapa = 0;
- m_dmama = 0;
- m_dmac = 0;
- m_reg_I = 0;
-
- {
- state_add(HPHYBRID_A, "A", m_reg_A);
- state_add(HPHYBRID_B, "B", m_reg_B);
- state_add(HPHYBRID_C, "C", m_reg_C);
- state_add(HPHYBRID_D, "D", m_reg_D);
- state_add(HPHYBRID_P, "P", m_reg_P);
- state_add(STATE_GENPC, "GENPC", m_reg_P).noshow();
- state_add(HPHYBRID_R, "R", m_reg_R);
- state_add(STATE_GENSP, "GENSP", m_reg_R).noshow();
- state_add(HPHYBRID_IV, "IV", m_reg_IV);
- state_add(HPHYBRID_PA, "PA", m_reg_PA[ 0 ]);
- state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).noshow().formatstr("%9s");
- state_add(HPHYBRID_DMAPA , "DMAPA" , m_dmapa).noshow();
- state_add(HPHYBRID_DMAMA , "DMAMA" , m_dmama).noshow();
- state_add(HPHYBRID_DMAC , "DMAC" , m_dmac).noshow();
- state_add(HPHYBRID_I , "I" , m_reg_I).noshow();
- }
-
- m_program = &space(AS_PROGRAM);
- m_direct = &m_program->direct();
- m_io = &space(AS_IO);
-
- save_item(NAME(m_reg_A));
- save_item(NAME(m_reg_B));
- save_item(NAME(m_reg_C));
- save_item(NAME(m_reg_D));
- save_item(NAME(m_reg_P));
- save_item(NAME(m_reg_R));
- save_item(NAME(m_reg_IV));
- save_item(NAME(m_reg_PA[0]));
- save_item(NAME(m_reg_PA[1]));
- save_item(NAME(m_reg_PA[2]));
- save_item(NAME(m_flags));
- save_item(NAME(m_dmapa));
- save_item(NAME(m_dmama));
- save_item(NAME(m_dmac));
- save_item(NAME(m_reg_I));
-
- m_icountptr = &m_icount;
+ m_reg_A = 0;
+ m_reg_B = 0;
+ m_reg_P = HP_RESET_ADDR;
+ m_reg_R = 0;
+ m_reg_C = 0;
+ m_reg_D = 0;
+ m_reg_IV = 0;
+ m_reg_PA[ 0 ] = 0;
+ m_reg_PA[ 1 ] = 0;
+ m_reg_PA[ 2 ] = 0;
+ m_flags = 0;
+ m_dmapa = 0;
+ m_dmama = 0;
+ m_dmac = 0;
+ m_reg_I = 0;
+
+ {
+ state_add(HPHYBRID_A, "A", m_reg_A);
+ state_add(HPHYBRID_B, "B", m_reg_B);
+ state_add(HPHYBRID_C, "C", m_reg_C);
+ state_add(HPHYBRID_D, "D", m_reg_D);
+ state_add(HPHYBRID_P, "P", m_reg_P);
+ state_add(STATE_GENPC, "GENPC", m_reg_P).noshow();
+ state_add(HPHYBRID_R, "R", m_reg_R);
+ state_add(STATE_GENSP, "GENSP", m_reg_R).noshow();
+ state_add(HPHYBRID_IV, "IV", m_reg_IV);
+ state_add(HPHYBRID_PA, "PA", m_reg_PA[ 0 ]);
+ state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).noshow().formatstr("%9s");
+ state_add(HPHYBRID_DMAPA , "DMAPA" , m_dmapa).noshow();
+ state_add(HPHYBRID_DMAMA , "DMAMA" , m_dmama).noshow();
+ state_add(HPHYBRID_DMAC , "DMAC" , m_dmac).noshow();
+ state_add(HPHYBRID_I , "I" , m_reg_I).noshow();
+ }
+
+ m_program = &space(AS_PROGRAM);
+ m_direct = &m_program->direct();
+ m_io = &space(AS_IO);
+
+ save_item(NAME(m_reg_A));
+ save_item(NAME(m_reg_B));
+ save_item(NAME(m_reg_C));
+ save_item(NAME(m_reg_D));
+ save_item(NAME(m_reg_P));
+ save_item(NAME(m_reg_R));
+ save_item(NAME(m_reg_IV));
+ save_item(NAME(m_reg_PA[0]));
+ save_item(NAME(m_reg_PA[1]));
+ save_item(NAME(m_reg_PA[2]));
+ save_item(NAME(m_flags));
+ save_item(NAME(m_dmapa));
+ save_item(NAME(m_dmama));
+ save_item(NAME(m_dmac));
+ save_item(NAME(m_reg_I));
+
+ m_icountptr = &m_icount;
}
void hp_hybrid_cpu_device::device_reset()
{
- m_reg_P = HP_RESET_ADDR;
- m_reg_I = RM(m_reg_P);
- m_flags = 0;
+ m_reg_P = HP_RESET_ADDR;
+ m_reg_I = RM(m_reg_P);
+ m_flags = 0;
}
void hp_hybrid_cpu_device::execute_run()
{
- do {
- if (BIT(m_flags , HPHYBRID_DMAEN_BIT) && BIT(m_flags , HPHYBRID_DMAR_BIT)) {
- handle_dma();
- } else {
- debugger_instruction_hook(this, m_reg_P);
-
- // Check for interrupts
- check_for_interrupts();
-
- m_reg_I = execute_one(m_reg_I);
- }
- } while (m_icount > 0);
+ do {
+ if (BIT(m_flags , HPHYBRID_DMAEN_BIT) && BIT(m_flags , HPHYBRID_DMAR_BIT)) {
+ handle_dma();
+ } else {
+ debugger_instruction_hook(this, m_reg_P);
+
+ // Check for interrupts
+ check_for_interrupts();
+
+ m_reg_I = execute_one(m_reg_I);
+ }
+ } while (m_icount > 0);
}
void hp_hybrid_cpu_device::execute_set_input(int inputnum, int state)
{
- if (inputnum < HPHYBRID_INT_LVLS) {
- if (state) {
- BIT_SET(m_flags , HPHYBRID_IRH_BIT + inputnum);
- } else {
- BIT_CLR(m_flags , HPHYBRID_IRH_BIT + inputnum);
- }
- }
+ if (inputnum < HPHYBRID_INT_LVLS) {
+ if (state) {
+ BIT_SET(m_flags , HPHYBRID_IRH_BIT + inputnum);
+ } else {
+ BIT_CLR(m_flags , HPHYBRID_IRH_BIT + inputnum);
+ }
+ }
}
/**
@@ -167,14 +167,14 @@ void hp_hybrid_cpu_device::execute_set_input(int inputnum, int state)
*/
UINT16 hp_hybrid_cpu_device::execute_one(UINT16 opcode)
{
- if ((opcode & 0x7fe0) == 0x7000) {
- // EXE
- m_icount -= 8;
- return RM(opcode & 0x1f);
- } else {
- m_reg_P = execute_one_sub(opcode);
- return RM(m_reg_P);
- }
+ if ((opcode & 0x7fe0) == 0x7000) {
+ // EXE
+ m_icount -= 8;
+ return RM(opcode & 0x1f);
+ } else {
+ m_reg_P = execute_one_sub(opcode);
+ return RM(m_reg_P);
+ }
}
/**
@@ -186,773 +186,773 @@ UINT16 hp_hybrid_cpu_device::execute_one(UINT16 opcode)
*/
UINT16 hp_hybrid_cpu_device::execute_one_sub(UINT16 opcode)
{
- UINT16 ea;
- UINT16 tmp;
-
- switch (opcode & 0x7800) {
- case 0x0000:
- // LDA
- m_icount -= 13;
- m_reg_A = RM(get_ea(opcode));
- break;
-
- case 0x0800:
- // LDB
- m_icount -= 13;
- m_reg_B = RM(get_ea(opcode));
- break;
-
- case 0x1000:
- // CPA
- m_icount -= 16;
- if (m_reg_A != RM(get_ea(opcode))) {
- // Skip next instruction
- return m_reg_P + 2;
- }
- break;
-
- case 0x1800:
- // CPB
- m_icount -= 16;
- if (m_reg_B != RM(get_ea(opcode))) {
- // Skip next instruction
- return m_reg_P + 2;
- }
- break;
-
- case 0x2000:
- // ADA
- m_icount -= 13;
- do_add(m_reg_A , RM(get_ea(opcode)));
- break;
-
- case 0x2800:
- // ADB
- m_icount -= 13;
- do_add(m_reg_B , RM(get_ea(opcode)));
- break;
-
- case 0x3000:
- // STA
- m_icount -= 13;
- WM(get_ea(opcode) , m_reg_A);
- break;
-
- case 0x3800:
- // STB
- m_icount -= 13;
- WM(get_ea(opcode) , m_reg_B);
- break;
-
- case 0x4000:
- // JSM
- m_icount -= 17;
- WM(++m_reg_R , m_reg_P);
- return get_ea(opcode);
-
- case 0x4800:
- // ISZ
- m_icount -= 19;
- ea = get_ea(opcode);
- tmp = RM(ea) + 1;
- WM(ea , tmp);
- if (tmp == 0) {
- // Skip next instruction
- return m_reg_P + 2;
- }
- break;
-
- case 0x5000:
- // AND
- m_icount -= 13;
- m_reg_A &= RM(get_ea(opcode));
- break;
-
- case 0x5800:
- // DSZ
- m_icount -= 19;
- ea = get_ea(opcode);
- tmp = RM(ea) - 1;
- WM(ea , tmp);
- if (tmp == 0) {
- // Skip next instruction
- return m_reg_P + 2;
- }
- break;
-
- case 0x6000:
- // IOR
- m_icount -= 13;
- m_reg_A |= RM(get_ea(opcode));
- break;
-
- case 0x6800:
- // JMP
- m_icount -= 8;
- return get_ea(opcode);
-
- default:
- switch (opcode & 0xfec0) {
- case 0x7400:
- // RZA
- // SZA
- m_icount -= 14;
- return get_skip_addr(opcode , m_reg_A == 0);
-
- case 0x7440:
- // RIA
- // SIA
- m_icount -= 14;
- return get_skip_addr(opcode , m_reg_A++ == 0);
-
- case 0x7480:
- // SFS
- // SFC
- m_icount -= 14;
- // TODO: read flag bit
- return get_skip_addr(opcode , true);
-
- case 0x7C00:
- // RZB
- // SZB
- m_icount -= 14;
- return get_skip_addr(opcode , m_reg_B == 0);
-
- case 0x7C40:
- // RIB
- // SIB
- m_icount -= 14;
- return get_skip_addr(opcode , m_reg_B++ == 0);
-
- case 0x7c80:
- // SSS
- // SSC
- m_icount -= 14;
- // TODO: read status bit
- return get_skip_addr(opcode , true);
-
- case 0x7cc0:
- // SHS
- // SHC
- m_icount -= 14;
- return get_skip_addr(opcode , !BIT(m_flags , HPHYBRID_HALT_BIT));
-
- default:
- switch (opcode & 0xfe00) {
- case 0x7600:
- // SLA
- // RLA
- m_icount -= 14;
- return get_skip_addr_sc(opcode , m_reg_A , 0);
-
- case 0x7e00:
- // SLB
- // RLB
- m_icount -= 14;
- return get_skip_addr_sc(opcode , m_reg_B , 0);
-
- case 0xf400:
- // SAP
- // SAM
- m_icount -= 14;
- return get_skip_addr_sc(opcode , m_reg_A , 15);
-
- case 0xf600:
- // SOC
- // SOS
- m_icount -= 14;
- return get_skip_addr_sc(opcode , m_flags , HPHYBRID_O_BIT);
-
- case 0xfc00:
- // SBP
- // SBM
- m_icount -= 14;
- return get_skip_addr_sc(opcode , m_reg_B , 15);
-
- case 0xfe00:
- // SEC
- // SES
- m_icount -= 14;
- return get_skip_addr_sc(opcode , m_flags , HPHYBRID_C_BIT);
-
- default:
- switch (opcode & 0xfff0) {
- case 0xf100:
- // AAR
- tmp = (opcode & 0xf) + 1;
- m_icount -= (9 + tmp);
- // A shift by 16 positions is equivalent to a shift by 15
- tmp = tmp > 15 ? 15 : tmp;
- m_reg_A = ((m_reg_A ^ 0x8000) >> tmp) - (0x8000 >> tmp);
- break;
-
- case 0xf900:
- // ABR
- tmp = (opcode & 0xf) + 1;
- m_icount -= (9 + tmp);
- tmp = tmp > 15 ? 15 : tmp;
- m_reg_B = ((m_reg_B ^ 0x8000) >> tmp) - (0x8000 >> tmp);
- break;
-
- case 0xf140:
- // SAR
- tmp = (opcode & 0xf) + 1;
- m_icount -= (9 + tmp);
- m_reg_A >>= tmp;
- break;
-
- case 0xf940:
- // SBR
- tmp = (opcode & 0xf) + 1;
- m_icount -= (9 + tmp);
- m_reg_B >>= tmp;
- break;
-
- case 0xf180:
- // SAL
- tmp = (opcode & 0xf) + 1;
- m_icount -= (9 + tmp);
- m_reg_A <<= tmp;
- break;
-
- case 0xf980:
- // SBL
- tmp = (opcode & 0xf) + 1;
- m_icount -= (9 + tmp);
- m_reg_B <<= tmp;
- break;
-
- case 0xf1c0:
- // RAR
- tmp = (opcode & 0xf) + 1;
- m_icount -= (9 + tmp);
- m_reg_A = (m_reg_A >> tmp) | (m_reg_A << (16 - tmp));
- break;
-
- case 0xf9c0:
- // RBR
- tmp = (opcode & 0xf) + 1;
- m_icount -= (9 + tmp);
- m_reg_B = (m_reg_B >> tmp) | (m_reg_B << (16 - tmp));
- break;
-
- default:
- if ((opcode & 0xf760) == 0x7160) {
- // Place/withdraw instructions
- m_icount -= 23;
- do_pw(opcode);
- } else if ((opcode & 0xff80) == 0xf080) {
- // RET
- m_icount -= 16;
- if (BIT(opcode , 6)) {
- // Pop PA stack
- if (BIT(m_flags , HPHYBRID_IRH_SVC_BIT)) {
- BIT_CLR(m_flags , HPHYBRID_IRH_SVC_BIT);
- memmove(&m_reg_PA[ 0 ] , &m_reg_PA[ 1 ] , HPHYBRID_INT_LVLS);
- } else if (BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) {
- BIT_CLR(m_flags , HPHYBRID_IRL_SVC_BIT);
- memmove(&m_reg_PA[ 0 ] , &m_reg_PA[ 1 ] , HPHYBRID_INT_LVLS);
- }
- }
- tmp = RM(m_reg_R--) + (opcode & 0x1f);
- return BIT(opcode , 5) ? tmp - 0x20 : tmp;
- } else {
- switch (opcode) {
- case 0x7100:
- // SDO
- m_icount -= 12;
- BIT_SET(m_flags , HPHYBRID_DMADIR_BIT);
- break;
-
- case 0x7108:
- // SDI
- m_icount -= 12;
- BIT_CLR(m_flags , HPHYBRID_DMADIR_BIT);
- break;
-
- case 0x7110:
- // EIR
- m_icount -= 12;
- BIT_SET(m_flags , HPHYBRID_INTEN_BIT);
- break;
-
- case 0x7118:
- // DIR
- m_icount -= 12;
- BIT_CLR(m_flags , HPHYBRID_INTEN_BIT);
- break;
-
- case 0x7120:
- // DMA
- m_icount -= 12;
- BIT_SET(m_flags , HPHYBRID_DMAEN_BIT);
- break;
-
- case 0x7138:
- // DDR
- m_icount -= 12;
- BIT_CLR(m_flags , HPHYBRID_DMAEN_BIT);
- break;
-
- case 0x7140:
- // DBL
- m_icount -= 12;
- BIT_CLR(m_flags , HPHYBRID_DB_BIT);
- break;
-
- case 0x7148:
- // CBL
- m_icount -= 12;
- BIT_CLR(m_flags , HPHYBRID_CB_BIT);
- break;
-
- case 0x7150:
- // DBU
- m_icount -= 12;
- BIT_SET(m_flags , HPHYBRID_DB_BIT);
- break;
-
- case 0x7158:
- // CBU
- m_icount -= 12;
- BIT_SET(m_flags , HPHYBRID_CB_BIT);
- break;
-
- case 0xf020:
- // TCA
- m_icount -= 9;
- m_reg_A = ~m_reg_A;
- do_add(m_reg_A , 1);
- break;
-
- case 0xf060:
- // CMA
- m_icount -= 9;
- m_reg_A = ~m_reg_A;
- break;
-
- case 0xf820:
- // TCB
- m_icount -= 9;
- m_reg_B = ~m_reg_B;
- do_add(m_reg_B , 1);
- break;
-
- case 0xf860:
- // CMB
- m_icount -= 9;
- m_reg_B = ~m_reg_B;
- break;
-
- default:
- // Unrecognized instructions: NOP
- // Execution time is fictional
- m_icount -= 6;
- }
- }
- }
- }
- }
- }
-
- return m_reg_P + 1;
+ UINT16 ea;
+ UINT16 tmp;
+
+ switch (opcode & 0x7800) {
+ case 0x0000:
+ // LDA
+ m_icount -= 13;
+ m_reg_A = RM(get_ea(opcode));
+ break;
+
+ case 0x0800:
+ // LDB
+ m_icount -= 13;
+ m_reg_B = RM(get_ea(opcode));
+ break;
+
+ case 0x1000:
+ // CPA
+ m_icount -= 16;
+ if (m_reg_A != RM(get_ea(opcode))) {
+ // Skip next instruction
+ return m_reg_P + 2;
+ }
+ break;
+
+ case 0x1800:
+ // CPB
+ m_icount -= 16;
+ if (m_reg_B != RM(get_ea(opcode))) {
+ // Skip next instruction
+ return m_reg_P + 2;
+ }
+ break;
+
+ case 0x2000:
+ // ADA
+ m_icount -= 13;
+ do_add(m_reg_A , RM(get_ea(opcode)));
+ break;
+
+ case 0x2800:
+ // ADB
+ m_icount -= 13;
+ do_add(m_reg_B , RM(get_ea(opcode)));
+ break;
+
+ case 0x3000:
+ // STA
+ m_icount -= 13;
+ WM(get_ea(opcode) , m_reg_A);
+ break;
+
+ case 0x3800:
+ // STB
+ m_icount -= 13;
+ WM(get_ea(opcode) , m_reg_B);
+ break;
+
+ case 0x4000:
+ // JSM
+ m_icount -= 17;
+ WM(++m_reg_R , m_reg_P);
+ return get_ea(opcode);
+
+ case 0x4800:
+ // ISZ
+ m_icount -= 19;
+ ea = get_ea(opcode);
+ tmp = RM(ea) + 1;
+ WM(ea , tmp);
+ if (tmp == 0) {
+ // Skip next instruction
+ return m_reg_P + 2;
+ }
+ break;
+
+ case 0x5000:
+ // AND
+ m_icount -= 13;
+ m_reg_A &= RM(get_ea(opcode));
+ break;
+
+ case 0x5800:
+ // DSZ
+ m_icount -= 19;
+ ea = get_ea(opcode);
+ tmp = RM(ea) - 1;
+ WM(ea , tmp);
+ if (tmp == 0) {
+ // Skip next instruction
+ return m_reg_P + 2;
+ }
+ break;
+
+ case 0x6000:
+ // IOR
+ m_icount -= 13;
+ m_reg_A |= RM(get_ea(opcode));
+ break;
+
+ case 0x6800:
+ // JMP
+ m_icount -= 8;
+ return get_ea(opcode);
+
+ default:
+ switch (opcode & 0xfec0) {
+ case 0x7400:
+ // RZA
+ // SZA
+ m_icount -= 14;
+ return get_skip_addr(opcode , m_reg_A == 0);
+
+ case 0x7440:
+ // RIA
+ // SIA
+ m_icount -= 14;
+ return get_skip_addr(opcode , m_reg_A++ == 0);
+
+ case 0x7480:
+ // SFS
+ // SFC
+ m_icount -= 14;
+ // TODO: read flag bit
+ return get_skip_addr(opcode , true);
+
+ case 0x7C00:
+ // RZB
+ // SZB
+ m_icount -= 14;
+ return get_skip_addr(opcode , m_reg_B == 0);
+
+ case 0x7C40:
+ // RIB
+ // SIB
+ m_icount -= 14;
+ return get_skip_addr(opcode , m_reg_B++ == 0);
+
+ case 0x7c80:
+ // SSS
+ // SSC
+ m_icount -= 14;
+ // TODO: read status bit
+ return get_skip_addr(opcode , true);
+
+ case 0x7cc0:
+ // SHS
+ // SHC
+ m_icount -= 14;
+ return get_skip_addr(opcode , !BIT(m_flags , HPHYBRID_HALT_BIT));
+
+ default:
+ switch (opcode & 0xfe00) {
+ case 0x7600:
+ // SLA
+ // RLA
+ m_icount -= 14;
+ return get_skip_addr_sc(opcode , m_reg_A , 0);
+
+ case 0x7e00:
+ // SLB
+ // RLB
+ m_icount -= 14;
+ return get_skip_addr_sc(opcode , m_reg_B , 0);
+
+ case 0xf400:
+ // SAP
+ // SAM
+ m_icount -= 14;
+ return get_skip_addr_sc(opcode , m_reg_A , 15);
+
+ case 0xf600:
+ // SOC
+ // SOS
+ m_icount -= 14;
+ return get_skip_addr_sc(opcode , m_flags , HPHYBRID_O_BIT);
+
+ case 0xfc00:
+ // SBP
+ // SBM
+ m_icount -= 14;
+ return get_skip_addr_sc(opcode , m_reg_B , 15);
+
+ case 0xfe00:
+ // SEC
+ // SES
+ m_icount -= 14;
+ return get_skip_addr_sc(opcode , m_flags , HPHYBRID_C_BIT);
+
+ default:
+ switch (opcode & 0xfff0) {
+ case 0xf100:
+ // AAR
+ tmp = (opcode & 0xf) + 1;
+ m_icount -= (9 + tmp);
+ // A shift by 16 positions is equivalent to a shift by 15
+ tmp = tmp > 15 ? 15 : tmp;
+ m_reg_A = ((m_reg_A ^ 0x8000) >> tmp) - (0x8000 >> tmp);
+ break;
+
+ case 0xf900:
+ // ABR
+ tmp = (opcode & 0xf) + 1;
+ m_icount -= (9 + tmp);
+ tmp = tmp > 15 ? 15 : tmp;
+ m_reg_B = ((m_reg_B ^ 0x8000) >> tmp) - (0x8000 >> tmp);
+ break;
+
+ case 0xf140:
+ // SAR
+ tmp = (opcode & 0xf) + 1;
+ m_icount -= (9 + tmp);
+ m_reg_A >>= tmp;
+ break;
+
+ case 0xf940:
+ // SBR
+ tmp = (opcode & 0xf) + 1;
+ m_icount -= (9 + tmp);
+ m_reg_B >>= tmp;
+ break;
+
+ case 0xf180:
+ // SAL
+ tmp = (opcode & 0xf) + 1;
+ m_icount -= (9 + tmp);
+ m_reg_A <<= tmp;
+ break;
+
+ case 0xf980:
+ // SBL
+ tmp = (opcode & 0xf) + 1;
+ m_icount -= (9 + tmp);
+ m_reg_B <<= tmp;
+ break;
+
+ case 0xf1c0:
+ // RAR
+ tmp = (opcode & 0xf) + 1;
+ m_icount -= (9 + tmp);
+ m_reg_A = (m_reg_A >> tmp) | (m_reg_A << (16 - tmp));
+ break;
+
+ case 0xf9c0:
+ // RBR
+ tmp = (opcode & 0xf) + 1;
+ m_icount -= (9 + tmp);
+ m_reg_B = (m_reg_B >> tmp) | (m_reg_B << (16 - tmp));
+ break;
+
+ default:
+ if ((opcode & 0xf760) == 0x7160) {
+ // Place/withdraw instructions
+ m_icount -= 23;
+ do_pw(opcode);
+ } else if ((opcode & 0xff80) == 0xf080) {
+ // RET
+ m_icount -= 16;
+ if (BIT(opcode , 6)) {
+ // Pop PA stack
+ if (BIT(m_flags , HPHYBRID_IRH_SVC_BIT)) {
+ BIT_CLR(m_flags , HPHYBRID_IRH_SVC_BIT);
+ memmove(&m_reg_PA[ 0 ] , &m_reg_PA[ 1 ] , HPHYBRID_INT_LVLS);
+ } else if (BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) {
+ BIT_CLR(m_flags , HPHYBRID_IRL_SVC_BIT);
+ memmove(&m_reg_PA[ 0 ] , &m_reg_PA[ 1 ] , HPHYBRID_INT_LVLS);
+ }
+ }
+ tmp = RM(m_reg_R--) + (opcode & 0x1f);
+ return BIT(opcode , 5) ? tmp - 0x20 : tmp;
+ } else {
+ switch (opcode) {
+ case 0x7100:
+ // SDO
+ m_icount -= 12;
+ BIT_SET(m_flags , HPHYBRID_DMADIR_BIT);
+ break;
+
+ case 0x7108:
+ // SDI
+ m_icount -= 12;
+ BIT_CLR(m_flags , HPHYBRID_DMADIR_BIT);
+ break;
+
+ case 0x7110:
+ // EIR
+ m_icount -= 12;
+ BIT_SET(m_flags , HPHYBRID_INTEN_BIT);
+ break;
+
+ case 0x7118:
+ // DIR
+ m_icount -= 12;
+ BIT_CLR(m_flags , HPHYBRID_INTEN_BIT);
+ break;
+
+ case 0x7120:
+ // DMA
+ m_icount -= 12;
+ BIT_SET(m_flags , HPHYBRID_DMAEN_BIT);
+ break;
+
+ case 0x7138:
+ // DDR
+ m_icount -= 12;
+ BIT_CLR(m_flags , HPHYBRID_DMAEN_BIT);
+ break;
+
+ case 0x7140:
+ // DBL
+ m_icount -= 12;
+ BIT_CLR(m_flags , HPHYBRID_DB_BIT);
+ break;
+
+ case 0x7148:
+ // CBL
+ m_icount -= 12;
+ BIT_CLR(m_flags , HPHYBRID_CB_BIT);
+ break;
+
+ case 0x7150:
+ // DBU
+ m_icount -= 12;
+ BIT_SET(m_flags , HPHYBRID_DB_BIT);
+ break;
+
+ case 0x7158:
+ // CBU
+ m_icount -= 12;
+ BIT_SET(m_flags , HPHYBRID_CB_BIT);
+ break;
+
+ case 0xf020:
+ // TCA
+ m_icount -= 9;
+ m_reg_A = ~m_reg_A;
+ do_add(m_reg_A , 1);
+ break;
+
+ case 0xf060:
+ // CMA
+ m_icount -= 9;
+ m_reg_A = ~m_reg_A;
+ break;
+
+ case 0xf820:
+ // TCB
+ m_icount -= 9;
+ m_reg_B = ~m_reg_B;
+ do_add(m_reg_B , 1);
+ break;
+
+ case 0xf860:
+ // CMB
+ m_icount -= 9;
+ m_reg_B = ~m_reg_B;
+ break;
+
+ default:
+ // Unrecognized instructions: NOP
+ // Execution time is fictional
+ m_icount -= 6;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ return m_reg_P + 1;
}
void hp_hybrid_cpu_device::state_string_export(const device_state_entry &entry, std::string &str)
{
- if (entry.index() == STATE_GENFLAGS) {
- strprintf(str, "%s %s %c %c",
- BIT(m_flags , HPHYBRID_DB_BIT) ? "Db":"..",
- BIT(m_flags , HPHYBRID_CB_BIT) ? "Cb":"..",
- BIT(m_flags , HPHYBRID_O_BIT) ? 'O':'.',
- BIT(m_flags , HPHYBRID_C_BIT) ? 'E':'.');
- }
+ if (entry.index() == STATE_GENFLAGS) {
+ strprintf(str, "%s %s %c %c",
+ BIT(m_flags , HPHYBRID_DB_BIT) ? "Db":"..",
+ BIT(m_flags , HPHYBRID_CB_BIT) ? "Cb":"..",
+ BIT(m_flags , HPHYBRID_O_BIT) ? 'O':'.',
+ BIT(m_flags , HPHYBRID_C_BIT) ? 'E':'.');
+ }
}
offs_t hp_hybrid_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options)
{
- extern CPU_DISASSEMBLE(hp_hybrid);
- return CPU_DISASSEMBLE_NAME(hp_hybrid)(this, buffer, pc, oprom, opram, options);
+ extern CPU_DISASSEMBLE(hp_hybrid);
+ return CPU_DISASSEMBLE_NAME(hp_hybrid)(this, buffer, pc, oprom, opram, options);
}
UINT16 hp_hybrid_cpu_device::get_ea(UINT16 opcode)
{
- UINT16 base;
- UINT16 off;
-
- if (BIT(opcode , 10)) {
- // Current page
- base = m_reg_P;
- } else {
- // Base page
- base = 0;
- }
-
- off = opcode & 0x3ff;
- if (off & 0x200) {
- off -= 0x400;
- }
-
- base += off;
-
- if (BIT(opcode , 15)) {
- // Indirect addressing
- m_icount -= 6;
- return RM(base);
- } else {
- // Direct addressing
- return base;
- }
+ UINT16 base;
+ UINT16 off;
+
+ if (BIT(opcode , 10)) {
+ // Current page
+ base = m_reg_P;
+ } else {
+ // Base page
+ base = 0;
+ }
+
+ off = opcode & 0x3ff;
+ if (off & 0x200) {
+ off -= 0x400;
+ }
+
+ base += off;
+
+ if (BIT(opcode , 15)) {
+ // Indirect addressing
+ m_icount -= 6;
+ return RM(base);
+ } else {
+ // Direct addressing
+ return base;
+ }
}
void hp_hybrid_cpu_device::do_add(UINT16& addend1 , UINT16 addend2)
{
- UINT32 tmp = addend1 + addend2;
+ UINT32 tmp = addend1 + addend2;
- if (BIT(tmp , 16)) {
- // Carry
- BIT_SET(m_flags , HPHYBRID_C_BIT);
- }
+ if (BIT(tmp , 16)) {
+ // Carry
+ BIT_SET(m_flags , HPHYBRID_C_BIT);
+ }
- if (BIT((tmp ^ addend1) & (tmp ^ addend2) , 15)) {
- // Overflow
- BIT_SET(m_flags , HPHYBRID_O_BIT);
- }
+ if (BIT((tmp ^ addend1) & (tmp ^ addend2) , 15)) {
+ // Overflow
+ BIT_SET(m_flags , HPHYBRID_O_BIT);
+ }
- addend1 = (UINT16)tmp;
+ addend1 = (UINT16)tmp;
}
UINT16 hp_hybrid_cpu_device::get_skip_addr(UINT16 opcode , bool condition) const
{
- bool skip_val = BIT(opcode , 8) != 0;
-
- if (condition == skip_val) {
- UINT16 off = opcode & 0x1f;
-
- if (BIT(opcode , 5)) {
- off -= 0x20;
- }
- return m_reg_P + off;
- } else {
- return m_reg_P + 1;
- }
+ bool skip_val = BIT(opcode , 8) != 0;
+
+ if (condition == skip_val) {
+ UINT16 off = opcode & 0x1f;
+
+ if (BIT(opcode , 5)) {
+ off -= 0x20;
+ }
+ return m_reg_P + off;
+ } else {
+ return m_reg_P + 1;
+ }
}
UINT16 hp_hybrid_cpu_device::get_skip_addr_sc(UINT16 opcode , UINT16& v , unsigned n)
{
- bool val = BIT(v , n);
+ bool val = BIT(v , n);
- if (BIT(opcode , 7)) {
- if (BIT(opcode , 6)) {
- BIT_SET(v , n);
- } else {
- BIT_CLR(v , n);
- }
- }
+ if (BIT(opcode , 7)) {
+ if (BIT(opcode , 6)) {
+ BIT_SET(v , n);
+ } else {
+ BIT_CLR(v , n);
+ }
+ }
- return get_skip_addr(opcode , val);
+ return get_skip_addr(opcode , val);
}
void hp_hybrid_cpu_device::do_pw(UINT16 opcode)
{
- UINT16 tmp;
- UINT16 reg_addr = opcode & 7;
- UINT16 *ptr_reg;
- UINT16 b_mask;
-
- if (BIT(opcode , 3)) {
- ptr_reg = &m_reg_D;
- b_mask = BIT_MASK(HPHYBRID_DB_BIT);
- } else {
- ptr_reg = &m_reg_C;
- b_mask = BIT_MASK(HPHYBRID_CB_BIT);
- }
-
- if (BIT(opcode , 4)) {
- // Withdraw
- if (BIT(opcode , 11)) {
- // Byte
- UINT32 tmp_addr = (UINT32)(*ptr_reg);
- if (m_flags & b_mask) {
- tmp_addr |= 0x10000;
- }
- tmp = RM((UINT16)(tmp_addr >> 1));
- if (BIT(tmp_addr , 0)) {
- tmp &= 0xff;
- } else {
- tmp >>= 8;
- }
- } else {
- // Word
- tmp = RM(*ptr_reg);
- }
- WM(reg_addr , tmp);
-
- if (BIT(opcode , 7)) {
- // Post-decrement
- if ((*ptr_reg)-- == 0) {
- m_flags ^= b_mask;
- }
- } else {
- // Post-increment
- if (++(*ptr_reg) == 0) {
- m_flags ^= b_mask;
- }
- }
- } else {
- // Place
- if (BIT(opcode , 7)) {
- // Pre-decrement
- if ((*ptr_reg)-- == 0) {
- m_flags ^= b_mask;
- }
- } else {
- // Pre-increment
- if (++(*ptr_reg) == 0) {
- m_flags ^= b_mask;
- }
- }
- tmp = RM(reg_addr);
- if (BIT(opcode , 11)) {
- // Byte
- UINT32 tmp_addr = (UINT32)(*ptr_reg);
- if (m_flags & b_mask) {
- tmp_addr |= 0x10000;
- }
- WMB(tmp_addr , (UINT8)tmp);
- } else {
- // Word
- WM(*ptr_reg , tmp);
- }
- }
+ UINT16 tmp;
+ UINT16 reg_addr = opcode & 7;
+ UINT16 *ptr_reg;
+ UINT16 b_mask;
+
+ if (BIT(opcode , 3)) {
+ ptr_reg = &m_reg_D;
+ b_mask = BIT_MASK(HPHYBRID_DB_BIT);
+ } else {
+ ptr_reg = &m_reg_C;
+ b_mask = BIT_MASK(HPHYBRID_CB_BIT);
+ }
+
+ if (BIT(opcode , 4)) {
+ // Withdraw
+ if (BIT(opcode , 11)) {
+ // Byte
+ UINT32 tmp_addr = (UINT32)(*ptr_reg);
+ if (m_flags & b_mask) {
+ tmp_addr |= 0x10000;
+ }
+ tmp = RM((UINT16)(tmp_addr >> 1));
+ if (BIT(tmp_addr , 0)) {
+ tmp &= 0xff;
+ } else {
+ tmp >>= 8;
+ }
+ } else {
+ // Word
+ tmp = RM(*ptr_reg);
+ }
+ WM(reg_addr , tmp);
+
+ if (BIT(opcode , 7)) {
+ // Post-decrement
+ if ((*ptr_reg)-- == 0) {
+ m_flags ^= b_mask;
+ }
+ } else {
+ // Post-increment
+ if (++(*ptr_reg) == 0) {
+ m_flags ^= b_mask;
+ }
+ }
+ } else {
+ // Place
+ if (BIT(opcode , 7)) {
+ // Pre-decrement
+ if ((*ptr_reg)-- == 0) {
+ m_flags ^= b_mask;
+ }
+ } else {
+ // Pre-increment
+ if (++(*ptr_reg) == 0) {
+ m_flags ^= b_mask;
+ }
+ }
+ tmp = RM(reg_addr);
+ if (BIT(opcode , 11)) {
+ // Byte
+ UINT32 tmp_addr = (UINT32)(*ptr_reg);
+ if (m_flags & b_mask) {
+ tmp_addr |= 0x10000;
+ }
+ WMB(tmp_addr , (UINT8)tmp);
+ } else {
+ // Word
+ WM(*ptr_reg , tmp);
+ }
+ }
}
void hp_hybrid_cpu_device::check_for_interrupts(void)
{
- if (!BIT(m_flags , HPHYBRID_INTEN_BIT) || BIT(m_flags , HPHYBRID_IRH_SVC_BIT)) {
- return;
- }
-
- int irqline;
-
- if (BIT(m_flags , HPHYBRID_IRH_BIT)) {
- // Service high-level interrupt
- BIT_SET(m_flags , HPHYBRID_IRH_SVC_BIT);
- irqline = HPHYBRID_IRH;
- } else if (BIT(m_flags , HPHYBRID_IRL_BIT) && !BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) {
- // Service low-level interrupt
- BIT_SET(m_flags , HPHYBRID_IRL_SVC_BIT);
- irqline = HPHYBRID_IRL;
- } else {
- return;
- }
-
- // Get interrupt vector in low byte
- UINT8 vector = (UINT8)standard_irq_callback(irqline);
- UINT8 new_PA;
-
- // Get highest numbered 1
- // Don't know what happens if vector is 0, here we assume bit 7 = 1
- if (vector == 0) {
- new_PA = 7;
- } else {
- for (new_PA = 7; new_PA && !BIT(vector , 7); new_PA--, vector <<= 1) {
- }
- }
- if (irqline == HPHYBRID_IRH) {
- BIT_SET(new_PA , 3);
- }
-
- // Push PA stack
- memmove(&m_reg_PA[ 1 ] , &m_reg_PA[ 0 ] , HPHYBRID_INT_LVLS);
-
- CURRENT_PA = new_PA;
-
- // Is this correct? Patent @ pg 210 suggests that the whole interrupt recognition sequence
- // lasts for 32 cycles (6 are already accounted for in get_ea for one indirection)
- m_icount -= 26;
-
- // Do a double-indirect JSM IV,I instruction
- WM(++m_reg_R , m_reg_P);
- m_reg_P = RM(get_ea(0xc008));
- m_reg_I = RM(m_reg_P);
+ if (!BIT(m_flags , HPHYBRID_INTEN_BIT) || BIT(m_flags , HPHYBRID_IRH_SVC_BIT)) {
+ return;
+ }
+
+ int irqline;
+
+ if (BIT(m_flags , HPHYBRID_IRH_BIT)) {
+ // Service high-level interrupt
+ BIT_SET(m_flags , HPHYBRID_IRH_SVC_BIT);
+ irqline = HPHYBRID_IRH;
+ } else if (BIT(m_flags , HPHYBRID_IRL_BIT) && !BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) {
+ // Service low-level interrupt
+ BIT_SET(m_flags , HPHYBRID_IRL_SVC_BIT);
+ irqline = HPHYBRID_IRL;
+ } else {
+ return;
+ }
+
+ // Get interrupt vector in low byte
+ UINT8 vector = (UINT8)standard_irq_callback(irqline);
+ UINT8 new_PA;
+
+ // Get highest numbered 1
+ // Don't know what happens if vector is 0, here we assume bit 7 = 1
+ if (vector == 0) {
+ new_PA = 7;
+ } else {
+ for (new_PA = 7; new_PA && !BIT(vector , 7); new_PA--, vector <<= 1) {
+ }
+ }
+ if (irqline == HPHYBRID_IRH) {
+ BIT_SET(new_PA , 3);
+ }
+
+ // Push PA stack
+ memmove(&m_reg_PA[ 1 ] , &m_reg_PA[ 0 ] , HPHYBRID_INT_LVLS);
+
+ CURRENT_PA = new_PA;
+
+ // Is this correct? Patent @ pg 210 suggests that the whole interrupt recognition sequence
+ // lasts for 32 cycles (6 are already accounted for in get_ea for one indirection)
+ m_icount -= 26;
+
+ // Do a double-indirect JSM IV,I instruction
+ WM(++m_reg_R , m_reg_P);
+ m_reg_P = RM(get_ea(0xc008));
+ m_reg_I = RM(m_reg_P);
}
void hp_hybrid_cpu_device::handle_dma(void)
{
- // Patent hints at the fact that terminal count is detected by bit 15 of dmac being 1 after decrementing
- bool tc = BIT(--m_dmac , 15) != 0;
- UINT16 tmp;
-
- if (BIT(m_flags , HPHYBRID_DMADIR_BIT)) {
- // "Outward" DMA: memory -> peripheral
- tmp = RM(m_dmama++);
- WIO(m_dmapa , tc ? 2 : 0 , tmp);
- m_icount -= 10;
- } else {
- // "Inward" DMA: peripheral -> memory
- tmp = RIO(m_dmapa , tc ? 2 : 0);
- WM(m_dmama++ , tmp);
- m_icount -= 9;
- }
-
- // This is the one of the biggest question marks: is the DMA automatically disabled on TC?
- // Here we assume it is. After all it would make no difference because there is no way
- // to read the DMA enable flag back, so each time the DMA is needed it has to be enabled again.
- if (tc) {
- BIT_CLR(m_flags , HPHYBRID_DMAEN_BIT);
- }
+ // Patent hints at the fact that terminal count is detected by bit 15 of dmac being 1 after decrementing
+ bool tc = BIT(--m_dmac , 15) != 0;
+ UINT16 tmp;
+
+ if (BIT(m_flags , HPHYBRID_DMADIR_BIT)) {
+ // "Outward" DMA: memory -> peripheral
+ tmp = RM(m_dmama++);
+ WIO(m_dmapa , tc ? 2 : 0 , tmp);
+ m_icount -= 10;
+ } else {
+ // "Inward" DMA: peripheral -> memory
+ tmp = RIO(m_dmapa , tc ? 2 : 0);
+ WM(m_dmama++ , tmp);
+ m_icount -= 9;
+ }
+
+ // This is the one of the biggest question marks: is the DMA automatically disabled on TC?
+ // Here we assume it is. After all it would make no difference because there is no way
+ // to read the DMA enable flag back, so each time the DMA is needed it has to be enabled again.
+ if (tc) {
+ BIT_CLR(m_flags , HPHYBRID_DMAEN_BIT);
+ }
}
UINT16 hp_hybrid_cpu_device::RM(UINT16 addr)
{
- UINT16 tmp;
-
- if (addr <= HP_REG_LAST_ADDR) {
- // Memory mapped registers
- switch (addr) {
- case HP_REG_A_ADDR:
- return m_reg_A;
-
- case HP_REG_B_ADDR:
- return m_reg_B;
-
- case HP_REG_P_ADDR:
- return m_reg_P;
-
- case HP_REG_R_ADDR:
- return m_reg_R;
-
- case HP_REG_R4_ADDR:
- case HP_REG_R5_ADDR:
- case HP_REG_R6_ADDR:
- case HP_REG_R7_ADDR:
- return RIO(CURRENT_PA , addr - HP_REG_R4_ADDR);
-
- case HP_REG_IV_ADDR:
- // Correct?
- if (!BIT(m_flags , HPHYBRID_IRH_SVC_BIT) && !BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) {
- return m_reg_IV;
- } else {
- return m_reg_IV | CURRENT_PA;
- }
-
- case HP_REG_PA_ADDR:
- return CURRENT_PA;
-
- case HP_REG_DMAPA_ADDR:
- tmp = m_dmapa & HP_REG_PA_MASK;
- if (BIT(m_flags , HPHYBRID_CB_BIT)) {
- BIT_SET(tmp , 15);
- }
- if (BIT(m_flags , HPHYBRID_DB_BIT)) {
- BIT_SET(tmp , 14);
- }
- return tmp;
-
- case HP_REG_DMAMA_ADDR:
- return m_dmama;
-
- case HP_REG_DMAC_ADDR:
- return m_dmac;
-
- case HP_REG_C_ADDR:
- return m_reg_C;
-
- case HP_REG_D_ADDR:
- return m_reg_D;
-
- default:
- // Unknown registers are returned as 0
- return 0;
- }
- } else {
- return m_direct->read_word((offs_t)addr << 1);
- }
+ UINT16 tmp;
+
+ if (addr <= HP_REG_LAST_ADDR) {
+ // Memory mapped registers
+ switch (addr) {
+ case HP_REG_A_ADDR:
+ return m_reg_A;
+
+ case HP_REG_B_ADDR:
+ return m_reg_B;
+
+ case HP_REG_P_ADDR:
+ return m_reg_P;
+
+ case HP_REG_R_ADDR:
+ return m_reg_R;
+
+ case HP_REG_R4_ADDR:
+ case HP_REG_R5_ADDR:
+ case HP_REG_R6_ADDR:
+ case HP_REG_R7_ADDR:
+ return RIO(CURRENT_PA , addr - HP_REG_R4_ADDR);
+
+ case HP_REG_IV_ADDR:
+ // Correct?
+ if (!BIT(m_flags , HPHYBRID_IRH_SVC_BIT) && !BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) {
+ return m_reg_IV;
+ } else {
+ return m_reg_IV | CURRENT_PA;
+ }
+
+ case HP_REG_PA_ADDR:
+ return CURRENT_PA;
+
+ case HP_REG_DMAPA_ADDR:
+ tmp = m_dmapa & HP_REG_PA_MASK;
+ if (BIT(m_flags , HPHYBRID_CB_BIT)) {
+ BIT_SET(tmp , 15);
+ }
+ if (BIT(m_flags , HPHYBRID_DB_BIT)) {
+ BIT_SET(tmp , 14);
+ }
+ return tmp;
+
+ case HP_REG_DMAMA_ADDR:
+ return m_dmama;
+
+ case HP_REG_DMAC_ADDR:
+ return m_dmac;
+
+ case HP_REG_C_ADDR:
+ return m_reg_C;
+
+ case HP_REG_D_ADDR:
+ return m_reg_D;
+
+ default:
+ // Unknown registers are returned as 0
+ return 0;
+ }
+ } else {
+ return m_direct->read_word((offs_t)addr << 1);
+ }
}
void hp_hybrid_cpu_device::WM(UINT16 addr , UINT16 v)
{
- if (addr <= HP_REG_LAST_ADDR) {
- // Memory mapped registers
- switch (addr) {
- case HP_REG_A_ADDR:
- m_reg_A = v;
- break;
-
- case HP_REG_B_ADDR:
- m_reg_B = v;
- break;
-
- case HP_REG_P_ADDR:
- m_reg_P = v;
- break;
-
- case HP_REG_R_ADDR:
- m_reg_R = v;
- break;
-
- case HP_REG_R4_ADDR:
- case HP_REG_R5_ADDR:
- case HP_REG_R6_ADDR:
- case HP_REG_R7_ADDR:
- WIO(CURRENT_PA , addr - HP_REG_R4_ADDR , v);
- break;
-
- case HP_REG_IV_ADDR:
- m_reg_IV = v & HP_REG_IV_MASK;
- break;
-
- case HP_REG_PA_ADDR:
- CURRENT_PA = v & HP_REG_PA_MASK;
- break;
-
- case HP_REG_DMAPA_ADDR:
- m_dmapa = v & HP_REG_PA_MASK;
- break;
-
- case HP_REG_DMAMA_ADDR:
- m_dmama = v;
- break;
-
- case HP_REG_DMAC_ADDR:
- m_dmac = v;
- break;
-
- case HP_REG_C_ADDR:
- m_reg_C = v;
- break;
-
- case HP_REG_D_ADDR:
- m_reg_D = v;
- break;
-
- default:
- // Unknown registers are silently discarded
- break;
- }
- } else {
- m_program->write_word((offs_t)addr << 1 , v);
- }
+ if (addr <= HP_REG_LAST_ADDR) {
+ // Memory mapped registers
+ switch (addr) {
+ case HP_REG_A_ADDR:
+ m_reg_A = v;
+ break;
+
+ case HP_REG_B_ADDR:
+ m_reg_B = v;
+ break;
+
+ case HP_REG_P_ADDR:
+ m_reg_P = v;
+ break;
+
+ case HP_REG_R_ADDR:
+ m_reg_R = v;
+ break;
+
+ case HP_REG_R4_ADDR:
+ case HP_REG_R5_ADDR:
+ case HP_REG_R6_ADDR:
+ case HP_REG_R7_ADDR:
+ WIO(CURRENT_PA , addr - HP_REG_R4_ADDR , v);
+ break;
+
+ case HP_REG_IV_ADDR:
+ m_reg_IV = v & HP_REG_IV_MASK;
+ break;
+
+ case HP_REG_PA_ADDR:
+ CURRENT_PA = v & HP_REG_PA_MASK;
+ break;
+
+ case HP_REG_DMAPA_ADDR:
+ m_dmapa = v & HP_REG_PA_MASK;
+ break;
+
+ case HP_REG_DMAMA_ADDR:
+ m_dmama = v;
+ break;
+
+ case HP_REG_DMAC_ADDR:
+ m_dmac = v;
+ break;
+
+ case HP_REG_C_ADDR:
+ m_reg_C = v;
+ break;
+
+ case HP_REG_D_ADDR:
+ m_reg_D = v;
+ break;
+
+ default:
+ // Unknown registers are silently discarded
+ break;
+ }
+ } else {
+ m_program->write_word((offs_t)addr << 1 , v);
+ }
}
void hp_hybrid_cpu_device::WMB(UINT32 addr , UINT8 v)
{
- if (addr <= (HP_REG_LAST_ADDR * 2 + 1)) {
- // Cannot write bytes to registers
- } else {
- m_program->write_byte(addr , v);
- }
+ if (addr <= (HP_REG_LAST_ADDR * 2 + 1)) {
+ // Cannot write bytes to registers
+ } else {
+ m_program->write_byte(addr , v);
+ }
}
UINT16 hp_hybrid_cpu_device::RIO(UINT8 pa , UINT8 ic)
{
- return m_io->read_word(HP_MAKE_IOADDR(pa, ic) << 1);
+ return m_io->read_word(HP_MAKE_IOADDR(pa, ic) << 1);
}
void hp_hybrid_cpu_device::WIO(UINT8 pa , UINT8 ic , UINT16 v)
{
- m_io->write_word(HP_MAKE_IOADDR(pa, ic) << 1 , v);
+ m_io->write_word(HP_MAKE_IOADDR(pa, ic) << 1 , v);
}
hp_5061_3011_cpu_device::hp_5061_3011_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
diff --git a/src/emu/cpu/hphybrid/hphybrid.h b/src/emu/cpu/hphybrid/hphybrid.h
index 5ef9f927d0e..7683cce28b6 100644
--- a/src/emu/cpu/hphybrid/hphybrid.h
+++ b/src/emu/cpu/hphybrid/hphybrid.h
@@ -65,7 +65,7 @@
class hp_hybrid_cpu_device : public cpu_device
{
public:
- DECLARE_WRITE_LINE_MEMBER(dmar_w);
+ DECLARE_WRITE_LINE_MEMBER(dmar_w);
protected:
hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
@@ -126,7 +126,7 @@ private:
UINT16 get_skip_addr_sc(UINT16 opcode , UINT16& v , unsigned n);
void do_pw(UINT16 opcode);
void check_for_interrupts(void);
- void handle_dma(void);
+ void handle_dma(void);
UINT16 RM(UINT16 addr);
void WM(UINT16 addr , UINT16 v);
diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/emu/cpu/m68000/m68kcpu.c
index b925594825d..bc5e7bc9b3d 100644
--- a/src/emu/cpu/m68000/m68kcpu.c
+++ b/src/emu/cpu/m68000/m68kcpu.c
@@ -2336,8 +2336,8 @@ const device_type M68K = &device_creator<m68000_base_device>;
m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, M68K, "M68K", tag, owner, clock, "m68k", __FILE__),
- m_program_config("program", ENDIANNESS_BIG, 16, 24),
- m_oprogram_config("decrypted_opcodes", ENDIANNESS_BIG, 16, 24)
+ m_program_config("program", ENDIANNESS_BIG, 16, 24),
+ m_oprogram_config("decrypted_opcodes", ENDIANNESS_BIG, 16, 24)
{
clear_all();
}
@@ -2348,8 +2348,8 @@ m68000_base_device::m68000_base_device(const machine_config &mconfig, const char
m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
- m_program_config("program", ENDIANNESS_BIG, prg_data_width, prg_address_bits, 0, internal_map),
- m_oprogram_config("decrypted_opcodes", ENDIANNESS_BIG, prg_data_width, prg_address_bits, 0, internal_map)
+ m_program_config("program", ENDIANNESS_BIG, prg_data_width, prg_address_bits, 0, internal_map),
+ m_oprogram_config("decrypted_opcodes", ENDIANNESS_BIG, prg_data_width, prg_address_bits, 0, internal_map)
{
clear_all();
}
@@ -2358,8 +2358,8 @@ m68000_base_device::m68000_base_device(const machine_config &mconfig, const char
m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),
- m_program_config("program", ENDIANNESS_BIG, prg_data_width, prg_address_bits),
- m_oprogram_config("decrypted_opcodes", ENDIANNESS_BIG, prg_data_width, prg_address_bits)
+ m_program_config("program", ENDIANNESS_BIG, prg_data_width, prg_address_bits),
+ m_oprogram_config("decrypted_opcodes", ENDIANNESS_BIG, prg_data_width, prg_address_bits)
{
clear_all();
}
diff --git a/src/emu/cpu/rsp/rsp.c b/src/emu/cpu/rsp/rsp.c
index edea79ac688..6419282a598 100644
--- a/src/emu/cpu/rsp/rsp.c
+++ b/src/emu/cpu/rsp/rsp.c
@@ -801,9 +801,9 @@ void rsp_device::execute_run()
m_rsp_state->icount = MIN(m_rsp_state->icount, 0);
}
/*m_cop2->dump(op);
- if (((op >> 26) & 0x3f) == 0x3a)
- {
- m_cop2->dump_dmem();
- }*/
+ if (((op >> 26) & 0x3f) == 0x3a)
+ {
+ m_cop2->dump_dmem();
+ }*/
}
}
diff --git a/src/emu/cpu/rsp/rspcp2.c b/src/emu/cpu/rsp/rspcp2.c
index cde6f3b5be8..ab6afed4cbc 100644
--- a/src/emu/cpu/rsp/rspcp2.c
+++ b/src/emu/cpu/rsp/rspcp2.c
@@ -206,9 +206,9 @@ const rsp_cop2::vec_helpers_t rsp_cop2::m_vec_helpers = {
{ 0xffff, 0xffff, 0x0000, 0x0000 }, // L
{ 0xffff, 0xffff, 0xffff, 0xffff } // D
},
- { // word_reverse
- 0x0203, 0x0001, 0x0607, 0x0405, 0x0a0b, 0x0809, 0x0e0f, 0x0c0d
- }
+ { // word_reverse
+ 0x0203, 0x0001, 0x0607, 0x0405, 0x0a0b, 0x0809, 0x0e0f, 0x0c0d
+ }
};
#if !(defined(__SSSE3__) || defined(_MSC_VER))
@@ -322,7 +322,7 @@ void rsp_cop2::vec_load_group1(UINT32 addr, UINT32 element, UINT16 *regp, rsp_ve
dqm = _mm_shuffle_epi8(dqm, ekey);
#endif
- // Align the data to the DQM so we can mask it in.
+ // Align the data to the DQM so we can mask it in.
#if !(defined(__SSSE3__) || defined(_MSC_VER))
data = sse2_pshufb(data, m_vec_helpers.ror_b2l_keys[ror & 0xF]);
#else
@@ -330,7 +330,7 @@ void rsp_cop2::vec_load_group1(UINT32 addr, UINT32 element, UINT16 *regp, rsp_ve
data = _mm_shuffle_epi8(data, ekey);
#endif
- // Mask and mux in the data.
+ // Mask and mux in the data.
#if (defined(__SSE4_1__) || defined(_MSC_VER))
reg = _mm_blendv_epi8(reg, data, dqm);
#else
@@ -377,7 +377,7 @@ void rsp_cop2::vec_load_group2(UINT32 addr, UINT32 element, UINT16 *regp, rsp_ve
}
// "Unpack" the data.
- rsp_vec_t zero = _mm_setzero_si128();
+ rsp_vec_t zero = _mm_setzero_si128();
data = _mm_unpacklo_epi8(zero, data);
if (request_type != RSP_MEM_REQUEST_PACK)
@@ -385,10 +385,10 @@ void rsp_cop2::vec_load_group2(UINT32 addr, UINT32 element, UINT16 *regp, rsp_ve
data = _mm_srli_epi16(data, 1);
}
- data = _mm_shufflehi_epi16(data, _MM_SHUFFLE(0, 1, 2, 3));
- data = _mm_shufflelo_epi16(data, _MM_SHUFFLE(0, 1, 2, 3));
+ data = _mm_shufflehi_epi16(data, _MM_SHUFFLE(0, 1, 2, 3));
+ data = _mm_shufflelo_epi16(data, _MM_SHUFFLE(0, 1, 2, 3));
- _mm_store_si128((rsp_vec_t *) regp, data);
+ _mm_store_si128((rsp_vec_t *) regp, data);
}
//
@@ -403,7 +403,7 @@ void rsp_cop2::vec_load_group4(UINT32 addr, UINT32 element, UINT16 *regp, rsp_ve
{
UINT32 aligned_addr = addr & 0xFF0;
UINT32 offset = addr & 0xF;
- static UINT32 call_count = 0;
+ static UINT32 call_count = 0;
rsp_vec_t data = _mm_load_si128((rsp_vec_t *) (m_rsp.get_dmem() + aligned_addr));
@@ -439,7 +439,7 @@ void rsp_cop2::vec_load_group4(UINT32 addr, UINT32 element, UINT16 *regp, rsp_ve
_mm_store_si128((rsp_vec_t *) regp, data);
- call_count++;
+ call_count++;
}
//
@@ -542,7 +542,7 @@ void rsp_cop2::vec_store_group2(UINT32 addr, UINT32 element, UINT16 *regp, rsp_v
reg = _mm_shuffle_epi8(reg, dkey);
#endif
- // TODO: Always store in 8-byte chunks to emulate wraparound.
+ // TODO: Always store in 8-byte chunks to emulate wraparound.
_mm_storel_epi64((rsp_vec_t *) (m_rsp.get_dmem() + addr), reg);
}
@@ -574,7 +574,7 @@ void rsp_cop2::vec_store_group4(UINT32 addr, UINT32 element, UINT16 *regp, rsp_v
reg = _mm_shuffle_epi8(reg, ekey);
#endif
- // Mask and mux out the data, write.
+ // Mask and mux out the data, write.
#if (defined(__SSE4_1__) || defined(_MSC_VER))
data = _mm_blendv_epi8(data, reg, dqm);
#else
@@ -702,10 +702,10 @@ rsp_cop2::rsp_cop2(rsp_device &rsp, running_machine &machine)
memset(m_vflag, 0, sizeof(m_vflag));
memset(m_accum, 0, sizeof(m_accum));
#if USE_SIMD
- memset(&m_acc, 0, sizeof(m_acc));
- memset(&m_flags, 0, sizeof(aligned_rsp_2vect_t) * 3);
- m_div_out = 0;
- m_div_in = 0;
+ memset(&m_acc, 0, sizeof(m_acc));
+ memset(&m_flags, 0, sizeof(aligned_rsp_2vect_t) * 3);
+ m_div_out = 0;
+ m_div_in = 0;
#endif
m_rspcop2_state = (internal_rspcop2_state *)rsp.m_cache.alloc_near(sizeof(internal_rspcop2_state));
}
@@ -877,7 +877,7 @@ void rsp_cop2::handle_lwc2(UINT32 op)
//
// Load 1 byte to vector byte index
- //printf("LBV ");
+ //printf("LBV ");
#if USE_SIMD
vec_lbdlsv_sbdlsv(op, m_rsp.m_rsp_state->r[base]);
#else
@@ -896,7 +896,7 @@ void rsp_cop2::handle_lwc2(UINT32 op)
//
// Loads 2 bytes starting from vector byte index
- //printf("LSV ");
+ //printf("LSV ");
#if USE_SIMD
vec_lbdlsv_sbdlsv(op, m_rsp.m_rsp_state->r[base]);
#else
@@ -922,7 +922,7 @@ void rsp_cop2::handle_lwc2(UINT32 op)
//
// Loads 4 bytes starting from vector byte index
- //printf("LLV ");
+ //printf("LLV ");
#if USE_SIMD
vec_lbdlsv_sbdlsv(op, m_rsp.m_rsp_state->r[base]);
#else
@@ -948,7 +948,7 @@ void rsp_cop2::handle_lwc2(UINT32 op)
//
// Loads 8 bytes starting from vector byte index
- //printf("LDV ");
+ //printf("LDV ");
#if USE_SIMD
vec_lbdlsv_sbdlsv(op, m_rsp.m_rsp_state->r[base]);
#else
@@ -974,7 +974,7 @@ void rsp_cop2::handle_lwc2(UINT32 op)
//
// Loads up to 16 bytes starting from vector byte index
- //printf("LQV ");
+ //printf("LQV ");
#if USE_SIMD
vec_lqrv_sqrv(op, m_rsp.m_rsp_state->r[base]);
#else
@@ -1001,7 +1001,7 @@ void rsp_cop2::handle_lwc2(UINT32 op)
//
// Stores up to 16 bytes starting from right side until 16-byte boundary
- //printf("LRV ");
+ //printf("LRV ");
#if USE_SIMD
vec_lqrv_sqrv(op, m_rsp.m_rsp_state->r[base]);
#else
@@ -1029,7 +1029,7 @@ void rsp_cop2::handle_lwc2(UINT32 op)
//
// Loads a byte as the upper 8 bits of each element
- //printf("LPV ");
+ //printf("LPV ");
#if USE_SIMD
vec_lfhpuv_sfhpuv(op, m_rsp.m_rsp_state->r[base]);
#else
@@ -1052,7 +1052,7 @@ void rsp_cop2::handle_lwc2(UINT32 op)
//
// Loads a byte as the bits 14-7 of each element
- //printf("LUV ");
+ //printf("LUV ");
#if USE_SIMD
vec_lfhpuv_sfhpuv(op, m_rsp.m_rsp_state->r[base]);
#else
@@ -1075,7 +1075,7 @@ void rsp_cop2::handle_lwc2(UINT32 op)
//
// Loads a byte as the bits 14-7 of each element, with 2-byte stride
- //printf("LHV ");
+ //printf("LHV ");
#if USE_SIMD
vec_lfhpuv_sfhpuv(op, m_rsp.m_rsp_state->r[base]);
#else
@@ -1098,7 +1098,7 @@ void rsp_cop2::handle_lwc2(UINT32 op)
//
// Loads a byte as the bits 14-7 of upper or lower quad, with 4-byte stride
- //printf("LFV ");
+ //printf("LFV ");
#if USE_SIMD
vec_lfhpuv_sfhpuv(op, m_rsp.m_rsp_state->r[base]);
#else
@@ -1127,7 +1127,7 @@ void rsp_cop2::handle_lwc2(UINT32 op)
// Loads the full 128-bit vector starting from vector byte index and wrapping to index 0
// after byte index 15
- //printf("LWV ");
+ //printf("LWV ");
#if USE_SIMD
#else
ea = (base) ? m_rsp.m_rsp_state->r[base] + (offset * 16) : (offset * 16);
@@ -1154,15 +1154,15 @@ void rsp_cop2::handle_lwc2(UINT32 op)
// FIXME: has a small problem with odd indices
- //printf("LTV ");
+ //printf("LTV ");
#if 0
#else
- INT32 index = (op >> 7) & 0xf;
- INT32 offset = (op & 0x7f);
- if (offset & 0x40)
- offset |= 0xffffffc0;
+ INT32 index = (op >> 7) & 0xf;
+ INT32 offset = (op & 0x7f);
+ if (offset & 0x40)
+ offset |= 0xffffffc0;
- INT32 vs = (op >> 16) & 0x1f;
+ INT32 vs = (op >> 16) & 0x1f;
INT32 ve = vs + 8;
if (ve > 32)
ve = 32;
@@ -1225,7 +1225,7 @@ void rsp_cop2::handle_swc2(UINT32 op)
//
// Stores 1 byte from vector byte index
- //printf("SBV ");
+ //printf("SBV ");
#if USE_SIMD
vec_lbdlsv_sbdlsv(op, m_rsp.m_rsp_state->r[base]);
#else
@@ -1244,7 +1244,7 @@ void rsp_cop2::handle_swc2(UINT32 op)
//
// Stores 2 bytes starting from vector byte index
- //printf("SSV ");
+ //printf("SSV ");
#if USE_SIMD
vec_lbdlsv_sbdlsv(op, m_rsp.m_rsp_state->r[base]);
#else
@@ -1270,7 +1270,7 @@ void rsp_cop2::handle_swc2(UINT32 op)
//
// Stores 4 bytes starting from vector byte index
- //printf("SLV ");
+ //printf("SLV ");
#if USE_SIMD
vec_lbdlsv_sbdlsv(op, m_rsp.m_rsp_state->r[base]);
#else
@@ -1296,7 +1296,7 @@ void rsp_cop2::handle_swc2(UINT32 op)
//
// Stores 8 bytes starting from vector byte index
- //printf("SDV ");
+ //printf("SDV ");
#if USE_SIMD
vec_lbdlsv_sbdlsv(op, m_rsp.m_rsp_state->r[base]);
#else
@@ -1322,7 +1322,7 @@ void rsp_cop2::handle_swc2(UINT32 op)
//
// Stores up to 16 bytes starting from vector byte index until 16-byte boundary
- //printf("SQV ");
+ //printf("SQV ");
#if USE_SIMD
vec_lqrv_sqrv(op, m_rsp.m_rsp_state->r[base]);
#else
@@ -1348,7 +1348,7 @@ void rsp_cop2::handle_swc2(UINT32 op)
//
// Stores up to 16 bytes starting from right side until 16-byte boundary
- //printf("SRV ");
+ //printf("SRV ");
#if USE_SIMD
vec_lqrv_sqrv(op, m_rsp.m_rsp_state->r[base]);
#else
@@ -1377,7 +1377,7 @@ void rsp_cop2::handle_swc2(UINT32 op)
//
// Stores upper 8 bits of each element
- //printf("SPV ");
+ //printf("SPV ");
#if USE_SIMD
vec_lfhpuv_sfhpuv(op, m_rsp.m_rsp_state->r[base]);
#else
@@ -1409,7 +1409,7 @@ void rsp_cop2::handle_swc2(UINT32 op)
//
// Stores bits 14-7 of each element
- //printf("SUV ");
+ //printf("SUV ");
#if USE_SIMD
vec_lfhpuv_sfhpuv(op, m_rsp.m_rsp_state->r[base]);
#else
@@ -1441,7 +1441,7 @@ void rsp_cop2::handle_swc2(UINT32 op)
//
// Stores bits 14-7 of each element, with 2-byte stride
- //printf("SHV ");
+ //printf("SHV ");
#if USE_SIMD
vec_lfhpuv_sfhpuv(op, m_rsp.m_rsp_state->r[base]);
#else
@@ -1470,7 +1470,7 @@ void rsp_cop2::handle_swc2(UINT32 op)
// FIXME: only works for index 0 and index 8
- //printf("SFV ");
+ //printf("SFV ");
#if USE_SIMD
vec_lfhpuv_sfhpuv(op, m_rsp.m_rsp_state->r[base]);
#else
@@ -1500,7 +1500,7 @@ void rsp_cop2::handle_swc2(UINT32 op)
// Stores the full 128-bit vector starting from vector byte index and wrapping to index 0
// after byte index 15
- //printf("SWV ");
+ //printf("SWV ");
#if USE_SIMD
#else
ea = (base) ? m_rsp.m_rsp_state->r[base] + (offset * 16) : (offset * 16);
@@ -1528,13 +1528,13 @@ void rsp_cop2::handle_swc2(UINT32 op)
//
// Stores one element from maximum of 8 vectors, while incrementing element index
- //printf("STV ");
+ //printf("STV ");
#if 0
#else
- INT32 index = (op >> 7) & 0xf;
- INT32 offset = (op & 0x7f);
- if (offset & 0x40)
- offset |= 0xffffffc0;
+ INT32 index = (op >> 7) & 0xf;
+ INT32 offset = (op & 0x7f);
+ if (offset & 0x40)
+ offset |= 0xffffffc0;
INT32 vs = (op >> 16) & 0x1f;
INT32 ve = vs + 8;
@@ -1548,7 +1548,7 @@ void rsp_cop2::handle_swc2(UINT32 op)
INT32 eaoffset = (ea & 0xf) + (element * 2);
ea &= ~0xf;
- for (INT32 i = vs; i < ve; i++)
+ for (INT32 i = vs; i < ve; i++)
{
m_rsp.WRITE16(ea + (eaoffset & 0xf), VREG_S(i, element & 0x7));
eaoffset += 2;
@@ -1654,7 +1654,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
//
// Multiplies signed integer by signed integer * 2
- //printf("MULF ");
+ //printf("MULF ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t acc_lo, acc_mid, acc_hi;
@@ -1706,7 +1706,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
// ------------------------------------------------------
//
- //printf("MULU ");
+ //printf("MULU ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t acc_lo, acc_mid, acc_hi;
@@ -1762,7 +1762,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
// Stores the higher 16 bits of the 32-bit result to accumulator
// The low slice of accumulator is stored into destination element
- //printf("MUDL ");
+ //printf("MUDL ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t acc_lo, acc_mid, acc_hi;
@@ -1809,7 +1809,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
// The result is stored into accumulator
// The middle slice of accumulator is stored into destination element
- //printf("MUDM ");
+ //printf("MUDM ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t acc_lo, acc_mid, acc_hi;
@@ -1857,7 +1857,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
// The result is stored into accumulator
// The low slice of accumulator is stored into destination element
- //printf("MUDN ");
+ //printf("MUDN ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t acc_lo = read_acc_lo(acc);
@@ -1902,7 +1902,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
// The result is stored into highest 32 bits of accumulator, the low slice is zero
// The highest 32 bits of accumulator is saturated into destination element
- //printf("MUDH ");
+ //printf("MUDH ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t acc_lo, acc_mid, acc_hi;
@@ -1950,7 +1950,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
// Multiplies signed integer by signed integer * 2
// The result is added to accumulator
- //printf("MACF ");
+ //printf("MACF ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t acc_lo, acc_mid, acc_hi;
@@ -2001,7 +2001,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
// ------------------------------------------------------
//
- //printf("MACU ");
+ //printf("MACU ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t acc_lo, acc_mid, acc_hi;
@@ -2071,7 +2071,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
// Adds the higher 16 bits of the 32-bit result to accumulator
// The low slice of accumulator is stored into destination element
- //printf("MADL ");
+ //printf("MADL ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t acc_lo, acc_mid, acc_hi;
@@ -2120,7 +2120,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
// The result is added into accumulator
// The middle slice of accumulator is stored into destination element
- //printf("MADM ");
+ //printf("MADM ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t acc_lo, acc_mid, acc_hi;
@@ -2171,7 +2171,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
// The result is added into accumulator
// The low slice of accumulator is stored into destination element
- //printf("MADN ");
+ //printf("MADN ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t acc_lo, acc_mid, acc_hi;
@@ -2225,7 +2225,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
// The result is added into highest 32 bits of accumulator, the low slice is zero
// The highest 32 bits of accumulator is saturated into destination element
- //printf("MADH ");
+ //printf("MADH ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t acc_lo, acc_mid, acc_hi;
@@ -2275,7 +2275,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
// TODO: check VS2REG == VDREG
- //printf("ADD ");
+ //printf("ADD ");
#if USE_SIMD
rsp_vec_t acc_lo;
UINT16 *acc = m_acc.s;
@@ -2321,7 +2321,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
// TODO: check VS2REG == VDREG
- //printf("SUB ");
+ //printf("SUB ");
#if USE_SIMD
rsp_vec_t acc_lo;
UINT16 *acc = m_acc.s;
@@ -2367,7 +2367,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
// Changes the sign of source register 2 if source register 1 is negative and stores
// the result to destination register
- //printf("ABS ");
+ //printf("ABS ");
#if USE_SIMD
rsp_vec_t acc_lo;
UINT16 *acc = m_acc.s;
@@ -2423,7 +2423,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
// TODO: check VS2REG = VDREG
- //printf("ADDC ");
+ //printf("ADDC ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t sn;
@@ -2471,7 +2471,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
// TODO: check VS2REG = VDREG
- //printf("SUBC ");
+ //printf("SUBC ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t eq, sn;
@@ -2521,7 +2521,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
//
// Stores high, middle or low slice of accumulator to destination vector
- //printf("SAW ");
+ //printf("SAW ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
switch (EL)
@@ -2586,7 +2586,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
// Sets compare flags if elements in VS1 are less than VS2
// Moves the element in VS2 to destination vector
- //printf("LT ");
+ //printf("LT ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t le;
@@ -2655,7 +2655,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
// Sets compare flags if elements in VS1 are equal with VS2
// Moves the element in VS2 to destination vector
- //printf("EQ ");
+ //printf("EQ ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t le;
@@ -2712,7 +2712,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
// Sets compare flags if elements in VS1 are not equal with VS2
// Moves the element in VS2 to destination vector
- //printf("NE ");
+ //printf("NE ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t le;
@@ -2770,7 +2770,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
// Sets compare flags if elements in VS1 are greater or equal with VS2
// Moves the element in VS2 to destination vector
- //printf("GE ");
+ //printf("GE ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t le;
@@ -2827,7 +2827,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
//
// Vector clip low
- //printf("CL ");
+ //printf("CL ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
@@ -2944,7 +2944,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
//
// Vector clip high
- //printf("CH ");
+ //printf("CH ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t ge, le, sign, eq, vce;
@@ -3047,7 +3047,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
//
// Vector clip reverse
- //printf("CR ");
+ //printf("CR ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t ge, le;
@@ -3125,7 +3125,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
//
// Merges two vectors according to compare flags
- //printf("MRG ");
+ //printf("MRG ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
rsp_vec_t le = read_vcc_lo(m_flags[RSP_VCC].s);
@@ -3166,7 +3166,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
//
// Bitwise AND of two vector registers
- //printf("AND ");
+ //printf("AND ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
@@ -3196,7 +3196,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
//
// Bitwise NOT AND of two vector registers
- //printf("NAND ");
+ //printf("NAND ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
@@ -3226,7 +3226,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
//
// Bitwise OR of two vector registers
- //printf("OR ");
+ //printf("OR ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
@@ -3256,7 +3256,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
//
// Bitwise NOT OR of two vector registers
- //printf("NOR ");
+ //printf("NOR ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
@@ -3286,7 +3286,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
//
// Bitwise XOR of two vector registers
- //printf("XOR ");
+ //printf("XOR ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
@@ -3316,7 +3316,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
//
// Bitwise NOT XOR of two vector registers
- //printf("NXOR ");
+ //printf("NXOR ");
#if USE_SIMD
UINT16 *acc = m_acc.s;
@@ -3347,7 +3347,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
//
// Calculates reciprocal
- //printf("RCP ");
+ //printf("RCP ");
#if USE_SIMD
write_acc_lo(m_acc.s, vec_load_and_shuffle_operand(m_v[VS2REG].s, EL));
@@ -3418,7 +3418,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
//
// Calculates reciprocal low part
- //printf("RCPL ");
+ //printf("RCPL ");
#if USE_SIMD
write_acc_lo(m_acc.s, vec_load_and_shuffle_operand(m_v[VS2REG].s, EL));
@@ -3505,7 +3505,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
//
// Calculates reciprocal high part
- //printf("RCPH ");
+ //printf("RCPH ");
#if USE_SIMD
write_acc_lo(m_acc.s, vec_load_and_shuffle_operand(m_v[VS2REG].s, EL));
@@ -3537,7 +3537,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
//
// Moves element from vector to destination vector
- //printf("MOV ");
+ //printf("MOV ");
#if USE_SIMD
write_acc_lo(m_acc.s, vec_load_and_shuffle_operand(m_v[VS2REG].s, EL));
m_v[VDREG].v = vec_vmov(VS2REG, EL, VDREG, VS1REG);
@@ -3561,7 +3561,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
//
// Calculates reciprocal square-root
- //printf("RSQ ");
+ //printf("RSQ ");
#if USE_SIMD
write_acc_lo(m_acc.s, vec_load_and_shuffle_operand(m_v[VS2REG].s, EL));
@@ -3633,7 +3633,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
//
// Calculates reciprocal square-root low part
- //printf("RSQL ");
+ //printf("RSQL ");
#if USE_SIMD
write_acc_lo(m_acc.s, vec_load_and_shuffle_operand(m_v[VS2REG].s, EL));
@@ -3723,7 +3723,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
//
// Calculates reciprocal square-root high part
- //printf("RSQH ");
+ //printf("RSQH ");
#if USE_SIMD
write_acc_lo(m_acc.s, vec_load_and_shuffle_operand(m_v[VS2REG].s, EL));
@@ -3754,7 +3754,7 @@ void rsp_cop2::handle_vector_ops(UINT32 op)
//
// Vector null instruction
- //printf("NOP ");
+ //printf("NOP ");
break;
}
@@ -3777,7 +3777,7 @@ void rsp_cop2::handle_cop2(UINT32 op)
// | 010010 | 00000 | TTTTT | DDDDD | IIII | 0000000 |
// ---------------------------------------------------
//
- //printf("MFC2 ");
+ //printf("MFC2 ");
int el = (op >> 7) & 0xf;
UINT16 b1 = VREG_B(RDREG, (el+0) & 0xf);
UINT16 b2 = VREG_B(RDREG, (el+1) & 0xf);
@@ -3792,15 +3792,15 @@ void rsp_cop2::handle_cop2(UINT32 op)
// | 010010 | 00010 | TTTTT | DDDDD | 00000000000 |
// ------------------------------------------------
//
- //printf("CFC2 ");
+ //printf("CFC2 ");
if (RTREG)
{
#if USE_SIMD
- INT32 src = RDREG & 3;
- if (src == 3) {
- src = 2;
- }
- RTVAL = get_flags(m_flags[src].s);
+ INT32 src = RDREG & 3;
+ if (src == 3) {
+ src = 2;
+ }
+ RTVAL = get_flags(m_flags[src].s);
#else
switch(RDREG)
{
@@ -3865,7 +3865,7 @@ void rsp_cop2::handle_cop2(UINT32 op)
// | 010010 | 00100 | TTTTT | DDDDD | IIII | 0000000 |
// ---------------------------------------------------
//
- //printf("MTC2 ");
+ //printf("MTC2 ");
int el = (op >> 7) & 0xf;
W_VREG_B(RDREG, (el+0) & 0xf, (RTVAL >> 8) & 0xff);
W_VREG_B(RDREG, (el+1) & 0xf, (RTVAL >> 0) & 0xff);
@@ -3966,7 +3966,7 @@ void rsp_cop2::handle_cop2(UINT32 op)
case 0x10: case 0x11: case 0x12: case 0x13: case 0x14: case 0x15: case 0x16: case 0x17:
case 0x18: case 0x19: case 0x1a: case 0x1b: case 0x1c: case 0x1d: case 0x1e: case 0x1f:
{
- //printf("V");
+ //printf("V");
handle_vector_ops(op);
break;
}
@@ -4185,38 +4185,38 @@ void rsp_cop2::dump(UINT32 op)
}
#if USE_SIMD
- printf("acc_h: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_acc.s[0], m_acc.s[1], m_acc.s[2], m_acc.s[3], m_acc.s[4], m_acc.s[5], m_acc.s[6], m_acc.s[7]);
- printf("acc_m: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_acc.s[8], m_acc.s[9], m_acc.s[10], m_acc.s[11], m_acc.s[12], m_acc.s[13], m_acc.s[14], m_acc.s[15]);
- printf("acc_l: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_acc.s[16], m_acc.s[17], m_acc.s[18], m_acc.s[19], m_acc.s[20], m_acc.s[21], m_acc.s[22], m_acc.s[23]);
- printf("vcc_hi: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_flags[RSP_VCC].s[0], m_flags[RSP_VCC].s[1], m_flags[RSP_VCC].s[2], m_flags[RSP_VCC].s[3], m_flags[RSP_VCC].s[4], m_flags[RSP_VCC].s[5], m_flags[RSP_VCC].s[6], m_flags[RSP_VCC].s[7]);
- printf("vcc_lo: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_flags[RSP_VCC].s[8], m_flags[RSP_VCC].s[9], m_flags[RSP_VCC].s[10], m_flags[RSP_VCC].s[11], m_flags[RSP_VCC].s[12], m_flags[RSP_VCC].s[13], m_flags[RSP_VCC].s[14], m_flags[RSP_VCC].s[15]);
- printf("vco_hi: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_flags[RSP_VCO].s[0], m_flags[RSP_VCO].s[1], m_flags[RSP_VCO].s[2], m_flags[RSP_VCO].s[3], m_flags[RSP_VCO].s[4], m_flags[RSP_VCO].s[5], m_flags[RSP_VCO].s[6], m_flags[RSP_VCO].s[7]);
- printf("vco_lo: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_flags[RSP_VCO].s[8], m_flags[RSP_VCO].s[9], m_flags[RSP_VCO].s[10], m_flags[RSP_VCO].s[11], m_flags[RSP_VCO].s[12], m_flags[RSP_VCO].s[13], m_flags[RSP_VCO].s[14], m_flags[RSP_VCO].s[15]);
- printf("vce: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_flags[RSP_VCE].s[0], m_flags[RSP_VCE].s[1], m_flags[RSP_VCE].s[2], m_flags[RSP_VCE].s[3], m_flags[RSP_VCE].s[4], m_flags[RSP_VCE].s[5], m_flags[RSP_VCE].s[6], m_flags[RSP_VCE].s[7]);
+ printf("acc_h: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_acc.s[0], m_acc.s[1], m_acc.s[2], m_acc.s[3], m_acc.s[4], m_acc.s[5], m_acc.s[6], m_acc.s[7]);
+ printf("acc_m: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_acc.s[8], m_acc.s[9], m_acc.s[10], m_acc.s[11], m_acc.s[12], m_acc.s[13], m_acc.s[14], m_acc.s[15]);
+ printf("acc_l: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_acc.s[16], m_acc.s[17], m_acc.s[18], m_acc.s[19], m_acc.s[20], m_acc.s[21], m_acc.s[22], m_acc.s[23]);
+ printf("vcc_hi: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_flags[RSP_VCC].s[0], m_flags[RSP_VCC].s[1], m_flags[RSP_VCC].s[2], m_flags[RSP_VCC].s[3], m_flags[RSP_VCC].s[4], m_flags[RSP_VCC].s[5], m_flags[RSP_VCC].s[6], m_flags[RSP_VCC].s[7]);
+ printf("vcc_lo: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_flags[RSP_VCC].s[8], m_flags[RSP_VCC].s[9], m_flags[RSP_VCC].s[10], m_flags[RSP_VCC].s[11], m_flags[RSP_VCC].s[12], m_flags[RSP_VCC].s[13], m_flags[RSP_VCC].s[14], m_flags[RSP_VCC].s[15]);
+ printf("vco_hi: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_flags[RSP_VCO].s[0], m_flags[RSP_VCO].s[1], m_flags[RSP_VCO].s[2], m_flags[RSP_VCO].s[3], m_flags[RSP_VCO].s[4], m_flags[RSP_VCO].s[5], m_flags[RSP_VCO].s[6], m_flags[RSP_VCO].s[7]);
+ printf("vco_lo: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_flags[RSP_VCO].s[8], m_flags[RSP_VCO].s[9], m_flags[RSP_VCO].s[10], m_flags[RSP_VCO].s[11], m_flags[RSP_VCO].s[12], m_flags[RSP_VCO].s[13], m_flags[RSP_VCO].s[14], m_flags[RSP_VCO].s[15]);
+ printf("vce: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_flags[RSP_VCE].s[0], m_flags[RSP_VCE].s[1], m_flags[RSP_VCE].s[2], m_flags[RSP_VCE].s[3], m_flags[RSP_VCE].s[4], m_flags[RSP_VCE].s[5], m_flags[RSP_VCE].s[6], m_flags[RSP_VCE].s[7]);
#else
- printf("acc_h: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", ACCUM_H(0), ACCUM_H(1), ACCUM_H(2), ACCUM_H(3), ACCUM_H(4), ACCUM_H(5), ACCUM_H(6), ACCUM_H(7));
- printf("acc_m: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", ACCUM_M(0), ACCUM_M(1), ACCUM_M(2), ACCUM_M(3), ACCUM_M(4), ACCUM_M(5), ACCUM_M(6), ACCUM_M(7));
- printf("acc_l: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", ACCUM_L(0), ACCUM_L(1), ACCUM_L(2), ACCUM_L(3), ACCUM_L(4), ACCUM_L(5), ACCUM_L(6), ACCUM_L(7));
- printf("vcc_hi: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_vflag[4][0], m_vflag[4][1], m_vflag[4][2], m_vflag[4][3], m_vflag[4][4], m_vflag[4][5], m_vflag[4][6], m_vflag[4][7]);
- printf("vcc_lo: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_vflag[1][0], m_vflag[1][1], m_vflag[1][2], m_vflag[1][3], m_vflag[1][4], m_vflag[1][5], m_vflag[1][6], m_vflag[1][7]);
- printf("vco_hi: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_vflag[3][0], m_vflag[3][1], m_vflag[3][2], m_vflag[3][3], m_vflag[3][4], m_vflag[3][5], m_vflag[3][6], m_vflag[3][7]);
- printf("vco_lo: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_vflag[0][0], m_vflag[0][1], m_vflag[0][2], m_vflag[0][3], m_vflag[0][4], m_vflag[0][5], m_vflag[0][6], m_vflag[0][7]);
- printf("vce: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_vflag[2][0], m_vflag[2][1], m_vflag[2][2], m_vflag[2][3], m_vflag[2][4], m_vflag[2][5], m_vflag[2][6], m_vflag[2][7]);
+ printf("acc_h: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", ACCUM_H(0), ACCUM_H(1), ACCUM_H(2), ACCUM_H(3), ACCUM_H(4), ACCUM_H(5), ACCUM_H(6), ACCUM_H(7));
+ printf("acc_m: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", ACCUM_M(0), ACCUM_M(1), ACCUM_M(2), ACCUM_M(3), ACCUM_M(4), ACCUM_M(5), ACCUM_M(6), ACCUM_M(7));
+ printf("acc_l: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", ACCUM_L(0), ACCUM_L(1), ACCUM_L(2), ACCUM_L(3), ACCUM_L(4), ACCUM_L(5), ACCUM_L(6), ACCUM_L(7));
+ printf("vcc_hi: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_vflag[4][0], m_vflag[4][1], m_vflag[4][2], m_vflag[4][3], m_vflag[4][4], m_vflag[4][5], m_vflag[4][6], m_vflag[4][7]);
+ printf("vcc_lo: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_vflag[1][0], m_vflag[1][1], m_vflag[1][2], m_vflag[1][3], m_vflag[1][4], m_vflag[1][5], m_vflag[1][6], m_vflag[1][7]);
+ printf("vco_hi: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_vflag[3][0], m_vflag[3][1], m_vflag[3][2], m_vflag[3][3], m_vflag[3][4], m_vflag[3][5], m_vflag[3][6], m_vflag[3][7]);
+ printf("vco_lo: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_vflag[0][0], m_vflag[0][1], m_vflag[0][2], m_vflag[0][3], m_vflag[0][4], m_vflag[0][5], m_vflag[0][6], m_vflag[0][7]);
+ printf("vce: %04x|%04x|%04x|%04x|%04x|%04x|%04x|%04x\n", m_vflag[2][0], m_vflag[2][1], m_vflag[2][2], m_vflag[2][3], m_vflag[2][4], m_vflag[2][5], m_vflag[2][6], m_vflag[2][7]);
#endif
}
void rsp_cop2::dump_dmem()
{
- UINT8* dmem = m_rsp.get_dmem();
- printf("\n");
- for (int i = 0; i < 0x1000; i += 32)
- {
- printf("%04x: ", i);
- for (int j = 0; j < 32; j++)
- {
- printf("%02x ", dmem[i + j]);
- }
- printf("\n");
- }
- printf("\n");
-} \ No newline at end of file
+ UINT8* dmem = m_rsp.get_dmem();
+ printf("\n");
+ for (int i = 0; i < 0x1000; i += 32)
+ {
+ printf("%04x: ", i);
+ for (int j = 0; j < 32; j++)
+ {
+ printf("%02x ", dmem[i + j]);
+ }
+ printf("\n");
+ }
+ printf("\n");
+}
diff --git a/src/emu/cpu/rsp/rspcp2.h b/src/emu/cpu/rsp/rspcp2.h
index 25ed0013e2a..909b0ae4172 100644
--- a/src/emu/cpu/rsp/rspcp2.h
+++ b/src/emu/cpu/rsp/rspcp2.h
@@ -17,18 +17,18 @@
#include "rsp.h"
#include "rspdiv.h"
-#define SIMD_OFF (1)
+#define SIMD_OFF (1)
#if (defined(__SSE2__) || defined(__SSE3__) || defined(__SSSE3__) || defined(__SSE4_1__) || defined(__SSE4_2__))
-#define SSE_AVAILABLE (1)
+#define SSE_AVAILABLE (1)
#else
-#define SSE_AVAILABLE (0)
+#define SSE_AVAILABLE (0)
#endif
#if (SSE_AVAILABLE || defined(_MSC_VER)) && defined(PTR64) && !SIMD_OFF
-#define USE_SIMD (1)
+#define USE_SIMD (1)
#else
-#define USE_SIMD (0)
+#define USE_SIMD (0)
#endif
#if USE_SIMD
@@ -167,8 +167,8 @@ public:
void log_instruction_execution();
virtual void cfunc_unimplemented_opcode() { }
- void dump(UINT32 op);
- void dump_dmem();
+ void dump(UINT32 op);
+ void dump_dmem();
protected:
virtual int generate_vector_opcode(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc) { return TRUE; }
@@ -342,7 +342,7 @@ protected:
static inline INT16 get_flags(const UINT16 *flags)
{
- return _mm_movemask_epi8(_mm_packs_epi16(_mm_load_si128((rsp_vec_t*) (flags + (sizeof(rsp_vec_t) >> 1))), _mm_load_si128((rsp_vec_t*) flags)));
+ return _mm_movemask_epi8(_mm_packs_epi16(_mm_load_si128((rsp_vec_t*) (flags + (sizeof(rsp_vec_t) >> 1))), _mm_load_si128((rsp_vec_t*) flags)));
}
static inline rsp_vec_t vec_zero()
@@ -389,8 +389,8 @@ private:
void handle_swc2(UINT32 op);
void handle_vector_ops(UINT32 op);
- UINT32 m_div_in;
- UINT32 m_div_out;
+ UINT32 m_div_in;
+ UINT32 m_div_out;
};
#endif /* __RSPCP2_H__ */
diff --git a/src/emu/cpu/rsp/vadd.h b/src/emu/cpu/rsp/vadd.h
index 33b21fd7312..16009e53287 100644
--- a/src/emu/cpu/rsp/vadd.h
+++ b/src/emu/cpu/rsp/vadd.h
@@ -14,4 +14,3 @@ inline rsp_vec_t vec_vadd(rsp_vec_t vs, rsp_vec_t vt, rsp_vec_t carry, rsp_vec_t
minimum = _mm_subs_epi16(minimum, carry);
return _mm_adds_epi16(minimum, maximum);
}
-
diff --git a/src/emu/cpu/rsp/vcl.h b/src/emu/cpu/rsp/vcl.h
index e82a7fde162..e09a13d5a8e 100644
--- a/src/emu/cpu/rsp/vcl.h
+++ b/src/emu/cpu/rsp/vcl.h
@@ -46,7 +46,7 @@ inline rsp_vec_t vec_vcl(rsp_vec_t vs, rsp_vec_t vt, rsp_vec_t zero, rsp_vec_t *
*ge = _mm_or_si128(ge_eq, *ge);
#endif
- // Mux the result based on the value of sign.
+ // Mux the result based on the value of sign.
#if (defined(__SSE4_1__) || defined(_MSC_VER))
rsp_vec_t mux_mask = _mm_blendv_epi8(*ge, *le, sign);
#else
diff --git a/src/emu/cpu/rsp/vmudh.h b/src/emu/cpu/rsp/vmudh.h
index 6ae77e2ef7e..71c3a38f4fb 100644
--- a/src/emu/cpu/rsp/vmudh.h
+++ b/src/emu/cpu/rsp/vmudh.h
@@ -8,4 +8,3 @@ inline rsp_vec_t rsp_vmudh(rsp_vec_t vs, rsp_vec_t vt, rsp_vec_t *acc_md, rsp_ve
return sclamp_acc_to_mid(*acc_md, *acc_hi);
}
-
diff --git a/src/emu/cpu/rsp/vmulh.h b/src/emu/cpu/rsp/vmulh.h
index 61140f4744c..aaccf9d41b3 100644
--- a/src/emu/cpu/rsp/vmulh.h
+++ b/src/emu/cpu/rsp/vmulh.h
@@ -28,4 +28,3 @@ inline rsp_vec_t vec_vmadh_vmudh(UINT32 iw, rsp_vec_t vs, rsp_vec_t vt, rsp_vec_
return sclamp_acc_to_mid(*acc_md, *acc_hi);
}
-
diff --git a/src/emu/cpu/rsp/vrcpsq.h b/src/emu/cpu/rsp/vrcpsq.h
index 2e2434863e9..930d8237853 100644
--- a/src/emu/cpu/rsp/vrcpsq.h
+++ b/src/emu/cpu/rsp/vrcpsq.h
@@ -26,7 +26,7 @@ inline rsp_vec_t vec_vrcp_vrsq(UINT32 iw, INT32 dp, UINT32 src, UINT32 e, UINT32
}
else if (input == -32768)
{
- result = 0xffff0000;
+ result = 0xffff0000;
}
else // Main case: compute the reciprocal.
{
diff --git a/src/emu/cpu/rsp/vrsq.h b/src/emu/cpu/rsp/vrsq.h
index 140e46dcd01..f657bc42554 100644
--- a/src/emu/cpu/rsp/vrsq.h
+++ b/src/emu/cpu/rsp/vrsq.h
@@ -26,7 +26,7 @@ rsp_vec_t vec_vrsq(INT32 dp, UINT32 src, UINT32 e, UINT32 dest, UINT32 de)
}
else if (input == -32768)
{
- result = 0xffff0000;
+ result = 0xffff0000;
}
else // Main case: compute the reciprocal.
{
diff --git a/src/emu/cpu/sh2/sh2.c b/src/emu/cpu/sh2/sh2.c
index b2ea57f60d4..629d447323e 100644
--- a/src/emu/cpu/sh2/sh2.c
+++ b/src/emu/cpu/sh2/sh2.c
@@ -143,11 +143,11 @@ READ32_MEMBER(sh2_device::sh2_internal_a5)
static ADDRESS_MAP_START( sh7604_map, AS_PROGRAM, 32, sh2_device )
AM_RANGE(0x40000000, 0xbfffffff) AM_READ(sh2_internal_a5)
-/*!
+/*!
@todo: cps3boot breaks with this enabled. Needs customization ...
*/
-// AM_RANGE(0xc0000000, 0xc0000fff) AM_RAM // cache data array
-// AM_RANGE(0xffffff88, 0xffffff8b) AM_READWRITE(dma_dtcr0_r,dma_dtcr0_w)
+// AM_RANGE(0xc0000000, 0xc0000fff) AM_RAM // cache data array
+// AM_RANGE(0xffffff88, 0xffffff8b) AM_READWRITE(dma_dtcr0_r,dma_dtcr0_w)
AM_RANGE(0xe0000000, 0xe00001ff) AM_MIRROR(0x1ffffe00) AM_READWRITE(sh7604_r, sh7604_w)
ADDRESS_MAP_END
@@ -159,14 +159,14 @@ static ADDRESS_MAP_START( sh7021_map, AS_PROGRAM, 32, sh2a_device )
AM_RANGE(0x05ffff48, 0x05ffff4b) AM_READWRITE16(dma_tcr0_r, dma_tcr0_w,0x0000ffff)
AM_RANGE(0x05ffff4c, 0x05ffff4f) AM_READWRITE16(dma_chcr0_r, dma_chcr0_w, 0x0000ffff)
// fall-back
- AM_RANGE(0x05fffe00, 0x05ffffff) AM_READWRITE16(sh7021_r,sh7021_w,0xffffffff) // SH-7032H internal i/o
-// AM_RANGE(0x07000000, 0x070003ff) AM_RAM AM_SHARE("oram")// on-chip RAM, actually at 0xf000000 (1 kb)
-// AM_RANGE(0x0f000000, 0x0f0003ff) AM_RAM AM_SHARE("oram")// on-chip RAM, actually at 0xf000000 (1 kb)
+ AM_RANGE(0x05fffe00, 0x05ffffff) AM_READWRITE16(sh7021_r,sh7021_w,0xffffffff) // SH-7032H internal i/o
+// AM_RANGE(0x07000000, 0x070003ff) AM_RAM AM_SHARE("oram")// on-chip RAM, actually at 0xf000000 (1 kb)
+// AM_RANGE(0x0f000000, 0x0f0003ff) AM_RAM AM_SHARE("oram")// on-chip RAM, actually at 0xf000000 (1 kb)
ADDRESS_MAP_END
static ADDRESS_MAP_START( sh7032_map, AS_PROGRAM, 32, sh1_device )
// fall-back
- AM_RANGE(0x05fffe00, 0x05ffffff) AM_READWRITE16(sh7032_r,sh7032_w,0xffffffff) // SH-7032H internal i/o
+ AM_RANGE(0x05fffe00, 0x05ffffff) AM_READWRITE16(sh7032_r,sh7032_w,0xffffffff) // SH-7032H internal i/o
ADDRESS_MAP_END
sh2_device::sh2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
@@ -300,7 +300,7 @@ void sh2_device::WB(offs_t A, UINT8 V)
m_program->write_byte(A & AM,V);
return;
}
-
+
m_program->write_byte(A,V);
}
@@ -311,7 +311,7 @@ void sh2_device::WW(offs_t A, UINT16 V)
m_program->write_word(A & AM,V);
return;
}
-
+
m_program->write_word(A,V);
}
@@ -322,7 +322,7 @@ void sh2_device::WL(offs_t A, UINT32 V)
m_program->write_dword(A & AM,V);
return;
}
-
+
/* 0x20000000 no Cache */
/* 0x00000000 read thru Cache if CE bit is 1 */
m_program->write_dword(A,V);
diff --git a/src/emu/cpu/sh2/sh2.h b/src/emu/cpu/sh2/sh2.h
index c53b6baad59..9724c1f51b0 100644
--- a/src/emu/cpu/sh2/sh2.h
+++ b/src/emu/cpu/sh2/sh2.h
@@ -513,17 +513,17 @@ public:
DECLARE_READ16_MEMBER(sh7021_r);
DECLARE_WRITE16_MEMBER(sh7021_w);
void sh7032_dma_exec(int ch);
-
+
private:
UINT16 m_sh7021_regs[0x200];
struct
{
- UINT32 sar; /**< Source Address Register */
- UINT32 dar; /**< Destination Address Register */
- UINT16 tcr; /**< Transfer Count Register */
- UINT16 chcr; /**< Channel Control Register */
+ UINT32 sar; /**< Source Address Register */
+ UINT32 dar; /**< Destination Address Register */
+ UINT16 tcr; /**< Transfer Count Register */
+ UINT16 chcr; /**< Channel Control Register */
} m_dma[4];
- UINT16 m_dmaor; /**< DMA Operation Register (status flags) */
+ UINT16 m_dmaor; /**< DMA Operation Register (status flags) */
};
diff --git a/src/emu/cpu/sh2/sh2comn.c b/src/emu/cpu/sh2/sh2comn.c
index 38b6d633c22..1080203494f 100644
--- a/src/emu/cpu/sh2/sh2comn.c
+++ b/src/emu/cpu/sh2/sh2comn.c
@@ -899,7 +899,7 @@ void sh2_device::sh2_exception(const char *message, int irqline)
void sh2a_device::sh7032_dma_exec(int ch)
{
const short dma_word_size[4] = { 0, +1, -1, 0 };
- UINT8 rs = (m_dma[ch].chcr >> 8) & 0xf; /**< Resource Select bits */
+ UINT8 rs = (m_dma[ch].chcr >> 8) & 0xf; /**< Resource Select bits */
if(rs != 0xc) // Auto-Request
{
logerror("Warning: SH7032 DMA enables non auto-request transfer\n");
@@ -911,9 +911,9 @@ void sh2a_device::sh7032_dma_exec(int ch)
return;
printf("%08x %08x %04x\n",m_dma[ch].sar,m_dma[ch].dar,m_dma[ch].chcr);
- UINT8 dm = (m_dma[ch].chcr >> 14) & 3; /**< Destination Address Mode bits */
- UINT8 sm = (m_dma[ch].chcr >> 12) & 3; /**< Source Address Mode bits */
- bool ts = (m_dma[ch].chcr & 8); /**< Transfer Size bit */
+ UINT8 dm = (m_dma[ch].chcr >> 14) & 3; /**< Destination Address Mode bits */
+ UINT8 sm = (m_dma[ch].chcr >> 12) & 3; /**< Source Address Mode bits */
+ bool ts = (m_dma[ch].chcr & 8); /**< Transfer Size bit */
int src_word_size = dma_word_size[sm] * ((ts == true) ? 2 : 1);
int dst_word_size = dma_word_size[dm] * ((ts == true) ? 2 : 1);
UINT32 src_addr = m_dma[ch].sar;
@@ -1025,4 +1025,3 @@ WRITE16_MEMBER(sh2a_device::sh7021_w)
#if (defined(__MINGW32__) && (__GNUC__ >= 5))
#pragma GCC diagnostic pop
#endif
-
diff --git a/src/emu/cpu/sm510/sm510.c b/src/emu/cpu/sm510/sm510.c
index 09029709849..ef4f704590b 100644
--- a/src/emu/cpu/sm510/sm510.c
+++ b/src/emu/cpu/sm510/sm510.c
@@ -6,14 +6,14 @@
- SM510: 2.7Kx8 ROM, 128x4 RAM(32x4 for LCD)
- SM511: 4Kx8 ROM, 128x4 RAM(32x4 for LCD), melody controller
- SM512: 4Kx8 ROM, 128x4 RAM(48x4 for LCD), melody controller
-
+
Other chips that may be in the same family, investigate more when one of
them needs to get emulated: SM500, SM530/31, SM4A, SM3903, ..
References:
- 1990 Sharp Microcomputers Data Book
- 1996 Sharp Microcomputer Databook
-
+
TODO:
- proper support for LFSR program counter in debugger
- callback for lcd screen as MAME bitmap (when needed)
@@ -146,12 +146,12 @@ void sm510_base_device::device_reset()
m_op = m_prev_op = 0;
do_branch(3, 7, 0);
m_prev_pc = m_pc;
-
+
// lcd is on (Bp on, BC off, bs(y) off)
m_bp = true;
m_bc = false;
m_y = 0;
-
+
m_r = 0;
m_write_r(0, 0, 0xff);
m_melody_rd &= ~1;
@@ -168,11 +168,11 @@ inline UINT16 sm510_base_device::get_lcd_row(int column, UINT8* ram)
// output 0 if lcd blackpate/bleeder is off, or in case row doesn't exist
if (ram == NULL || m_bc || !m_bp)
return 0;
-
+
UINT16 rowdata = 0;
for (int i = 0; i < 0x10; i++)
rowdata |= (ram[i] >> column & 1) << i;
-
+
return rowdata;
}
@@ -185,12 +185,12 @@ TIMER_CALLBACK_MEMBER(sm510_base_device::lcd_timer_cb)
m_write_sega(h | SM510_PORT_SEGA, get_lcd_row(h, m_lcd_ram_a), 0xffff);
m_write_segb(h | SM510_PORT_SEGB, get_lcd_row(h, m_lcd_ram_b), 0xffff);
m_write_segc(h | SM510_PORT_SEGC, get_lcd_row(h, m_lcd_ram_c), 0xffff);
-
+
// bs output from L/X and Y regs
UINT8 bs = (m_l >> h & 1) | ((m_x*2) >> h & 2);
m_write_segbs(h | SM510_PORT_SEGBS, (m_bc || !m_bp) ? 0 : bs, 0xffff);
}
-
+
// schedule next timeout
m_lcd_timer->adjust(attotime::from_ticks(0x200, unscaled_clock()));
}
@@ -222,10 +222,10 @@ void sm510_base_device::clock_melody()
0, 0, 8, 8, 9, 9, 10,10,11,12,12,13,14,15, 8*2, 8*2,
0, 0, 8, 9, 9, 10,10,11,11,12,13,14,14,15, 8*2, 9*2
};
-
+
UINT8 cmd = m_melody_rom[m_melody_address] & 0x3f;
UINT8 out = 0;
-
+
// clock duty cycle if tone is active
if ((cmd & 0xf) > 1)
{
@@ -245,7 +245,7 @@ void sm510_base_device::clock_melody()
// rest tell signal
m_melody_rd |= 2;
}
-
+
// clock time base on F8(d7)
if ((m_div & 0x7f) == 0)
{
@@ -255,7 +255,7 @@ void sm510_base_device::clock_melody()
if (m_melody_step_count == 0)
m_melody_address++;
}
-
+
// output to R pin
if (out != m_r)
{
@@ -293,7 +293,7 @@ bool sm510_base_device::wake_me_up()
// after waking up, but we leave it unchanged
m_halt = false;
do_branch(1, 0, 0);
-
+
standard_irq_callback(0);
return true;
}
@@ -305,7 +305,7 @@ void sm510_base_device::execute_set_input(int line, int state)
{
if (line != SM510_INPUT_LINE_K)
return;
-
+
// set K input lines active state
m_k_active = (state != 0);
}
@@ -317,7 +317,7 @@ TIMER_CALLBACK_MEMBER(sm510_base_device::div_timer_cb)
// 1S signal on overflow(falling edge of f1)
if (m_div == 0)
m_1s = true;
-
+
clock_melody();
}
diff --git a/src/emu/cpu/sm510/sm510.h b/src/emu/cpu/sm510/sm510.h
index b50cea20957..8dd7446b884 100644
--- a/src/emu/cpu/sm510/sm510.h
+++ b/src/emu/cpu/sm510/sm510.h
@@ -134,7 +134,7 @@ protected:
int m_stack_levels;
UINT16 m_stack[2];
int m_icount;
-
+
UINT8 m_acc;
UINT8 m_bl;
UINT8 m_bm;
@@ -177,7 +177,7 @@ protected:
bool wake_me_up();
void init_divider();
TIMER_CALLBACK_MEMBER(div_timer_cb);
-
+
// other i/o handlers
devcb_read8 m_read_k;
devcb_read_line m_read_ba;
@@ -251,12 +251,12 @@ protected:
void op_rm();
void op_sm();
-
+
void op_pre();
void op_sme();
void op_rme();
void op_tmel();
-
+
void op_skip();
void op_cend();
void op_idiv();
@@ -274,7 +274,7 @@ protected:
virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
virtual void execute_one();
virtual void get_opcode_param();
-
+
virtual void update_w_latch() { m_write_s(0, m_w, 0xff); } // W is connected directly to S
};
diff --git a/src/emu/cpu/sm510/sm510d.c b/src/emu/cpu/sm510/sm510d.c
index fec8bc44bbd..70e6b2c8ed6 100644
--- a/src/emu/cpu/sm510/sm510d.c
+++ b/src/emu/cpu/sm510/sm510d.c
@@ -103,7 +103,7 @@ static offs_t sm510_common_disasm(const UINT8 *lut_mnemonic, const UINT8 *lut_ex
param = oprom[s_next_pc[pc & 0x3f]];
len++;
}
-
+
// extended opcode
bool is_extended = (instr == mEXT);
if (is_extended)
@@ -131,12 +131,12 @@ static offs_t sm510_common_disasm(const UINT8 *lut_mnemonic, const UINT8 *lut_ex
UINT16 address = (param << 4 & 0xc00) | (mask << 6 & 0x3c0) | (param & 0x03f);
dst += sprintf(dst, "$%03X", address);
}
-
+
// show param offset
if (bits >= 8)
dst += sprintf(dst, " [$%03X]", pc + s_next_pc[pc & 0x3f]);
}
-
+
return len | s_flags[instr] | DASMFLAG_SUPPORTED;
}
@@ -210,6 +210,6 @@ CPU_DISASSEMBLE(sm511)
UINT8 ext[0x100];
memset(ext, 0, 0x100);
memcpy(ext + 0x30, sm511_extended, 0x10);
-
+
return sm510_common_disasm(sm511_mnemonic, ext, buffer, pc, oprom, opram);
}
diff --git a/src/emu/cpu/sm510/sm510op.c b/src/emu/cpu/sm510/sm510op.c
index bb0f4975511..cf99cbc5ae4 100644
--- a/src/emu/cpu/sm510/sm510op.c
+++ b/src/emu/cpu/sm510/sm510op.c
@@ -57,12 +57,12 @@ inline UINT8 sm510_base_device::bitmask(UINT16 param)
void sm510_base_device::op_lb()
{
// LB x: load BM/BL with 4-bit immediate value (partial)
-
+
// SM510 WIP..
// bm and bl(low) are probably ok!
m_bm = (m_bm & 4) | (m_op & 3);
m_bl = (m_op >> 2 & 3);
-
+
// bl(high) is still unclear, official doc is confusing
UINT8 hi = 0;
switch (m_bl)
diff --git a/src/emu/cpu/sm510/sm511core.c b/src/emu/cpu/sm510/sm511core.c
index d5dcf94cc7c..2347721ff90 100644
--- a/src/emu/cpu/sm510/sm511core.c
+++ b/src/emu/cpu/sm510/sm511core.c
@@ -102,7 +102,7 @@ void sm511_device::execute_one()
switch (m_op)
{
case 0x00: op_rot(); break;
-// case 0x01: op_xxx(); break; // ?
+// case 0x01: op_xxx(); break; // ?
case 0x02: op_sbm(); break;
case 0x03: op_atpl(); break;
case 0x08: op_add(); break;
@@ -119,7 +119,7 @@ void sm511_device::execute_one()
case 0x5a: op_ta0(); break;
case 0x5b: op_tabl(); break;
case 0x5c: op_atx(); break;
-// case 0x5d: op_cend(); break;
+// case 0x5d: op_cend(); break;
case 0x5e: op_tal(); break;
case 0x5f: op_lbl(); break;
@@ -127,14 +127,14 @@ void sm511_device::execute_one()
case 0x62: op_wr(); break;
case 0x63: op_ws(); break;
case 0x64: op_incb(); break;
-// case 0x65: op_idiv(); break;
+// case 0x65: op_idiv(); break;
case 0x66: op_rc(); break;
case 0x67: op_sc(); break;
case 0x6c: op_decb(); break;
case 0x6d: op_ptw(); break;
case 0x6e: op_rtn0(); break;
case 0x6f: op_rtn1(); break;
-
+
// extended opcodes
case 0x60:
m_op = m_op << 8 | m_param;
diff --git a/src/emu/cpu/ucom4/ucom4.h b/src/emu/cpu/ucom4/ucom4.h
index ed317fe9806..47305a4638a 100644
--- a/src/emu/cpu/ucom4/ucom4.h
+++ b/src/emu/cpu/ucom4/ucom4.h
@@ -323,7 +323,7 @@ class upd650_cpu_device : public ucom4_cpu_device
public:
upd650_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-protected:
+protected:
virtual UINT8 input_r(int index);
};
diff --git a/src/emu/cpu/ucom4/ucom4op.c b/src/emu/cpu/ucom4/ucom4op.c
index c42a2814022..d208fcaf80f 100644
--- a/src/emu/cpu/ucom4/ucom4op.c
+++ b/src/emu/cpu/ucom4/ucom4op.c
@@ -59,7 +59,7 @@ UINT8 upd650_cpu_device::input_r(int index)
// bidirectional ports are 'push-pull', meaning it will output 0 when it's read
if ((index & 0xf) == NEC_UCOM4_PORTC || (index & 0xf) == NEC_UCOM4_PORTD)
output_w(index, 0);
-
+
return ucom4_cpu_device::input_r(index);
}
diff --git a/src/emu/machine/68230pit.c b/src/emu/machine/68230pit.c
index 9c99baa4f16..d0c50a2c535 100644
--- a/src/emu/machine/68230pit.c
+++ b/src/emu/machine/68230pit.c
@@ -1,5 +1,5 @@
// license:BSD-3-Clause
-// copyright-holders:Joakim Larsson Edström
+// copyright-holders:Joakim Larsson Edstr??m
/**********************************************************************
Motorola MC68230 PI/T Parallell Interface and Timer
@@ -46,130 +46,128 @@ const device_type PIT68230 = &device_creator<pit68230_device>;
//-------------------------------------------------
pit68230_device::pit68230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, PIT68230, "Motorola 68230 PI/T", tag, owner, clock, "pit68230", __FILE__)
+ : device_t(mconfig, PIT68230, "Motorola 68230 PI/T", tag, owner, clock, "pit68230", __FILE__)
{
}
void pit68230_device::device_start()
{
- printf("PIT68230 device started\n");
+ printf("PIT68230 device started\n");
}
void pit68230_device::device_reset()
{
- printf("PIT68230 device reseted\n");
- m_pgcr = 0;
- m_psrr = 0;
- m_paddr = 0;
- m_pbddr = 0;
- m_pcddr = 0;
- m_pacr = 0;
- m_pbcr = 0;
- m_padr = 0;
- m_pbdr = 0;
- m_psr = 0;
+ printf("PIT68230 device reseted\n");
+ m_pgcr = 0;
+ m_psrr = 0;
+ m_paddr = 0;
+ m_pbddr = 0;
+ m_pcddr = 0;
+ m_pacr = 0;
+ m_pbcr = 0;
+ m_padr = 0;
+ m_pbdr = 0;
+ m_psr = 0;
}
WRITE8_MEMBER( pit68230_device::data_w )
{
- printf("data_w: %04x -> ", data);
- switch (offset)
- {
- case PIT_68230_PGCR:
- printf("PGCR");
- m_pgcr = data;
- break;
- case PIT_68230_PSRR:
- printf("PSRR");
- m_psrr = data;
- break;
- case PIT_68230_PADDR:
- printf("PADDR");
- m_paddr = data;
- break;
- case PIT_68230_PBDDR:
- printf("PBDDR");
- m_pbddr = data;
- break;
- case PIT_68230_PACR:
- printf("PACR");
- m_pacr = data;
- break;
- case PIT_68230_PBCR:
- printf("PBCR");
- m_pbcr = data;
- break;
- case PIT_68230_PADR:
- printf("PADR");
- m_padr = data;
- break;
- case PIT_68230_PSR:
- printf("PSR");
- m_padr = data;
- break;
- default:
- printf("unhandled register %02x", offset);
- }
- printf("\n");
+ printf("data_w: %04x -> ", data);
+ switch (offset)
+ {
+ case PIT_68230_PGCR:
+ printf("PGCR");
+ m_pgcr = data;
+ break;
+ case PIT_68230_PSRR:
+ printf("PSRR");
+ m_psrr = data;
+ break;
+ case PIT_68230_PADDR:
+ printf("PADDR");
+ m_paddr = data;
+ break;
+ case PIT_68230_PBDDR:
+ printf("PBDDR");
+ m_pbddr = data;
+ break;
+ case PIT_68230_PACR:
+ printf("PACR");
+ m_pacr = data;
+ break;
+ case PIT_68230_PBCR:
+ printf("PBCR");
+ m_pbcr = data;
+ break;
+ case PIT_68230_PADR:
+ printf("PADR");
+ m_padr = data;
+ break;
+ case PIT_68230_PSR:
+ printf("PSR");
+ m_padr = data;
+ break;
+ default:
+ printf("unhandled register %02x", offset);
+ }
+ printf("\n");
}
READ8_MEMBER( pit68230_device::data_r )
{
- UINT8 data = 0;
-
- printf("data_r: ");
- switch (offset)
- {
- case PIT_68230_PGCR:
- printf("PGCR");
- data = m_pgcr;
- break;
- case PIT_68230_PSRR:
- printf("PSRR");
- data = m_psrr;
- break;
- case PIT_68230_PADDR:
- printf("PADDR");
- data = m_paddr;
- break;
- case PIT_68230_PBDDR:
- printf("PBDDR");
- data = m_pbddr;
- break;
- case PIT_68230_PACR:
- printf("PACR");
- data = m_pacr;
- break;
- case PIT_68230_PBCR:
- printf("PBCR");
- data = m_pbcr;
- break;
- case PIT_68230_PADR:
- printf("PADR");
- data = m_padr;
- break;
- case PIT_68230_PBDR:
- /* 4.6.2. PORT B DATA REGISTER (PBDR). The port B data register is a holding register for moving data
+ UINT8 data = 0;
+
+ printf("data_r: ");
+ switch (offset)
+ {
+ case PIT_68230_PGCR:
+ printf("PGCR");
+ data = m_pgcr;
+ break;
+ case PIT_68230_PSRR:
+ printf("PSRR");
+ data = m_psrr;
+ break;
+ case PIT_68230_PADDR:
+ printf("PADDR");
+ data = m_paddr;
+ break;
+ case PIT_68230_PBDDR:
+ printf("PBDDR");
+ data = m_pbddr;
+ break;
+ case PIT_68230_PACR:
+ printf("PACR");
+ data = m_pacr;
+ break;
+ case PIT_68230_PBCR:
+ printf("PBCR");
+ data = m_pbcr;
+ break;
+ case PIT_68230_PADR:
+ printf("PADR");
+ data = m_padr;
+ break;
+ case PIT_68230_PBDR:
+ /* 4.6.2. PORT B DATA REGISTER (PBDR). The port B data register is a holding register for moving data
to and from port B pins. The port B data direction register determines whether each pin is an input (zero)
-or an output (one). This register is readable and writable at all times. Depending on the chosen mode/submode,
+or an output (one). This register is readable and writable at all times. Depending on the chosen mode/submode,
reading or writing may affect the double-buffered handshake mechanism. The port B data register is not affected
-by the assertion of the RESET pin. PB0-PB7 sits on pins 17-24 on a 48 pin DIP package */
- printf("PBDR");
- data = m_pbdr;
- // data = (m_pbdr & 0xfc) | 1; // CPU-1 centronics interface expects to see 2 lowest bits equal 1 for printer
- break;
- case PIT_68230_PSR:
- printf("PSR");
- data = m_psr;
- // data = m_psr | 1; // CPU-1 centronics interface expects status to be non zero
- break;
- default:
- printf("unhandled register %02x", offset);
- data = 0;
- }
- printf("\n");
-
- return data;
+by the assertion of the RESET pin. PB0-PB7 sits on pins 17-24 on a 48 pin DIP package */
+ printf("PBDR");
+ data = m_pbdr;
+ // data = (m_pbdr & 0xfc) | 1; // CPU-1 centronics interface expects to see 2 lowest bits equal 1 for printer
+ break;
+ case PIT_68230_PSR:
+ printf("PSR");
+ data = m_psr;
+ // data = m_psr | 1; // CPU-1 centronics interface expects status to be non zero
+ break;
+ default:
+ printf("unhandled register %02x", offset);
+ data = 0;
+ }
+ printf("\n");
+
+ return data;
}
-
-
diff --git a/src/emu/machine/68230pit.h b/src/emu/machine/68230pit.h
index b299ca868f9..dcb5b81bb88 100644
--- a/src/emu/machine/68230pit.h
+++ b/src/emu/machine/68230pit.h
@@ -1,5 +1,5 @@
// license:BSD-3-Clause
-// copyright-holders:Joakim Larsson Edström
+// copyright-holders:Joakim Larsson Edstr??m
/**********************************************************************
Motorola MC68230 PI/T Parallell Interface and Timer
@@ -56,7 +56,7 @@ protected:
virtual void device_reset();
private:
- UINT8 m_pgcr; // Port General Control register
+ UINT8 m_pgcr; // Port General Control register
UINT8 m_psrr; // Port Service Request register
UINT8 m_paddr; // Port A Data Direction register
UINT8 m_pbddr; // Port B Data Direction register
diff --git a/src/emu/machine/atapihle.c b/src/emu/machine/atapihle.c
index 4b749ee36e6..dcbc00fb26c 100644
--- a/src/emu/machine/atapihle.c
+++ b/src/emu/machine/atapihle.c
@@ -246,7 +246,7 @@ void atapi_hle_device::process_command()
case IDE_COMMAND_CHECK_POWER_MODE:
m_status = IDE_STATUS_DRDY;
- m_sector_count = 0xff; // Power mode: 0x00 = Standby, 0x80 = Idle mode, 0xff = Active mode or Idle mode
+ m_sector_count = 0xff; // Power mode: 0x00 = Standby, 0x80 = Idle mode, 0xff = Active mode or Idle mode
set_irq(ASSERT_LINE);
break;
diff --git a/src/emu/machine/nvram.c b/src/emu/machine/nvram.c
index 343d246176c..a1c9d734e2e 100644
--- a/src/emu/machine/nvram.c
+++ b/src/emu/machine/nvram.c
@@ -179,4 +179,3 @@ void nvram_device::determine_final_base()
#if (defined(__MINGW32__) && (__GNUC__ >= 5))
#pragma GCC diagnostic pop
#endif
-
diff --git a/src/emu/machine/pci.c b/src/emu/machine/pci.c
index ef2e0f4ee0e..a5c95198c75 100644
--- a/src/emu/machine/pci.c
+++ b/src/emu/machine/pci.c
@@ -905,4 +905,4 @@ void pci_root_device::device_reset()
#if (defined(__MINGW32__) && (__GNUC__ >= 5))
#pragma GCC diagnostic pop
-#endif \ No newline at end of file
+#endif
diff --git a/src/emu/machine/saturn.c b/src/emu/machine/saturn.c
index a9ad0638c68..cf79fdc26a2 100644
--- a/src/emu/machine/saturn.c
+++ b/src/emu/machine/saturn.c
@@ -38,7 +38,7 @@
H counter value 0x0ec (236) -> 0xe0
H counter value 0x12c (300) -> 0x100
- Timer 1 seems to count backwards compared to Timer 0 from setting 0x6b onward.
- - Yabause claims that if VDP2 DISP bit isn't enabled then vblank irqs (hblank too?)
+ - Yabause claims that if VDP2 DISP bit isn't enabled then vblank irqs (hblank too?)
doesn't happen.
**************************************************************************************/
diff --git a/src/emu/machine/smpc.c b/src/emu/machine/smpc.c
index effb6ba9841..caf0834da5a 100644
--- a/src/emu/machine/smpc.c
+++ b/src/emu/machine/smpc.c
@@ -686,7 +686,7 @@ void saturn_state::smpc_comreg_exec(address_space &space, UINT8 data, UINT8 is_s
case 0x0a:
case 0x0b:
popmessage ("SMPC: NETLINK %s, contact MAMEdev",(data & 1) ? "off" : "on");
- break; case 0x0d:
+ break; case 0x0d:
if(LOG_SMPC) printf ("SMPC: System Reset\n");
smpc_system_reset();
break;
@@ -943,7 +943,7 @@ UINT8 saturn_state::smpc_th_control_mode(UINT8 pad_n)
res|= 0xc;
break;
}
-
+
return res;
}
diff --git a/src/emu/machine/stvcd.c b/src/emu/machine/stvcd.c
index 2c2422cfde4..eebb8d11cb4 100644
--- a/src/emu/machine/stvcd.c
+++ b/src/emu/machine/stvcd.c
@@ -866,7 +866,7 @@ void saturn_state::cd_exec_command( void )
if(cr4 == 0)
hirqreg |= (CMOK);
else
- hirqreg |= (CMOK|DRDY);
+ hirqreg |= (CMOK|DRDY);
status_type = 1;
}
break;
diff --git a/src/emu/machine/tms6100.c b/src/emu/machine/tms6100.c
index c0b355feee5..9cedc12c10a 100644
--- a/src/emu/machine/tms6100.c
+++ b/src/emu/machine/tms6100.c
@@ -201,11 +201,11 @@ WRITE_LINE_MEMBER(tms6100_device::tms6100_romclock_w)
/* read bit at address */
/* if (m_variant == TMS6110_IS_M58819)
{
- m_data = (m_rom[m_address >> 3] >> (7-(m_address & 0x07))) & 1;
+ m_data = (m_rom[m_address >> 3] >> (7-(m_address & 0x07))) & 1;
}
else // m_variant == (TMS6110_IS_TMS6100 || TMS6110_IS_TMS6125)
{
- */
+ */
m_data = (m_rom[m_address >> 3] >> (m_address & 0x07)) & 1;
/* } */
m_address++;
diff --git a/src/emu/machine/wd_fdc.h b/src/emu/machine/wd_fdc.h
index 1aa0e1b13dc..7af735a7bef 100644
--- a/src/emu/machine/wd_fdc.h
+++ b/src/emu/machine/wd_fdc.h
@@ -179,7 +179,7 @@ public:
void hlt_w(bool state);
bool enp_r();
-
+
void index_callback(floppy_image_device *floppy, int state);
protected:
diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h
index f17ea06e632..280866cf96a 100644
--- a/src/emu/mconfig.h
+++ b/src/emu/mconfig.h
@@ -62,7 +62,7 @@ public:
std::string m_perfect_cpu_quantum; // tag of CPU to use for "perfect" scheduling
INT32 m_watchdog_vblank_count; // number of VBLANKs until the watchdog kills us
attotime m_watchdog_time; // length of time until the watchdog kills us
- bool m_force_no_drc; // whether or not to force DRC off
+ bool m_force_no_drc; // whether or not to force DRC off
// other parameters
const char * m_default_layout; // default layout for this machine
diff --git a/src/emu/netlist/analog/nld_opamps.c b/src/emu/netlist/analog/nld_opamps.c
index e54883151db..00eb9984cc5 100644
--- a/src/emu/netlist/analog/nld_opamps.c
+++ b/src/emu/netlist/analog/nld_opamps.c
@@ -42,10 +42,10 @@ NETLIB_NAMESPACE_DEVICES_START()
/*
* Type = 0: Impedance changer
- * 1; Ideal opamp
- * 2; opamp with first pole
- * 3: opamp with first pole + output limit
- * 4: opamp with input stage, first pole + output limit
+ * 1; Ideal opamp
+ * 2; opamp with first pole
+ * 3: opamp with first pole + output limit
+ * 4: opamp with input stage, first pole + output limit
*/
NETLIB_START(OPAMP)
@@ -141,17 +141,16 @@ NETLIB_UPDATE_PARAM(OPAMP)
/*
NETLIB_DEVICE_WITH_PARAMS(OPAMPx,
- NETLIB_NAME(R) m_RP;
- NETLIB_NAME(C) m_CP;
- NETLIB_NAME(VCCS) m_G1;
- NETLIB_NAME(VCVS) m_EBUF;
-
- param_model_t m_model;
- analog_input_t m_VH;
- analog_input_t m_VL;
- analog_input_t m_VREF;
+ NETLIB_NAME(R) m_RP;
+ NETLIB_NAME(C) m_CP;
+ NETLIB_NAME(VCCS) m_G1;
+ NETLIB_NAME(VCVS) m_EBUF;
+
+ param_model_t m_model;
+ analog_input_t m_VH;
+ analog_input_t m_VL;
+ analog_input_t m_VREF;
);
*/
NETLIB_NAMESPACE_DEVICES_END()
-
diff --git a/src/emu/netlist/devices/net_lib.c b/src/emu/netlist/devices/net_lib.c
index 89829620448..b33a069a832 100644
--- a/src/emu/netlist/devices/net_lib.c
+++ b/src/emu/netlist/devices/net_lib.c
@@ -72,12 +72,12 @@ void initialize_factory(factory_list_t &factory)
ENTRY(VCCS, VCCS, "-")
ENTRY(CCCS, CCCS, "-")
ENTRY(LVCCS, LVCCS, "-")
- ENTRY(VS, VS, "V")
+ ENTRY(VS, VS, "V")
ENTRY(CS, CS, "I")
ENTRY(OPAMP, OPAMP, "MODEL")
ENTRY(dummy_input, DUMMY_INPUT, "-")
ENTRY(frontier, FRONTIER_DEV, "+I,G,Q") // not intended to be used directly
- ENTRY(function, AFUNC, "N,FUNC") // only for macro devices - NO FEEDBACK loops
+ ENTRY(function, AFUNC, "N,FUNC") // only for macro devices - NO FEEDBACK loops
ENTRY(QBJT_EB, QBJT_EB, "MODEL")
ENTRY(QBJT_switch, QBJT_SW, "MODEL")
ENTRY(logic_input, TTL_INPUT, "IN")
diff --git a/src/emu/netlist/devices/nld_log.h b/src/emu/netlist/devices/nld_log.h
index 4b768b66b82..9f7431ed1ee 100644
--- a/src/emu/netlist/devices/nld_log.h
+++ b/src/emu/netlist/devices/nld_log.h
@@ -21,7 +21,7 @@
#include "../nl_base.h"
#define LOG(_name, _I) \
- NET_REGISTER_DEV(ÖPG, _name) \
+ NET_REGISTER_DEV(??PG, _name) \
NET_CONNECT(_name, I, _I)
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/devices/nld_system.h b/src/emu/netlist/devices/nld_system.h
index 3f8de7bc2fc..27ed157b3f2 100644
--- a/src/emu/netlist/devices/nld_system.h
+++ b/src/emu/netlist/devices/nld_system.h
@@ -24,7 +24,7 @@
#define LOGIC_INPUT(_name, _v, _family) \
NET_REGISTER_DEV(LOGIC_INPUT, _name) \
- PARAM(_name.IN, _v) \
+ PARAM(_name.IN, _v) \
PARAM(_name.FAMILY, _family)
#define ANALOG_INPUT(_name, _v) \
@@ -70,9 +70,9 @@
#define PARAMETERS(_name) \
NET_REGISTER_DEV(PARAMETERS, _name)
-#define AFUNC(_name, _N, _F) \
+#define AFUNC(_name, _N, _F) \
NET_REGISTER_DEV(AFUNC, _name) \
- PARAM(_name.N, _N) \
+ PARAM(_name.N, _N) \
PARAM(_name.FUNC, _F)
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/macro/nlm_cd4xxx.c b/src/emu/netlist/macro/nlm_cd4xxx.c
index 97777b193aa..e8ffede2aa8 100644
--- a/src/emu/netlist/macro/nlm_cd4xxx.c
+++ b/src/emu/netlist/macro/nlm_cd4xxx.c
@@ -38,7 +38,7 @@ NETLIST_START(CD4001_DIP)
s2.A, /* A3 |5 10| Y5 */ s3.Q,
s2.B, /* Y3 |6 9| A4 */ s3.B,
VDD.I, /* GND |7 8| Y4 */ s3.A
- /* +--------------+ */
+ /* +--------------+ */
)
NETLIST_END()
@@ -74,10 +74,10 @@ NETLIST_START(CD4020_DIP)
s1.Q7, /* Q7 |6 11| RESET */ s1.RESET,
s1.Q4, /* Q4 |7 10| IP */ s1.IP,
s1.VSS, /* VSS |8 9| Q1 */ s1.Q1
- /* +--------------+ */
+ /* +--------------+ */
)
/*
- * IP = (Input pulses)
+ * IP = (Input pulses)
*/
NETLIST_END()
@@ -117,12 +117,12 @@ NETLIST_START(CD4066_DIP)
DIPPINS( /* +--------------+ */
A.R.1, /* INOUTA |1 ++ 14| VDD */ A.PS.VDD,
A.R.2, /* OUTINA |2 13| CONTROLA */ A.CTL,
- B.R.1, /* OUTINB |3 12| CONTROLD */ D.CTL,
+ B.R.1, /* OUTINB |3 12| CONTROLD */ D.CTL,
B.R.2, /* INOUTB |4 4066 11| INOUTD */ D.R.1,
B.CTL, /* CONTROLB |5 10| OUTIND */ D.R.2,
C.CTL, /* CONTROLC |6 9| OUTINC */ C.R.1,
A.PS.VSS, /* VSS |7 8| INOUTC */ C.R.2
- /* +--------------+ */
+ /* +--------------+ */
)
NETLIST_END()
@@ -143,12 +143,12 @@ NETLIST_START(CD4016_DIP)
DIPPINS( /* +--------------+ */
A.R.1, /* INOUTA |1 ++ 14| VDD */ A.PS.VDD,
A.R.2, /* OUTINA |2 13| CONTROLA */ A.CTL,
- B.R.1, /* OUTINB |3 12| CONTROLD */ D.CTL,
+ B.R.1, /* OUTINB |3 12| CONTROLD */ D.CTL,
B.R.2, /* INOUTB |4 4016 11| INOUTD */ D.R.1,
B.CTL, /* CONTROLB |5 10| OUTIND */ D.R.2,
C.CTL, /* CONTROLC |6 9| OUTINC */ C.R.1,
A.PS.VSS, /* VSS |7 8| INOUTC */ C.R.2
- /* +--------------+ */
+ /* +--------------+ */
)
NETLIST_END()
diff --git a/src/emu/netlist/macro/nlm_opamp.c b/src/emu/netlist/macro/nlm_opamp.c
index c2038d19a28..bb160848b38 100644
--- a/src/emu/netlist/macro/nlm_opamp.c
+++ b/src/emu/netlist/macro/nlm_opamp.c
@@ -17,7 +17,7 @@ NETLIST_START(opamp_layout_4_4_11)
B.PLUS, /* |5 10| */ C.PLUS,
B.MINUS, /* |6 9| */ C.MINUS,
B.OUT, /* |7 8| */ C.OUT
- /* +--------------+ */
+ /* +--------------+ */
)
NET_C(A.GND, B.GND, C.GND, D.GND)
NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
@@ -33,7 +33,7 @@ NETLIST_START(opamp_layout_2_8_4)
A.MINUS, /* |2 7| */ B.OUT,
A.PLUS, /* |3 6| */ B.MINUS,
A.GND, /* |4 5| */ B.PLUS
- /* +--------------+ */
+ /* +--------------+ */
)
NET_C(A.GND, B.GND)
NET_C(A.VCC, B.VCC)
diff --git a/src/emu/netlist/macro/nlm_opamp.h b/src/emu/netlist/macro/nlm_opamp.h
index f9ed62d71b3..5b24ffc4842 100644
--- a/src/emu/netlist/macro/nlm_opamp.h
+++ b/src/emu/netlist/macro/nlm_opamp.h
@@ -9,13 +9,13 @@
* Netlist Macros
* ---------------------------------------------------------------------------*/
-#define MB3614_DIP(_name) \
+#define MB3614_DIP(_name) \
NET_REGISTER_DEV(MB3614_DIP, _name)
-#define LM324_DIP(_name) \
+#define LM324_DIP(_name) \
NET_REGISTER_DEV(LM324_DIP, _name)
-#define LM358_DIP(_name) \
+#define LM358_DIP(_name) \
NET_REGISTER_DEV(LM358_DIP, _name)
/* ----------------------------------------------------------------------------
diff --git a/src/emu/netlist/macro/nlm_other.c b/src/emu/netlist/macro/nlm_other.c
index 33747ed6780..e3d53def922 100644
--- a/src/emu/netlist/macro/nlm_other.c
+++ b/src/emu/netlist/macro/nlm_other.c
@@ -6,7 +6,7 @@
/*
* MC14584B: Hex Schmitt Trigger
- * ON Semiconductor
+ * ON Semiconductor
*
* +--------------+
* A1 |1 ++ 14| VCC
@@ -39,7 +39,7 @@ NETLIST_START(MC14584B_DIP)
s3.A, /* A3 |5 10| Y5 */ s5.Q,
s3.Q, /* Y3 |6 9| A4 */ s4.A,
GND.I, /* GND |7 8| Y4 */ s4.Q
- /* +--------------+ */
+ /* +--------------+ */
)
NETLIST_END()
diff --git a/src/emu/netlist/macro/nlm_other.h b/src/emu/netlist/macro/nlm_other.h
index c658b0dfbb3..3bf574d6973 100644
--- a/src/emu/netlist/macro/nlm_other.h
+++ b/src/emu/netlist/macro/nlm_other.h
@@ -9,10 +9,10 @@
* Netlist Macros
* ---------------------------------------------------------------------------*/
-#define MC14584B_GATE(_name) \
+#define MC14584B_GATE(_name) \
NET_REGISTER_DEV(MC14584B_GATE, _name)
-#define MC14584B_DIP(_name) \
+#define MC14584B_DIP(_name) \
NET_REGISTER_DEV(MC14584B_DIP, _name)
diff --git a/src/emu/netlist/macro/nlm_ttl74xx.c b/src/emu/netlist/macro/nlm_ttl74xx.c
index 75e865b1fe1..c9c33aceaeb 100644
--- a/src/emu/netlist/macro/nlm_ttl74xx.c
+++ b/src/emu/netlist/macro/nlm_ttl74xx.c
@@ -6,7 +6,7 @@
/*
* DM7416: Hex Inverting Buffers with
- * High Voltage Open-Collector Outputs
+ * High Voltage Open-Collector Outputs
*
* +--------------+
* A1 |1 ++ 14| VCC
@@ -39,7 +39,7 @@ NETLIST_START(TTL_7416_DIP)
s3.A, /* A3 |5 10| Y5 */ s5.Q,
s3.Q, /* Y3 |6 9| A4 */ s4.A,
GND.I, /* GND |7 8| Y4 */ s4.Q
- /* +--------------+ */
+ /* +--------------+ */
)
NETLIST_END()
diff --git a/src/emu/netlist/macro/nlm_ttl74xx.h b/src/emu/netlist/macro/nlm_ttl74xx.h
index 91f757dbf7d..d322588eb52 100644
--- a/src/emu/netlist/macro/nlm_ttl74xx.h
+++ b/src/emu/netlist/macro/nlm_ttl74xx.h
@@ -9,10 +9,10 @@
* Netlist Macros
* ---------------------------------------------------------------------------*/
-#define TTL_7416_GATE(_name) \
+#define TTL_7416_GATE(_name) \
NET_REGISTER_DEV(TTL_7416_GATE, _name)
-#define TTL_7416_DIP(_name) \
+#define TTL_7416_DIP(_name) \
NET_REGISTER_DEV(TTL7416_DIP, _name)
/* ----------------------------------------------------------------------------
diff --git a/src/emu/netlist/nl_base.c b/src/emu/netlist/nl_base.c
index 129bdd2db44..0c0b8e4d0fd 100644
--- a/src/emu/netlist/nl_base.c
+++ b/src/emu/netlist/nl_base.c
@@ -535,7 +535,7 @@ ATTR_COLD void device_t::register_subalias(const pstring &name, const pstring &a
// FIXME: make this working again
//if (term.isType(terminal_t::INPUT) || term.isType(terminal_t::TERMINAL))
- // m_terminals.add(name);
+ // m_terminals.add(name);
}
ATTR_COLD void device_t::register_terminal(const pstring &name, terminal_t &port)
diff --git a/src/emu/netlist/nl_base.h b/src/emu/netlist/nl_base.h
index d1329a5e5d6..940c5f54052 100644
--- a/src/emu/netlist/nl_base.h
+++ b/src/emu/netlist/nl_base.h
@@ -241,7 +241,7 @@ typedef UINT8 netlist_sig_t;
, _priv)
#define NETLIB_LOGIC_FAMILY(_fam) \
-virtual logic_family_desc_t *default_logic_family() \
+virtual logic_family_desc_t *default_logic_family() \
{ \
return netlist_family_ ## _fam; \
}
@@ -394,8 +394,8 @@ namespace netlist
VCCS, // Voltage controlled current source
LVCCS, // Voltage controlled current source (Current limited)
CCCS, // Current controlled current source
- VS, // Voltage Source
- CS, // Current Source
+ VS, // Voltage Source
+ CS, // Current Source
GND // GND device
};
diff --git a/src/emu/netlist/nl_factory.c b/src/emu/netlist/nl_factory.c
index f4e75b0ab41..edc55af9732 100644
--- a/src/emu/netlist/nl_factory.c
+++ b/src/emu/netlist/nl_factory.c
@@ -34,7 +34,7 @@ ATTR_COLD const pstring_list_t base_factory_t::def_params()
}
-factory_list_t::factory_list_t( setup_t &setup)
+factory_list_t::factory_list_t( setup_t &setup)
: m_setup(setup)
{
}
diff --git a/src/emu/netlist/nl_setup.h b/src/emu/netlist/nl_setup.h
index a38aa7229ef..900fb810878 100644
--- a/src/emu/netlist/nl_setup.h
+++ b/src/emu/netlist/nl_setup.h
@@ -58,7 +58,7 @@ ATTR_COLD void NETLIST_NAME(_name)(netlist::setup_t &setup) \
setup.register_source(palloc(netlist::source_proc_t(# _name, &NETLIST_NAME(_name))));
#define LOCAL_LIB_ENTRY(_name) \
- LOCAL_SOURCE(_name) \
+ LOCAL_SOURCE(_name) \
setup.register_lib_entry(# _name);
#define INCLUDE(_name) \
diff --git a/src/emu/netlist/plib/palloc.h b/src/emu/netlist/plib/palloc.h
index c80265c8105..badbc681486 100644
--- a/src/emu/netlist/plib/palloc.h
+++ b/src/emu/netlist/plib/palloc.h
@@ -79,7 +79,7 @@ inline void pfree_array_t(T *p)
pfree_raw(s);
}
-#define palloc(T) new(ppool) T
+#define palloc(T) new(ppool) T
#define pfree(_ptr) pfree_t(_ptr)
#if 1
@@ -94,7 +94,7 @@ inline void pfree_array_t(T *p)
#define ATTR_ALIGN
-#define palloc(T) global_alloc(T)
+#define palloc(T) global_alloc(T)
#define pfree(_ptr) global_free(_ptr)
#define palloc_array(T, N) global_alloc_array(T, N)
diff --git a/src/emu/netlist/plib/pconfig.h b/src/emu/netlist/plib/pconfig.h
index 45958b85468..c06fe3e3d2f 100644
--- a/src/emu/netlist/plib/pconfig.h
+++ b/src/emu/netlist/plib/pconfig.h
@@ -40,7 +40,7 @@
//============================================================
// prevent implicit copying
-#define P_PREVENT_COPYING(_name) \
+#define P_PREVENT_COPYING(_name) \
private: \
_name(const _name &); \
_name &operator=(const _name &);
@@ -234,4 +234,3 @@ private:
#if (defined(__MINGW32__) && (__GNUC__ >= 5))
#pragma GCC diagnostic pop
#endif
-
diff --git a/src/emu/netlist/plib/plists.h b/src/emu/netlist/plib/plists.h
index 8f4914145b5..bbb553eb12a 100644
--- a/src/emu/netlist/plib/plists.h
+++ b/src/emu/netlist/plib/plists.h
@@ -657,7 +657,7 @@ private:
#if 0
unsigned hash(const pstring &v) const
{
- /* Fowler–Noll–Vo hash - FNV-1 */
+ /* Fowler???Noll???Vo hash - FNV-1 */
const char *string = v.cstr();
unsigned result = 2166136261;
for (UINT8 c = *string++; c != 0; c = *string++)
@@ -671,17 +671,17 @@ private:
/* jenkins one at a time algo */
unsigned result = 0;
const char *string = v.cstr();
- while (*string)
- {
- result += *string;
- string++;
- result += (result << 10);
- result ^= (result >> 6);
- }
- result += (result << 3);
- result ^= (result >> 11);
- result += (result << 15);
- return result;
+ while (*string)
+ {
+ result += *string;
+ string++;
+ result += (result << 10);
+ result ^= (result >> 6);
+ }
+ result += (result << 3);
+ result ^= (result >> 11);
+ result += (result << 15);
+ return result;
}
#endif
#endif
diff --git a/src/emu/netlist/plib/pstate.c b/src/emu/netlist/plib/pstate.c
index 909bfcb2e58..326eb13fe49 100644
--- a/src/emu/netlist/plib/pstate.c
+++ b/src/emu/netlist/plib/pstate.c
@@ -75,4 +75,3 @@ template<> ATTR_COLD void pstate_manager_t::save_item(pstate_callback_t &state,
m_save.add(p);
state.register_state(*this, stname);
}
-
diff --git a/src/emu/netlist/solver/mat_cr.h b/src/emu/netlist/solver/mat_cr.h
index 708833f2625..195e856784b 100644
--- a/src/emu/netlist/solver/mat_cr.h
+++ b/src/emu/netlist/solver/mat_cr.h
@@ -92,7 +92,7 @@ struct mat_cr_t
*
* ==> LUx = r
*
- * ==> Ux = L⁻¹r = w
+ * ==> Ux = L?????r = w
*
* ==> r = Lw
*
diff --git a/src/emu/netlist/solver/vector_base.h b/src/emu/netlist/solver/vector_base.h
index c180b080338..c5b86cdb5e8 100644
--- a/src/emu/netlist/solver/vector_base.h
+++ b/src/emu/netlist/solver/vector_base.h
@@ -42,7 +42,6 @@ inline void vec_set (const std::size_t n, const double &scalar, double * RESTRIC
}
inline double vecmult (const std::size_t n, const double * RESTRICT a1, const double * RESTRICT a2 )
{
-
double value = 0.0;
for ( std::size_t i = 0; i < n; i++ )
value = value + a1[i] * a2[i];
diff --git a/src/emu/netlist/tools/nl_convert.c b/src/emu/netlist/tools/nl_convert.c
index bee0c2e8c36..59871b96bdf 100644
--- a/src/emu/netlist/tools/nl_convert.c
+++ b/src/emu/netlist/tools/nl_convert.c
@@ -188,7 +188,7 @@ nl_convert_base_t::unit_t nl_convert_base_t::m_units[] = {
{"M", "CAP_M(%g)", 1.0e-3 },
{"u", "CAP_U(%g)", 1.0e-6 }, /* eagle */
{"U", "CAP_U(%g)", 1.0e-6 },
- {"μ", "CAP_U(%g)", 1.0e-6 },
+ {"??", "CAP_U(%g)", 1.0e-6 },
{"N", "CAP_N(%g)", 1.0e-9 },
{"P", "CAP_P(%g)", 1.0e-12},
{"F", "%ge-15", 1.0e-15},
diff --git a/src/emu/schedule.c b/src/emu/schedule.c
index 46aae22c078..dbd22f24960 100644
--- a/src/emu/schedule.c
+++ b/src/emu/schedule.c
@@ -993,4 +993,3 @@ void device_scheduler::dump_timers() const
#if (defined(__MINGW32__) && (__GNUC__ >= 5))
#pragma GCC diagnostic pop
#endif
-
diff --git a/src/emu/screen.h b/src/emu/screen.h
index d91328cb1e9..682dd0ce049 100644
--- a/src/emu/screen.h
+++ b/src/emu/screen.h
@@ -355,7 +355,7 @@ typedef device_type_iterator<&device_creator<screen_device>, screen_device> scre
/*!
@brief Configures screen parameters for the given screen.
-
+
@param _pixclock Pixel Clock frequency value
@param _htotal Total number of horizontal pixels, including hblank period.
@param _hbend Horizontal pixel position for HBlank end event, also first pixel where screen rectangle is visible.
@@ -369,7 +369,7 @@ typedef device_type_iterator<&device_creator<screen_device>, screen_device> scre
/*!
@brief Sets the number of Frames Per Second for this screen
-
+
@param _rate FPS number
@deprecated Please use MCFG_SCREEN_RAW_PARAMS instead. Gives imprecise timings.
*/
@@ -378,7 +378,7 @@ typedef device_type_iterator<&device_creator<screen_device>, screen_device> scre
/*!
@brief Sets the vblank time of the given screen
-
+
@param _time Time parameter, in attotime value\
@deprecated Please use MCFG_SCREEN_RAW_PARAMS instead. Gives imprecise timings.
*/
@@ -387,7 +387,7 @@ typedef device_type_iterator<&device_creator<screen_device>, screen_device> scre
/*!
@brief Sets total screen size, including H/V-Blanks
-
+
@param _width Screen horizontal size
@param _height Screen vertical size
@deprecated Please use MCFG_SCREEN_RAW_PARAMS instead. Gives imprecise timings.
@@ -397,7 +397,7 @@ typedef device_type_iterator<&device_creator<screen_device>, screen_device> scre
/*!
@brief Sets screen visible area
-
+
@param _minx Screen left border
@param _maxx Screen right border, must be in N-1 format
@param _miny Screen top border
diff --git a/src/emu/sound/c140.c b/src/emu/sound/c140.c
index da659b1cad1..6649f53616a 100644
--- a/src/emu/sound/c140.c
+++ b/src/emu/sound/c140.c
@@ -134,11 +134,11 @@ void c140_device::device_start()
/* allocate a pair of buffers to mix into - 1 second's worth should be more than enough */
m_mixer_buffer_left = auto_alloc_array(machine(), INT16, 2 * m_sample_rate);
m_mixer_buffer_right = m_mixer_buffer_left + m_sample_rate;
-
+
save_item(NAME(m_REG));
-
+
for (int i = 0; i < C140_MAX_VOICE; i++)
- {
+ {
save_item(NAME(m_voi[i].ptoffset), i);
save_item(NAME(m_voi[i].pos), i);
save_item(NAME(m_voi[i].key), i);
diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c
index 637ad167f64..ae278d503db 100644
--- a/src/emu/sound/discrete.c
+++ b/src/emu/sound/discrete.c
@@ -1146,4 +1146,3 @@ WRITE8_MEMBER( discrete_device::write )
#if (defined(__MINGW32__) && (__GNUC__ >= 5))
#pragma GCC diagnostic pop
#endif
-
diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c
index b7c0e82feff..df2a5ef0143 100644
--- a/src/emu/sound/scsp.c
+++ b/src/emu/sound/scsp.c
@@ -1051,7 +1051,7 @@ unsigned short scsp_device::r16(address_space &space, unsigned int addr)
*/
logerror("SCSP: Reading from EXTS register %08x\n",addr);
if(addr == 0xee0)
- v = space.machine().device<cdda_device>("cdda")->get_channel_volume(0);
+ v = space.machine().device<cdda_device>("cdda")->get_channel_volume(0);
if(addr == 0xee2)
v = space.machine().device<cdda_device>("cdda")->get_channel_volume(1);
}
diff --git a/src/emu/sound/tms36xx.c b/src/emu/sound/tms36xx.c
index c170b1305b1..18c55ce6235 100644
--- a/src/emu/sound/tms36xx.c
+++ b/src/emu/sound/tms36xx.c
@@ -375,7 +375,7 @@ void tms36xx_device::device_start()
m_decay[0], m_decay[1], m_decay[2],
m_decay[3], m_decay[4], m_decay[5]));
LOG(("TMS36xx speed %d\n", m_speed));
-
+
save_item(NAME(m_octave));
save_item(NAME(m_tune_counter));
save_item(NAME(m_note_counter));
diff --git a/src/emu/sound/ymf278b.c b/src/emu/sound/ymf278b.c
index 38e0a0ae29c..60097767655 100644
--- a/src/emu/sound/ymf278b.c
+++ b/src/emu/sound/ymf278b.c
@@ -1011,7 +1011,7 @@ void ymf278b_device::device_start()
// Register state for saving
register_save_state();
- // YMF262 related
+ // YMF262 related
/* stream system initialize */
int ymf262_clock = clock() / (19/8.0);
diff --git a/src/emu/video/hd44780.h b/src/emu/video/hd44780.h
index f98bc01806b..c175ccb9e47 100644
--- a/src/emu/video/hd44780.h
+++ b/src/emu/video/hd44780.h
@@ -70,14 +70,14 @@ protected:
{
CHARSET_HD44780_A00,
CHARSET_KS0066_F05 /*,
- CHARSET_HD44780_A01,
- CHARSET_HD44780_A02,
- CHARSET_KS0066_F00,
- CHARSET_KS0066_F03,
- CHARSET_KS0066_F04,
- CHARSET_KS0066_F06,
- CHARSET_KS0066_F59
- */
+ CHARSET_HD44780_A01,
+ CHARSET_HD44780_A02,
+ CHARSET_KS0066_F00,
+ CHARSET_KS0066_F03,
+ CHARSET_KS0066_F04,
+ CHARSET_KS0066_F06,
+ CHARSET_KS0066_F59
+ */
};
void set_charset_type(int type);
diff --git a/src/emu/video/i82730.c b/src/emu/video/i82730.c
index 5bcc3240a35..d90a79d04ee 100644
--- a/src/emu/video/i82730.c
+++ b/src/emu/video/i82730.c
@@ -15,9 +15,9 @@
// CONSTANTS
//**************************************************************************
-#define VERBOSE 1
-#define VERBOSE_COMMANDS 1
-#define VERBOSE_DATASTREAM 0
+#define VERBOSE 1
+#define VERBOSE_COMMANDS 1
+#define VERBOSE_DATASTREAM 0
//**************************************************************************
diff --git a/src/emu/video/i82730.h b/src/emu/video/i82730.h
index 5df4e46a5de..ff2602d2307 100644
--- a/src/emu/video/i82730.h
+++ b/src/emu/video/i82730.h
@@ -35,9 +35,9 @@
// TYPE DEFINITIONS
//**************************************************************************
-typedef device_delegate<void (bitmap_rgb32 &bitmap, UINT16 *data, UINT8 lc, UINT16 y, int x_count)> i82730_update_row_delegate;
+typedef device_delegate<void (bitmap_rgb32 &bitmap, UINT16 *data, UINT8 lc, UINT16 y, int x_count)> i82730_update_row_delegate;
-#define I82730_UPDATE_ROW(name) \
+#define I82730_UPDATE_ROW(name) \
void name(bitmap_rgb32 &bitmap, UINT16 *data, UINT8 lc, UINT16 y, int x_count)
diff --git a/src/emu/video/mb_vcu.c b/src/emu/video/mb_vcu.c
index a5ff14230bf..0ad568976f8 100644
--- a/src/emu/video/mb_vcu.c
+++ b/src/emu/video/mb_vcu.c
@@ -191,7 +191,7 @@ void mb_vcu_device::device_start()
3, resistances_gb, m_weights_b, 3600, 0,
2, resistances_r, m_weights_r, 3600, 0);
}
-
+
save_item(NAME(m_status));
save_pointer(NAME(m_ram), 0x800);
save_pointer(NAME(m_palram), 0x100);
diff --git a/src/emu/video/rgbsse.h b/src/emu/video/rgbsse.h
index a29dd879ec8..0b729fabe46 100644
--- a/src/emu/video/rgbsse.h
+++ b/src/emu/video/rgbsse.h
@@ -349,7 +349,7 @@ public:
add(other);
clamp_to_uint8();
}
-
+
inline void scale_add_and_clamp(const rgbaint_t& scale, const rgbaint_t& other)
{
mul(scale);
@@ -362,7 +362,7 @@ public:
{
rgbaint_t color2(other);
color2.mul(scale2);
-
+
mul(scale);
add(color2);
sra_imm(8);
diff --git a/src/emu/video/vooddefs.h b/src/emu/video/vooddefs.h
index 1fe157888f0..f98aece2110 100644
--- a/src/emu/video/vooddefs.h
+++ b/src/emu/video/vooddefs.h
@@ -3209,7 +3209,7 @@ do
INT32 smax, tmax; \
UINT32 texbase; \
rgb_union c_local; \
- \
+ \
/* determine the S/T/LOD values for this texture */ \
if (TEXMODE_ENABLE_PERSPECTIVE(TEXMODE)) \
{ \
@@ -4743,10 +4743,10 @@ INLINE void ATTR_FORCE_INLINE multi_reciplog(INT64 valueA, INT64 valueB, INT64 v
double recip = double(1ULL<<(47-39))/valueC;
double resAD = valueA * recip;
double resBD = valueB * recip;
- log = new_log2(recip);
- log += 56<<8;
- resA = resAD;
- resB = resBD;
+ log = new_log2(recip);
+ log += 56<<8;
+ resA = resAD;
+ resB = resBD;
}
diff --git a/src/mame/arcade.lst b/src/mame/arcade.lst
index ea1ef2cc653..7f322c5c159 100644
--- a/src/mame/arcade.lst
+++ b/src/mame/arcade.lst
@@ -44,7 +44,7 @@ crush4 // Kural TWT
maketrax // (c) 1981 Williams, high score table says KRL (fur Kural)
maketrxb // (c) 1981 [Kural] (Williams license)
korosuke // (c) 1981 Kural Electric
-crushrlf // bootleg
+crushrlf // bootleg
mbrush // 1981 bootleg
paintrlr // 1981 bootleg
crushs // 1981 bootleg
@@ -339,7 +339,7 @@ mimonsco // (c) 1982 bootleg
scobra // GX316 (c) 1981 Konami
scobras // GX316 (c) 1981 Stern
scobrase // GX316 (c) 1981 Sega
-scobrae // GX316 (c) 1981 Stern
+scobrae // GX316 (c) 1981 Stern
scobrab // GX316 (c) 1981 Karateco (bootleg?)
suprheli // bootleg
stratgyx // GX306 (c) 1981 Konami
@@ -684,14 +684,14 @@ falcon // bootleg
vautour // bootleg (Jeutel)
falconz // bootleg
vautourz // bootleg
-vautourza // bootleg (Jeutal)
+vautourza // bootleg (Jeutal)
griffon // bootleg (Videotron)
nextfase // bootleg
phoenixs // bootleg (Sonic)
-phoenixass // bootleg (Assa)
+phoenixass // bootleg (Assa)
avefenix // bootleg (Video Game)
avefenixrf // bootleg (Recreativos Franco)
-avefenixl // bootleg (Laguna)
+avefenixl // bootleg (Laguna)
pleiads // (c) 1981 Tehkan
pleiadsb2 // bootleg
pleiadbl // bootleg
@@ -1242,7 +1242,7 @@ marioo // (c) 1983 Nintendo of America
marioj // (c) 1983 Nintendo
masao // bootleg
mariobl // bootleg
-mmagic // (c) 1979 Nintendo
+mmagic // (c) 1979 Nintendo
dkong3abl //
pestplce // bootleg on donkey kong hw
spclforc // (c) 1985 Senko Industries (Magic Eletronics Inc. license)
@@ -3287,7 +3287,7 @@ megamana // 06/10/1995 (c) 1995 (Asia)
rockmanj // 22/09/1995 (c) 1995 (Japan)
fcrash // bootleg of Final Fight
ffightbl // bootleg
-ffightbla // bootleg
+ffightbla // bootleg
ganbare // 11/04/2000 (c) 2000 (Japan)
@@ -3454,7 +3454,7 @@ xmvsf // 04/10/1996 (c) 1996 (Euro)
xmvsfr1 // 10/09/1996 (c) 1996 (Euro)
xmvsfu // 23/10/1996 (c) 1996 (USA)
xmvsfur1 // 04/10/1996 (c) 1996 (USA)
-xmvsfur2 // 10/09/1996 (c) 1996 (USA)
+xmvsfur2 // 10/09/1996 (c) 1996 (USA)
xmvsfj // 04/10/1996 (c) 1996 (Japan)
xmvsfjr1 // 10/09/1996 (c) 1996 (Japan)
xmvsfjr2 // 09/09/1996 (c) 1996 (Japan)
@@ -4518,8 +4518,8 @@ stactics // (c) 1981 Sega
turbo // (c) 1981 Sega
turboa // (c) 1981 Sega
turbob // (c) 1981 Sega
-turboc // (c) 1981 Sega
-turbod // (c) 1981 Sega
+turboc // (c) 1981 Sega
+turbod // (c) 1981 Sega
turbobl // bootleg
subroc3d // (c) 1982 Sega
buckrog // (c) 1982 Sega
@@ -4697,7 +4697,7 @@ passht4b // bootleg
passshtb // bootleg
shinoblb // (c) 1987 (but bootleg)
shinobld // (c) 1987 (but bootleg)
-shinoblda //
+shinoblda //
tetrisbl // (c) 1988 (but bootleg)
beautyb // (c) 1991 AMT
iqpipe // (c) 1991 AMT
@@ -5772,7 +5772,7 @@ scg06nt // 2005.12 Sega Golf Club 2006: Next Tours (Rev A)
// 2006.09 Sega Network Taisen Mahjong MJ 3 Evolution (Rev A)
// 2006.10 Quest of D Oukoku no Syugosya Ver.3.00
// 2006.11 Quest of D Oukoku no Syugosya Ver.3.01
-mj3evo // 2007.06 Sega Network Taisen Mahjong MJ 3 Evolution (Rev B)
+mj3evo // 2007.06 Sega Network Taisen Mahjong MJ 3 Evolution (Rev B)
// 2007.11 Quest of D The Battle Kingdom Ver.4.00
// 2008.01 Quest of D The Battle Kingdom Ver.4.00b
// 2008.02 Quest of D The Battle Kingdom Ver.4.00c
@@ -6031,7 +6031,7 @@ midres // (c) 1989 Data East Corporation (World)
midresu // (c) 1989 Data East USA (US)
midresj // (c) 1989 Data East Corporation (Japan)
midresb // bootleg
-midresbj // bootleg
+midresbj // bootleg
bouldash // (c) 1990 Data East Corporation (World)
bouldashj // (c) 1990 Data East Corporation (Japan)
// end of similar hardware
@@ -6481,7 +6481,7 @@ esckids // GX975 (c) 1991 (Asia)
esckidsj // GX975 (c) 1991 (Japan)
vendetta // GX081 (c) 1991 (World)
vendettar // GX081 (c) 1991 (World)
-vendettaz // GX081 (c) 1991 (World)
+vendettaz // GX081 (c) 1991 (World)
vendetta2p // GX081 (c) 1991 (World)
vendetta2peba // GX081 (c) 1991 (World)
vendetta2pu // GX081 (c) 1991 (Asia)
@@ -7139,7 +7139,7 @@ roadblst1 // 136048 (c) 1986, 1987
roadblstc // 136048 (c) 1986, 1987
roadblstcg // 136048 (c) 1986, 1987
roadblstc1 // 136048 (c) 1986, 1987
-roadblstgu // 136048 (c) 1986, 1987
+roadblstgu // 136048 (c) 1986, 1987
// Atari System 2 games
// Paperboy
@@ -8282,7 +8282,7 @@ biofreak // (c) 1997 Midway Games (prototype)
blitz // (c) 1997 Midway Games
blitz11 // (c) 1997 Midway Games
blitz99 // (c) 1998 Midway Games
-blitz99a // (c) 1998 Midway Games
+blitz99a // (c) 1998 Midway Games
blitz2k // (c) 1999 Midway Games
hyprdriv // (c) 1998 Midway Games
@@ -8297,7 +8297,7 @@ sf2049te // (c) 1999 Atari Games
warfa // (c) 1999 Atari Games
nbashowt // (c) 1998 Midway Games
nbanfl // (c) 1999 Midway Games
-nbagold // (c) 2000 Midway Games
+nbagold // (c) 2000 Midway Games
gauntdl // (c) 1999 Midway Games
gauntdl24 // (c) 1999 Midway Games
cartfury // (c) 2000 Midway Games
@@ -8721,7 +8721,7 @@ stdragon // (c) 1989
stdragona // (c) 1989
rodland // (c) 1990
rodlandj // (c) 1990 (Japan)
-rittam // Prototype or hack of Rod-Land
+rittam // Prototype or hack of Rod-Land
rodlandjb // bootleg
avspirit // (c) 1991
phantasm // (c) 1991 (Japan)
@@ -8801,14 +8801,14 @@ pspikesk // (c) 1991 Video System Co. (Korea)
pspikesu // (c) 1991 Video System Co. (US)
svolly91 // (c) 1991 Video System Co. (Japan)
pspikesb // bootleg
-pspikesba // bootleg
+pspikesba // bootleg
spikes91 // bootleg
spikes91b // bootleg
pspikesc // bootleg
karatblz // (c) 1991 Video System Co.
karatblzu // (c) 1991 Video System Co. (US)
karatblzj // (c) 1991 Video System / Tecmo (Japan)
-karatblzbl // bootleg
+karatblzbl // bootleg
turbofrc // (c) 1991 Video System Co.
aerofgt // (c) 1992 Video System Co.
aerofgtb // (c) 1992 Video System Co.
@@ -8865,7 +8865,7 @@ baryona // (c) 1997 SemiCom
dreamwld // (c) 2000 SemiCom
rolcrush // (c) 1999 Trust
cutefght // (c) 1998 SemiCom
-gaialast // (c) 1999 SemiCom
+gaialast // (c) 1999 SemiCom
// SH2 board
s1945ii // (c) 1997
@@ -9686,7 +9686,7 @@ sprtmtch // "31" (c) 1989 Dynax + Fabtek license
maya // (c) 1994 Promat
mayaa // (c) 1994 Promat
mayab // (c) 1994 Promat
-mayac // (c) 1994 Promat
+mayac // (c) 1994 Promat
inca // (c) 199? ????
blktouch // (c) Yang Gi Co Ltd.
mcnpshnt // "33" Mahjong Campus Hunting 1990 Dynax
@@ -10685,7 +10685,7 @@ pitbossa1 // (c) 1983 Merit
pitbossb // (c) 1983 Merit
pitbossc // (c) 1983 Merit
casino5 // (c) 1984 Merit
-mroundup // (c) 1984 Merit
+mroundup // (c) 1984 Merit
trvwzh // (c) 1985 Merit
trvwzha // (c) 1985 Merit
trvwzhb // (c) 1985 Merit
@@ -12855,7 +12855,7 @@ cdibios // Base unit
quizard // (c) TAB Austria 199?
quizard_17 // (c) TAB Austria 1996
quizard_12 // (c) TAB Austria 1996
-quizard_10 // (c) TAB Austria 1996
+quizard_10 // (c) TAB Austria 1996
quizard2 // (c) TAB Austria 1995
quizard2_22 // (c) TAB Austria 199?
quizard3 // (c) TAB Austria 1996
diff --git a/src/mame/audio/seibu.h b/src/mame/audio/seibu.h
index ca3fa2f11c2..dcfe0ecec39 100644
--- a/src/mame/audio/seibu.h
+++ b/src/mame/audio/seibu.h
@@ -195,22 +195,22 @@ extern const device_type SEIBU_ADPCM;
MCFG_CPU_PROGRAM_MAP(seibu3_adpcm_sound_map) \
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
-#define SEIBU_SOUND_SYSTEM_ENCRYPTED_LOW() \
- MCFG_DEVICE_MODIFY("seibu_sound") \
- downcast<seibu_sound_device *>(device)->set_encryption(1); \
- MCFG_DEVICE_MODIFY("audiocpu") \
+#define SEIBU_SOUND_SYSTEM_ENCRYPTED_LOW() \
+ MCFG_DEVICE_MODIFY("seibu_sound") \
+ downcast<seibu_sound_device *>(device)->set_encryption(1); \
+ MCFG_DEVICE_MODIFY("audiocpu") \
MCFG_CPU_DECRYPTED_OPCODES_MAP(seibu_sound_decrypted_opcodes_map)
-#define SEIBU_SOUND_SYSTEM_ENCRYPTED_FULL() \
- MCFG_DEVICE_MODIFY("seibu_sound") \
- downcast<seibu_sound_device *>(device)->set_encryption(2); \
- MCFG_DEVICE_MODIFY("audiocpu") \
+#define SEIBU_SOUND_SYSTEM_ENCRYPTED_FULL() \
+ MCFG_DEVICE_MODIFY("seibu_sound") \
+ downcast<seibu_sound_device *>(device)->set_encryption(2); \
+ MCFG_DEVICE_MODIFY("audiocpu") \
MCFG_CPU_DECRYPTED_OPCODES_MAP(seibu_sound_decrypted_opcodes_map)
-#define SEIBU_SOUND_SYSTEM_ENCRYPTED_CUSTOM() \
- MCFG_DEVICE_MODIFY("seibu_sound") \
- downcast<seibu_sound_device *>(device)->set_encryption(3); \
- MCFG_DEVICE_MODIFY("audiocpu") \
+#define SEIBU_SOUND_SYSTEM_ENCRYPTED_CUSTOM() \
+ MCFG_DEVICE_MODIFY("seibu_sound") \
+ downcast<seibu_sound_device *>(device)->set_encryption(3); \
+ MCFG_DEVICE_MODIFY("audiocpu") \
MCFG_CPU_DECRYPTED_OPCODES_MAP(seibu_sound_decrypted_opcodes_map)
#define SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(freq1,freq2) \
diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c
index 5e2f083c44b..edcd1ade088 100644
--- a/src/mame/drivers/aerofgt.c
+++ b/src/mame/drivers/aerofgt.c
@@ -1521,8 +1521,8 @@ static MACHINE_CONFIG_START( karatblzbl, aerofgt_state )
MCFG_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
MCFG_CPU_PROGRAM_MAP(karatblzbl_sound_map)
-// MCFG_MACHINE_START_OVERRIDE(aerofgt_state,aerofgt)
-// MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,aerofgt)
+// MCFG_MACHINE_START_OVERRIDE(aerofgt_state,aerofgt)
+// MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,aerofgt)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1554,7 +1554,7 @@ static MACHINE_CONFIG_START( karatblzbl, aerofgt_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- // NEC D7759c + YM????
+ // NEC D7759c + YM????
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( spinlbrk, aerofgt_state )
@@ -2480,7 +2480,7 @@ ROM_START( karatblzbl )
ROM_LOAD16_BYTE( "gfx21.u71", 0x2c0000, 0x020000, CRC(ffd66ea0) SHA1(fc1b2fa27d28a61b381e3d4f15809c740082d07f) )
ROM_LOAD16_BYTE( "gfx26.u76", 0x2c0001, 0x020000, CRC(7ae76103) SHA1(5c42fbe133cbf600d2150295a70a1541b79706b5) )
ROM_LOAD16_BYTE( "gfx25.u67", 0x300000, 0x020000, CRC(1195b559) SHA1(2fd00b3360df5f0a762569ab49c445b68568cf2e) )
- ROM_LOAD16_BYTE( "gfx30.u72", 0x300001, 0x020000, CRC(7593679f) SHA1(3a6199d1dc60d2c05084fe41c639228613831d99) )
+ ROM_LOAD16_BYTE( "gfx30.u72", 0x300001, 0x020000, CRC(7593679f) SHA1(3a6199d1dc60d2c05084fe41c639228613831d99) )
ROM_REGION( 0x100000, "gfx4", 0 )
ROM_LOAD16_BYTE( "5.u62", 0x000000, 0x040000, CRC(1ed12174) SHA1(1e4fc511ad644aaf90505f7930957b4adf9f6c2a) )
diff --git a/src/mame/drivers/aleisttl.c b/src/mame/drivers/aleisttl.c
index 2b8fe06c97f..1251384302b 100644
--- a/src/mame/drivers/aleisttl.c
+++ b/src/mame/drivers/aleisttl.c
@@ -7,7 +7,7 @@
Chase (aka Chase1) (1976)
Deluxe Soccer (1973)
Fire Power (1975) EG-1020-2
- Fütsball (1975)
+ F??tsball (1975)
Galaxy Raider (1974)
Hesitation (1974) AL-6500?
Hockey, Soccer, Tennis (1974)
diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c
index 103d034f01e..b10be6bdc0e 100644
--- a/src/mame/drivers/appoooh.c
+++ b/src/mame/drivers/appoooh.c
@@ -393,7 +393,7 @@ GFXDECODE_END
void appoooh_state::machine_start()
{
membank("bank1")->configure_entries(0, 2, memregion("maincpu")->base() + 0xa000, 0x6000);
-
+
save_item(NAME(m_adpcm_data));
save_item(NAME(m_adpcm_address));
}
diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c
index 64693872fea..d1585c544ae 100644
--- a/src/mame/drivers/arkanoid.c
+++ b/src/mame/drivers/arkanoid.c
@@ -1366,38 +1366,38 @@ MACHINE_CONFIG_END
/* ROMs */
/* rom numbering, with guesses:
- A75 01 = Z80 code 1/2 v1.0 Japan
- A75 01-1 = Z80 code 1/2 v1.1 Japan and USA/Romstar
- A75 02 = Z80 code 2/2 v1.0 Japan
- A75 03 = GFX 1/3
- A75 04 = GFX 2/3
- A75 05 = GFX 3/3
- A75 06 = MC68705P5 MCU code, v1.0 Japan and v1.0 USA/Romstar
- A75 07 = PROM red
- A75 08 = PROM green
- A75 09 = PROM blue
- A75 10 = Z80 code 2/2 v1.1 USA/Romstar
- A75 11 = Z80 code 2/2 v1.2 Japan (paired with 01-1 v1.1 Japan)
- (A75 12 through 17 are unknown, could be another two sets of z80 code plus mc68705p5)
- A75 18 = Z80 code v2.0 2/2 USA/Romstar
- A75 19 = Z80 code v2.0 1/2 USA/Romstar
- A75 20 = MC68705P5 MCU code, v2.0 USA/Romstar
- A75 21 = Z80 code v2.0 1/2 Japan
- A75 22 = Z80 code v2.0 2/2 Japan
- A75 23 = MC68705P5 MCU code, v2.0 Japan
- A75 24 = Z80 code v2.1 1/2 Japan
- A75 25 = Z80 code v2.1 2/2 Japan
- A75 26 = MC68705P5 MCU code, v2.1 Japan
- A75 27 = Z80 code 1/2 Tournament
- A75 28 = Z80 code 2/2 Tournament
- A75 29 = GFX 1/3 Tournament
- A75 30 = GFX 2/3 Tournament
- A75 31 = GFX 3/3 Tournament
- A75 32 = MC68705P5 MCU code, Tournament
- A75 33 = PROM red Tournament
- A75 34 = PROM green Tournament
- A75 35 = PROM blue Tournament
- (one of the 21/22/23 or 24/25/26 sets is likely 'world'? or are these really two japan sets?)
+ A75 01 = Z80 code 1/2 v1.0 Japan
+ A75 01-1 = Z80 code 1/2 v1.1 Japan and USA/Romstar
+ A75 02 = Z80 code 2/2 v1.0 Japan
+ A75 03 = GFX 1/3
+ A75 04 = GFX 2/3
+ A75 05 = GFX 3/3
+ A75 06 = MC68705P5 MCU code, v1.0 Japan and v1.0 USA/Romstar
+ A75 07 = PROM red
+ A75 08 = PROM green
+ A75 09 = PROM blue
+ A75 10 = Z80 code 2/2 v1.1 USA/Romstar
+ A75 11 = Z80 code 2/2 v1.2 Japan (paired with 01-1 v1.1 Japan)
+ (A75 12 through 17 are unknown, could be another two sets of z80 code plus mc68705p5)
+ A75 18 = Z80 code v2.0 2/2 USA/Romstar
+ A75 19 = Z80 code v2.0 1/2 USA/Romstar
+ A75 20 = MC68705P5 MCU code, v2.0 USA/Romstar
+ A75 21 = Z80 code v2.0 1/2 Japan
+ A75 22 = Z80 code v2.0 2/2 Japan
+ A75 23 = MC68705P5 MCU code, v2.0 Japan
+ A75 24 = Z80 code v2.1 1/2 Japan
+ A75 25 = Z80 code v2.1 2/2 Japan
+ A75 26 = MC68705P5 MCU code, v2.1 Japan
+ A75 27 = Z80 code 1/2 Tournament
+ A75 28 = Z80 code 2/2 Tournament
+ A75 29 = GFX 1/3 Tournament
+ A75 30 = GFX 2/3 Tournament
+ A75 31 = GFX 3/3 Tournament
+ A75 32 = MC68705P5 MCU code, Tournament
+ A75 33 = PROM red Tournament
+ A75 34 = PROM green Tournament
+ A75 35 = PROM blue Tournament
+ (one of the 21/22/23 or 24/25/26 sets is likely 'world'? or are these really two japan sets?)
*/
ROM_START( arkanoid )
diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c
index cbb4b82f704..d2d1a1785f7 100644
--- a/src/mame/drivers/atarisy1.c
+++ b/src/mame/drivers/atarisy1.c
@@ -2316,7 +2316,7 @@ ROM_START( roadblstcg )
// set in the first place)
ROM_LOAD( "135048-1172.d1", 0x000000, 0x000200, CRC(b79d1903) SHA1(8319fab8b39f708457eb1efe47789b26adc61249) )
ROM_LOAD( "135048-1171.d2", 0x000200, 0x000200, CRC(29248a95) SHA1(c9467d495676d323121c92c6757e73b2ed3fb3d7) )
-
+
ROM_LOAD( "136048-1174.12d", 0x000000, 0x000200, CRC(db4a4d53) SHA1(c5468f3585ec9bc23c9ee990b3ae3738b0309823) )
ROM_LOAD( "136048-1173.2d", 0x000200, 0x000200, CRC(c80574af) SHA1(9a3dc83f70e79915ce0db3e6e69b5dcfee3acb6f) )
diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c
index f989596d660..b2dcdf11ada 100644
--- a/src/mame/drivers/atarisy2.c
+++ b/src/mame/drivers/atarisy2.c
@@ -277,27 +277,27 @@ WRITE16_MEMBER(atarisy2_state::bankselect_w)
{
/*static const int bankoffset[64] =
{
- 12, 8, 4, 0,
- 13, 9, 5, 1,
- 14, 10, 6, 2,
- 15, 11, 7, 3,
- 28, 24, 20, 16,
- 29, 25, 21, 17,
- 30, 26, 22, 18,
- 31, 27, 23, 19,
- 44, 40, 36, 32,
- 45, 41, 37, 33,
- 46, 42, 38, 34,
- 47, 43, 39, 35,
- 60, 56, 52, 48,
- 61, 57, 53, 49,
- 62, 58, 54, 50,
- 63, 59, 55, 51
+ 12, 8, 4, 0,
+ 13, 9, 5, 1,
+ 14, 10, 6, 2,
+ 15, 11, 7, 3,
+ 28, 24, 20, 16,
+ 29, 25, 21, 17,
+ 30, 26, 22, 18,
+ 31, 27, 23, 19,
+ 44, 40, 36, 32,
+ 45, 41, 37, 33,
+ 46, 42, 38, 34,
+ 47, 43, 39, 35,
+ 60, 56, 52, 48,
+ 61, 57, 53, 49,
+ 62, 58, 54, 50,
+ 63, 59, 55, 51
};*/
int banknumber = ((data >> 10) & 0x3f) ^ 0x03;
banknumber = BITSWAP16(banknumber, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 1, 0, 3, 2);
-
+
if (offset)
m_rombank2->set_entry(banknumber);
else
diff --git a/src/mame/drivers/bmcpokr.c b/src/mame/drivers/bmcpokr.c
index 386e52bafc5..45596804203 100644
--- a/src/mame/drivers/bmcpokr.c
+++ b/src/mame/drivers/bmcpokr.c
@@ -622,7 +622,7 @@ static INPUT_PORTS_START( mjmaglmp )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_COIN2 ) // NOTE
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_GAMBLE_KEYOUT ) // KEY DOWN
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Pay Out") PORT_CODE(KEYCODE_O) // PAY
- PORT_BIT( 0x0200, IP_ACTIVE_HIGH,IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, bmcpokr_state,hopper_r, NULL) // HOPPER
+ PORT_BIT( 0x0200, IP_ACTIVE_HIGH,IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, bmcpokr_state,hopper_r, NULL) // HOPPER
PORT_SERVICE_NO_TOGGLE( 0x0400, IP_ACTIVE_LOW ) // ACCOUNT
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Reset") // RESET
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // (unused)
diff --git a/src/mame/drivers/chihiro.c b/src/mame/drivers/chihiro.c
index f65c8685e0b..cf0c3e428b4 100644
--- a/src/mame/drivers/chihiro.c
+++ b/src/mame/drivers/chihiro.c
@@ -1543,7 +1543,7 @@ TIMER_CALLBACK_MEMBER(chihiro_state::usb_ohci_timer)
usb_ohci_read_endpoint_descriptor(ohcist.hc_regs[HcControlCurrentED]);
// only if it is not halted and not to be skipped
if (!(ohcist.endpoint_descriptor.h | ohcist.endpoint_descriptor.k)) {
- // compare the Endpoint Descriptors TailPointer and NextTransferDescriptor fields.
+ // compare the Endpoint Descriptor?s TailPointer and NextTransferDescriptor fields.
if (ohcist.endpoint_descriptor.headp != ohcist.endpoint_descriptor.tailp) {
UINT32 a, b;
// service transfer descriptor
diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c
index b420c04066a..de39eba5c0d 100644
--- a/src/mame/drivers/coolridr.c
+++ b/src/mame/drivers/coolridr.c
@@ -345,7 +345,7 @@ public:
// store the blit params here
UINT32 m_spriteblit[12];
UINT32 m_vregs_address;
-
+
UINT32 m_clipvals[2][3];
UINT8 m_clipblitterMode[2]; // hack
@@ -2732,7 +2732,7 @@ void coolridr_state::sysh1_dma_transfer( address_space &space, UINT16 dma_index
do{
cmd = (m_framebuffer_vram[(0+dma_index)/4] & 0xfc000000) >> 24;
-
+
switch(cmd)
{
case 0x00: /* end of list marker */
@@ -3026,7 +3026,7 @@ static ADDRESS_MAP_START( coolridr_submap, AS_PROGRAM, 32, coolridr_state )
AM_RANGE(0x05000000, 0x05000fff) AM_RAM
AM_RANGE(0x05200000, 0x052001ff) AM_RAM
AM_RANGE(0x05300000, 0x0530ffff) AM_RAM AM_SHARE("share3") /*Communication area RAM*/
-// AM_RANGE(0x05fffe00, 0x05ffffff) AM_READWRITE16(sh7032_r,sh7032_w,0xffffffff) // SH-7032H internal i/o
+// AM_RANGE(0x05fffe00, 0x05ffffff) AM_READWRITE16(sh7032_r,sh7032_w,0xffffffff) // SH-7032H internal i/o
AM_RANGE(0x06000000, 0x060001ff) AM_RAM AM_SHARE("nvram") // backup RAM
AM_RANGE(0x06100000, 0x06100003) AM_READ_PORT("IN0") AM_WRITE8(lamps_w,0x000000ff)
AM_RANGE(0x06100004, 0x06100007) AM_READ_PORT("IN1")
@@ -3123,32 +3123,31 @@ GFXDECODE_END
PORT_DIPNAME( 0x00800000, 0x00800000, DEF_STR( Unknown ) ) \
PORT_DIPSETTING( 0x00800000, DEF_STR( Off ) ) \
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) ) \
- PORT_BIT( 0xff00ff00, IP_ACTIVE_LOW, IPT_UNUSED ) \
-
+ PORT_BIT( 0xff00ff00, IP_ACTIVE_LOW, IPT_UNUSED )
static INPUT_PORTS_START( aquastge )
DUMMY_INPUT_PORT("IN0")
PORT_START("IN1")
- PORT_DIPNAME( 0x00000001, 0x00000001, "IN1" )
- PORT_DIPSETTING( 0x00000001, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_DIPNAME( 0x00000002, 0x00000002, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x00000002, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_DIPNAME( 0x00000004, 0x00000004, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x00000004, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_DIPNAME( 0x00000008, 0x00000008, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x00000008, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
- PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_DIPNAME( 0x00000040, 0x00000040, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x00000040, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_DIPNAME( 0x00000080, 0x00000080, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x00000080, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x00000001, 0x00000001, "IN1" )
+ PORT_DIPSETTING( 0x00000001, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x00000002, 0x00000002, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00000002, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x00000004, 0x00000004, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00000004, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x00000008, 0x00000008, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00000008, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
+ PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
+ PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
+ PORT_DIPNAME( 0x00000040, 0x00000040, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00000040, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x00000080, 0x00000080, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00000080, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_NAME("P1 Coin")
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_NAME("P2 Coin")
PORT_SERVICE_NO_TOGGLE( 0x00040000, IP_ACTIVE_LOW )
@@ -3157,8 +3156,8 @@ static INPUT_PORTS_START( aquastge )
PORT_BIT( 0x00200000, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME("P2 Start")
PORT_BIT( 0x00400000, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("P2 Service Switch")
PORT_BIT( 0x00800000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0xff00ff00, IP_ACTIVE_LOW, IPT_UNUSED )
-
+ PORT_BIT( 0xff00ff00, IP_ACTIVE_LOW, IPT_UNUSED )
+
DUMMY_INPUT_PORT("IN2")
DUMMY_INPUT_PORT("IN3")
@@ -3906,7 +3905,7 @@ READ32_MEMBER(coolridr_state::aquastge_hack_r)
return 0;
else
{
-// printf("pc %08x\n", pc);
+// printf("pc %08x\n", pc);
}
return m_sysh1_workram_h[0xc3fd8/4];
@@ -3933,7 +3932,7 @@ DRIVER_INIT_MEMBER(coolridr_state, aquastge)
{
m_maincpu->space(AS_PROGRAM).install_read_handler(0x60c3fd8, 0x60c3fdb, read32_delegate(FUNC(coolridr_state::aquastge_hack_r), this));
-
+
m_maincpu->sh2drc_set_options(SH2DRC_FASTEST_OPTIONS);
@@ -3944,4 +3943,3 @@ DRIVER_INIT_MEMBER(coolridr_state, aquastge)
GAME( 1995, coolridr, 0, coolridr, coolridr, coolridr_state, coolridr, ROT0, "Sega", "Cool Riders",GAME_IMPERFECT_SOUND) // region is set in test mode, this set is for Japan, USA and Export (all regions)
GAME( 1995, aquastge, 0, aquastge, aquastge, coolridr_state, aquastge, ROT0, "Sega", "Aqua Stage",GAME_NOT_WORKING)
-
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index 4693b1f97ef..7c96d66e038 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -1494,7 +1494,7 @@ ROM_START( 19xxa )
ROM_LOAD16_WORD_SWAP( "19x.11m", 0x000000, 0x200000, CRC(d38beef3) SHA1(134e961b926a97cca5e45d3558efb98f6f278e08) )
ROM_LOAD16_WORD_SWAP( "19x.12m", 0x200000, 0x200000, CRC(d47c96e2) SHA1(3c1b5563f8e7ee1c450b3592fcb319e928caec3c) )
- _19XX_ASIA_KEY
+ _19XX_ASIA_KEY
ROM_END
ROM_START( 19xxar1 )
@@ -2677,7 +2677,7 @@ ROM_START( ddtodh )
ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
ROM_LOAD16_WORD_SWAP( "dad.11m", 0x000000, 0x200000, CRC(0c499b67) SHA1(a8ebd8a1cd6dece8344b7cb0439d85843fb97616) )
ROM_LOAD16_WORD_SWAP( "dad.12m", 0x200000, 0x200000, CRC(2f0b5a4e) SHA1(8d1ebbb811aa469b0f0d29d719d2b9af28fb63a2) )
-
+
DDTOD_HISPANIC_KEY
ROM_END
@@ -6288,7 +6288,7 @@ ROM_START( sfa2 )
ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
ROM_LOAD16_WORD_SWAP( "sz2.11m", 0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
ROM_LOAD16_WORD_SWAP( "sz2.12m", 0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
-
+
SFA2_WORLD_KEY
ROM_END
@@ -8488,7 +8488,7 @@ ROM_START( xmcotaj1 )
ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
ROM_LOAD16_WORD_SWAP( "xmn.11m", 0x000000, 0x200000, CRC(c848a6bc) SHA1(ac8ac564d3c43225822f8bc330eba9f35b24b0a4) )
ROM_LOAD16_WORD_SWAP( "xmn.12m", 0x200000, 0x200000, CRC(729c188f) SHA1(3279774ad8aebbcf0fc779cdfcbe21044dd192ad) )
-
+
XMCOTA_JAPAN_KEY
ROM_END
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index ed12dc4ada3..6c411b80832 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -3921,10 +3921,10 @@ WRITE8_MEMBER(ddenlovr_state::mjgnight_coincounter_w)
{
m_prot_val = data;
- set_led_status(machine(), 0, data & 0x01); // led? 1 in-game, 0 in service mode / while booting
+ set_led_status(machine(), 0, data & 0x01); // led? 1 in-game, 0 in service mode / while booting
- coin_counter_w(machine(), 0, data & 0x04); // coin-out
- coin_counter_w(machine(), 1, data & 0x08); // coin-in
+ coin_counter_w(machine(), 0, data & 0x04); // coin-out
+ coin_counter_w(machine(), 1, data & 0x08); // coin-in
if (data & 0xf2)
logerror("%04x: warning, coin counter = %02x\n", space.device().safe_pc(), data);
diff --git a/src/mame/drivers/deadang.c b/src/mame/drivers/deadang.c
index ac2cb802658..b15d5b4619d 100644
--- a/src/mame/drivers/deadang.c
+++ b/src/mame/drivers/deadang.c
@@ -166,7 +166,7 @@ static INPUT_PORTS_START( ghunter )
PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Controller ) ) PORT_DIPLOCATION("SW2:4")
PORT_DIPSETTING( 0x0800, DEF_STR( Trackball ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Joystick ) )
-
+
PORT_START("TRACKX")
PORT_BIT( 0x0fff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_PLAYER(1)
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index 90cbed76764..273fcbec16d 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -3643,7 +3643,7 @@ DRIVER_INIT_MEMBER(deco32_state,captaven)
{
deco56_decrypt_gfx(machine(), "gfx1");
deco56_decrypt_gfx(machine(), "gfx2");
-
+
save_item(NAME(m_raster_enable));
save_item(NAME(m_nslasher_sound_irq));
save_item(NAME(m_irq_source));
@@ -3725,7 +3725,7 @@ DRIVER_INIT_MEMBER(dragngun_state,lockload)
memcpy(RAM+0x300000,RAM+0x100000,0x100000);
memset(RAM+0x100000,0,0x100000);
-
+
save_item(NAME(m_raster_enable));
save_item(NAME(m_nslasher_sound_irq));
save_item(NAME(m_irq_source));
@@ -3752,7 +3752,7 @@ DRIVER_INIT_MEMBER(deco32_state,tattass)
deco56_decrypt_gfx(machine(), "gfx1"); /* 141 */
deco56_decrypt_gfx(machine(), "gfx2"); /* 141 */
-
+
save_item(NAME(m_tattass_eprom_bit));
save_item(NAME(m_lastClock));
save_item(NAME(m_buffer));
@@ -3783,7 +3783,7 @@ DRIVER_INIT_MEMBER(deco32_state,nslasher)
deco156_decrypt(machine());
soundlatch_setclearedvalue(0xff);
-
+
save_item(NAME(m_nslasher_sound_irq));
/* The board for Night Slashers is very close to the Fighter's History and
diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c
index 83fb3f551a8..a4036476371 100644
--- a/src/mame/drivers/destroyr.c
+++ b/src/mame/drivers/destroyr.c
@@ -476,7 +476,7 @@ void destroyr_state::machine_start()
{
m_dial_timer = timer_alloc(TIMER_DESTROYR_DIAL);
m_frame_timer = timer_alloc(TIMER_DESTROYR_FRAME);
-
+
save_item(NAME(m_cursor));
save_item(NAME(m_wavemod));
save_item(NAME(m_attract));
diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c
index e1c1dff8fd3..f52bf38fe2a 100644
--- a/src/mame/drivers/dreamwld.c
+++ b/src/mame/drivers/dreamwld.c
@@ -353,8 +353,8 @@ UINT32 dreamwld_state::screen_update_dreamwld(screen_device &screen, bitmap_ind1
int x0 = 0, x1 = 0;
UINT16* linebase;
-
-
+
+
/* layer 0 */
linebase = &m_lineram16[0x000];
@@ -367,7 +367,7 @@ UINT32 dreamwld_state::screen_update_dreamwld(screen_device &screen, bitmap_ind1
else
/* per-line rowscroll */
x0 = linebase[(i+32)&0xff];
- }
+ }
tmptilemap0->set_scrollx(
(i + layer0_scrolly) & 0x3ff,
@@ -408,14 +408,14 @@ UINT32 dreamwld_state::screen_update_dreamwld(screen_device &screen, bitmap_ind1
READ32_MEMBER(dreamwld_state::dreamwld_protdata_r)
{
- //static int count = 0;
+ //static int count = 0;
UINT8 *protdata = memregion("user1")->base();
size_t protsize = memregion("user1")->bytes();
UINT8 dat = protdata[(m_protindex++) % protsize];
- //printf("protection read %04x %02x\n", count, dat);
- //count++;
+ //printf("protection read %04x %02x\n", count, dat);
+ //count++;
// real hw returns 00 after end of data, I haven't checked if it's possible to overflow the read counter
// and read out the internal rom.
@@ -1249,7 +1249,7 @@ ROM_END
GAME( 1997, baryon, 0, baryon, baryon, driver_device, 0, ROT270, "SemiCom / Tirano", "Baryon - Future Assault (set 1)", GAME_SUPPORTS_SAVE )
GAME( 1997, baryona, baryon, baryon, baryon, driver_device, 0, ROT270, "SemiCom / Tirano", "Baryon - Future Assault (set 2)", GAME_SUPPORTS_SAVE )
-GAME( 1998, cutefght, 0, dreamwld, cutefght, driver_device, 0, ROT0, "SemiCom", "Cute Fighter", GAME_SUPPORTS_SAVE )
+GAME( 1998, cutefght, 0, dreamwld, cutefght, driver_device, 0, ROT0, "SemiCom", "Cute Fighter", GAME_SUPPORTS_SAVE )
GAME( 1999, rolcrush, 0, baryon, rolcrush, driver_device, 0, ROT0, "Trust / SemiCom", "Rolling Crush (version 1.07.E - 1999/02/11)", GAME_SUPPORTS_SAVE )
GAME( 1999, gaialast, 0, baryon, gaialast, driver_device, 0, ROT0, "SemiCom / XESS", "Gaia - The Last Choice of Earth", GAME_SUPPORTS_SAVE )
GAME( 2000, dreamwld, 0, dreamwld, dreamwld, driver_device, 0, ROT0, "SemiCom", "Dream World", GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index 34af2d93529..fd3945e2b7f 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -4811,7 +4811,7 @@ static MACHINE_CONFIG_DERIVED( mjelctrn, hnoridur )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjembase, hnoridur )
- MCFG_CPU_MODIFY("maincpu") // TMPZ84015
+ MCFG_CPU_MODIFY("maincpu") // TMPZ84015
MCFG_CPU_PROGRAM_MAP(nanajign_mem_map)
MCFG_CPU_IO_MAP(mjembase_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dynax_state, mjelctrn_vblank_interrupt) /* IM 2 needs a vector on the data bus */
@@ -5456,7 +5456,7 @@ DRIVER_INIT_MEMBER(dynax_state,blktouch)
}
}
-
+
DRIVER_INIT_MEMBER(dynax_state, maya_common)
{
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index d126e31dbcf..03dfb533a06 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -227,7 +227,7 @@ READ32_MEMBER(firebeat_gcu_device::read)
switch (reg)
{
- case 0x78: // GCU Status
+ case 0x78: // GCU Status
/* ppd checks bits 0x0041 of the upper halfword on interrupt */
return 0xffff0005;
@@ -255,96 +255,96 @@ WRITE32_MEMBER(firebeat_gcu_device::write)
#endif
break;
- case 0x14: // ?
+ case 0x14: // ?
break;
- case 0x18: // ?
+ case 0x18: // ?
break;
- case 0x20: // Framebuffer 0 Origin(?)
+ case 0x20: // Framebuffer 0 Origin(?)
break;
- case 0x24: // Framebuffer 1 Origin(?)
+ case 0x24: // Framebuffer 1 Origin(?)
break;
- case 0x28: // Framebuffer 2 Origin(?)
+ case 0x28: // Framebuffer 2 Origin(?)
break;
- case 0x2c: // Framebuffer 3 Origin(?)
+ case 0x2c: // Framebuffer 3 Origin(?)
break;
- case 0x30: // Framebuffer 0 Dimensions
+ case 0x30: // Framebuffer 0 Dimensions
if (ACCESSING_BITS_16_31)
m_frame[0].height = (data >> 16) & 0xffff;
if (ACCESSING_BITS_0_15)
m_frame[0].width = data & 0xffff;
break;
- case 0x34: // Framebuffer 1 Dimensions
+ case 0x34: // Framebuffer 1 Dimensions
if (ACCESSING_BITS_16_31)
m_frame[1].height = (data >> 16) & 0xffff;
if (ACCESSING_BITS_0_15)
m_frame[1].width = data & 0xffff;
break;
- case 0x38: // Framebuffer 2 Dimensions
+ case 0x38: // Framebuffer 2 Dimensions
if (ACCESSING_BITS_16_31)
m_frame[2].height = (data >> 16) & 0xffff;
if (ACCESSING_BITS_0_15)
m_frame[2].width = data & 0xffff;
break;
- case 0x3c: // Framebuffer 3 Dimensions
+ case 0x3c: // Framebuffer 3 Dimensions
if (ACCESSING_BITS_16_31)
m_frame[3].height = (data >> 16) & 0xffff;
if (ACCESSING_BITS_0_15)
m_frame[3].width = data & 0xffff;
break;
- case 0x40: // Framebuffer 0 Base
+ case 0x40: // Framebuffer 0 Base
m_frame[0].base = data;
#if PRINT_GCU
printf("%s FB0 Base: %08X\n", basetag(), data);
#endif
break;
- case 0x44: // Framebuffer 1 Base
+ case 0x44: // Framebuffer 1 Base
m_frame[1].base = data;
#if PRINT_GCU
printf("%s FB1 Base: %08X\n", basetag(), data);
#endif
break;
- case 0x48: // Framebuffer 2 Base
+ case 0x48: // Framebuffer 2 Base
m_frame[2].base = data;
#if PRINT_GCU
printf("%s FB2 Base: %08X\n", basetag(), data);
#endif
break;
- case 0x4c: // Framebuffer 3 Base
+ case 0x4c: // Framebuffer 3 Base
m_frame[3].base = data;
#if PRINT_GCU
printf("%s FB3 Base: %08X\n", basetag(), data);
#endif
break;
- case 0x5c: // VRAM Read Address
+ case 0x5c: // VRAM Read Address
m_vram_read_addr = (data & 0xffffff) / 2;
break;
- case 0x60: // VRAM Port 0 Write Address
+ case 0x60: // VRAM Port 0 Write Address
m_vram_fifo0_addr = (data & 0xffffff) / 2;
break;
- case 0x68: // VRAM Port 0/1 Mode
+ case 0x68: // VRAM Port 0/1 Mode
if (ACCESSING_BITS_16_31)
m_vram_fifo0_mode = data >> 16;
if (ACCESSING_BITS_0_15)
m_vram_fifo1_mode = data & 0xffff;
break;
- case 0x70: // VRAM Port 0 Write FIFO
+ case 0x70: // VRAM Port 0 Write FIFO
if (m_vram_fifo0_mode & 0x100)
{
// write to command fifo
@@ -359,7 +359,7 @@ WRITE32_MEMBER(firebeat_gcu_device::write)
m_command_fifo0_ptr = 0;
}
}
- else
+ else
{
// write to VRAM fifo
m_vram[m_vram_fifo0_addr] = data;
@@ -367,12 +367,12 @@ WRITE32_MEMBER(firebeat_gcu_device::write)
}
break;
- case 0x64: // VRAM Port 1 Write Address
+ case 0x64: // VRAM Port 1 Write Address
m_vram_fifo1_addr = (data & 0xffffff) / 2;
printf("GCU FIFO1 addr = %08X\n", data);
break;
- case 0x74: // VRAM Port 1 Write FIFO
+ case 0x74: // VRAM Port 1 Write FIFO
printf("GCU FIFO1 write = %08X\n", data);
if (m_vram_fifo1_mode & 0x100)
@@ -388,7 +388,7 @@ WRITE32_MEMBER(firebeat_gcu_device::write)
m_command_fifo1_ptr = 0;
}
}
- else
+ else
{
// write to VRAM fifo
m_vram[m_vram_fifo1_addr] = data;
@@ -409,7 +409,7 @@ int firebeat_gcu_device::draw(screen_device &screen, bitmap_ind16 &bitmap, const
int x = 0;
int y = 0;
int width = m_frame[0].width;
- int height = m_frame[0].height;
+ int height = m_frame[0].height;
if (width != 0 && height != 0)
{
@@ -430,15 +430,15 @@ int firebeat_gcu_device::draw(screen_device &screen, bitmap_ind16 &bitmap, const
int li = ((j+y) * fb_pitch) + x;
UINT32 fbaddr0 = m_frame[0].base + li;
UINT32 fbaddr1 = m_frame[1].base + li;
-// UINT32 fbaddr2 = m_frame[2].base + li;
-// UINT32 fbaddr3 = m_frame[3].base + li;
+// UINT32 fbaddr2 = m_frame[2].base + li;
+// UINT32 fbaddr3 = m_frame[3].base + li;
for (int i=0; i < width; i++)
{
UINT16 pix0 = vram16[fbaddr0 ^ NATIVE_ENDIAN_VALUE_LE_BE(1,0)];
UINT16 pix1 = vram16[fbaddr1 ^ NATIVE_ENDIAN_VALUE_LE_BE(1,0)];
-// UINT16 pix2 = vram16[fbaddr2 ^ NATIVE_ENDIAN_VALUE_LE_BE(1,0)];
-// UINT16 pix3 = vram16[fbaddr3 ^ NATIVE_ENDIAN_VALUE_LE_BE(1,0)];
+// UINT16 pix2 = vram16[fbaddr2 ^ NATIVE_ENDIAN_VALUE_LE_BE(1,0)];
+// UINT16 pix3 = vram16[fbaddr3 ^ NATIVE_ENDIAN_VALUE_LE_BE(1,0)];
if (pix0 & 0x8000)
{
@@ -451,8 +451,8 @@ int firebeat_gcu_device::draw(screen_device &screen, bitmap_ind16 &bitmap, const
fbaddr0++;
fbaddr1++;
-// fbaddr2++;
-// fbaddr3++;
+// fbaddr2++;
+// fbaddr3++;
}
}
@@ -493,7 +493,7 @@ void firebeat_gcu_device::draw_object(UINT32 *cmd)
UINT32 address = cmd[0] & 0xffffff;
int alpha_level = (cmd[2] >> 27) & 0x1f;
bool relative_coords = (cmd[0] & 0x10000000) ? true : false;
-
+
if (relative_coords)
{
x += m_fb_origin_x;
@@ -522,7 +522,7 @@ void firebeat_gcu_device::draw_object(UINT32 *cmd)
int index;
int xinc;
UINT32 fbaddr = ((j+y) * fb_pitch) + x;
-
+
if (yflip)
{
index = address + ((height - 1 - (v >> 6)) * 1024);
@@ -592,7 +592,7 @@ void firebeat_gcu_device::draw_object(UINT32 *cmd)
void firebeat_gcu_device::fill_rect(UINT32 *cmd)
{
- // 0x00: xxx----- -------- -------- -------- command (4)
+ // 0x00: xxx----- -------- -------- -------- command (4)
// 0x00: ---x---- -------- -------- -------- 0: absolute coordinates
// 1: relative coordinates from framebuffer origin
// 0x00: ----xx-- -------- -------- -------- ?
@@ -742,30 +742,30 @@ void firebeat_gcu_device::execute_display_list(UINT32 addr)
switch (command)
{
- case 0: // NOP?
+ case 0: // NOP?
break;
- case 1: // Execute display list
+ case 1: // Execute display list
execute_display_list(cmd[0] & 0xffffff);
break;
- case 2: // End of display list
+ case 2: // End of display list
end = true;
break;
- case 3: // Framebuffer config
+ case 3: // Framebuffer config
fb_config(cmd);
break;
- case 4: // Fill rectangle
+ case 4: // Fill rectangle
fill_rect(cmd);
break;
- case 5: // Draw object
+ case 5: // Draw object
draw_object(cmd);
break;
- case 7: // Draw 8x8 character (2 bits per pixel)
+ case 7: // Draw 8x8 character (2 bits per pixel)
draw_character(cmd);
break;
@@ -787,29 +787,29 @@ void firebeat_gcu_device::execute_command(UINT32* cmd)
switch (command)
{
- case 0: // NOP?
+ case 0: // NOP?
break;
- case 1: // Execute display list
+ case 1: // Execute display list
execute_display_list(cmd[0] & 0xffffff);
break;
- case 2: // End of display list
+ case 2: // End of display list
break;
- case 3: // Framebuffer config
+ case 3: // Framebuffer config
fb_config(cmd);
break;
- case 4: // Fill rectangle
+ case 4: // Fill rectangle
fill_rect(cmd);
break;
- case 5: // Draw object
+ case 5: // Draw object
draw_object(cmd);
break;
- case 7: // Draw 8x8 character (2 bits per pixel)
+ case 7: // Draw 8x8 character (2 bits per pixel)
draw_character(cmd);
break;
@@ -851,7 +851,7 @@ void firebeat_gcu_device::device_stop()
printf("dumping %s\n", filename);
FILE *file = fopen(filename, "wb");
int i;
-
+
for (i=0; i < 0x2000000/4; i++)
{
fputc((m_vram[i] >> 24) & 0xff, file);
@@ -859,7 +859,7 @@ void firebeat_gcu_device::device_stop()
fputc((m_vram[i] >> 8) & 0xff, file);
fputc((m_vram[i] >> 0) & 0xff, file);
}
-
+
fclose(file);
#endif
}
@@ -1594,7 +1594,7 @@ READ32_MEMBER(firebeat_state::ppc_spu_share_r)
{
r |= m_spu_shared_ram[(offset * 4) + 3] << 0;
- if (offset == 0xff) // address 0x3ff clears PPC interrupt
+ if (offset == 0xff) // address 0x3ff clears PPC interrupt
{
m_maincpu->set_input_line(INPUT_LINE_IRQ3, CLEAR_LINE);
}
@@ -1621,7 +1621,7 @@ WRITE32_MEMBER(firebeat_state::ppc_spu_share_w)
{
m_spu_shared_ram[(offset * 4) + 2] = (data >> 8) & 0xff;
- if (offset == 0xff) // address 0x3fe triggers M68K interrupt
+ if (offset == 0xff) // address 0x3fe triggers M68K interrupt
{
m_audiocpu->set_input_line(INPUT_LINE_IRQ4, ASSERT_LINE);
}
@@ -1637,11 +1637,11 @@ WRITE32_MEMBER(firebeat_state::ppc_spu_share_w)
IRQ1: ?
IRQ2: Timer?
-
- IRQ4: Dual-port RAM mailbox (when PPC writes to 0x3FE)
- Handles commands from PPC (bytes 0x00 and 0x01)
-
- IRQ6: ATA
+
+ IRQ4: Dual-port RAM mailbox (when PPC writes to 0x3FE)
+ Handles commands from PPC (bytes 0x00 and 0x01)
+
+ IRQ6: ATA
*/
READ16_MEMBER(firebeat_state::m68k_spu_share_r)
@@ -1655,7 +1655,7 @@ READ16_MEMBER(firebeat_state::m68k_spu_share_r)
{
r |= m_spu_shared_ram[offset];
- if (offset == 0x3fe) // address 0x3fe clears M68K interrupt
+ if (offset == 0x3fe) // address 0x3fe clears M68K interrupt
{
m_audiocpu->set_input_line(INPUT_LINE_IRQ4, CLEAR_LINE);
}
@@ -1672,7 +1672,7 @@ WRITE16_MEMBER(firebeat_state::m68k_spu_share_w)
{
m_spu_shared_ram[offset] = data & 0xff;
- if (offset == 0x3ff) // address 0x3ff triggers PPC interrupt
+ if (offset == 0x3ff) // address 0x3ff triggers PPC interrupt
{
m_maincpu->set_input_line(INPUT_LINE_IRQ3, ASSERT_LINE);
}
@@ -1684,7 +1684,7 @@ READ16_MEMBER(firebeat_state::spu_unk_r)
// dipswitches?
UINT16 r = 0;
- r |= 0x80; // if set, uses ATA PIO mode, otherwise DMA
+ r |= 0x80; // if set, uses ATA PIO mode, otherwise DMA
return r;
}
@@ -1760,7 +1760,7 @@ static ADDRESS_MAP_START( spu_map, AS_PROGRAM, 16, firebeat_state )
AM_RANGE(0x280000, 0x2807ff) AM_READWRITE(m68k_spu_share_r, m68k_spu_share_w)
AM_RANGE(0x300000, 0x30000f) AM_DEVREADWRITE("spu_ata", ata_interface_device, read_cs0, write_cs0)
AM_RANGE(0x340000, 0x34000f) AM_DEVREADWRITE("spu_ata", ata_interface_device, read_cs1, write_cs1)
- AM_RANGE(0x400000, 0x400fff) AM_DEVREADWRITE("rf5c400", rf5c400_device, rf5c400_r, rf5c400_w)
+ AM_RANGE(0x400000, 0x400fff) AM_DEVREADWRITE("rf5c400", rf5c400_device, rf5c400_r, rf5c400_w)
ADDRESS_MAP_END
/*****************************************************************************/
@@ -2503,7 +2503,7 @@ ROM_END
// Beatmania III has a different BIOS and SPU program, and they aren't dumped yet
ROM_START( bm37th )
ROM_REGION32_BE(0x80000, "user1", 0)
- ROM_LOAD16_WORD_SWAP("974a03.21e", 0x00000, 0x80000, BAD_DUMP CRC(ef9a932d) SHA1(6299d3b9823605e519dbf1f105b59a09197df72f)) // boots with KBM BIOS
+ ROM_LOAD16_WORD_SWAP("974a03.21e", 0x00000, 0x80000, BAD_DUMP CRC(ef9a932d) SHA1(6299d3b9823605e519dbf1f105b59a09197df72f)) // boots with KBM BIOS
ROM_REGION(0xc0, "user2", ROMREGION_ERASE00) // Security dongle
ROM_LOAD( "gcb07-jc", 0x000000, 0x0000c0, CRC(16115b6a) SHA1(dcb2a3346973941a946b2cdfd31a5a761f666ca3) )
@@ -2522,7 +2522,7 @@ ROM_END
ROM_START( bm3final )
ROM_REGION32_BE(0x80000, "user1", 0)
- ROM_LOAD16_WORD_SWAP("974a03.21e", 0x00000, 0x80000, BAD_DUMP CRC(ef9a932d) SHA1(6299d3b9823605e519dbf1f105b59a09197df72f)) // boots with KBM BIOS
+ ROM_LOAD16_WORD_SWAP("974a03.21e", 0x00000, 0x80000, BAD_DUMP CRC(ef9a932d) SHA1(6299d3b9823605e519dbf1f105b59a09197df72f)) // boots with KBM BIOS
ROM_REGION(0xc0, "user2", ROMREGION_ERASE00) // Security dongle
ROM_LOAD( "gcc01-jc", 0x000000, 0x0000c0, CRC(9c49fed8) SHA1(212b87c1d25763117611ffb2a36ed568d429d2f4) )
diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c
index 8a712b371ad..bbfcb6e1f81 100644
--- a/src/mame/drivers/galaxian.c
+++ b/src/mame/drivers/galaxian.c
@@ -6523,7 +6523,6 @@ DRIVER_INIT_MEMBER(galaxian_state,scobra)
DRIVER_INIT_MEMBER(galaxian_state,scobrae)
{
-
UINT8 *rom = memregion("maincpu")->base();
int offs;
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c
index 8d538907b5e..a8ccf2bc2b4 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -994,7 +994,7 @@ DRIVER_INIT_MEMBER(gladiatr_state,gladiatr)
membank("bank1")->configure_entries(0, 2, memregion("maincpu")->base() + 0x10000, 0x6000);
membank("bank2")->configure_entries(0, 2, memregion("audiocpu")->base() + 0x10000, 0xc000);
-
+
/* make sure bank is valid in cpu-reset */
membank("bank2")->set_entry(0);
}
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index 51f9be4173d..812768d2489 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -181,7 +181,7 @@ Frequencies: 68k is XTAL_32MHZ/2
void gstriker_state::machine_start()
{
membank("soundbank")->configure_entries(0, 8, memregion("audiocpu")->base(), 0x8000);
-
+
save_item(NAME(m_dmmy_8f_ret));
save_item(NAME(m_pending_command));
}
@@ -1012,7 +1012,7 @@ void gstriker_state::mcu_init()
m_maincpu->space(AS_PROGRAM).install_write_handler(0x20008e, 0x20008f, write16_delegate(FUNC(gstriker_state::twrldc94_prot_reg_w),this));
m_maincpu->space(AS_PROGRAM).install_read_handler(0x20008e, 0x20008f, read16_delegate(FUNC(gstriker_state::twrldc94_prot_reg_r),this));
-
+
save_item(NAME(m_mcu_data));
save_item(NAME(m_prot_reg));
}
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index ee99b07888e..e3fb319819f 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -597,7 +597,7 @@ MACHINE_START_MEMBER(itech8_state,sstrike)
/* we need to update behind the beam as well */
m_behind_beam_update_timer = timer_alloc(TIMER_BEHIND_BEAM_UPDATE);
m_behind_beam_update_timer->adjust(m_screen->time_until_pos(0), 32);
-
+
itech8_state::machine_start();
}
@@ -605,7 +605,7 @@ void itech8_state::machine_start()
{
if (membank("bank1"))
membank("bank1")->configure_entries(0, 2, memregion("maincpu")->base() + 0x4000, 0xc000);
-
+
m_irq_off_timer = timer_alloc(TIMER_IRQ_OFF);
m_delayed_sound_data_timer = timer_alloc(TIMER_DELAYED_SOUND_DATA);
m_blitter_done_timer = timer_alloc(TIMER_BLITTER_DONE);
@@ -2611,7 +2611,7 @@ DRIVER_INIT_MEMBER(itech8_state,grmatch)
m_maincpu->space(AS_PROGRAM).install_write_handler(0x0160, 0x0160, write8_delegate(FUNC(itech8_state::grmatch_palette_w),this));
m_maincpu->space(AS_PROGRAM).install_write_handler(0x0180, 0x0180, write8_delegate(FUNC(itech8_state::grmatch_xscroll_w),this));
m_maincpu->space(AS_PROGRAM).unmap_write(0x01e0, 0x01ff);
-
+
save_item(NAME(m_grmatch_palcontrol));
save_item(NAME(m_grmatch_xscroll));
save_item(NAME(m_grmatch_palette));
@@ -2623,9 +2623,9 @@ DRIVER_INIT_MEMBER(itech8_state,slikshot)
m_maincpu->space(AS_PROGRAM).install_read_handler (0x0180, 0x0180, read8_delegate(FUNC(itech8_state::slikshot_z80_r),this));
m_maincpu->space(AS_PROGRAM).install_read_handler (0x01cf, 0x01cf, read8_delegate(FUNC(itech8_state::slikshot_z80_control_r),this));
m_maincpu->space(AS_PROGRAM).install_write_handler(0x01cf, 0x01cf, write8_delegate(FUNC(itech8_state::slikshot_z80_control_w),this));
-
+
m_delayed_z80_control_timer = timer_alloc(TIMER_DELAYED_Z80_CONTROL);
-
+
save_item(NAME(m_z80_ctrl));
save_item(NAME(m_z80_port_val));
save_item(NAME(m_z80_clear_to_send));
diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c
index 722865dbcc8..318ac995cd8 100644
--- a/src/mame/drivers/mazerbla.c
+++ b/src/mame/drivers/mazerbla.c
@@ -350,7 +350,7 @@ WRITE8_MEMBER(mazerbla_state::cfb_vbank_w)
WRITE8_MEMBER(mazerbla_state::cfb_rom_bank_sel_w)
{
m_gfx_rom_bank = data;
-
+
membank("bank1")->set_entry(m_gfx_rom_bank);
}
@@ -1381,7 +1381,7 @@ INTERRUPT_GEN_MEMBER(mazerbla_state::sound_interrupt)
void mazerbla_state::machine_start()
{
membank("bank1")->configure_entries(0, 256, memregion("sub2")->base() + 0x10000, 0x2000);
-
+
save_item(NAME(m_vcu_video_reg));
save_item(NAME(m_vcu_gfx_addr));
save_item(NAME(m_vcu_gfx_param_addr));
diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c
index b47b431d74e..59324322f02 100644
--- a/src/mame/drivers/mcr3.c
+++ b/src/mame/drivers/mcr3.c
@@ -2035,7 +2035,7 @@ GAMEL(1983, spyhunt, 0, mcrsc_csd, spyhunt, mcr3_state, spyhunt, ROT9
GAMEL(1983, spyhuntp, spyhunt, mcrsc_csd, spyhunt, mcr3_state, spyhunt, ROT90, "Bally Midway (Playtronic license)", "Spy Hunter (Playtronic license)", GAME_SUPPORTS_SAVE, layout_spyhunt )
GAME( 1984, crater, 0, mcrscroll, crater, mcr3_state, crater, ORIENTATION_FLIP_X, "Bally Midway", "Crater Raider", GAME_SUPPORTS_SAVE )
GAMEL(1985, turbotag, 0, mcrsc_csd, turbotag, mcr3_state, turbotag, ROT90, "Bally Midway", "Turbo Tag (prototype)", GAME_SUPPORTS_SAVE, layout_turbotag )
-
+
// very different hardware, probably bootleg despite the license text printed on the PCB, similar to '1942p' in 1942.c. Probably should be put in separate driver.
// PCB made by Tecfri for Recreativos Franco S.A. in Spain, has Bally Midway logo, and licensing text on the PCB. Board is dated '85' so seems to be a low-cost rebuild? it is unclear if it made it to market.
GAME (1983, spyhuntpr,spyhunt, spyhuntpr, spyhuntpr,mcr3_state, spyhuntpr,ROT90, "Bally Midway (Recreativos Franco S.A. license)", "Spy Hunter (Spain, Tecfri / Recreativos Franco S.A. PCB)", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/midyunit.c b/src/mame/drivers/midyunit.c
index 523b7bedaab..ed939e65f86 100644
--- a/src/mame/drivers/midyunit.c
+++ b/src/mame/drivers/midyunit.c
@@ -2670,16 +2670,16 @@ Notes:
*************************************************************************/
// same as mkyawdim3, but with its own main program roms
-ROM_START( mkyawdim4 )
+ROM_START( mkyawdim4 )
ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound CPU */
- ROM_LOAD( "14.bin", 0x00000, 0x10000, CRC(b58d229e) SHA1(3ed14ef650dfa7f9d460611b19e9233a022cbea6) )
+ ROM_LOAD( "14.bin", 0x00000, 0x10000, CRC(b58d229e) SHA1(3ed14ef650dfa7f9d460611b19e9233a022cbea6) )
ROM_REGION( 0x100000, "oki", 0 ) /* ADPCM */
- ROM_LOAD( "15.bin", 0x00000, 0x20000, CRC(921c613d) SHA1(be62b87f195b6347112ab13cc14514d4c88a8b86) )
+ ROM_LOAD( "15.bin", 0x00000, 0x20000, CRC(921c613d) SHA1(be62b87f195b6347112ab13cc14514d4c88a8b86) )
ROM_RELOAD( 0x40000, 0x20000 )
ROM_RELOAD( 0x80000, 0x20000 )
ROM_RELOAD( 0xc0000, 0x20000 )
- ROM_LOAD( "16.bin", 0x20000, 0x20000, CRC(6e68e0b0) SHA1(edb7aa6507452ffa5ce7097e3b1855a69542971c) )
+ ROM_LOAD( "16.bin", 0x20000, 0x20000, CRC(6e68e0b0) SHA1(edb7aa6507452ffa5ce7097e3b1855a69542971c) )
ROM_CONTINUE( 0x60000, 0x20000 )
ROM_CONTINUE( 0xa0000, 0x20000 )
ROM_CONTINUE( 0xe0000, 0x20000 )
@@ -2687,25 +2687,25 @@ ROM_START( mkyawdim4 )
ROM_REGION16_LE( 0x100000, "user1", 0 ) /* 34010 code */
ROM_LOAD16_BYTE( "17.bin", 0x00000, 0x80000, CRC(671b533d) SHA1(20859ceb0635126047216f85a6e35072e14766ad) )
ROM_LOAD16_BYTE( "18.bin", 0x00001, 0x80000, CRC(4e857747) SHA1(b94c7d5e4356ac6890e6bfaf75c76d94408e5bc5) )
-// ROM_LOAD16_BYTE( "17.bin", 0x00000, 0x80000, CRC(b12b3bf2) SHA1(deb7755e8407d9de25124b3fdbc4c834a25d8252) ) // other PCB: mkyawdim3 with mkyawdim main program
-// ROM_LOAD16_BYTE( "18.bin", 0x00001, 0x80000, CRC(7a37dc5c) SHA1(c4fc6933d8b990c5c56c65282b1f72b90b5d5435) )
+// ROM_LOAD16_BYTE( "17.bin", 0x00000, 0x80000, CRC(b12b3bf2) SHA1(deb7755e8407d9de25124b3fdbc4c834a25d8252) ) // other PCB: mkyawdim3 with mkyawdim main program
+// ROM_LOAD16_BYTE( "18.bin", 0x00001, 0x80000, CRC(7a37dc5c) SHA1(c4fc6933d8b990c5c56c65282b1f72b90b5d5435) )
ROM_REGION( 0x800000, "gfx1", 0 )
- ROM_LOAD( "22.bin", 0x000000, 0x80000, CRC(d17096c4) SHA1(01ef390a372c9d94adf138f9543ebb88b89f4c38) )
- ROM_LOAD( "21.bin", 0x080000, 0x80000, CRC(993bc2e4) SHA1(7791edbec2b4b8971a3e790346dd7564ecf16d5c) )
- ROM_LOAD( "20.bin", 0x100000, 0x80000, CRC(6fb91ede) SHA1(a3735b49f93b08c44fbc97e2b5aad394628fbe90) )
- ROM_LOAD( "19.bin", 0x180000, 0x80000, CRC(ed1ff88a) SHA1(6b090b658ee6148af953bd0c9216f37162b6460f) )
-
- ROM_LOAD( "26.bin", 0x200000, 0x80000, CRC(a002a155) SHA1(3cf7909e92bcd428063596fc5b9953e0000d6eca) )
- ROM_LOAD( "25.bin", 0x280000, 0x80000, CRC(dcee8492) SHA1(a912b74d3b26ebd1b1613cc631080f83ececeaf8) )
- ROM_LOAD( "24.bin", 0x300000, 0x80000, CRC(de88caef) SHA1(a7927b504dc56ca5c9048373977fe5743b0a3f0b) )
- ROM_LOAD( "23.bin", 0x380000, 0x80000, CRC(37eb01b4) SHA1(06092460bd137e08d0f8df8560942ed877d40e09) )
-
- ROM_LOAD( "30.bin", 0x400000, 0x80000, CRC(45acaf21) SHA1(5edd36c55f4e5d3c74fb85171728ec0a58284b12) )
- ROM_LOAD( "29.bin", 0x480000, 0x80000, CRC(2a6c10a0) SHA1(cc90923c44f2961b945a0fd0f85ecc2ba04af2cb) )
- ROM_LOAD( "28.bin", 0x500000, 0x80000, CRC(23308979) SHA1(0b36788624a1cf0d3f4c895be5ba967b8dfcf85e) )
- ROM_LOAD( "27.bin", 0x580000, 0x80000, CRC(cafc47bb) SHA1(8610af6e52f7089ff4acd850c53ab8b4119e4445) )
-ROM_END
+ ROM_LOAD( "22.bin", 0x000000, 0x80000, CRC(d17096c4) SHA1(01ef390a372c9d94adf138f9543ebb88b89f4c38) )
+ ROM_LOAD( "21.bin", 0x080000, 0x80000, CRC(993bc2e4) SHA1(7791edbec2b4b8971a3e790346dd7564ecf16d5c) )
+ ROM_LOAD( "20.bin", 0x100000, 0x80000, CRC(6fb91ede) SHA1(a3735b49f93b08c44fbc97e2b5aad394628fbe90) )
+ ROM_LOAD( "19.bin", 0x180000, 0x80000, CRC(ed1ff88a) SHA1(6b090b658ee6148af953bd0c9216f37162b6460f) )
+
+ ROM_LOAD( "26.bin", 0x200000, 0x80000, CRC(a002a155) SHA1(3cf7909e92bcd428063596fc5b9953e0000d6eca) )
+ ROM_LOAD( "25.bin", 0x280000, 0x80000, CRC(dcee8492) SHA1(a912b74d3b26ebd1b1613cc631080f83ececeaf8) )
+ ROM_LOAD( "24.bin", 0x300000, 0x80000, CRC(de88caef) SHA1(a7927b504dc56ca5c9048373977fe5743b0a3f0b) )
+ ROM_LOAD( "23.bin", 0x380000, 0x80000, CRC(37eb01b4) SHA1(06092460bd137e08d0f8df8560942ed877d40e09) )
+
+ ROM_LOAD( "30.bin", 0x400000, 0x80000, CRC(45acaf21) SHA1(5edd36c55f4e5d3c74fb85171728ec0a58284b12) )
+ ROM_LOAD( "29.bin", 0x480000, 0x80000, CRC(2a6c10a0) SHA1(cc90923c44f2961b945a0fd0f85ecc2ba04af2cb) )
+ ROM_LOAD( "28.bin", 0x500000, 0x80000, CRC(23308979) SHA1(0b36788624a1cf0d3f4c895be5ba967b8dfcf85e) )
+ ROM_LOAD( "27.bin", 0x580000, 0x80000, CRC(cafc47bb) SHA1(8610af6e52f7089ff4acd850c53ab8b4119e4445) )
+ROM_END
diff --git a/src/mame/drivers/mmagic.c b/src/mame/drivers/mmagic.c
index 920c7d93a62..c6cd987adeb 100644
--- a/src/mame/drivers/mmagic.c
+++ b/src/mame/drivers/mmagic.c
@@ -2,48 +2,48 @@
// copyright-holders:Dirk Best
/***************************************************************************
- "Monkey Magic" © 1979 Nintendo
+ "Monkey Magic" ?? 1979 Nintendo
- Dumping info provided by Andrew Welburn:
+ Dumping info provided by Andrew Welburn:
- TZF-MP - Main Board
- TZF-SOU - Sound Board
+ TZF-MP - Main Board
+ TZF-SOU - Sound Board
- # device Label PCB filename
- -------------------------------------------
- 4 i2708 1AI* 2A 1AI.2A
- 5 i2708 2AI* 3A 2AI.3A
- 6 i2708 3AI* 4A 3AI.4A
- 7 i2708 4AI* 4/5A 4AI.45A
- 8 i2708 5AI* 5A 5AI.5A
+ # device Label PCB filename
+ -------------------------------------------
+ 4 i2708 1AI* 2A 1AI.2A
+ 5 i2708 2AI* 3A 2AI.3A
+ 6 i2708 3AI* 4A 3AI.4A
+ 7 i2708 4AI* 4/5A 4AI.45A
+ 8 i2708 5AI* 5A 5AI.5A
- 22 H7641 6H 6HI 6H.6HI
- 23 ?? ** 7H 7HI 7H.7HI
- 24 H7641 6J 6JK 6J.6JK
- 25 H7641 6H*** 7JK
+ 22 H7641 6H 6HI 6H.6HI
+ 23 ?? ** 7H 7HI 7H.7HI
+ 24 H7641 6J 6JK 6J.6JK
+ 25 H7641 6H*** 7JK
- * Note that there is a Kana character 'I' in romaji on the end of the labels, not an I.
+ * Note that there is a Kana character 'I' in romaji on the end of the labels, not an I.
- ** Note this device was plastic and not ceramic, but it was dumped as a Harris 7641 as
- it is logical that its compatible with the 7641. I can see the other devices all have
- similar/same Harris markings in the bottom left of the IC obscured by the labels.
+ ** Note this device was plastic and not ceramic, but it was dumped as a Harris 7641 as
+ it is logical that its compatible with the 7641. I can see the other devices all have
+ similar/same Harris markings in the bottom left of the IC obscured by the labels.
- *** Note that the label for the 7643 PROM at IC25 was almost scraped off, but by its position
- in the sequence, it has to be 6H. I removed a little more of the label in order to
- work out what the inking was on it below, turned out to be 'D-2'. the prom at IC22 also
- looks like it has an inked number under the paper label, just peeking through on one side.
- Without removing the paper labels entirely, these markings wont be fully known, but were
- covered for some reason.
+ *** Note that the label for the 7643 PROM at IC25 was almost scraped off, but by its position
+ in the sequence, it has to be 6H. I removed a little more of the label in order to
+ work out what the inking was on it below, turned out to be 'D-2'. the prom at IC22 also
+ looks like it has an inked number under the paper label, just peeking through on one side.
+ Without removing the paper labels entirely, these markings wont be fully known, but were
+ covered for some reason.
- SPECS:
+ SPECS:
- - CPU is an NEC D8085A
- - Crystal is marked 6.1440, but this looks to have been replaced.
- - X1/X2 clock frequency measured at pins 1 + 2 is 6.14330 mhz
- - Test point with stable readings is :
- - TP4 (HS) = 15.9982 khz (Horizontal sync)
- - TP5 (VS) = 60.5992 hz (Vertical Sync)
+ - CPU is an NEC D8085A
+ - Crystal is marked 6.1440, but this looks to have been replaced.
+ - X1/X2 clock frequency measured at pins 1 + 2 is 6.14330 mhz
+ - Test point with stable readings is :
+ - TP4 (HS) = 15.9982 khz (Horizontal sync)
+ - TP5 (VS) = 60.5992 hz (Vertical Sync)
***************************************************************************/
@@ -270,7 +270,7 @@ void mmagic_state::machine_start()
static MACHINE_CONFIG_START( mmagic, mmagic_state )
// basic machine hardware
- MCFG_CPU_ADD("maincpu", I8085A, XTAL_6_144MHz) // NEC D8085A
+ MCFG_CPU_ADD("maincpu", I8085A, XTAL_6_144MHz) // NEC D8085A
MCFG_CPU_PROGRAM_MAP(mmagic_mem)
MCFG_CPU_IO_MAP(mmagic_io)
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index d83eb262f99..08c4ea9d76e 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -6062,4 +6062,4 @@ GAME( 1999, ecap, eca, model3_21_5881, eca, model3_state, eca,
#if (defined(__MINGW32__) && (__GNUC__ >= 5))
#pragma GCC diagnostic pop
-#endif \ No newline at end of file
+#endif
diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c
index 3bfd04c7092..2794cd98ba1 100644
--- a/src/mame/drivers/namcona1.c
+++ b/src/mame/drivers/namcona1.c
@@ -694,7 +694,7 @@ void namcona1_state::machine_start()
m_maskrom = (UINT16 *)memregion("maskrom")->base();
m_mEnableInterrupts = 0;
m_c140->set_base(m_workram);
-
+
save_item(NAME(m_mEnableInterrupts));
save_item(NAME(m_count));
save_item(NAME(m_mcu_mailbox));
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index a27cd8d3a03..9d9f6fcaafe 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -1422,7 +1422,7 @@ Notes:
XC9536 - Xilinx XC9536XL in-system programmable CPLD (PLCC44), stamped JULIE_DEV
XC2S30 - Xilinx XC2S30 Spartan-II FPGA (TQFP144), Rumble Fish 2 have printed sticker A08
17S30 - Xilinx 17S30APC OTP Configuration PROM, stamped SXFLS
- IC12-IC27 - Fujitsu MBM29DL640E 64M TSOP48 flash ROMs
+ IC12-IC27 - Fujitsu MBM29DL640E 64M TSOP48 flash ROMs
Network Board
@@ -9388,4 +9388,3 @@ GAME( 2009, basschal, awbios, aw2c, aw2c, naomi_state, atomiswave, ROT0, "Sega
#if (defined(__MINGW32__) && (__GNUC__ >= 5))
#pragma GCC diagnostic pop
#endif
-
diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c
index 0b974aa43e7..e24fae3ff79 100644
--- a/src/mame/drivers/naughtyb.c
+++ b/src/mame/drivers/naughtyb.c
@@ -832,7 +832,7 @@ DRIVER_INIT_MEMBER(naughtyb_state,popflame)
m_maincpu->space(AS_PROGRAM).install_read_handler(0x9090, 0x9090, read8_delegate(FUNC(naughtyb_state::popflame_protection_r),this));
m_maincpu->space(AS_PROGRAM).install_write_handler(0xb000, 0xb0ff, write8_delegate(FUNC(naughtyb_state::popflame_protection_w),this));
-
+
save_item(NAME(m_popflame_prot_seed));
save_item(NAME(m_r_index));
save_item(NAME(m_prot_count));
@@ -864,7 +864,7 @@ DRIVER_INIT_MEMBER(naughtyb_state,trvmstr)
{
/* install questions' handlers */
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xc000, 0xc002, read8_delegate(FUNC(naughtyb_state::trvmstr_questions_r),this), write8_delegate(FUNC(naughtyb_state::trvmstr_questions_w),this));
-
+
save_item(NAME(m_question_offset));
}
diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c
index 02a881ccccb..2310f80e10b 100644
--- a/src/mame/drivers/nbmj9195.c
+++ b/src/mame/drivers/nbmj9195.c
@@ -32,7 +32,7 @@ Notes:
void nbmj9195_state::machine_start()
{
membank("soundbank")->configure_entries(0, 4, memregion("audiocpu")->base() + 0x8000, 0x8000);
-
+
save_item(NAME(m_inputport));
save_item(NAME(m_dipswbitsel));
save_item(NAME(m_outcoin_flag));
diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c
index b2d060762fe..06d8a343e85 100644
--- a/src/mame/drivers/nycaptor.c
+++ b/src/mame/drivers/nycaptor.c
@@ -743,7 +743,7 @@ void nycaptor_state::machine_start()
membank("bank1")->configure_entries(0, 2, memregion("maincpu")->base() + 0x10000, 0x4000);
else
membank("bank1")->configure_entries(0, 4, memregion("maincpu")->base() + 0x10000, 0x4000);
-
+
save_item(NAME(m_generic_control_reg));
save_item(NAME(m_sound_nmi_enable));
save_item(NAME(m_pending_nmi));
diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c
index 2e0a7bf2cc9..c007d5bf17f 100644
--- a/src/mame/drivers/pcktgal.c
+++ b/src/mame/drivers/pcktgal.c
@@ -212,7 +212,7 @@ void pcktgal_state::machine_start()
membank("bank1")->configure_entries(0, 2, memregion("maincpu")->base() + 0x4000, 0xc000);
membank("bank2")->configure_entries(0, 2, memregion("maincpu")->base() + 0x6000, 0xc000);
membank("bank3")->configure_entries(0, 2, memregion("audiocpu")->base() + 0x10000, 0x4000);
-
+
save_item(NAME(m_msm5205next));
save_item(NAME(m_toggle));
}
diff --git a/src/mame/drivers/photon2.c b/src/mame/drivers/photon2.c
index 1d9d9f9d1ae..45cac079d0d 100644
--- a/src/mame/drivers/photon2.c
+++ b/src/mame/drivers/photon2.c
@@ -105,7 +105,7 @@ void photon2_state::video_start()
{
m_spectrum_frame_number = 0;
m_spectrum_flash_invert = 0;
-
+
save_item(NAME(m_spectrum_frame_number));
save_item(NAME(m_spectrum_flash_invert));
save_item(NAME(m_spectrum_port_fe));
@@ -329,7 +329,7 @@ void photon2_state::machine_start()
{
membank("mainbank")->configure_entries(0, 4, memregion("maincpu")->base(), 0x4000);
membank("mainbank")->set_entry(0);
-
+
save_item(NAME(m_nmi_enable));
}
diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c
index b8794ba80bc..57ebb08cc3d 100644
--- a/src/mame/drivers/poolshrk.c
+++ b/src/mame/drivers/poolshrk.c
@@ -41,7 +41,7 @@ DRIVER_INIT_MEMBER(poolshrk_state,poolshrk)
pSprite += 4;
}
}
-
+
save_item(NAME(m_da_latch));
}
diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c
index b548f2b98bd..cd0053866bf 100644
--- a/src/mame/drivers/rainbow.c
+++ b/src/mame/drivers/rainbow.c
@@ -724,7 +724,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( jumpingi, jumping )
MCFG_CPU_REPLACE("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(jumping_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", rbisland_state, irq4_line_hold)
+ MCFG_CPU_VBLANK_INT_DRIVER("screen", rbisland_state, irq4_line_hold)
MACHINE_CONFIG_END
/***************************************************************************
@@ -902,46 +902,46 @@ ROM_END
/* red 'Imnoe' PCB */
ROM_START( jumpingi )
- ROM_REGION( 0xa0000, "maincpu", 0 )
- ROM_LOAD16_BYTE( "05.IC3", 0x00000, 0x20000, CRC(69ac4af4) SHA1(39055573e412e2591f7a68f9fee5919528529544) )
- ROM_LOAD16_BYTE( "03.IC6", 0x00001, 0x20000, CRC(38975cdc) SHA1(23c02a4574a95904805d5f458c06c77c14d11c14) )
- ROM_LOAD16_BYTE( "06.IC2", 0x40000, 0x20000, CRC(3ebb0fb8) SHA1(1b41b305623d121255eb70cb992e4d9da13abd82) ) // b22-03.23
- ROM_LOAD16_BYTE( "04.IC5", 0x40001, 0x20000, CRC(91625e7f) SHA1(765afd973d9b82bb496b04beca284bf2769d6e6f) ) // b22-04.24
- ROM_LOAD16_BYTE( "02", 0x80001, 0x10000, CRC(0810d327) SHA1(fe91ac02e617bde413dc8a20b7cbcaf3e20aeb28) ) /* c-chip substitute */
-
- ROM_REGION( 0x14000, "audiocpu", 0 )
- ROM_LOAD( "01.IC53", 0x00000, 0x8000, CRC(8527c00e) SHA1(86e3824caca39aca4ca4df63bb4474adacfc4c53) )
- ROM_CONTINUE( 0x10000, 0x4000 )
- ROM_CONTINUE( 0x0c000, 0x4000 )
-
- ROM_REGION( 0x80000, "gfx1", 0 )
- ROM_LOAD( "13.IC8", 0x00000, 0x10000, CRC(65b76309) SHA1(1e345726e137f4c56d4bf239651c986fd53a16c3) ) /* tiles */
- ROM_LOAD( "14.IC7", 0x10000, 0x10000, CRC(43a94283) SHA1(d6a05cbc7b996a8e7f1520563f6fada9a59021a4) )
- ROM_LOAD( "11.IC10", 0x20000, 0x10000, CRC(e61933fb) SHA1(02bc0e1a7a3ce9e15fb83b28ce8fafb0b8d80ebd) )
- ROM_LOAD( "12.IC9", 0x30000, 0x10000, CRC(ed031eb2) SHA1(905be4d890ff7bb8a4d8ad85b2a11483fb4d67eb) )
- ROM_LOAD( "09.IC12", 0x40000, 0x10000, CRC(312700ca) SHA1(c79edc9c25f364d0afd79aaa21cfe2fe46044314) )
- ROM_LOAD( "10.IC11", 0x50000, 0x10000, CRC(de3b0b88) SHA1(14b8871821e4c0abbb9967c5aa282cf4e67884fe) )
- ROM_LOAD( "07.IC14", 0x60000, 0x10000, CRC(9fdc6c8e) SHA1(ff4e1a98dc982bce2f9d235cac62c7166f477f64) )
- ROM_LOAD( "08.IC13", 0x70000, 0x10000, CRC(06226492) SHA1(834280ec49e61a0c9c6b6fe2033e1b20bd1bffbf) )
-
- ROM_REGION( 0xa0000, "gfx2", ROMREGION_INVERT )
- ROM_LOAD( "15.IC62", 0x00000, 0x10000, CRC(8548db6c) SHA1(675cd301259d5ed16098a38ac58b27b5ccd91264) ) /* sprites */
- ROM_LOAD( "19.IC61", 0x10000, 0x10000, CRC(89b3d8ee) SHA1(8491de6e8292e58b9a8696be15827bcb1ea42845) )
- ROM_LOAD( "23.IC60", 0x20000, 0x08000, CRC(662a2f1e) SHA1(1c5e8b1f0623e64faf9cd60f9653fc5957191a9b) )
- ROM_LOAD( "16.IC78", 0x28000, 0x10000, CRC(925865e1) SHA1(457de50bc03e8b949ac7d46ae4188201e87574a8) )
- ROM_LOAD( "20.IC77", 0x38000, 0x10000, CRC(b09695d1) SHA1(e6d315f9befb7b47f42668d573a1102e52d78aea) )
- ROM_LOAD( "24.IC76", 0x48000, 0x08000, CRC(41937743) SHA1(890c832a7cf87e6fe749d4824b02d57e10872bdf) )
- ROM_LOAD( "17.IC93", 0x50000, 0x10000, CRC(f644eeab) SHA1(9d45e9dfb08e8c90b4b10f5dc383fa4732161a81) )
- ROM_LOAD( "21.IC92", 0x60000, 0x10000, CRC(16e1b0ff) SHA1(1467a317d07a447d01113e6b6b9f5aca30cb0dcb) )
- ROM_LOAD( "25.IC91", 0x70000, 0x08000, CRC(d886c014) SHA1(9327c332c98a81451e9e0624344d2601ef06e490) )
- ROM_LOAD( "18.IC121", 0x78000, 0x10000, CRC(93df1e4d) SHA1(b100d265b973254ec9cd44b6c32f62b4bac3b732) )
- ROM_LOAD( "22.IC120", 0x88000, 0x10000, CRC(7c4e893b) SHA1(eceecb38554157ee24d228a2c722dad750a6a07d) )
- ROM_LOAD( "26.IC119", 0x98000, 0x08000, CRC(7e1d58d8) SHA1(d586a018c3ec3e6e6a39992170d324361e03c68a) )
-
- ROM_REGION( 0x200, "pals", 0 )
- ROM_LOAD( "JP2.IC56", 0x000, 0x104, CRC(12e9a7b8) SHA1(a0ce8b6083c9adfcb4bdbca87f63a01f292525f3) ) // PAL16R6A-2CN
- ROM_LOAD( "JP1.IC13", 0x000, 0x144, CRC(76944f81) SHA1(ab78e4e157ffdc13aea5dc360268b2640e60d19c) ) // PAL20L8A-2CNS
- ROM_LOAD( "JP3.IC51", 0x000, 0x104, CRC(c1e6cb8f) SHA1(9908e62bb9b806047b7a344bb62334bd696b9fc8) ) // PAL16L8A-2CN z80 address decoder?
+ ROM_REGION( 0xa0000, "maincpu", 0 )
+ ROM_LOAD16_BYTE( "05.IC3", 0x00000, 0x20000, CRC(69ac4af4) SHA1(39055573e412e2591f7a68f9fee5919528529544) )
+ ROM_LOAD16_BYTE( "03.IC6", 0x00001, 0x20000, CRC(38975cdc) SHA1(23c02a4574a95904805d5f458c06c77c14d11c14) )
+ ROM_LOAD16_BYTE( "06.IC2", 0x40000, 0x20000, CRC(3ebb0fb8) SHA1(1b41b305623d121255eb70cb992e4d9da13abd82) ) // b22-03.23
+ ROM_LOAD16_BYTE( "04.IC5", 0x40001, 0x20000, CRC(91625e7f) SHA1(765afd973d9b82bb496b04beca284bf2769d6e6f) ) // b22-04.24
+ ROM_LOAD16_BYTE( "02", 0x80001, 0x10000, CRC(0810d327) SHA1(fe91ac02e617bde413dc8a20b7cbcaf3e20aeb28) ) /* c-chip substitute */
+
+ ROM_REGION( 0x14000, "audiocpu", 0 )
+ ROM_LOAD( "01.IC53", 0x00000, 0x8000, CRC(8527c00e) SHA1(86e3824caca39aca4ca4df63bb4474adacfc4c53) )
+ ROM_CONTINUE( 0x10000, 0x4000 )
+ ROM_CONTINUE( 0x0c000, 0x4000 )
+
+ ROM_REGION( 0x80000, "gfx1", 0 )
+ ROM_LOAD( "13.IC8", 0x00000, 0x10000, CRC(65b76309) SHA1(1e345726e137f4c56d4bf239651c986fd53a16c3) ) /* tiles */
+ ROM_LOAD( "14.IC7", 0x10000, 0x10000, CRC(43a94283) SHA1(d6a05cbc7b996a8e7f1520563f6fada9a59021a4) )
+ ROM_LOAD( "11.IC10", 0x20000, 0x10000, CRC(e61933fb) SHA1(02bc0e1a7a3ce9e15fb83b28ce8fafb0b8d80ebd) )
+ ROM_LOAD( "12.IC9", 0x30000, 0x10000, CRC(ed031eb2) SHA1(905be4d890ff7bb8a4d8ad85b2a11483fb4d67eb) )
+ ROM_LOAD( "09.IC12", 0x40000, 0x10000, CRC(312700ca) SHA1(c79edc9c25f364d0afd79aaa21cfe2fe46044314) )
+ ROM_LOAD( "10.IC11", 0x50000, 0x10000, CRC(de3b0b88) SHA1(14b8871821e4c0abbb9967c5aa282cf4e67884fe) )
+ ROM_LOAD( "07.IC14", 0x60000, 0x10000, CRC(9fdc6c8e) SHA1(ff4e1a98dc982bce2f9d235cac62c7166f477f64) )
+ ROM_LOAD( "08.IC13", 0x70000, 0x10000, CRC(06226492) SHA1(834280ec49e61a0c9c6b6fe2033e1b20bd1bffbf) )
+
+ ROM_REGION( 0xa0000, "gfx2", ROMREGION_INVERT )
+ ROM_LOAD( "15.IC62", 0x00000, 0x10000, CRC(8548db6c) SHA1(675cd301259d5ed16098a38ac58b27b5ccd91264) ) /* sprites */
+ ROM_LOAD( "19.IC61", 0x10000, 0x10000, CRC(89b3d8ee) SHA1(8491de6e8292e58b9a8696be15827bcb1ea42845) )
+ ROM_LOAD( "23.IC60", 0x20000, 0x08000, CRC(662a2f1e) SHA1(1c5e8b1f0623e64faf9cd60f9653fc5957191a9b) )
+ ROM_LOAD( "16.IC78", 0x28000, 0x10000, CRC(925865e1) SHA1(457de50bc03e8b949ac7d46ae4188201e87574a8) )
+ ROM_LOAD( "20.IC77", 0x38000, 0x10000, CRC(b09695d1) SHA1(e6d315f9befb7b47f42668d573a1102e52d78aea) )
+ ROM_LOAD( "24.IC76", 0x48000, 0x08000, CRC(41937743) SHA1(890c832a7cf87e6fe749d4824b02d57e10872bdf) )
+ ROM_LOAD( "17.IC93", 0x50000, 0x10000, CRC(f644eeab) SHA1(9d45e9dfb08e8c90b4b10f5dc383fa4732161a81) )
+ ROM_LOAD( "21.IC92", 0x60000, 0x10000, CRC(16e1b0ff) SHA1(1467a317d07a447d01113e6b6b9f5aca30cb0dcb) )
+ ROM_LOAD( "25.IC91", 0x70000, 0x08000, CRC(d886c014) SHA1(9327c332c98a81451e9e0624344d2601ef06e490) )
+ ROM_LOAD( "18.IC121", 0x78000, 0x10000, CRC(93df1e4d) SHA1(b100d265b973254ec9cd44b6c32f62b4bac3b732) )
+ ROM_LOAD( "22.IC120", 0x88000, 0x10000, CRC(7c4e893b) SHA1(eceecb38554157ee24d228a2c722dad750a6a07d) )
+ ROM_LOAD( "26.IC119", 0x98000, 0x08000, CRC(7e1d58d8) SHA1(d586a018c3ec3e6e6a39992170d324361e03c68a) )
+
+ ROM_REGION( 0x200, "pals", 0 )
+ ROM_LOAD( "JP2.IC56", 0x000, 0x104, CRC(12e9a7b8) SHA1(a0ce8b6083c9adfcb4bdbca87f63a01f292525f3) ) // PAL16R6A-2CN
+ ROM_LOAD( "JP1.IC13", 0x000, 0x144, CRC(76944f81) SHA1(ab78e4e157ffdc13aea5dc360268b2640e60d19c) ) // PAL20L8A-2CNS
+ ROM_LOAD( "JP3.IC51", 0x000, 0x104, CRC(c1e6cb8f) SHA1(9908e62bb9b806047b7a344bb62334bd696b9fc8) ) // PAL16L8A-2CN z80 address decoder?
ROM_END
DRIVER_INIT_MEMBER(rbisland_state,rbisland)
diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c
index ee2d6004428..82f54480e44 100644
--- a/src/mame/drivers/sbowling.c
+++ b/src/mame/drivers/sbowling.c
@@ -100,7 +100,7 @@ static void plot_pixel_sbw(bitmap_ind16 *tmpbitmap, int x, int y, int col, int f
y = 255-y;
x = 247-x;
}
-
+
tmpbitmap->pix16(y, x) = col;
}
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index 7c509fd6302..f07144621f4 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -2486,7 +2486,7 @@ static MACHINE_CONFIG_FRAGMENT( system32 )
MCFG_RF5C68_ADD("rfsnd", RFC_CLOCK/4)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.55)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.55)
-
+
MCFG_S32COMM_ADD("s32comm")
MACHINE_CONFIG_END
@@ -2572,7 +2572,7 @@ static MACHINE_CONFIG_FRAGMENT( multi32 )
MCFG_SOUND_ADD("sega", MULTIPCM, MASTER_CLOCK/4)
MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(0, "rspeaker", 1.0)
-
+
MCFG_S32COMM_ADD("s32comm")
MACHINE_CONFIG_END
@@ -5237,7 +5237,7 @@ void segas32_state::init_f1lap(void)
m_system32_prot_vblank = &segas32_state::f1lap_fd1149_vblank;
m_sw1_output = &segas32_state::f1lap_sw1_output;
-
+
m_s32comm->set_linktype(15612); // EPR-15612
}
@@ -5303,7 +5303,7 @@ void segas32_state::init_radr(void)
segas32_common_init(read16_delegate(FUNC(segas32_state::analog_custom_io_r),this), write16_delegate(FUNC(segas32_state::analog_custom_io_w),this));
m_sw1_output = &segas32_state::radm_sw1_output;
m_sw2_output = &segas32_state::radr_sw2_output;
-
+
m_s32comm->set_linktype(14084); // EPR-14084
}
diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c
index 42f99a0b35d..7ccaaa0c05a 100644
--- a/src/mame/drivers/segaybd.c
+++ b/src/mame/drivers/segaybd.c
@@ -836,8 +836,8 @@ ADDRESS_MAP_END
/*
static ADDRESS_MAP_START( motor_portmap, AS_IO, 8, segaybd_state )
- ADDRESS_MAP_UNMAP_HIGH
- ADDRESS_MAP_GLOBAL_MASK(0xff)
+ ADDRESS_MAP_UNMAP_HIGH
+ ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_END
*/
@@ -1440,7 +1440,7 @@ static MACHINE_CONFIG_DERIVED( yboard_deluxe, yboard )
// basic machine hardware
MCFG_CPU_ADD("motorcpu", Z80, XTAL_16MHz/2 ) // 8 Mhz(guessed)
MCFG_CPU_PROGRAM_MAP(motor_map)
-// MCFG_CPU_IO_MAP(motor_portmap)
+// MCFG_CPU_IO_MAP(motor_portmap)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/silvmil.c b/src/mame/drivers/silvmil.c
index 5d1d9cab889..8ae2b26ce00 100644
--- a/src/mame/drivers/silvmil.c
+++ b/src/mame/drivers/silvmil.c
@@ -446,10 +446,10 @@ static MACHINE_CONFIG_DERIVED( puzzlove, silvmil )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( puzzlovek, puzzlove )
- MCFG_DEVICE_REMOVE("ymsnd")
- MCFG_YM2151_ADD("ymsnd", XTAL_15MHz/4) /* Verified */
- MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_DEVICE_REMOVE("ymsnd")
+ MCFG_YM2151_ADD("ymsnd", XTAL_15MHz/4) /* Verified */
+ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -587,6 +587,6 @@ DRIVER_INIT_MEMBER(silvmil_state,silvmil)
tumblepb_gfx1_rearrange();
}
-GAME( 1995, silvmil, 0, silvmil, silvmil, silvmil_state, silvmil, ROT270, "Para", "Silver Millennium", GAME_SUPPORTS_SAVE )
-GAME( 1994, puzzlove, 0, puzzlove, puzzlove, silvmil_state, silvmil, ROT0, "Para", "PuzzLove", GAME_SUPPORTS_SAVE )
-GAME( 1994, puzzlovek, puzzlove, puzzlovek, puzzlovek, silvmil_state, silvmil, ROT0, "Para", "PuzzLove (Korea)", GAME_SUPPORTS_SAVE )
+GAME( 1995, silvmil, 0, silvmil, silvmil, silvmil_state, silvmil, ROT270, "Para", "Silver Millennium", GAME_SUPPORTS_SAVE )
+GAME( 1994, puzzlove, 0, puzzlove, puzzlove, silvmil_state, silvmil, ROT0, "Para", "PuzzLove", GAME_SUPPORTS_SAVE )
+GAME( 1994, puzzlovek, puzzlove, puzzlovek, puzzlovek, silvmil_state, silvmil, ROT0, "Para", "PuzzLove (Korea)", GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index 6c587027dae..76e89640b0c 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -1918,7 +1918,7 @@ static MACHINE_CONFIG_START( rranger, suna8_state )
MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
MCFG_CPU_PROGRAM_MAP(rranger_map)
MCFG_CPU_IO_MAP(rranger_io_map)
-// MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
+// MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", suna8_state, irq0_line_hold) /* IRQ & NMI ! */
MCFG_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 8) /* verified on pcb */
diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c
index 7c3f8963367..7fb84b355cd 100644
--- a/src/mame/drivers/system1.c
+++ b/src/mame/drivers/system1.c
@@ -129,7 +129,7 @@ This game runs on Sega System 1 hardware.
834-5583-12 SPATTER (sticker)
834-5542 daughter board with 4 eproms (EPR6306, EPR6307, EPR6308, EPR6309)
-834-5540 daughter board with logic ICs
+834-5540 daughter board with logic ICs
315-5099 custom Z80 CPU w/security
*******************************************************************************
@@ -380,7 +380,7 @@ void system1_state::machine_start()
m_bank1->set_entry(0);
if (m_banked_decrypted_opcodes)
- {
+ {
m_bank0d->set_base(m_banked_decrypted_opcodes);
m_bank1d->configure_entries(0, numbanks, m_banked_decrypted_opcodes + 0x10000, 0x4000);
m_bank1d->set_entry(0);
@@ -2821,7 +2821,7 @@ ROM_END
ROM_START( spattera )
ROM_REGION( 0x10000, "maincpu", 0 )
- ROM_LOAD( "epr-6597.116", 0x0000, 0x4000, CRC(fb928b9d) SHA1(0a9bede7a147009b9ebb8a0b73681359da665982) ) /* encrypted */
+ ROM_LOAD( "epr-6597.116", 0x0000, 0x4000, CRC(fb928b9d) SHA1(0a9bede7a147009b9ebb8a0b73681359da665982) ) /* encrypted */
ROM_LOAD( "epr-6598.109", 0x4000, 0x4000, CRC(5dff037a) SHA1(8e6f6b75a89609ab0498d317c11e6d653343ffbe) ) /* encrypted */
ROM_LOAD( "epr-6599.96", 0x8000, 0x4000, CRC(7ba9de5b) SHA1(f18542c95e8241433ed995c213924ad1ce03cd5b) )
diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c
index 0bfd4123ccb..dce90cf6a2d 100644
--- a/src/mame/drivers/system16.c
+++ b/src/mame/drivers/system16.c
@@ -137,9 +137,9 @@ static ADDRESS_MAP_START( shinobib_map, AS_PROGRAM, 16, segas1x_bootleg_state )
AM_RANGE(0x412000, 0x412fff) AM_RAM AM_SHARE("bg1_tileram")
AM_RANGE(0x440000, 0x440fff) AM_RAM AM_SHARE("sprites")
AM_RANGE(0x840000, 0x840fff) AM_RAM_WRITE(paletteram_w) AM_SHARE("paletteram")
-// AM_RANGE(0xc40000, 0xc40001) AM_WRITE(sound_command_irq_w)
+// AM_RANGE(0xc40000, 0xc40001) AM_WRITE(sound_command_irq_w)
AM_RANGE(0xC42006, 0xC42007) AM_WRITE(sound_command_irq_w)
-
+
AM_RANGE(0xC44000, 0xC44001) AM_READNOP
AM_RANGE(0xc41000, 0xc41001) AM_READ_PORT("SERVICE")
AM_RANGE(0xc41002, 0xc41003) AM_READ_PORT("P1")
@@ -2133,7 +2133,7 @@ static MACHINE_CONFIG_DERIVED( shinobi_datsu, system16_base )
// 2x YM2203C, one at U57, one at U56
MCFG_SOUND_ADD("ym1", YM2203, 4000000)
-// MCFG_YM2203_IRQ_HANDLER(WRITELINE(segas1x_bootleg_state, datsu_irq_handler))
+// MCFG_YM2203_IRQ_HANDLER(WRITELINE(segas1x_bootleg_state, datsu_irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@@ -2141,7 +2141,7 @@ static MACHINE_CONFIG_DERIVED( shinobi_datsu, system16_base )
MCFG_SOUND_ADD("ym2", YM2203, 4000000)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
-// MCFG_YM2203_IRQ_HANDLER(WRITELINE(segas1x_bootleg_state, datsu_irq_handler))
+// MCFG_YM2203_IRQ_HANDLER(WRITELINE(segas1x_bootleg_state, datsu_irq_handler))
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 0.80)
diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c
index dc301dc0c66..b621c25a3d7 100644
--- a/src/mame/drivers/taitoair.c
+++ b/src/mame/drivers/taitoair.c
@@ -186,12 +186,12 @@ perhaps? The two writes seem to take only two values.
/*!
@todo - Framebuffer DMA requires palette switch to be selected dynamically, see at first stage Course Select in Top Landing.
My gut feeling is that 3d poly fill operation actually copies to internal buffer then a DMA op actually do the buffer-to-screen copy, including gradiation ROZ too;
- - Air Inferno: missing landing monitor camera (blackened);
- - Air Inferno: missing 3d HUD graphics;
- - Air Inferno: Expert course has wrong 3d geometry;
- - Air Inferno: Almost surely crashing during replay has missing smoke effect, looks quite odd atm.
- - Top Landing: Night stages might have wrong priority for stars-above-sea;
- - Input limiters / analog thresholds for both games;
+ - Air Inferno: missing landing monitor camera (blackened);
+ - Air Inferno: missing 3d HUD graphics;
+ - Air Inferno: Expert course has wrong 3d geometry;
+ - Air Inferno: Almost surely crashing during replay has missing smoke effect, looks quite odd atm.
+ - Top Landing: Night stages might have wrong priority for stars-above-sea;
+ - Input limiters / analog thresholds for both games;
*/
#include "emu.h"
@@ -344,14 +344,14 @@ WRITE8_MEMBER(taitoair_state::sound_bankswitch_w)
}
/*!
- @brief Framebuffer DMA control
- @regs [0] x--- ---- ---- ---- copy framebuffer to the screen
- [0] --x- ---- ---- ---- unknown, used on POST test
- [0] 1001 1111 1111 1111 used by Air Inferno after erase op, erase -> copy?
- [0] 0001 1111 1111 1111 erase op?
- [1] xxxx xxxx xxxx xxxx fill value? 0xffff by Top Landing, 0x0000 Air Inferno
- [2] (unused)
- [3] both games uses 0xb7, most likely a register setting.
+ @brief Framebuffer DMA control
+ @regs [0] x--- ---- ---- ---- copy framebuffer to the screen
+ [0] --x- ---- ---- ---- unknown, used on POST test
+ [0] 1001 1111 1111 1111 used by Air Inferno after erase op, erase -> copy?
+ [0] 0001 1111 1111 1111 erase op?
+ [1] xxxx xxxx xxxx xxxx fill value? 0xffff by Top Landing, 0x0000 Air Inferno
+ [2] (unused)
+ [3] both games uses 0xb7, most likely a register setting.
*/
WRITE16_MEMBER(taitoair_state::dma_regs_w)
{
diff --git a/src/mame/drivers/thedealr.c b/src/mame/drivers/thedealr.c
index c67f752bdf6..3871163a9b5 100644
--- a/src/mame/drivers/thedealr.c
+++ b/src/mame/drivers/thedealr.c
@@ -4,8 +4,8 @@
The Dealer (Visco Games)
- Driver by Luca Elia
- This game runs on Seta Hardware
+ Driver by Luca Elia
+ This game runs on Seta Hardware
P0-040A PCB:
@@ -94,7 +94,7 @@ UINT32 thedealr_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
{
bitmap.fill(0x1f0, cliprect);
- m_seta001->set_bg_yoffsets( 0x11+1, -0x10 ); // + is up (down with flip)
+ m_seta001->set_bg_yoffsets( 0x11+1, -0x10 ); // + is up (down with flip)
m_seta001->set_fg_yoffsets( -0x12+1, -0x01 );
m_seta001->draw_sprites(screen, bitmap, cliprect, 0x1000, 1);
@@ -120,11 +120,11 @@ void thedealr_state::screen_eof(screen_device &screen, bool state)
void thedealr_state::iox_reset()
{
- m_iox_status = 0x00;
- m_iox_ret = 0x00;
- m_iox_cmd = 0xff;
- m_iox_leds = 0x00;
- m_iox_coins = 0x00;
+ m_iox_status = 0x00;
+ m_iox_ret = 0x00;
+ m_iox_cmd = 0xff;
+ m_iox_leds = 0x00;
+ m_iox_coins = 0x00;
}
MACHINE_RESET_MEMBER(thedealr_state,thedealr)
@@ -150,19 +150,19 @@ WRITE8_MEMBER(thedealr_state::iox_w)
switch (m_iox_cmd)
{
- case 0x20: // leds
+ case 0x20: // leds
m_iox_leds = data;
- set_led_status(machine(), 0, data & 0x01); // bet
- set_led_status(machine(), 1, data & 0x02); // deal
+ set_led_status(machine(), 0, data & 0x01); // bet
+ set_led_status(machine(), 1, data & 0x02); // deal
set_led_status(machine(), 2, data & 0x04);
set_led_status(machine(), 3, data & 0x08);
- set_led_status(machine(), 4, data & 0x10); // hold 1-5?
+ set_led_status(machine(), 4, data & 0x10); // hold 1-5?
set_led_status(machine(), 5, data & 0x20);
set_led_status(machine(), 6, data & 0x40);
set_led_status(machine(), 7, data & 0x80);
break;
- case 0x40: // coin counters
+ case 0x40: // coin counters
m_iox_coins = data;
coin_counter_w(machine(), 0, (~data) & 0x02); // coin1 or service coin
coin_counter_w(machine(), 1, (~data) & 0x04); // coupon
@@ -177,7 +177,7 @@ WRITE8_MEMBER(thedealr_state::iox_w)
break;
}
-// popmessage("LED: %02X COIN: %02X", m_iox_leds, m_iox_coins);
+// popmessage("LED: %02X COIN: %02X", m_iox_leds, m_iox_coins);
}
else
{
@@ -186,7 +186,7 @@ WRITE8_MEMBER(thedealr_state::iox_w)
switch (m_iox_cmd)
{
- case 0x01: // inputs?
+ case 0x01: // inputs?
{
UINT16 buttons = ioport("IOX")->read();
m_iox_ret = 0;
@@ -202,30 +202,30 @@ WRITE8_MEMBER(thedealr_state::iox_w)
break;
}
-// case 0x04: // ? at boot
+// case 0x04: // ? at boot
- case 0x08: // return iox version
+ case 0x08: // return iox version
m_iox_ret = 0x54;
m_iox_status |= IOX_OUT_FULL;
break;
- case 0x20: // leds
+ case 0x20: // leds
m_iox_status |= IOX_WAITDATA;
break;
- case 0x40: // coin counters
+ case 0x40: // coin counters
m_iox_status |= IOX_WAITDATA;
break;
- case 0x80: // store param?
+ case 0x80: // store param?
m_iox_status |= IOX_WAITDATA;
break;
- case 0x81: // store param?
+ case 0x81: // store param?
m_iox_status |= IOX_WAITDATA;
break;
- case 0xff: // reset
+ case 0xff: // reset
iox_reset();
break;
@@ -262,18 +262,18 @@ WRITE8_MEMBER(thedealr_state::unk_w)
// bit 2 - ? 0 during game
// bit 3 - ? 1 during game
// bit 7 - ? 0 during game
-// popmessage("UNK %02x", data);
+// popmessage("UNK %02x", data);
}
static ADDRESS_MAP_START( thedealr, AS_PROGRAM, 8, thedealr_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x2000, 0x2000) AM_RAM // w ff at boot (after clearing commram)
+ AM_RANGE(0x2000, 0x2000) AM_RAM // w ff at boot (after clearing commram)
- AM_RANGE(0x2400, 0x2400) AM_READ(irq_ack_r) // r = irq ack.
- AM_RANGE(0x2400, 0x2400) AM_WRITE(unk_w) // w = ?
+ AM_RANGE(0x2400, 0x2400) AM_READ(irq_ack_r) // r = irq ack.
+ AM_RANGE(0x2400, 0x2400) AM_WRITE(unk_w) // w = ?
- AM_RANGE(0x2800, 0x2800) AM_READ_PORT("COINS") AM_WRITENOP // rw
+ AM_RANGE(0x2800, 0x2800) AM_READ_PORT("COINS") AM_WRITENOP // rw
AM_RANGE(0x2801, 0x2801) AM_READ_PORT("DSW4")
AM_RANGE(0x2c00, 0x2c00) AM_READ_PORT("DSW3")
@@ -281,8 +281,8 @@ static ADDRESS_MAP_START( thedealr, AS_PROGRAM, 8, thedealr_state )
AM_RANGE(0x3400, 0x3400) AM_READWRITE(iox_r, iox_w)
AM_RANGE(0x3401, 0x3401) AM_READ(iox_status_r)
- AM_RANGE(0x3000, 0x3000) AM_RAM // rw, comm in test mode
- AM_RANGE(0x3001, 0x3001) AM_RAM // rw, ""
+ AM_RANGE(0x3000, 0x3000) AM_RAM // rw, comm in test mode
+ AM_RANGE(0x3001, 0x3001) AM_RAM // rw, ""
AM_RANGE(0x3800, 0x3bff) AM_RAM AM_SHARE("commram")
@@ -375,7 +375,7 @@ static INPUT_PORTS_START( thedealr )
Switches 7 & 8 control the payout as follows:
Off/Off Off/On On/Off On/On Notes
- ---------------------------------------------------------------------------------------------
+ ---------------------------------------------------------------------------------------------
Jackpot MB 5000 5000 5000 2000 Ryl Flush bonus at Max Bet
Jackpot 2500 2500 2500 1000 Ryl Flush bonus at 5 coins + 500 (or 200) per coin up to Max Bet
Mini JP 1500 1500 1000 500 Str Flush bonus at Max Bet
@@ -444,7 +444,7 @@ Fever Mode:
3 of a Kind winning hand Jacks or higher enters Fever Mode
You start with a pair of your 3 of a Kind cards & you draw 3 cards each hand.
Jacks through Kings get 5 Fever Mode Draws
- Aces get 15 Fever Mode Draws
+ Aces get 15 Fever Mode Draws
*/
PORT_DIPNAME( 0x20, 0x20, "Fever Mode" ) PORT_DIPLOCATION("SW3:6")
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
@@ -455,12 +455,12 @@ Fever Mode:
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_START("DSW4")
- PORT_DIPUNKNOWN_DIPLOC( 0x01, 0x01, "SW4:7" ) // X in service mode
- PORT_DIPUNKNOWN_DIPLOC( 0x02, 0x02, "SW4:8" ) // ""
+ PORT_DIPUNKNOWN_DIPLOC( 0x01, 0x01, "SW4:7" ) // X in service mode
+ PORT_DIPUNKNOWN_DIPLOC( 0x02, 0x02, "SW4:8" ) // ""
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW4:1")
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x08, "SW4:2" ) // "Excess switch time" error
+ PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x08, "SW4:2" ) // "Excess switch time" error
PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x10, "SW4:3" )
PORT_DIPUNKNOWN_DIPLOC( 0x20, 0x20, "SW4:4" )
PORT_DIPUNKNOWN_DIPLOC( 0x40, 0x40, "SW4:5" )
@@ -522,11 +522,11 @@ TIMER_DEVICE_CALLBACK_MEMBER(thedealr_state::thedealr_interrupt)
static MACHINE_CONFIG_START( thedealr, thedealr_state )
// basic machine hardware
- MCFG_CPU_ADD("maincpu", R65C02, XTAL_16MHz/8) // 2 MHz?
+ MCFG_CPU_ADD("maincpu", R65C02, XTAL_16MHz/8) // 2 MHz?
MCFG_CPU_PROGRAM_MAP(thedealr)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", thedealr_state, thedealr_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("subcpu", R65C02, XTAL_16MHz/8) // 2 MHz?
+ MCFG_CPU_ADD("subcpu", R65C02, XTAL_16MHz/8) // 2 MHz?
MCFG_CPU_PROGRAM_MAP(thedealr_sub)
MCFG_CPU_VBLANK_INT_DRIVER("screen", thedealr_state, nmi_line_pulse)
@@ -555,7 +555,7 @@ static MACHINE_CONFIG_START( thedealr, thedealr_state )
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", YM2149, XTAL_16MHz/8) // 2 MHz?
+ MCFG_SOUND_ADD("aysnd", YM2149, XTAL_16MHz/8) // 2 MHz?
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW2"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index aa039776699..7e8e27f0f74 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -2495,7 +2495,7 @@ ROM_START( tnzsj )
ROM_LOAD( "b53-15.pal16l8a.subpcb.ic6.jed", 0x00000, 0x01000, NO_DUMP) // on sub pcb
ROM_END
-/* tnzs - old style PCB sets
+/* tnzs - old style PCB sets
The New Zealand Story
Taito, 1988
diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c
index 36500399d30..b5ac4c115c6 100644
--- a/src/mame/drivers/ttchamp.c
+++ b/src/mame/drivers/ttchamp.c
@@ -82,7 +82,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<palette_device> m_palette;
-
+
UINT16 m_paloff;
UINT16 m_port10;
UINT8 m_rombank;
@@ -155,7 +155,7 @@ void ttchamp_state::machine_start()
m_bakram = auto_alloc_array(machine(), UINT8, 0x100);
machine().device<nvram_device>("backram")->set_base(m_bakram, 0x100);
-
+
save_item(NAME(m_paloff));
save_item(NAME(m_port10));
save_item(NAME(m_rombank));
diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c
index c54f52d4310..a4428cb0d08 100644
--- a/src/mame/drivers/turbo.c
+++ b/src/mame/drivers/turbo.c
@@ -1085,9 +1085,9 @@ ROM_END
ROM_START( turbob )
ROM_REGION( 0x6000, "maincpu", 0 )
// B revision label on 1st rom, A revision for 2nd / 3rd, 2nd rom was faulty, 3rd rom matched existing set, existing 2nd rom passes rom check.
- ROM_LOAD( "epr-1363_t5b.ic76", 0x0000, 0x2000, CRC(f7f28149) SHA1(08aec3edd6d756b14b2f10fe5abd22ac83c79fcc) ) /* CPU module stamped as 834-0128 */
- ROM_LOAD( "epr-1364_t5a.ic89", 0x2000, 0x2000, CRC(6a341693) SHA1(428927c4a14bf82225875012c255d25dcffaf2ab) )
- ROM_LOAD( "epr-1365_t5a.ic103", 0x4000, 0x2000, CRC(3b6b0dc8) SHA1(3ebfa3f9fabd444ee105591acb6984b6b3523725) )
+ ROM_LOAD( "epr-1363_t5b.ic76", 0x0000, 0x2000, CRC(f7f28149) SHA1(08aec3edd6d756b14b2f10fe5abd22ac83c79fcc) ) /* CPU module stamped as 834-0128 */
+ ROM_LOAD( "epr-1364_t5a.ic89", 0x2000, 0x2000, CRC(6a341693) SHA1(428927c4a14bf82225875012c255d25dcffaf2ab) )
+ ROM_LOAD( "epr-1365_t5a.ic103", 0x4000, 0x2000, CRC(3b6b0dc8) SHA1(3ebfa3f9fabd444ee105591acb6984b6b3523725) )
ROM_REGION( 0x20000, "sprites", 0 ) /* sprite data */
ROM_LOAD( "epr-1246.prom-ic84", 0x00000, 0x2000, CRC(555bfe9a) SHA1(1e56385475eeff044dcd9b44a154991d3efe995e) ) /* level 0 */
@@ -1192,8 +1192,8 @@ ROM_END
ROM_START( turbod )
ROM_REGION( 0x6000, "maincpu", 0 )
- // no letter on rom labels, numbered 1363-1365, possibly the original 1363-1365 revision? - service mode still shows the older EPR-1262 through EPR-1264 tho?
- ROM_LOAD( "1363.ic76", 0x0000, 0x2000, CRC(b6329a00) SHA1(02ca3d7703607bc0390a14d838fafb01a3e3cdef) ) /* CPU module stamped as 834-0128 */
+ // no letter on rom labels, numbered 1363-1365, possibly the original 1363-1365 revision? - service mode still shows the older EPR-1262 through EPR-1264 tho?
+ ROM_LOAD( "1363.ic76", 0x0000, 0x2000, CRC(b6329a00) SHA1(02ca3d7703607bc0390a14d838fafb01a3e3cdef) ) /* CPU module stamped as 834-0128 */
ROM_LOAD( "1364.ic89", 0x2000, 0x2000, CRC(3192f83b) SHA1(78dabb75e38f5f8331bfc43dce852a4c4397f874) )
ROM_LOAD( "1365.ic103", 0x4000, 0x2000, CRC(23a3303a) SHA1(bcc4ab9203060b4043d779b7a242abc583093dbb) )
diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c
index 487689e8498..8ea29244fe6 100644
--- a/src/mame/drivers/vegas.c
+++ b/src/mame/drivers/vegas.c
@@ -2537,7 +2537,7 @@ ROM_START( nbashowt )
DISK_REGION( "ide:0:hdd:image" )
// various strings from this image
- // SHOWTIME REV 2.0
+ // SHOWTIME REV 2.0
// BUILD DATE: Apr 25 1999 (diag.exe?)
// BUILD DATE: Apr 21 1999 (game?)
DISK_IMAGE( "nbashowt", 0, SHA1(f7c56bc3dcbebc434de58034986179ae01127f87) )
@@ -2555,7 +2555,7 @@ ROM_START( nbanfl )
DISK_REGION( "ide:0:hdd:image" )
// various strings from this image
- //NBA SHOWTIME 2.1
+ //NBA SHOWTIME 2.1
//BUILD DATE: Sep 22 1999 (diag.exe?)
//BUILD DATE: Sep 21 1999 (game?)
DISK_IMAGE( "nbanfl", 0, SHA1(f60c627f85f1bf58f2ea674063736a1e516e7e9e) )
@@ -2568,7 +2568,7 @@ ROM_END
// it's possible the boot rom and CHD are mismatched here
ROM_START( nbagold )
ROM_REGION32_LE( 0x80000, "user1", 0 )
- ROM_LOAD( "nbagold_jan10_2000.u27", 0x000000, 0x80000, CRC(6768e802) SHA1(d994e3efe14f57e261841134ddd1489fa67d418b) ) // 11:29:11 Jan 10 2000. BIOS FOR NBAGOLD USING BANSHEE / 11:23:58 Jan 10 2000. POST FOR NBAGOLD USING BANSHEE
+ ROM_LOAD( "nbagold_jan10_2000.u27", 0x000000, 0x80000, CRC(6768e802) SHA1(d994e3efe14f57e261841134ddd1489fa67d418b) ) // 11:29:11 Jan 10 2000. BIOS FOR NBAGOLD USING BANSHEE / 11:23:58 Jan 10 2000. POST FOR NBAGOLD USING BANSHEE
DISK_REGION( "ide:0:hdd:image" )
// various strings from this image
@@ -2578,9 +2578,9 @@ ROM_START( nbagold )
//BUILD DATE:Feb 10 2000 (something else?)
DISK_IMAGE( "nbanfl3", 0, SHA1(19a51346ce5ae4e06e8dff3eb4bed59ec1ee855f))
// these both contain the same strings / build dates, same thing with different user data / drive sizes?
-// DISK_IMAGE( "nbanfl27", 0, SHA1(da371d27e2fbceec493e2203055e0c1399eaf3b9) )
-// DISK_IMAGE( "sportstn", 0, SHA1(9442feefaeb5ae4a090422e937615f8a2d8e8f31) )
-
+// DISK_IMAGE( "nbanfl27", 0, SHA1(da371d27e2fbceec493e2203055e0c1399eaf3b9) )
+// DISK_IMAGE( "sportstn", 0, SHA1(9442feefaeb5ae4a090422e937615f8a2d8e8f31) )
+
ROM_REGION16_LE( 0x10000, "dcs", 0 ) /* Vegas SIO boot ROM */
ROM_LOAD16_BYTE( "vegassio.bin", 0x000000, 0x8000, CRC(d1470e23) SHA1(f6e8405cfa604528c0224401bc374a6df9caccef) )
diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c
index 7a8e5af4528..2da519b84b6 100644
--- a/src/mame/drivers/xyonix.c
+++ b/src/mame/drivers/xyonix.c
@@ -262,7 +262,7 @@ ROM_START( xyonix )
ROM_REGION( 0x10000, "mcu", 0 )
ROM_LOAD( "mc68705p3s.e7", 0x00000, 0x780, BAD_DUMP CRC(f60cdd86) SHA1(e18cc598153b3e108942328ee9c5b9f83b034c41) ) // FIXED BITS (xxxxxx0x)
-
+
ROM_REGION( 0x10000, "gfx1", 0 )
ROM_LOAD( "xyonix1.bin", 0x00000, 0x08000, CRC(3dfa9596) SHA1(52cdbbe18f83cea7248c29588ea3a18c4bb7984f) )
ROM_LOAD( "xyonix2.bin", 0x08000, 0x08000, CRC(db87343e) SHA1(62bc30cd65b2f8976cd73a0b349a9ccdb3faaad2) )
@@ -274,4 +274,4 @@ ROM_END
/* GAME drivers **************************************************************/
GAME( 1989, xyonix, 0, xyonix, xyonix, driver_device, 0, ROT0, "Philko", "Xyonix", GAME_SUPPORTS_SAVE )
- \ No newline at end of file
+
diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h
index 14489ef1f5f..3c8605bf2a1 100644
--- a/src/mame/includes/cclimber.h
+++ b/src/mame/includes/cclimber.h
@@ -22,7 +22,7 @@ public:
m_toprollr_bg_videoram(*this, "bg_videoram"),
m_toprollr_bg_coloram(*this, "bg_coloram"),
m_decrypted_opcodes(*this, "decrypted_opcodes") { }
-
+
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_audiocpu;
required_device<gfxdecode_device> m_gfxdecode;
diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h
index a03efc5adce..71de12f7624 100644
--- a/src/mame/includes/deco32.h
+++ b/src/mame/includes/deco32.h
@@ -116,7 +116,7 @@ public:
// nslasher
DECLARE_WRITE32_MEMBER(nslasher_eeprom_w);
-
+
// tattass
DECLARE_WRITE32_MEMBER(tattass_control_w);
@@ -205,7 +205,7 @@ public:
UINT32 m_sprite_ctrl;
int m_lightgun_port;
bitmap_rgb32 m_temp_render_bitmap;
-
+
DECLARE_READ32_MEMBER(lightgun_r);
DECLARE_WRITE32_MEMBER(lightgun_w);
DECLARE_WRITE32_MEMBER(sprite_control_w);
diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h
index efa9d1426df..ee957d9c621 100644
--- a/src/mame/includes/itech8.h
+++ b/src/mame/includes/itech8.h
@@ -40,7 +40,7 @@ public:
required_device<tms34061_device> m_tms34061;
required_device<tlc34076_device> m_tlc34076;
required_device<screen_device> m_screen;
-
+
rectangle m_visarea;
UINT8 m_grom_bank;
@@ -165,7 +165,7 @@ public:
UINT16 *sens0, UINT16 *sens1, UINT16 *sens2, UINT16 *sens3);
void compute_sensors();
TIMER_CALLBACK_MEMBER( delayed_z80_control_w );
-
+
protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
};
diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h
index 01b9a52dfea..cefff99545b 100644
--- a/src/mame/includes/micro3d.h
+++ b/src/mame/includes/micro3d.h
@@ -229,17 +229,17 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
private:
// internal state
-// union
-// {
-// struct
-// {
-// UINT8 m_vcf;
-// UINT8 m_vcq;
-// UINT8 m_vca;
-// UINT8 m_pan;
-// };
+// union
+// {
+// struct
+// {
+// UINT8 m_vcf;
+// UINT8 m_vcq;
+// UINT8 m_vca;
+// UINT8 m_pan;
+// };
UINT8 m_dac[4];
-// };
+// };
float m_gain;
UINT32 m_noise_shift;
diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h
index 41be8fc1ad5..48ec4d00a53 100644
--- a/src/mame/includes/nbmj9195.h
+++ b/src/mame/includes/nbmj9195.h
@@ -38,7 +38,7 @@ public:
required_device<dac_device> m_dac2;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
-
+
optional_shared_ptr<UINT8> m_palette_ptr; //shabdama doesn't use it at least for now
int m_inputport;
diff --git a/src/mame/includes/pcktgal.h b/src/mame/includes/pcktgal.h
index b28c2bf4e81..b5abeba2e9d 100644
--- a/src/mame/includes/pcktgal.h
+++ b/src/mame/includes/pcktgal.h
@@ -34,7 +34,7 @@ public:
DECLARE_WRITE8_MEMBER(adpcm_data_w);
DECLARE_READ8_MEMBER(adpcm_reset_r);
DECLARE_WRITE_LINE_MEMBER(adpcm_int);
-
+
DECLARE_DRIVER_INIT(pcktgal);
DECLARE_PALETTE_INIT(pcktgal);
virtual void machine_start();
diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h
index 356801eede6..d9b56f4a1e4 100644
--- a/src/mame/includes/taitoair.h
+++ b/src/mame/includes/taitoair.h
@@ -75,7 +75,7 @@ public:
INT16 m_eyecoordBuffer[4]; /* homogeneous */
bool m_gradbank;
-
+
DECLARE_READ16_MEMBER(dsp_m_r);
DECLARE_WRITE16_MEMBER(dsp_m_w);
@@ -130,7 +130,7 @@ public:
void fb_copy_op(void);
void fb_fill_op(void);
void fb_erase_op(void);
-
+
void fill_slope( bitmap_ind16 &bitmap, const rectangle &cliprect, UINT16 header, INT32 x1, INT32 x2, INT32 sl1, INT32 sl2, INT32 y1, INT32 y2, INT32 *nx1, INT32 *nx2 );
void fill_poly( bitmap_ind16 &bitmap, const rectangle &cliprect, const struct taitoair_poly *q );
int projectEyeCoordToScreen(float* projectionMatrix,const int Res,INT16* eyePoint3d,int type);
diff --git a/src/mame/machine/awboard.c b/src/mame/machine/awboard.c
index 8f0c575e5be..be4b899ef95 100644
--- a/src/mame/machine/awboard.c
+++ b/src/mame/machine/awboard.c
@@ -99,9 +99,9 @@ ROM board internal layouts:
00000000 - 00800000 FMEM1 flash ROM
00800000 - 01000000 FMEM2 flash ROM
01000000 - 02000000 unk, probably mirror of above
- 02000000 - 04000000 MROM1 MROM4 MROM7 MROM10 \
+ 02000000 - 04000000 MROM1 MROM4 MROM7 MROM10 \
04000000 - 06000000 MROM2 MROM5 MROM8 MROM11 banked mask ROMs
- 06000000 - 08000000 MROM3 MROM6 MROM9 MROM12 /
+ 06000000 - 08000000 MROM3 MROM6 MROM9 MROM12 /
Type 3:
@@ -116,11 +116,11 @@ ROM board internal layouts:
Development:
- 00000000 - 00800000 IC12 \
+ 00000000 - 00800000 IC12 \
..... flash ROMs
- 07800000 - 08000000 IC27 /
+ 07800000 - 08000000 IC27 /
+
-
In short:
EPR-ROM
diff --git a/src/mame/machine/dc.c b/src/mame/machine/dc.c
index 341f584a327..a28b6c17810 100644
--- a/src/mame/machine/dc.c
+++ b/src/mame/machine/dc.c
@@ -732,4 +732,3 @@ TIMER_DEVICE_CALLBACK_MEMBER(dc_state::dc_scanline)
#if (defined(__MINGW32__) && (__GNUC__ >= 5))
#pragma GCC diagnostic pop
#endif
-
diff --git a/src/mame/machine/fd1089.c b/src/mame/machine/fd1089.c
index c273c4949b4..456192b32e6 100644
--- a/src/mame/machine/fd1089.c
+++ b/src/mame/machine/fd1089.c
@@ -223,7 +223,7 @@ ADDRESS_MAP_END
fd1089_base_device::fd1089_base_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)
: m68000_device(mconfig, tag, owner, clock, shortname, source),
- m_decrypted_opcodes(*this, ":fd1089_decrypted_opcodes")
+ m_decrypted_opcodes(*this, ":fd1089_decrypted_opcodes")
{
// override the name after the m68000 initializes
m_name.assign(name);
diff --git a/src/mame/machine/m1comm.c b/src/mame/machine/m1comm.c
index 03177efcaef..ceec0fc893b 100644
--- a/src/mame/machine/m1comm.c
+++ b/src/mame/machine/m1comm.c
@@ -330,7 +330,7 @@ void m1comm_device::check_vint_irq()
#ifdef __M1COMM_SIMULATION__
void m1comm_device::comm_tick()
{
- if (m_linkenable == 0x01)
+ if (m_linkenable == 0x01)
{
int frameStart = 0x0010;
int frameOffset = 0x0000;
@@ -568,4 +568,4 @@ void m1comm_device::comm_tick()
}
}
}
-#endif \ No newline at end of file
+#endif
diff --git a/src/mame/machine/mc8123.h b/src/mame/machine/mc8123.h
index 6887b4f644c..f5a2078bec5 100644
--- a/src/mame/machine/mc8123.h
+++ b/src/mame/machine/mc8123.h
@@ -10,4 +10,3 @@
// an arbitrary amount of banks at 8000-BFFF.
void mc8123_decode(UINT8 *rom, UINT8 *opcodes, const UINT8 *key, int length);
-
diff --git a/src/mame/machine/pgmcrypt.c b/src/mame/machine/pgmcrypt.c
index a026eaf9a36..956edaaa66f 100644
--- a/src/mame/machine/pgmcrypt.c
+++ b/src/mame/machine/pgmcrypt.c
@@ -1508,7 +1508,6 @@ void slqz3_decrypt(running_machine &machine)
int rom_size = 0x200000;
for(i=0; i<rom_size/2; i++) {
-
UINT16 x = src[i];
// not 100% verified
@@ -1526,4 +1525,3 @@ void slqz3_decrypt(running_machine &machine)
src[i] = x;
}
}
-
diff --git a/src/mame/machine/s32comm.c b/src/mame/machine/s32comm.c
index abacdd7a75c..dad9c291527 100644
--- a/src/mame/machine/s32comm.c
+++ b/src/mame/machine/s32comm.c
@@ -18,19 +18,19 @@ Sega System 32 Comm PCB 837-9409
| |---------------------------------| |
| |---------------------------------| LED CN? CN? CNK |
|--------------------------------------------------------------------------------|
- Setup:
- Z80 - Zilog Z0840004PSC Z80 CPU, running at 4.000MHz (DIP40)
- MB89237A - Fujitsu MB89237A DMA-Controller (DIP20) [most likely i8237A clone]
- MB89374 - Fujitsu MB89374 Data Link Controller (SDIP42)
- MB8464 - Fujitsu MB8464 8k x8 SRAM (DIP28)
- MB8421 - Fujitsu MB8421-12LP 2k x8 SRAM (SDIP52)
+ Setup:
+ Z80 - Zilog Z0840004PSC Z80 CPU, running at 4.000MHz (DIP40)
+ MB89237A - Fujitsu MB89237A DMA-Controller (DIP20) [most likely i8237A clone]
+ MB89374 - Fujitsu MB89374 Data Link Controller (SDIP42)
+ MB8464 - Fujitsu MB8464 8k x8 SRAM (DIP28)
+ MB8421 - Fujitsu MB8421-12LP 2k x8 SRAM (SDIP52)
- Board:
- 837-9409 F1 Super Lap
+ Board:
+ 837-9409 F1 Super Lap
- EEPROM:
- 14084.17 Rad Rally
- 15612.17 F1 Super Lap
+ EEPROM:
+ 14084.17 Rad Rally
+ 15612.17 F1 Super Lap
Sega System Multi32 Comm PCB 837-8792-91
( http://images.arianchen.de/sega-comm/orunners-front.jpg )
@@ -49,21 +49,21 @@ Sega System Multi32 Comm PCB 837-8792-91
| |---------------------------------| |---------------------------------| |
| CN8 CN9 |
|--------------------------------------------------------------------------------|
- Setup:
- 15033.17 - INTEL D27C100 128k x8 EPROM (DIP32, labelled 'EPR-15033')
- Z80 - Zilog Z0840004PSC Z80 CPU, running at 4.000MHz (DIP40)
- MB89237A - Fujitsu MB89237A DMA-Controller (DIP20) [most likely i8237A clone]
- MB89374 - Fujitsu MB89374 Data Link Controller (SDIP42)
- MB8421 - Fujitsu MB8421-12LP 2k x8 SRAM (SDIP52)
- MB8464A - Fujitsu MB8464-10LL 8k x8 SRAM (DIP28)
- 315-5611 - Lattice GAL16V8A PAL (DIP20)
- 315-5506 - Lattice GAL16V8A PAL (DIP20)
-
- Board:
- 837-8792 OutRunners, Stadium Cross
-
- EEPROM:
- 15033.17 OutRunners, Stadium Cross
+ Setup:
+ 15033.17 - INTEL D27C100 128k x8 EPROM (DIP32, labelled 'EPR-15033')
+ Z80 - Zilog Z0840004PSC Z80 CPU, running at 4.000MHz (DIP40)
+ MB89237A - Fujitsu MB89237A DMA-Controller (DIP20) [most likely i8237A clone]
+ MB89374 - Fujitsu MB89374 Data Link Controller (SDIP42)
+ MB8421 - Fujitsu MB8421-12LP 2k x8 SRAM (SDIP52)
+ MB8464A - Fujitsu MB8464-10LL 8k x8 SRAM (DIP28)
+ 315-5611 - Lattice GAL16V8A PAL (DIP20)
+ 315-5506 - Lattice GAL16V8A PAL (DIP20)
+
+ Board:
+ 837-8792 OutRunners, Stadium Cross
+
+ EEPROM:
+ 15033.17 OutRunners, Stadium Cross
*/
#include "machine/s32comm.h"
@@ -198,7 +198,7 @@ WRITE8_MEMBER(s32comm_device::cn_w)
m_linkalive = 0x00;
m_linkcount = 0x00;
m_linktimer = 0x04; //0x00E8; // 58 fps * 4s
-
+
comm_tick();
}
#endif
@@ -213,7 +213,7 @@ WRITE8_MEMBER(s32comm_device::fg_w)
{
if (!m_cn)
return;
-
+
m_fg = data & 0x01;
}
@@ -229,7 +229,7 @@ void s32comm_device::check_vint_irq()
void s32comm_device::set_linktype(UINT16 linktype)
{
m_linktype = linktype;
-
+
switch (m_linktype)
{
case 14084:
@@ -268,7 +268,7 @@ void s32comm_device::comm_tick()
void s32comm_device::comm_tick_14084()
{
- if (m_linkenable == 0x01)
+ if (m_linkenable == 0x01)
{
int frameStart = 0x0480;
int frameOffset = 0x0000;
@@ -287,21 +287,21 @@ void s32comm_device::comm_tick_14084()
{
// waiting...
m_shared[4] = 0x00;
-
+
// check rx socket
if (!m_line_rx.is_open())
{
printf("S32COMM: listen on %s\n", m_localhost);
m_line_rx.open(m_localhost);
}
-
+
// check tx socket
if (!m_line_tx.is_open())
{
printf("S32COMM: connect to %s\n", m_remotehost);
m_line_tx.open(m_remotehost);
}
-
+
// if both sockets are there check ring
if ((m_line_rx.is_open()) && (m_line_tx.is_open()))
{
@@ -338,7 +338,7 @@ void s32comm_device::comm_tick_14084()
m_line_tx.write(m_buffer, dataSize);
}
}
-
+
// 0xFE - link size
else if (idx == 0xFE)
{
@@ -349,11 +349,11 @@ void s32comm_device::comm_tick_14084()
// slave and relay forward message
m_line_tx.write(m_buffer, dataSize);
}
-
+
// consider it done
printf("S32COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount);
m_linkalive = 0x01;
-
+
// write to shared mem
m_shared[4] = 0x01;
m_shared[1] = m_linkid;
@@ -371,13 +371,13 @@ void s32comm_device::comm_tick_14084()
}
printf("S32COMM: droped a message...\n");
}
-
+
if (m_linkalive == 0x00)
recv = m_line_rx.read(m_buffer, dataSize);
else
recv = 0;
}
-
+
// if we are master and link is not yet established
if (isMaster && (m_linkalive == 0x00))
{
@@ -405,7 +405,7 @@ void s32comm_device::comm_tick_14084()
m_shared[1] = m_linkid;
m_shared[0] = m_linkcount;
}
-
+
else if (m_linktimer > 0x02)
{
// decrease delay timer
@@ -415,7 +415,7 @@ void s32comm_device::comm_tick_14084()
}
}
}
- }
+ }
// update "ring buffer" if link established
if (m_linkalive == 0x01)
@@ -470,7 +470,7 @@ void s32comm_device::comm_tick_14084()
}
recv = m_line_rx.read(m_buffer, dataSize);
}
-
+
// update "ring buffer" if link established
// live relay does not send data
if (m_linkid != 0x00 && m_shared[3] != 0x00)
@@ -486,7 +486,7 @@ void s32comm_device::comm_tick_14084()
// push message to other nodes
m_line_tx.write(m_buffer, dataSize);
- // master sends some additional status bytes
+ // master sends some additional status bytes
if (isMaster){
m_buffer[0] = 0xF0;
for (int j = 0x00 ; j < frameSize ; j++)
@@ -501,16 +501,16 @@ void s32comm_device::comm_tick_14084()
m_line_tx.write(m_buffer, dataSize);
}
}
-
+
// clear 03
m_shared[3] = 0x00;
}
- }
+ }
}
void s32comm_device::comm_tick_15033()
{
- if (m_linkenable == 0x01)
+ if (m_linkenable == 0x01)
{
int frameStartTX = 0x0710;
int frameStartRX = 0x0010;
@@ -540,21 +540,21 @@ void s32comm_device::comm_tick_15033()
{
// waiting...
m_shared[4] = 0x00;
-
+
// check rx socket
if (!m_line_rx.is_open())
{
printf("S32COMM: listen on %s\n", m_localhost);
m_line_rx.open(m_localhost);
}
-
+
// check tx socket
if (!m_line_tx.is_open())
{
printf("S32COMM: connect to %s\n", m_remotehost);
m_line_tx.open(m_remotehost);
}
-
+
// if both sockets are there check ring
if ((m_line_rx.is_open()) && (m_line_tx.is_open()))
{
@@ -591,7 +591,7 @@ void s32comm_device::comm_tick_15033()
m_line_tx.write(m_buffer, dataSize);
}
}
-
+
// 0xFE - link size
else if (idx == 0xFE)
{
@@ -602,11 +602,11 @@ void s32comm_device::comm_tick_15033()
// slave and relay forward message
m_line_tx.write(m_buffer, dataSize);
}
-
+
// consider it done
printf("S32COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount);
m_linkalive = 0x01;
-
+
// write to shared mem
m_shared[4] = 0x01;
m_shared[1] = m_linkid;
@@ -624,13 +624,13 @@ void s32comm_device::comm_tick_15033()
}
printf("S32COMM: droped a message...\n");
}
-
+
if (m_linkalive == 0x00)
recv = m_line_rx.read(m_buffer, dataSize);
else
recv = 0;
}
-
+
// if we are master and link is not yet established
if (isMaster && (m_linkalive == 0x00))
{
@@ -658,7 +658,7 @@ void s32comm_device::comm_tick_15033()
m_shared[1] = m_linkid;
m_shared[0] = m_linkcount;
}
-
+
else if (m_linktimer > 0x02)
{
// decrease delay timer
@@ -668,7 +668,7 @@ void s32comm_device::comm_tick_15033()
}
}
}
- }
+ }
// update "ring buffer" if link established
if (m_linkalive == 0x01)
@@ -723,7 +723,7 @@ void s32comm_device::comm_tick_15033()
}
recv = m_line_rx.read(m_buffer, dataSize);
}
-
+
// update "ring buffer" if link established
// live relay does not send data
if (m_linkid != 0x00 && m_shared[3] != 0x00)
@@ -739,7 +739,7 @@ void s32comm_device::comm_tick_15033()
// push message to other nodes
m_line_tx.write(m_buffer, dataSize);
- // master sends some additional status bytes
+ // master sends some additional status bytes
if (isMaster){
m_buffer[0] = 0xF0;
for (int j = 0x00 ; j < frameSize ; j++)
@@ -757,12 +757,12 @@ void s32comm_device::comm_tick_15033()
// clear 03
m_shared[3] = 0x00;
}
- }
+ }
}
void s32comm_device::comm_tick_15612()
{
- if (m_linkenable == 0x01)
+ if (m_linkenable == 0x01)
{
int frameStart = 0x0010;
int frameOffset = 0x0000;
@@ -781,21 +781,21 @@ void s32comm_device::comm_tick_15612()
{
// waiting...
m_shared[0] = 0x05;
-
+
// check rx socket
if (!m_line_rx.is_open())
{
printf("S32COMM: listen on %s\n", m_localhost);
m_line_rx.open(m_localhost);
}
-
+
// check tx socket
if (!m_line_tx.is_open())
{
printf("S32COMM: connect to %s\n", m_remotehost);
m_line_tx.open(m_remotehost);
}
-
+
// if both sockets are there check ring
if ((m_line_rx.is_open()) && (m_line_tx.is_open()))
{
@@ -832,7 +832,7 @@ void s32comm_device::comm_tick_15612()
m_line_tx.write(m_buffer, dataSize);
}
}
-
+
// 0xFE - link size
else if (idx == 0xFE)
{
@@ -843,11 +843,11 @@ void s32comm_device::comm_tick_15612()
// slave and relay forward message
m_line_tx.write(m_buffer, dataSize);
}
-
+
// consider it done
printf("S32COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount);
m_linkalive = 0x01;
-
+
// write to shared mem
m_shared[0] = 0x01;
m_shared[2] = m_linkid;
@@ -865,13 +865,13 @@ void s32comm_device::comm_tick_15612()
}
printf("S32COMM: droped a message...\n");
}
-
+
if (m_linkalive == 0x00)
recv = m_line_rx.read(m_buffer, dataSize);
else
recv = 0;
}
-
+
// if we are master and link is not yet established
if (isMaster && (m_linkalive == 0x00))
{
@@ -899,7 +899,7 @@ void s32comm_device::comm_tick_15612()
m_shared[2] = m_linkid;
m_shared[3] = m_linkcount;
}
-
+
else if (m_linktimer > 0x02)
{
// decrease delay timer
@@ -909,7 +909,7 @@ void s32comm_device::comm_tick_15612()
}
}
}
- }
+ }
// update "ring buffer" if link established
if (m_linkalive == 0x01)
@@ -964,7 +964,7 @@ void s32comm_device::comm_tick_15612()
}
recv = m_line_rx.read(m_buffer, dataSize);
}
-
+
// update "ring buffer" if link established
// live relay does not send data
if (m_linkid != 0x00 && m_shared[4] != 0x00)
@@ -980,7 +980,7 @@ void s32comm_device::comm_tick_15612()
// push message to other nodes
m_line_tx.write(m_buffer, dataSize);
- // master sends some additional status bytes
+ // master sends some additional status bytes
if (isMaster){
m_buffer[0] = 0xF0;
for (int j = 0x00 ; j < frameSize ; j++)
diff --git a/src/mame/machine/s32comm.h b/src/mame/machine/s32comm.h
index e76cba98862..776f593e245 100644
--- a/src/mame/machine/s32comm.h
+++ b/src/mame/machine/s32comm.h
@@ -11,7 +11,7 @@
#define MCFG_S32COMM_ADD(_tag ) \
MCFG_DEVICE_ADD(_tag, S32COMM, 0)
-
+
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
@@ -45,7 +45,7 @@ public:
DECLARE_READ8_MEMBER(fg_r);
DECLARE_WRITE8_MEMBER(fg_w);
- // IRQ logic - 5 = VINT, 7 = DLC
+ // IRQ logic - 5 = VINT, 7 = DLC
void check_vint_irq();
#ifdef __S32COMM_SIMULATION__
void set_linktype(UINT16 linktype);
@@ -58,16 +58,16 @@ protected:
private:
UINT8 m_shared[0x800]; // 2k shared memory
- UINT8 m_zfg; // z80 flip gate? purpose unknown, bit0 is stored
- UINT8 m_cn; // bit0 is used to enable/disable the comm board
- UINT8 m_fg; // flip gate? purpose unknown, bit0 is stored, bit7 is connected to ZFG bit 0
-
+ UINT8 m_zfg; // z80 flip gate? purpose unknown, bit0 is stored
+ UINT8 m_cn; // bit0 is used to enable/disable the comm board
+ UINT8 m_fg; // flip gate? purpose unknown, bit0 is stored, bit7 is connected to ZFG bit 0
+
emu_file m_line_rx; // rx line - can be either differential, simple serial or toslink
emu_file m_line_tx; // tx line - is differential, simple serial and toslink
char m_localhost[256];
char m_remotehost[256];
UINT8 m_buffer[0x800];
-
+
#ifdef __S32COMM_SIMULATION__
UINT8 m_linkenable;
UINT16 m_linktimer;
@@ -76,9 +76,9 @@ private:
UINT8 m_linkcount;
UINT16 m_linktype;
-
+
void comm_tick();
-
+
void comm_tick_14084();
void comm_tick_15033();
void comm_tick_15612();
diff --git a/src/mame/machine/segacrp2.c b/src/mame/machine/segacrp2.c
index b5cff3a5d0e..8c326441755 100644
--- a/src/mame/machine/segacrp2.c
+++ b/src/mame/machine/segacrp2.c
@@ -48,7 +48,7 @@
void sega_decode_2(UINT8 *rom, UINT8 *decrypted,
- const UINT8 xor_table[128],const int swap_table[128])
+ const UINT8 xor_table[128],const int swap_table[128])
{
static const UINT8 swaptable[24][4] =
{
diff --git a/src/mame/machine/segacrp2.h b/src/mame/machine/segacrp2.h
index a842ef8096b..3c30b8771ae 100644
--- a/src/mame/machine/segacrp2.h
+++ b/src/mame/machine/segacrp2.h
@@ -2,6 +2,6 @@
// copyright-holders:Nicola Salmoria
void sega_decode_2(UINT8 *rom, UINT8 *decrypted,
- const UINT8 xor_table[128],const int swap_table[128]);
+ const UINT8 xor_table[128],const int swap_table[128]);
void sega_decode_317(UINT8 *rom, UINT8 *decrypted, int shift);
diff --git a/src/mame/mess.lst b/src/mame/mess.lst
index e1d86f829e1..40748282b20 100644
--- a/src/mame/mess.lst
+++ b/src/mame/mess.lst
@@ -1580,7 +1580,7 @@ fsa1gt
fsa1st
// Microsoft
-xbox
+xbox
// NASCOM Microcomputers
nascom1 // 1978 Nascom 1
diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c
index 122285f9674..eed824f4067 100644
--- a/src/mame/video/deco32.c
+++ b/src/mame/video/deco32.c
@@ -159,7 +159,7 @@ void deco32_state::video_start()
VIDEO_START_MEMBER(deco32_state,captaven)
{
m_has_ace_ram=0;
-
+
deco32_state::video_start();
}
@@ -168,7 +168,7 @@ VIDEO_START_MEMBER(deco32_state,fghthist)
m_dirty_palette = auto_alloc_array(machine(), UINT8, 4096);
m_sprgen->alloc_sprite_bitmap();
m_has_ace_ram=0;
-
+
save_pointer(NAME(m_dirty_palette), 4096);
deco32_state::video_start();
}
@@ -184,12 +184,12 @@ VIDEO_START_MEMBER(deco32_state,nslasher)
m_sprgen2->alloc_sprite_bitmap();
memset(m_dirty_palette,0,4096);
m_has_ace_ram=1;
-
+
save_pointer(NAME(m_dirty_palette), 4096);
save_item(NAME(m_ace_ram_dirty));
save_item(NAME(m_spriteram16_2));
save_item(NAME(m_spriteram16_2_buffered));
-
+
deco32_state::video_start();
}
@@ -207,7 +207,7 @@ VIDEO_START_MEMBER(dragngun_state,dragngun)
m_screen->register_screen_bitmap(m_temp_render_bitmap);
memset(m_dirty_palette,0,4096);
-
+
m_has_ace_ram=0;
save_item(NAME(m_sprite_ctrl));
diff --git a/src/mame/video/hexion.c b/src/mame/video/hexion.c
index 30e867a1428..566a74230ee 100644
--- a/src/mame/video/hexion.c
+++ b/src/mame/video/hexion.c
@@ -51,7 +51,7 @@ void hexion_state::video_start()
m_vram[0] = memregion("maincpu")->base() + 0x30000;
m_vram[1] = m_vram[0] + 0x2000;
m_unkram = m_vram[1] + 0x2000;
-
+
membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base() + 0x10000, 0x2000);
}
diff --git a/src/mame/video/itech8.c b/src/mame/video/itech8.c
index a6be480e81f..a96770f90c5 100644
--- a/src/mame/video/itech8.c
+++ b/src/mame/video/itech8.c
@@ -149,7 +149,7 @@ void itech8_state::video_start()
/* fetch the GROM base */
m_grom_base = memregion("grom")->base();
m_grom_size = memregion("grom")->bytes();
-
+
save_item(NAME(m_blitter_data));
save_item(NAME(m_blit_in_progress));
save_item(NAME(m_page_select));
diff --git a/src/mame/video/namcona1.c b/src/mame/video/namcona1.c
index 9b37ca88f40..0c7c9bd6e8a 100644
--- a/src/mame/video/namcona1.c
+++ b/src/mame/video/namcona1.c
@@ -185,10 +185,10 @@ void namcona1_state::video_start()
m_shaperam.resize(0x8000);
m_gfxdecode->gfx(2)->set_source(&m_shaperam[0]);
-
+
save_item(NAME(m_shaperam));
save_item(NAME(m_palette_is_dirty));
-
+
machine().save().register_postload(save_prepost_delegate(FUNC(namcona1_state::postload), this));
} /* video_start */
diff --git a/src/mame/video/naughtyb.c b/src/mame/video/naughtyb.c
index 137a5bd71e7..e1114c84fe0 100644
--- a/src/mame/video/naughtyb.c
+++ b/src/mame/video/naughtyb.c
@@ -107,7 +107,7 @@ void naughtyb_state::video_start()
/* Naughty Boy has a virtual screen twice as large as the visible screen */
m_tmpbitmap.allocate(68*8,28*8,m_screen->format());
-
+
save_item(NAME(m_cocktail));
save_item(NAME(m_palreg));
save_item(NAME(m_bankreg));
diff --git a/src/mame/video/nbmj9195.c b/src/mame/video/nbmj9195.c
index e77948865ab..0632e64ddd4 100644
--- a/src/mame/video/nbmj9195.c
+++ b/src/mame/video/nbmj9195.c
@@ -372,7 +372,7 @@ VIDEO_START_MEMBER(nbmj9195_state,_1layer)
{
int width = m_screen->width();
int height = m_screen->height();
-
+
m_blitter_timer = timer_alloc(TIMER_BLITTER);
m_screen->register_screen_bitmap(m_tmpbitmap[0]);
@@ -381,7 +381,7 @@ VIDEO_START_MEMBER(nbmj9195_state,_1layer)
m_scanline[0] = m_scanline[1] = SCANLINE_MIN;
m_nb19010_busyflag = 1;
m_gfxdraw_mode = 0;
-
+
save_item(NAME(m_scrollx));
save_item(NAME(m_scrolly));
save_item(NAME(m_scrollx_raster));
@@ -424,7 +424,7 @@ void nbmj9195_state::video_start()
m_nb19010_busyflag = 1;
m_gfxdraw_mode = 1;
m_screen_refresh = 1;
-
+
save_item(NAME(m_scrollx));
save_item(NAME(m_scrolly));
save_item(NAME(m_scrollx_raster));
diff --git a/src/mame/video/segas32.c b/src/mame/video/segas32.c
index 65458e8bee9..55aa4c4dd75 100644
--- a/src/mame/video/segas32.c
+++ b/src/mame/video/segas32.c
@@ -1103,10 +1103,10 @@ void segas32_state::update_tilemap_rowscroll(screen_device &screen, struct segas
if (!flipx)
{
srcx = cliprect.min_x + xscroll;
- srcxstep = 1;
+ srcxstep = 1;
}
else
- {
+ {
srcx = cliprect.max_x + xscroll;
srcxstep = -1;
}
diff --git a/src/mame/video/shadfrce.c b/src/mame/video/shadfrce.c
index 5a01b4d7b58..c492790efb5 100644
--- a/src/mame/video/shadfrce.c
+++ b/src/mame/video/shadfrce.c
@@ -103,8 +103,6 @@ WRITE16_MEMBER(shadfrce_state::bg1scrolly_w)
void shadfrce_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int y_offset )
{
-
-
/* | ---- ---- hhhf Fe-Y | ---- ---- yyyy yyyy | ---- ---- TTTT TTTT | ---- ---- tttt tttt |
| ---- ---- -pCc cccX | ---- ---- xxxx xxxx | ---- ---- ---- ---- | ---- ---- ---- ---- | */
@@ -125,7 +123,6 @@ void shadfrce_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, c
int hcount;
while (source >= finish)
{
-
int enable = ((source[0] & 0x0004));
if (enable)
diff --git a/src/mame/video/starcrus.c b/src/mame/video/starcrus.c
index 69a080d653a..776632ac165 100644
--- a/src/mame/video/starcrus.c
+++ b/src/mame/video/starcrus.c
@@ -26,7 +26,7 @@ void starcrus_state::video_start()
m_proj1_vid = auto_bitmap_ind16_alloc(machine(), 16, 16);
m_proj2_vid = auto_bitmap_ind16_alloc(machine(), 16, 16);
-
+
save_item(NAME(m_s1_x));
save_item(NAME(m_s1_y));
save_item(NAME(m_s2_x));
diff --git a/src/mame/video/taitoair.c b/src/mame/video/taitoair.c
index 16af0809cd7..65b70726f44 100644
--- a/src/mame/video/taitoair.c
+++ b/src/mame/video/taitoair.c
@@ -96,16 +96,16 @@ int taitoair_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec
for (offs = start_offset; offs >= 0; offs -= 0x008 / 2)
{
/*!
- Starting at a particular sequence, sprite DMA seems to stop there and resume via "something",
+ Starting at a particular sequence, sprite DMA seems to stop there and resume via "something",
effectively drawing any other sprite with better priority in the framebuffer scheme of things.
-
- @todo reported sequence for DMA pause flag is 0x0c** 0x0000 0x0000 0x0000.
- Verify how exactly via HW test. Continuing may be determined by a DMA bit write.
+
+ @todo reported sequence for DMA pause flag is 0x0c** 0x0000 0x0000 0x0000.
+ Verify how exactly via HW test. Continuing may be determined by a DMA bit write.
*/
if(m_tc0080vco->sprram_r(space, offs + 0, 0xffff) == 0xc00 ||
- m_tc0080vco->sprram_r(space, offs + 0, 0xffff) == 0xcff) // Air Inferno
+ m_tc0080vco->sprram_r(space, offs + 0, 0xffff) == 0xcff) // Air Inferno
return offs - 8/2;
-
+
x0 = m_tc0080vco->sprram_r(space, offs + 1, 0xffff) & 0x3ff;
y0 = m_tc0080vco->sprram_r(space, offs + 0, 0xffff) & 0x3ff;
zoomx = (m_tc0080vco->sprram_r(space, offs + 2, 0xffff) & 0x7f00) >> 8;
@@ -113,7 +113,7 @@ int taitoair_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec
tile_offs = (m_tc0080vco->sprram_r(space, offs + 3, 0xffff) & 0x1fff) << 2;
ysize = size[(m_tc0080vco->sprram_r(space, offs, 0xffff) & 0x0c00) >> 10];
-
+
if (tile_offs)
{
/* Convert zoomy value to real value as zoomx */
@@ -198,7 +198,7 @@ int taitoair_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec
}
}
}
-
+
return 0;
}
@@ -401,7 +401,7 @@ void taitoair_state::fb_copy_op()
cliprect.min_y = 3*16;
cliprect.max_x = m_screen->width() - 1;
cliprect.max_y = m_screen->height() - 1;
-
+
/* clear screen fb */
m_framebuffer[1]->fill(0, cliprect);
/* copy buffer fb into screen fb (at this stage we are ready to draw) */
@@ -421,7 +421,7 @@ void taitoair_state::fb_erase_op()
cliprect.min_y = 3*16;
cliprect.max_x = m_screen->width() - 1;
cliprect.max_y = m_screen->height() - 1;
-
+
m_framebuffer[0]->fill(0, cliprect);
//m_framebuffer[1]->fill(0, cliprect);
}
@@ -437,7 +437,7 @@ void taitoair_state::fb_fill_op()
cliprect.min_y = 3*16;
cliprect.max_x = m_screen->width() - 1;
cliprect.max_y = m_screen->height() - 1;
-
+
if (m_line_ram[0x3fff])
{
int adr = 0x3fff;
@@ -542,16 +542,16 @@ UINT32 taitoair_state::screen_update_taitoair(screen_device &screen, bitmap_ind1
}
if(m_gradbank == true)
base|= 0x1000;
-
+
*dest++ = base | (cntr >= 0x83f000 ? 0x3f : (cntr >> 12) & 0x3f);
-
+
c1b += inc1x;
c2b += inc2x;
}
counter1 += inc1y;
counter2 += inc2y;
}
-
+
copybitmap_trans(bitmap, *m_framebuffer[1], 0, 0, 0, 0, cliprect, 0);
@@ -560,8 +560,8 @@ UINT32 taitoair_state::screen_update_taitoair(screen_device &screen, bitmap_ind1
sprite_ptr = draw_sprites(bitmap, cliprect);
- m_tc0080vco->tilemap_draw(screen, bitmap, cliprect, 1, 0, 0);
-
+ m_tc0080vco->tilemap_draw(screen, bitmap, cliprect, 1, 0, 0);
+
m_tc0080vco->tilemap_draw(screen, bitmap, cliprect, 2, 0, 0);
draw_sprites(bitmap, cliprect, sprite_ptr);
diff --git a/src/mame/video/tank8.c b/src/mame/video/tank8.c
index 503d2e64c89..52af82e0724 100644
--- a/src/mame/video/tank8.c
+++ b/src/mame/video/tank8.c
@@ -111,7 +111,7 @@ void tank8_state::video_start()
/* VBLANK starts on scanline #256 and ends on scanline #24 */
m_tilemap->set_scrolly(0, 2 * 24);
-
+
save_item(NAME(m_collision_index));
}
diff --git a/src/mame/video/vsystem_spr.c b/src/mame/video/vsystem_spr.c
index 411bce03264..7b74e66851c 100644
--- a/src/mame/video/vsystem_spr.c
+++ b/src/mame/video/vsystem_spr.c
@@ -85,7 +85,7 @@ vsystem_spr_device::vsystem_spr_device(const machine_config &mconfig, const char
m_pal_mask = 0x3f;
m_newtilecb = vsystem_tile_indirection_delegate(FUNC(vsystem_spr_device::tile_callback_noindirect), this);
-
+
memset(&m_curr_sprite, 0, sizeof(m_curr_sprite));
}
@@ -177,9 +177,9 @@ void vsystem_spr_device::device_start()
{
// bind our handler
m_newtilecb.bind_relative_to(*owner());
-
+
save_item(NAME(m_pal_base));
-
+
save_item(NAME(m_curr_sprite.ox));
save_item(NAME(m_curr_sprite.xsize));
save_item(NAME(m_curr_sprite.zoomx));
diff --git a/src/mess/drivers/apple2.c b/src/mess/drivers/apple2.c
index b6b71ffcdd3..e3efb25683b 100644
--- a/src/mess/drivers/apple2.c
+++ b/src/mess/drivers/apple2.c
@@ -1569,8 +1569,8 @@ COMP( 198?, elppa, apple2, 0, apple2p, apple2p, driver_device,
COMP( 1982, maxxi, apple2, 0, apple2p, apple2p, driver_device, 0, "Polymax", "Maxxi", GAME_SUPPORTS_SAVE )
COMP( 1982, prav82, apple2, 0, apple2p, apple2p, driver_device, 0, "Pravetz", "Pravetz 82", GAME_SUPPORTS_SAVE )
COMP( 1982, ace100, apple2, 0, apple2, apple2p, driver_device, 0, "Franklin Computer", "Franklin Ace 100", GAME_SUPPORTS_SAVE )
-COMP( 1982, uniap2en, apple2, 0, apple2p, apple2p, driver_device, 0, "Unitron Eletrônica", "Unitron AP II (in English)", GAME_SUPPORTS_SAVE )
-COMP( 1982, uniap2pt, apple2, 0, apple2p, apple2p, driver_device, 0, "Unitron Eletrônica", "Unitron AP II (in Brazilian Portuguese)", GAME_SUPPORTS_SAVE )
+COMP( 1982, uniap2en, apple2, 0, apple2p, apple2p, driver_device, 0, "Unitron Eletr??nica", "Unitron AP II (in English)", GAME_SUPPORTS_SAVE )
+COMP( 1982, uniap2pt, apple2, 0, apple2p, apple2p, driver_device, 0, "Unitron Eletr??nica", "Unitron AP II (in Brazilian Portuguese)", GAME_SUPPORTS_SAVE )
COMP( 1983, agat7, apple2, 0, apple2p, apple2p, driver_device, 0, "Agat", "Agat-7", GAME_NOT_WORKING) // disk controller ROM JSRs to $FCA8 which is a delay on apple II, illegal instruction crash here :(
// reverse font direction -\/
COMP( 1984, ivelultr, apple2, 0, apple2p, apple2p, driver_device, 0, "Ivasim", "Ivel Ultra", GAME_SUPPORTS_SAVE )
diff --git a/src/mess/drivers/casloopy.c b/src/mess/drivers/casloopy.c
index d2a957c5a96..86ac1c94702 100644
--- a/src/mess/drivers/casloopy.c
+++ b/src/mess/drivers/casloopy.c
@@ -420,7 +420,7 @@ static ADDRESS_MAP_START( casloopy_map, AS_PROGRAM, 32, casloopy_state )
AM_RANGE(0x04051000, 0x040511ff) AM_READWRITE16(pal_r, pal_w, 0xffffffff)
AM_RANGE(0x04058000, 0x04058007) AM_READWRITE16(vregs_r, vregs_w, 0xffffffff)
AM_RANGE(0x0405b000, 0x0405b00f) AM_RAM AM_SHARE("vregs") // RGB555 brightness control plus scrolling
-// AM_RANGE(0x05ffff00, 0x05ffffff) AM_READWRITE16(sh7021_r, sh7021_w, 0xffffffff)
+// AM_RANGE(0x05ffff00, 0x05ffffff) AM_READWRITE16(sh7021_r, sh7021_w, 0xffffffff)
// AM_RANGE(0x05ffff00, 0x05ffffff) - SH7021 internal i/o
AM_RANGE(0x06000000, 0x061fffff) AM_READ(cart_r)
AM_RANGE(0x07000000, 0x070003ff) AM_RAM AM_SHARE("oram")// on-chip RAM, actually at 0xf000000 (1 kb)
diff --git a/src/mess/drivers/coleco.c b/src/mess/drivers/coleco.c
index 435b20060c3..7f8d4be28d8 100644
--- a/src/mess/drivers/coleco.c
+++ b/src/mess/drivers/coleco.c
@@ -354,7 +354,7 @@ ROM_END
Unreleased Brazilian Colecovision clone by Microdigital.
It was never released and the only known prototypes were uncovered by an ex-employee of Microdigital
- called Cláudio Cassens who donated it to collectors (Eduardo Luccas) in June 2015.
+ called Cl??udio Cassens who donated it to collectors (Eduardo Luccas) in June 2015.
-- Felipe Sanches
*/
ROM_START (onyx)
diff --git a/src/mess/drivers/daruma.c b/src/mess/drivers/daruma.c
index 03e19e82a76..29f0c6df69d 100644
--- a/src/mess/drivers/daruma.c
+++ b/src/mess/drivers/daruma.c
@@ -23,127 +23,127 @@
class daruma_state : public driver_device
{
public:
- daruma_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
+ daruma_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
+ m_maincpu(*this, "maincpu"),
m_speaker(*this, "speaker") { }
- DECLARE_WRITE8_MEMBER(port_w);
- DECLARE_READ8_MEMBER(port_r);
+ DECLARE_WRITE8_MEMBER(port_w);
+ DECLARE_READ8_MEMBER(port_r);
DECLARE_READ8_MEMBER(dev0_r);
DECLARE_WRITE8_MEMBER(dev1_w);
DECLARE_WRITE8_MEMBER(dev2_w);
DECLARE_READ8_MEMBER(dev4_r);
- required_device<cpu_device> m_maincpu;
+ required_device<cpu_device> m_maincpu;
required_device<speaker_sound_device> m_speaker;
- char port0, port1, port2, port3;
+ char port0, port1, port2, port3;
};
WRITE8_MEMBER(daruma_state::port_w)
{
// printf("port_w: write %02X to PORT (offset=%02X)\n", data, offset);
- switch(offset)
- {
- case MCS51_PORT_P0: port0=data;
- case MCS51_PORT_P1: port1=data;
- case MCS51_PORT_P2: port2=data;
- case MCS51_PORT_P3: port3=data;
- }
+ switch(offset)
+ {
+ case MCS51_PORT_P0: port0=data;
+ case MCS51_PORT_P1: port1=data;
+ case MCS51_PORT_P2: port2=data;
+ case MCS51_PORT_P3: port3=data;
+ }
}
READ8_MEMBER(daruma_state::port_r)
{
- switch(offset)
- {
- case MCS51_PORT_P0: printf("port_r: read %02X from PORT0\n", port0); return port0;
- case MCS51_PORT_P1: printf("port_r: read %02X from PORT1\n", port1); return port1;
- case MCS51_PORT_P2: printf("port_r: read %02X from PORT2\n", port2); return port2;
- case MCS51_PORT_P3: printf("port_r: read %02X from PORT3\n", port3); return port3;
- }
- return 0;
+ switch(offset)
+ {
+ case MCS51_PORT_P0: printf("port_r: read %02X from PORT0\n", port0); return port0;
+ case MCS51_PORT_P1: printf("port_r: read %02X from PORT1\n", port1); return port1;
+ case MCS51_PORT_P2: printf("port_r: read %02X from PORT2\n", port2); return port2;
+ case MCS51_PORT_P3: printf("port_r: read %02X from PORT3\n", port3); return port3;
+ }
+ return 0;
}
READ8_MEMBER(daruma_state::dev0_r)
{
- return 0xFF;
+ return 0xFF;
}
READ8_MEMBER(daruma_state::dev4_r)
{
- return ioport("switches")->read();
+ return ioport("switches")->read();
}
WRITE8_MEMBER(daruma_state::dev1_w)
{
- //while attempting to identify which bit is used for
- //controlling the buzzer, here's what I heard from each of
- //the signals on this address:
-
- //0x80 serial comm.? (noise)
- //0x20 LED? (3 clicks)
- //0x10 LED? (1 click)
- //0x08 serial comm.? click & noise
- //0x04 LED? (2 clicks)
- //0x02 motor control or printer heads? (I hear a series of rhythmic pulses)
- //0x01 LED? (2 clicks)
+ //while attempting to identify which bit is used for
+ //controlling the buzzer, here's what I heard from each of
+ //the signals on this address:
+
+ //0x80 serial comm.? (noise)
+ //0x20 LED? (3 clicks)
+ //0x10 LED? (1 click)
+ //0x08 serial comm.? click & noise
+ //0x04 LED? (2 clicks)
+ //0x02 motor control or printer heads? (I hear a series of rhythmic pulses)
+ //0x01 LED? (2 clicks)
m_speaker->level_w(data & 0x02);
}
WRITE8_MEMBER(daruma_state::dev2_w)
{
- //while attempting to identify which bit is used for
- //controlling the buzzer, here's what I heard from each of
- //the signals on this address:
-
- //0x80: LED? (3 clicks)
- //0x40: unused?
- //0x20: unused?
- //0x10: low freq brief beep followed by a click
- //0x08: low freq brief noise followed by a click
- //0x04: low freq brief beep followed by a click
- //0x02: low freq brief beep followed by a click
- //0x01: low freq brief noise
+ //while attempting to identify which bit is used for
+ //controlling the buzzer, here's what I heard from each of
+ //the signals on this address:
+
+ //0x80: LED? (3 clicks)
+ //0x40: unused?
+ //0x20: unused?
+ //0x10: low freq brief beep followed by a click
+ //0x08: low freq brief noise followed by a click
+ //0x04: low freq brief beep followed by a click
+ //0x02: low freq brief beep followed by a click
+ //0x01: low freq brief noise
//m_speaker->level_w(data & 0x01);
}
static ADDRESS_MAP_START( mem_prg, AS_PROGRAM, 8, daruma_state )
- AM_RANGE(0x0000, 0xffff) AM_ROM
+ AM_RANGE(0x0000, 0xffff) AM_ROM
ADDRESS_MAP_END
static ADDRESS_MAP_START( mem_io, AS_IO, 8, daruma_state )
- AM_RANGE(0x0000, 0x0000) AM_READ(dev0_r)
- AM_RANGE(0x1000, 0x1000) AM_WRITE(dev1_w)
+ AM_RANGE(0x0000, 0x0000) AM_READ(dev0_r)
+ AM_RANGE(0x1000, 0x1000) AM_WRITE(dev1_w)
// AM_RANGE(0x2000, 0x2000) AM_WRITE(dev2_w)
// AM_RANGE(0x3000, 0x3000) AM_WRITE(dev3_w)
- AM_RANGE(0x4000, 0x4000) AM_READ(dev4_r)
- AM_RANGE(0x8000, 0xffff) AM_RAM /* 32K CMOS SRAM (HYUNDAY hy62256a) */
- AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P3) AM_READWRITE(port_r, port_w)
+ AM_RANGE(0x4000, 0x4000) AM_READ(dev4_r)
+ AM_RANGE(0x8000, 0xffff) AM_RAM /* 32K CMOS SRAM (HYUNDAY hy62256a) */
+ AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P3) AM_READWRITE(port_r, port_w)
ADDRESS_MAP_END
//TODO: These buttons and switches are all guesses. We'll need to further investigate this.
static INPUT_PORTS_START( daruma )
- PORT_START("buttons")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Paper A") PORT_CODE(KEYCODE_A)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Paper B") PORT_CODE(KEYCODE_B)
-
- PORT_START("switches")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN)
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN)
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNKNOWN)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN)
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Limit Switch") PORT_CODE(KEYCODE_S)
+ PORT_START("buttons")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Paper A") PORT_CODE(KEYCODE_A)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Paper B") PORT_CODE(KEYCODE_B)
+
+ PORT_START("switches")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN)
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN)
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNKNOWN)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN)
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Limit Switch") PORT_CODE(KEYCODE_S)
INPUT_PORTS_END
static MACHINE_CONFIG_START( daruma, daruma_state )
- /* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C32,11059200) //verified on pcb
- MCFG_CPU_PROGRAM_MAP(mem_prg)
- MCFG_CPU_IO_MAP(mem_io)
+ /* basic machine hardware */
+ MCFG_CPU_ADD("maincpu", I80C32,11059200) //verified on pcb
+ MCFG_CPU_PROGRAM_MAP(mem_prg)
+ MCFG_CPU_IO_MAP(mem_io)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -161,8 +161,8 @@ static MACHINE_CONFIG_START( daruma, daruma_state )
MACHINE_CONFIG_END
ROM_START( ds348 )
- ROM_REGION( 0x10000, "maincpu", 0 )
- ROM_LOAD( "daruma_ds348_v1_1.rom", 0x0000, 0x10000, CRC(10bf9036) SHA1(d654a13bc582f5384e759ec6fe5309a642bd8e18) )
+ ROM_REGION( 0x10000, "maincpu", 0 )
+ ROM_LOAD( "daruma_ds348_v1_1.rom", 0x0000, 0x10000, CRC(10bf9036) SHA1(d654a13bc582f5384e759ec6fe5309a642bd8e18) )
ROM_END
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
diff --git a/src/mess/drivers/force68k.c b/src/mess/drivers/force68k.c
index 7bbf42b6b70..6a74bc8bc2e 100644
--- a/src/mess/drivers/force68k.c
+++ b/src/mess/drivers/force68k.c
@@ -1,5 +1,5 @@
// license:BSD-3-Clause
-// copyright-holders:Joakim Larsson Edström
+// copyright-holders:Joakim Larsson Edstr??m
/***************************************************************************
Force SYS68K CPU-1/CPU-6 VME SBC drivers, initially based on the 68ksbc.c
@@ -7,7 +7,7 @@
13/06/2015
The info found on the links below is for a later revisions of the board I have
- but I hope it is somewhat compatible so I can get it up and running at least.
+ but I hope it is somewhat compatible so I can get it up and running at least.
My CPU-1 board has proms from 1983 and no rev markings so probably the original.
http://bitsavers.trailing-edge.com/pdf/forceComputers/1988_Force_VMEbus_Products.pdf
@@ -27,7 +27,7 @@ OAO 000 - OBF FFF USER EPROMArea
0C0 041 - 0C0 043 ACIA (P3) Host
0C0 080 - 0C0 082 ACIA (P4) Terminal
0C0 101 - 0C0 103 ACIA (P5) Remote device (eg serial printer)
-0C0 401 - 0C0 42F RTC
+0C0 401 - 0C0 42F RTC
OEO 001 - 0E0 035 PI/T (eg centronics printer)
OEO 200 - 0E0 2FF FPU
OEO 300 - 0E0 300 Reset Off
@@ -59,28 +59,28 @@ Off board Sources (other VME boards)
10. The VMEbus
---------------
-The implemented VMEbus Interface includes 24 address, 16 data,
+The implemented VMEbus Interface includes 24 address, 16 data,
6 address modifier and the asynchronous control signals.
-A single level bus arbiter is provided to build multi master
-systems. In addition to the bus arbiter, a separate slave bus
+A single level bus arbiter is provided to build multi master
+systems. In addition to the bus arbiter, a separate slave bus
arbitration allows selection of the arbitration level (0-3).
-The address modifier range .,Short 110 Access« can be selected
-via a jumper for variable system generation. The 7 interrupt
-request levels of the VMEbus are fully supported from the
-SYS68K1CPU-1 B/D. For multi-processing, each IRQ signal can be
+The address modifier range .,Short 110 Access?? can be selected
+via a jumper for variable system generation. The 7 interrupt
+request levels of the VMEbus are fully supported from the
+SYS68K1CPU-1 B/D. For multi-processing, each IRQ signal can be
enabled/disabled via a jumper field.
-Additionally, the SYS68K1CPU-1 B/D supports the ACFAIL, SYSRESET,
+Additionally, the SYS68K1CPU-1 B/D supports the ACFAIL, SYSRESET,
SYSFAIL and SYSCLK signal (16 MHz).
TODO:
- - Finish 2 x ACIA6850, host and remote interface left, terminal works
+ - Finish 2 x ACIA6850, host and remote interface left, terminal works
- Finish 1 x 68230 Motorola, Parallel Interface / Timer
- Connect Port B to a Centronics printer interface
- Add 1 x Abort Switch
- - Add configurable serial connector between ACIA:s and
+ - Add configurable serial connector between ACIA:s and
- Real terminal emulator, ie rs232 "socket"
- Debug console
- Add VME bus driver
@@ -97,9 +97,9 @@ SYSFAIL and SYSCLK signal (16 MHz).
#define BAUDGEN_CLOCK XTAL_1_8432MHz
/*
- The baudrate on the Force68k CPU-1 to CPU-6 is generated by a
- Motorola 14411 bitrate generator, the CPU-6 documents matches the circuits
- that I could find on the CPU-1 board. Here how I calculated the clock for
+ The baudrate on the Force68k CPU-1 to CPU-6 is generated by a
+ Motorola 14411 bitrate generator, the CPU-6 documents matches the circuits
+ that I could find on the CPU-1 board. Here how I calculated the clock for
the factory settings. No need to add selectors until terminal.c supports
configurable baudrates. Fortunality CPU-1 was shipped with 9600N8!
@@ -107,7 +107,7 @@ SYSFAIL and SYSCLK signal (16 MHz).
3 RS232C interfaces, strap selectable baud rate from 110-9600 or 600-19200 baud
- Default Jumper Settings of B7:
+ Default Jumper Settings of B7:
--------------------------------
GND 10 - 11 RSA input on 14411
F1 on 14411 1 - 20 Baud selector of the terminal port
@@ -117,7 +117,7 @@ SYSFAIL and SYSCLK signal (16 MHz).
The RSB input on the 14411 is kept high always so RSA=0, RSB=1 and a 1.8432MHz crystal
generates 153600 on the F1 output pin which by default strapping is connected to all
three 6850 acias on the board. These can be strapped separatelly to speedup downloads.
-
+
The selectable outputs from 14411, F1-F16:
X16 RSA=0,RSB=1: 153600, 115200, 76800, 57600, 38400, 28800, 19200, 9600, 4800, 3200, 2153.3, 1758.8, 1200, 921600, 1843000
X64 RSA=1,RSB=1: 614400, 460800, 307200, 230400, 153600, 115200, 76800, 57600, 38400, 28800, 19200, 9600, 4800, 921600, 1843000
@@ -133,13 +133,13 @@ class force68k_state : public driver_device
public:
force68k_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
- // m_rtc(*this, "rtc")
- m_maincpu(*this, "maincpu"),
- m_rtc(*this, "rtc"),
- m_pit(*this, "pit"),
- m_aciahost(*this, "aciahost"),
- m_aciaterm(*this, "aciaterm"),
- m_aciaremt(*this, "aciaremt")
+ // m_rtc(*this, "rtc")
+ m_maincpu(*this, "maincpu"),
+ m_rtc(*this, "rtc"),
+ m_pit(*this, "pit"),
+ m_aciahost(*this, "aciahost"),
+ m_aciaterm(*this, "aciaterm"),
+ m_aciaremt(*this, "aciaremt")
{
}
@@ -162,19 +162,19 @@ private:
};
static ADDRESS_MAP_START(force68k_mem, AS_PROGRAM, 16, force68k_state)
- ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0x000000, 0x000007) AM_ROM AM_READ(bootvect_r) /* Vectors mapped from System EPROM */
- AM_RANGE(0x000008, 0x01ffff) AM_RAM /* DRAM */
- AM_RANGE(0x080000, 0x09ffff) AM_ROM /* System EPROM Area */
-// AM_RANGE(0x0a0000, 0x0bffff) AM_ROM /* User EPROM Area */
+ ADDRESS_MAP_UNMAP_HIGH
+ AM_RANGE(0x000000, 0x000007) AM_ROM AM_READ(bootvect_r) /* Vectors mapped from System EPROM */
+ AM_RANGE(0x000008, 0x01ffff) AM_RAM /* DRAM */
+ AM_RANGE(0x080000, 0x09ffff) AM_ROM /* System EPROM Area */
+// AM_RANGE(0x0a0000, 0x0bffff) AM_ROM /* User EPROM Area */
AM_RANGE(0x0c0040, 0x0c0041) AM_DEVREADWRITE8("aciahost", acia6850_device, status_r, control_w, 0x00ff)
AM_RANGE(0x0c0042, 0x0c0043) AM_DEVREADWRITE8("aciahost", acia6850_device, data_r, data_w, 0x00ff)
AM_RANGE(0x0c0080, 0x0c0081) AM_DEVREADWRITE8("aciaterm", acia6850_device, status_r, control_w, 0xff00)
AM_RANGE(0x0c0082, 0x0c0083) AM_DEVREADWRITE8("aciaterm", acia6850_device, data_r, data_w, 0xff00)
AM_RANGE(0x0c0100, 0x0c0101) AM_DEVREADWRITE8("aciaremt", acia6850_device, status_r, control_w, 0x00ff)
AM_RANGE(0x0c0102, 0x0c0103) AM_DEVREADWRITE8("aciaremt", acia6850_device, data_r, data_w, 0x00ff)
- AM_RANGE(0x0c0400, 0x0c042f) AM_DEVREADWRITE8("rtc", mm58167_device, read, write, 0x00ff)
- AM_RANGE(0x0e0000, 0x0e0035) AM_DEVREADWRITE8("pit", pit68230_device, data_r, data_w, 0x00ff)
+ AM_RANGE(0x0c0400, 0x0c042f) AM_DEVREADWRITE8("rtc", mm58167_device, read, write, 0x00ff)
+ AM_RANGE(0x0e0000, 0x0e0035) AM_DEVREADWRITE8("pit", pit68230_device, data_r, data_w, 0x00ff)
// AM_RANGE(0x0e0200, 0x0e0380) AM_READWRITE(fpu_r, fpu_w) /* optional FPCP 68881 FPU interface */
// AM_RANGE(0x100000, 0xfeffff) /* VMEbus Rev B addresses (24 bits) */
// AM_RANGE(0xff0000, 0xffffff) /* VMEbus Rev B addresses (16 bits) */
@@ -190,39 +190,39 @@ void force68k_state::machine_start()
}
READ16_MEMBER(force68k_state::bootvect_r)
-{
- return m_sysrom[offset];
+{
+ return m_sysrom[offset];
}
WRITE_LINE_MEMBER(force68k_state::write_aciahost_clock)
-{
- m_aciahost->write_txc(state);
+{
+ m_aciahost->write_txc(state);
m_aciahost->write_rxc(state);
}
WRITE_LINE_MEMBER(force68k_state::write_aciaterm_clock)
-{
- m_aciaterm->write_txc(state);
+{
+ m_aciaterm->write_txc(state);
m_aciaterm->write_rxc(state);
}
WRITE_LINE_MEMBER(force68k_state::write_aciaremt_clock)
-{
- m_aciaremt->write_txc(state);
+{
+ m_aciaremt->write_txc(state);
m_aciaremt->write_rxc(state);
}
static MACHINE_CONFIG_START( fccpu1, force68k_state )
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz / 2)
MCFG_CPU_PROGRAM_MAP(force68k_mem)
- /* P3/Host Port config */
+ /* P3/Host Port config */
MCFG_DEVICE_ADD("aciahost", ACIA6850, 0)
- MCFG_DEVICE_ADD("aciahost_clock", CLOCK, ACIA_CLOCK)
+ MCFG_DEVICE_ADD("aciahost_clock", CLOCK, ACIA_CLOCK)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(force68k_state, write_aciahost_clock))
- /* P4/Terminal Port config */
+ /* P4/Terminal Port config */
MCFG_DEVICE_ADD("aciaterm", ACIA6850, 0)
MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232trm", rs232_port_device, write_txd))
@@ -232,10 +232,10 @@ static MACHINE_CONFIG_START( fccpu1, force68k_state )
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("aciaterm", acia6850_device, write_rxd))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("aciaterm", acia6850_device, write_cts))
- MCFG_DEVICE_ADD("aciaterm_clock", CLOCK, ACIA_CLOCK)
+ MCFG_DEVICE_ADD("aciaterm_clock", CLOCK, ACIA_CLOCK)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(force68k_state, write_aciaterm_clock))
- /* P5/Remote Port config */
+ /* P5/Remote Port config */
MCFG_DEVICE_ADD("aciaremt", ACIA6850, 0)
#define PRINTER 0
@@ -246,16 +246,16 @@ static MACHINE_CONFIG_START( fccpu1, force68k_state )
MCFG_RS232_PORT_ADD("rs232rmt", default_rs232_devices, "printer")
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("aciaremt", acia6850_device, write_rxd))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("aciaremt", acia6850_device, write_cts))
-#endif
+#endif
- MCFG_DEVICE_ADD("aciaremt_clock", CLOCK, ACIA_CLOCK)
+ MCFG_DEVICE_ADD("aciaremt_clock", CLOCK, ACIA_CLOCK)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(force68k_state, write_aciaterm_clock))
/* RTC Real Time Clock device */
MCFG_DEVICE_ADD("rtc", MM58167, XTAL_32_768kHz)
/* PIT Parallel Interface and Timer device, assuming strapped for on board clock */
- MCFG_DEVICE_ADD("pit", PIT68230, XTAL_16MHz / 2)
+ MCFG_DEVICE_ADD("pit", PIT68230, XTAL_16MHz / 2)
MACHINE_CONFIG_END
@@ -291,9 +291,9 @@ MACHINE_CONFIG_END
ROM_START( fccpu1 )
ROM_REGION(0x1000000, "maincpu", 0)
- ROM_LOAD16_BYTE( "fccpu1V1.0L.j8.bin", 0x080001, 0x2000, CRC(3ac6f08f) SHA1(502f6547b508d8732bd68bbbb2402d8c30fefc3b) )
- ROM_LOAD16_BYTE( "fccpu1V1.0L.j9.bin", 0x080000, 0x2000, CRC(035315fb) SHA1(90dc44d9c25d28428233e6846da6edce2d69e440) )
-/* COMMAND SUMMARY DESCRIPTION (From CPU-1B datasheet, ROMs were dumped
+ ROM_LOAD16_BYTE( "fccpu1V1.0L.j8.bin", 0x080001, 0x2000, CRC(3ac6f08f) SHA1(502f6547b508d8732bd68bbbb2402d8c30fefc3b) )
+ ROM_LOAD16_BYTE( "fccpu1V1.0L.j9.bin", 0x080000, 0x2000, CRC(035315fb) SHA1(90dc44d9c25d28428233e6846da6edce2d69e440) )
+/* COMMAND SUMMARY DESCRIPTION (From CPU-1B datasheet, ROMs were dumped
from a CPU-1 board so some features might be missing or different)
---------------------------------------------------------------------------
BF <address1> <address2> <data> <CR> Block Fill memory - from addr1 through addr2 with data
@@ -309,8 +309,8 @@ ROM_START( fccpu1 )
GT <address> <CR> Exec prog: temporary breakpoint
HE<CR> Help; display monitor commands
LO [n] [;<options] <CR> Load Object file
- MD <address> [<count» <CR> Memory Display
- MM <address> [<data» [;<options» <CR> Memory Modify
+ MD <address> [<count?? <CR> Memory Display
+ MM <address> [<data?? [;<options?? <CR> Memory Modify
MS <address> <data1 > <data2> < ... <CR> Memory Set - starting at addr with data 1. data 2 ...
NOBR [<address> ... ] <CR> Remove Breakpoint
NOPA <CR> Printer Detach (Centronics on PIT/P2)
@@ -318,7 +318,7 @@ ROM_START( fccpu1 )
PA <CR> Printer Attach (Centronics on PIT/P2)
PF[n] <CR> Set/display Port Format
RM <CR> Register Modify
- TM [<exit character» <CR> Transparent Mode
+ TM [<exit character?? <CR> Transparent Mode
TR [<count] <CR> Trace
TT <address> <CR> Trace: temporary breakpoint
VE [n] [<string] <CR> Verify memory/object file
diff --git a/src/mess/drivers/hh_sm510.c b/src/mess/drivers/hh_sm510.c
index ff7e4b7b9cc..5461048b7bc 100644
--- a/src/mess/drivers/hh_sm510.c
+++ b/src/mess/drivers/hh_sm510.c
@@ -57,7 +57,7 @@ void hh_sm510_state::machine_start()
{
// zerofill
m_inp_mux = 0;
-// m_inp_lines = 0;
+// m_inp_lines = 0;
memset(m_lcd_output_cache, ~0, sizeof(m_lcd_output_cache));
// register for savestates
@@ -149,7 +149,7 @@ READ8_MEMBER(hh_sm510_state::input_r)
Konami Top Gun
* PCB label BH003
* Sharp SM510 under epoxy (die label CMS54C, KMS598)
-
+
The ROM listing "BH003 Top Gun" from patent US5137277 is identical to the
released version, except for 2 probable bit errors and filler bytes. Unused
pages list data too, of what looks like assembler leftover garbage.
diff --git a/src/mess/drivers/hp64k.c b/src/mess/drivers/hp64k.c
index 7bf0107a597..3c33333804e 100644
--- a/src/mess/drivers/hp64k.c
+++ b/src/mess/drivers/hp64k.c
@@ -6,16 +6,16 @@
// ***************************************
//
// Documentation used for this driver:
-// [1] HP, manual 64100-90910, dec 83 rev. - Model 64100A mainframe service manual
+// [1] HP, manual 64100-90910, dec 83 rev. - Model 64100A mainframe service manual
// [2] HP, manual 64941-90902, apr 83 rev. - Model 64941A Flexible disc (Floppy) drive
// controller service manual
//
// A 64100A system ("mainframe" in HP docs) is built around a 13 slot card cage.
// The first 4 slots are reserved for specific card types:
-// J1 I/O card
-// J2 Display and RAM card
-// J3 CPU card
-// J4 Floppy interface card
+// J1 I/O card
+// J2 Display and RAM card
+// J3 CPU card
+// J4 Floppy interface card
//
// The rest of the slots are for CPU emulators, logic analyzers and so on (i.e. those
// cards doing the main functions of a development system).
@@ -35,7 +35,7 @@
// CPU card (64100-66521 or 64100-66532)
//
// This board holds the HP custom CPU with its massive heatsink, the BIOS roms and little else.
-// U30 5061-3011 HP "hybrid" CPU @ 6.25 MHz
+// U30 5061-3011 HP "hybrid" CPU @ 6.25 MHz
// U8
// U9
// U10
@@ -43,7 +43,7 @@
// U18
// U19
// U20
-// U21 2732 16kw of BIOS EPROMs
+// U21 2732 16kw of BIOS EPROMs
//
// **********
// I/O card (64100-66520)
@@ -59,8 +59,8 @@
// exponentially decaying envelope (a bell sound) whereas in the emulation it's inside a
// simple rectangular envelope.
//
-//*U20 HP "PHI" Custom HP-IB interface microcontroller
-//*U28 i8251 RS232 UART
+//*U20 HP "PHI" Custom HP-IB interface microcontroller
+//*U28 i8251 RS232 UART
//
// **********
// Display card (64100-66530)
@@ -72,10 +72,10 @@
// CRTC is designed to refresh the whole DRAM in parallel. For some mysterious reason the first
// display row is always blanked (its 40 words of RAM are even used for the stack!).
//
-// U33 i8275 CRT controller
-// U60 2716 Character generator ROM
+// U33 i8275 CRT controller
+// U60 2716 Character generator ROM
// U23-U30
-// U38-U45 HM4864 64 kw of DRAM
+// U38-U45 HM4864 64 kw of DRAM
//
// **********
// Floppy I/F card (64941-66501)
@@ -87,7 +87,7 @@
// I tried to reverse engineer the FSM by looking at the schematics and applying some sensible
// assumptions. Then I did a sort of "clean room" re-implementation. It appears to work correctly.
//
-// U4 FD1791A Floppy disk controller
+// U4 FD1791A Floppy disk controller
//
// A brief summary of the reverse-engineered interface of this card follows.
//
@@ -162,8 +162,8 @@
#define BIT_MASK(n) (1U << (n))
// Macros to clear/set single bits
-#define BIT_CLR(w , n) ((w) &= ~BIT_MASK(n))
-#define BIT_SET(w , n) ((w) |= BIT_MASK(n))
+#define BIT_CLR(w , n) ((w) &= ~BIT_MASK(n))
+#define BIT_SET(w , n) ((w) |= BIT_MASK(n))
class hp64k_state : public driver_device
{
@@ -256,11 +256,11 @@ private:
UINT8 m_slot_map;
// Floppy I/F
- UINT8 m_floppy_in_latch_msb; // U23
- UINT8 m_floppy_in_latch_lsb; // U38
- UINT8 m_floppy_out_latch_msb; // U22
- UINT8 m_floppy_out_latch_lsb; // U37
- UINT8 m_floppy_if_ctrl; // U24
+ UINT8 m_floppy_in_latch_msb; // U23
+ UINT8 m_floppy_in_latch_lsb; // U38
+ UINT8 m_floppy_out_latch_msb; // U22
+ UINT8 m_floppy_out_latch_lsb; // U37
+ UINT8 m_floppy_if_ctrl; // U24
bool m_floppy_dmaen;
bool m_floppy_dmai;
bool m_floppy_mdci;
@@ -268,8 +268,8 @@ private:
bool m_floppy_drq;
bool m_floppy0_wpt;
bool m_floppy1_wpt;
- UINT8 m_floppy_drv_ctrl; // U39
- UINT8 m_floppy_status; // U25
+ UINT8 m_floppy_drv_ctrl; // U39
+ UINT8 m_floppy_status; // U25
typedef enum {
HP64K_FLPST_IDLE,
@@ -293,22 +293,22 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START(cpu_io_map , AS_IO , 16 , hp64k_state)
// PA = 0, IC = [0..3]
// Keyboard input
- AM_RANGE(HP_MAKE_IOADDR(0 , 0) , HP_MAKE_IOADDR(0 , 3)) AM_READ(hp64k_kb_r)
+ AM_RANGE(HP_MAKE_IOADDR(0 , 0) , HP_MAKE_IOADDR(0 , 3)) AM_READ(hp64k_kb_r)
// PA = 2, IC = [0..3]
// Line sync interrupt clear/watchdog reset
- AM_RANGE(HP_MAKE_IOADDR(2 , 0) , HP_MAKE_IOADDR(2 , 3)) AM_READWRITE(hp64k_deltat_r , hp64k_deltat_w)
+ AM_RANGE(HP_MAKE_IOADDR(2 , 0) , HP_MAKE_IOADDR(2 , 3)) AM_READWRITE(hp64k_deltat_r , hp64k_deltat_w)
// PA = 4, IC = [0..3]
// Floppy I/F
- AM_RANGE(HP_MAKE_IOADDR(4 , 0) , HP_MAKE_IOADDR(4 , 3)) AM_READWRITE(hp64k_flp_r , hp64k_flp_w)
+ AM_RANGE(HP_MAKE_IOADDR(4 , 0) , HP_MAKE_IOADDR(4 , 3)) AM_READWRITE(hp64k_flp_r , hp64k_flp_w)
// PA = 6, IC = [0..3]
// Read from USART
- AM_RANGE(HP_MAKE_IOADDR(6 , 0) , HP_MAKE_IOADDR(6 , 3)) AM_READ(hp64k_usart_r)
+ AM_RANGE(HP_MAKE_IOADDR(6 , 0) , HP_MAKE_IOADDR(6 , 3)) AM_READ(hp64k_usart_r)
// PA = 7, IC = 2
// Rear-panel switches
- AM_RANGE(HP_MAKE_IOADDR(7 , 2) , HP_MAKE_IOADDR(7 , 2)) AM_READ(hp64k_rear_sw_r)
+ AM_RANGE(HP_MAKE_IOADDR(7 , 2) , HP_MAKE_IOADDR(7 , 2)) AM_READ(hp64k_rear_sw_r)
// PA = 9, IC = [0..3]
// Beeper control & interrupt status read
- AM_RANGE(HP_MAKE_IOADDR(9 , 0) , HP_MAKE_IOADDR(9 , 3)) AM_WRITE(hp64k_beep_w)
+ AM_RANGE(HP_MAKE_IOADDR(9 , 0) , HP_MAKE_IOADDR(9 , 3)) AM_WRITE(hp64k_beep_w)
// PA = 10, IC = [0..3]
// Slot selection
AM_RANGE(HP_MAKE_IOADDR(10 , 0) , HP_MAKE_IOADDR(10 , 3)) AM_WRITE(hp64k_slot_sel_w)
@@ -922,15 +922,15 @@ static INPUT_PORTS_START(hp64k)
// column = [0..15]
// row = [0..7]
PORT_START("KEY0")
- PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_2)
- PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A')
- PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W')
- PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E')
- PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R')
- PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T')
- PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y')
- PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U')
- PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I')
+ PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_2)
+ PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A')
+ PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W')
+ PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E')
+ PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R')
+ PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T')
+ PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y')
+ PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U')
+ PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I')
PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_UNUSED)
@@ -938,90 +938,90 @@ static INPUT_PORTS_START(hp64k)
PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB) PORT_CHAR('\t')
- PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q')
+ PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB) PORT_CHAR('\t')
+ PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q')
PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'')
- PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(')
- PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')')
- PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0')
- PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=')
- PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('^') PORT_CHAR('~')
- PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE) PORT_CHAR('\\') PORT_CHAR('|')
- PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8)
+ PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'')
+ PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(')
+ PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')')
+ PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0')
+ PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=')
+ PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('^') PORT_CHAR('~')
+ PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE) PORT_CHAR('\\') PORT_CHAR('|')
+ PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8)
PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_START("KEY1")
- PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
- PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"')
- PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')
- PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
- PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%')
- PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&')
+ PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
+ PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"')
+ PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')
+ PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
+ PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%')
+ PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&')
PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F9) PORT_NAME("RECALL")
- PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F10) PORT_NAME("CLRLINE")
- PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F11) PORT_NAME("CAPS")
- PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F12) PORT_NAME("RESET")
- PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F1) PORT_NAME("SK1")
- PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F2) PORT_NAME("SK2")
+ PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F9) PORT_NAME("RECALL")
+ PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F10) PORT_NAME("CLRLINE")
+ PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F11) PORT_NAME("CAPS")
+ PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F12) PORT_NAME("RESET")
+ PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F1) PORT_NAME("SK1")
+ PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F2) PORT_NAME("SK2")
PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F3) PORT_NAME("SK3")
- PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F4) PORT_NAME("SK4")
+ PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F3) PORT_NAME("SK3")
+ PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F4) PORT_NAME("SK4")
PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F5) PORT_NAME("SK5")
- PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F6) PORT_NAME("SK6")
- PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F7) PORT_NAME("SK7")
+ PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F5) PORT_NAME("SK5")
+ PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F6) PORT_NAME("SK6")
+ PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F7) PORT_NAME("SK7")
PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F8) PORT_NAME("SK8")
+ PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F8) PORT_NAME("SK8")
PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_START("KEY2")
- PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
+ PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S')
- PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D')
- PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F')
- PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G')
- PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H')
+ PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S')
+ PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D')
+ PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F')
+ PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G')
+ PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H')
PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O')
- PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P')
+ PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O')
+ PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P')
PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_INSERT) PORT_NAME("INSCHAR")
- PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_DEL) PORT_NAME("DELCHAR")
+ PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_INSERT) PORT_NAME("INSCHAR")
+ PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_DEL) PORT_NAME("DELCHAR")
PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z')
- PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X')
- PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C')
+ PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z')
+ PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X')
+ PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C')
PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J')
+ PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J')
PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('@') PORT_CHAR('`')
- PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('[') PORT_CHAR('{')
- PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR('_') PORT_CHAR(UCHAR_MAMEKEY(DEL))
- PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_HOME) PORT_NAME("ROLLUP")
- PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP))
- PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_PGDN) PORT_NAME("NEXTPG")
+ PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('@') PORT_CHAR('`')
+ PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('[') PORT_CHAR('{')
+ PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR('_') PORT_CHAR(UCHAR_MAMEKEY(DEL))
+ PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_HOME) PORT_NAME("ROLLUP")
+ PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP))
+ PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_PGDN) PORT_NAME("NEXTPG")
PORT_START("KEY3")
PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_UNUSED)
@@ -1029,15 +1029,15 @@ static INPUT_PORTS_START(hp64k)
PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_UNUSED)
PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V')
- PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B')
+ PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V')
+ PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B')
PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K')
- PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L')
- PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('+')
- PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(':') PORT_CHAR('*')
- PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR(']') PORT_CHAR('}')
- PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
+ PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K')
+ PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L')
+ PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('+')
+ PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(':') PORT_CHAR('*')
+ PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR(']') PORT_CHAR('}')
+ PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT))
PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_UNUSED)
@@ -1057,82 +1057,82 @@ static INPUT_PORTS_START(hp64k)
PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN))
PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_PGUP) PORT_NAME("PREVPG")
- PORT_START("rear_sw")
- PORT_DIPNAME(0x8000 , 0x8000 , "E9-6 jumper")
- PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
- PORT_DIPSETTING(0x8000 , DEF_STR(No))
- PORT_DIPNAME(0x4000 , 0x4000 , "E9-5 jumper")
- PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
- PORT_DIPSETTING(0x4000 , DEF_STR(No))
- PORT_DIPNAME(0x2000 , 0x2000 , "E9-4 jumper")
- PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
- PORT_DIPSETTING(0x2000 , DEF_STR(No))
- PORT_DIPNAME(0x1000 , 0x1000 , "E9-3 jumper")
- PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
- PORT_DIPSETTING(0x1000 , DEF_STR(No))
- PORT_DIPNAME(0x0800 , 0x0800 , "E9-2 jumper")
- PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
- PORT_DIPSETTING(0x0800 , DEF_STR(No))
- PORT_DIPNAME(0x0400 , 0x0400 , "E9-1 jumper")
- PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
- PORT_DIPSETTING(0x0400 , DEF_STR(No))
- PORT_DIPNAME(0x0018 , 0x0000 , "System source")
- PORT_DIPLOCATION("S1:!7,!6")
- PORT_DIPSETTING(0x0000 , "Sys bus")
- PORT_DIPSETTING(0x0008 , "Local storage-talk only")
- PORT_DIPSETTING(0x0010 , "Local storage-addressable")
- PORT_DIPSETTING(0x0018 , "Performance verification")
- PORT_DIPNAME(0x0300 , 0x0000 , "Upper bus address (N/U)")
- PORT_DIPLOCATION("S1:!2,!1")
- PORT_DIPSETTING(0x0000 , "0")
- PORT_DIPSETTING(0x0100 , "1")
- PORT_DIPSETTING(0x0200 , "2")
- PORT_DIPSETTING(0x0300 , "3")
- PORT_DIPNAME(0x0007 , 0x0000 , "System bus address")
- PORT_DIPLOCATION("S1:!5,!4,!3")
- PORT_DIPSETTING(0x0000 , "0")
- PORT_DIPSETTING(0x0001 , "1")
- PORT_DIPSETTING(0x0002 , "2")
- PORT_DIPSETTING(0x0003 , "3")
- PORT_DIPSETTING(0x0004 , "4")
- PORT_DIPSETTING(0x0005 , "5")
- PORT_DIPSETTING(0x0006 , "6")
- PORT_DIPSETTING(0x0007 , "7")
- PORT_DIPNAME(0x0080 , 0x0000 , "RS232 mode")
- PORT_DIPLOCATION("S4 IO:!8")
- PORT_DIPSETTING(0x0000 , "Terminal")
- PORT_DIPSETTING(0x0080 , "Modem")
-
- PORT_START("rs232_sw")
- PORT_DIPNAME(0xc0 , 0x00 , "Stop bits")
- PORT_DIPLOCATION("S4 IO:!2,!1")
- PORT_DIPSETTING(0x00 , "Invalid")
- PORT_DIPSETTING(0x40 , "1")
- PORT_DIPSETTING(0x80 , "1.5")
- PORT_DIPSETTING(0xc0 , "2")
- PORT_DIPNAME(0x20 , 0x00 , "Parity")
- PORT_DIPLOCATION("S4 IO:!3")
- PORT_DIPSETTING(0x00 , "Odd")
- PORT_DIPSETTING(0x20 , "Even")
- PORT_DIPNAME(0x10 , 0x00 , "Parity enable")
- PORT_DIPLOCATION("S4 IO:!4")
- PORT_DIPSETTING(0x00 , DEF_STR(No))
- PORT_DIPSETTING(0x10 , DEF_STR(Yes))
- PORT_DIPNAME(0x0c , 0x00 , "Char length")
- PORT_DIPLOCATION("S4 IO:!6,!5")
- PORT_DIPSETTING(0x00 , "5")
- PORT_DIPSETTING(0x04 , "6")
- PORT_DIPSETTING(0x08 , "7")
- PORT_DIPSETTING(0x0c , "8")
- PORT_DIPNAME(0x02 , 0x00 , "Baud rate factor")
- PORT_DIPLOCATION("S4 IO:!7")
- PORT_DIPSETTING(0x00 , "1x")
- PORT_DIPSETTING(0x02 , "16x")
+ PORT_START("rear_sw")
+ PORT_DIPNAME(0x8000 , 0x8000 , "E9-6 jumper")
+ PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
+ PORT_DIPSETTING(0x8000 , DEF_STR(No))
+ PORT_DIPNAME(0x4000 , 0x4000 , "E9-5 jumper")
+ PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
+ PORT_DIPSETTING(0x4000 , DEF_STR(No))
+ PORT_DIPNAME(0x2000 , 0x2000 , "E9-4 jumper")
+ PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
+ PORT_DIPSETTING(0x2000 , DEF_STR(No))
+ PORT_DIPNAME(0x1000 , 0x1000 , "E9-3 jumper")
+ PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
+ PORT_DIPSETTING(0x1000 , DEF_STR(No))
+ PORT_DIPNAME(0x0800 , 0x0800 , "E9-2 jumper")
+ PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
+ PORT_DIPSETTING(0x0800 , DEF_STR(No))
+ PORT_DIPNAME(0x0400 , 0x0400 , "E9-1 jumper")
+ PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
+ PORT_DIPSETTING(0x0400 , DEF_STR(No))
+ PORT_DIPNAME(0x0018 , 0x0000 , "System source")
+ PORT_DIPLOCATION("S1:!7,!6")
+ PORT_DIPSETTING(0x0000 , "Sys bus")
+ PORT_DIPSETTING(0x0008 , "Local storage-talk only")
+ PORT_DIPSETTING(0x0010 , "Local storage-addressable")
+ PORT_DIPSETTING(0x0018 , "Performance verification")
+ PORT_DIPNAME(0x0300 , 0x0000 , "Upper bus address (N/U)")
+ PORT_DIPLOCATION("S1:!2,!1")
+ PORT_DIPSETTING(0x0000 , "0")
+ PORT_DIPSETTING(0x0100 , "1")
+ PORT_DIPSETTING(0x0200 , "2")
+ PORT_DIPSETTING(0x0300 , "3")
+ PORT_DIPNAME(0x0007 , 0x0000 , "System bus address")
+ PORT_DIPLOCATION("S1:!5,!4,!3")
+ PORT_DIPSETTING(0x0000 , "0")
+ PORT_DIPSETTING(0x0001 , "1")
+ PORT_DIPSETTING(0x0002 , "2")
+ PORT_DIPSETTING(0x0003 , "3")
+ PORT_DIPSETTING(0x0004 , "4")
+ PORT_DIPSETTING(0x0005 , "5")
+ PORT_DIPSETTING(0x0006 , "6")
+ PORT_DIPSETTING(0x0007 , "7")
+ PORT_DIPNAME(0x0080 , 0x0000 , "RS232 mode")
+ PORT_DIPLOCATION("S4 IO:!8")
+ PORT_DIPSETTING(0x0000 , "Terminal")
+ PORT_DIPSETTING(0x0080 , "Modem")
+
+ PORT_START("rs232_sw")
+ PORT_DIPNAME(0xc0 , 0x00 , "Stop bits")
+ PORT_DIPLOCATION("S4 IO:!2,!1")
+ PORT_DIPSETTING(0x00 , "Invalid")
+ PORT_DIPSETTING(0x40 , "1")
+ PORT_DIPSETTING(0x80 , "1.5")
+ PORT_DIPSETTING(0xc0 , "2")
+ PORT_DIPNAME(0x20 , 0x00 , "Parity")
+ PORT_DIPLOCATION("S4 IO:!3")
+ PORT_DIPSETTING(0x00 , "Odd")
+ PORT_DIPSETTING(0x20 , "Even")
+ PORT_DIPNAME(0x10 , 0x00 , "Parity enable")
+ PORT_DIPLOCATION("S4 IO:!4")
+ PORT_DIPSETTING(0x00 , DEF_STR(No))
+ PORT_DIPSETTING(0x10 , DEF_STR(Yes))
+ PORT_DIPNAME(0x0c , 0x00 , "Char length")
+ PORT_DIPLOCATION("S4 IO:!6,!5")
+ PORT_DIPSETTING(0x00 , "5")
+ PORT_DIPSETTING(0x04 , "6")
+ PORT_DIPSETTING(0x08 , "7")
+ PORT_DIPSETTING(0x0c , "8")
+ PORT_DIPNAME(0x02 , 0x00 , "Baud rate factor")
+ PORT_DIPLOCATION("S4 IO:!7")
+ PORT_DIPSETTING(0x00 , "1x")
+ PORT_DIPSETTING(0x02 , "16x")
INPUT_PORTS_END
static SLOT_INTERFACE_START(hp64k_floppies)
- SLOT_INTERFACE("525dd" , FLOPPY_525_DD)
+ SLOT_INTERFACE("525dd" , FLOPPY_525_DD)
SLOT_INTERFACE_END
static MACHINE_CONFIG_START(hp64k , hp64k_state)
@@ -1145,8 +1145,8 @@ static MACHINE_CONFIG_START(hp64k , hp64k_state)
// Actual keyboard refresh rate should be between 1 and 2 kHz
MCFG_TIMER_DRIVER_ADD_PERIODIC("kb_timer" , hp64k_state , hp64k_kb_scan , attotime::from_hz(100))
- // Line sync timer. A line frequency of 50 Hz is assumed.
- MCFG_TIMER_DRIVER_ADD_PERIODIC("linesync_timer" , hp64k_state , hp64k_line_sync , attotime::from_hz(50))
+ // Line sync timer. A line frequency of 50 Hz is assumed.
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("linesync_timer" , hp64k_state , hp64k_line_sync , attotime::from_hz(50))
// Clock = 25 MHz / 9 * (112/114)
MCFG_DEVICE_ADD("crtc" , I8275 , 2729045)
@@ -1160,37 +1160,37 @@ static MACHINE_CONFIG_START(hp64k , hp64k_state)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_PALETTE_ADD_MONOCHROME_GREEN_HIGHLIGHT("palette")
- MCFG_FD1791_ADD("fdc" , XTAL_4MHz / 4)
- MCFG_WD_FDC_FORCE_READY
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(hp64k_state , hp64k_flp_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(hp64k_state , hp64k_flp_drq_w))
- MCFG_FLOPPY_DRIVE_ADD("fdc:0" , hp64k_floppies , "525dd" , floppy_image_device::default_floppy_formats)
- MCFG_SLOT_FIXED(true)
- MCFG_FLOPPY_DRIVE_ADD("fdc:1" , hp64k_floppies , "525dd" , floppy_image_device::default_floppy_formats)
- MCFG_SLOT_FIXED(true)
-
- MCFG_DEVICE_ADD("fdc_rdy0" , TTL74123 , 0)
- MCFG_TTL74123_CONNECTION_TYPE(TTL74123_NOT_GROUNDED_NO_DIODE)
- MCFG_TTL74123_RESISTOR_VALUE(RES_K(68.1))
- // Warning! Duration formula is not correct for LS123, actual capacitor is 10 uF
- MCFG_TTL74123_CAPACITOR_VALUE(CAP_U(16))
- MCFG_TTL74123_B_PIN_VALUE(1)
- MCFG_TTL74123_CLEAR_PIN_VALUE(1)
- MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITE8(hp64k_state , hp64k_floppy0_rdy));
-
- MCFG_DEVICE_ADD("fdc_rdy1" , TTL74123 , 0)
- MCFG_TTL74123_CONNECTION_TYPE(TTL74123_NOT_GROUNDED_NO_DIODE)
- MCFG_TTL74123_RESISTOR_VALUE(RES_K(68.1))
- MCFG_TTL74123_CAPACITOR_VALUE(CAP_U(16))
- MCFG_TTL74123_B_PIN_VALUE(1)
- MCFG_TTL74123_CLEAR_PIN_VALUE(1)
- MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITE8(hp64k_state , hp64k_floppy1_rdy));
-
- MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper" , BEEP , 2500)
- MCFG_SOUND_ROUTE(ALL_OUTPUTS , "mono" , 1.00)
-
- MCFG_TIMER_DRIVER_ADD("beep_timer" , hp64k_state , hp64k_beeper_off);
+ MCFG_FD1791_ADD("fdc" , XTAL_4MHz / 4)
+ MCFG_WD_FDC_FORCE_READY
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(hp64k_state , hp64k_flp_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(hp64k_state , hp64k_flp_drq_w))
+ MCFG_FLOPPY_DRIVE_ADD("fdc:0" , hp64k_floppies , "525dd" , floppy_image_device::default_floppy_formats)
+ MCFG_SLOT_FIXED(true)
+ MCFG_FLOPPY_DRIVE_ADD("fdc:1" , hp64k_floppies , "525dd" , floppy_image_device::default_floppy_formats)
+ MCFG_SLOT_FIXED(true)
+
+ MCFG_DEVICE_ADD("fdc_rdy0" , TTL74123 , 0)
+ MCFG_TTL74123_CONNECTION_TYPE(TTL74123_NOT_GROUNDED_NO_DIODE)
+ MCFG_TTL74123_RESISTOR_VALUE(RES_K(68.1))
+ // Warning! Duration formula is not correct for LS123, actual capacitor is 10 uF
+ MCFG_TTL74123_CAPACITOR_VALUE(CAP_U(16))
+ MCFG_TTL74123_B_PIN_VALUE(1)
+ MCFG_TTL74123_CLEAR_PIN_VALUE(1)
+ MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITE8(hp64k_state , hp64k_floppy0_rdy));
+
+ MCFG_DEVICE_ADD("fdc_rdy1" , TTL74123 , 0)
+ MCFG_TTL74123_CONNECTION_TYPE(TTL74123_NOT_GROUNDED_NO_DIODE)
+ MCFG_TTL74123_RESISTOR_VALUE(RES_K(68.1))
+ MCFG_TTL74123_CAPACITOR_VALUE(CAP_U(16))
+ MCFG_TTL74123_B_PIN_VALUE(1)
+ MCFG_TTL74123_CLEAR_PIN_VALUE(1)
+ MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITE8(hp64k_state , hp64k_floppy1_rdy));
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("beeper" , BEEP , 2500)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS , "mono" , 1.00)
+
+ MCFG_TIMER_DRIVER_ADD("beep_timer" , hp64k_state , hp64k_beeper_off);
MACHINE_CONFIG_END
ROM_START(hp64k)
diff --git a/src/mess/drivers/i7000.c b/src/mess/drivers/i7000.c
index 7d1ef57211a..77a5d7734c9 100644
--- a/src/mess/drivers/i7000.c
+++ b/src/mess/drivers/i7000.c
@@ -55,11 +55,11 @@ class i7000_state : public driver_device
public:
i7000_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_card(*this, "cardslot"),
- m_gfxdecode(*this, "gfxdecode"),
- m_videoram(*this, "videoram")
- { }
+ m_maincpu(*this, "maincpu"),
+ m_card(*this, "cardslot"),
+ m_gfxdecode(*this, "gfxdecode"),
+ m_videoram(*this, "videoram")
+ { }
void video_start();
void machine_start();
@@ -92,9 +92,9 @@ READ8_MEMBER( i7000_state::i7000_kbd_r )
{
UINT8 data = 0xff;
- for (int i=0; i<40*25; i++){
- m_bg_tilemap->mark_tile_dirty(i);
- }
+ for (int i=0; i<40*25; i++){
+ m_bg_tilemap->mark_tile_dirty(i);
+ }
if (m_row < 8)
{
@@ -108,110 +108,110 @@ READ8_MEMBER( i7000_state::i7000_kbd_r )
/* Input ports */
static INPUT_PORTS_START( i7000 )
PORT_START("X0")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("1") PORT_CODE(KEYCODE_1)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("9") PORT_CODE(KEYCODE_9)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("U") PORT_CODE(KEYCODE_U)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("ESC") PORT_CODE(KEYCODE_ESC)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("K") PORT_CODE(KEYCODE_K)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("N") PORT_CODE(KEYCODE_N)
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("!") PORT_CHAR('!')
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("ENTER") PORT_CODE(KEYCODE_ENTER)
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("1") PORT_CODE(KEYCODE_1)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("9") PORT_CODE(KEYCODE_9)
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("U") PORT_CODE(KEYCODE_U)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("ESC") PORT_CODE(KEYCODE_ESC)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("K") PORT_CODE(KEYCODE_K)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("N") PORT_CODE(KEYCODE_N)
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("!") PORT_CHAR('!')
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("ENTER") PORT_CODE(KEYCODE_ENTER)
PORT_START("X1")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("2") PORT_CODE(KEYCODE_2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0") PORT_CODE(KEYCODE_0)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("T") PORT_CODE(KEYCODE_T)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0x9D")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("L") PORT_CODE(KEYCODE_L)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("X") PORT_CODE(KEYCODE_X)
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0x8F")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("^R DC2") //0x12
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("2") PORT_CODE(KEYCODE_2)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0") PORT_CODE(KEYCODE_0)
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("T") PORT_CODE(KEYCODE_T)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0x9D")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("L") PORT_CODE(KEYCODE_L)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("X") PORT_CODE(KEYCODE_X)
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0x8F")
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("^R DC2") //0x12
PORT_START("X2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("3") PORT_CODE(KEYCODE_3)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("$ ^") PORT_CHAR('$') PORT_CHAR('^')
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("R") PORT_CODE(KEYCODE_R)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("S") PORT_CODE(KEYCODE_S)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0xA0")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C)
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("- _") PORT_CODE(KEYCODE_MINUS)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("BACKSPACE") PORT_CODE(KEYCODE_BACKSPACE)
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("3") PORT_CODE(KEYCODE_3)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("$ ^") PORT_CHAR('$') PORT_CHAR('^')
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("R") PORT_CODE(KEYCODE_R)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("S") PORT_CODE(KEYCODE_S)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0xA0")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C)
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("- _") PORT_CODE(KEYCODE_MINUS)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("BACKSPACE") PORT_CODE(KEYCODE_BACKSPACE)
PORT_START("X3")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("4") PORT_CODE(KEYCODE_4)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("% +") PORT_CHAR('%') PORT_CHAR('+')
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("I") PORT_CODE(KEYCODE_I)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D") PORT_CODE(KEYCODE_D)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0x9C")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("M") PORT_CODE(KEYCODE_M)
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("]") PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']')
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("@") PORT_CHAR('@')
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("4") PORT_CODE(KEYCODE_4)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("% +") PORT_CHAR('%') PORT_CHAR('+')
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("I") PORT_CODE(KEYCODE_I)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D") PORT_CODE(KEYCODE_D)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0x9C")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("M") PORT_CODE(KEYCODE_M)
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("]") PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']')
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("@") PORT_CHAR('@')
PORT_START("X4")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("5 *") PORT_CODE(KEYCODE_5)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("^U NAK") //0x15
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("O") PORT_CODE(KEYCODE_O)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F") PORT_CODE(KEYCODE_F)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("| <") PORT_CHAR('<')
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(", ;") PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR(';')
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("[") PORT_CODE(KEYCODE_OPENBRACE)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("^E ENQ") //0x05
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("5 *") PORT_CODE(KEYCODE_5)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("^U NAK") //0x15
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("O") PORT_CODE(KEYCODE_O)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F") PORT_CODE(KEYCODE_F)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("| <") PORT_CHAR('<')
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(", ;") PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR(';')
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("[") PORT_CODE(KEYCODE_OPENBRACE)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("^E ENQ") //0x05
PORT_START("X5")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("6") PORT_CODE(KEYCODE_6)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("^O SI") //0x0F
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("P") PORT_CODE(KEYCODE_P)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("G") PORT_CODE(KEYCODE_G)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("J") PORT_CODE(KEYCODE_J)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(".") PORT_CODE(KEYCODE_STOP) PORT_CHAR('.')
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("#") PORT_CHAR('#')
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("{") PORT_CHAR('{')
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("6") PORT_CODE(KEYCODE_6)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("^O SI") //0x0F
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("P") PORT_CODE(KEYCODE_P)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("G") PORT_CODE(KEYCODE_G)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("J") PORT_CODE(KEYCODE_J)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(".") PORT_CODE(KEYCODE_STOP) PORT_CHAR('.')
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("#") PORT_CHAR('#')
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("{") PORT_CHAR('{')
PORT_START("X6")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("7") PORT_CODE(KEYCODE_7)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Q") PORT_CODE(KEYCODE_Q)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E") PORT_CODE(KEYCODE_E)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A") PORT_CODE(KEYCODE_A)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("H") PORT_CODE(KEYCODE_H)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("V") PORT_CODE(KEYCODE_V)
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("^L FF") //0x0C
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("^T DC4") //0x14
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("7") PORT_CODE(KEYCODE_7)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Q") PORT_CODE(KEYCODE_Q)
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E") PORT_CODE(KEYCODE_E)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A") PORT_CODE(KEYCODE_A)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("H") PORT_CODE(KEYCODE_H)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("V") PORT_CODE(KEYCODE_V)
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("^L FF") //0x0C
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("^T DC4") //0x14
PORT_START("X7")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("8") PORT_CODE(KEYCODE_8)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("W") PORT_CODE(KEYCODE_W)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Y") PORT_CODE(KEYCODE_Y)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(">") PORT_CHAR('>')
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Z") PORT_CODE(KEYCODE_Z)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("B") PORT_CODE(KEYCODE_B)
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("SPACEBAR") PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("}") PORT_CHAR('}')
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("8") PORT_CODE(KEYCODE_8)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("W") PORT_CODE(KEYCODE_W)
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Y") PORT_CODE(KEYCODE_Y)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(">") PORT_CHAR('>')
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Z") PORT_CODE(KEYCODE_Z)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("B") PORT_CODE(KEYCODE_B)
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("SPACEBAR") PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("}") PORT_CHAR('}')
PORT_START("DSW") /* DP01 */
- PORT_DIPNAME( 0x80, 0x80, "1")
- PORT_DIPSETTING( 0x00, DEF_STR( No ) )
- PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x40, 0x40, "2")
- PORT_DIPSETTING( 0x00, DEF_STR( No ) )
- PORT_DIPSETTING( 0x40, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x20, 0x00, "3")
- PORT_DIPSETTING( 0x00, DEF_STR( No ) )
- PORT_DIPSETTING( 0x20, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x10, 0x10, "4")
- PORT_DIPSETTING( 0x00, DEF_STR( No ) )
- PORT_DIPSETTING( 0x10, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x08, 0x08, "5")
- PORT_DIPSETTING( 0x00, DEF_STR( No ) )
- PORT_DIPSETTING( 0x08, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x04, 0x04, "6")
- PORT_DIPSETTING( 0x00, DEF_STR( No ) )
- PORT_DIPSETTING( 0x04, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x02, 0x00, "7")
- PORT_DIPSETTING( 0x00, DEF_STR( No ) )
- PORT_DIPSETTING( 0x02, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x01, 0x01, "8")
- PORT_DIPSETTING( 0x00, DEF_STR( No ) )
- PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
+ PORT_DIPNAME( 0x80, 0x80, "1")
+ PORT_DIPSETTING( 0x00, DEF_STR( No ) )
+ PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
+ PORT_DIPNAME( 0x40, 0x40, "2")
+ PORT_DIPSETTING( 0x00, DEF_STR( No ) )
+ PORT_DIPSETTING( 0x40, DEF_STR( Yes ) )
+ PORT_DIPNAME( 0x20, 0x00, "3")
+ PORT_DIPSETTING( 0x00, DEF_STR( No ) )
+ PORT_DIPSETTING( 0x20, DEF_STR( Yes ) )
+ PORT_DIPNAME( 0x10, 0x10, "4")
+ PORT_DIPSETTING( 0x00, DEF_STR( No ) )
+ PORT_DIPSETTING( 0x10, DEF_STR( Yes ) )
+ PORT_DIPNAME( 0x08, 0x08, "5")
+ PORT_DIPSETTING( 0x00, DEF_STR( No ) )
+ PORT_DIPSETTING( 0x08, DEF_STR( Yes ) )
+ PORT_DIPNAME( 0x04, 0x04, "6")
+ PORT_DIPSETTING( 0x00, DEF_STR( No ) )
+ PORT_DIPSETTING( 0x04, DEF_STR( Yes ) )
+ PORT_DIPNAME( 0x02, 0x00, "7")
+ PORT_DIPSETTING( 0x00, DEF_STR( No ) )
+ PORT_DIPSETTING( 0x02, DEF_STR( Yes ) )
+ PORT_DIPNAME( 0x01, 0x01, "8")
+ PORT_DIPSETTING( 0x00, DEF_STR( No ) )
+ PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
INPUT_PORTS_END
DRIVER_INIT_MEMBER(i7000_state, i7000)
@@ -238,40 +238,40 @@ PALETTE_INIT_MEMBER(i7000_state, i7000)
/*FIXME: we still need to figure out the proper memory map
for the maincpu and where the cartridge slot maps to. */
static ADDRESS_MAP_START(i7000_mem, AS_PROGRAM, 8, i7000_state)
- AM_RANGE(0x0000, 0x0fff) AM_ROM AM_REGION("boot", 0)
- AM_RANGE(0x2000, 0x2fff) AM_RAM AM_SHARE("videoram")
- AM_RANGE(0x4000, 0xffff) AM_RAM
+ AM_RANGE(0x0000, 0x0fff) AM_ROM AM_REGION("boot", 0)
+ AM_RANGE(0x2000, 0x2fff) AM_RAM AM_SHARE("videoram")
+ AM_RANGE(0x4000, 0xffff) AM_RAM
// AM_RANGE(0x4000, 0xbfff) AM_ROM AM_REGION("cardslot", 0)
ADDRESS_MAP_END
static ADDRESS_MAP_START( i7000_io , AS_IO, 8, i7000_state)
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK (0xff)
-// AM_RANGE(0x06, 0x06) AM_WRITE(i7000_io_?_w)
-// AM_RANGE(0x08, 0x09) AM_WRITE(i7000_io_?_w) //printer perhaps?
-// AM_RANGE(0x0c, 0x0c) AM_WRITE(i7000_io_?_w) //0x0C and 0x10 may be related to mem page swapping. (self-test "4. PAG")
-// AM_RANGE(0x10, 0x10) AM_WRITE(i7000_io_?_w)
-// AM_RANGE(0x14, 0x15) AM_WRITE(i7000_io_?_w)
+// AM_RANGE(0x06, 0x06) AM_WRITE(i7000_io_?_w)
+// AM_RANGE(0x08, 0x09) AM_WRITE(i7000_io_?_w) //printer perhaps?
+// AM_RANGE(0x0c, 0x0c) AM_WRITE(i7000_io_?_w) //0x0C and 0x10 may be related to mem page swapping. (self-test "4. PAG")
+// AM_RANGE(0x10, 0x10) AM_WRITE(i7000_io_?_w)
+// AM_RANGE(0x14, 0x15) AM_WRITE(i7000_io_?_w)
AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE("pit8253", pit8253_device, read, write)
-// AM_RANGE(0x1c, 0x1c) AM_WRITE(i7000_io_printer_data_w) //ASCII data
+// AM_RANGE(0x1c, 0x1c) AM_WRITE(i7000_io_printer_data_w) //ASCII data
AM_RANGE(0x1d, 0x1d) AM_READ_PORT("DSW")
-// AM_RANGE(0x1e, 0x1e) AM_READWRITE(i7000_io_printer_status_r, i7000_io_?_w)
-// AM_RANGE(0x1f, 0x1f) AM_WRITE(i7000_io_printer_strobe_w) //self-test routine writes 0x08 and 0x09 (it seems that bit 0 is the strobe and bit 3 is an enable signal)
-// AM_RANGE(0x20, 0x21) AM_READWRITE(i7000_io_keyboard_r, i7000_io_keyboard_w)
+// AM_RANGE(0x1e, 0x1e) AM_READWRITE(i7000_io_printer_status_r, i7000_io_?_w)
+// AM_RANGE(0x1f, 0x1f) AM_WRITE(i7000_io_printer_strobe_w) //self-test routine writes 0x08 and 0x09 (it seems that bit 0 is the strobe and bit 3 is an enable signal)
+// AM_RANGE(0x20, 0x21) AM_READWRITE(i7000_io_keyboard_r, i7000_io_keyboard_w)
AM_RANGE( 0x20, 0x20 ) AM_DEVREADWRITE("i8279", i8279_device, data_r, data_w)
AM_RANGE( 0x21, 0x21 ) AM_DEVREADWRITE("i8279", i8279_device, status_r, cmd_w)
-// AM_RANGE(0x24, 0x24) AM_READ(i7000_io_?_r)
-// AM_RANGE(0x25, 0x25) AM_WRITE(i7000_io_?_w)
+// AM_RANGE(0x24, 0x24) AM_READ(i7000_io_?_r)
+// AM_RANGE(0x25, 0x25) AM_WRITE(i7000_io_?_w)
-// AM_RANGE(0x28, 0x2d) AM_READWRITE(i7000_io_joystick_r, i7000_io_joystick_w)
+// AM_RANGE(0x28, 0x2d) AM_READWRITE(i7000_io_joystick_r, i7000_io_joystick_w)
-// AM_RANGE(0x3b, 0x3b) AM_WRITE(i7000_io_?_w)
-// AM_RANGE(0x66, 0x67) AM_WRITE(i7000_io_?_w)
-// AM_RANGE(0xbb, 0xbb) AM_WRITE(i7000_io_?_w) //may be related to page-swapping...
+// AM_RANGE(0x3b, 0x3b) AM_WRITE(i7000_io_?_w)
+// AM_RANGE(0x66, 0x67) AM_WRITE(i7000_io_?_w)
+// AM_RANGE(0xbb, 0xbb) AM_WRITE(i7000_io_?_w) //may be related to page-swapping...
ADDRESS_MAP_END
DEVICE_IMAGE_LOAD_MEMBER( i7000_state, i7000_card )
@@ -358,12 +358,12 @@ static MACHINE_CONFIG_START( i7000, i7000_state )
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- /* Programmable timer */
+ /* Programmable timer */
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
-// MCFG_PIT8253_CLK0(XTAL_4MHz / 2) /* TODO: verify on PCB */
-// MCFG_PIT8253_OUT0_HANDLER(WRITELINE(i7000_state,i7000_pit_out0))
-// MCFG_PIT8253_CLK1(XTAL_4MHz / 2) /* TODO: verify on PCB */
-// MCFG_PIT8253_OUT1_HANDLER(WRITELINE(i7000_state,i7000_pit_out1))
+// MCFG_PIT8253_CLK0(XTAL_4MHz / 2) /* TODO: verify on PCB */
+// MCFG_PIT8253_OUT0_HANDLER(WRITELINE(i7000_state,i7000_pit_out0))
+// MCFG_PIT8253_CLK1(XTAL_4MHz / 2) /* TODO: verify on PCB */
+// MCFG_PIT8253_OUT1_HANDLER(WRITELINE(i7000_state,i7000_pit_out1))
MCFG_PIT8253_CLK2(XTAL_4MHz / 2) /* TODO: verify on PCB */
MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("speaker", speaker_sound_device, level_w))
diff --git a/src/mess/drivers/icatel.c b/src/mess/drivers/icatel.c
index 400fe02633e..8c47fcaff9a 100644
--- a/src/mess/drivers/icatel.c
+++ b/src/mess/drivers/icatel.c
@@ -2,18 +2,18 @@
// copyright-holders: Felipe Sanches
/***************************************************************************
- icatel - Brazilian public payphone
- manufactured by icatel http://www.icatel.com.br/
+ icatel - Brazilian public payphone
+ manufactured by icatel http://www.icatel.com.br/
- Partial schematics (drawn based on PCB inspection) available at:
- https://github.com/garoa/Icatel/blob/master/doc/icatel.pdf
+ Partial schematics (drawn based on PCB inspection) available at:
+ https://github.com/garoa/Icatel/blob/master/doc/icatel.pdf
- Driver by Felipe Sanches <juca@members.fsf.org>
+ Driver by Felipe Sanches <juca@members.fsf.org>
- Changelog:
+ Changelog:
- 2014 DEC 14 [Felipe Sanches]:
- * Initial driver skeleton
+ 2014 DEC 14 [Felipe Sanches]:
+ * Initial driver skeleton
***************************************************************************/
@@ -81,7 +81,7 @@ static ADDRESS_MAP_START(i80c31_io, AS_IO, 8, icatel_state)
ADDRESS_MAP_END
static ADDRESS_MAP_START(i80c31_data, AS_DATA, 8, icatel_state)
-// AM_RANGE(0x0056,0x005A) AM_READ(magic_string) /* This is a hack! */
+// AM_RANGE(0x0056,0x005A) AM_READ(magic_string) /* This is a hack! */
ADDRESS_MAP_END
DRIVER_INIT_MEMBER( icatel_state, icatel )
@@ -98,7 +98,7 @@ void icatel_state::machine_reset()
READ8_MEMBER(icatel_state::magic_string)
{
-// logerror("read: magic_string, offset=%04X\n", offset);
+// logerror("read: magic_string, offset=%04X\n", offset);
char mstr[] = "TP-OK";
return mstr[offset%5];
}
@@ -108,7 +108,7 @@ READ8_MEMBER(icatel_state::ioport_r)
switch (offset%4)
{
case 0: return 0xff;
- case 1: return 0x7f;
+ case 1: return 0x7f;
case 2: return 0xff;
case 3: return 0xff;
}
@@ -169,8 +169,8 @@ WRITE8_MEMBER(icatel_state::ci8_w)
READ8_MEMBER(icatel_state::ci15_r)
{
/* TODO: Implement-me! */
-// debugger_break(machine());
-// logerror("read: ci15\n");
+// debugger_break(machine());
+// logerror("read: ci15\n");
return (1 << 3) | (1 << 0);
}
diff --git a/src/mess/drivers/rainbow.c b/src/mess/drivers/rainbow.c
index d8704fdd71b..eb5be74ae90 100644
--- a/src/mess/drivers/rainbow.c
+++ b/src/mess/drivers/rainbow.c
@@ -1122,7 +1122,7 @@ static const int SECTOR_SIZES[4] = { 256, 512, 1024, 128 };
void rainbow_state::hdc_reset()
{
-// printf(">> HARD DISC CONTROLLER RESET <<\n");
+// printf(">> HARD DISC CONTROLLER RESET <<\n");
logerror(">> HARD DISC CONTROLLER RESET <<\n");
m_hdc->reset(); // NEW HDC
@@ -2025,7 +2025,7 @@ WRITE8_MEMBER(rainbow_state::z80_diskcontrol_w)
if (m_unit < 2)
{
- data = data | 8; // MOTOR 0 (for A or B)
+ data = data | 8; // MOTOR 0 (for A or B)
}
else
{
@@ -2370,7 +2370,7 @@ MACHINE_CONFIG_END
// - first generation hardware (introduced May '82) with ROM 04.03.11
// - inability to boot from hard disc (mind the inadequate PSU)
//----------------------------------------------------------------------------------------
-// AVAILABLE RAM: 64 K on board (versus 128 K on model 'B').
+// AVAILABLE RAM: 64 K on board (versus 128 K on model 'B').
// Two compatible memory expansions were sold by DEC:
// (PCIXX-AA) : 64 K (usable on either Rainbow 100-A or 100-B) *
@@ -2379,7 +2379,7 @@ MACHINE_CONFIG_END
// * DEC changed the way signals are handled on J6 (memory connector) later:
// "Whether a PC100-A or PC100-B memory module is installed on the PC100-B system module
-// affects the functions the signals on 5 pins (29, 30, 32, 43, and 47) of the J6 connector
+// affects the functions the signals on 5 pins (29, 30, 32, 43, and 47) of the J6 connector
// will perform." (from 'EK-RB100_TM_001 Addendum for PC100-A_PC100-B Dec.84' page 120).
//----------------------------------------------------------------------------------------
// KNOWN DIFFERENCES TO 100-B:
@@ -2396,9 +2396,9 @@ ROM_LOAD("23-177e4-00.bin", 0xFC000, 0x2000, NO_DUMP) // ROM (FC000-FDFFF) (E90)
// SOCKETED LANGUAGE ROM (E91) with 1 single localization per ROM -
ROM_LOAD("23-092e4-00.bin", 0xFE000, 0x2000, NO_DUMP) // ROM (FE000-FFFFF) (E91) 8 K - English (?)
// See also MP-01491-00 - PC100A FIELD MAINTENANCE SET. Appendix A of EK-RB100 Rainbow
-// Technical Manual Addendum f.100A and 100B (Dec.84) lists 15 localizations / part numbers
+// Technical Manual Addendum f.100A and 100B (Dec.84) lists 15 localizations / part numbers
-ROM_REGION(0x1000, "chargen", 0) // [E98] 2732 (4 K) EPROM
+ROM_REGION(0x1000, "chargen", 0) // [E98] 2732 (4 K) EPROM
ROM_LOAD("23-020e3-00.bin", 0x0000, 0x1000, CRC(1685e452) SHA1(bc299ff1cb74afcededf1a7beb9001188fdcf02f))
ROM_END
@@ -2410,25 +2410,25 @@ ROM_END
ROM_START(rainbow)
ROM_REGION(0x100000, "maincpu", 0)
-// Note that the 'Field Maintenance Print Set 1984' also lists alternate revision 'A1' with
+// Note that the 'Field Maintenance Print Set 1984' also lists alternate revision 'A1' with
// 23-063e3-00 (for chargen) and '23-074e5-00' / '23-073e5-00' for E5-01 / E5-02.
// Part numbers 22E5, 20E5 and 37E3 verified to match revision "B" (FCC ID : A0994Q - PC100 - B).
-// BOOT ROM
-ROM_LOAD("23-022e5-00.bin", 0xf0000, 0x4000, CRC(9d1332b4) SHA1(736306d2a36bd44f95a39b36ebbab211cc8fea6e))
+// BOOT ROM
+ROM_LOAD("23-022e5-00.bin", 0xf0000, 0x4000, CRC(9d1332b4) SHA1(736306d2a36bd44f95a39b36ebbab211cc8fea6e))
ROM_RELOAD(0xf4000, 0x4000)
-// LANGUAGE ROM
+// LANGUAGE ROM
ROM_LOAD("23-020e5-00.bin", 0xf8000, 0x4000, CRC(8638712f) SHA1(8269b0d95dc6efbe67d500dac3999df4838625d8)) // German, French, English
//ROM_LOAD( "23-015e5-00.bin", 0xf8000, 0x4000, NO_DUMP) // Dutch, French, English
//ROM_LOAD( "23-016e5-00.bin", 0xf8000, 0x4000, NO_DUMP) // Finish, Swedish, English
-//ROM_LOAD( "23-017e5-00.bin", 0xf8000, 0x4000, NO_DUMP) // Danish, Norwegian, English
-//ROM_LOAD( "23-018e5-00.bin", 0xf8000, 0x4000, NO_DUMP) // Spanish, Italian, English
+//ROM_LOAD( "23-017e5-00.bin", 0xf8000, 0x4000, NO_DUMP) // Danish, Norwegian, English
+//ROM_LOAD( "23-018e5-00.bin", 0xf8000, 0x4000, NO_DUMP) // Spanish, Italian, English
ROM_RELOAD(0xfc000, 0x4000)
// CHARACTER GENERATOR (E3-03)
-ROM_REGION(0x1000, "chargen", 0)
+ROM_REGION(0x1000, "chargen", 0)
ROM_LOAD("23-037e3.bin", 0x0000, 0x1000, CRC(1685e452) SHA1(bc299ff1cb74afcededf1a7beb9001188fdcf02f))
ROM_END
@@ -2443,7 +2443,7 @@ ROM_END
// A Readme from January 1985 mentions 'recent ROM changes for MASS 11' (a VAX word processor).
// It is *likely* that the sole differences between 5.05 and 5.03 affect terminal emulation.
-// FIXME: ROM names are * made up *.
+// FIXME: ROM names are * made up *.
// Someone who knows the DEC naming conventions should correct them -
ROM_START(rainbow190)
ROM_REGION(0x100000, "maincpu", 0)
@@ -2452,7 +2452,7 @@ ROM_RELOAD(0xf4000, 0x4000)
ROM_LOAD("dec190rom1.bin", 0xf8000, 0x4000, CRC(5ce59632) SHA1(d29793f7014c57a4e7cb77bbf6e84f9113635ed2))
ROM_RELOAD(0xfc000, 0x4000)
-ROM_REGION(0x1000, "chargen", 0)
+ROM_REGION(0x1000, "chargen", 0)
ROM_LOAD("chargen.bin", 0x0000, 0x1000, CRC(1685e452) SHA1(bc299ff1cb74afcededf1a7beb9001188fdcf02f))
ROM_END
//----------------------------------------------------------------------------------------
diff --git a/src/mess/drivers/rambo.c b/src/mess/drivers/rambo.c
index 8dd28468990..34c5a953261 100644
--- a/src/mess/drivers/rambo.c
+++ b/src/mess/drivers/rambo.c
@@ -11,7 +11,7 @@
http://reprap.org/mediawiki/images/7/75/Rambo1-1-schematic.png
3d printers currently supported by this driver:
- * Metamáquina 2
+ * Metam??quina 2
3d printers known to use this board:
* TODO: list them all here
@@ -31,31 +31,31 @@
class rambo_state : public driver_device
{
public:
- rambo_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu")
- {
- }
-
- UINT8 m_port_a;
- UINT8 m_port_b;
- UINT8 m_port_c;
- UINT8 m_port_d;
- UINT8 m_port_e;
- UINT8 m_port_f;
- UINT8 m_port_g;
- UINT8 m_port_h;
- UINT8 m_port_j;
- UINT8 m_port_k;
- UINT8 m_port_l;
- required_device<avr8_device> m_maincpu;
-
- DECLARE_READ8_MEMBER(port_r);
- DECLARE_WRITE8_MEMBER(port_w);
-
- DECLARE_DRIVER_INIT(rambo);
- virtual void machine_start();
- virtual void machine_reset();
+ rambo_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
+ m_maincpu(*this, "maincpu")
+ {
+ }
+
+ UINT8 m_port_a;
+ UINT8 m_port_b;
+ UINT8 m_port_c;
+ UINT8 m_port_d;
+ UINT8 m_port_e;
+ UINT8 m_port_f;
+ UINT8 m_port_g;
+ UINT8 m_port_h;
+ UINT8 m_port_j;
+ UINT8 m_port_k;
+ UINT8 m_port_l;
+ required_device<avr8_device> m_maincpu;
+
+ DECLARE_READ8_MEMBER(port_r);
+ DECLARE_WRITE8_MEMBER(port_w);
+
+ DECLARE_DRIVER_INIT(rambo);
+ virtual void machine_start();
+ virtual void machine_reset();
};
void rambo_state::machine_start()
@@ -64,39 +64,39 @@ void rambo_state::machine_start()
READ8_MEMBER(rambo_state::port_r)
{
- switch( offset )
- {
- case AVR8_IO_PORTA:
- {
+ switch( offset )
+ {
+ case AVR8_IO_PORTA:
+ {
#if LOG_PORTS
- printf("[%08X] Port A READ \n", m_maincpu->m_shifted_pc);
+ printf("[%08X] Port A READ \n", m_maincpu->m_shifted_pc);
#endif
- return m_port_a;
- }
- default:
- break;
- }
- return 0;
+ return m_port_a;
+ }
+ default:
+ break;
+ }
+ return 0;
}
WRITE8_MEMBER(rambo_state::port_w)
{
- switch( offset )
- {
- case AVR8_IO_PORTA:
- {
- if (data == m_port_a) break;
+ switch( offset )
+ {
+ case AVR8_IO_PORTA:
+ {
+ if (data == m_port_a) break;
#if LOG_PORTS
- UINT8 old_port_a = m_port_a;
- UINT8 changed = data ^ old_port_a;
+ UINT8 old_port_a = m_port_a;
+ UINT8 changed = data ^ old_port_a;
#endif
- m_port_a = data;
- break;
- }
- default:
- break;
- }
+ m_port_a = data;
+ break;
+ }
+ default:
+ break;
+ }
}
/****************************************************\
@@ -104,15 +104,15 @@ WRITE8_MEMBER(rambo_state::port_w)
\****************************************************/
static ADDRESS_MAP_START( rambo_prg_map, AS_PROGRAM, 8, rambo_state )
- AM_RANGE(0x0000, 0x1FFFF) AM_ROM
+ AM_RANGE(0x0000, 0x1FFFF) AM_ROM
ADDRESS_MAP_END
static ADDRESS_MAP_START( rambo_data_map, AS_DATA, 8, rambo_state )
- AM_RANGE(0x0200, 0x21FF) AM_RAM /* ATMEGA2560 Internal SRAM */
+ AM_RANGE(0x0200, 0x21FF) AM_RAM /* ATMEGA2560 Internal SRAM */
ADDRESS_MAP_END
static ADDRESS_MAP_START( rambo_io_map, AS_IO, 8, rambo_state )
- AM_RANGE(AVR8_IO_PORTA, AVR8_IO_PORTL) AM_READWRITE( port_r, port_w )
+ AM_RANGE(AVR8_IO_PORTA, AVR8_IO_PORTL) AM_READWRITE( port_r, port_w )
ADDRESS_MAP_END
/****************************************************\
@@ -125,102 +125,102 @@ DRIVER_INIT_MEMBER(rambo_state, rambo)
void rambo_state::machine_reset()
{
- m_port_a = 0;
- m_port_b = 0;
- m_port_c = 0;
- m_port_d = 0;
- m_port_e = 0;
- m_port_f = 0;
- m_port_g = 0;
- m_port_h = 0;
- m_port_j = 0;
- m_port_k = 0;
- m_port_l = 0;
+ m_port_a = 0;
+ m_port_b = 0;
+ m_port_c = 0;
+ m_port_d = 0;
+ m_port_e = 0;
+ m_port_f = 0;
+ m_port_g = 0;
+ m_port_h = 0;
+ m_port_j = 0;
+ m_port_k = 0;
+ m_port_l = 0;
}
static MACHINE_CONFIG_START( rambo, rambo_state )
- MCFG_CPU_ADD("maincpu", ATMEGA2560, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(rambo_prg_map)
- MCFG_CPU_DATA_MAP(rambo_data_map)
- MCFG_CPU_IO_MAP(rambo_io_map)
-
- MCFG_CPU_AVR8_EEPROM("eeprom")
- MCFG_CPU_AVR8_LFUSE(0xFF)
- MCFG_CPU_AVR8_HFUSE(0xDA)
- MCFG_CPU_AVR8_EFUSE(0xF4)
- MCFG_CPU_AVR8_LOCK(0x0F)
-
- /*TODO: Add an ATMEGA32U2 for USB-Serial communications */
- /*TODO: Emulate the AD5206 digipot */
- /*TODO: Emulate the A4982 stepper motor drivers and instantiate 5 of these here
- for controlling the X, Y, Z, E1 (and optionally E2) motors */
- /*TODO: Simulate the heating elements */
- /*TODO: Implement the thermistor measurements */
+ MCFG_CPU_ADD("maincpu", ATMEGA2560, MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(rambo_prg_map)
+ MCFG_CPU_DATA_MAP(rambo_data_map)
+ MCFG_CPU_IO_MAP(rambo_io_map)
+
+ MCFG_CPU_AVR8_EEPROM("eeprom")
+ MCFG_CPU_AVR8_LFUSE(0xFF)
+ MCFG_CPU_AVR8_HFUSE(0xDA)
+ MCFG_CPU_AVR8_EFUSE(0xF4)
+ MCFG_CPU_AVR8_LOCK(0x0F)
+
+ /*TODO: Add an ATMEGA32U2 for USB-Serial communications */
+ /*TODO: Emulate the AD5206 digipot */
+ /*TODO: Emulate the A4982 stepper motor drivers and instantiate 5 of these here
+ for controlling the X, Y, Z, E1 (and optionally E2) motors */
+ /*TODO: Simulate the heating elements */
+ /*TODO: Implement the thermistor measurements */
MACHINE_CONFIG_END
ROM_START( metamaq2 )
- ROM_REGION( 0x20000, "maincpu", 0 )
- ROM_DEFAULT_BIOS("20131015")
-
- ROM_SYSTEM_BIOS( 0, "20130619", "June 19th, 2013" )
- /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_06_19) */
- ROMX_LOAD("repetier-fw-metamaquina2-2013-06-19.bin", 0x0000, 0x1000e, CRC(4279b178) SHA1(e4d3c9d6421287c980639c2df32d07b754adc8fc), ROM_BIOS(1))
-
- ROM_SYSTEM_BIOS( 1, "20130624", "June 24th, 2013" )
- /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_RC2_RAMBo_rev10e_2013_06_24) */
- ROMX_LOAD("repetier-fw-metamaquina2-2013-06-24_mm2rc2_rambo_rev10e.bin", 0x0000, 0xcebc, CRC(82400a3c) SHA1(0781ce29406ce69b63edb93d776b9c081bed841e), ROM_BIOS(2))
-
- ROM_SYSTEM_BIOS( 2, "20130625", "June 25th, 2013" )
- /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_06_25) */
- ROMX_LOAD("repetier-fw-metamaquina2-2013-06-25.bin", 0x0000, 0x10076, CRC(e7e4db38) SHA1(0c307bb0a0ee4e9d38253936e7030d0efb3c1845), ROM_BIOS(3))
-
- ROM_SYSTEM_BIOS( 3, "20130709", "July 9th, 2013" )
- /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_07_09) */
- ROMX_LOAD("repetier-fw-metamaquina2-2013-07-09.bin", 0x0000, 0x10078, CRC(9a45509f) SHA1(3a2e6516b45cc0ea1aef039335b02208847aaebf), ROM_BIOS(4))
-
- ROM_SYSTEM_BIOS( 4, "20130712", "July 12th, 2013" )
- /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_07_12) */
- ROMX_LOAD("repetier-fw-metamaquina2-2013-07-12.bin", 0x0000, 0x10184, CRC(9aeac87c) SHA1(c1441096553c214c12a34da87fa42cc3f0eaf74d), ROM_BIOS(5))
-
- ROM_SYSTEM_BIOS( 5, "20130717", "July 17th, 2013" )
- /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_07_17) */
- ROMX_LOAD("repetier-fw-metamaquina2-2013-07-17.bin", 0x0000, 0x10180, CRC(7c053ed0) SHA1(7abeabcbfdb411b6e681e2d0c9398c40b142f76b), ROM_BIOS(6))
-
- ROM_SYSTEM_BIOS( 6, "20130806", "August 6th, 2013" )
- /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_08_06) */
- ROMX_LOAD("repetier-fw-metamaquina2-2013-08-06.bin", 0x0000, 0x1017e, CRC(6aaf5a14) SHA1(93cebee8ab9eda9d81e70504b407268a198577f0), ROM_BIOS(7))
-
- ROM_SYSTEM_BIOS( 7, "20130809", "August 9th, 2013" )
- /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_08_09) */
- ROMX_LOAD("repetier-fw-metamaquina2-2013-08-09.bin", 0x0000, 0x1018a, CRC(ee53a011) SHA1(666d09fe69220a172528fe8d1c358e3ddaaa743a), ROM_BIOS(8))
-
- ROM_SYSTEM_BIOS( 8, "20130822", "August 22nd, 2013" )
- /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_08_22) */
- ROMX_LOAD("repetier-fw-metamaquina2-2013-08-22.bin", 0x0000, 0x1018a, CRC(70a5a3c9) SHA1(20e52ea7bf40e71020b815b9fb6385d880677927), ROM_BIOS(9))
-
- ROM_SYSTEM_BIOS( 9, "20130913", "September 13th, 2013" )
- /* source code for this one is unavailable as it was an unreleased internal development build */
- ROMX_LOAD("repetier-fw-metamaquina2-2013-09-13-devel.bin", 0x0000, 0x101bc, CRC(5e7c7933) SHA1(5b9bfe919daf705ad7a9a2de3cf4c51e3338ec47), ROM_BIOS(10))
-
- ROM_SYSTEM_BIOS( 10, "20130920", "September 20th, 2013" )
- /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_09_20) */
- ROMX_LOAD("repetier-fw-metamaquina2-2013-09-20.bin", 0x0000, 0x10384, CRC(48378e58) SHA1(513f0a0c65219875cc467420cc091e3489b58919), ROM_BIOS(11))
-
- ROM_SYSTEM_BIOS( 11, "20131015", "October 15th, 2013" )
- /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_10_15) */
- ROMX_LOAD("repetier-fw-metamaquina2-2013-10-15.bin", 0x0000, 0x102c8, CRC(520134bd) SHA1(dfe2251aad06972f237eb4920ce14ccb32da5af0), ROM_BIOS(12))
-
- /*Arduino MEGA bootloader */
- /* This is marked as a BAD_DUMP because we're not sure this is the bootloader we're actually using.
- This is inherited from the Replicator 1 driver.
- A proper dump would be good.
- Also, it is not clear whether there's any difference in the bootloader
- between the ATMEGA1280 and the ATMEGA2560 MCUs */
- ROM_LOAD( "atmegaboot_168_atmega1280.bin", 0x1f000, 0x0f16, BAD_DUMP CRC(c041f8db) SHA1(d995ebf360a264cccacec65f6dc0c2257a3a9224) )
-
- /* on-die 4kbyte eeprom */
- ROM_REGION( 0x1000, "eeprom", ROMREGION_ERASEFF )
+ ROM_REGION( 0x20000, "maincpu", 0 )
+ ROM_DEFAULT_BIOS("20131015")
+
+ ROM_SYSTEM_BIOS( 0, "20130619", "June 19th, 2013" )
+ /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_06_19) */
+ ROMX_LOAD("repetier-fw-metamaquina2-2013-06-19.bin", 0x0000, 0x1000e, CRC(4279b178) SHA1(e4d3c9d6421287c980639c2df32d07b754adc8fc), ROM_BIOS(1))
+
+ ROM_SYSTEM_BIOS( 1, "20130624", "June 24th, 2013" )
+ /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_RC2_RAMBo_rev10e_2013_06_24) */
+ ROMX_LOAD("repetier-fw-metamaquina2-2013-06-24_mm2rc2_rambo_rev10e.bin", 0x0000, 0xcebc, CRC(82400a3c) SHA1(0781ce29406ce69b63edb93d776b9c081bed841e), ROM_BIOS(2))
+
+ ROM_SYSTEM_BIOS( 2, "20130625", "June 25th, 2013" )
+ /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_06_25) */
+ ROMX_LOAD("repetier-fw-metamaquina2-2013-06-25.bin", 0x0000, 0x10076, CRC(e7e4db38) SHA1(0c307bb0a0ee4e9d38253936e7030d0efb3c1845), ROM_BIOS(3))
+
+ ROM_SYSTEM_BIOS( 3, "20130709", "July 9th, 2013" )
+ /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_07_09) */
+ ROMX_LOAD("repetier-fw-metamaquina2-2013-07-09.bin", 0x0000, 0x10078, CRC(9a45509f) SHA1(3a2e6516b45cc0ea1aef039335b02208847aaebf), ROM_BIOS(4))
+
+ ROM_SYSTEM_BIOS( 4, "20130712", "July 12th, 2013" )
+ /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_07_12) */
+ ROMX_LOAD("repetier-fw-metamaquina2-2013-07-12.bin", 0x0000, 0x10184, CRC(9aeac87c) SHA1(c1441096553c214c12a34da87fa42cc3f0eaf74d), ROM_BIOS(5))
+
+ ROM_SYSTEM_BIOS( 5, "20130717", "July 17th, 2013" )
+ /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_07_17) */
+ ROMX_LOAD("repetier-fw-metamaquina2-2013-07-17.bin", 0x0000, 0x10180, CRC(7c053ed0) SHA1(7abeabcbfdb411b6e681e2d0c9398c40b142f76b), ROM_BIOS(6))
+
+ ROM_SYSTEM_BIOS( 6, "20130806", "August 6th, 2013" )
+ /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_08_06) */
+ ROMX_LOAD("repetier-fw-metamaquina2-2013-08-06.bin", 0x0000, 0x1017e, CRC(6aaf5a14) SHA1(93cebee8ab9eda9d81e70504b407268a198577f0), ROM_BIOS(7))
+
+ ROM_SYSTEM_BIOS( 7, "20130809", "August 9th, 2013" )
+ /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_08_09) */
+ ROMX_LOAD("repetier-fw-metamaquina2-2013-08-09.bin", 0x0000, 0x1018a, CRC(ee53a011) SHA1(666d09fe69220a172528fe8d1c358e3ddaaa743a), ROM_BIOS(8))
+
+ ROM_SYSTEM_BIOS( 8, "20130822", "August 22nd, 2013" )
+ /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_08_22) */
+ ROMX_LOAD("repetier-fw-metamaquina2-2013-08-22.bin", 0x0000, 0x1018a, CRC(70a5a3c9) SHA1(20e52ea7bf40e71020b815b9fb6385d880677927), ROM_BIOS(9))
+
+ ROM_SYSTEM_BIOS( 9, "20130913", "September 13th, 2013" )
+ /* source code for this one is unavailable as it was an unreleased internal development build */
+ ROMX_LOAD("repetier-fw-metamaquina2-2013-09-13-devel.bin", 0x0000, 0x101bc, CRC(5e7c7933) SHA1(5b9bfe919daf705ad7a9a2de3cf4c51e3338ec47), ROM_BIOS(10))
+
+ ROM_SYSTEM_BIOS( 10, "20130920", "September 20th, 2013" )
+ /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_09_20) */
+ ROMX_LOAD("repetier-fw-metamaquina2-2013-09-20.bin", 0x0000, 0x10384, CRC(48378e58) SHA1(513f0a0c65219875cc467420cc091e3489b58919), ROM_BIOS(11))
+
+ ROM_SYSTEM_BIOS( 11, "20131015", "October 15th, 2013" )
+ /* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_10_15) */
+ ROMX_LOAD("repetier-fw-metamaquina2-2013-10-15.bin", 0x0000, 0x102c8, CRC(520134bd) SHA1(dfe2251aad06972f237eb4920ce14ccb32da5af0), ROM_BIOS(12))
+
+ /*Arduino MEGA bootloader */
+ /* This is marked as a BAD_DUMP because we're not sure this is the bootloader we're actually using.
+ This is inherited from the Replicator 1 driver.
+ A proper dump would be good.
+ Also, it is not clear whether there's any difference in the bootloader
+ between the ATMEGA1280 and the ATMEGA2560 MCUs */
+ ROM_LOAD( "atmegaboot_168_atmega1280.bin", 0x1f000, 0x0f16, BAD_DUMP CRC(c041f8db) SHA1(d995ebf360a264cccacec65f6dc0c2257a3a9224) )
+
+ /* on-die 4kbyte eeprom */
+ ROM_REGION( 0x1000, "eeprom", ROMREGION_ERASEFF )
ROM_END
/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
diff --git a/src/mess/drivers/rc759.c b/src/mess/drivers/rc759.c
index 175ea21037c..4f2f5642cfa 100644
--- a/src/mess/drivers/rc759.c
+++ b/src/mess/drivers/rc759.c
@@ -472,7 +472,7 @@ static ADDRESS_MAP_START( rc759_io, AS_IO, 16, rc759_state )
AM_RANGE(0x056, 0x057) AM_NOP // in reality, access to sound and rtc is a bit more involved
AM_RANGE(0x05a, 0x05b) AM_DEVWRITE8("snd", sn76489a_device, write, 0x00ff)
AM_RANGE(0x05c, 0x05d) AM_READWRITE8(rtc_r, rtc_w, 0x00ff)
-// AM_RANGE(0x060, 0x06f) AM_WRITE8(crt_control_w, 0x00ff)
+// AM_RANGE(0x060, 0x06f) AM_WRITE8(crt_control_w, 0x00ff)
AM_RANGE(0x070, 0x077) AM_MIRROR(0x08) AM_DEVREADWRITE8("ppi", i8255_device, read, write, 0x00ff)
AM_RANGE(0x080, 0x0ff) AM_READWRITE8(nvram_r, nvram_w, 0x00ff)
// AM_RANGE(0x100, 0x101) net
@@ -487,12 +487,12 @@ static ADDRESS_MAP_START( rc759_io, AS_IO, 16, rc759_state )
// AM_RANGE(0x28d, 0x28d) external printer control
AM_RANGE(0x28e, 0x28f) AM_READWRITE8(floppy_ack_r, floppy_reserve_w, 0x00ff)
AM_RANGE(0x290, 0x291) AM_WRITE8(floppy_release_w, 0x00ff)
-// AM_RANGE(0x292, 0x293) AM_READWRITE8(printer_ack_r, printer_reserve_w, 0x00ff)
-// AM_RANGE(0x294, 0x295) AM_WRITE8(printer_release_w, 0x00ff)
+// AM_RANGE(0x292, 0x293) AM_READWRITE8(printer_ack_r, printer_reserve_w, 0x00ff)
+// AM_RANGE(0x294, 0x295) AM_WRITE8(printer_release_w, 0x00ff)
AM_RANGE(0x300, 0x30f) AM_DEVREADWRITE8("isbx", isbx_slot_device, mcs0_r, mcs0_w, 0x00ff)
AM_RANGE(0x310, 0x31f) AM_DEVREADWRITE8("isbx", isbx_slot_device, mcs1_r, mcs1_w, 0x00ff)
-// AM_RANGE(0x320, 0x321) isbx dma ack
-// AM_RANGE(0x330, 0x331) isbx tc
+// AM_RANGE(0x320, 0x321) isbx dma ack
+// AM_RANGE(0x330, 0x331) isbx tc
ADDRESS_MAP_END
@@ -554,8 +554,8 @@ static MACHINE_CONFIG_START( rc759, rc759_state )
MCFG_I82730_SINT_HANDLER(DEVWRITELINE("pic", pic8259_device, ir4_w))
// keyboard
- MCFG_DEVICE_ADD("keyb", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(rc759_state, keyb_put))
+ MCFG_DEVICE_ADD("keyb", GENERIC_KEYBOARD, 0)
+ MCFG_GENERIC_KEYBOARD_CB(WRITE8(rc759_state, keyb_put))
// cassette
MCFG_CASSETTE_ADD("cas")
@@ -584,8 +584,8 @@ static MACHINE_CONFIG_START( rc759, rc759_state )
// floppy disk controller
MCFG_WD2797_ADD("fdc", 1000000)
-// MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("pic", pic8259_device, ir0_w))
-// MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, drq1_w))
+// MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("pic", pic8259_device, ir0_w))
+// MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, drq1_w))
// floppy drives
MCFG_FLOPPY_DRIVE_ADD("fdc:0", rc759_floppies, "hd", floppy_image_device::default_floppy_formats)
diff --git a/src/mess/drivers/sdk80.c b/src/mess/drivers/sdk80.c
index dab269c9720..92c6f97b190 100644
--- a/src/mess/drivers/sdk80.c
+++ b/src/mess/drivers/sdk80.c
@@ -29,9 +29,9 @@ Please note this rom set boots into BASIC, not monitor.
#include "bus/rs232/rs232.h"
//#include "machine/ay31015.h"
-#define I8251A_TAG "usart"
-#define I8251A_BAUD_TAG "usart_baud"
-#define RS232_TAG "rs232"
+#define I8251A_TAG "usart"
+#define I8251A_BAUD_TAG "usart_baud"
+#define RS232_TAG "rs232"
class sdk80_state : public driver_device
{
@@ -145,40 +145,40 @@ static MACHINE_CONFIG_START( sdk80, sdk80_state )
/* video hardware */
// 96364 crt controller
-// MCFG_SCREEN_ADD("screen", RASTER)
-// MCFG_SCREEN_REFRESH_RATE(60)
+// MCFG_SCREEN_ADD("screen", RASTER)
+// MCFG_SCREEN_REFRESH_RATE(60)
/* Video is blanked for 70 out of 262 scanlines per refresh cycle.
Each scanline is composed of 65 character times, 40 of which
are visible, and each character time is 7 dot times; a dot time
is 2 cycles of the fundamental 14.31818 MHz oscillator. The
total blanking time is about 4450 microseconds. */
-// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((int) (70 * 65 * 7 * 2 / 14.31818)))
+// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((int) (70 * 65 * 7 * 2 / 14.31818)))
/* It would be nice if we could implement some sort of display
overscan here. */
-// MCFG_SCREEN_SIZE(40 * 7, 24 * 8)
-// MCFG_SCREEN_VISIBLE_AREA(0, 40 * 7 - 1, 0, 24 * 8 - 1)
-// MCFG_SCREEN_UPDATE_DRIVER(sdk80_state, screen_update)
-// MCFG_SCREEN_PALETTE("palette")
+// MCFG_SCREEN_SIZE(40 * 7, 24 * 8)
+// MCFG_SCREEN_VISIBLE_AREA(0, 40 * 7 - 1, 0, 24 * 8 - 1)
+// MCFG_SCREEN_UPDATE_DRIVER(sdk80_state, screen_update)
+// MCFG_SCREEN_PALETTE("palette")
-// MCFG_GFXDECODE_ADD("gfxdecode", "palette", sdk80)
+// MCFG_GFXDECODE_ADD("gfxdecode", "palette", sdk80)
-// MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette")
+// MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette")
// Video board UART
-// MCFG_DEVICE_ADD( "hd6402", AY31015, 0 )
-// MCFG_AY31015_TX_CLOCK(( XTAL_16MHz / 16 ) / 256)
-// MCFG_AY31015_RX_CLOCK(( XTAL_16MHz / 16 ) / 256)
-// MCFG_AY51013_READ_SI_CB(READ8(sdk80_state, nascom1_hd6402_si))
-// MCFG_AY51013_WRITE_SO_CB(WRITE8(sdk80_state, nascom1_hd6402_so))
+// MCFG_DEVICE_ADD( "hd6402", AY31015, 0 )
+// MCFG_AY31015_TX_CLOCK(( XTAL_16MHz / 16 ) / 256)
+// MCFG_AY31015_RX_CLOCK(( XTAL_16MHz / 16 ) / 256)
+// MCFG_AY51013_READ_SI_CB(READ8(sdk80_state, nascom1_hd6402_si))
+// MCFG_AY51013_WRITE_SO_CB(WRITE8(sdk80_state, nascom1_hd6402_so))
/* Devices */
-// MCFG_DEVICE_ADD("i8279", I8279, 3100000) // based on divider
-// MCFG_I8279_OUT_IRQ_CB(INPUTLINE("maincpu", I8085_RST55_LINE)) // irq
-// MCFG_I8279_OUT_SL_CB(WRITE8(sdk80_state, scanlines_w)) // scan SL lines
-// MCFG_I8279_OUT_DISP_CB(WRITE8(sdk80_state, digit_w)) // display A&B
-// MCFG_I8279_IN_RL_CB(READ8(sdk80_state, kbd_r)) // kbd RL lines
-// MCFG_I8279_IN_SHIFT_CB(VCC) // Shift key
-// MCFG_I8279_IN_CTRL_CB(VCC)
+// MCFG_DEVICE_ADD("i8279", I8279, 3100000) // based on divider
+// MCFG_I8279_OUT_IRQ_CB(INPUTLINE("maincpu", I8085_RST55_LINE)) // irq
+// MCFG_I8279_OUT_SL_CB(WRITE8(sdk80_state, scanlines_w)) // scan SL lines
+// MCFG_I8279_OUT_DISP_CB(WRITE8(sdk80_state, digit_w)) // display A&B
+// MCFG_I8279_IN_RL_CB(READ8(sdk80_state, kbd_r)) // kbd RL lines
+// MCFG_I8279_IN_SHIFT_CB(VCC) // Shift key
+// MCFG_I8279_IN_CTRL_CB(VCC)
//MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
//MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(sdk80_state, kbd_put))
diff --git a/src/mess/drivers/smc777.c b/src/mess/drivers/smc777.c
index 730ab4da19c..930df846ae6 100644
--- a/src/mess/drivers/smc777.c
+++ b/src/mess/drivers/smc777.c
@@ -613,33 +613,33 @@ static ADDRESS_MAP_START( smc777_io, AS_IO, 8, smc777_state )
AM_RANGE(0x18, 0x19) AM_MIRROR(0xff00) AM_WRITE(mc6845_w)
AM_RANGE(0x1a, 0x1b) AM_MIRROR(0xff00) AM_READWRITE(key_r, key_w)
AM_RANGE(0x1c, 0x1c) AM_MIRROR(0xff00) AM_READWRITE(system_input_r, system_output_w)
-// AM_RANGE(0x1d, 0x1d) system and control read, printer strobe write
-// AM_RANGE(0x1e, 0x1f) rs232 irq control
+// AM_RANGE(0x1d, 0x1d) system and control read, printer strobe write
+// AM_RANGE(0x1e, 0x1f) rs232 irq control
AM_RANGE(0x20, 0x20) AM_MIRROR(0xff00) AM_READWRITE(display_reg_r, display_reg_w)
AM_RANGE(0x21, 0x21) AM_MIRROR(0xff00) AM_READWRITE(irq_mask_r, irq_mask_w)
-// AM_RANGE(0x22, 0x22) printer output data
+// AM_RANGE(0x22, 0x22) printer output data
AM_RANGE(0x23, 0x23) AM_MIRROR(0xff00) AM_WRITE(border_col_w)
-// AM_RANGE(0x24, 0x24) rtc write address
-// AM_RANGE(0x25, 0x25) rtc read
-// AM_RANGE(0x26, 0x26) rs232 #1
-// AM_RANGE(0x28, 0x2c) fdc #2
-// AM_RANGE(0x2d, 0x2f) rs232 #2
+// AM_RANGE(0x24, 0x24) rtc write address
+// AM_RANGE(0x25, 0x25) rtc read
+// AM_RANGE(0x26, 0x26) rs232 #1
+// AM_RANGE(0x28, 0x2c) fdc #2
+// AM_RANGE(0x2d, 0x2f) rs232 #2
AM_RANGE(0x30, 0x33) AM_MIRROR(0xff00) AM_READWRITE(fdc_r, fdc_w)
AM_RANGE(0x34, 0x34) AM_MIRROR(0xff00) AM_READWRITE(fdc_request_r, floppy_select_w)
-// AM_RANGE(0x35, 0x37) rs232 #3
-// AM_RANGE(0x38, 0x3b) cache disk unit
-// AM_RANGE(0x3c, 0x3d) rgb superimposer
-// AM_RANGE(0x40, 0x47) ieee-488
-// AM_RANGE(0x48, 0x4f) hdd (winchester)
+// AM_RANGE(0x35, 0x37) rs232 #3
+// AM_RANGE(0x38, 0x3b) cache disk unit
+// AM_RANGE(0x3c, 0x3d) rgb superimposer
+// AM_RANGE(0x40, 0x47) ieee-488
+// AM_RANGE(0x48, 0x4f) hdd (winchester)
AM_RANGE(0x51, 0x51) AM_MIRROR(0xff00) AM_READ_PORT("JOY_1P") AM_WRITE(color_mode_w)
AM_RANGE(0x52, 0x52) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_WRITE(ramdac_w)
AM_RANGE(0x53, 0x53) AM_MIRROR(0xff00) AM_DEVWRITE("sn1", sn76489a_device, write)
-// AM_RANGE(0x54, 0x59) vrt controller
-// AM_RANGE(0x5a, 0x5b) ram banking
-// AM_RANGE(0x70, 0x70) auto-start rom
-// AM_RANGE(0x74, 0x74) ieee-488 rom
-// AM_RANGE(0x75, 0x75) vrt controller rom
-// AM_RANGE(0x7e, 0x7f) kanji rom
+// AM_RANGE(0x54, 0x59) vrt controller
+// AM_RANGE(0x5a, 0x5b) ram banking
+// AM_RANGE(0x70, 0x70) auto-start rom
+// AM_RANGE(0x74, 0x74) ieee-488 rom
+// AM_RANGE(0x75, 0x75) vrt controller rom
+// AM_RANGE(0x7e, 0x7f) kanji rom
AM_RANGE(0x80, 0xff) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_READWRITE(fbuf_r, fbuf_w)
ADDRESS_MAP_END
diff --git a/src/mess/drivers/tb303.c b/src/mess/drivers/tb303.c
index a1df54dc7e3..37eccbd7e78 100644
--- a/src/mess/drivers/tb303.c
+++ b/src/mess/drivers/tb303.c
@@ -28,7 +28,7 @@ public:
{ }
required_device<timer_device> m_t3_off_timer;
-
+
UINT8 m_ram[0xc00];
UINT16 m_ram_address;
bool m_ram_ce;
@@ -97,7 +97,7 @@ void tb303_state::refresh_ram()
case 2: hi = 1; break;
case 3: hi = 2; break;
}
-
+
if (m_ram_ce)
{
// _WE must be high(read mode) for address transitions
@@ -114,7 +114,7 @@ WRITE8_MEMBER(tb303_state::ram_w)
// MCU D,F,E: RAM address
m_port[offset] = data;
refresh_ram();
-
+
// MCU D,F01: pitch data
//..
}
@@ -133,7 +133,7 @@ WRITE8_MEMBER(tb303_state::strobe_w)
// MCU I0: RAM _WE
m_ram_we = (data & 1) ? false : true;
refresh_ram();
-
+
// MCU I1: pitch data latch strobe
// MCU I2: gate signal
@@ -147,13 +147,13 @@ void tb303_state::update_leds()
{
// 4*4 LED matrix from port G/H:
/*
- 0.0 D204 1.0 D211 2.0 D217 3.0 D205
- 0.1 D206 1.1 D213 2.1 D218 3.1 D207
- 0.2 D208 1.2 D215 2.2 D220 3.2 D210
- 0.3 D209 1.3 D216 2.3 D221 3.3 D212
+ 0.0 D204 1.0 D211 2.0 D217 3.0 D205
+ 0.1 D206 1.1 D213 2.1 D218 3.1 D207
+ 0.2 D208 1.2 D215 2.2 D220 3.2 D210
+ 0.3 D209 1.3 D216 2.3 D221 3.3 D212
*/
display_matrix(4, 4, m_port[NEC_UCOM4_PORTG], m_port[NEC_UCOM4_PORTH]);
-
+
// todo: battery led
// todo: 4 more leds(see top-left part)
}
@@ -164,7 +164,7 @@ WRITE8_MEMBER(tb303_state::switch_w)
// MCU H: input/led mux
if (offset == NEC_UCOM4_PORTH)
m_inp_mux = data = data ^ 0xf;
-
+
m_port[offset] = data;
update_leds();
}
@@ -253,13 +253,13 @@ INPUT_PORTS_END
void tb303_state::machine_start()
{
hh_ucom4_state::machine_start();
-
+
// zerofill
memset(m_ram, 0, sizeof(m_ram));
m_ram_address = 0;
m_ram_ce = false;
m_ram_we = false;
-
+
// register for savestates
save_item(NAME(m_ram));
save_item(NAME(m_ram_address));
diff --git a/src/mess/drivers/xbox.c b/src/mess/drivers/xbox.c
index 8b2ada377e8..0b938a82807 100644
--- a/src/mess/drivers/xbox.c
+++ b/src/mess/drivers/xbox.c
@@ -2,10 +2,10 @@
// copyright-holders:?
/***************************************************************************
- XBOX (c) 2001 Microsoft
+ XBOX (c) 2001 Microsoft
+
+ Skeleton driver
- Skeleton driver
-
***************************************************************************/
@@ -64,23 +64,23 @@ UINT32 xbox_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap, c
static ADDRESS_MAP_START(xbox_map, AS_PROGRAM, 32, xbox_state)
AM_RANGE(0x00000000, 0x07ffffff) AM_RAM // 128 megabytes
AM_RANGE(0xf0000000, 0xf0ffffff) AM_RAM
-// AM_RANGE(0xfd000000, 0xfdffffff) AM_RAM AM_READWRITE(geforce_r, geforce_w)
-// AM_RANGE(0xfed00000, 0xfed003ff) AM_READWRITE(usbctrl_r, usbctrl_w)
-// AM_RANGE(0xfe800000, 0xfe85ffff) AM_READWRITE(audio_apu_r, audio_apu_w)
-// AM_RANGE(0xfec00000, 0xfec001ff) AM_READWRITE(audio_ac93_r, audio_ac93_w)
+// AM_RANGE(0xfd000000, 0xfdffffff) AM_RAM AM_READWRITE(geforce_r, geforce_w)
+// AM_RANGE(0xfed00000, 0xfed003ff) AM_READWRITE(usbctrl_r, usbctrl_w)
+// AM_RANGE(0xfe800000, 0xfe85ffff) AM_READWRITE(audio_apu_r, audio_apu_w)
+// AM_RANGE(0xfec00000, 0xfec001ff) AM_READWRITE(audio_ac93_r, audio_ac93_w)
AM_RANGE(0xff000000, 0xff07ffff) AM_ROM AM_REGION("bios", 0) AM_MIRROR(0x00f80000)
ADDRESS_MAP_END
static ADDRESS_MAP_START(xbox_map_io, AS_IO, 32, xbox_state)
-// AM_RANGE(0x0020, 0x0023) AM_DEVREADWRITE8("pic8259_1", pic8259_device, read, write, 0xffffffff)
-// AM_RANGE(0x0040, 0x0043) AM_DEVREADWRITE8("pit8254", pit8254_device, read, write, 0xffffffff)
-// AM_RANGE(0x00a0, 0x00a3) AM_DEVREADWRITE8("pic8259_2", pic8259_device, read, write, 0xffffffff)
-// AM_RANGE(0x01f0, 0x01f7) AM_DEVREADWRITE("ide", bus_master_ide_controller_device, read_cs0, write_cs0)
-// AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_bus_legacy_device, read, write)
-// AM_RANGE(0x4000, 0x40ff) AM_READWRITE(mediaboard_r, mediaboard_w)
-// AM_RANGE(0x8000, 0x80ff) AM_READWRITE(dummy_r, dummy_w)
-// AM_RANGE(0xc000, 0xc0ff) AM_READWRITE(smbus_r, smbus_w)
-// AM_RANGE(0xff60, 0xff67) AM_DEVREADWRITE("ide", bus_master_ide_controller_device, bmdma_r, bmdma_w)
+// AM_RANGE(0x0020, 0x0023) AM_DEVREADWRITE8("pic8259_1", pic8259_device, read, write, 0xffffffff)
+// AM_RANGE(0x0040, 0x0043) AM_DEVREADWRITE8("pit8254", pit8254_device, read, write, 0xffffffff)
+// AM_RANGE(0x00a0, 0x00a3) AM_DEVREADWRITE8("pic8259_2", pic8259_device, read, write, 0xffffffff)
+// AM_RANGE(0x01f0, 0x01f7) AM_DEVREADWRITE("ide", bus_master_ide_controller_device, read_cs0, write_cs0)
+// AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_bus_legacy_device, read, write)
+// AM_RANGE(0x4000, 0x40ff) AM_READWRITE(mediaboard_r, mediaboard_w)
+// AM_RANGE(0x8000, 0x80ff) AM_READWRITE(dummy_r, dummy_w)
+// AM_RANGE(0xc000, 0xc0ff) AM_READWRITE(smbus_r, smbus_w)
+// AM_RANGE(0xff60, 0xff67) AM_DEVREADWRITE("ide", bus_master_ide_controller_device, bmdma_r, bmdma_w)
ADDRESS_MAP_END
static INPUT_PORTS_START( xbox )
@@ -161,7 +161,7 @@ static MACHINE_CONFIG_START( xbox, xbox_state )
MCFG_CPU_ADD("maincpu", PENTIUM3, 733333333/CPU_DIV) /* Wrong! family 6 model 8 stepping 10 */
MCFG_CPU_PROGRAM_MAP(xbox_map)
MCFG_CPU_IO_MAP(xbox_map_io)
-// MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(chihiro_state, irq_callback)
+// MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(chihiro_state, irq_callback)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -193,20 +193,20 @@ ROM_START( xbox )
ROM_REGION( 0x200, "mcpx", 0 )
ROM_LOAD( "mcpx_1_0.bin", 0, 0x200, CRC(f31429fc) SHA1(a9ecbf8896d10db81594923e485862aa3aac7b58) )
ROM_LOAD( "mcpx_1_1.bin", 0, 0x200, CRC(94ce376b) SHA1(6c875f17f773aaec51eb434068bb6c657c4343c0) )
-
+
ROM_REGION( 0x80000, "bios", 0)
- ROM_LOAD( "xbox-5530.bin", 0x000000, 0x040000, CRC(9569c4d3) SHA1(40fa73277013be3168135e1768b09623a987ff63) )
- ROM_LOAD( "xbox-5713.bin", 0x040000, 0x040000, CRC(58fd8173) SHA1(8b7ccc4648ccd78cdb7b65cfca09621eaf2d4238) )
+ ROM_LOAD( "xbox-5530.bin", 0x000000, 0x040000, CRC(9569c4d3) SHA1(40fa73277013be3168135e1768b09623a987ff63) )
+ ROM_LOAD( "xbox-5713.bin", 0x040000, 0x040000, CRC(58fd8173) SHA1(8b7ccc4648ccd78cdb7b65cfca09621eaf2d4238) )
ROM_COPY( "mcpx", 0, 0x7fe00, 0x200 )
-
+
ROM_REGION( 0x1000000, "tbp", 0 ) // To Be Processed, of course
ROM_LOAD( "3944_1024k.bin", 0x000000, 0x100000, CRC(32a9ecb6) SHA1(67054fc88bda94e33e86f1b19be60efec0724fb6) )
- ROM_LOAD( "4034_1024k.bin", 0x000000, 0x100000, CRC(0d6fc88f) SHA1(ab676b712204fb1728bf89f9cd541a8f5a64ab97) )
- ROM_LOAD( "4134_1024k.bin", 0x000000, 0x100000, CRC(49d8055a) SHA1(d46cef771a63dc8024fe36d7ab5b959087ac999f) )
- ROM_LOAD( "4817_1024k.bin", 0x000000, 0x100000, CRC(3f30863a) SHA1(dc955bd4d3ca71e01214a49e5d0aba615270c03c) )
- ROM_LOAD( "5101_256k.bin", 0x000000, 0x040000, CRC(e8a9224e) SHA1(5108e1025f48071c07a6823661d708c66dee97a9) )
- ROM_LOAD( "5838_256k.bin", 0x000000, 0x040000, CRC(5be2413d) SHA1(b9489e883c650b5e5fe2f83a32237dbf74f0e9f1) )
+ ROM_LOAD( "4034_1024k.bin", 0x000000, 0x100000, CRC(0d6fc88f) SHA1(ab676b712204fb1728bf89f9cd541a8f5a64ab97) )
+ ROM_LOAD( "4134_1024k.bin", 0x000000, 0x100000, CRC(49d8055a) SHA1(d46cef771a63dc8024fe36d7ab5b959087ac999f) )
+ ROM_LOAD( "4817_1024k.bin", 0x000000, 0x100000, CRC(3f30863a) SHA1(dc955bd4d3ca71e01214a49e5d0aba615270c03c) )
+ ROM_LOAD( "5101_256k.bin", 0x000000, 0x040000, CRC(e8a9224e) SHA1(5108e1025f48071c07a6823661d708c66dee97a9) )
+ ROM_LOAD( "5838_256k.bin", 0x000000, 0x040000, CRC(5be2413d) SHA1(b9489e883c650b5e5fe2f83a32237dbf74f0e9f1) )
ROM_END
// See src/emu/gamedrv.h for details
// For a game:
diff --git a/src/mess/layout/tb303.lay b/src/mess/layout/tb303.lay
index d10ee6a5adb..b68f4684da9 100644
--- a/src/mess/layout/tb303.lay
+++ b/src/mess/layout/tb303.lay
@@ -15,7 +15,7 @@
<bounds left="0" right="100" top="0" bottom="100" />
<!-- 21 LEDs: D201-D221 -->
-
+
<bezel name="x.0" element="led"><bounds x="1" y="10" width="1" height="1" /></bezel> <!-- d201 -->
<bezel name="x.0" element="led"><bounds x="10" y="2" width="1" height="1" /></bezel> <!-- d202 -->
diff --git a/src/mess/machine/amstrad.c b/src/mess/machine/amstrad.c
index b673b2040d1..508ed6f2e82 100644
--- a/src/mess/machine/amstrad.c
+++ b/src/mess/machine/amstrad.c
@@ -2098,7 +2098,7 @@ The exception is the case where none of b7-b0 are reset (i.e. port &FBFF), which
if(m_system_type != SYSTEM_GX4000)
{
if(m_fdc) // if FDC is present (it isn't on a 464)
- {
+ {
if ((offset & (1<<7)) == 0)
{
unsigned int b8b0 = ((offset & 0x0100) >> (8 - 1)) | (offset & 0x01);
diff --git a/src/tools/nltool.c b/src/tools/nltool.c
index 3a898c1f96d..5b6ff343b94 100644
--- a/src/tools/nltool.c
+++ b/src/tools/nltool.c
@@ -273,7 +273,6 @@ struct input_t
input_t()
{
-
}
input_t(netlist::netlist_t *netlist, const pstring &line)
{
diff --git a/src/tools/nlwav.c b/src/tools/nlwav.c
index 731358be6e9..cc6a5988e3e 100644
--- a/src/tools/nlwav.c
+++ b/src/tools/nlwav.c
@@ -90,27 +90,27 @@ public:
private:
struct riff_chunk_t
{
- char group_id[4];
- unsigned filelen;
- char rifftype[4];
+ char group_id[4];
+ unsigned filelen;
+ char rifftype[4];
};
struct riff_format_t
{
- char signature[4];
- unsigned fmt_length;
- short format_tag;
- short channels;
- unsigned sample_rate;
- unsigned bytes_per_second;
- short block_align;
- short bits_sample;
+ char signature[4];
+ unsigned fmt_length;
+ short format_tag;
+ short channels;
+ unsigned sample_rate;
+ unsigned bytes_per_second;
+ short block_align;
+ short bits_sample;
};
struct riff_data_t
{
- char signature[4];
- unsigned len;
+ char signature[4];
+ unsigned len;
// data follows
};
@@ -144,13 +144,12 @@ private:
void convert(nlwav_options_t &opts)
{
-
wav_t wo(opts.opt_out(), 48000);
-
+
FILE *FIN = std::fopen(opts.opt_inp(),"r");
if (FIN==NULL)
throw netlist::fatalerror_e("Error opening input file: %s", opts.opt_inp().cstr());
-
+
double dt = 1.0 / (double) wo.sample_rate();
double ct = dt;
//double mean = 2.4;
@@ -165,7 +164,7 @@ void convert(nlwav_options_t &opts)
int n = 0;
//short sample = 0;
-
+
while(!std::feof(FIN))
{
#if 1
@@ -212,7 +211,7 @@ void convert(nlwav_options_t &opts)
v = 32000.0;
else if (v<-32000.0)
v = -32000.0;
- sample = v;
+ sample = v;
//printf("%f %f\n", t, v);
#endif
}
@@ -270,23 +269,23 @@ int main(int argc, char *argv[])
}
/*
-Der Daten-Abschnitt enthält die Abtastwerte:
-Offset Länge Inhalt Beschreibung
-36 (0x24) 4 'data' Header-Signatur
-40 (0x28) 4 <length> Länge des Datenblocks, max. <Dateigröße> − 44
+Der Daten-Abschnitt enth??lt die Abtastwerte:
+Offset L??nge Inhalt Beschreibung
+36 (0x24) 4 'data' Header-Signatur
+40 (0x28) 4 <length> L??nge des Datenblocks, max. <Dateigr????e>?????????44
-0 (0x00) char 4 'RIFF'
-4 (0x04) unsigned 4 <Dateigröße> − 8
-8 (0x08) char 4 'WAVE'
+0 (0x00) char 4 'RIFF'
+4 (0x04) unsigned 4 <Dateigr????e>?????????8
+8 (0x08) char 4 'WAVE'
Der fmt-Abschnitt (24 Byte) beschreibt das Format der einzelnen Abtastwerte:
-Offset Länge Inhalt Beschreibung
-12 (0x0C) 4 'fmt ' Header-Signatur (folgendes Leerzeichen beachten)
-16 (0x10) 4 <fmt length> Länge des restlichen fmt-Headers (16 Bytes)
-20 (0x14) 2 <format tag> Datenformat der Abtastwerte (siehe separate Tabelle weiter unten)
-22 (0x16) 2 <channels> Anzahl der Kanäle: 1 = mono, 2 = stereo; mittlerweile sind auch mehr als 2 Kanäle (z. B. für Raumklang) möglich.[2]
-24 (0x18) 4 <sample rate> Samples pro Sekunde je Kanal (z. B. 44100)
-28 (0x1C) 4 <bytes/second> Abtastrate · Frame-Größe
-32 (0x20) 2 <block align> Frame-Größe = <Anzahl der Kanäle> · ((<Bits/Sample (eines Kanals)> + 7) / 8) (Division ohne Rest)
-34 (0x22) 2 <bits/sample> Anzahl der Datenbits pro Samplewert je Kanal (z. B. 12)
+Offset L??nge Inhalt Beschreibung
+12 (0x0C) 4 'fmt ' Header-Signatur (folgendes Leerzeichen beachten)
+16 (0x10) 4 <fmt length> L??nge des restlichen fmt-Headers (16 Bytes)
+20 (0x14) 2 <format tag> Datenformat der Abtastwerte (siehe separate Tabelle weiter unten)
+22 (0x16) 2 <channels> Anzahl der Kan??le: 1 = mono, 2 = stereo; mittlerweile sind auch mehr als 2 Kan??le (z. B. f??r Raumklang) m??glich.[2]
+24 (0x18) 4 <sample rate> Samples pro Sekunde je Kanal (z. B. 44100)
+28 (0x1C) 4 <bytes/second> Abtastrate????????Frame-Gr????e
+32 (0x20) 2 <block align> Frame-Gr????e = <Anzahl der Kan??le>????????((<Bits/Sample (eines Kanals)>???+???7)???/???8) (Division ohne Rest)
+34 (0x22) 2 <bits/sample> Anzahl der Datenbits pro Samplewert je Kanal (z. B. 12)
*/
diff --git a/src/version.c b/src/version.c
index 5343ee091de..8d05a291671 100644
--- a/src/version.c
+++ b/src/version.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#define BARE_BUILD_VERSION "0.163"
+#define BARE_BUILD_VERSION "0.164"
extern const char bare_build_version[];
extern const char build_version[];