summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2016-04-27 08:13:59 +0200
committerGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2016-04-27 08:13:59 +0200
commitcfee536f22f032c7ead65075f73cc6fd8549e68b (patch)
treef4b4703dd0295571684456c19668f508b3ddcb3a
parentbe8159d01eaa7533e7758bf07384501dbc6214f3 (diff)
Cleanups and version bumpmame0173
-rw-r--r--hash/hp9845b_rom.xml8
-rw-r--r--hash/lynx.xml2
-rw-r--r--hash/megadriv.xml2
-rw-r--r--hash/neogeo.xml2
-rw-r--r--hash/pce_tourvision.xml272
-rw-r--r--src/devices/bus/a2bus/pc_xporter.cpp63
-rw-r--r--src/devices/bus/a2bus/pc_xporter.h4
-rw-r--r--src/devices/bus/generic/slot.cpp2
-rw-r--r--src/devices/bus/generic/slot.h16
-rw-r--r--src/devices/bus/hp_optroms/hp_optrom.cpp156
-rw-r--r--src/devices/bus/hp_optroms/hp_optrom.h74
-rw-r--r--src/devices/bus/intv/ecs.cpp2
-rw-r--r--src/devices/bus/intv_ctrl/ctrl.cpp1
-rw-r--r--src/devices/bus/intv_ctrl/ctrl.h4
-rw-r--r--src/devices/bus/intv_ctrl/ecs_ctrl.cpp381
-rw-r--r--src/devices/bus/intv_ctrl/ecs_ctrl.h108
-rw-r--r--src/devices/bus/intv_ctrl/handctrl.cpp211
-rw-r--r--src/devices/bus/intv_ctrl/handctrl.h8
-rw-r--r--src/devices/bus/neogeo_ctrl/ctrl.cpp7
-rw-r--r--src/devices/bus/neogeo_ctrl/ctrl.h10
-rw-r--r--src/devices/bus/neogeo_ctrl/dial.cpp5
-rw-r--r--src/devices/bus/neogeo_ctrl/dial.h8
-rw-r--r--src/devices/bus/neogeo_ctrl/irrmaze.cpp3
-rw-r--r--src/devices/bus/neogeo_ctrl/irrmaze.h8
-rw-r--r--src/devices/bus/neogeo_ctrl/joystick.cpp13
-rw-r--r--src/devices/bus/neogeo_ctrl/joystick.h6
-rw-r--r--src/devices/bus/neogeo_ctrl/kizuna4p.cpp8
-rw-r--r--src/devices/bus/neogeo_ctrl/kizuna4p.h8
-rw-r--r--src/devices/bus/neogeo_ctrl/mahjong.cpp3
-rw-r--r--src/devices/bus/neogeo_ctrl/mahjong.h8
-rw-r--r--src/devices/bus/sat_ctrl/analog.cpp1
-rw-r--r--src/devices/bus/sat_ctrl/analog.h2
-rw-r--r--src/devices/bus/sat_ctrl/ctrl.cpp5
-rw-r--r--src/devices/bus/sat_ctrl/ctrl.h4
-rw-r--r--src/devices/bus/sat_ctrl/joy.cpp1
-rw-r--r--src/devices/bus/sat_ctrl/joy.h2
-rw-r--r--src/devices/bus/sat_ctrl/joy_md.cpp1
-rw-r--r--src/devices/bus/sat_ctrl/joy_md.h10
-rw-r--r--src/devices/bus/sat_ctrl/keybd.cpp251
-rw-r--r--src/devices/bus/sat_ctrl/keybd.h8
-rw-r--r--src/devices/bus/sat_ctrl/mouse.cpp13
-rw-r--r--src/devices/bus/sat_ctrl/mouse.h2
-rw-r--r--src/devices/bus/sat_ctrl/multitap.h6
-rw-r--r--src/devices/bus/sat_ctrl/pointer.cpp13
-rw-r--r--src/devices/bus/sat_ctrl/pointer.h2
-rw-r--r--src/devices/bus/sat_ctrl/racing.cpp1
-rw-r--r--src/devices/bus/sat_ctrl/racing.h2
-rw-r--r--src/devices/bus/sat_ctrl/segatap.h6
-rw-r--r--src/devices/cpu/drcbex64.cpp27
-rw-r--r--src/devices/cpu/drcbex86.cpp40
-rw-r--r--src/devices/cpu/hphybrid/hphybrid.cpp80
-rw-r--r--src/devices/cpu/hphybrid/hphybrid.h4
-rw-r--r--src/devices/cpu/hphybrid/hphybrid_dasm.cpp6
-rw-r--r--src/devices/cpu/mips/mips3drc.cpp698
-rw-r--r--src/devices/cpu/powerpc/ppccom.cpp2
-rw-r--r--src/devices/cpu/sm510/sm500.h4
-rw-r--r--src/devices/cpu/sm510/sm500op.cpp1
-rw-r--r--src/devices/cpu/sm510/sm510.cpp4
-rw-r--r--src/devices/cpu/sm510/sm510d.cpp6
-rw-r--r--src/devices/cpu/sm510/sm511core.cpp2
-rw-r--r--src/devices/machine/am9517a.cpp1
-rw-r--r--src/devices/machine/gen_latch.cpp6
-rw-r--r--src/devices/machine/gen_latch.h8
-rw-r--r--src/devices/machine/hp_taco.cpp1594
-rw-r--r--src/devices/machine/hp_taco.h220
-rw-r--r--src/devices/machine/rtc9701.cpp2
-rw-r--r--src/devices/machine/serflash.cpp2
-rw-r--r--src/devices/machine/smpc.cpp32
-rw-r--r--src/devices/video/epic12.cpp2
-rw-r--r--src/emu/devfind.h4
-rw-r--r--src/emu/diimage.cpp2
-rw-r--r--src/emu/diimage.h26
-rw-r--r--src/emu/dispatch.h2
-rw-r--r--src/emu/emuopts.h4
-rw-r--r--src/emu/machine.cpp2
-rw-r--r--src/emu/machine.h2
-rw-r--r--src/emu/main.h2
-rw-r--r--src/emu/mconfig.cpp2
-rw-r--r--src/emu/rendfont.cpp4
-rw-r--r--src/emu/rendlay.cpp14
-rw-r--r--src/emu/romload.cpp2
-rw-r--r--src/emu/ui/uimain.h30
-rw-r--r--src/emu/validity.h2
-rw-r--r--src/frontend/mame/info.cpp971
-rw-r--r--src/frontend/mame/luaengine.cpp32
-rw-r--r--src/frontend/mame/mame.cpp14
-rw-r--r--src/frontend/mame/mame.h6
-rw-r--r--src/frontend/mame/mameopts.cpp1
-rw-r--r--src/frontend/mame/ui/filemngr.cpp3
-rw-r--r--src/frontend/mame/ui/floppycntrl.cpp4
-rw-r--r--src/frontend/mame/ui/floppycntrl.h2
-rw-r--r--src/frontend/mame/ui/menu.cpp62
-rw-r--r--src/frontend/mame/ui/menu.h10
-rw-r--r--src/frontend/mame/ui/miscmenu.cpp4
-rw-r--r--src/frontend/mame/ui/selgame.cpp10
-rw-r--r--src/frontend/mame/ui/sliders.cpp60
-rw-r--r--src/frontend/mame/ui/submenu.h4
-rw-r--r--src/frontend/mame/ui/ui.cpp48
-rw-r--r--src/frontend/mame/ui/ui.h4
-rw-r--r--src/lib/netlist/macro/nlm_ttl74xx.cpp4
-rw-r--r--src/lib/netlist/nl_base.h2
-rw-r--r--src/lib/netlist/nl_util.h18
-rw-r--r--src/lib/netlist/plib/pdynlib.cpp5
-rw-r--r--src/lib/netlist/solver/nld_ms_direct.h4
-rw-r--r--src/lib/netlist/solver/nld_ms_sm.h4
-rw-r--r--src/lib/netlist/solver/nld_ms_sor_mat.h1
-rw-r--r--src/lib/netlist/solver/nld_ms_w.h2
-rw-r--r--src/lib/netlist/solver/nld_solver.cpp2
-rw-r--r--src/lib/util/flac.cpp24
-rw-r--r--src/lib/util/options.cpp2
-rw-r--r--src/mame/drivers/apple2.cpp6
-rw-r--r--src/mame/drivers/apple2e.cpp24
-rw-r--r--src/mame/drivers/aristmk5.cpp2
-rw-r--r--src/mame/drivers/aristmk6.cpp9
-rw-r--r--src/mame/drivers/attckufo.cpp8
-rw-r--r--src/mame/drivers/balsente.cpp1
-rw-r--r--src/mame/drivers/cclimber.cpp2
-rw-r--r--src/mame/drivers/chihiro.cpp2
-rw-r--r--src/mame/drivers/chsuper.cpp2
-rw-r--r--src/mame/drivers/cps1.cpp1
-rw-r--r--src/mame/drivers/crospang.cpp2
-rw-r--r--src/mame/drivers/cshooter.cpp66
-rw-r--r--src/mame/drivers/gaelco2.cpp8
-rw-r--r--src/mame/drivers/galaxi.cpp2
-rw-r--r--src/mame/drivers/galaxian.cpp2
-rw-r--r--src/mame/drivers/hh_tms1k.cpp4
-rw-r--r--src/mame/drivers/himesiki.cpp8
-rw-r--r--src/mame/drivers/hp9845.cpp26
-rw-r--r--src/mame/drivers/igs009.cpp12
-rw-r--r--src/mame/drivers/intv.cpp4
-rw-r--r--src/mame/drivers/jongkyo.cpp5
-rw-r--r--src/mame/drivers/jungleyo.cpp38
-rw-r--r--src/mame/drivers/ksys573.cpp24
-rw-r--r--src/mame/drivers/lwings.cpp2
-rw-r--r--src/mame/drivers/m92.cpp2
-rw-r--r--src/mame/drivers/mac.cpp4
-rw-r--r--src/mame/drivers/macs.cpp106
-rw-r--r--src/mame/drivers/magic10.cpp2
-rw-r--r--src/mame/drivers/mhavoc.cpp2
-rw-r--r--src/mame/drivers/neogeo_noslot.cpp2
-rw-r--r--src/mame/drivers/ng_aes.cpp2
-rw-r--r--src/mame/drivers/opwolf.cpp8
-rw-r--r--src/mame/drivers/pc.cpp2
-rw-r--r--src/mame/drivers/pockchal.cpp6
-rw-r--r--src/mame/drivers/r9751.cpp4
-rw-r--r--src/mame/drivers/segag80r.cpp4
-rw-r--r--src/mame/drivers/senjyo.cpp4
-rw-r--r--src/mame/drivers/snookr10.cpp8
-rw-r--r--src/mame/drivers/spyhuntertec.cpp2
-rw-r--r--src/mame/drivers/stv.cpp4
-rw-r--r--src/mame/drivers/subsino2.cpp4
-rw-r--r--src/mame/drivers/symbolics.cpp40
-rw-r--r--src/mame/drivers/system1.cpp54
-rw-r--r--src/mame/includes/klax.h2
-rw-r--r--src/mame/includes/megadriv.h1
-rw-r--r--src/mame/includes/neogeo.h2
-rw-r--r--src/mame/includes/segas24.h2
-rw-r--r--src/mame/machine/315-5838_317-0229_comp.cpp2
-rw-r--r--src/mame/machine/dec_lk201.cpp2
-rw-r--r--src/mame/machine/intv.cpp1
-rw-r--r--src/mame/machine/m3comm.cpp114
-rw-r--r--src/mame/machine/model1.cpp4
-rw-r--r--src/mame/machine/n64.cpp4
-rw-r--r--src/mame/machine/segacrp2_device.cpp14
-rw-r--r--src/mame/machine/segacrp2_device.h1
-rw-r--r--src/mame/machine/segacrpt_device.cpp5
-rw-r--r--src/mame/machine/segacrpt_device.h1
-rw-r--r--src/mame/machine/xbox.cpp8
-rw-r--r--src/mame/mame.lst52
-rw-r--r--src/mame/nl.lst1
-rw-r--r--src/mame/video/apple2.cpp4
-rw-r--r--src/mame/video/deco16ic.cpp22
-rw-r--r--src/mame/video/dynduke.cpp2
-rw-r--r--src/mame/video/namcos22.cpp2
-rw-r--r--src/mame/video/ssv.cpp14
-rw-r--r--src/mame/video/taito_f3.cpp138
-rw-r--r--src/osd/modules/debugger/debugimgui.cpp134
-rw-r--r--src/osd/modules/diagnostics/diagnostics_module.h4
-rw-r--r--src/osd/modules/diagnostics/diagnostics_win32.cpp1
-rw-r--r--src/osd/modules/diagnostics/none.cpp2
-rw-r--r--src/osd/modules/input/input_dinput.cpp6
-rw-r--r--src/osd/modules/input/input_dinput.h2
-rw-r--r--src/osd/modules/input/input_sdl.cpp12
-rw-r--r--src/osd/modules/input/input_sdlcommon.h2
-rw-r--r--src/osd/modules/input/input_winhybrid.cpp8
-rw-r--r--src/osd/modules/input/input_xinput.cpp2
-rw-r--r--src/osd/modules/input/input_xinput.h2
-rw-r--r--src/osd/modules/ipc/rtc_tcp_connection.cpp2
-rw-r--r--src/osd/modules/lib/osdobj_common.h2
-rw-r--r--src/osd/modules/osdwindow.cpp2
-rw-r--r--src/osd/modules/osdwindow.h8
-rw-r--r--src/osd/modules/output/network.cpp9
-rw-r--r--src/osd/modules/render/aviwrite.cpp4
-rw-r--r--src/osd/modules/render/aviwrite.h10
-rw-r--r--src/osd/modules/render/bgfx/chain.cpp4
-rw-r--r--src/osd/modules/render/bgfx/chain.h8
-rw-r--r--src/osd/modules/render/bgfx/chainentry.h2
-rw-r--r--src/osd/modules/render/bgfx/chainmanager.cpp544
-rw-r--r--src/osd/modules/render/bgfx/chainmanager.h62
-rw-r--r--src/osd/modules/render/bgfx/clear.h8
-rw-r--r--src/osd/modules/render/bgfx/target.h2
-rw-r--r--src/osd/modules/render/bgfx/targetmanager.cpp8
-rw-r--r--src/osd/modules/render/bgfx/targetmanager.h4
-rw-r--r--src/osd/modules/render/bgfx/targetreader.cpp12
-rw-r--r--src/osd/modules/render/bgfx/texturemanager.cpp1
-rw-r--r--src/osd/modules/render/bgfxutil.cpp14
-rw-r--r--src/osd/modules/render/bgfxutil.h6
-rw-r--r--src/osd/modules/render/d3d/d3dhlsl.cpp18
-rw-r--r--src/osd/modules/render/drawbgfx.cpp183
-rw-r--r--src/osd/modules/render/drawbgfx.h24
-rw-r--r--src/osd/modules/render/drawogl.cpp2
-rw-r--r--src/osd/modules/render/drawsdl.cpp2
-rw-r--r--src/osd/modules/render/sliderdirtynotifier.h2
-rw-r--r--src/osd/osdcore.cpp11
-rw-r--r--src/osd/osdsync.cpp5
-rw-r--r--src/osd/osdsync.h4
-rw-r--r--src/osd/sdl/sdlmain.cpp2
-rw-r--r--src/osd/sdl/window.cpp8
-rw-r--r--src/osd/sdl/window.h2
-rw-r--r--src/osd/watchdog.h2
-rw-r--r--src/osd/windows/window.cpp6
-rw-r--r--src/osd/windows/winmain.cpp6
-rw-r--r--src/version.cpp2
223 files changed, 3948 insertions, 4011 deletions
diff --git a/hash/hp9845b_rom.xml b/hash/hp9845b_rom.xml
index d22a5588e7b..371a50b2eb4 100644
--- a/hash/hp9845b_rom.xml
+++ b/hash/hp9845b_rom.xml
@@ -71,7 +71,7 @@
<info name="serial" value="09845-65518" />
<part name="rom" interface="hp9845b_rom">
- <!-- Correct BSC is probably 0x0b (or ROM wouldn't belong to LPU)-->
+ <!-- Correct BSC is probably 0x0b (or ROM wouldn't belong to LPU)-->
<feature name="base" value="0x0b5000" />
<dataarea name="rom" size="0x4000" width="16" endianness="big">
<rom name="09845-65518-11_50-reva-io_lpu.bin" size="0x2000" crc="98bd769e" sha1="8c28f838982d1b77f5b5dfd0923869bcff755a78" offset="0x0000" />
@@ -171,7 +171,7 @@
</part>
</software>
- <!-- To be fixed, cannot be used as is -->
+ <!-- To be fixed, cannot be used as is -->
<software name="image45">
<description>IMAGE/45 Database Manager (Rev B)</description>
<year>198?</year>
@@ -192,7 +192,7 @@
</part>
</software>
- <!-- To be fixed, cannot be used as is -->
+ <!-- To be fixed, cannot be used as is -->
<software name="image45c" cloneof="image45">
<description>IMAGE/45 Database Manager (Rev C)</description>
<year>198?</year>
@@ -227,7 +227,7 @@
</part>
</software>
- <!-- To be fixed, cannot be used as is -->
+ <!-- To be fixed, cannot be used as is -->
<software name="resmgmt">
<description>Resource Management</description>
<year>198?</year>
diff --git a/hash/lynx.xml b/hash/lynx.xml
index 7a5342fc064..b4681d3b77a 100644
--- a/hash/lynx.xml
+++ b/hash/lynx.xml
@@ -1096,5 +1096,5 @@ Known undumped prototypes:
</dataarea>
</part>
</software>
-
+
</softwarelist>
diff --git a/hash/megadriv.xml b/hash/megadriv.xml
index a8ba96d6a9d..bb01af7931f 100644
--- a/hash/megadriv.xml
+++ b/hash/megadriv.xml
@@ -14948,7 +14948,7 @@ but dumps still have to be confirmed.
<rom name="F1 Champion Edtn MDRIVE ROM3 Eval only.BIN" size="0x080000" crc="7863f441" sha1="ccad151b160a7b361d2d8982d56e80895b4799a7" offset="0x100001" loadflag="load16_byte"/>
</dataarea>
</part>
- </software>
+ </software>
<software name="f1circus">
<description>F1 Circus MD (Jpn)</description>
diff --git a/hash/neogeo.xml b/hash/neogeo.xml
index 3b1df296047..e56f2e5e56b 100644
--- a/hash/neogeo.xml
+++ b/hash/neogeo.xml
@@ -12001,7 +12001,7 @@
</dataarea>
</part>
</software>
-
+
<!-- Unlicensed 3rd party -->
<!-- the exact same roms were put on bootleg MVS carts, despite having no MVS mode in the code and running as an AES game with menu and no coins required -->
diff --git a/hash/pce_tourvision.xml b/hash/pce_tourvision.xml
index 404a90b6171..e15571003e7 100644
--- a/hash/pce_tourvision.xml
+++ b/hash/pce_tourvision.xml
@@ -8,7 +8,7 @@
<publisher>bootleg (Tourvision) / Namcot</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="dragon saber - after story of dragon spirit (japan).pce" size="524288" crc="3219849c" sha1="6d94cd3e27dbe1694229f7f006dc821be4764aa2" offset="000000" />
</dataarea>
</part>
@@ -20,243 +20,243 @@
<publisher>bootleg (Tourvision) / Cream</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="0x060000">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="bull fight - ring no haja (japan).pce" size="393216" crc="5c4d1991" sha1="6cd94e6209da2939752ab6b1c2d46e5b48c8e0cb" offset="000000" />
</dataarea>
</part>
</software>
-
- <!--1943 Kai -->
+
+ <!--1943 Kai -->
<software name="1943kai">
<description>1943 Kai (Tourvision PCE bootleg)</description>
<year>1991</year>
<publisher>bootleg (Tourvision) / Capcom / Naxat Soft</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="1943 kai (japan).pce" size="524288" crc="fde08d6d" sha1="3ac86354155ca01859c53e2f2287a715cd3fca13" offset="000000" />
</dataarea>
</part>
</software>
- <!--Aero Blasters - Hudson / Kaneko -->
+ <!--Aero Blasters - Hudson / Kaneko -->
<software name="aeroblst">
<description>Aero Blasters (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Inter State / Kaneko / Hudson Soft</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="aero blasters (japan).pce" size="524288" crc="25be2b81" sha1="748ec92246140565d95f6fb727de6167227b85d3" offset="000000" />
</dataarea>
</part>
</software>
- <!--After Burner -->
+ <!--After Burner -->
<software name="aburner2">
<description>After Burner (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Sega / Nec Avenue</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="after burner ii (japan).pce" size="524288" crc="ca72a828" sha1="50b9d22fe5179aee5cb95022472714ef8483841f" offset="000000" />
</dataarea>
</part>
</software>
- <!--Armed-F -->
+ <!--Armed-F -->
<software name="armedf">
<description>Armed-F (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Nichibutsu / Big Don</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="armed formation f (japan).pce" size="262144" crc="20ef87fd" sha1="a326c9cece6f14b82629c4c79b34df819b022dce" offset="000000" />
</dataarea>
</part>
</software>
- <!--Ballistix -->
+ <!--Ballistix -->
<software name="ballistx">
<description>Ballistix (Tourvision PCE bootleg)</description>
<year>1991</year>
<publisher>bootleg (Tourvision) / Psygnosis / Coconuts Japan</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="ballistix (japan).pce" size="262144" crc="8acfc8aa" sha1="e687abeb0f94e85fafa52e92b0beb82542f0c368" offset="000000" />
</dataarea>
</part>
</software>
- <!--Be Ball -->
+ <!--Be Ball -->
<software name="beballa">
<description>Be Ball (alt) (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Hudson Soft</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- byte at 0xBCD is changed 0x05 -> 0x02 -->
+ <!-- byte at 0xBCD is changed 0x05 -> 0x02 -->
<rom name="tourv_be_ball_alt.pce" size="262144" crc="261f1013" sha1="55d8815a4a432e587fc7483b63b73114fe40e710" offset="000000" />
</dataarea>
</part>
</software>
- <!--Bomberman -->
+ <!--Bomberman -->
<software name="bombman">
<description>Bomberman (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Hudson Soft</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="bomberman (japan).pce" size="262144" crc="9abb4d1f" sha1="738bbced47d87cd438d7972eba58c08f5c031a74" offset="000000" />
</dataarea>
</part>
</software>
- <!--Chozetsurinjin Beraboh Man (Super Foolist Man) -->
+ <!--Chozetsurinjin Beraboh Man (Super Foolist Man) -->
<software name="bravoman">
<description>Chouzetsu Rinjin - Bravoman (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Namco / Namcot</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="chouzetsu rinjin - bravoman (japan).pce" size="524288" crc="0df57c90" sha1="9abb7d96a4dba96a26f7073ea06cb8b2deb24a43" offset="000000" />
</dataarea>
</part>
</software>
- <!--Chuka Taisen -->
+ <!--Chuka Taisen -->
<software name="chukatai">
<description>Chuka Taisen (Tourvision PCE bootleg)</description>
<year>1992</year>
<publisher>bootleg (Tourvision) / Taito Corporation</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="393216">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="gokuraku! chuuka taisen (japan).pce" size="393216" crc="e749a22c" sha1="b58e94e3e0c778e678c5d08c708ac4e37bedbbe3" offset="000000" />
</dataarea>
</part>
</software>
- <!--Columns - Telenet Japan -->
+ <!--Columns - Telenet Japan -->
<software name="columns">
<description>Columns (Tourvision PCE bootleg)</description>
<year>1991</year>
<publisher>bootleg (Tourvision) / Telenet Japan</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="131072">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="columns (japan).pce" size="131072" crc="99f7a572" sha1="238f9ee6cc80b31c5c93a4f43281e690200bdea3" offset="000000" />
</dataarea>
</part>
</software>
- <!--Coryoon -->
+ <!--Coryoon -->
<software name="coryoon">
<description>Coryoon - Child of Dragon (Tourvision PCE bootleg)</description>
<year>1991</year>
<publisher>bootleg (Tourvision) / Naxat Soft</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="coryoon - child of dragon (japan).pce" size="524288" crc="b4d29e3b" sha1="709595f04defcc55181f7502a0065e4c22d5fb19" offset="000000" />
</dataarea>
</part>
</software>
- <!--Daisenpu -->
+ <!--Daisenpu -->
<software name="daisenpu">
<description>Daisenpu (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Toaplan / Nec Avenue</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="dai senpu (japan).pce" size="524288" crc="9107bcc8" sha1="81f8c8f01530bb3d22e2dd463202d0e26e7faf24" offset="000000" />
</dataarea>
</part>
</software>
- <!--Dead Moon -->
+ <!--Dead Moon -->
<software name="deadmoon">
<description>Dead Moon (Tourvision PCE bootleg)</description>
<year>1991</year>
<publisher>bootleg (Tourvision) / T.S.S</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="dead moon (japan).pce" size="524288" crc="56739bc7" sha1="d86ba171b459c286243306407311d85d013a2833" offset="000000" />
</dataarea>
</part>
</software>
- <!--Devil Crash -->
+ <!--Devil Crash -->
<software name="devlcrsh">
<description>Devil Crash (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Naxat / Red</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="393216">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="devil crash - naxat pinball (japan).pce" size="393216" crc="4ec81a80" sha1="808638c33e110285d0d9415bc046b94a84b02c6a" offset="000000" />
</dataarea>
</part>
</software>
- <!--Dodge Ball -->
+ <!--Dodge Ball -->
<software name="nekdodge">
<description>Dodge Ball (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Technos Japan Corp / Naxat Soft</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="nekketsu koukou dodgeball bu - pc bangai hen (japan).pce" size="262144" crc="65fdb863" sha1="582121ade819254da31fd8867c30e60195589a9a" offset="000000" />
</dataarea>
</part>
</software>
- <!--Doraemon Meikyuu Daisakusen -->
+ <!--Doraemon Meikyuu Daisakusen -->
<software name="dorams">
<description>Doraemon Meikyuu Dai Sakusen (Tourvision PCE bootleg)</description>
<year>1989</year>
<publisher>bootleg (Tourvision) / Fujiko-Shogakukan-TV Asahi / Hudson Soft</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="doraemon - meikyuu dai sakusen (japan).pce" size="262144" crc="dc760a07" sha1="81769dc4e2e669f6ae98872d22c52ac290530a28" offset="000000" />
</dataarea>
</part>
</software>
- <!--Dragon Spirit -->
+ <!--Dragon Spirit -->
<software name="dspirit">
<description>Dragon Spirit (Tourvision PCE bootleg)</description>
<year>1988</year>
<publisher>bootleg (Tourvision) / Namcot</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="dragon spirit (japan).pce" size="262144" crc="01a76935" sha1="09b037fde801b71d1ff343c40ff5a58372b9a514" offset="000000" />
</dataarea>
</part>
@@ -264,7 +264,7 @@
- <!--
+ <!--
Dungeon Explorer TourVision cart - Hudson / Atlus
Notes:
@@ -276,77 +276,77 @@ Notes:
<publisher>bootleg (Tourvision) / Atlus Ltd. / Hudson Soft</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="393216">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="dungeon explorer (japan).pce" size="393216" crc="1b1a80a2" sha1="77caece9655a0e14330884673ffb41ff2bb625c4" offset="000000" />
</dataarea>
</part>
</software>
- <!--Final Blaster -->
+ <!--Final Blaster -->
<software name="finlblst">
<description>Final Blaster (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Namco / Namcot</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="393216">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="final blaster (japan).pce" size="393216" crc="c90971ba" sha1="4a013fde3938ceaacf38fcc4f56828d1292142d0" offset="000000" />
</dataarea>
</part>
</software>
- <!--Final Lap Twin - Namco -->
+ <!--Final Lap Twin - Namco -->
<software name="finallap">
<description>Final Lap Twin (Tourvision PCE bootleg)</description>
<year>1989</year>
<publisher>bootleg (Tourvision) / Namco Ltd. / Namcot</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="393216">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="final lap twin (japan).pce" size="393216" crc="c8c084e3" sha1="ad695b7d1fb8bac7d9e13045bf229dba98d56a71" offset="000000" />
</dataarea>
</part>
</software>
- <!--Final Match Tennis -->
+ <!--Final Match Tennis -->
<software name="finalmt">
<description>Final Match Tennis (Tourvision PCE bootleg)</description>
<year>1991</year>
<publisher>bootleg (Tourvision) / Human</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="final match tennis (japan).pce" size="262144" crc="560d2305" sha1="e3a97b468d0a6c94effde70bf331dc4b3d90b166" offset="000000" />
</dataarea>
</part>
</software>
- <!--Formation Soccer - Human Cup ' 90 - Human -->
+ <!--Formation Soccer - Human Cup ' 90 - Human -->
<software name="fsoccr90">
<description>Formation Soccer - Human Cup '90 (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Human</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="formation soccer - human cup '90 (japan).pce" size="262144" crc="85a1e7b6" sha1="d53db608475ca26ff81837dc43b40726bd0440a5" offset="000000" />
</dataarea>
</part>
</software>
- <!--Gomola Speed - Human -->
+ <!--Gomola Speed - Human -->
<software name="gomolaa">
<description>Gomola Speed (alt) (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Human</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="393216">
- <!-- NOT identical to the set in the PCE list, alt revison? -->
+ <!-- NOT identical to the set in the PCE list, alt revison? -->
<rom name="gomolaa.pce" size="393216" crc="4bd38f17" sha1="fe4b08fb0cd9d0a53726c2709db3e31fbeae1213" offset="000000" />
</dataarea>
</part>
@@ -355,84 +355,84 @@ Notes:
- <!--Gunhed -->
+ <!--Gunhed -->
<software name="gunhed">
<description>GunHed (Tourvision PCE bootleg)</description>
<year>1989</year>
<publisher>bootleg (Tourvision) / Hudson / Toho Sunrise</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="393216">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="gunhed (japan).pce" size="393216" crc="a17d4d7e" sha1="0107d93ff5d10325092d45e6bfd21e8130efeed7" offset="000000" />
</dataarea>
</part>
</software>
- <!--Hana Taka Daka (Super Long Nose Goblin) -->
+ <!--Hana Taka Daka (Super Long Nose Goblin) -->
<software name="hanataka">
<description>Hana Taaka Daka!? (Tourvision PCE bootleg)</description>
<year>1991</year>
<publisher>bootleg (Tourvision) / Taito Corporation</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="hana taaka daka! (japan).pce" size="524288" crc="ba4d0dd4" sha1="664ccd11372b04739e388fb921ac507eb71986cd" offset="000000" />
</dataarea>
</part>
</software>
- <!--Jakie Chan - Hudson -->
+ <!--Jakie Chan - Hudson -->
<software name="jchan">
<description>Jackie Chan (Tourvision PCE bootleg)</description>
<year>1991</year>
<publisher>bootleg (Tourvision) / Hudson Soft</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="jackie chan (japan).pce" size="524288" crc="c6fa6373" sha1="44c9ce3b37ca9c5edfe840f78485048e2bd1bf41" offset="000000" />
</dataarea>
</part>
</software>
- <!--jinmu Densho -->
+ <!--jinmu Densho -->
<software name="jinmu">
<description>Jinmu Denshou (Tourvision PCE bootleg)</description>
<year>1989</year>
<publisher>bootleg (Tourvision) / Big Club / Wolf Team</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="jinmu denshou (japan).pce" size="524288" crc="c150637a" sha1="e38d6d83120301a7befa7f496f1a93768060032d" offset="000000" />
</dataarea>
</part>
</software>
- <!--Kiki Kaikai -->
+ <!--Kiki Kaikai -->
<software name="kikikai">
<description>Kiki Kaikai (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Taito</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="393216">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="kiki kaikai (japan).pce" size="393216" crc="c0cb5add" sha1="8dc4fce4beca91f51f123acf8f1cc659ed58d312" offset="000000" />
</dataarea>
</part>
</software>
- <!--Ledgnd of Hero Tonma -->
+ <!--Ledgnd of Hero Tonma -->
<software name="loht">
<description>Legend of Hero Tonma (Tourvision PCE bootleg)</description>
<year>1991</year>
<publisher>bootleg (Tourvision) / IREM Corp</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="legend of hero tonma (japan).pce" size="524288" crc="c28b0d8a" sha1="352e91337db64bc7edd788e4ccb9c240c7040898" offset="000000" />
</dataarea>
</part>
@@ -440,161 +440,161 @@ Notes:
- <!--Makyo Densetsu - The Legenary Axe - Victor Musical Industries, Inc. -->
+ <!--Makyo Densetsu - The Legenary Axe - Victor Musical Industries, Inc. -->
<software name="makyoden">
<description>Makyou Densetsu - The Legenary Axe (Tourvision PCE bootleg)</description>
<year>1988</year>
<publisher>bootleg (Tourvision) / Victor Musical Industries, Inc.</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="makyou densetsu (japan).pce" size="262144" crc="d4c5af46" sha1="7e1b1f52222663e9e98973fdb3cf67879122b617" offset="000000" />
</dataarea>
</part>
</software>
- <!--Mizubaku Daibouken Liquid Kids -->
+ <!--Mizubaku Daibouken Liquid Kids -->
<software name="mizubaku">
<description>Mizubaku Daibouken Liquid Kids (Tourvision PCE bootleg)</description>
<year>1992</year>
<publisher>bootleg (Tourvision) / Taito Corporation</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="mizubaku dai bouken (japan).pce" size="524288" crc="b2ef558d" sha1="6e99a1982b6e2b0b9fb82f1d30270620917e1b92" offset="000000" />
</dataarea>
</part>
</software>
- <!--Mr Heli -->
+ <!--Mr Heli -->
<software name="mrheli">
<description>Mr. Heli no Daibouken (Tourvision PCE bootleg)</description>
<year>1989</year>
<publisher>bootleg (Tourvision) / IREM Corp</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="mr. heli no daibouken (japan).pce" size="524288" crc="2cb92290" sha1="df6346583d7169ffdec03925c9b15d3e4f066079" offset="000000" />
</dataarea>
</part>
</software>
- <!--Ninja Ryukenden -->
+ <!--Ninja Ryukenden -->
<software name="nryukend">
<description>Ninja Ryukenden (Tourvision PCE bootleg)</description>
<year>1992</year>
<publisher>bootleg (Tourvision) / Temco / Hudson Soft</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="ninja ryuuken den (japan).pce" size="524288" crc="67573bac" sha1="7f6a088424f849fc80f883d19533c031305d9616" offset="000000" />
</dataarea>
</part>
</software>
- <!--Operation Wolf -->
+ <!--Operation Wolf -->
<software name="opwolf">
<description>Operation Wolf (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Taito / Nec Avenue</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="operation wolf (japan).pce" size="524288" crc="ff898f87" sha1="da2a28e2961fa295c4b8f55bd5a6ce6f1c58beb7" offset="000000" />
</dataarea>
</part>
</software>
- <!--Override -->
+ <!--Override -->
<software name="override">
<description>Override (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Sting / Data East Corporation</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="override (japan).pce" size="262144" crc="b74ec562" sha1="9da08c896e02b67257521b948c2fa5bc55724c0d" offset="000000" />
</dataarea>
</part>
</software>
- <!--Pac-Land -->
+ <!--Pac-Land -->
<software name="pacland">
<description>Pac-Land (Tourvision PCE bootleg)</description>
<year>1989</year>
<publisher>bootleg (Tourvision) / Namco / Namcot</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="pac-land (japan).pce" size="262144" crc="14fad3ba" sha1="fc0166da82ed3cf4a4e06fc6c73fd3184ba8bb3b" offset="000000" />
</dataarea>
</part>
</software>
- <!--PC Genjin Punkic Cyborg -->
+ <!--PC Genjin Punkic Cyborg -->
<software name="pcdenj">
<description>PC Denjin Punkic Cyborg (Tourvision PCE bootleg)</description>
<year>1992</year>
<publisher>bootleg (Tourvision) / Hudson Soft / Red</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="pc denjin - punkic cyborgs (japan).pce" size="524288" crc="740491c2" sha1="7713236070c2d5252faa651b6a8b7726cadb9bf4" offset="000000" />
</dataarea>
</part>
</software>
- <!--PC Genjin 2 - Hudson -->
+ <!--PC Genjin 2 - Hudson -->
<software name="pcgenj2">
<description>PC Genjin 2 - Pithecanthropus Computerurus (Tourvision PCE bootleg)</description>
<year>1991</year>
<publisher>bootleg (Tourvision) / Hudson Soft / Red</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="pc genjin 2 - pithecanthropus computerurus (japan).pce" size="524288" crc="3028f7ca" sha1="ef2b10e9bd35428bff3d67b9f77dd3ff50d91f2e" offset="000000" />
</dataarea>
</part>
</software>
- <!--Power 11 - Hudson -->
+ <!--Power 11 - Hudson -->
<software name="power11">
<description>Power Eleven (Tourvision PCE bootleg)</description>
<year>1991</year>
<publisher>bootleg (Tourvision) / Hudson Soft</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="393216">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="power eleven (japan).pce" size="393216" crc="3e647d8b" sha1="f132948117d3135ec8d5d74eaac8d965e6676fb4" offset="000000" />
</dataarea>
</part>
</software>
- <!--Power Drift -->
+ <!--Power Drift -->
<software name="pdrift">
<description>Power Drift (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Sega / Asmik Corporation</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="power drift (japan).pce" size="524288" crc="25e0f6e9" sha1="1ffe1111a570b0cca256a356965fd6cdf7bcf2e9" offset="000000" />
</dataarea>
</part>
</software>
- <!--
+ <!--
Power League IV - Hudson
Notes:
@@ -608,70 +608,70 @@ Notes:
<publisher>bootleg (Tourvision) / Hudson Soft</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="power league iv (japan).pce" size="524288" crc="30cc3563" sha1="a21825a19bef0a4d7847f72b4a00acd74a53ebb8" offset="000000" />
</dataarea>
</part>
</software>
- <!--Pro Yakyuu World Stadium '91 -->
+ <!--Pro Yakyuu World Stadium '91 -->
<software name="proyak91">
<description>Pro Yakyuu World Stadium '91 (Tourvision PCE bootleg)</description>
<year>1991</year>
<publisher>bootleg (Tourvision) / Namco / Namcot</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="pro yakyuu world stadium '91 (japan).pce" size="262144" crc="66b167a9" sha1="6b76e9cc10a812c15631450b617ea3719fdcdc16" offset="000000" />
</dataarea>
</part>
</software>
- <!--Psycho Chaser -->
+ <!--Psycho Chaser -->
<software name="psychas">
<description>Psycho Chaser (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Naxat Soft</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="psycho chaser (japan).pce" size="262144" crc="03883ee8" sha1="753fc6f1aa16770c87cc12967a43e951a7b1ec83" offset="000000" />
</dataarea>
</part>
</software>
- <!--Puzzle Boy -->
+ <!--Puzzle Boy -->
<software name="puzzlboy">
<description>Puzzle Boy (Tourvision PCE bootleg)</description>
<year>1991</year>
<publisher>bootleg (Tourvision) / Atlus / Telenet Japan</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="puzzle boy (japan).pce" size="262144" crc="faa6e187" sha1="f3d87e780683cd1873287069f4758581bb848935" offset="000000" />
</dataarea>
</part>
</software>
- <!--Raiden -->
+ <!--Raiden -->
<software name="raiden">
<description>Raiden (Tourvision PCE bootleg)</description>
<year>1991</year>
<publisher>bootleg (Tourvision) / Seibu Kaihatsu inc / Hudson Soft</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="786432">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="raiden (japan).pce" size="786432" crc="850829f2" sha1="cef25446294884053442a4214434d7d97319ddca" offset="000000" />
</dataarea>
</part>
</software>
- <!--
+ <!--
Rastan Saga II Tourvision cart - Taito
Notes:
@@ -683,112 +683,112 @@ Notes:
<publisher>bootleg (Tourvision) / Taito Corporation</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="393216">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="rastan saga ii (japan).pce" size="393216" crc="00c38e69" sha1="cf06ba4d1bd31ebd69f0415ae52848f752ec8f6b" offset="000000" />
</dataarea>
</part>
</software>
- <!--R-Type II -->
+ <!--R-Type II -->
<software name="rtypep2a">
<description>R-Type II (hack, no copyright string) (Tourvision PCE bootleg)</description>
<year>1991</year>
<publisher>bootleg (Tourvision) / IREM Corp</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- NOT identical to pce list, copyright strings have been erased -->
+ <!-- NOT identical to pce list, copyright strings have been erased -->
<rom name="tourv_r-type_ii_hacked.pce" size="262144" crc="ae65fe80" sha1="1a6c6f5bd017f23ab9d00a9385986ddf498f9a82" offset="000000" />
</dataarea>
</part>
</software>
- <!--Saiga No Nindou - Ninja Spirit -->
+ <!--Saiga No Nindou - Ninja Spirit -->
<software name="saigonin">
<description>Saigo no Nindou - Ninja Spirit (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / IREM Corp</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="saigo no nindou - ninja spirit (japan).pce" size="524288" crc="0590a156" sha1="14fc48758d658413f952a0b4f9465137164bdacc" offset="000000" />
</dataarea>
</part>
</software>
- <!--Salamander -->
+ <!--Salamander -->
<software name="salamand">
<description>Salamander (Tourvision PCE bootleg)</description>
<year>1991</year>
<publisher>bootleg (Tourvision) / Konami</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="salamander (japan).pce" size="262144" crc="faecce20" sha1="a24e3a4ff36ec9fffd5ea1f4c6b526f61f842584" offset="000000" />
</dataarea>
</part>
</software>
- <!--Shinobi -->
+ <!--Shinobi -->
<software name="shinobi">
<description>Shinobi (Tourvision PCE bootleg)</description>
<year>1989</year>
<publisher>bootleg (Tourvision) / Sega / Asmik Corporation</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="393216">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="shinobi (japan).pce" size="393216" crc="bc655cf3" sha1="c219f8477dc2b34b53c25a419332595835d1f5ec" offset="000000" />
</dataarea>
</part>
</software>
- <!--Side arms -->
+ <!--Side arms -->
<software name="sidearms">
<description>Side Arms (Tourvision PCE bootleg)</description>
<year>1989</year>
<publisher>bootleg (Tourvision) / Capcom / Nec Avenue</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="sidearms - hyper dyne (japan).pce" size="262144" crc="e5e7b8b7" sha1="b732b3485bd8841d3571221170b04b7f699e9109" offset="000000" />
</dataarea>
</part>
</software>
- <!--Skweek -->
+ <!--Skweek -->
<software name="skweek">
<description>Skweek (Tourvision PCE bootleg)</description>
<year>1991</year>
<publisher>bootleg (Tourvision) / Victor Musical Industries, Inc.</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="skweek (japan).pce" size="262144" crc="4d539c9f" sha1="3436b48a9c748269f6ae65e40c9115a27321d440" offset="000000" />
</dataarea>
</part>
</software>
- <!--Son Son II -->
+ <!--Son Son II -->
<software name="sonson2">
<description>Son Son II (Tourvision PCE bootleg)</description>
<year>1989</year>
<publisher>bootleg (Tourvision) / Capcom / Nec Avenue</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="son son ii (japan).pce" size="262144" crc="d7921df2" sha1="51aa9b47aa5f68102989885a1b92bb6b563ffe3a" offset="000000" />
</dataarea>
</part>
</software>
- <!--
+ <!--
Special Criminal Investigation (SCI) - Taito
Notes:
@@ -802,70 +802,70 @@ Notes:
<publisher>bootleg (Tourvision) / Taito Corporation</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="special criminal investigation (japan).pce" size="524288" crc="09a0bfcc" sha1="8d18aea811d752d24cc00f20d2c6ced67df1efa9" offset="000000" />
</dataarea>
</part>
</software>
- <!--Super Star Soldier - Hudson / Kaneko -->
+ <!--Super Star Soldier - Hudson / Kaneko -->
<software name="sssoldr">
<description>Super Star Soldier (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Inter State / Kaneko / Hudson Soft</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="super star soldier (japan).pce" size="524288" crc="5d0e3105" sha1="4220516a17bc32a3f68ed51ef2af63e496e79f7d" offset="000000" />
</dataarea>
</part>
</software>
- <!--Super Volley ball - Video System -->
+ <!--Super Volley ball - Video System -->
<software name="svolley">
<description>Super Volley ball (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Video System</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="super volleyball (japan).pce" size="262144" crc="ce2e4f9f" sha1="46dd4acebe25de38f28e56cf149b24b42f3aef31" offset="000000" />
</dataarea>
</part>
</software>
- <!--Tatsujin -->
+ <!--Tatsujin -->
<software name="tatsujin">
<description>Tatsujin (Tourvision PCE bootleg)</description>
<year>1992</year>
<publisher>bootleg (Tourvision) / Toaplan Co Ltd / Taito Corporation</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="tatsujin (japan).pce" size="524288" crc="a6088275" sha1="dda768075fbf8c0624e2c1f217b1092513b1c942" offset="000000" />
</dataarea>
</part>
</software>
- <!--Terra Cresta II -->
+ <!--Terra Cresta II -->
<software name="terracr2">
<description>Terra Cresta II (Tourvision PCE bootleg)</description>
<year>1992</year>
<publisher>bootleg (Tourvision) / Nichibutsu / Nihon Bussan Co., Ltd</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="terra cresta ii - mandoraa no gyakushuu (japan).pce" size="524288" crc="1b2d0077" sha1="c58d3ea8df6cb518349d431d6b3d6fd2c14898ec" offset="000000" />
</dataarea>
</part>
</software>
- <!--
+ <!--
Thunder Blade Tourvision cart - Sega / NEC Avenue
Notes:
@@ -879,28 +879,28 @@ Notes:
<publisher>bootleg (Tourvision) / Sega / NEC Avenue</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="524288">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="thunder blade (japan).pce" size="524288" crc="ddc3e809" sha1="553f8026dd68e85cd17855adbf920b3971acfdc4" offset="000000" />
</dataarea>
</part>
</software>
- <!--Toy Shop Boys -->
+ <!--Toy Shop Boys -->
<software name="toyshopb">
<description>Toy Shop Boys (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Victor Musical Industries, Inc.</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="toy shop boys (japan).pce" size="262144" crc="97c5ee9a" sha1="d552223399ff54c3664a5a06fc620ffb717cea57" offset="000000" />
</dataarea>
</part>
</software>
- <!--
+ <!--
USA Pro Basketball - Aicom
Notes:
@@ -914,76 +914,76 @@ Notes:
<publisher>bootleg (Tourvision) / Aicom Corporation</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="usa pro basketball (japan).pce" size="262144" crc="1cad4b7f" sha1="62f3e0c56d22c015bea15fe04cd16fae380fefcd" offset="000000" />
</dataarea>
</part>
</software>
- <!--Veigues -->
+ <!--Veigues -->
<software name="veigues">
<description>Veigues - Tactical Gladiator (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Victor Musical Industries, Inc.</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="393216">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="veigues - tactical gladiator (japan).pce" size="393216" crc="04188c5c" sha1="da66c085ecbb317cb160cb192142a3d2c044f26f" offset="000000" />
</dataarea>
</part>
</software>
- <!--Volfied - Taito -->
+ <!--Volfied - Taito -->
<software name="volfied">
<description>Volfied (Tourvision PCE bootleg)</description>
<year>1989</year>
<publisher>bootleg (Tourvision) / Taito Corporation</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="393216">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="volfied (japan).pce" size="393216" crc="ad226f30" sha1="0ecee557815b93fc37f2f5675c2c01c77ef8569e" offset="000000" />
</dataarea>
</part>
</software>
- <!--Winning Shot -->
+ <!--Winning Shot -->
<software name="winshot">
<description>Winning Shot (Tourvision PCE bootleg)</description>
<year>1989</year>
<publisher>bootleg (Tourvision) / Data East Corp.</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="winning shot (japan).pce" size="262144" crc="9b5ebc58" sha1="039ff38e6221b4b7722144e85dc7c84873d7efe6" offset="000000" />
</dataarea>
</part>
</software>
- <!--W-Ring -->
+ <!--W-Ring -->
<software name="wring">
<description>W-Ring - The Double Rings (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Naxat Soft</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="393216">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="w-ring - the double rings (japan).pce" size="393216" crc="be990010" sha1="95d0a95ce9f08da3f096cfdc654ba5dfeb794add" offset="000000" />
</dataarea>
</part>
</software>
- <!--Xevious -->
+ <!--Xevious -->
<software name="xevious">
<description>Xevious (Tourvision PCE bootleg)</description>
<year>1990</year>
<publisher>bootleg (Tourvision) / Namco Ltd. / Namcot</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="262144">
- <!-- verified identical -->
+ <!-- verified identical -->
<rom name="xevious - fardraut densetsu (japan).pce" size="262144" crc="f8f85eec" sha1="13da0500ace1957d0748b11dfaae68e40e71230e" offset="000000" />
</dataarea>
</part>
@@ -996,7 +996,7 @@ Notes:
<publisher>bootleg (Tourvision) / Taito</publisher>
<part name="cart" interface="tourvision_cart">
<dataarea name="rom" size="393216">
- <!-- NOT dumped from an actual Tourvision cart yet, hence bad_dump, but we know it exists, and it's likely identical. -->
+ <!-- NOT dumped from an actual Tourvision cart yet, hence bad_dump, but we know it exists, and it's likely identical. -->
<rom name="parasol stars - the story of bubble bobble iii (japan).pce" status="baddump" size="393216" crc="51e86451" sha1="94a4c4b16435b043b0b985af446d8767602f5041" offset="000000" />
</dataarea>
</part>
diff --git a/src/devices/bus/a2bus/pc_xporter.cpp b/src/devices/bus/a2bus/pc_xporter.cpp
index 140f3e99a16..bc05557cfc8 100644
--- a/src/devices/bus/a2bus/pc_xporter.cpp
+++ b/src/devices/bus/a2bus/pc_xporter.cpp
@@ -35,11 +35,11 @@
then read Cn00 to map C800-CFFF first.
PC RAM from 0xA0000-0xAFFFF is where the V30 BIOS is downloaded,
- plus used for general storage by the system. This is mirrored at
+ plus used for general storage by the system. This is mirrored at
Fxxxx on the V30 so that it can boot.
RAM from 0xB0000-0xBFFFF is the CGA framebuffer as usual.
- C800-CBFF?: RAM, used as scratchpad space by the software
+ C800-CBFF?: RAM, used as scratchpad space by the software
CF00: PC memory pointer (bits 0-7)
CF01: PC memory pointer (bits 8-15)
CF02: PC memory pointer (bits 16-23)
@@ -53,11 +53,11 @@
CF31: control/flags: bit 4 = 1 to assert reset on V30, 5 = 1 to assert halt on V30
TODO:
- - Code at $70b0-$70c5 waits for the V30 to answer FPU presence.
+ - Code at $70b0-$70c5 waits for the V30 to answer FPU presence.
- What's going on at CF0E/CF0F?
- - The manual indicates there is no ROM; special drivers installed into ProDOS 8
- provide the RAMdisk and A2-accessing-PC-drives functionality.
-
+ - The manual indicates there is no ROM; special drivers installed into ProDOS 8
+ provide the RAMdisk and A2-accessing-PC-drives functionality.
+
*********************************************************************/
#include "pc_xporter.h"
@@ -87,7 +87,7 @@ static ADDRESS_MAP_START(pc_io, AS_IO, 16, a2bus_pcxporter_device )
ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( pcxporter )
- MCFG_CPU_ADD("v30", V30, XTAL_14_31818MHz/2) // 7.16 MHz as per manual
+ MCFG_CPU_ADD("v30", V30, XTAL_14_31818MHz/2) // 7.16 MHz as per manual
MCFG_CPU_PROGRAM_MAP(pc_map)
MCFG_CPU_IO_MAP(pc_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
@@ -141,7 +141,7 @@ MACHINE_CONFIG_FRAGMENT( pcxporter )
MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE(a2bus_pcxporter_device, keyboard_clock_w))
MCFG_PC_KBDC_OUT_DATA_CB(WRITELINE(a2bus_pcxporter_device, keyboard_data_w))
MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270)
-
+
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
@@ -214,10 +214,10 @@ void a2bus_pcxporter_device::device_start()
save_item(NAME(m_ram));
save_item(NAME(m_regs));
save_item(NAME(m_offset));
-
+
m_v30->space(AS_PROGRAM).install_ram(0, 0xaffff, m_ram);
m_v30->space(AS_PROGRAM).install_rom(0xf0000, 0xfffff, &m_ram[0xa0000]);
-
+
m_pcmem_space = &m_v30->space(AS_PROGRAM);
m_pcio_space = &m_v30->space(AS_IO);
}
@@ -313,11 +313,11 @@ UINT8 a2bus_pcxporter_device::read_c800(address_space &space, UINT16 offset)
case 0x704: // read w/o increment
rv = m_ram[m_offset];
- return rv;
-
+ return rv;
+
default:
//printf("Read $C800 at %x\n", offset + 0xc800);
- break;
+ break;
}
return m_regs[offset];
@@ -371,13 +371,13 @@ void a2bus_pcxporter_device::write_c800(address_space &space, UINT16 offset, UIN
else if (m_offset >= 0xb8000 && m_offset <= 0xbbfff) m_pcmem_space->write_byte(m_offset, data);
else if (m_offset >= 0xbc000 && m_offset <= 0xbffff) m_pcmem_space->write_byte(m_offset-0x4000, data);
break;
-
- case 0x72c: // CGA 6845 register select
+
+ case 0x72c: // CGA 6845 register select
m_pcio_space->write_byte(0x3d6, data);
m_6845_reg = data;
break;
-
- case 0x72d: // CGA 6845 data read/write
+
+ case 0x72d: // CGA 6845 data read/write
// HACK: adjust the 40 column mode the 6502 sets to
// be more within specs.
switch (m_6845_reg)
@@ -406,37 +406,37 @@ void a2bus_pcxporter_device::write_c800(address_space &space, UINT16 offset, UIN
m_pcio_space->write_byte(0x3d7, data);
break;
-
- case 0x72e: // CGA mode select
+
+ case 0x72e: // CGA mode select
m_pcio_space->write_byte(0x3d8, data);
break;
case 0x72f: // CGA color select
m_pcio_space->write_byte(0x3d9, data);
break;
-
- case 0x730: // control 1
+
+ case 0x730: // control 1
if (data & 0x10) { m_v30->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); m_reset_during_halt = true; }
if (data & 0x20)
- {
+ {
if (m_reset_during_halt)
{
m_v30->reset();
m_reset_during_halt = false;
}
-
+
m_v30->set_input_line(INPUT_LINE_HALT, CLEAR_LINE);
m_v30->resume(SUSPEND_REASON_HALT | SUSPEND_REASON_DISABLE);
}
break;
-
- case 0x731: // control 2
+
+ case 0x731: // control 2
if (data & 0x10) m_v30->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
if (data & 0x20) m_v30->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
break;
-
+
default:
-// printf("%02x to C800 at %x\n", data, offset + 0xc800);
+// printf("%02x to C800 at %x\n", data, offset + 0xc800);
m_regs[offset] = data;
break;
}
@@ -703,7 +703,7 @@ READ8_MEMBER (a2bus_pcxporter_device::pc_ppi_porta_r)
{
data = m_ppi_shift_register;
}
-// PIO_LOG(1,"PIO_A_r",("$%02x\n", data));
+// PIO_LOG(1,"PIO_A_r",("$%02x\n", data));
return data;
}
@@ -719,13 +719,13 @@ READ8_MEMBER ( a2bus_pcxporter_device::pc_ppi_portc_r )
{
/* read hi nibble of S2 */
data = (data & 0xf0) | ((0x3) & 0x0f);
-// PIO_LOG(1,"PIO_C_r (hi)",("$%02x\n", data));
+// PIO_LOG(1,"PIO_C_r (hi)",("$%02x\n", data));
}
else
{
/* read lo nibble of S2 */
data = (data & 0xf0) | (0x0 & 0x0f);
-// PIO_LOG(1,"PIO_C_r (lo)",("$%02x\n", data));
+// PIO_LOG(1,"PIO_C_r (lo)",("$%02x\n", data));
}
if ( m_ppi_portb & 0x01 )
@@ -773,6 +773,3 @@ WRITE8_MEMBER( a2bus_pcxporter_device::nmi_enable_w )
m_nmi_enabled = BIT(data,7);
m_isabus->set_nmi_state(m_nmi_enabled);
}
-
-
-
diff --git a/src/devices/bus/a2bus/pc_xporter.h b/src/devices/bus/a2bus/pc_xporter.h
index e7a347fd8b3..6c9267a8102 100644
--- a/src/devices/bus/a2bus/pc_xporter.h
+++ b/src/devices/bus/a2bus/pc_xporter.h
@@ -50,7 +50,7 @@ public:
required_device<speaker_sound_device> m_speaker;
required_device<isa8_device> m_isabus;
optional_device<pc_kbdc_device> m_pc_kbdc;
-
+
// overrides of standard a2bus slot functions
virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
@@ -114,7 +114,7 @@ public:
protected:
virtual void device_start() override;
virtual void device_reset() override;
-
+
private:
UINT8 m_ram[768*1024];
UINT8 m_c800_ram[0x400];
diff --git a/src/devices/bus/generic/slot.cpp b/src/devices/bus/generic/slot.cpp
index 5ac81616206..0002520ce04 100644
--- a/src/devices/bus/generic/slot.cpp
+++ b/src/devices/bus/generic/slot.cpp
@@ -39,7 +39,7 @@ device_generic_cart_interface::device_generic_cart_interface(const machine_confi
: device_slot_card_interface(mconfig, device),
m_rom(nullptr),
m_rom_size(0),
- m_region(*this, DEVICE_SELF)
+ m_region(*this, DEVICE_SELF)
{
}
diff --git a/src/devices/bus/generic/slot.h b/src/devices/bus/generic/slot.h
index b071e49dde4..5cef5d21d92 100644
--- a/src/devices/bus/generic/slot.h
+++ b/src/devices/bus/generic/slot.h
@@ -28,8 +28,8 @@ public:
virtual void rom_alloc(size_t size, int width, endianness_t end, const char *tag);
virtual void ram_alloc(UINT32 size);
- UINT8* get_rom_base() { return m_rom; }
- UINT32 get_rom_size() { return m_rom_size; }
+ UINT8* get_rom_base() { return m_rom; }
+ UINT32 get_rom_size() { return m_rom_size; }
UINT8* get_region_base() { if (m_region.found()) return m_region->base(); return nullptr; }
UINT32 get_region_size() { if (m_region.found()) return m_region->bytes(); return 0; }
@@ -44,8 +44,8 @@ public:
UINT32 m_rom_size;
dynamic_buffer m_ram;
- // this replaces m_rom for non-user configurable carts!
- optional_memory_region m_region;
+ // this replaces m_rom for non-user configurable carts!
+ optional_memory_region m_region;
};
@@ -153,7 +153,7 @@ public:
}
return nullptr;
}
- UINT32 get_rom_size() {
+ UINT32 get_rom_size() {
if (m_cart)
{
if (!user_loadable())
@@ -199,7 +199,7 @@ extern const device_type GENERIC_SOCKET;
MCFG_GENERIC_INTERFACE(_dev_intf)
#define MCFG_GENERIC_CARTSLOT_ADD_WITH_DEFAULT(_tag, _slot_intf, _dev_intf, _default) \
- MCFG_DEVICE_ADD(_tag, GENERIC_SOCKET, 0) \
- MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _default, false) \
- MCFG_GENERIC_INTERFACE(_dev_intf)
+ MCFG_DEVICE_ADD(_tag, GENERIC_SOCKET, 0) \
+ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _default, false) \
+ MCFG_GENERIC_INTERFACE(_dev_intf)
#endif
diff --git a/src/devices/bus/hp_optroms/hp_optrom.cpp b/src/devices/bus/hp_optroms/hp_optrom.cpp
index aa3ef766d71..ec2425c058c 100644
--- a/src/devices/bus/hp_optroms/hp_optrom.cpp
+++ b/src/devices/bus/hp_optroms/hp_optrom.cpp
@@ -19,14 +19,14 @@ const device_type HP_OPTROM_SLOT = &device_creator<hp_optrom_slot_device>;
// |hp_optrom_cart_device|
// +---------------------+
hp_optrom_cart_device::hp_optrom_cart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- device_slot_card_interface(mconfig, *this)
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+ device_slot_card_interface(mconfig, *this)
{
}
hp_optrom_cart_device::hp_optrom_cart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, HP_OPTROM_CART, "HP9845 optional ROM cartridge", tag, owner, clock, "hp_optrom_cart", __FILE__),
- device_slot_card_interface(mconfig, *this)
+ device_t(mconfig, HP_OPTROM_CART, "HP9845 optional ROM cartridge", tag, owner, clock, "hp_optrom_cart", __FILE__),
+ device_slot_card_interface(mconfig, *this)
{
}
@@ -34,12 +34,12 @@ hp_optrom_cart_device::hp_optrom_cart_device(const machine_config &mconfig, cons
// |hp_optrom_slot_device|
// +---------------------+
hp_optrom_slot_device::hp_optrom_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, HP_OPTROM_SLOT, "HP9845 optional ROM Slot", tag, owner, clock, "hp_optrom_slot", __FILE__),
- device_image_interface(mconfig, *this),
- device_slot_interface(mconfig, *this),
- m_cart(nullptr),
- m_base_addr(0),
- m_end_addr(0)
+ device_t(mconfig, HP_OPTROM_SLOT, "HP9845 optional ROM Slot", tag, owner, clock, "hp_optrom_slot", __FILE__),
+ device_image_interface(mconfig, *this),
+ device_slot_interface(mconfig, *this),
+ m_cart(nullptr),
+ m_base_addr(0),
+ m_end_addr(0)
{
}
@@ -49,95 +49,95 @@ hp_optrom_slot_device::~hp_optrom_slot_device()
void hp_optrom_slot_device::device_start()
{
- m_cart = dynamic_cast<hp_optrom_cart_device *>(get_card_device());
+ m_cart = dynamic_cast<hp_optrom_cart_device *>(get_card_device());
}
void hp_optrom_slot_device::device_config_complete()
{
- update_names(HP_OPTROM_SLOT , "optional_rom" , "optrom");
+ update_names(HP_OPTROM_SLOT , "optional_rom" , "optrom");
}
bool hp_optrom_slot_device::call_load()
{
- logerror("hp_optrom: call_load\n");
- if (m_cart == nullptr || !m_from_swlist) {
- logerror("hp_optrom: must be loaded from sw list\n");
- return IMAGE_INIT_FAIL;
- }
-
- const char *base_feature = get_feature("base");
- if (base_feature == nullptr) {
- logerror("hp_optrom: no 'base' feature\n");
- return IMAGE_INIT_FAIL;
- }
-
- offs_t base_addr;
- if (base_feature[ 0 ] != '0' || base_feature[ 1 ] != 'x' || sscanf(&base_feature[ 2 ] , "%x" , &base_addr) != 1) {
- logerror("hp_optrom: can't parse 'base' feature\n");
- return IMAGE_INIT_FAIL;
- }
-
- // Valid BSC values for ROMs on LPU drawer: 0x07 0x0b .... 0x3b
- // Valid BSC values for ROMs on PPU drawer: 0x09 0x0d .... 0x3d
- // (BSC is field in bits 16..21 of base address)
- // Bit 15 of base address must be 0
- // Base address must be multiple of 0x1000
- if ((base_addr & ~0x3f7000UL) != 0 || ((base_addr & 0x30000) != 0x10000 && (base_addr & 0x30000) != 0x30000) || base_addr < 0x70000) {
- logerror("hp_optrom: illegal base address (%x)\n" , base_addr);
- return IMAGE_INIT_FAIL;
- }
-
- auto length = get_software_region_length("rom") / 2;
-
- if (length < 0x1000 || length > 0x8000 || (length & 0xfff) != 0 || ((base_addr & 0x7000) + length) > 0x8000) {
- logerror("hp_optrom: illegal region length (%x)\n" , length);
- return IMAGE_INIT_FAIL;
- }
-
- offs_t end_addr = base_addr + length - 1;
- logerror("hp_optrom: base_addr = %06x end_addr = %06x\n" , base_addr , end_addr);
-
- m_content.resize(length * 2);
- UINT8 *buffer = m_content.data();
- memcpy(buffer , get_software_region("rom") , length * 2);
-
- // Install ROM in address space of every CPU
- for (hp_hybrid_cpu_device& cpu : device_interface_iterator<hp_hybrid_cpu_device>(machine().root_device())) {
- logerror("hp_optrom: install in %s AS\n" , cpu.tag());
- cpu.space(AS_PROGRAM).install_rom(base_addr , end_addr , buffer);
- }
-
- m_base_addr = base_addr;
- m_end_addr = end_addr;
-
- return IMAGE_INIT_PASS;
+ logerror("hp_optrom: call_load\n");
+ if (m_cart == nullptr || !m_from_swlist) {
+ logerror("hp_optrom: must be loaded from sw list\n");
+ return IMAGE_INIT_FAIL;
+ }
+
+ const char *base_feature = get_feature("base");
+ if (base_feature == nullptr) {
+ logerror("hp_optrom: no 'base' feature\n");
+ return IMAGE_INIT_FAIL;
+ }
+
+ offs_t base_addr;
+ if (base_feature[ 0 ] != '0' || base_feature[ 1 ] != 'x' || sscanf(&base_feature[ 2 ] , "%x" , &base_addr) != 1) {
+ logerror("hp_optrom: can't parse 'base' feature\n");
+ return IMAGE_INIT_FAIL;
+ }
+
+ // Valid BSC values for ROMs on LPU drawer: 0x07 0x0b .... 0x3b
+ // Valid BSC values for ROMs on PPU drawer: 0x09 0x0d .... 0x3d
+ // (BSC is field in bits 16..21 of base address)
+ // Bit 15 of base address must be 0
+ // Base address must be multiple of 0x1000
+ if ((base_addr & ~0x3f7000UL) != 0 || ((base_addr & 0x30000) != 0x10000 && (base_addr & 0x30000) != 0x30000) || base_addr < 0x70000) {
+ logerror("hp_optrom: illegal base address (%x)\n" , base_addr);
+ return IMAGE_INIT_FAIL;
+ }
+
+ auto length = get_software_region_length("rom") / 2;
+
+ if (length < 0x1000 || length > 0x8000 || (length & 0xfff) != 0 || ((base_addr & 0x7000) + length) > 0x8000) {
+ logerror("hp_optrom: illegal region length (%x)\n" , length);
+ return IMAGE_INIT_FAIL;
+ }
+
+ offs_t end_addr = base_addr + length - 1;
+ logerror("hp_optrom: base_addr = %06x end_addr = %06x\n" , base_addr , end_addr);
+
+ m_content.resize(length * 2);
+ UINT8 *buffer = m_content.data();
+ memcpy(buffer , get_software_region("rom") , length * 2);
+
+ // Install ROM in address space of every CPU
+ for (hp_hybrid_cpu_device& cpu : device_interface_iterator<hp_hybrid_cpu_device>(machine().root_device())) {
+ logerror("hp_optrom: install in %s AS\n" , cpu.tag());
+ cpu.space(AS_PROGRAM).install_rom(base_addr , end_addr , buffer);
+ }
+
+ m_base_addr = base_addr;
+ m_end_addr = end_addr;
+
+ return IMAGE_INIT_PASS;
}
void hp_optrom_slot_device::call_unload()
{
- logerror("hp_optrom: call_unload\n");
- if (m_cart != nullptr && m_base_addr != 0 && m_end_addr != 0) {
- for (hp_hybrid_cpu_device& cpu : device_interface_iterator<hp_hybrid_cpu_device>(machine().root_device())) {
- cpu.space(AS_PROGRAM).unmap_read(m_base_addr , m_end_addr);
- }
- m_content.resize(0);
- m_base_addr = 0;
- m_end_addr = 0;
- }
+ logerror("hp_optrom: call_unload\n");
+ if (m_cart != nullptr && m_base_addr != 0 && m_end_addr != 0) {
+ for (hp_hybrid_cpu_device& cpu : device_interface_iterator<hp_hybrid_cpu_device>(machine().root_device())) {
+ cpu.space(AS_PROGRAM).unmap_read(m_base_addr , m_end_addr);
+ }
+ m_content.resize(0);
+ m_base_addr = 0;
+ m_end_addr = 0;
+ }
}
bool hp_optrom_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
{
- logerror("hp_optrom: call_softlist_load\n");
- machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
- return TRUE;
+ logerror("hp_optrom: call_softlist_load\n");
+ machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
+ return TRUE;
}
std::string hp_optrom_slot_device::get_default_card_software()
{
- return software_get_default_slot("rom");
+ return software_get_default_slot("rom");
}
SLOT_INTERFACE_START(hp_optrom_slot_device)
- SLOT_INTERFACE_INTERNAL("rom", HP_OPTROM_CART)
+ SLOT_INTERFACE_INTERNAL("rom", HP_OPTROM_CART)
SLOT_INTERFACE_END
diff --git a/src/devices/bus/hp_optroms/hp_optrom.h b/src/devices/bus/hp_optroms/hp_optrom.h
index a18fd5e4087..5bca192a4dc 100644
--- a/src/devices/bus/hp_optroms/hp_optrom.h
+++ b/src/devices/bus/hp_optroms/hp_optrom.h
@@ -16,53 +16,53 @@
#include "emu.h"
class hp_optrom_cart_device : public device_t,
- public device_slot_card_interface
+ public device_slot_card_interface
{
public:
- // construction/destruction
- hp_optrom_cart_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);
- hp_optrom_cart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ // construction/destruction
+ hp_optrom_cart_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);
+ hp_optrom_cart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- // device-level overrides
- virtual void device_start() override {}
+ // device-level overrides
+ virtual void device_start() override {}
};
class hp_optrom_slot_device : public device_t,
- public device_image_interface,
- public device_slot_interface
+ public device_image_interface,
+ public device_slot_interface
{
public:
- // construction/destruction
- hp_optrom_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- virtual ~hp_optrom_slot_device();
-
- // device-level overrides
- virtual void device_start() override;
- virtual void device_config_complete() override;
-
- // image-level overrides
- virtual bool call_load() override;
- virtual void call_unload() override;
- virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
-
- virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
- virtual bool is_readable() const override { return true; }
- virtual bool is_writeable() const override { return false; }
- virtual bool is_creatable() const override { return false; }
- virtual bool must_be_loaded() const override { return false; }
- virtual bool is_reset_on_load() const override { return true; }
- virtual const option_guide *create_option_guide() const override { return nullptr; }
- virtual const char *image_interface() const override { return "hp9845b_rom"; }
- virtual const char *file_extensions() const override { return "bin"; }
-
- // slot interface overrides
- virtual std::string get_default_card_software() override;
+ // construction/destruction
+ hp_optrom_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ virtual ~hp_optrom_slot_device();
+
+ // device-level overrides
+ virtual void device_start() override;
+ virtual void device_config_complete() override;
+
+ // image-level overrides
+ virtual bool call_load() override;
+ virtual void call_unload() override;
+ virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+
+ virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
+ virtual bool is_readable() const override { return true; }
+ virtual bool is_writeable() const override { return false; }
+ virtual bool is_creatable() const override { return false; }
+ virtual bool must_be_loaded() const override { return false; }
+ virtual bool is_reset_on_load() const override { return true; }
+ virtual const option_guide *create_option_guide() const override { return nullptr; }
+ virtual const char *image_interface() const override { return "hp9845b_rom"; }
+ virtual const char *file_extensions() const override { return "bin"; }
+
+ // slot interface overrides
+ virtual std::string get_default_card_software() override;
protected:
- hp_optrom_cart_device *m_cart;
- dynamic_buffer m_content;
- offs_t m_base_addr;
- offs_t m_end_addr;
+ hp_optrom_cart_device *m_cart;
+ dynamic_buffer m_content;
+ offs_t m_base_addr;
+ offs_t m_end_addr;
};
// device type definition
diff --git a/src/devices/bus/intv/ecs.cpp b/src/devices/bus/intv/ecs.cpp
index bbee4f3074b..69582c2280e 100644
--- a/src/devices/bus/intv/ecs.cpp
+++ b/src/devices/bus/intv/ecs.cpp
@@ -102,7 +102,7 @@ static MACHINE_CONFIG_FRAGMENT( sub_slot )
MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("ctrl_port", intvecs_control_port_device, portA_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono_ecs", 0.33)
- MCFG_INTVECS_CONTROL_PORT_ADD("ctrl_port", intvecs_control_port_devices, "keybd")
+ MCFG_INTVECS_CONTROL_PORT_ADD("ctrl_port", intvecs_control_port_devices, "keybd")
MCFG_INTV_CARTRIDGE_ADD("subslot", intv_cart, nullptr)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/intv_ctrl/ctrl.cpp b/src/devices/bus/intv_ctrl/ctrl.cpp
index 4d57c558d0e..d322a22cb46 100644
--- a/src/devices/bus/intv_ctrl/ctrl.cpp
+++ b/src/devices/bus/intv_ctrl/ctrl.cpp
@@ -92,4 +92,3 @@ UINT8 intv_control_port_device::read_ctrl()
SLOT_INTERFACE_START( intv_control_port_devices )
SLOT_INTERFACE("handctrl", INTV_HANDCTRL)
SLOT_INTERFACE_END
-
diff --git a/src/devices/bus/intv_ctrl/ctrl.h b/src/devices/bus/intv_ctrl/ctrl.h
index b29891efe87..8188d1e0b60 100644
--- a/src/devices/bus/intv_ctrl/ctrl.h
+++ b/src/devices/bus/intv_ctrl/ctrl.h
@@ -45,8 +45,8 @@ public:
intv_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~intv_control_port_device();
- DECLARE_READ8_MEMBER( ctrl_r ) { return read_ctrl(); }
- UINT8 read_ctrl();
+ DECLARE_READ8_MEMBER( ctrl_r ) { return read_ctrl(); }
+ UINT8 read_ctrl();
protected:
// device-level overrides
diff --git a/src/devices/bus/intv_ctrl/ecs_ctrl.cpp b/src/devices/bus/intv_ctrl/ecs_ctrl.cpp
index 19bc059531a..6320a35868a 100644
--- a/src/devices/bus/intv_ctrl/ecs_ctrl.cpp
+++ b/src/devices/bus/intv_ctrl/ecs_ctrl.cpp
@@ -3,7 +3,7 @@
/**********************************************************************
Mattel Intellivision ECS hack for controller port emulation
-
+
FIXME: This device is the best I could come up with to emulate
the fact that Keyboard and Synth controllers for the ECS should be
plugged in both ECS control ports, while the 3rd and 4th additional
@@ -12,9 +12,9 @@
in more than a slot, this has been worked around with this device
which supports as options
- ECS keyboard
- - ECS synth
+ - ECS synth
- a pair of Intellivision controller
-
+
All the code for both the controller port and the slot devices has
been included in this single source file to make easier to clean
them up once we extend the core to support this kind of setup
@@ -100,16 +100,16 @@ UINT8 intvecs_control_port_device::read_portA()
UINT8 intvecs_control_port_device::read_portB()
{
- UINT8 data = 0;
- if (m_device)
- data |= m_device->read_portB();
- return data;
+ UINT8 data = 0;
+ if (m_device)
+ data |= m_device->read_portB();
+ return data;
}
void intvecs_control_port_device::write_portA(UINT8 data)
{
- if (m_device)
- m_device->write_portA(data);
+ if (m_device)
+ m_device->write_portA(data);
}
@@ -119,8 +119,8 @@ void intvecs_control_port_device::write_portA(UINT8 data)
SLOT_INTERFACE_START( intvecs_control_port_devices )
SLOT_INTERFACE("ctrls", ECS_CTRLS)
- SLOT_INTERFACE("keybd", ECS_KEYBD)
- SLOT_INTERFACE("synth", ECS_SYNTH)
+ SLOT_INTERFACE("keybd", ECS_KEYBD)
+ SLOT_INTERFACE("synth", ECS_SYNTH)
SLOT_INTERFACE_END
@@ -139,25 +139,25 @@ SLOT_INTERFACE_END
const device_type ECS_CTRLS = &device_creator<intvecs_ctrls_device>;
static SLOT_INTERFACE_START( intvecs_controller )
- SLOT_INTERFACE("handctrl", INTV_HANDCTRL)
+ SLOT_INTERFACE("handctrl", INTV_HANDCTRL)
SLOT_INTERFACE_END
static MACHINE_CONFIG_FRAGMENT( intvecs_ctrls )
- MCFG_INTV_CONTROL_PORT_ADD("port1", intvecs_controller, "handctrl")
- MCFG_INTV_CONTROL_PORT_ADD("port2", intvecs_controller, "handctrl")
+ MCFG_INTV_CONTROL_PORT_ADD("port1", intvecs_controller, "handctrl")
+ MCFG_INTV_CONTROL_PORT_ADD("port2", intvecs_controller, "handctrl")
MACHINE_CONFIG_END
machine_config_constructor intvecs_ctrls_device::device_mconfig_additions() const
{
- return MACHINE_CONFIG_NAME( intvecs_ctrls );
+ return MACHINE_CONFIG_NAME( intvecs_ctrls );
}
intvecs_ctrls_device::intvecs_ctrls_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, ECS_CTRLS, "Mattel Intellivision ECS Hand Controller x2 (HACK)", tag, owner, clock, "intvecs_ctrls", __FILE__),
- device_intvecs_control_port_interface(mconfig, *this),
- m_hand1(*this, "port1"),
- m_hand2(*this, "port2")
+ device_t(mconfig, ECS_CTRLS, "Mattel Intellivision ECS Hand Controller x2 (HACK)", tag, owner, clock, "intvecs_ctrls", __FILE__),
+ device_intvecs_control_port_interface(mconfig, *this),
+ m_hand1(*this, "port1"),
+ m_hand2(*this, "port2")
{
}
@@ -171,12 +171,12 @@ void intvecs_ctrls_device::device_reset()
UINT8 intvecs_ctrls_device::read_portA()
{
- return m_hand1->read_ctrl();
+ return m_hand1->read_ctrl();
}
UINT8 intvecs_ctrls_device::read_portB()
{
- return m_hand2->read_ctrl();
+ return m_hand2->read_ctrl();
}
//-------------------------------------------------
@@ -197,120 +197,120 @@ static INPUT_PORTS_START( intvecs_keybd )
Bit 4 D E 2 3 W S Z X
Bit 5 A CTL (right) 1 Q (up) (down) (space)
Bit 6 SHIFT NC NC NC NC NC NC NC
-
+
Shifted keys that differ from pc:
Key : 1 2 5 6 7 (left) (right) (up) (down)
Shift + key: = " + - / % ' ^ ?
*/
- PORT_START("ROW.0")
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("RTN") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR(')')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC))
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('P')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR(':')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) PORT_CHAR('%')
-
- PORT_START("ROW.1")
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('L')
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('O')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('*')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR('(')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('I')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('K')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('M')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',')
-
- PORT_START("ROW.2")
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('J')
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('U')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('-')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('/')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('H')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('B')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('N')
-
- PORT_START("ROW.3")
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('G')
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('T')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('R')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('F')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('C')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('V')
-
- PORT_START("ROW.4")
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('D')
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('E')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('W')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('S')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('X')
-
- PORT_START("ROW.5")
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('A')
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("CTL") PORT_CODE(KEYCODE_RCONTROL) PORT_CODE(KEYCODE_LCONTROL)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_CHAR('\'')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('=')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP)) PORT_CHAR('^')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_CHAR('?')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
-
- PORT_START("ROW.6")
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("SHIFT") PORT_CODE(KEYCODE_RSHIFT) PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_START("ROW.0")
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("RTN") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR(')')
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC))
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('P')
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR(':')
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.')
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) PORT_CHAR('%')
+
+ PORT_START("ROW.1")
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('L')
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('O')
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('*')
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR('(')
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('I')
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('K')
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('M')
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',')
+
+ PORT_START("ROW.2")
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('J')
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('U')
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('-')
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('/')
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y')
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('H')
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('B')
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('N')
+
+ PORT_START("ROW.3")
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('G')
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('T')
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%')
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('R')
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('F')
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('C')
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('V')
+
+ PORT_START("ROW.4")
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('D')
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('E')
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"')
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('W')
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('S')
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z')
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('X')
+
+ PORT_START("ROW.5")
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('A')
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("CTL") PORT_CODE(KEYCODE_RCONTROL) PORT_CODE(KEYCODE_LCONTROL)
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_CHAR('\'')
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('=')
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q')
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP)) PORT_CHAR('^')
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_CHAR('?')
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
+
+ PORT_START("ROW.6")
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("SHIFT") PORT_CODE(KEYCODE_RSHIFT) PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
ioport_constructor intvecs_keybd_device::device_input_ports() const
{
- return INPUT_PORTS_NAME( intvecs_keybd );
+ return INPUT_PORTS_NAME( intvecs_keybd );
}
intvecs_keybd_device::intvecs_keybd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, ECS_KEYBD, "Mattel Intellivision ECS Keyboard", tag, owner, clock, "intvecs_keybd", __FILE__),
- device_intvecs_control_port_interface(mconfig, *this),
- m_keybd(*this, "ROW")
+ device_t(mconfig, ECS_KEYBD, "Mattel Intellivision ECS Keyboard", tag, owner, clock, "intvecs_keybd", __FILE__),
+ device_intvecs_control_port_interface(mconfig, *this),
+ m_keybd(*this, "ROW")
{
}
void intvecs_keybd_device::device_start()
{
- save_item(NAME(m_psg_portA));
+ save_item(NAME(m_psg_portA));
}
void intvecs_keybd_device::device_reset()
{
- m_psg_portA = 0;
+ m_psg_portA = 0;
}
UINT8 intvecs_keybd_device::read_portB()
{
- UINT8 val = 0xff;
- // return correct result if more than one bit of 0xFE is set
- for (int i = 0; i < 7; i++)
- {
- if (BIT(m_psg_portA, i))
- val &= m_keybd[i]->read();
- }
- return val;
+ UINT8 val = 0xff;
+ // return correct result if more than one bit of 0xFE is set
+ for (int i = 0; i < 7; i++)
+ {
+ if (BIT(m_psg_portA, i))
+ val &= m_keybd[i]->read();
+ }
+ return val;
}
void intvecs_keybd_device::write_portA(UINT8 data)
{
- m_psg_portA = (~data) & 0xff;
+ m_psg_portA = (~data) & 0xff;
}
@@ -334,115 +334,114 @@ static INPUT_PORTS_START( intvecs_synth )
Bit 5 B5 Bb5 A5 Ab5 G5 Gb5 F5 E5
Bit 6 C6 NC NC NC NC NC NC NC
*/
- PORT_START("SYNTH.0")
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("G2")
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Gb2")
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F2")
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E2")
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Eb2")
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D2")
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Db2")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C2")
-
- PORT_START("SYNTH.1")
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Eb3")
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D3")
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Db3")
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C3")
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("B2")
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Bb2")
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A2")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ab2")
-
- PORT_START("SYNTH.2")
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("B3")
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Bb3")
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A3")
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ab3")
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("G3")
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Gb3")
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F3")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E3")
-
- PORT_START("SYNTH.3")
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("G4")
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Gb4")
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F4")
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E4")
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Eb4")
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D4")
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Db4")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C4")
-
- PORT_START("SYNTH.4")
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Eb5")
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D5")
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Db5")
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C5")
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("B4")
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Bb4")
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A4")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ab4")
-
- PORT_START("SYNTH.5")
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("B5")
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Bb5")
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A5")
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ab5")
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("G5")
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Gb5")
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F5")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E5")
-
- PORT_START("SYNTH.6")
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C6")
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_START("SYNTH.0")
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("G2")
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Gb2")
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F2")
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E2")
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Eb2")
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D2")
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Db2")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C2")
+
+ PORT_START("SYNTH.1")
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Eb3")
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D3")
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Db3")
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C3")
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("B2")
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Bb2")
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A2")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ab2")
+
+ PORT_START("SYNTH.2")
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("B3")
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Bb3")
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A3")
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ab3")
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("G3")
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Gb3")
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F3")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E3")
+
+ PORT_START("SYNTH.3")
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("G4")
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Gb4")
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F4")
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E4")
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Eb4")
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D4")
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Db4")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C4")
+
+ PORT_START("SYNTH.4")
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Eb5")
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D5")
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Db5")
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C5")
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("B4")
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Bb4")
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A4")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ab4")
+
+ PORT_START("SYNTH.5")
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("B5")
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Bb5")
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A5")
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ab5")
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("G5")
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Gb5")
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F5")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E5")
+
+ PORT_START("SYNTH.6")
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C6")
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
ioport_constructor intvecs_synth_device::device_input_ports() const
{
- return INPUT_PORTS_NAME( intvecs_synth );
+ return INPUT_PORTS_NAME( intvecs_synth );
}
intvecs_synth_device::intvecs_synth_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, ECS_SYNTH, "Mattel Intellivision ECS Synthetizer", tag, owner, clock, "intvecs_synth", __FILE__),
- device_intvecs_control_port_interface(mconfig, *this),
- m_synth(*this, "SYNTH")
+ device_t(mconfig, ECS_SYNTH, "Mattel Intellivision ECS Synthetizer", tag, owner, clock, "intvecs_synth", __FILE__),
+ device_intvecs_control_port_interface(mconfig, *this),
+ m_synth(*this, "SYNTH")
{
}
void intvecs_synth_device::device_start()
{
- save_item(NAME(m_psg_portA));
+ save_item(NAME(m_psg_portA));
}
void intvecs_synth_device::device_reset()
{
- m_psg_portA = 0;
+ m_psg_portA = 0;
}
UINT8 intvecs_synth_device::read_portB()
{
- UINT8 val = 0xff;
- // return correct result if more than one bit of 0xFE is set
- for (int i = 0; i < 7; i++)
- {
- if (BIT(m_psg_portA, i))
- val &= m_synth[i]->read();
- }
- return val;
+ UINT8 val = 0xff;
+ // return correct result if more than one bit of 0xFE is set
+ for (int i = 0; i < 7; i++)
+ {
+ if (BIT(m_psg_portA, i))
+ val &= m_synth[i]->read();
+ }
+ return val;
}
void intvecs_synth_device::write_portA(UINT8 data)
{
- m_psg_portA = (~data) & 0xff;
+ m_psg_portA = (~data) & 0xff;
}
-
diff --git a/src/devices/bus/intv_ctrl/ecs_ctrl.h b/src/devices/bus/intv_ctrl/ecs_ctrl.h
index 40d94ca5d1b..136c7bfa9d9 100644
--- a/src/devices/bus/intv_ctrl/ecs_ctrl.h
+++ b/src/devices/bus/intv_ctrl/ecs_ctrl.h
@@ -32,8 +32,8 @@ public:
virtual ~device_intvecs_control_port_interface();
virtual UINT8 read_portA() { return 0xff; };
- virtual UINT8 read_portB() { return 0xff; };
- virtual void write_portA(UINT8 data) { };
+ virtual UINT8 read_portB() { return 0xff; };
+ virtual void write_portA(UINT8 data) { };
protected:
intvecs_control_port_device *m_port;
@@ -49,16 +49,16 @@ public:
intvecs_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~intvecs_control_port_device();
- DECLARE_READ8_MEMBER( portA_r ) { return read_portA(); }
- DECLARE_READ8_MEMBER( portB_r ) { return read_portB(); }
- DECLARE_WRITE8_MEMBER( portA_w ) { return write_portA(data); }
+ DECLARE_READ8_MEMBER( portA_r ) { return read_portA(); }
+ DECLARE_READ8_MEMBER( portB_r ) { return read_portB(); }
+ DECLARE_WRITE8_MEMBER( portA_w ) { return write_portA(data); }
protected:
// device-level overrides
virtual void device_start() override;
- UINT8 read_portA();
- UINT8 read_portB();
- void write_portA(UINT8 data);
+ UINT8 read_portA();
+ UINT8 read_portB();
+ void write_portA(UINT8 data);
device_intvecs_control_port_interface *m_device;
};
@@ -88,76 +88,76 @@ SLOT_INTERFACE_EXTERN( intvecs_control_port_devices );
// ======================> intvecs_ctrls_device
class intvecs_ctrls_device : public device_t,
- public device_intvecs_control_port_interface
+ public device_intvecs_control_port_interface
{
public:
- // construction/destruction
- intvecs_ctrls_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ // construction/destruction
+ intvecs_ctrls_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- // optional information overrides
- virtual machine_config_constructor device_mconfig_additions() const override;
+ // optional information overrides
+ virtual machine_config_constructor device_mconfig_additions() const override;
protected:
- // device-level overrides
- virtual void device_start() override;
- virtual void device_reset() override;
-
- virtual UINT8 read_portA() override;
- virtual UINT8 read_portB() override;
-
+ // device-level overrides
+ virtual void device_start() override;
+ virtual void device_reset() override;
+
+ virtual UINT8 read_portA() override;
+ virtual UINT8 read_portB() override;
+
private:
- required_device<intv_control_port_device> m_hand1;
- required_device<intv_control_port_device> m_hand2;
+ required_device<intv_control_port_device> m_hand1;
+ required_device<intv_control_port_device> m_hand2;
};
// ======================> intvecs_keybd_device
class intvecs_keybd_device : public device_t,
- public device_intvecs_control_port_interface
+ public device_intvecs_control_port_interface
{
public:
- // construction/destruction
- intvecs_keybd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
- // optional information overrides
- virtual ioport_constructor device_input_ports() const override;
-
+ // construction/destruction
+ intvecs_keybd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+
+ // optional information overrides
+ virtual ioport_constructor device_input_ports() const override;
+
protected:
- // device-level overrides
- virtual void device_start() override;
- virtual void device_reset() override;
-
- virtual UINT8 read_portB() override;
- virtual void write_portA(UINT8 data) override;
-
+ // device-level overrides
+ virtual void device_start() override;
+ virtual void device_reset() override;
+
+ virtual UINT8 read_portB() override;
+ virtual void write_portA(UINT8 data) override;
+
private:
- UINT8 m_psg_portA;
- required_ioport_array<7> m_keybd;
+ UINT8 m_psg_portA;
+ required_ioport_array<7> m_keybd;
};
// ======================> intvecs_synth_device
class intvecs_synth_device : public device_t,
- public device_intvecs_control_port_interface
+ public device_intvecs_control_port_interface
{
public:
- // construction/destruction
- intvecs_synth_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
- // optional information overrides
- virtual ioport_constructor device_input_ports() const override;
-
+ // construction/destruction
+ intvecs_synth_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+
+ // optional information overrides
+ virtual ioport_constructor device_input_ports() const override;
+
protected:
- // device-level overrides
- virtual void device_start() override;
- virtual void device_reset() override;
-
- virtual UINT8 read_portB() override;
- virtual void write_portA(UINT8 data) override;
-
+ // device-level overrides
+ virtual void device_start() override;
+ virtual void device_reset() override;
+
+ virtual UINT8 read_portB() override;
+ virtual void write_portA(UINT8 data) override;
+
private:
- UINT8 m_psg_portA;
- required_ioport_array<7> m_synth;
+ UINT8 m_psg_portA;
+ required_ioport_array<7> m_synth;
};
diff --git a/src/devices/bus/intv_ctrl/handctrl.cpp b/src/devices/bus/intv_ctrl/handctrl.cpp
index 512f9f32adc..07154829d51 100644
--- a/src/devices/bus/intv_ctrl/handctrl.cpp
+++ b/src/devices/bus/intv_ctrl/handctrl.cpp
@@ -16,53 +16,53 @@ const device_type INTV_HANDCTRL = &device_creator<intv_handctrl_device>;
static INPUT_PORTS_START( intv_handctrl )
- PORT_START("KEYPAD")
- PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("1") PORT_CODE(KEYCODE_1_PAD)
- PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("2") PORT_CODE(KEYCODE_2_PAD)
- PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("3") PORT_CODE(KEYCODE_3_PAD)
- PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("4") PORT_CODE(KEYCODE_4_PAD)
- PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("5") PORT_CODE(KEYCODE_5_PAD)
- PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("6") PORT_CODE(KEYCODE_6_PAD)
- PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("7") PORT_CODE(KEYCODE_7_PAD)
- PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("8") PORT_CODE(KEYCODE_8_PAD)
- PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("9") PORT_CODE(KEYCODE_9_PAD)
- PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("Clear") PORT_CODE(KEYCODE_DEL_PAD)
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("0") PORT_CODE(KEYCODE_0_PAD)
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("Enter") PORT_CODE(KEYCODE_ENTER_PAD)
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Upper") PORT_PLAYER(1)
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Lower-Left") PORT_PLAYER(1)
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Lower-Right") PORT_PLAYER(1)
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- PORT_START("DISC_DG")
- PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_NAME("Up") PORT_PLAYER(1) PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
- PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Up-Up-Right") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
- PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Up-Right") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
- PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Right-Up-Right") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
- PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_NAME("Right") PORT_PLAYER(1) PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
- PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Right-Down-Right") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
- PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Down-Right") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
- PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Down-Down-Right") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
- PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_NAME("Down") PORT_PLAYER(1) PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
- PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Down-Down-Left") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Down-Left") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Left-Down-Left") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_NAME("Left") PORT_PLAYER(1) PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Left-Up-Left") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Up-Left") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Up-Up-Left") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
-
- PORT_START("DISC_AN_X")
- PORT_BIT( 0xff, 0x50, IPT_AD_STICK_X ) PORT_NAME("X") PORT_MINMAX(0x00,0x9f) PORT_SENSITIVITY(100) PORT_KEYDELTA(0x50) PORT_CODE_DEC(KEYCODE_LEFT) PORT_CODE_INC(KEYCODE_RIGHT) PORT_PLAYER(1) PORT_CONDITION("OPTIONS",0x01,EQUALS,0x01)
-
- PORT_START("DISC_AN_Y")
- PORT_BIT( 0xff, 0x50, IPT_AD_STICK_Y ) PORT_NAME("Y") PORT_MINMAX(0x00,0x9f) PORT_SENSITIVITY(100) PORT_KEYDELTA(0x50) PORT_CODE_DEC(KEYCODE_UP) PORT_CODE_INC(KEYCODE_DOWN) PORT_PLAYER(1) PORT_CONDITION("OPTIONS",0x01,EQUALS,0x01)
-
-
- PORT_START("OPTIONS")
- PORT_CONFNAME( 0x01, 0x01, "Controller Disc Emulation" )
- PORT_CONFSETTING( 0x00, "Digital" )
- PORT_CONFSETTING( 0x01, "Analog" )
+ PORT_START("KEYPAD")
+ PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("1") PORT_CODE(KEYCODE_1_PAD)
+ PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("2") PORT_CODE(KEYCODE_2_PAD)
+ PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("3") PORT_CODE(KEYCODE_3_PAD)
+ PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("4") PORT_CODE(KEYCODE_4_PAD)
+ PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("5") PORT_CODE(KEYCODE_5_PAD)
+ PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("6") PORT_CODE(KEYCODE_6_PAD)
+ PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("7") PORT_CODE(KEYCODE_7_PAD)
+ PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("8") PORT_CODE(KEYCODE_8_PAD)
+ PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("9") PORT_CODE(KEYCODE_9_PAD)
+ PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("Clear") PORT_CODE(KEYCODE_DEL_PAD)
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("0") PORT_CODE(KEYCODE_0_PAD)
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("Enter") PORT_CODE(KEYCODE_ENTER_PAD)
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Upper") PORT_PLAYER(1)
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Lower-Left") PORT_PLAYER(1)
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Lower-Right") PORT_PLAYER(1)
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+ PORT_START("DISC_DG")
+ PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_NAME("Up") PORT_PLAYER(1) PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
+ PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Up-Up-Right") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
+ PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Up-Right") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
+ PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Right-Up-Right") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
+ PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_NAME("Right") PORT_PLAYER(1) PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
+ PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Right-Down-Right") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
+ PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Down-Right") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
+ PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Down-Down-Right") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
+ PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_NAME("Down") PORT_PLAYER(1) PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
+ PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Down-Down-Left") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Down-Left") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Left-Down-Left") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_NAME("Left") PORT_PLAYER(1) PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Left-Up-Left") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Up-Left") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Up-Up-Left") PORT_CONDITION("OPTIONS",0x01,EQUALS,0x00)
+
+ PORT_START("DISC_AN_X")
+ PORT_BIT( 0xff, 0x50, IPT_AD_STICK_X ) PORT_NAME("X") PORT_MINMAX(0x00,0x9f) PORT_SENSITIVITY(100) PORT_KEYDELTA(0x50) PORT_CODE_DEC(KEYCODE_LEFT) PORT_CODE_INC(KEYCODE_RIGHT) PORT_PLAYER(1) PORT_CONDITION("OPTIONS",0x01,EQUALS,0x01)
+
+ PORT_START("DISC_AN_Y")
+ PORT_BIT( 0xff, 0x50, IPT_AD_STICK_Y ) PORT_NAME("Y") PORT_MINMAX(0x00,0x9f) PORT_SENSITIVITY(100) PORT_KEYDELTA(0x50) PORT_CODE_DEC(KEYCODE_UP) PORT_CODE_INC(KEYCODE_DOWN) PORT_PLAYER(1) PORT_CONDITION("OPTIONS",0x01,EQUALS,0x01)
+
+
+ PORT_START("OPTIONS")
+ PORT_CONFNAME( 0x01, 0x01, "Controller Disc Emulation" )
+ PORT_CONFSETTING( 0x00, "Digital" )
+ PORT_CONFSETTING( 0x01, "Analog" )
INPUT_PORTS_END
@@ -89,10 +89,10 @@ intv_handctrl_device::intv_handctrl_device(const machine_config &mconfig, const
device_t(mconfig, INTV_HANDCTRL, "Mattel Intellivision Hand Controller", tag, owner, clock, "intv_hand", __FILE__),
device_intv_control_port_interface(mconfig, *this),
m_cfg(*this, "OPTIONS"),
- m_keypad(*this, "KEYPAD"),
- m_disc_dig(*this, "DISC_DG"),
- m_disc_anx(*this, "DISC_AN_X"),
- m_disc_any(*this, "DISC_AN_Y")
+ m_keypad(*this, "KEYPAD"),
+ m_disc_dig(*this, "DISC_DG"),
+ m_disc_anx(*this, "DISC_AN_X"),
+ m_disc_any(*this, "DISC_AN_Y")
{
}
@@ -121,59 +121,58 @@ void intv_handctrl_device::device_reset()
UINT8 intv_handctrl_device::read_ctrl()
{
- static const UINT8 keypad_table[] =
- {
- 0xff, 0x3f, 0x9f, 0x5f, 0xd7, 0xb7, 0x77, 0xdb,
- 0xbb, 0x7b, 0xdd, 0xbd, 0x7d, 0xde, 0xbe, 0x7e
- };
-
- static const UINT8 disc_table[] =
- {
- 0xf3, 0xe3, 0xe7, 0xf7, 0xf6, 0xe6, 0xee, 0xfe,
- 0xfc, 0xec, 0xed, 0xfd, 0xf9, 0xe9, 0xeb, 0xfb
- };
-
- static const UINT8 discyx_table[5][5] =
- {
- { 0xe3, 0xf3, 0xfb, 0xeb, 0xe9 },
- { 0xe7, 0xe3, 0xfb, 0xe9, 0xf9 },
- { 0xf7, 0xf7, 0xff, 0xfd, 0xfd },
- { 0xf6, 0xe6, 0xfe, 0xec, 0xed },
- { 0xe6, 0xee, 0xfe, 0xfc, 0xec }
- };
-
- int x, y;
- UINT8 res = 0xff;
-
- /* keypad */
- x = m_keypad->read();
- for (int i = 0; i < 16; i++)
- {
- if (BIT(x, i))
- res &= keypad_table[i];
- }
-
- switch (m_cfg->read() & 1)
- {
- /* disc == digital */
- case 0:
- default:
- x = m_disc_dig->read();
- for (int i = 0; i < 16; i++)
- {
- if (BIT(x, i))
- res &= disc_table[i];
- }
- break;
-
- /* disc == _fake_ analog */
- case 1:
- x = m_disc_anx->read();
- y = m_disc_any->read();
- res &= discyx_table[y / 32][x / 32];
- break;
- }
-
- return res;
+ static const UINT8 keypad_table[] =
+ {
+ 0xff, 0x3f, 0x9f, 0x5f, 0xd7, 0xb7, 0x77, 0xdb,
+ 0xbb, 0x7b, 0xdd, 0xbd, 0x7d, 0xde, 0xbe, 0x7e
+ };
+
+ static const UINT8 disc_table[] =
+ {
+ 0xf3, 0xe3, 0xe7, 0xf7, 0xf6, 0xe6, 0xee, 0xfe,
+ 0xfc, 0xec, 0xed, 0xfd, 0xf9, 0xe9, 0xeb, 0xfb
+ };
+
+ static const UINT8 discyx_table[5][5] =
+ {
+ { 0xe3, 0xf3, 0xfb, 0xeb, 0xe9 },
+ { 0xe7, 0xe3, 0xfb, 0xe9, 0xf9 },
+ { 0xf7, 0xf7, 0xff, 0xfd, 0xfd },
+ { 0xf6, 0xe6, 0xfe, 0xec, 0xed },
+ { 0xe6, 0xee, 0xfe, 0xfc, 0xec }
+ };
+
+ int x, y;
+ UINT8 res = 0xff;
+
+ /* keypad */
+ x = m_keypad->read();
+ for (int i = 0; i < 16; i++)
+ {
+ if (BIT(x, i))
+ res &= keypad_table[i];
+ }
+
+ switch (m_cfg->read() & 1)
+ {
+ /* disc == digital */
+ case 0:
+ default:
+ x = m_disc_dig->read();
+ for (int i = 0; i < 16; i++)
+ {
+ if (BIT(x, i))
+ res &= disc_table[i];
+ }
+ break;
+
+ /* disc == _fake_ analog */
+ case 1:
+ x = m_disc_anx->read();
+ y = m_disc_any->read();
+ res &= discyx_table[y / 32][x / 32];
+ break;
+ }
+
+ return res;
}
-
diff --git a/src/devices/bus/intv_ctrl/handctrl.h b/src/devices/bus/intv_ctrl/handctrl.h
index 5b6fc4a3fb9..90c02d74793 100644
--- a/src/devices/bus/intv_ctrl/handctrl.h
+++ b/src/devices/bus/intv_ctrl/handctrl.h
@@ -41,10 +41,10 @@ protected:
private:
required_ioport m_cfg;
- required_ioport m_keypad;
- required_ioport m_disc_dig;
- required_ioport m_disc_anx;
- required_ioport m_disc_any;
+ required_ioport m_keypad;
+ required_ioport m_disc_dig;
+ required_ioport m_disc_anx;
+ required_ioport m_disc_any;
};
diff --git a/src/devices/bus/neogeo_ctrl/ctrl.cpp b/src/devices/bus/neogeo_ctrl/ctrl.cpp
index bdfeb657065..d79410c060b 100644
--- a/src/devices/bus/neogeo_ctrl/ctrl.cpp
+++ b/src/devices/bus/neogeo_ctrl/ctrl.cpp
@@ -3,13 +3,13 @@
/**********************************************************************
SNK Neo Geo Controller Port emulation
-
+
This actually covers two separate piece of hardware of Neo Geo system:
- - The 15-pin controller ports that are used for controllers in the
+ - The 15-pin controller ports that are used for controllers in the
AES home system and for mahjong controllers in the MVS arcade PCB
- The controller part of the main edge connector that is used for
joystick inputs in the MVS arcade PCB
-
+
Technically, the latter is not a configurable slot, because it's not
a component that arcade operators could simply change with a different
controller, but this implementation allows for simpler code.
@@ -219,4 +219,3 @@ SLOT_INTERFACE_END
SLOT_INTERFACE_START( neogeo_arc_pin15 )
SLOT_INTERFACE("mahjong", NEOGEO_MJCTRL)
SLOT_INTERFACE_END
-
diff --git a/src/devices/bus/neogeo_ctrl/ctrl.h b/src/devices/bus/neogeo_ctrl/ctrl.h
index 437dc8addd3..1d61e6753d1 100644
--- a/src/devices/bus/neogeo_ctrl/ctrl.h
+++ b/src/devices/bus/neogeo_ctrl/ctrl.h
@@ -48,7 +48,7 @@ public:
neogeo_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~neogeo_control_port_device();
- UINT8 read_ctrl();
+ UINT8 read_ctrl();
UINT8 read_start_sel();
void write_ctrlsel(UINT8 data);
DECLARE_READ8_MEMBER( ctrl_r ) { return read_ctrl(); }
@@ -69,12 +69,12 @@ public:
// construction/destruction
device_neogeo_ctrl_edge_interface(const machine_config &mconfig, device_t &device);
virtual ~device_neogeo_ctrl_edge_interface();
-
+
virtual UINT8 read_start_sel() { return 0xff; }
virtual DECLARE_READ8_MEMBER( in0_r ) { return 0xff; }
virtual DECLARE_READ8_MEMBER( in1_r ) { return 0xff; }
virtual void write_ctrlsel(UINT8 data) { }
-
+
protected:
neogeo_ctrl_edge_port_device *m_port;
};
@@ -88,7 +88,7 @@ public:
// construction/destruction
neogeo_ctrl_edge_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~neogeo_ctrl_edge_port_device();
-
+
UINT8 read_start_sel();
DECLARE_READ8_MEMBER( in0_r );
DECLARE_READ8_MEMBER( in1_r );
@@ -97,7 +97,7 @@ public:
protected:
// device-level overrides
virtual void device_start() override;
-
+
device_neogeo_ctrl_edge_interface *m_device;
};
diff --git a/src/devices/bus/neogeo_ctrl/dial.cpp b/src/devices/bus/neogeo_ctrl/dial.cpp
index 046ff1ccd06..d73a7b6c8de 100644
--- a/src/devices/bus/neogeo_ctrl/dial.cpp
+++ b/src/devices/bus/neogeo_ctrl/dial.cpp
@@ -102,7 +102,7 @@ READ8_MEMBER(neogeo_dial_device::in0_r)
res = m_joy1->read();
else
res = m_dial1->read();
-
+
return res;
}
@@ -117,7 +117,7 @@ READ8_MEMBER(neogeo_dial_device::in1_r)
res = m_joy2->read();
else
res = m_dial2->read();
-
+
return res;
}
@@ -129,4 +129,3 @@ void neogeo_dial_device::write_ctrlsel(UINT8 data)
{
m_ctrl_sel = data;
}
-
diff --git a/src/devices/bus/neogeo_ctrl/dial.h b/src/devices/bus/neogeo_ctrl/dial.h
index 0c0e07c474d..5727c540637 100644
--- a/src/devices/bus/neogeo_ctrl/dial.h
+++ b/src/devices/bus/neogeo_ctrl/dial.h
@@ -27,20 +27,20 @@ class neogeo_dial_device : public device_t,
public:
// construction/destruction
neogeo_dial_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
-
+
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
-
+
// device_neogeo_control_port_interface overrides
virtual DECLARE_READ8_MEMBER( in0_r ) override;
virtual DECLARE_READ8_MEMBER( in1_r ) override;
virtual void write_ctrlsel(UINT8 data) override;
-
+
private:
required_ioport m_joy1;
required_ioport m_joy2;
diff --git a/src/devices/bus/neogeo_ctrl/irrmaze.cpp b/src/devices/bus/neogeo_ctrl/irrmaze.cpp
index 0172d6f86d4..e22941e5d09 100644
--- a/src/devices/bus/neogeo_ctrl/irrmaze.cpp
+++ b/src/devices/bus/neogeo_ctrl/irrmaze.cpp
@@ -90,7 +90,7 @@ READ8_MEMBER(neogeo_irrmaze_device::in0_r)
res = m_ty->read();
else
res = m_tx->read();
-
+
return res;
}
@@ -111,4 +111,3 @@ void neogeo_irrmaze_device::write_ctrlsel(UINT8 data)
{
m_ctrl_sel = data;
}
-
diff --git a/src/devices/bus/neogeo_ctrl/irrmaze.h b/src/devices/bus/neogeo_ctrl/irrmaze.h
index 9ec4da5761b..0eeecfb8a11 100644
--- a/src/devices/bus/neogeo_ctrl/irrmaze.h
+++ b/src/devices/bus/neogeo_ctrl/irrmaze.h
@@ -27,20 +27,20 @@ class neogeo_irrmaze_device : public device_t,
public:
// construction/destruction
neogeo_irrmaze_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
-
+
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
-
+
// device_neogeo_control_port_interface overrides
virtual DECLARE_READ8_MEMBER( in0_r ) override;
virtual DECLARE_READ8_MEMBER( in1_r ) override;
virtual void write_ctrlsel(UINT8 data) override;
-
+
private:
required_ioport m_tx;
required_ioport m_ty;
diff --git a/src/devices/bus/neogeo_ctrl/joystick.cpp b/src/devices/bus/neogeo_ctrl/joystick.cpp
index a2a95c7a7e0..f30b4fa2102 100644
--- a/src/devices/bus/neogeo_ctrl/joystick.cpp
+++ b/src/devices/bus/neogeo_ctrl/joystick.cpp
@@ -11,9 +11,9 @@
/**********************************************************************
-
+
Implementation through the 15-pin controller port (used by AES)
-
+
**********************************************************************/
@@ -92,7 +92,7 @@ void neogeo_joystick_device::device_reset()
UINT8 neogeo_joystick_device::read_ctrl()
{
- return m_joy->read();
+ return m_joy->read();
}
//-------------------------------------------------
@@ -107,10 +107,10 @@ UINT8 neogeo_joystick_device::read_start_sel()
/**********************************************************************
-
- Implementation through the edge connector (used by MVS) and
+
+ Implementation through the edge connector (used by MVS) and
connecting two controllers
-
+
**********************************************************************/
//**************************************************************************
@@ -203,4 +203,3 @@ READ8_MEMBER(neogeo_joy_ac_device::in1_r)
{
return m_joy2->read();
}
-
diff --git a/src/devices/bus/neogeo_ctrl/joystick.h b/src/devices/bus/neogeo_ctrl/joystick.h
index 4f8ce2a91da..86cccd6fef8 100644
--- a/src/devices/bus/neogeo_ctrl/joystick.h
+++ b/src/devices/bus/neogeo_ctrl/joystick.h
@@ -54,15 +54,15 @@ class neogeo_joy_ac_device : public device_t,
public:
// construction/destruction
neogeo_joy_ac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
-
+
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
-
+
// device_neogeo_ctrl_edge_interface overrides
virtual DECLARE_READ8_MEMBER( in0_r ) override;
virtual DECLARE_READ8_MEMBER( in1_r ) override;
diff --git a/src/devices/bus/neogeo_ctrl/kizuna4p.cpp b/src/devices/bus/neogeo_ctrl/kizuna4p.cpp
index 9a3ef190154..b6b93089fe4 100644
--- a/src/devices/bus/neogeo_ctrl/kizuna4p.cpp
+++ b/src/devices/bus/neogeo_ctrl/kizuna4p.cpp
@@ -128,9 +128,9 @@ READ8_MEMBER(neogeo_kizuna4p_device::in0_r)
res = m_joy3->read();
else
res = m_joy1->read();
-
+
if (m_ctrl_sel & 0x04) res &= ((m_ctrl_sel & 0x01) ? ~0x20 : ~0x10);
-
+
return res;
}
@@ -145,9 +145,9 @@ READ8_MEMBER(neogeo_kizuna4p_device::in1_r)
res = m_joy4->read();
else
res = m_joy2->read();
-
+
if (m_ctrl_sel & 0x04) res &= ((m_ctrl_sel & 0x01) ? ~0x20 : ~0x10);
-
+
return res;
}
diff --git a/src/devices/bus/neogeo_ctrl/kizuna4p.h b/src/devices/bus/neogeo_ctrl/kizuna4p.h
index ef4aa1bad36..7a3907f98db 100644
--- a/src/devices/bus/neogeo_ctrl/kizuna4p.h
+++ b/src/devices/bus/neogeo_ctrl/kizuna4p.h
@@ -27,21 +27,21 @@ class neogeo_kizuna4p_device : public device_t,
public:
// construction/destruction
neogeo_kizuna4p_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
-
+
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
-
+
// device_neogeo_control_port_interface overrides
virtual DECLARE_READ8_MEMBER( in0_r ) override;
virtual DECLARE_READ8_MEMBER( in1_r ) override;
virtual UINT8 read_start_sel() override;
virtual void write_ctrlsel(UINT8 data) override;
-
+
private:
required_ioport m_joy1;
required_ioport m_joy2;
diff --git a/src/devices/bus/neogeo_ctrl/mahjong.cpp b/src/devices/bus/neogeo_ctrl/mahjong.cpp
index 37e471adb62..5a58daf6bee 100644
--- a/src/devices/bus/neogeo_ctrl/mahjong.cpp
+++ b/src/devices/bus/neogeo_ctrl/mahjong.cpp
@@ -150,7 +150,7 @@ UINT8 neogeo_mjctrl_ac_device::read_ctrl()
case 0x1b: res = m_mjpanel[2]->read(); break;
case 0x24: res = m_mjpanel[3]->read(); break;
}
-
+
return res;
}
@@ -171,4 +171,3 @@ UINT8 neogeo_mjctrl_device::read_start_sel()
{
return m_ss->read();
}
-
diff --git a/src/devices/bus/neogeo_ctrl/mahjong.h b/src/devices/bus/neogeo_ctrl/mahjong.h
index eb4f2fc4166..52812a9917e 100644
--- a/src/devices/bus/neogeo_ctrl/mahjong.h
+++ b/src/devices/bus/neogeo_ctrl/mahjong.h
@@ -28,19 +28,19 @@ public:
// construction/destruction
neogeo_mjctrl_ac_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);
neogeo_mjctrl_ac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
-
+
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
-
+
// device_neogeo_control_port_interface overrides
virtual UINT8 read_ctrl() override;
virtual void write_ctrlsel(UINT8 data) override;
-
+
private:
required_ioport_array<4> m_mjpanel;
UINT8 m_ctrl_sel;
diff --git a/src/devices/bus/sat_ctrl/analog.cpp b/src/devices/bus/sat_ctrl/analog.cpp
index ab1d75292fd..32cf2092385 100644
--- a/src/devices/bus/sat_ctrl/analog.cpp
+++ b/src/devices/bus/sat_ctrl/analog.cpp
@@ -120,4 +120,3 @@ UINT8 saturn_analog_device::read_ctrl(UINT8 offset)
}
return res;
}
-
diff --git a/src/devices/bus/sat_ctrl/analog.h b/src/devices/bus/sat_ctrl/analog.h
index 2688f58aca9..ebd99d570fa 100644
--- a/src/devices/bus/sat_ctrl/analog.h
+++ b/src/devices/bus/sat_ctrl/analog.h
@@ -35,7 +35,7 @@ protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
-
+
// device_saturn_control_port_interface overrides
virtual UINT8 read_ctrl(UINT8 offset) override;
virtual UINT8 read_status() override { return 0xf1; }
diff --git a/src/devices/bus/sat_ctrl/ctrl.cpp b/src/devices/bus/sat_ctrl/ctrl.cpp
index 55a324cbd7f..2d5473bbb19 100644
--- a/src/devices/bus/sat_ctrl/ctrl.cpp
+++ b/src/devices/bus/sat_ctrl/ctrl.cpp
@@ -3,7 +3,7 @@
/**********************************************************************
Sega Saturn Controller Port emulation
-
+
**********************************************************************/
#include "ctrl.h"
@@ -127,7 +127,7 @@ SLOT_INTERFACE_START( saturn_controls )
SLOT_INTERFACE("joypad", SATURN_JOY)
SLOT_INTERFACE("racing", SATURN_WHEEL)
SLOT_INTERFACE("analog", SATURN_ANALOG)
-// SLOT_INTERFACE("lightgun", SATURN_LIGHTGUN)
+// SLOT_INTERFACE("lightgun", SATURN_LIGHTGUN)
SLOT_INTERFACE("trackball", SATURN_TRACK)
SLOT_INTERFACE("keyboard", SATURN_KEYBD)
SLOT_INTERFACE("joy_md3", SATURN_JOYMD3B)
@@ -140,4 +140,3 @@ SLOT_INTERFACE_END
SLOT_INTERFACE_START( saturn_joys )
SLOT_INTERFACE("joypad", SATURN_JOY)
SLOT_INTERFACE_END
-
diff --git a/src/devices/bus/sat_ctrl/ctrl.h b/src/devices/bus/sat_ctrl/ctrl.h
index 346a181780c..ad3fe80cec7 100644
--- a/src/devices/bus/sat_ctrl/ctrl.h
+++ b/src/devices/bus/sat_ctrl/ctrl.h
@@ -50,13 +50,13 @@ public:
virtual ~saturn_control_port_device();
UINT16 read_direct();
- UINT8 read_ctrl(UINT8 offset);
+ UINT8 read_ctrl(UINT8 offset);
UINT8 read_status();
UINT8 read_id(int idx);
// device-level overrides
virtual void device_start() override;
-
+
protected:
device_saturn_control_port_interface *m_device;
};
diff --git a/src/devices/bus/sat_ctrl/joy.cpp b/src/devices/bus/sat_ctrl/joy.cpp
index e8fbc90a1b1..ff2ebb0733e 100644
--- a/src/devices/bus/sat_ctrl/joy.cpp
+++ b/src/devices/bus/sat_ctrl/joy.cpp
@@ -108,4 +108,3 @@ UINT16 saturn_joy_device::read_direct()
{
return m_joy->read();
}
-
diff --git a/src/devices/bus/sat_ctrl/joy.h b/src/devices/bus/sat_ctrl/joy.h
index 786c50949a5..58ec4e544c6 100644
--- a/src/devices/bus/sat_ctrl/joy.h
+++ b/src/devices/bus/sat_ctrl/joy.h
@@ -35,7 +35,7 @@ protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
-
+
// device_saturn_control_port_interface overrides
virtual UINT16 read_direct() override;
virtual UINT8 read_ctrl(UINT8 offset) override;
diff --git a/src/devices/bus/sat_ctrl/joy_md.cpp b/src/devices/bus/sat_ctrl/joy_md.cpp
index 4f2fc0fdf91..d88753c591b 100644
--- a/src/devices/bus/sat_ctrl/joy_md.cpp
+++ b/src/devices/bus/sat_ctrl/joy_md.cpp
@@ -119,4 +119,3 @@ UINT8 saturn_joymd6b_device::read_ctrl(UINT8 offset)
}
return res;
}
-
diff --git a/src/devices/bus/sat_ctrl/joy_md.h b/src/devices/bus/sat_ctrl/joy_md.h
index 2f178a413de..8c2505aad5e 100644
--- a/src/devices/bus/sat_ctrl/joy_md.h
+++ b/src/devices/bus/sat_ctrl/joy_md.h
@@ -35,7 +35,7 @@ protected:
// device-level overrides
virtual void device_start() override {};
virtual void device_reset() override {};
-
+
// device_saturn_control_port_interface overrides
virtual UINT8 read_ctrl(UINT8 offset) override;
virtual UINT8 read_status() override { return 0xf1; }
@@ -54,20 +54,20 @@ class saturn_joymd6b_device : public device_t,
public:
// construction/destruction
saturn_joymd6b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
-
+
protected:
// device-level overrides
virtual void device_start() override {};
virtual void device_reset() override {};
-
+
// device_saturn_control_port_interface overrides
virtual UINT8 read_ctrl(UINT8 offset) override;
virtual UINT8 read_status() override { return 0xf1; }
virtual UINT8 read_id(int idx) override { return m_ctrl_id; }
-
+
private:
required_ioport m_joy;
};
diff --git a/src/devices/bus/sat_ctrl/keybd.cpp b/src/devices/bus/sat_ctrl/keybd.cpp
index 5c0f30f9948..54fa2d5722c 100644
--- a/src/devices/bus/sat_ctrl/keybd.cpp
+++ b/src/devices/bus/sat_ctrl/keybd.cpp
@@ -19,171 +19,171 @@ static INPUT_PORTS_START( saturn_joy )
// TODO: there's no info about the keycode used on Saturn keyboard, the following is trial & error with Game Basic software
PORT_START("KEY.0") // 0x00 - 0x07
PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_UNUSED)
- PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F1") /*PORT_CODE(KEYCODE_F1)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x01)
- PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("0-3") /*PORT_CODE(KEYCODE_2) PORT_CHAR('2')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x02)
+ PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F1") /*PORT_CODE(KEYCODE_F1)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x01)
+ PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("0-3") /*PORT_CODE(KEYCODE_2) PORT_CHAR('2')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x02)
PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F2") /*PORT_CODE(KEYCODE_F2)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x03) // RUN
PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F3") /*PORT_CODE(KEYCODE_F3)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x04) // LIST
PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F4") /*PORT_CODE(KEYCODE_F4)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x05) // EDIT
- PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F5") /*PORT_CODE(KEYCODE_F5)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x06)
- PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("CLR SCR") PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x07)
+ PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F5") /*PORT_CODE(KEYCODE_F5)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x06)
+ PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("CLR SCR") PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x07)
PORT_START("KEY.1") // 0x08 - 0x0f
- PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("1-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x08)
- PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F6") /*PORT_CODE(KEYCODE_F6)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x09)
- PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F7") /*PORT_CODE(KEYCODE_F7)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x0a)
- PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F8") /*PORT_CODE(KEYCODE_F8)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x0b)
+ PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("1-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x08)
+ PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F6") /*PORT_CODE(KEYCODE_F6)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x09)
+ PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F7") /*PORT_CODE(KEYCODE_F7)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x0a)
+ PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F8") /*PORT_CODE(KEYCODE_F8)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x0b)
PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F9") /*PORT_CODE(KEYCODE_F9)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x0c) // LIST again
- PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("1-6") /*PORT_CODE(KEYCODE_5) PORT_CHAR('5')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x0d)
- PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("1-7") /*PORT_CODE(KEYCODE_6) PORT_CHAR('6')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x0e)
- PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("1-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x0f)
+ PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("1-6") /*PORT_CODE(KEYCODE_5) PORT_CHAR('5')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x0d)
+ PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("1-7") /*PORT_CODE(KEYCODE_6) PORT_CHAR('6')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x0e)
+ PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("1-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x0f)
PORT_START("KEY.2") // 0x10 - 0x17
- PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("2-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x10)
- PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("2-2") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x11)
+ PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("2-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x10)
+ PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("2-2") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x11)
/* TODO: break codes! */
- PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("SHIFT") /*PORT_CODE(KEYCODE_2) PORT_CHAR('2')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x12)
- PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("KANA SHIFT") /*PORT_CODE(KEYCODE_3) PORT_CHAR('3')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x13)
- PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("(special keys)") /*PORT_CODE(KEYCODE_4) PORT_CHAR('4')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x14)
+ PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("SHIFT") /*PORT_CODE(KEYCODE_2) PORT_CHAR('2')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x12)
+ PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("KANA SHIFT") /*PORT_CODE(KEYCODE_3) PORT_CHAR('3')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x13)
+ PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("(special keys)") /*PORT_CODE(KEYCODE_4) PORT_CHAR('4')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x14)
- PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Q") PORT_CODE(KEYCODE_Q) PORT_CHAR('Q') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x15)
- PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("1") PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x16)
- PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("2-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x17)
+ PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Q") PORT_CODE(KEYCODE_Q) PORT_CHAR('Q') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x15)
+ PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("1") PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x16)
+ PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("2-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x17)
PORT_START("KEY.3") // 0x18 - 0x1f
- PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("3-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x18)
- PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("3-2") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x19)
- PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Z") PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x1a)
- PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("S") PORT_CODE(KEYCODE_S) PORT_CHAR('S') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x1b)
- PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("A") PORT_CODE(KEYCODE_A) PORT_CHAR('A') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x1c)
- PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("W") PORT_CODE(KEYCODE_W) PORT_CHAR('W') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x1d)
- PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("2") PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x1e)
- PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("3-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x1f)
+ PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("3-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x18)
+ PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("3-2") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x19)
+ PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Z") PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x1a)
+ PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("S") PORT_CODE(KEYCODE_S) PORT_CHAR('S') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x1b)
+ PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("A") PORT_CODE(KEYCODE_A) PORT_CHAR('A') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x1c)
+ PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("W") PORT_CODE(KEYCODE_W) PORT_CHAR('W') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x1d)
+ PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("2") PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x1e)
+ PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("3-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x1f)
PORT_START("KEY.4") // 0x20 - 0x27
- PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("4-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x20)
- PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C) PORT_CHAR('C') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x21)
- PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("X") PORT_CODE(KEYCODE_X) PORT_CHAR('X') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x22)
- PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D") PORT_CODE(KEYCODE_D) PORT_CHAR('D') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x23)
- PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E") PORT_CODE(KEYCODE_E) PORT_CHAR('E') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x24)
- PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("4") PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x25)
- PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("3") PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x26)
- PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("4-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x27)
+ PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("4-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x20)
+ PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C) PORT_CHAR('C') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x21)
+ PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("X") PORT_CODE(KEYCODE_X) PORT_CHAR('X') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x22)
+ PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D") PORT_CODE(KEYCODE_D) PORT_CHAR('D') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x23)
+ PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E") PORT_CODE(KEYCODE_E) PORT_CHAR('E') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x24)
+ PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("4") PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x25)
+ PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("3") PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x26)
+ PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("4-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x27)
PORT_START("KEY.5") // 0x28 - 0x2f
PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("5-1") /*PORT_CODE(KEYCODE_F) PORT_CHAR('F')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x28) // another F?
- PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("SPACE") PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x29)
- PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("V") PORT_CODE(KEYCODE_V) PORT_CHAR('V') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x2a)
- PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F") PORT_CODE(KEYCODE_F) PORT_CHAR('F') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x2b)
- PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("T") PORT_CODE(KEYCODE_T) PORT_CHAR('T') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x2c)
- PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("R") PORT_CODE(KEYCODE_R) PORT_CHAR('R') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x2d)
- PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("5") PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x2e)
- PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("5-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x2f)
+ PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("SPACE") PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x29)
+ PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("V") PORT_CODE(KEYCODE_V) PORT_CHAR('V') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x2a)
+ PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F") PORT_CODE(KEYCODE_F) PORT_CHAR('F') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x2b)
+ PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("T") PORT_CODE(KEYCODE_T) PORT_CHAR('T') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x2c)
+ PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("R") PORT_CODE(KEYCODE_R) PORT_CHAR('R') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x2d)
+ PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("5") PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x2e)
+ PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("5-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x2f)
PORT_START("KEY.6") // 0x30 - 0x37
- PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("6-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x30)
- PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("N") PORT_CODE(KEYCODE_N) PORT_CHAR('N') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x31)
- PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("B") PORT_CODE(KEYCODE_B) PORT_CHAR('B') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x32)
- PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("H") PORT_CODE(KEYCODE_H) PORT_CHAR('H') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x33)
- PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("G") PORT_CODE(KEYCODE_G) PORT_CHAR('G') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x34)
- PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Y") PORT_CODE(KEYCODE_Y) PORT_CHAR('Y') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x35)
- PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("6") PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x36)
- PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("6-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x37)
+ PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("6-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x30)
+ PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("N") PORT_CODE(KEYCODE_N) PORT_CHAR('N') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x31)
+ PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("B") PORT_CODE(KEYCODE_B) PORT_CHAR('B') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x32)
+ PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("H") PORT_CODE(KEYCODE_H) PORT_CHAR('H') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x33)
+ PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("G") PORT_CODE(KEYCODE_G) PORT_CHAR('G') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x34)
+ PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Y") PORT_CODE(KEYCODE_Y) PORT_CHAR('Y') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x35)
+ PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("6") PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x36)
+ PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("6-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x37)
PORT_START("KEY.7") // 0x38 - 0x3f
- PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("7-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x38)
- PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("7-2") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x39)
- PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("M") PORT_CODE(KEYCODE_M) PORT_CHAR('M') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x3a)
- PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("J") PORT_CODE(KEYCODE_J) PORT_CHAR('J') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x3b)
- PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("U") PORT_CODE(KEYCODE_U) PORT_CHAR('U') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x3c)
- PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("7") PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x3d)
- PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("8") PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x3e)
- PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("7-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x3f)
+ PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("7-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x38)
+ PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("7-2") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x39)
+ PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("M") PORT_CODE(KEYCODE_M) PORT_CHAR('M') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x3a)
+ PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("J") PORT_CODE(KEYCODE_J) PORT_CHAR('J') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x3b)
+ PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("U") PORT_CODE(KEYCODE_U) PORT_CHAR('U') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x3c)
+ PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("7") PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x3d)
+ PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("8") PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x3e)
+ PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("7-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x3f)
PORT_START("KEY.8") // 0x40 - 0x47
- PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("8-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x40)
- PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME(",") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x41)
- PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("K") PORT_CODE(KEYCODE_K) PORT_CHAR('K') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x42)
- PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("I") PORT_CODE(KEYCODE_I) PORT_CHAR('I') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x43)
- PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("O") PORT_CODE(KEYCODE_O) PORT_CHAR('O') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x44)
- PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("0") PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x45)
- PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("9") PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x46)
- PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("8-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x47)
+ PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("8-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x40)
+ PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME(",") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x41)
+ PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("K") PORT_CODE(KEYCODE_K) PORT_CHAR('K') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x42)
+ PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("I") PORT_CODE(KEYCODE_I) PORT_CHAR('I') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x43)
+ PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("O") PORT_CODE(KEYCODE_O) PORT_CHAR('O') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x44)
+ PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("0") PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x45)
+ PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("9") PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x46)
+ PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("8-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x47)
PORT_START("KEY.9") // 0x48 - 0x4f
- PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("9-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x48)
- PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME(".") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x49)
- PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("/") /*PORT_CODE(KEYCODE_2) PORT_CHAR('2')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x4a)
- PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("L") PORT_CODE(KEYCODE_L) PORT_CHAR('L') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x4b)
- PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME(";") /*PORT_CODE(KEYCODE_4) PORT_CHAR('4')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x4c)
- PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("P") PORT_CODE(KEYCODE_P) PORT_CHAR('P') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x4d)
- PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("- / =") PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x4e)
- PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("9-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x4f)
+ PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("9-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x48)
+ PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME(".") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x49)
+ PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("/") /*PORT_CODE(KEYCODE_2) PORT_CHAR('2')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x4a)
+ PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("L") PORT_CODE(KEYCODE_L) PORT_CHAR('L') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x4b)
+ PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME(";") /*PORT_CODE(KEYCODE_4) PORT_CHAR('4')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x4c)
+ PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("P") PORT_CODE(KEYCODE_P) PORT_CHAR('P') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x4d)
+ PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("- / =") PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x4e)
+ PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("9-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x4f)
PORT_START("KEY.10") // 0x50 - 0x57
- PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("A-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x50)
- PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("\xC2\xA5") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x51)
- PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME(":") /*PORT_CODE(KEYCODE_2) PORT_CHAR('2')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x52)
- PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("A-4") /*PORT_CODE(KEYCODE_3) PORT_CHAR('3')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x53)
- PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("@") /*PORT_CODE(KEYCODE_4) PORT_CHAR('4')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x54)
- PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("^") /*PORT_CODE(KEYCODE_5) PORT_CHAR(0xd)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x55)
- PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("A-7") /*PORT_CODE(KEYCODE_6) PORT_CHAR('6')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x56)
- PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("A-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x57)
+ PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("A-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x50)
+ PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("\xC2\xA5") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x51)
+ PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME(":") /*PORT_CODE(KEYCODE_2) PORT_CHAR('2')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x52)
+ PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("A-4") /*PORT_CODE(KEYCODE_3) PORT_CHAR('3')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x53)
+ PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("@") /*PORT_CODE(KEYCODE_4) PORT_CHAR('4')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x54)
+ PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("^") /*PORT_CODE(KEYCODE_5) PORT_CHAR(0xd)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x55)
+ PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("A-7") /*PORT_CODE(KEYCODE_6) PORT_CHAR('6')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x56)
+ PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("A-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x57)
PORT_START("KEY.11") // 0x58 - 0x5f
- PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("B-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x58)
- PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("B-2") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x59)
- PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("ENTER") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(0x0d) PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x5a)
+ PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("B-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x58)
+ PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("B-2") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x59)
+ PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("ENTER") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(0x0d) PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x5a)
PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("[") /*PORT_CODE(KEYCODE_3) PORT_CHAR('3')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x5b) // {
- PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("B-5") /*PORT_CODE(KEYCODE_4) PORT_CHAR('4')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x5c)
+ PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("B-5") /*PORT_CODE(KEYCODE_4) PORT_CHAR('4')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x5c)
PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("]") /*PORT_CODE(KEYCODE_5) PORT_CHAR(0xd)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x5d) // }
- PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("B-7") /*PORT_CODE(KEYCODE_6) PORT_CHAR('6')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x5e)
- PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("B-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x5f)
+ PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("B-7") /*PORT_CODE(KEYCODE_6) PORT_CHAR('6')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x5e)
+ PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("B-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x5f)
PORT_START("KEY.12") // 0x60 - 0x67
- PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("C-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x60)
- PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("C-2") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x61)
- PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("C-3") /*PORT_CODE(KEYCODE_2) PORT_CHAR('2')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x62)
- PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("C-4") /*PORT_CODE(KEYCODE_3) PORT_CHAR('3')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x63)
- PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("C-5") /*PORT_CODE(KEYCODE_4) PORT_CHAR('4')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x64)
- PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("C-6") /*PORT_CODE(KEYCODE_5) PORT_CHAR(0xd)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x65)
- PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("BACKSPACE") PORT_CODE(KEYCODE_BACKSPACE) /* PORT_CHAR('6')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x66)
- PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("C-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x67)
+ PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("C-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x60)
+ PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("C-2") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x61)
+ PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("C-3") /*PORT_CODE(KEYCODE_2) PORT_CHAR('2')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x62)
+ PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("C-4") /*PORT_CODE(KEYCODE_3) PORT_CHAR('3')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x63)
+ PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("C-5") /*PORT_CODE(KEYCODE_4) PORT_CHAR('4')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x64)
+ PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("C-6") /*PORT_CODE(KEYCODE_5) PORT_CHAR(0xd)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x65)
+ PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("BACKSPACE") PORT_CODE(KEYCODE_BACKSPACE) /* PORT_CHAR('6')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x66)
+ PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("C-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x67)
PORT_START("KEY.13") // 0x68 - 0x6f
- PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x68)
- PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D-2") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x69)
- PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D-3") /*PORT_CODE(KEYCODE_2) PORT_CHAR('2')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x6a)
- PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D-4") /*PORT_CODE(KEYCODE_3) PORT_CHAR('3')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x6b)
- PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D-5") /*PORT_CODE(KEYCODE_4) PORT_CHAR('4')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x6c)
- PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D-6") /*PORT_CODE(KEYCODE_5) PORT_CHAR(0xd)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x6d)
- PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D-7") /*PORT_CODE(KEYCODE_6) PORT_CHAR('6')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x6e)
- PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x6f)
+ PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x68)
+ PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D-2") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x69)
+ PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D-3") /*PORT_CODE(KEYCODE_2) PORT_CHAR('2')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x6a)
+ PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D-4") /*PORT_CODE(KEYCODE_3) PORT_CHAR('3')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x6b)
+ PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D-5") /*PORT_CODE(KEYCODE_4) PORT_CHAR('4')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x6c)
+ PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D-6") /*PORT_CODE(KEYCODE_5) PORT_CHAR(0xd)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x6d)
+ PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D-7") /*PORT_CODE(KEYCODE_6) PORT_CHAR('6')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x6e)
+ PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x6f)
PORT_START("KEY.14") // 0x70 - 0x77
- PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x70)
- PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E-2") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x71)
- PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E-3") /*PORT_CODE(KEYCODE_2) PORT_CHAR('2')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x72)
- PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E-4") /*PORT_CODE(KEYCODE_3) PORT_CHAR('3')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x73)
- PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E-5") /*PORT_CODE(KEYCODE_4) PORT_CHAR('4')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x74)
- PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E-6") /*PORT_CODE(KEYCODE_5) PORT_CHAR(0xd)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x75)
- PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E-7") /*PORT_CODE(KEYCODE_6) PORT_CHAR('6')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x76)
- PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x77)
+ PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x70)
+ PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E-2") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x71)
+ PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E-3") /*PORT_CODE(KEYCODE_2) PORT_CHAR('2')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x72)
+ PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E-4") /*PORT_CODE(KEYCODE_3) PORT_CHAR('3')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x73)
+ PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E-5") /*PORT_CODE(KEYCODE_4) PORT_CHAR('4')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x74)
+ PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E-6") /*PORT_CODE(KEYCODE_5) PORT_CHAR(0xd)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x75)
+ PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E-7") /*PORT_CODE(KEYCODE_6) PORT_CHAR('6')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x76)
+ PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E-8") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x77)
PORT_START("KEY.15") // 0x78 - 0x7f
- PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x78)
- PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F-2") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x79)
- PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F-3") /*PORT_CODE(KEYCODE_2) PORT_CHAR('2')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x7a)
- PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F-4") /*PORT_CODE(KEYCODE_3) PORT_CHAR('3')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x7b)
- PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F-5") /*PORT_CODE(KEYCODE_4) PORT_CHAR('4')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x7c)
- PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F-6") /*PORT_CODE(KEYCODE_5) PORT_CHAR(0xd)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x7d)
- PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F-7") /*PORT_CODE(KEYCODE_6) PORT_CHAR('6')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x7e)
+ PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F-1") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x78)
+ PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F-2") /*PORT_CODE(KEYCODE_1) PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x79)
+ PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F-3") /*PORT_CODE(KEYCODE_2) PORT_CHAR('2')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x7a)
+ PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F-4") /*PORT_CODE(KEYCODE_3) PORT_CHAR('3')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x7b)
+ PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F-5") /*PORT_CODE(KEYCODE_4) PORT_CHAR('4')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x7c)
+ PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F-6") /*PORT_CODE(KEYCODE_5) PORT_CHAR(0xd)*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x7d)
+ PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F-7") /*PORT_CODE(KEYCODE_6) PORT_CHAR('6')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x7e)
PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("ESC") /*PORT_CODE(KEYCODE_7) PORT_CHAR('7')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x7f) //SYSTEM CONFIGURATION
PORT_START("KEYS_1") // special keys
- PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("UP") PORT_CODE(KEYCODE_UP) /*PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x78)
- PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("DOWN") PORT_CODE(KEYCODE_DOWN) /*PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x79)
- PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("LEFT") PORT_CODE(KEYCODE_LEFT) /*PORT_CHAR('2')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x7a)
- PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("RIGHT") PORT_CODE(KEYCODE_RIGHT) /*PORT_CHAR('3')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x7b)
+ PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("UP") PORT_CODE(KEYCODE_UP) /*PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x78)
+ PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("DOWN") PORT_CODE(KEYCODE_DOWN) /*PORT_CHAR('1')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x79)
+ PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("LEFT") PORT_CODE(KEYCODE_LEFT) /*PORT_CHAR('2')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x7a)
+ PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("RIGHT") PORT_CODE(KEYCODE_RIGHT) /*PORT_CHAR('3')*/ PORT_CHANGED_MEMBER(DEVICE_SELF, saturn_keybd_device, key_stroke, 0x7b)
INPUT_PORTS_END
@@ -253,7 +253,7 @@ INPUT_CHANGED_MEMBER(saturn_keybd_device::key_stroke)
m_data = ((UINT8)(FPTR)(param) & 0xff);
m_status |= 8;
}
-
+
if(oldval && !newval)
{
//m_status &= ~8;
@@ -264,7 +264,7 @@ INPUT_CHANGED_MEMBER(saturn_keybd_device::key_stroke)
UINT16 saturn_keybd_device::get_game_key()
{
UINT16 game_key = 0xffff;
-
+
game_key ^= ((m_key_s1->read() & 0x80) << 8); // right
game_key ^= ((m_key_s1->read() & 0x40) << 8); // left
game_key ^= ((m_key_s1->read() & 0x20) << 8); // down
@@ -329,4 +329,3 @@ UINT8 saturn_keybd_device::read_ctrl(UINT8 offset)
}
return res;
}
-
diff --git a/src/devices/bus/sat_ctrl/keybd.h b/src/devices/bus/sat_ctrl/keybd.h
index f2cb5d14ba2..314e87bf118 100644
--- a/src/devices/bus/sat_ctrl/keybd.h
+++ b/src/devices/bus/sat_ctrl/keybd.h
@@ -30,14 +30,14 @@ public:
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
-
+
DECLARE_INPUT_CHANGED_MEMBER(key_stroke);
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
-
+
// device_saturn_control_port_interface overrides
virtual UINT8 read_ctrl(UINT8 offset) override;
virtual UINT8 read_status() override { return 0xf1; }
@@ -48,9 +48,9 @@ private:
UINT8 m_data;
UINT8 m_prev_data;
UINT16 m_repeat_count;
-
+
UINT16 get_game_key();
-
+
required_ioport_array<16> m_key;
required_ioport m_key_s1;
};
diff --git a/src/devices/bus/sat_ctrl/mouse.cpp b/src/devices/bus/sat_ctrl/mouse.cpp
index a0ef74824b9..45ac96ea6d2 100644
--- a/src/devices/bus/sat_ctrl/mouse.cpp
+++ b/src/devices/bus/sat_ctrl/mouse.cpp
@@ -3,8 +3,8 @@
/**********************************************************************
Sega Saturn Mouse emulation
-
- This is basically the same as a pointing controller, but it uses a different ID
+
+ This is basically the same as a pointing controller, but it uses a different ID
**********************************************************************/
@@ -89,16 +89,16 @@ UINT8 saturn_mouse_device::read_ctrl(UINT8 offset)
UINT8 mouse_ctrl = m_buttons->read();
INT16 mouse_x = m_pointx->read();
INT16 mouse_y = m_pointy->read();
-
+
if (mouse_x < 0)
mouse_ctrl |= 0x10;
-
+
if (mouse_y < 0)
mouse_ctrl |= 0x20;
-
+
if ((mouse_x & 0xff00) != 0xff00 && (mouse_x & 0xff00) != 0x0000)
mouse_ctrl |= 0x40;
-
+
if ((mouse_y & 0xff00) != 0xff00 && (mouse_y & 0xff00) != 0x0000)
mouse_ctrl |= 0x80;
@@ -117,4 +117,3 @@ UINT8 saturn_mouse_device::read_ctrl(UINT8 offset)
}
return res;
}
-
diff --git a/src/devices/bus/sat_ctrl/mouse.h b/src/devices/bus/sat_ctrl/mouse.h
index f0ea613f8e3..87e1d847e8c 100644
--- a/src/devices/bus/sat_ctrl/mouse.h
+++ b/src/devices/bus/sat_ctrl/mouse.h
@@ -35,7 +35,7 @@ protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
-
+
// device_saturn_control_port_interface overrides
virtual UINT8 read_ctrl(UINT8 offset) override;
virtual UINT8 read_status() override { return 0xf1; }
diff --git a/src/devices/bus/sat_ctrl/multitap.h b/src/devices/bus/sat_ctrl/multitap.h
index 2d48ff478c8..acc8f109e3e 100644
--- a/src/devices/bus/sat_ctrl/multitap.h
+++ b/src/devices/bus/sat_ctrl/multitap.h
@@ -29,15 +29,15 @@ class saturn_multitap_device : public device_t,
public:
// construction/destruction
saturn_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
-
+
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
-
+
// device_saturn_control_port_interface overrides
virtual UINT8 read_ctrl(UINT8 offset) override;
virtual UINT8 read_status() override { return 0x16; }
diff --git a/src/devices/bus/sat_ctrl/pointer.cpp b/src/devices/bus/sat_ctrl/pointer.cpp
index cfc2bbfc3b2..9762286dbbe 100644
--- a/src/devices/bus/sat_ctrl/pointer.cpp
+++ b/src/devices/bus/sat_ctrl/pointer.cpp
@@ -3,8 +3,8 @@
/**********************************************************************
Sega Saturn Pointing Controller / Trackball emulation
-
- This is basically the same as a mouse, but it uses a different ID
+
+ This is basically the same as a mouse, but it uses a different ID
**********************************************************************/
@@ -89,16 +89,16 @@ UINT8 saturn_track_device::read_ctrl(UINT8 offset)
UINT8 mouse_ctrl = m_buttons->read();
INT16 mouse_x = m_pointx->read();
INT16 mouse_y = m_pointy->read();
-
+
if (mouse_x < 0)
mouse_ctrl |= 0x10;
-
+
if (mouse_y < 0)
mouse_ctrl |= 0x20;
-
+
if ((mouse_x & 0xff00) != 0xff00 && (mouse_x & 0xff00) != 0x0000)
mouse_ctrl |= 0x40;
-
+
if ((mouse_y & 0xff00) != 0xff00 && (mouse_y & 0xff00) != 0x0000)
mouse_ctrl |= 0x80;
@@ -117,4 +117,3 @@ UINT8 saturn_track_device::read_ctrl(UINT8 offset)
}
return res;
}
-
diff --git a/src/devices/bus/sat_ctrl/pointer.h b/src/devices/bus/sat_ctrl/pointer.h
index e71cc9c898c..9b9a8986a3f 100644
--- a/src/devices/bus/sat_ctrl/pointer.h
+++ b/src/devices/bus/sat_ctrl/pointer.h
@@ -35,7 +35,7 @@ protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
-
+
// device_saturn_control_port_interface overrides
virtual UINT8 read_ctrl(UINT8 offset) override;
virtual UINT8 read_status() override { return 0xf1; }
diff --git a/src/devices/bus/sat_ctrl/racing.cpp b/src/devices/bus/sat_ctrl/racing.cpp
index 9e7a3e89f2f..0f86c6d3d23 100644
--- a/src/devices/bus/sat_ctrl/racing.cpp
+++ b/src/devices/bus/sat_ctrl/racing.cpp
@@ -106,4 +106,3 @@ UINT8 saturn_wheel_device::read_ctrl(UINT8 offset)
}
return res;
}
-
diff --git a/src/devices/bus/sat_ctrl/racing.h b/src/devices/bus/sat_ctrl/racing.h
index cc1e8019b1d..3edb9658d34 100644
--- a/src/devices/bus/sat_ctrl/racing.h
+++ b/src/devices/bus/sat_ctrl/racing.h
@@ -35,7 +35,7 @@ protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
-
+
// device_saturn_control_port_interface overrides
virtual UINT8 read_ctrl(UINT8 offset) override;
virtual UINT8 read_status() override { return 0xf1; }
diff --git a/src/devices/bus/sat_ctrl/segatap.h b/src/devices/bus/sat_ctrl/segatap.h
index 443175ebc33..149fb05f551 100644
--- a/src/devices/bus/sat_ctrl/segatap.h
+++ b/src/devices/bus/sat_ctrl/segatap.h
@@ -29,15 +29,15 @@ class saturn_segatap_device : public device_t,
public:
// construction/destruction
saturn_segatap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
-
+
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
-
+
// device_saturn_control_port_interface overrides
virtual UINT8 read_ctrl(UINT8 offset) override;
virtual UINT8 read_status() override { return 0x04; }
diff --git a/src/devices/cpu/drcbex64.cpp b/src/devices/cpu/drcbex64.cpp
index a8fea0ed27e..8d7e852b66c 100644
--- a/src/devices/cpu/drcbex64.cpp
+++ b/src/devices/cpu/drcbex64.cpp
@@ -6756,21 +6756,20 @@ void drcbe_x64::op_fcopyi(x86code *&dst, const instruction &inst)
{
if (dstp.is_memory())
{
- emit_mov_p32_r32(dst, dstp, srcp.ireg()); // mov dstp,srcp
+ emit_mov_p32_r32(dst, dstp, srcp.ireg()); // mov dstp,srcp
}
else
{
- emit_movd_r128_r32(dst, dstreg, srcp.ireg()); // movd dstreg,srcp
- emit_movss_p32_r128(dst, dstp, dstreg); // movss dstp,dstreg
+ emit_movd_r128_r32(dst, dstreg, srcp.ireg()); // movd dstreg,srcp
+ emit_movss_p32_r128(dst, dstp, dstreg); // movss dstp,dstreg
}
}
-
+
}
// 64-bit form
else if (inst.size() == 8)
{
-
if (srcp.is_memory())
{
emit_movq_r128_m64(dst, dstreg, MABS(srcp.memory())); // movq dstreg,[srcp]
@@ -6780,12 +6779,12 @@ void drcbe_x64::op_fcopyi(x86code *&dst, const instruction &inst)
{
if (dstp.is_memory())
{
- emit_mov_p64_r64(dst, dstp, srcp.ireg()); // mov dstp,srcp
+ emit_mov_p64_r64(dst, dstp, srcp.ireg()); // mov dstp,srcp
}
else
{
- emit_movq_r128_r64(dst, dstreg, srcp.ireg()); // movq dstreg,srcp
- emit_movsd_p64_r128(dst, dstp, dstreg); // movsd dstp,dstreg
+ emit_movq_r128_r64(dst, dstreg, srcp.ireg()); // movq dstreg,srcp
+ emit_movsd_p64_r128(dst, dstp, dstreg); // movsd dstp,dstreg
}
}
@@ -6821,13 +6820,13 @@ void drcbe_x64::op_icopyf(x86code *&dst, const instruction &inst)
{
if (dstp.is_memory())
{
- emit_movd_m32_r128(dst, MABS(dstp.memory()), srcp.freg()); // movd dstp,srcp
+ emit_movd_m32_r128(dst, MABS(dstp.memory()), srcp.freg()); // movd dstp,srcp
}
else
{
- emit_movd_r32_r128(dst, dstp.ireg(), srcp.freg()); // movd dstp,srcp
+ emit_movd_r32_r128(dst, dstp.ireg(), srcp.freg()); // movd dstp,srcp
}
- }
+ }
}
// 64-bit form
@@ -6843,12 +6842,12 @@ void drcbe_x64::op_icopyf(x86code *&dst, const instruction &inst)
{
if (dstp.is_memory())
{
- emit_movq_m64_r128(dst, MABS(dstp.memory()), srcp.freg()); // movq dstp,srcp
+ emit_movq_m64_r128(dst, MABS(dstp.memory()), srcp.freg()); // movq dstp,srcp
}
else
{
- emit_movq_r64_r128(dst, dstp.ireg(), srcp.freg()); // movq dstp,srcp
+ emit_movq_r64_r128(dst, dstp.ireg(), srcp.freg()); // movq dstp,srcp
}
}
}
-} \ No newline at end of file
+}
diff --git a/src/devices/cpu/drcbex86.cpp b/src/devices/cpu/drcbex86.cpp
index 4ff6a90774b..478e9f08bc0 100644
--- a/src/devices/cpu/drcbex86.cpp
+++ b/src/devices/cpu/drcbex86.cpp
@@ -272,8 +272,8 @@ const drcbe_x86::opcode_table_entry drcbe_x86::s_opcode_table_source[] =
{ uml::OP_FSQRT, &drcbe_x86::op_fsqrt }, // FSQRT dst,src1
{ uml::OP_FRECIP, &drcbe_x86::op_frecip }, // FRECIP dst,src1
{ uml::OP_FRSQRT, &drcbe_x86::op_frsqrt }, // FRSQRT dst,src1
- { uml::OP_FCOPYI, &drcbe_x86::op_fcopyi }, // FCOPYI dst,src
- { uml::OP_ICOPYF, &drcbe_x86::op_icopyf }, // ICOPYF dst,src
+ { uml::OP_FCOPYI, &drcbe_x86::op_fcopyi }, // FCOPYI dst,src
+ { uml::OP_ICOPYF, &drcbe_x86::op_icopyf }, // ICOPYF dst,src
};
@@ -6471,12 +6471,12 @@ void drcbe_x86::op_fcopyi(x86code *&dst, const instruction &inst)
{
if (srcp.is_memory())
{
- emit_mov_r32_m32(dst, REG_EAX, MABS(srcp.memory())); // mov eax,[srcp]
- emit_mov_m32_r32(dst, MABS(dstp.memory()), REG_EAX); // mov [dstp],eax
+ emit_mov_r32_m32(dst, REG_EAX, MABS(srcp.memory())); // mov eax,[srcp]
+ emit_mov_m32_r32(dst, MABS(dstp.memory()), REG_EAX); // mov [dstp],eax
}
else if (srcp.is_int_register())
{
- emit_mov_m32_r32(dst, MABS(dstp.memory()), srcp.ireg()); // mov [dstp],srcp
+ emit_mov_m32_r32(dst, MABS(dstp.memory()), srcp.ireg()); // mov [dstp],srcp
}
}
@@ -6485,17 +6485,17 @@ void drcbe_x86::op_fcopyi(x86code *&dst, const instruction &inst)
{
if (srcp.is_memory())
{
- emit_mov_r32_m32(dst, REG_EAX, MABS(srcp.memory())); // mov eax,[srcp]
- emit_mov_r32_m32(dst, REG_EDX, MABS(srcp.memory(4))); // mov edx,[srcp+4]
+ emit_mov_r32_m32(dst, REG_EAX, MABS(srcp.memory())); // mov eax,[srcp]
+ emit_mov_r32_m32(dst, REG_EDX, MABS(srcp.memory(4))); // mov edx,[srcp+4]
}
else if (srcp.is_int_register())
{
- emit_mov_r32_m32(dst, REG_EDX, MABS(m_reghi[srcp.ireg()])); // mov edx,[reghi[srcp]]
- emit_mov_r32_r32(dst, REG_EAX, srcp.ireg()); // mov eax,srcp
+ emit_mov_r32_m32(dst, REG_EDX, MABS(m_reghi[srcp.ireg()])); // mov edx,[reghi[srcp]]
+ emit_mov_r32_r32(dst, REG_EAX, srcp.ireg()); // mov eax,srcp
}
- emit_mov_m32_r32(dst, MABS(dstp.memory()), REG_EAX); // mov [dstp],eax
- emit_mov_m32_r32(dst, MABS(dstp.memory(4)), REG_EDX); // mov [dstp+4],edx
+ emit_mov_m32_r32(dst, MABS(dstp.memory()), REG_EAX); // mov [dstp],eax
+ emit_mov_m32_r32(dst, MABS(dstp.memory(4)), REG_EDX); // mov [dstp+4],edx
}
}
@@ -6518,33 +6518,33 @@ void drcbe_x86::op_icopyf(x86code *&dst, const instruction &inst)
// 32-bit case
if (inst.size() == 4)
{
- emit_mov_r32_m32(dst, REG_EAX, MABS(srcp.memory())); // mov eax,[srcp]
+ emit_mov_r32_m32(dst, REG_EAX, MABS(srcp.memory())); // mov eax,[srcp]
if (dstp.is_memory())
{
- emit_mov_m32_r32(dst, MABS(dstp.memory()), REG_EAX); // mov [dstp],eax
+ emit_mov_m32_r32(dst, MABS(dstp.memory()), REG_EAX); // mov [dstp],eax
}
else if (dstp.is_int_register())
{
- emit_mov_r32_r32(dst, dstp.ireg(), REG_EAX); // mov dstp,eax
+ emit_mov_r32_r32(dst, dstp.ireg(), REG_EAX); // mov dstp,eax
}
}
// 64-bit case
else if (inst.size() == 8)
{
- emit_mov_r32_m32(dst, REG_EAX, MABS(srcp.memory())); // mov eax,[srcp]
- emit_mov_r32_m32(dst, REG_EDX, MABS(srcp.memory(4))); // mov edx,[srcp+4]
+ emit_mov_r32_m32(dst, REG_EAX, MABS(srcp.memory())); // mov eax,[srcp]
+ emit_mov_r32_m32(dst, REG_EDX, MABS(srcp.memory(4))); // mov edx,[srcp+4]
if (dstp.is_memory())
{
- emit_mov_m32_r32(dst, MABS(dstp.memory()), REG_EAX); // mov [dstp],eax
- emit_mov_m32_r32(dst, MABS(dstp.memory(4)), REG_EDX); // mov [dstp+4],edx
+ emit_mov_m32_r32(dst, MABS(dstp.memory()), REG_EAX); // mov [dstp],eax
+ emit_mov_m32_r32(dst, MABS(dstp.memory(4)), REG_EDX); // mov [dstp+4],edx
}
else
{
- emit_mov_m32_r32(dst, MABS(m_reghi[dstp.ireg()]), REG_EDX); // mov [reghi[dstp]],edx
- emit_mov_r32_r32(dst, dstp.ireg(), REG_EAX); // mov dstp,eax
+ emit_mov_m32_r32(dst, MABS(m_reghi[dstp.ireg()]), REG_EDX); // mov [reghi[dstp]],edx
+ emit_mov_r32_r32(dst, dstp.ireg(), REG_EAX); // mov dstp,eax
}
}
}
diff --git a/src/devices/cpu/hphybrid/hphybrid.cpp b/src/devices/cpu/hphybrid/hphybrid.cpp
index da9470a91ae..62b406c1d28 100644
--- a/src/devices/cpu/hphybrid/hphybrid.cpp
+++ b/src/devices/cpu/hphybrid/hphybrid.cpp
@@ -534,7 +534,7 @@ UINT16 hp_hybrid_cpu_device::execute_one_sub(UINT16 opcode)
memmove(&m_reg_PA[ 0 ] , &m_reg_PA[ 1 ] , HPHYBRID_INT_LVLS);
m_pa_changed_func((UINT8)CURRENT_PA);
}
- BIT_CLR(m_flags, HPHYBRID_IM_BIT);
+ BIT_CLR(m_flags, HPHYBRID_IM_BIT);
}
tmp = RM(AEC_CASE_C , m_reg_R--) + (opcode & 0x1f);
return BIT(opcode , 5) ? tmp - 0x20 : tmp;
@@ -903,17 +903,17 @@ UINT16 hp_hybrid_cpu_device::get_skip_addr_sc(UINT16 opcode , UINT16& v , unsign
UINT16 hp_hybrid_cpu_device::get_skip_addr_sc(UINT16 opcode , UINT32& 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)
@@ -1007,7 +1007,7 @@ void hp_hybrid_cpu_device::do_pw(UINT16 opcode)
void hp_hybrid_cpu_device::check_for_interrupts(void)
{
- if (!BIT(m_flags , HPHYBRID_INTEN_BIT) || BIT(m_flags , HPHYBRID_IRH_SVC_BIT) || BIT(m_flags , HPHYBRID_IM_BIT)) {
+ if (!BIT(m_flags , HPHYBRID_INTEN_BIT) || BIT(m_flags , HPHYBRID_IRH_SVC_BIT) || BIT(m_flags , HPHYBRID_IM_BIT)) {
return;
}
@@ -1017,9 +1017,9 @@ void hp_hybrid_cpu_device::check_for_interrupts(void)
// Service high-level interrupt
BIT_SET(m_flags , HPHYBRID_IRH_SVC_BIT);
irqline = HPHYBRID_IRH;
- if (BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) {
- logerror("H pre-empted L @ %06x\n" , m_genpc);
- }
+ if (BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) {
+ logerror("H pre-empted L @ %06x\n" , m_genpc);
+ }
} 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);
@@ -1055,8 +1055,8 @@ void hp_hybrid_cpu_device::check_for_interrupts(void)
// lasts for 32 cycles
m_icount -= 32;
- // Allow special processing in 5061-3001
- enter_isr();
+ // Allow special processing in 5061-3001
+ enter_isr();
// Do a double-indirect JSM IV,I instruction
WM(AEC_CASE_C , ++m_reg_R , m_reg_P);
@@ -1066,7 +1066,7 @@ void hp_hybrid_cpu_device::check_for_interrupts(void)
void hp_hybrid_cpu_device::enter_isr(void)
{
- // Do nothing special
+ // Do nothing special
}
void hp_hybrid_cpu_device::handle_dma(void)
@@ -1477,33 +1477,33 @@ UINT16 hp_5061_3001_cpu_device::execute_no_bpc_ioc(UINT16 opcode)
do_mpy();
break;
- case 0x7026:
- // CIM
- // Undocumented instruction, see beginning of this file
- // Probably "Clear Interrupt Mask"
- // No idea at all about exec. time: make it 9 cycles
- m_icount -= 9;
+ case 0x7026:
+ // CIM
+ // Undocumented instruction, see beginning of this file
+ // Probably "Clear Interrupt Mask"
+ // No idea at all about exec. time: make it 9 cycles
+ m_icount -= 9;
#ifndef NO_ISR_WITH_IM_CLEARED
- BIT_CLR(m_flags, HPHYBRID_IM_BIT);
+ BIT_CLR(m_flags, HPHYBRID_IM_BIT);
#else
- BIT_SET(m_flags, HPHYBRID_IM_BIT);
+ BIT_SET(m_flags, HPHYBRID_IM_BIT);
#endif
- logerror("hp-5061-3001: CIM, P = %06x flags = %05x\n" , m_genpc , m_flags);
- break;
-
- case 0x7027:
- // SIM
- // Undocumented instruction, see beginning of this file
- // Probably "Set Interrupt Mask"
- // No idea at all about exec. time: make it 9 cycles
- m_icount -= 9;
+ logerror("hp-5061-3001: CIM, P = %06x flags = %05x\n" , m_genpc , m_flags);
+ break;
+
+ case 0x7027:
+ // SIM
+ // Undocumented instruction, see beginning of this file
+ // Probably "Set Interrupt Mask"
+ // No idea at all about exec. time: make it 9 cycles
+ m_icount -= 9;
#ifndef NO_ISR_WITH_IM_CLEARED
- BIT_SET(m_flags, HPHYBRID_IM_BIT);
+ BIT_SET(m_flags, HPHYBRID_IM_BIT);
#else
- BIT_CLR(m_flags, HPHYBRID_IM_BIT);
+ BIT_CLR(m_flags, HPHYBRID_IM_BIT);
#endif
- logerror("hp-5061-3001: SIM, P = %06x flags = %05x\n" , m_genpc , m_flags);
- break;
+ logerror("hp-5061-3001: SIM, P = %06x flags = %05x\n" , m_genpc , m_flags);
+ break;
default:
if ((opcode & 0xfec0) == 0x74c0) {
@@ -1655,9 +1655,9 @@ void hp_5061_3001_cpu_device::write_non_common_reg(UINT16 addr , UINT16 v)
void hp_5061_3001_cpu_device::enter_isr(void)
{
- // Set interrupt mask when entering an ISR
+ // Set interrupt mask when entering an ISR
#ifndef NO_ISR_WITH_IM_CLEARED
- BIT_SET(m_flags, HPHYBRID_IM_BIT);
+ BIT_SET(m_flags, HPHYBRID_IM_BIT);
#endif
}
diff --git a/src/devices/cpu/hphybrid/hphybrid.h b/src/devices/cpu/hphybrid/hphybrid.h
index d61785cb146..e0cfbc893d4 100644
--- a/src/devices/cpu/hphybrid/hphybrid.h
+++ b/src/devices/cpu/hphybrid/hphybrid.h
@@ -182,7 +182,7 @@ private:
UINT16 get_skip_addr_sc(UINT16 opcode , UINT32& v , unsigned n);
void do_pw(UINT16 opcode);
void check_for_interrupts(void);
- virtual void enter_isr(void);
+ virtual void enter_isr(void);
void handle_dma(void);
UINT16 RIO(UINT8 pa , UINT8 ic);
@@ -228,7 +228,7 @@ private:
UINT16 m_reg_r27; // R27 register
UINT16 m_reg_aec[ HP_REG_R37_ADDR - HP_REG_R32_ADDR + 1 ]; // AEC registers R32-R37
- virtual void enter_isr(void) override;
+ virtual void enter_isr(void) override;
};
class hp_5061_3011_cpu_device : public hp_hybrid_cpu_device
diff --git a/src/devices/cpu/hphybrid/hphybrid_dasm.cpp b/src/devices/cpu/hphybrid/hphybrid_dasm.cpp
index 78b586f2310..869cbb0f32b 100644
--- a/src/devices/cpu/hphybrid/hphybrid_dasm.cpp
+++ b/src/devices/cpu/hphybrid/hphybrid_dasm.cpp
@@ -355,9 +355,9 @@ static const dis_entry_t dis_table_emc[] = {
{0xffff , 0x7b40 , "MRY" , param_none , 0 },
{0xffff , 0x7b61 , "MLY" , param_none , 0 },
{0xffff , 0x7b8f , "MPY" , param_none , 0 },
- // *** Undocumented instructions of 5061-3001 ***
- {0xffff , 0x7026 , "CIM" , param_none , 0 },
- {0xffff , 0x7027 , "SIM" , param_none , 0 },
+ // *** Undocumented instructions of 5061-3001 ***
+ {0xffff , 0x7026 , "CIM" , param_none , 0 },
+ {0xffff , 0x7027 , "SIM" , param_none , 0 },
// *** END ***
{0 , 0 , nullptr , nullptr , 0 }
};
diff --git a/src/devices/cpu/mips/mips3drc.cpp b/src/devices/cpu/mips/mips3drc.cpp
index efcda7dbfa5..c7b2499b9e5 100644
--- a/src/devices/cpu/mips/mips3drc.cpp
+++ b/src/devices/cpu/mips/mips3drc.cpp
@@ -48,7 +48,7 @@ using namespace uml;
#define HI32 R32(REG_HI)
#define CPR032(reg) mem(LOPTR(&m_core->cpr[0][reg]))
#define CCR032(reg) mem(LOPTR(&m_core->ccr[0][reg]))
-#define FPR32_FR0(reg) mem(&((float *)&m_core->cpr[1][reg])[BYTE_XOR_LE(0)])
+#define FPR32_FR0(reg) mem(&((float *)&m_core->cpr[1][reg])[BYTE_XOR_LE(0)])
#define CCR132(reg) mem(LOPTR(&m_core->ccr[1][reg]))
#define CPR232(reg) mem(LOPTR(&m_core->cpr[2][reg]))
#define CCR232(reg) mem(LOPTR(&m_core->ccr[2][reg]))
@@ -58,7 +58,7 @@ using namespace uml;
#define HI64 R64(REG_HI)
#define CPR064(reg) mem(&m_core->cpr[0][reg])
#define CCR064(reg) mem(&m_core->ccr[0][reg])
-#define FPR64_FR1(reg) mem((double *)&m_core->cpr[1][reg])
+#define FPR64_FR1(reg) mem((double *)&m_core->cpr[1][reg])
#define CCR164(reg) mem(&m_core->ccr[1][reg])
#define CPR264(reg) mem(&m_core->cpr[2][reg])
#define CCR264(reg) mem(&m_core->ccr[2][reg])
@@ -1635,18 +1635,18 @@ int mips3_device::generate_opcode(drcuml_block *block, compiler_state *compiler,
return TRUE;
case 0x1b: /* LDR - MIPS III */
- UML_ADD(block, I0, R32(RSREG), SIMMVAL); // add i0,<rsreg>,SIMMVAL
- UML_SHL(block, I1, I0, 3); // shl i1,i0,3
- UML_AND(block, I0, I0, ~7); // and i0,i0,~7
+ UML_ADD(block, I0, R32(RSREG), SIMMVAL); // add i0,<rsreg>,SIMMVAL
+ UML_SHL(block, I1, I0, 3); // shl i1,i0,3
+ UML_AND(block, I0, I0, ~7); // and i0,i0,~7
if (m_bigendian)
- UML_XOR(block, I1, I1, 0x38); // xor i1,i1,0x38
- UML_DSHL(block, I2, (UINT64)~0, I1); // dshl i2,~0,i1
- UML_CALLH(block, *m_read64mask[m_core->mode >> 1]); // callh read64mask
+ UML_XOR(block, I1, I1, 0x38); // xor i1,i1,0x38
+ UML_DSHL(block, I2, (UINT64)~0, I1); // dshl i2,~0,i1
+ UML_CALLH(block, *m_read64mask[m_core->mode >> 1]); // callh read64mask
if (RTREG != 0)
{
- UML_DSHR(block, I2, (UINT64)~0, I1); // dshr i2,~0,i1
- UML_SUB(block, I1, 64, I1); // sub i1,64,i1
- UML_DROLINS(block, R64(RTREG), I0, I1, I2); // drolins <rtreg>,i0,i1,i2
+ UML_DSHR(block, I2, (UINT64)~0, I1); // dshr i2,~0,i1
+ UML_SUB(block, I1, 64, I1); // sub i1,64,i1
+ UML_DROLINS(block, R64(RTREG), I0, I1, I2); // drolins <rtreg>,i0,i1,i2
}
if (!in_delay_slot)
generate_update_cycles(block, compiler, desc->pc + 4, TRUE);
@@ -1654,17 +1654,17 @@ int mips3_device::generate_opcode(drcuml_block *block, compiler_state *compiler,
case 0x31: /* LWC1 - MIPS I */
check_cop1_access(block);
- UML_ADD(block, I0, R32(RSREG), SIMMVAL); // add i0,<rsreg>,SIMMVAL
- UML_CALLH(block, *m_read32[m_core->mode >> 1]); // callh read32
- UML_MOV(block, FPR32_FR0(RTREG), I0); // mov <cpr1_rt>,i0
+ UML_ADD(block, I0, R32(RSREG), SIMMVAL); // add i0,<rsreg>,SIMMVAL
+ UML_CALLH(block, *m_read32[m_core->mode >> 1]); // callh read32
+ UML_MOV(block, FPR32_FR0(RTREG), I0); // mov <cpr1_rt>,i0
if (!in_delay_slot)
generate_update_cycles(block, compiler, desc->pc + 4, TRUE);
return TRUE;
case 0x35: /* LDC1 - MIPS III */
check_cop1_access(block);
- UML_ADD(block, I0, R32(RSREG), SIMMVAL); // add i0,<rsreg>,SIMMVAL
- UML_CALLH(block, *m_read64[m_core->mode >> 1]); // callh read64
+ UML_ADD(block, I0, R32(RSREG), SIMMVAL); // add i0,<rsreg>,SIMMVAL
+ UML_CALLH(block, *m_read64[m_core->mode >> 1]); // callh read64
generate_set_cop1_reg64_i2d(block, compiler, desc, RTREG, I0);
if (!in_delay_slot)
generate_update_cycles(block, compiler, desc->pc + 4, TRUE);
@@ -1727,7 +1727,7 @@ int mips3_device::generate_opcode(drcuml_block *block, compiler_state *compiler,
case 0x3f: /* SD - MIPS III */
UML_ADD(block, I0, R32(RSREG), SIMMVAL); // add i0,<rsreg>,SIMMVAL
- UML_DMOV(block, I1, R64(RTREG)); // dmov i1,<rtreg>
+ UML_DMOV(block, I1, R64(RTREG)); // dmov i1,<rtreg>
UML_CALLH(block, *m_write64[m_core->mode >> 1]); // callh write64
if (!in_delay_slot)
generate_update_cycles(block, compiler, desc->pc + 4, TRUE);
@@ -1776,14 +1776,14 @@ int mips3_device::generate_opcode(drcuml_block *block, compiler_state *compiler,
return TRUE;
case 0x2c: /* SDL - MIPS III */
- UML_ADD(block, I0, R32(RSREG), SIMMVAL); // add i0,<rsreg>,SIMMVAL
- UML_SHL(block, I3, I0, 3); // shl i3,i0,3
- UML_AND(block, I0, I0, ~7); // and i0,i0,~7
- UML_DMOV(block, I1, R64(RTREG)); // dmov i1,<rtreg>
+ UML_ADD(block, I0, R32(RSREG), SIMMVAL); // add i0,<rsreg>,SIMMVAL
+ UML_SHL(block, I3, I0, 3); // shl i3,i0,3
+ UML_AND(block, I0, I0, ~7); // and i0,i0,~7
+ UML_DMOV(block, I1, R64(RTREG)); // dmov i1,<rtreg>
if (!m_bigendian)
- UML_XOR(block, I3, I3, 0x38); // xor i3,i3,0x38
- UML_DSHR(block, I2, (UINT64)~0, I3); // dshr i2,~0,i3
- UML_DSHR(block, I1, I1, I3); // dshr i1,i1,i3
+ UML_XOR(block, I3, I3, 0x38); // xor i3,i3,0x38
+ UML_DSHR(block, I2, (UINT64)~0, I3); // dshr i2,~0,i3
+ UML_DSHR(block, I1, I1, I3); // dshr i1,i1,i3
UML_CALLH(block, *m_write64mask[m_core->mode >> 1]);// callh write64mask
if (!in_delay_slot)
@@ -1791,14 +1791,14 @@ int mips3_device::generate_opcode(drcuml_block *block, compiler_state *compiler,
return TRUE;
case 0x2d: /* SDR - MIPS III */
- UML_ADD(block, I0, R32(RSREG), SIMMVAL); // add i0,<rsreg>,SIMMVAL
- UML_SHL(block, I3, I0, 3); // shl i3,i0,3
- UML_AND(block, I0, I0, ~7); // and i0,i0,~7
- UML_DMOV(block, I1, R64(RTREG)); // dmov i1,<rtreg>
+ UML_ADD(block, I0, R32(RSREG), SIMMVAL); // add i0,<rsreg>,SIMMVAL
+ UML_SHL(block, I3, I0, 3); // shl i3,i0,3
+ UML_AND(block, I0, I0, ~7); // and i0,i0,~7
+ UML_DMOV(block, I1, R64(RTREG)); // dmov i1,<rtreg>
if (m_bigendian)
- UML_XOR(block, I3, I3, 0x38); // xor i3,i3,0x38
- UML_DSHL(block, I2, (UINT64)~0, I3); // dshl i2,~0,i3
- UML_DSHL(block, I1, I1, I3); // dshl i1,i1,i3
+ UML_XOR(block, I3, I3, 0x38); // xor i3,i3,0x38
+ UML_DSHL(block, I2, (UINT64)~0, I3); // dshl i2,~0,i3
+ UML_DSHL(block, I1, I1, I3); // dshl i1,i1,i3
UML_CALLH(block, *m_write64mask[m_core->mode >> 1]);// callh write64mask
if (!in_delay_slot)
@@ -1807,8 +1807,8 @@ int mips3_device::generate_opcode(drcuml_block *block, compiler_state *compiler,
case 0x39: /* SWC1 - MIPS I */
check_cop1_access(block);
- UML_ADD(block, I0, R32(RSREG), SIMMVAL); // add i0,<rsreg>,SIMMVAL
- UML_MOV(block, I1, FPR32_FR0(RTREG)); // mov i1,<cpr1_rt>
+ UML_ADD(block, I0, R32(RSREG), SIMMVAL); // add i0,<rsreg>,SIMMVAL
+ UML_MOV(block, I1, FPR32_FR0(RTREG)); // mov i1,<cpr1_rt>
UML_CALLH(block, *m_write32[m_core->mode >> 1]); // callh write32
if (!in_delay_slot)
generate_update_cycles(block, compiler, desc->pc + 4, TRUE);
@@ -1817,8 +1817,8 @@ int mips3_device::generate_opcode(drcuml_block *block, compiler_state *compiler,
case 0x3d: /* SDC1 - MIPS III */
check_cop1_access(block);
generate_get_cop1_reg64_d2i(block, compiler, desc, RTREG, I1);
- UML_ADD(block, I0, R32(RSREG), SIMMVAL); // add i0,<rsreg>,SIMMVAL
- UML_CALLH(block, *m_write64[m_core->mode >> 1]); // callh write64
+ UML_ADD(block, I0, R32(RSREG), SIMMVAL); // add i0,<rsreg>,SIMMVAL
+ UML_CALLH(block, *m_write64[m_core->mode >> 1]); // callh write64
if (!in_delay_slot)
generate_update_cycles(block, compiler, desc->pc + 4, TRUE);
return TRUE;
@@ -2317,12 +2317,12 @@ int mips3_device::generate_regimm(drcuml_block *block, compiler_state *compiler,
{
UML_DCMP(block, R64(RSREG), 0); // dcmp <rsreg>,0
UML_JMPc(block, COND_L, skip = compiler->labelnum++); // jmp skip,L
- generate_delay_slot_and_branch(block, compiler, desc, 0); // <next instruction + hashjmp>
+ generate_delay_slot_and_branch(block, compiler, desc, 0); // <next instruction + hashjmp>
UML_LABEL(block, skip); // skip:
}
else
{
- generate_delay_slot_and_branch(block, compiler, desc, 0); // <next instruction + hashjmp>
+ generate_delay_slot_and_branch(block, compiler, desc, 0); // <next instruction + hashjmp>
}
return TRUE;
@@ -2711,12 +2711,12 @@ void mips3_device::generate_get_cop1_reg64(drcuml_block *block, compiler_state *
{
UML_ICOPYFS(block, I0, FPR32_FR0((reg & 0x1E) + 1));
UML_DSHL(block, I0, I0, 32);
- UML_ICOPYFS(block, I1, FPR32_FR0(reg & 0x1E));
- UML_DROLINS(block, I0, I1, 0, 0x00000000ffffffffL);
- UML_FDCOPYI(block, param, I0);
+ UML_ICOPYFS(block, I1, FPR32_FR0(reg & 0x1E));
+ UML_DROLINS(block, I0, I1, 0, 0x00000000ffffffffL);
+ UML_FDCOPYI(block, param, I0);
}
- else
- {
+ else
+ {
UML_FDMOV(block, param, FPR64_FR1(reg));
}
}
@@ -2772,7 +2772,7 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
case 0x00: /* MFC1 - MIPS I */
if (RTREG != 0)
{
- UML_DSEXT(block, R64(RTREG), FPR32_FR0(RDREG), SIZE_DWORD); // dsext <rtreg>,fpr[rdreg],dword
+ UML_DSEXT(block, R64(RTREG), FPR32_FR0(RDREG), SIZE_DWORD); // dsext <rtreg>,fpr[rdreg],dword
}
return TRUE;
@@ -2786,11 +2786,11 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
case 0x02: /* CFC1 - MIPS I */
if (RTREG != 0)
- UML_DSEXT(block, R64(RTREG), CCR132(RDREG), SIZE_DWORD); // dsext <rtreg>,ccr132[rdreg],dword
+ UML_DSEXT(block, R64(RTREG), CCR132(RDREG), SIZE_DWORD); // dsext <rtreg>,ccr132[rdreg],dword
return TRUE;
case 0x04: /* MTC1 - MIPS I */
- UML_MOV(block, FPR32_FR0(RDREG), R32(RTREG)); // mov fpr[rdreg],<rtreg>
+ UML_MOV(block, FPR32_FR0(RDREG), R32(RTREG)); // mov fpr[rdreg],<rtreg>
return TRUE;
case 0x05: /* DMTC1 - MIPS III */
@@ -2801,18 +2801,18 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
case 0x06: /* CTC1 - MIPS I */
if (RDREG != 31)
{
- UML_DSEXT(block, CCR164(RDREG), R32(RTREG), SIZE_DWORD); // dsext ccr1[rdreg],<rtreg>,dword
+ UML_DSEXT(block, CCR164(RDREG), R32(RTREG), SIZE_DWORD); // dsext ccr1[rdreg],<rtreg>,dword
}
else
{
- UML_XOR(block, I0, CCR132(31), R32(RTREG)); // xor i0,ccr1[31],<rtreg>
- UML_DSEXT(block, CCR164(31), R32(RTREG), SIZE_DWORD); // dsext ccr1[31],<rtreg>,dword
- UML_TEST(block, I0, 3); // test i0,3
- UML_JMPc(block, COND_Z, skip = compiler->labelnum++); // jmp skip,Z
- UML_AND(block, I0, CCR132(31), 3); // and i0,ccr1[31],3
- UML_LOAD(block, I0, &m_fpmode[0], I0, SIZE_BYTE, SCALE_x1); // load i0,fpmode,i0,byte
- UML_SETFMOD(block, I0); // setfmod i0
- UML_LABEL(block, skip); // skip:
+ UML_XOR(block, I0, CCR132(31), R32(RTREG)); // xor i0,ccr1[31],<rtreg>
+ UML_DSEXT(block, CCR164(31), R32(RTREG), SIZE_DWORD); // dsext ccr1[31],<rtreg>,dword
+ UML_TEST(block, I0, 3); // test i0,3
+ UML_JMPc(block, COND_Z, skip = compiler->labelnum++); // jmp skip,Z
+ UML_AND(block, I0, CCR132(31), 3); // and i0,ccr1[31],3
+ UML_LOAD(block, I0, &m_fpmode[0], I0, SIZE_BYTE, SCALE_x1); // load i0,fpmode,i0,byte
+ UML_SETFMOD(block, I0); // setfmod i0
+ UML_LABEL(block, skip); // skip:
}
return TRUE;
@@ -2821,18 +2821,18 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
{
case 0x00: /* BCzF - MIPS I */
case 0x02: /* BCzFL - MIPS II */
- UML_TEST(block, CCR132(31), FCCMASK(op >> 18)); // test ccr1[31],fccmask[which]
- UML_JMPc(block, COND_NZ, skip = compiler->labelnum++); // jmp skip,NZ
- generate_delay_slot_and_branch(block, compiler, desc, 0); // <next instruction + hashjmp>
- UML_LABEL(block, skip); // skip:
+ UML_TEST(block, CCR132(31), FCCMASK(op >> 18)); // test ccr1[31],fccmask[which]
+ UML_JMPc(block, COND_NZ, skip = compiler->labelnum++); // jmp skip,NZ
+ generate_delay_slot_and_branch(block, compiler, desc, 0); // <next instruction + hashjmp>
+ UML_LABEL(block, skip); // skip:
return TRUE;
case 0x01: /* BCzT - MIPS I */
case 0x03: /* BCzTL - MIPS II */
- UML_TEST(block, CCR132(31), FCCMASK(op >> 18)); // test ccr1[31],fccmask[which]
- UML_JMPc(block, COND_Z, skip = compiler->labelnum++); // jmp skip,Z
- generate_delay_slot_and_branch(block, compiler, desc, 0); // <next instruction + hashjmp>
- UML_LABEL(block, skip); // skip:
+ UML_TEST(block, CCR132(31), FCCMASK(op >> 18)); // test ccr1[31],fccmask[which]
+ UML_JMPc(block, COND_Z, skip = compiler->labelnum++); // jmp skip,Z
+ generate_delay_slot_and_branch(block, compiler, desc, 0); // <next instruction + hashjmp>
+ UML_LABEL(block, skip); // skip:
return TRUE;
}
break;
@@ -2843,126 +2843,126 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
case 0x00:
if (IS_SINGLE(op)) /* ADD.S - MIPS I */
{
- UML_FSADD(block, FDVALS_FR0, FSVALS_FR0, FTVALS_FR0); // fsadd <fdreg>,<fsreg>,<ftreg>
+ UML_FSADD(block, FDVALS_FR0, FSVALS_FR0, FTVALS_FR0); // fsadd <fdreg>,<fsreg>,<ftreg>
}
else /* ADD.D - MIPS I */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
- generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov F1,<ftreg>
- UML_FDADD(block, F2, F0, F1); // fdadd F2,F0,F1
- generate_set_cop1_reg64(block, compiler, desc, FDREG, F2); // dmov <fdreg>,F2
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
+ generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov F1,<ftreg>
+ UML_FDADD(block, F2, F0, F1); // fdadd F2,F0,F1
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, F2); // dmov <fdreg>,F2
}
return TRUE;
case 0x01:
if (IS_SINGLE(op)) /* SUB.S - MIPS I */
{
- UML_FSSUB(block, FDVALS_FR0, FSVALS_FR0, FTVALS_FR0); // fssub <fdreg>,<fsreg>,<ftreg>
+ UML_FSSUB(block, FDVALS_FR0, FSVALS_FR0, FTVALS_FR0); // fssub <fdreg>,<fsreg>,<ftreg>
}
else /* SUB.D - MIPS I */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
- generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov F1,<ftreg>
- UML_FDSUB(block, F2, F0, F1); // fdsub F2,F0,F1
- generate_set_cop1_reg64(block, compiler, desc, FDREG, F2); // dmov <fdreg>,F2
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
+ generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov F1,<ftreg>
+ UML_FDSUB(block, F2, F0, F1); // fdsub F2,F0,F1
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, F2); // dmov <fdreg>,F2
}
return TRUE;
case 0x02:
if (IS_SINGLE(op)) /* MUL.S - MIPS I */
{
- UML_FSMUL(block, FDVALS_FR0, FSVALS_FR0, FTVALS_FR0); // fsmul <fdreg>,<fsreg>,<ftreg>
+ UML_FSMUL(block, FDVALS_FR0, FSVALS_FR0, FTVALS_FR0); // fsmul <fdreg>,<fsreg>,<ftreg>
}
else /* MUL.D - MIPS I */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
- generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov F1,<ftreg>
- UML_FDMUL(block, F2, F0, F1); // fdmul F2,F0,F1
- generate_set_cop1_reg64(block, compiler, desc, FDREG, F2); // dmov <fdreg>,F2
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
+ generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov F1,<ftreg>
+ UML_FDMUL(block, F2, F0, F1); // fdmul F2,F0,F1
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, F2); // dmov <fdreg>,F2
}
return TRUE;
case 0x03:
if (IS_SINGLE(op)) /* DIV.S - MIPS I */
{
- UML_FSDIV(block, FDVALS_FR0, FSVALS_FR0, FTVALS_FR0); // fsdiv <fdreg>,<fsreg>,<ftreg>
+ UML_FSDIV(block, FDVALS_FR0, FSVALS_FR0, FTVALS_FR0); // fsdiv <fdreg>,<fsreg>,<ftreg>
}
else /* DIV.D - MIPS I */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
- generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov F1,<ftreg>
- UML_FDDIV(block, F2, F0, F1); // fddiv F2,F0,F1
- generate_set_cop1_reg64(block, compiler, desc, FDREG, F2); // dmov <fdreg>,F2
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
+ generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov F1,<ftreg>
+ UML_FDDIV(block, F2, F0, F1); // fddiv F2,F0,F1
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, F2); // dmov <fdreg>,F2
}
return TRUE;
case 0x04:
if (IS_SINGLE(op)) /* SQRT.S - MIPS II */
{
- UML_FSSQRT(block, FDVALS_FR0, FSVALS_FR0); // fssqrt <fdreg>,<fsreg>
+ UML_FSSQRT(block, FDVALS_FR0, FSVALS_FR0); // fssqrt <fdreg>,<fsreg>
}
else /* SQRT.D - MIPS II */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
- UML_FDSQRT(block, F0, F0); // fdsqrt F0,F0
- generate_set_cop1_reg64(block, compiler, desc, FDREG, F0); // dmov <fdreg>,F0
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
+ UML_FDSQRT(block, F0, F0); // fdsqrt F0,F0
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, F0); // dmov <fdreg>,F0
}
return TRUE;
case 0x05:
if (IS_SINGLE(op)) /* ABS.S - MIPS I */
{
- UML_FSABS(block, FDVALS_FR0, FSVALS_FR0); // fsabs <fdreg>,<fsreg>
+ UML_FSABS(block, FDVALS_FR0, FSVALS_FR0); // fsabs <fdreg>,<fsreg>
}
else /* ABS.D - MIPS I */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
- UML_FDABS(block, F0, F0); // fdabs F0,F0
- generate_set_cop1_reg64(block, compiler, desc, FDREG, F0); // dmov <fdreg>,F0
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
+ UML_FDABS(block, F0, F0); // fdabs F0,F0
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, F0); // dmov <fdreg>,F0
}
return TRUE;
case 0x06:
if (IS_SINGLE(op)) /* MOV.S - MIPS I */
{
- UML_FSMOV(block, FDVALS_FR0, FSVALS_FR0); // fsmov <fdreg>,<fsreg>
+ UML_FSMOV(block, FDVALS_FR0, FSVALS_FR0); // fsmov <fdreg>,<fsreg>
}
else /* MOV.D - MIPS I */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
- generate_set_cop1_reg64(block, compiler, desc, FDREG, F0); // dmov <fdreg>,F0
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, F0); // dmov <fdreg>,F0
}
return TRUE;
case 0x07:
if (IS_SINGLE(op)) /* NEG.S - MIPS I */
{
- UML_FSNEG(block, FDVALS_FR0, FSVALS_FR0); // fsneg <fdreg>,<fsreg>
- UML_CMP(block, FSVALS_FR0, 0); // cmp <fsreg>,0.0
- UML_MOVc(block, COND_E, FDVALS_FR0, 0x80000000); // mov <fdreg>,-0.0,e
+ UML_FSNEG(block, FDVALS_FR0, FSVALS_FR0); // fsneg <fdreg>,<fsreg>
+ UML_CMP(block, FSVALS_FR0, 0); // cmp <fsreg>,0.0
+ UML_MOVc(block, COND_E, FDVALS_FR0, 0x80000000); // mov <fdreg>,-0.0,e
}
else /* NEG.D - MIPS I */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
- UML_FDNEG(block, F1, F0); // fdneg F1,F0
- UML_DCMP(block, F0, 0); // cmp F0,0.0
- UML_DMOVc(block, COND_E, F1, U64(0x8000000000000000)); // dmov F1,-0.0,e
- generate_set_cop1_reg64(block, compiler, desc, FDREG, F1); // dmov <fdreg>,F1
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
+ UML_FDNEG(block, F1, F0); // fdneg F1,F0
+ UML_DCMP(block, F0, 0); // cmp F0,0.0
+ UML_DMOVc(block, COND_E, F1, U64(0x8000000000000000)); // dmov F1,-0.0,e
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, F1); // dmov <fdreg>,F1
}
return TRUE;
case 0x08:
if (IS_SINGLE(op)) /* ROUND.L.S - MIPS III */
{
- UML_FSTOINT(block, F0, FSVALS_FR0, SIZE_QWORD, ROUND_ROUND);// fstoint f0,<fsreg>,qword,round
+ UML_FSTOINT(block, F0, FSVALS_FR0, SIZE_QWORD, ROUND_ROUND);// fstoint f0,<fsreg>,qword,round
}
else /* ROUND.L.D - MIPS III */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
- UML_FDTOINT(block, F0, F0, SIZE_QWORD, ROUND_ROUND); // fdtoint f0,f0,qword,round
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
+ UML_FDTOINT(block, F0, F0, SIZE_QWORD, ROUND_ROUND); // fdtoint f0,f0,qword,round
}
- UML_ICOPYFD(block, I0, F0); // icopyfd i0,f0
- generate_set_cop1_reg64_i2d(block, compiler, desc, FDREG, I0); // dmov <fdreg>,f0
+ UML_ICOPYFD(block, I0, F0); // icopyfd i0,f0
+ generate_set_cop1_reg64_i2d(block, compiler, desc, FDREG, I0); // dmov <fdreg>,f0
return TRUE;
case 0x09:
@@ -2972,11 +2972,11 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
}
else /* TRUNC.L.D - MIPS III */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
- UML_FDTOINT(block, F0, F0, SIZE_QWORD, ROUND_TRUNC); // fdtoint f0,f0,qword,trunc
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
+ UML_FDTOINT(block, F0, F0, SIZE_QWORD, ROUND_TRUNC); // fdtoint f0,f0,qword,trunc
}
- UML_ICOPYFD(block, I0, F0); // icopyfd i0,f0
- generate_set_cop1_reg64_i2d(block, compiler, desc, FDREG, I0); // dmov <fdreg>,i0
+ UML_ICOPYFD(block, I0, F0); // icopyfd i0,f0
+ generate_set_cop1_reg64_i2d(block, compiler, desc, FDREG, I0); // dmov <fdreg>,i0
return TRUE;
case 0x0a:
@@ -2986,11 +2986,11 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
}
else /* CEIL.L.D - MIPS III */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
- UML_FDTOINT(block, F0, F0, SIZE_QWORD, ROUND_CEIL); // fdtoint f0,<fsreg>,qword,ceil
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
+ UML_FDTOINT(block, F0, F0, SIZE_QWORD, ROUND_CEIL); // fdtoint f0,<fsreg>,qword,ceil
}
- UML_ICOPYFD(block, I0, F0); // icopyfd i0,f0
- generate_set_cop1_reg64(block, compiler, desc, FDREG, I0); // dmov <fdreg>,f0
+ UML_ICOPYFD(block, I0, F0); // icopyfd i0,f0
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, I0); // dmov <fdreg>,f0
return TRUE;
case 0x0b:
@@ -3000,11 +3000,11 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
}
else /* FLOOR.L.D - MIPS III */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
- UML_FDTOINT(block, F0, F0, SIZE_QWORD, ROUND_FLOOR); // fdtoint f0,<fsreg>,qword,floor
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
+ UML_FDTOINT(block, F0, F0, SIZE_QWORD, ROUND_FLOOR); // fdtoint f0,<fsreg>,qword,floor
}
- UML_ICOPYFD(block, I0, F0); // icopyfd i0,f0
- generate_set_cop1_reg64(block, compiler, desc, FDREG, I0); // dmov <fdreg>,f0
+ UML_ICOPYFD(block, I0, F0); // icopyfd i0,f0
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, I0); // dmov <fdreg>,f0
return TRUE;
case 0x0c:
@@ -3014,8 +3014,8 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
}
else /* ROUND.W.D - MIPS II */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
- UML_FDTOINT(block, FDVALS_FR0, F0, SIZE_DWORD, ROUND_ROUND); // fdtoint <fdreg>,F0,dword,round
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
+ UML_FDTOINT(block, FDVALS_FR0, F0, SIZE_DWORD, ROUND_ROUND); // fdtoint <fdreg>,F0,dword,round
}
return TRUE;
@@ -3026,8 +3026,8 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
}
else /* TRUNC.W.D - MIPS II */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
- UML_FDTOINT(block, FDVALS_FR0, F0, SIZE_DWORD, ROUND_TRUNC); // fdtoint <fdreg>,F0,dword,trunc
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
+ UML_FDTOINT(block, FDVALS_FR0, F0, SIZE_DWORD, ROUND_TRUNC); // fdtoint <fdreg>,F0,dword,trunc
}
return TRUE;
@@ -3038,8 +3038,8 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
}
else /* CEIL.W.D - MIPS II */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
- UML_FDTOINT(block, FDVALS_FR0, F0, SIZE_DWORD, ROUND_CEIL); // fdtoint <fdreg>,F0,dword,ceil
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
+ UML_FDTOINT(block, FDVALS_FR0, F0, SIZE_DWORD, ROUND_CEIL); // fdtoint <fdreg>,F0,dword,ceil
}
return TRUE;
@@ -3050,8 +3050,8 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
}
else /* FLOOR.W.D - MIPS II */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
- UML_FDTOINT(block, FDVALS_FR0, F0, SIZE_DWORD, ROUND_FLOOR); // fdtoint <fdreg>,F0,dword,floor
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
+ UML_FDTOINT(block, FDVALS_FR0, F0, SIZE_DWORD, ROUND_FLOOR); // fdtoint <fdreg>,F0,dword,floor
}
return TRUE;
@@ -3066,71 +3066,71 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
else /* MOVT/F.D - MIPS IV */
{
condition = ((op >> 16) & 1) ? COND_Z : COND_NZ;
- generate_get_cop1_reg64(block, compiler, desc, FDREG, F0); // dmov F0,<fsreg>
+ generate_get_cop1_reg64(block, compiler, desc, FDREG, F0); // dmov F0,<fsreg>
UML_JMPc(block, condition, skip = compiler->labelnum++);
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov F0,<fsreg>
UML_LABEL(block, skip);
- generate_set_cop1_reg64(block, compiler, desc, FDREG, F0); // dmov <fdreg>,F0
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, F0); // dmov <fdreg>,F0
}
return TRUE;
case 0x12:
- UML_DCMP(block, R64(RTREG), 0); // dcmp <rtreg>,0
+ UML_DCMP(block, R64(RTREG), 0); // dcmp <rtreg>,0
if (IS_SINGLE(op)) /* MOVZ.S - MIPS IV */
{
- UML_FSMOVc(block, COND_Z, FDVALS_FR0, FSVALS_FR0); // fsmov <fdreg>,<fsreg>,Z
+ UML_FSMOVc(block, COND_Z, FDVALS_FR0, FSVALS_FR0); // fsmov <fdreg>,<fsreg>,Z
}
else /* MOVZ.D - MIPS IV */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
- generate_get_cop1_reg64(block, compiler, desc, FDREG, F1); // dmov f1,<fdreg>
- UML_FDMOVc(block, COND_Z, F2, F0); // fdmov f2,<fsreg>,Z
- UML_FDMOVc(block, COND_NZ, F2, F1); // fdmov f2,<fdreg>,NZ
- generate_set_cop1_reg64(block, compiler, desc, FDREG, F2); // dmov <fdreg>,f0
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
+ generate_get_cop1_reg64(block, compiler, desc, FDREG, F1); // dmov f1,<fdreg>
+ UML_FDMOVc(block, COND_Z, F2, F0); // fdmov f2,<fsreg>,Z
+ UML_FDMOVc(block, COND_NZ, F2, F1); // fdmov f2,<fdreg>,NZ
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, F2); // dmov <fdreg>,f0
}
return TRUE;
case 0x13:
- UML_DCMP(block, R64(RTREG), 0); // dcmp <rtreg>,0
+ UML_DCMP(block, R64(RTREG), 0); // dcmp <rtreg>,0
if (IS_SINGLE(op)) /* MOVN.S - MIPS IV */
{
- UML_FSMOVc(block, COND_NZ, FDVALS_FR0, FSVALS_FR0); // fsmov <fdreg>,<fsreg>,NZ
+ UML_FSMOVc(block, COND_NZ, FDVALS_FR0, FSVALS_FR0); // fsmov <fdreg>,<fsreg>,NZ
}
else /* MOVN.D - MIPS IV */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
- generate_get_cop1_reg64(block, compiler, desc, FDREG, F1); // dmov f1,<fdreg>
- UML_FDMOVc(block, COND_NZ, F2, F0); // fdmov f2,<fsreg>,NZ
- UML_FDMOVc(block, COND_Z, F2, F1); // fdmov f2,<fdreg>,Z
- generate_set_cop1_reg64(block, compiler, desc, FDREG, F2); // dmov <fdreg>,f2
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
+ generate_get_cop1_reg64(block, compiler, desc, FDREG, F1); // dmov f1,<fdreg>
+ UML_FDMOVc(block, COND_NZ, F2, F0); // fdmov f2,<fsreg>,NZ
+ UML_FDMOVc(block, COND_Z, F2, F1); // fdmov f2,<fdreg>,Z
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, F2); // dmov <fdreg>,f2
}
return TRUE;
case 0x15:
if (IS_SINGLE(op)) /* RECIP.S - MIPS IV */
{
- UML_FSRECIP(block, FDVALS_FR0, FSVALS_FR0); // fsrecip <fdreg>,<fsreg>
+ UML_FSRECIP(block, FDVALS_FR0, FSVALS_FR0); // fsrecip <fdreg>,<fsreg>
}
else /* RECIP.D - MIPS IV */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
- UML_FDRECIP(block, F0, F0); // fdrecip f0,<fsreg>
- generate_set_cop1_reg64(block, compiler, desc, FDREG, F0); // dmov <fdreg>,f0
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
+ UML_FDRECIP(block, F0, F0); // fdrecip f0,<fsreg>
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, F0); // dmov <fdreg>,f0
}
return TRUE;
case 0x16:
if (IS_SINGLE(op)) /* RSQRT.S - MIPS IV */
{
- UML_FSRSQRT(block, FDVALS_FR0, FSVALS_FR0); // fsrsqrt <fdreg>,<fsreg>
+ UML_FSRSQRT(block, FDVALS_FR0, FSVALS_FR0); // fsrsqrt <fdreg>,<fsreg>
}
else /* RSQRT.D - MIPS IV */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
- UML_FDRSQRT(block, F0, F0); // fdrsqrt f0,<fsreg>
- generate_set_cop1_reg64(block, compiler, desc, FDREG, F0); // dmov <fdreg>,f0
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
+ UML_FDRSQRT(block, F0, F0); // fdrsqrt f0,<fsreg>
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, F0); // dmov <fdreg>,f0
}
return TRUE;
@@ -3143,14 +3143,14 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
}
else /* CVT.S.L - MIPS I */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
- UML_FSFRINT(block, FDVALS_FR0, F0, SIZE_QWORD); // fsfrint <fdreg>,f0,qword
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
+ UML_FSFRINT(block, FDVALS_FR0, F0, SIZE_QWORD); // fsfrint <fdreg>,f0,qword
}
}
else /* CVT.S.D - MIPS I */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
- UML_FSFRFLT(block, FDVALS_FR0, F0, SIZE_QWORD); // fsfrflt <fdreg>,f0,qword
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
+ UML_FSFRFLT(block, FDVALS_FR0, F0, SIZE_QWORD); // fsfrflt <fdreg>,f0,qword
}
return TRUE;
@@ -3159,19 +3159,19 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
{
if (IS_SINGLE(op)) /* CVT.D.W - MIPS I */
{
- UML_FDFRINT(block, F0, FSVALS_FR0, SIZE_DWORD); // fdfrint f0,<fsreg>,dword
+ UML_FDFRINT(block, F0, FSVALS_FR0, SIZE_DWORD); // fdfrint f0,<fsreg>,dword
}
else /* CVT.D.L - MIPS I */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
- UML_FDFRINT(block, F0, F0, SIZE_QWORD); // fdfrint f0,f0,qword
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
+ UML_FDFRINT(block, F0, F0, SIZE_QWORD); // fdfrint f0,f0,qword
}
}
else /* CVT.D.S - MIPS I */
{
- UML_FDFRFLT(block, F0, FSVALS_FR0, SIZE_DWORD); // fdfrflt f0,<fsreg>,dword
+ UML_FDFRFLT(block, F0, FSVALS_FR0, SIZE_DWORD); // fdfrflt f0,<fsreg>,dword
}
- generate_set_cop1_reg64(block, compiler, desc, FDREG, F0); // dmov <fdreg>,f0
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, F0); // dmov <fdreg>,f0
return TRUE;
case 0x24:
@@ -3181,7 +3181,7 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
}
else /* CVT.W.D - MIPS I */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
UML_FDTOINT(block, FDVALS_FR0, F0, SIZE_DWORD, ROUND_DEFAULT);// fdtoint <fdreg>,f0,dword,default
}
return TRUE;
@@ -3190,13 +3190,13 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
if (IS_SINGLE(op)) /* CVT.L.S - MIPS I */
{
UML_FSTOINT(block, F0, FSVALS_FR0, SIZE_QWORD, ROUND_DEFAULT);// fstoint f0,<fsreg>,qword,default
- generate_set_cop1_reg64(block, compiler, desc, FDREG, F0); // dmov <fdreg>,f0
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, F0); // dmov <fdreg>,f0
}
else /* CVT.L.D - MIPS I */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
- UML_FDTOINT(block, F0, F0, SIZE_QWORD, ROUND_DEFAULT); // fdtoint <fdreg>,<fsreg>,qword,default
- generate_set_cop1_reg64(block, compiler, desc, FDREG, F0); // dmov <fdreg>,f0
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
+ UML_FDTOINT(block, F0, F0, SIZE_QWORD, ROUND_DEFAULT); // fdtoint <fdreg>,<fsreg>,qword,default
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, F0); // dmov <fdreg>,f0
}
return TRUE;
@@ -3213,9 +3213,9 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
}
else /* C.UN.D - MIPS I */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
- generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov f1,<ftreg>
- UML_FDCMP(block, F0, F1); // fdcmp f0,f1
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
+ generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov f1,<ftreg>
+ UML_FDCMP(block, F0, F1); // fdcmp f0,f1
}
UML_SETc(block, COND_U, I0); // set i0,u
UML_ROLINS(block, CCR132(31), I0, FCCSHIFT(op >> 8), FCCMASK(op >> 8));
@@ -3230,9 +3230,9 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
}
else /* C.EQ.D - MIPS I */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
- generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov f1,<ftreg>
- UML_FDCMP(block, F0, F1); // fdcmp f0,f1
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
+ generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov f1,<ftreg>
+ UML_FDCMP(block, F0, F1); // fdcmp f0,f1
}
UML_SETc(block, COND_E, I0); // set i0,e
UML_SETc(block, COND_NU, I1); // set i1,nu
@@ -3249,9 +3249,9 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
}
else /* C.UEQ.D - MIPS I */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
- generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov f1,<ftreg>
- UML_FDCMP(block, F0, F1); // fdcmp f0,f1
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
+ generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov f1,<ftreg>
+ UML_FDCMP(block, F0, F1); // fdcmp f0,f1
}
UML_SETc(block, COND_U, I0); // set i0,u
UML_SETc(block, COND_E, I1); // set i1,e
@@ -3268,9 +3268,9 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
}
else /* C.OLT.D - MIPS I */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
- generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov f1,<ftreg>
- UML_FDCMP(block, F0, F1); // fdcmp f0,f1
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
+ generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov f1,<ftreg>
+ UML_FDCMP(block, F0, F1); // fdcmp f0,f1
}
UML_SETc(block, COND_B, I0); // set i0,b
UML_SETc(block, COND_NU, I1); // set i1,nu
@@ -3287,9 +3287,9 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
}
else /* C.ULT.D - MIPS I */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
- generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov f1,<ftreg>
- UML_FDCMP(block, F0, F1); // fdcmp f0,f1
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
+ generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov f1,<ftreg>
+ UML_FDCMP(block, F0, F1); // fdcmp f0,f1
}
UML_SETc(block, COND_U, I0); // set i0,u
UML_SETc(block, COND_B, I1); // set i1,b
@@ -3306,9 +3306,9 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
}
else /* C.OLE.D - MIPS I */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
- generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov f1,<ftreg>
- UML_FDCMP(block, F0, F1); // fdcmp f0,f1
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
+ generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov f1,<ftreg>
+ UML_FDCMP(block, F0, F1); // fdcmp f0,f1
}
UML_SETc(block, COND_BE, I0); // set i0,be
UML_SETc(block, COND_NU, I1); // set i1,nu
@@ -3325,9 +3325,9 @@ int mips3_device::generate_cop1_fr0(drcuml_block *block, compiler_state *compile
}
else /* C.ULE.D - MIPS I */
{
- generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
- generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov f1,<ftreg>
- UML_FDCMP(block, F0, F1); // fdcmp f0,f1
+ generate_get_cop1_reg64(block, compiler, desc, FSREG, F0); // dmov f0,<fsreg>
+ generate_get_cop1_reg64(block, compiler, desc, FTREG, F1); // dmov f1,<ftreg>
+ UML_FDCMP(block, F0, F1); // fdcmp f0,f1
}
UML_SETc(block, COND_U, I0); // set i0,u
UML_SETc(block, COND_BE, I1); // set i1,be
@@ -3358,7 +3358,7 @@ int mips3_device::generate_cop1_fr1(drcuml_block *block, compiler_state *compile
case 0x00: /* MFC1 - MIPS I */
if (RTREG != 0)
{
- UML_DSEXT(block, R64(RTREG), FPR32_FR0(RDREG), SIZE_DWORD); // dsext <rtreg>,fpr[rdreg],dword
+ UML_DSEXT(block, R64(RTREG), FPR32_FR0(RDREG), SIZE_DWORD); // dsext <rtreg>,fpr[rdreg],dword
}
return TRUE;
@@ -3372,11 +3372,11 @@ int mips3_device::generate_cop1_fr1(drcuml_block *block, compiler_state *compile
case 0x02: /* CFC1 - MIPS I */
if (RTREG != 0)
- UML_DSEXT(block, R64(RTREG), CCR132(RDREG), SIZE_DWORD); // dsext <rtreg>,ccr132[rdreg],dword
+ UML_DSEXT(block, R64(RTREG), CCR132(RDREG), SIZE_DWORD); // dsext <rtreg>,ccr132[rdreg],dword
return TRUE;
case 0x04: /* MTC1 - MIPS I */
- UML_MOV(block, FPR32_FR0(RDREG), R32(RTREG)); // mov fpr[rdreg],<rtreg>
+ UML_MOV(block, FPR32_FR0(RDREG), R32(RTREG)); // mov fpr[rdreg],<rtreg>
return TRUE;
case 0x05: /* DMTC1 - MIPS III */
@@ -3387,18 +3387,18 @@ int mips3_device::generate_cop1_fr1(drcuml_block *block, compiler_state *compile
case 0x06: /* CTC1 - MIPS I */
if (RDREG != 31)
{
- UML_DSEXT(block, CCR164(RDREG), R32(RTREG), SIZE_DWORD); // dsext ccr1[rdreg],<rtreg>,dword
+ UML_DSEXT(block, CCR164(RDREG), R32(RTREG), SIZE_DWORD); // dsext ccr1[rdreg],<rtreg>,dword
}
else
{
- UML_XOR(block, I0, CCR132(31), R32(RTREG)); // xor i0,ccr1[31],<rtreg>
- UML_DSEXT(block, CCR164(31), R32(RTREG), SIZE_DWORD); // dsext ccr1[31],<rtreg>,dword
- UML_TEST(block, I0, 3); // test i0,3
- UML_JMPc(block, COND_Z, skip = compiler->labelnum++); // jmp skip,Z
- UML_AND(block, I0, CCR132(31), 3); // and i0,ccr1[31],3
- UML_LOAD(block, I0, &m_fpmode[0], I0, SIZE_BYTE, SCALE_x1); // load i0,fpmode,i0,byte
- UML_SETFMOD(block, I0); // setfmod i0
- UML_LABEL(block, skip); // skip:
+ UML_XOR(block, I0, CCR132(31), R32(RTREG)); // xor i0,ccr1[31],<rtreg>
+ UML_DSEXT(block, CCR164(31), R32(RTREG), SIZE_DWORD); // dsext ccr1[31],<rtreg>,dword
+ UML_TEST(block, I0, 3); // test i0,3
+ UML_JMPc(block, COND_Z, skip = compiler->labelnum++); // jmp skip,Z
+ UML_AND(block, I0, CCR132(31), 3); // and i0,ccr1[31],3
+ UML_LOAD(block, I0, &m_fpmode[0], I0, SIZE_BYTE, SCALE_x1); // load i0,fpmode,i0,byte
+ UML_SETFMOD(block, I0); // setfmod i0
+ UML_LABEL(block, skip); // skip:
}
return TRUE;
@@ -3407,18 +3407,18 @@ int mips3_device::generate_cop1_fr1(drcuml_block *block, compiler_state *compile
{
case 0x00: /* BCzF - MIPS I */
case 0x02: /* BCzFL - MIPS II */
- UML_TEST(block, CCR132(31), FCCMASK(op >> 18)); // test ccr1[31],fccmask[which]
- UML_JMPc(block, COND_NZ, skip = compiler->labelnum++); // jmp skip,NZ
- generate_delay_slot_and_branch(block, compiler, desc, 0); // <next instruction + hashjmp>
- UML_LABEL(block, skip); // skip:
+ UML_TEST(block, CCR132(31), FCCMASK(op >> 18)); // test ccr1[31],fccmask[which]
+ UML_JMPc(block, COND_NZ, skip = compiler->labelnum++); // jmp skip,NZ
+ generate_delay_slot_and_branch(block, compiler, desc, 0); // <next instruction + hashjmp>
+ UML_LABEL(block, skip); // skip:
return TRUE;
case 0x01: /* BCzT - MIPS I */
case 0x03: /* BCzTL - MIPS II */
- UML_TEST(block, CCR132(31), FCCMASK(op >> 18)); // test ccr1[31],fccmask[which]
- UML_JMPc(block, COND_Z, skip = compiler->labelnum++); // jmp skip,Z
- generate_delay_slot_and_branch(block, compiler, desc, 0); // <next instruction + hashjmp>
- UML_LABEL(block, skip); // skip:
+ UML_TEST(block, CCR132(31), FCCMASK(op >> 18)); // test ccr1[31],fccmask[which]
+ UML_JMPc(block, COND_Z, skip = compiler->labelnum++); // jmp skip,Z
+ generate_delay_slot_and_branch(block, compiler, desc, 0); // <next instruction + hashjmp>
+ UML_LABEL(block, skip); // skip:
return TRUE;
}
break;
@@ -3428,122 +3428,122 @@ int mips3_device::generate_cop1_fr1(drcuml_block *block, compiler_state *compile
{
case 0x00:
if (IS_SINGLE(op)) /* ADD.S - MIPS I */
- UML_FSADD(block, FDVALS_FR1, FSVALS_FR1, FTVALS_FR1); // fsadd <fdreg>,<fsreg>,<ftreg>
+ UML_FSADD(block, FDVALS_FR1, FSVALS_FR1, FTVALS_FR1); // fsadd <fdreg>,<fsreg>,<ftreg>
else /* ADD.D - MIPS I */
- UML_FDADD(block, FDVALD_FR1, FSVALD_FR1, FTVALD_FR1); // fdadd <fdreg>,<fsreg>,<ftreg>
+ UML_FDADD(block, FDVALD_FR1, FSVALD_FR1, FTVALD_FR1); // fdadd <fdreg>,<fsreg>,<ftreg>
return TRUE;
case 0x01:
if (IS_SINGLE(op)) /* SUB.S - MIPS I */
- UML_FSSUB(block, FDVALS_FR1, FSVALS_FR1, FTVALS_FR1); // fssub <fdreg>,<fsreg>,<ftreg>
+ UML_FSSUB(block, FDVALS_FR1, FSVALS_FR1, FTVALS_FR1); // fssub <fdreg>,<fsreg>,<ftreg>
else /* SUB.D - MIPS I */
- UML_FDSUB(block, FDVALD_FR1, FSVALD_FR1, FTVALD_FR1); // fdsub <fdreg>,<fsreg>,<ftreg>
+ UML_FDSUB(block, FDVALD_FR1, FSVALD_FR1, FTVALD_FR1); // fdsub <fdreg>,<fsreg>,<ftreg>
return TRUE;
case 0x02:
if (IS_SINGLE(op)) /* MUL.S - MIPS I */
- UML_FSMUL(block, FDVALS_FR1, FSVALS_FR1, FTVALS_FR1); // fsmul <fdreg>,<fsreg>,<ftreg>
+ UML_FSMUL(block, FDVALS_FR1, FSVALS_FR1, FTVALS_FR1); // fsmul <fdreg>,<fsreg>,<ftreg>
else /* MUL.D - MIPS I */
- UML_FDMUL(block, FDVALD_FR1, FSVALD_FR1, FTVALD_FR1); // fdmul <fdreg>,<fsreg>,<ftreg>
+ UML_FDMUL(block, FDVALD_FR1, FSVALD_FR1, FTVALD_FR1); // fdmul <fdreg>,<fsreg>,<ftreg>
return TRUE;
case 0x03:
if (IS_SINGLE(op)) /* DIV.S - MIPS I */
- UML_FSDIV(block, FDVALS_FR1, FSVALS_FR1, FTVALS_FR1); // fsdiv <fdreg>,<fsreg>,<ftreg>
+ UML_FSDIV(block, FDVALS_FR1, FSVALS_FR1, FTVALS_FR1); // fsdiv <fdreg>,<fsreg>,<ftreg>
else /* DIV.D - MIPS I */
- UML_FDDIV(block, FDVALD_FR1, FSVALD_FR1, FTVALD_FR1); // fddiv <fdreg>,<fsreg>,<ftreg>
+ UML_FDDIV(block, FDVALD_FR1, FSVALD_FR1, FTVALD_FR1); // fddiv <fdreg>,<fsreg>,<ftreg>
return TRUE;
case 0x04:
if (IS_SINGLE(op)) /* SQRT.S - MIPS II */
- UML_FSSQRT(block, FDVALS_FR1, FSVALS_FR1); // fssqrt <fdreg>,<fsreg>
+ UML_FSSQRT(block, FDVALS_FR1, FSVALS_FR1); // fssqrt <fdreg>,<fsreg>
else /* SQRT.D - MIPS II */
- UML_FDSQRT(block, FDVALD_FR1, FSVALD_FR1); // fdsqrt <fdreg>,<fsreg>
+ UML_FDSQRT(block, FDVALD_FR1, FSVALD_FR1); // fdsqrt <fdreg>,<fsreg>
return TRUE;
case 0x05:
if (IS_SINGLE(op)) /* ABS.S - MIPS I */
- UML_FSABS(block, FDVALS_FR1, FSVALS_FR1); // fsabs <fdreg>,<fsreg>
+ UML_FSABS(block, FDVALS_FR1, FSVALS_FR1); // fsabs <fdreg>,<fsreg>
else /* ABS.D - MIPS I */
- UML_FDABS(block, FDVALD_FR1, FSVALD_FR1); // fdabs <fdreg>,<fsreg>
+ UML_FDABS(block, FDVALD_FR1, FSVALD_FR1); // fdabs <fdreg>,<fsreg>
return TRUE;
case 0x06:
if (IS_SINGLE(op)) /* MOV.S - MIPS I */
- UML_FSMOV(block, FDVALS_FR1, FSVALS_FR1); // fsmov <fdreg>,<fsreg>
+ UML_FSMOV(block, FDVALS_FR1, FSVALS_FR1); // fsmov <fdreg>,<fsreg>
else /* MOV.D - MIPS I */
- UML_FDMOV(block, FDVALD_FR1, FSVALD_FR1); // fdmov <fdreg>,<fsreg>
+ UML_FDMOV(block, FDVALD_FR1, FSVALD_FR1); // fdmov <fdreg>,<fsreg>
return TRUE;
case 0x07:
if (IS_SINGLE(op)) /* NEG.S - MIPS I */
{
- UML_FSNEG(block, FDVALS_FR1, FSVALS_FR1); // fsneg <fdreg>,<fsreg>
- UML_CMP(block, FSVALS_FR1, 0); // cmp <fsreg>,0.0
- UML_MOVc(block, COND_E, FDVALS_FR1, 0x80000000); // mov <fdreg>,-0.0,e
+ UML_FSNEG(block, FDVALS_FR1, FSVALS_FR1); // fsneg <fdreg>,<fsreg>
+ UML_CMP(block, FSVALS_FR1, 0); // cmp <fsreg>,0.0
+ UML_MOVc(block, COND_E, FDVALS_FR1, 0x80000000); // mov <fdreg>,-0.0,e
}
else /* NEG.D - MIPS I */
{
- UML_FDNEG(block, FDVALD_FR1, FSVALD_FR1); // fdneg <fdreg>,<fsreg>
- UML_DCMP(block, FSVALD_FR1, 0); // dcmp <fsreg>,0.0
- UML_DMOVc(block, COND_E, FDVALD_FR1, 0x8000000000000000L);// mov <fdreg>,-0.0,e
+ UML_FDNEG(block, FDVALD_FR1, FSVALD_FR1); // fdneg <fdreg>,<fsreg>
+ UML_DCMP(block, FSVALD_FR1, 0); // dcmp <fsreg>,0.0
+ UML_DMOVc(block, COND_E, FDVALD_FR1, 0x8000000000000000L);// mov <fdreg>,-0.0,e
}
return TRUE;
case 0x08:
if (IS_SINGLE(op)) /* ROUND.L.S - MIPS III */
- UML_FSTOINT(block, FDVALD_FR1, FSVALS_FR1, SIZE_QWORD, ROUND_ROUND); // fstoint f0,<fsreg>,qword,round
+ UML_FSTOINT(block, FDVALD_FR1, FSVALS_FR1, SIZE_QWORD, ROUND_ROUND); // fstoint f0,<fsreg>,qword,round
else /* ROUND.L.D - MIPS III */
- UML_FDTOINT(block, FDVALD_FR1, FSVALD_FR1, SIZE_QWORD, ROUND_ROUND); // fdtoint f0,f0,qword,round
+ UML_FDTOINT(block, FDVALD_FR1, FSVALD_FR1, SIZE_QWORD, ROUND_ROUND); // fdtoint f0,f0,qword,round
return TRUE;
case 0x09:
if (IS_SINGLE(op)) /* TRUNC.L.S - MIPS III */
- UML_FSTOINT(block, FDVALD_FR1, FSVALS_FR1, SIZE_QWORD, ROUND_TRUNC); // fstoint f0,<fsreg>,qword,trunc
+ UML_FSTOINT(block, FDVALD_FR1, FSVALS_FR1, SIZE_QWORD, ROUND_TRUNC); // fstoint f0,<fsreg>,qword,trunc
else /* TRUNC.L.D - MIPS III */
- UML_FDTOINT(block, FDVALD_FR1, FSVALD_FR1, SIZE_QWORD, ROUND_TRUNC); // fdtoint f0,f0,qword,trunc
+ UML_FDTOINT(block, FDVALD_FR1, FSVALD_FR1, SIZE_QWORD, ROUND_TRUNC); // fdtoint f0,f0,qword,trunc
return TRUE;
case 0x0a:
if (IS_SINGLE(op)) /* CEIL.L.S - MIPS III */
- UML_FSTOINT(block, FDVALD_FR1, FSVALS_FR1, SIZE_QWORD, ROUND_CEIL); // fstoint f0,<fsreg>,qword,ceil
+ UML_FSTOINT(block, FDVALD_FR1, FSVALS_FR1, SIZE_QWORD, ROUND_CEIL); // fstoint f0,<fsreg>,qword,ceil
else /* CEIL.L.D - MIPS III */
- UML_FDTOINT(block, FDVALD_FR1, FSVALD_FR1, SIZE_QWORD, ROUND_CEIL); // fdtoint f0,<fsreg>,qword,ceil
+ UML_FDTOINT(block, FDVALD_FR1, FSVALD_FR1, SIZE_QWORD, ROUND_CEIL); // fdtoint f0,<fsreg>,qword,ceil
return TRUE;
case 0x0b:
if (IS_SINGLE(op)) /* FLOOR.L.S - MIPS III */
- UML_FSTOINT(block, FDVALD_FR1, FSVALS_FR1, SIZE_QWORD, ROUND_FLOOR); // fstoint f0,<fsreg>,qword,floor
+ UML_FSTOINT(block, FDVALD_FR1, FSVALS_FR1, SIZE_QWORD, ROUND_FLOOR); // fstoint f0,<fsreg>,qword,floor
else /* FLOOR.L.D - MIPS III */
- UML_FDTOINT(block, FDVALD_FR1, FSVALD_FR1, SIZE_QWORD, ROUND_FLOOR); // fdtoint f0,<fsreg>,qword,floor
+ UML_FDTOINT(block, FDVALD_FR1, FSVALD_FR1, SIZE_QWORD, ROUND_FLOOR); // fdtoint f0,<fsreg>,qword,floor
return TRUE;
case 0x0c:
if (IS_SINGLE(op)) /* ROUND.W.S - MIPS II */
- UML_FSTOINT(block, FDVALS_FR1, FSVALS_FR1, SIZE_DWORD, ROUND_ROUND); // fstoint <fdreg>,<fsreg>,dword,round
+ UML_FSTOINT(block, FDVALS_FR1, FSVALS_FR1, SIZE_DWORD, ROUND_ROUND); // fstoint <fdreg>,<fsreg>,dword,round
else /* ROUND.W.D - MIPS II */
- UML_FDTOINT(block, FDVALS_FR1, FSVALD_FR1, SIZE_DWORD, ROUND_ROUND); // fdtoint <fdreg>,F0,dword,round
+ UML_FDTOINT(block, FDVALS_FR1, FSVALD_FR1, SIZE_DWORD, ROUND_ROUND); // fdtoint <fdreg>,F0,dword,round
return TRUE;
case 0x0d:
if (IS_SINGLE(op)) /* TRUNC.W.S - MIPS II */
UML_FSTOINT(block, FDVALS_FR1, FSVALS_FR1, SIZE_DWORD, ROUND_TRUNC);// fstoint <fdreg>,<fsreg>,dword,trunc
else /* TRUNC.W.D - MIPS II */
- UML_FDTOINT(block, FDVALS_FR1, FSVALD_FR1, SIZE_DWORD, ROUND_TRUNC); // fdtoint <fdreg>,F0,dword,trunc
+ UML_FDTOINT(block, FDVALS_FR1, FSVALD_FR1, SIZE_DWORD, ROUND_TRUNC); // fdtoint <fdreg>,F0,dword,trunc
return TRUE;
case 0x0e:
if (IS_SINGLE(op)) /* CEIL.W.S - MIPS II */
UML_FSTOINT(block, FDVALS_FR1, FSVALS_FR1, SIZE_DWORD, ROUND_CEIL);// fstoint <fdreg>,<fsreg>,dword,ceil
else /* CEIL.W.D - MIPS II */
- UML_FDTOINT(block, FDVALS_FR1, FSVALD_FR1, SIZE_DWORD, ROUND_CEIL); // fdtoint <fdreg>,F0,dword,ceil
+ UML_FDTOINT(block, FDVALS_FR1, FSVALD_FR1, SIZE_DWORD, ROUND_CEIL); // fdtoint <fdreg>,F0,dword,ceil
return TRUE;
case 0x0f:
if (IS_SINGLE(op)) /* FLOOR.W.S - MIPS II */
UML_FSTOINT(block, FDVALS_FR1, FSVALS_FR1, SIZE_DWORD, ROUND_FLOOR);// fstoint <fdreg>,<fsreg>,dword,floor
else /* FLOOR.W.D - MIPS II */
- UML_FDTOINT(block, FDVALS_FR1, FSVALD_FR1, SIZE_DWORD, ROUND_FLOOR); // fdtoint <fdreg>,F0,dword,floor
+ UML_FDTOINT(block, FDVALS_FR1, FSVALD_FR1, SIZE_DWORD, ROUND_FLOOR); // fdtoint <fdreg>,F0,dword,floor
return TRUE;
case 0x11:
@@ -3556,46 +3556,46 @@ int mips3_device::generate_cop1_fr1(drcuml_block *block, compiler_state *compile
return TRUE;
case 0x12:
- UML_DCMP(block, R64(RTREG), 0); // dcmp <rtreg>,0
+ UML_DCMP(block, R64(RTREG), 0); // dcmp <rtreg>,0
if (IS_SINGLE(op)) /* MOVZ.S - MIPS IV */
- UML_FSMOVc(block, COND_Z, FDVALS_FR1, FSVALS_FR1); // fsmov <fdreg>,<fsreg>,Z
+ UML_FSMOVc(block, COND_Z, FDVALS_FR1, FSVALS_FR1); // fsmov <fdreg>,<fsreg>,Z
else /* MOVZ.D - MIPS IV */
- UML_FDMOVc(block, COND_Z, FDVALD_FR1, FSVALD_FR1); // fdmov <fdreg>,<fsreg>,Z
+ UML_FDMOVc(block, COND_Z, FDVALD_FR1, FSVALD_FR1); // fdmov <fdreg>,<fsreg>,Z
return TRUE;
case 0x13:
- UML_DCMP(block, R64(RTREG), 0); // dcmp <rtreg>,0
+ UML_DCMP(block, R64(RTREG), 0); // dcmp <rtreg>,0
if (IS_SINGLE(op)) /* MOVN.S - MIPS IV */
- UML_FSMOVc(block, COND_NZ, FDVALS_FR1, FSVALS_FR1); // fsmov <fdreg>,<fsreg>,NZ
+ UML_FSMOVc(block, COND_NZ, FDVALS_FR1, FSVALS_FR1); // fsmov <fdreg>,<fsreg>,NZ
else /* MOVN.D - MIPS IV */
- UML_FDMOVc(block, COND_NZ, FDVALD_FR1, FSVALD_FR1); // fdmov <fdreg>,<fsreg>,NZ
+ UML_FDMOVc(block, COND_NZ, FDVALD_FR1, FSVALD_FR1); // fdmov <fdreg>,<fsreg>,NZ
return TRUE;
case 0x15:
if (IS_SINGLE(op)) /* RECIP.S - MIPS IV */
- UML_FSRECIP(block, FDVALS_FR1, FSVALS_FR1); // fsrecip <fdreg>,<fsreg>
+ UML_FSRECIP(block, FDVALS_FR1, FSVALS_FR1); // fsrecip <fdreg>,<fsreg>
else /* RECIP.D - MIPS IV */
- UML_FDRECIP(block, FDVALD_FR1, FSVALD_FR1); // fdrecip <fdreg>,<fsreg>
+ UML_FDRECIP(block, FDVALD_FR1, FSVALD_FR1); // fdrecip <fdreg>,<fsreg>
return TRUE;
case 0x16:
if (IS_SINGLE(op)) /* RSQRT.S - MIPS IV */
- UML_FSRSQRT(block, FDVALS_FR1, FSVALS_FR1); // fsrsqrt <fdreg>,<fsreg>
+ UML_FSRSQRT(block, FDVALS_FR1, FSVALS_FR1); // fsrsqrt <fdreg>,<fsreg>
else /* RSQRT.D - MIPS IV */
- UML_FDRSQRT(block, FDVALD_FR1, FSVALD_FR1); // fdrsqrt <fdreg>,<fsreg>
+ UML_FDRSQRT(block, FDVALD_FR1, FSVALD_FR1); // fdrsqrt <fdreg>,<fsreg>
return TRUE;
case 0x20:
if (IS_INTEGRAL(op))
{
if (IS_SINGLE(op)) /* CVT.S.W - MIPS I */
- UML_FSFRINT(block, FDVALS_FR1, FSVALS_FR1, SIZE_DWORD); // fsfrint <fdreg>,<fsreg>,dword
+ UML_FSFRINT(block, FDVALS_FR1, FSVALS_FR1, SIZE_DWORD); // fsfrint <fdreg>,<fsreg>,dword
else /* CVT.S.L - MIPS I */
- UML_FSFRINT(block, FDVALS_FR1, FSVALD_FR1, SIZE_QWORD); // fsfrint <fdreg>,<fsreg>,qword
+ UML_FSFRINT(block, FDVALS_FR1, FSVALD_FR1, SIZE_QWORD); // fsfrint <fdreg>,<fsreg>,qword
}
else /* CVT.S.D - MIPS I */
{
- UML_FSFRFLT(block, FDVALS_FR1, FSVALD_FR1, SIZE_QWORD); // fsfrflt <fdreg>,f0,qword
+ UML_FSFRFLT(block, FDVALS_FR1, FSVALD_FR1, SIZE_QWORD); // fsfrflt <fdreg>,f0,qword
}
return TRUE;
@@ -3603,28 +3603,28 @@ int mips3_device::generate_cop1_fr1(drcuml_block *block, compiler_state *compile
if (IS_INTEGRAL(op))
{
if (IS_SINGLE(op)) /* CVT.D.W - MIPS I */
- UML_FDFRINT(block, FDVALD_FR1, FSVALS_FR1, SIZE_DWORD); // fdfrint <fdreg>,<fsreg>,dword
+ UML_FDFRINT(block, FDVALD_FR1, FSVALS_FR1, SIZE_DWORD); // fdfrint <fdreg>,<fsreg>,dword
else /* CVT.D.L - MIPS I */
- UML_FDFRINT(block, FDVALD_FR1, FSVALD_FR1, SIZE_QWORD); // fdfrint <fdreg>,<fsreg>,qword
+ UML_FDFRINT(block, FDVALD_FR1, FSVALD_FR1, SIZE_QWORD); // fdfrint <fdreg>,<fsreg>,qword
}
else /* CVT.D.S - MIPS I */
{
- UML_FDFRFLT(block, FDVALD_FR1, FDVALS_FR1, SIZE_DWORD); // fdfrflt <fdreg>,<fsreg>,dword
+ UML_FDFRFLT(block, FDVALD_FR1, FDVALS_FR1, SIZE_DWORD); // fdfrflt <fdreg>,<fsreg>,dword
}
return TRUE;
case 0x24:
if (IS_SINGLE(op)) /* CVT.W.S - MIPS I */
- UML_FSTOINT(block, FDVALS_FR1, FSVALS_FR1, SIZE_DWORD, ROUND_DEFAULT); // fstoint <fdreg>,<fsreg>,dword,default
+ UML_FSTOINT(block, FDVALS_FR1, FSVALS_FR1, SIZE_DWORD, ROUND_DEFAULT); // fstoint <fdreg>,<fsreg>,dword,default
else /* CVT.W.D - MIPS I */
- UML_FDTOINT(block, FDVALS_FR1, FSVALD_FR1, SIZE_DWORD, ROUND_DEFAULT); // fdtoint <fdreg>,<fsreg>,dword,default
+ UML_FDTOINT(block, FDVALS_FR1, FSVALD_FR1, SIZE_DWORD, ROUND_DEFAULT); // fdtoint <fdreg>,<fsreg>,dword,default
return TRUE;
case 0x25:
if (IS_SINGLE(op)) /* CVT.L.S - MIPS I */
- UML_FSTOINT(block, FDVALD_FR1, FSVALS_FR1, SIZE_QWORD, ROUND_DEFAULT); // fstoint <fdreg>,<fsreg>,qword,default
+ UML_FSTOINT(block, FDVALD_FR1, FSVALS_FR1, SIZE_QWORD, ROUND_DEFAULT); // fstoint <fdreg>,<fsreg>,qword,default
else /* CVT.L.D - MIPS I */
- UML_FDTOINT(block, FDVALD_FR1, FSVALD_FR1, SIZE_QWORD, ROUND_DEFAULT); // fdtoint <fdreg>,<fsreg>,qword,default
+ UML_FDTOINT(block, FDVALD_FR1, FSVALD_FR1, SIZE_QWORD, ROUND_DEFAULT); // fdtoint <fdreg>,<fsreg>,qword,default
return TRUE;
case 0x30:
@@ -3635,82 +3635,82 @@ int mips3_device::generate_cop1_fr1(drcuml_block *block, compiler_state *compile
case 0x31:
case 0x39:
if (IS_SINGLE(op)) /* C.UN.S - MIPS I */
- UML_FSCMP(block, FSVALS_FR1, FTVALS_FR1); // fscmp <fsreg>,<ftreg>
+ UML_FSCMP(block, FSVALS_FR1, FTVALS_FR1); // fscmp <fsreg>,<ftreg>
else /* C.UN.D - MIPS I */
- UML_FDCMP(block, FSVALD_FR1, FTVALD_FR1); // fdcmp <fsreg>,<ftreg>
- UML_SETc(block, COND_U, I0); // set i0,u
+ UML_FDCMP(block, FSVALD_FR1, FTVALD_FR1); // fdcmp <fsreg>,<ftreg>
+ UML_SETc(block, COND_U, I0); // set i0,u
UML_ROLINS(block, CCR132(31), I0, FCCSHIFT(op >> 8), FCCMASK(op >> 8)); // rolins ccr31,i0,fccshift,fcc
return TRUE;
case 0x32:
case 0x3a:
if (IS_SINGLE(op)) /* C.EQ.S - MIPS I */
- UML_FSCMP(block, FSVALS_FR1, FTVALS_FR1); // fscmp <fsreg>,<ftreg>
+ UML_FSCMP(block, FSVALS_FR1, FTVALS_FR1); // fscmp <fsreg>,<ftreg>
else /* C.EQ.D - MIPS I */
- UML_FDCMP(block, FSVALD_FR1, FTVALD_FR1); // fdcmp <fsreg>,<ftreg>
- UML_SETc(block, COND_E, I0); // set i0,e
- UML_SETc(block, COND_NU, I1); // set i1,nu
- UML_AND(block, I0, I0, I1); // and i0,i0,i1
+ UML_FDCMP(block, FSVALD_FR1, FTVALD_FR1); // fdcmp <fsreg>,<ftreg>
+ UML_SETc(block, COND_E, I0); // set i0,e
+ UML_SETc(block, COND_NU, I1); // set i1,nu
+ UML_AND(block, I0, I0, I1); // and i0,i0,i1
UML_ROLINS(block, CCR132(31), I0, FCCSHIFT(op >> 8), FCCMASK(op >> 8)); // rolins ccr31,i0,fccshift,fcc
return TRUE;
case 0x33:
case 0x3b:
if (IS_SINGLE(op)) /* C.UEQ.S - MIPS I */
- UML_FSCMP(block, FSVALS_FR1, FTVALS_FR1); // fscmp <fsreg>,<ftreg>
+ UML_FSCMP(block, FSVALS_FR1, FTVALS_FR1); // fscmp <fsreg>,<ftreg>
else /* C.UEQ.D - MIPS I */
- UML_FDCMP(block, FSVALD_FR1, FTVALD_FR1); // fdcmp f0,f1
- UML_SETc(block, COND_U, I0); // set i0,u
- UML_SETc(block, COND_E, I1); // set i1,e
- UML_OR(block, I0, I0, I1); // or i0,i0,i1
+ UML_FDCMP(block, FSVALD_FR1, FTVALD_FR1); // fdcmp f0,f1
+ UML_SETc(block, COND_U, I0); // set i0,u
+ UML_SETc(block, COND_E, I1); // set i1,e
+ UML_OR(block, I0, I0, I1); // or i0,i0,i1
UML_ROLINS(block, CCR132(31), I0, FCCSHIFT(op >> 8), FCCMASK(op >> 8)); // rolins ccr31,i0,fccshift,fcc
return TRUE;
case 0x34:
case 0x3c:
if (IS_SINGLE(op)) /* C.OLT.S - MIPS I */
- UML_FSCMP(block, FSVALS_FR1, FTVALS_FR1); // fscmp <fsreg>,<ftreg>
+ UML_FSCMP(block, FSVALS_FR1, FTVALS_FR1); // fscmp <fsreg>,<ftreg>
else /* C.OLT.D - MIPS I */
- UML_FDCMP(block, FSVALD_FR1, FTVALD_FR1); // fdcmp f0,f1
- UML_SETc(block, COND_B, I0); // set i0,b
- UML_SETc(block, COND_NU, I1); // set i1,nu
- UML_AND(block, I0, I0, I1); // and i0,i0,i1
+ UML_FDCMP(block, FSVALD_FR1, FTVALD_FR1); // fdcmp f0,f1
+ UML_SETc(block, COND_B, I0); // set i0,b
+ UML_SETc(block, COND_NU, I1); // set i1,nu
+ UML_AND(block, I0, I0, I1); // and i0,i0,i1
UML_ROLINS(block, CCR132(31), I0, FCCSHIFT(op >> 8), FCCMASK(op >> 8)); // rolins ccr31,i0,fccshift,fcc
return TRUE;
case 0x35:
case 0x3d:
if (IS_SINGLE(op)) /* C.ULT.S - MIPS I */
- UML_FSCMP(block, FSVALS_FR1, FTVALS_FR1); // fscmp <fsreg>,<ftreg>
+ UML_FSCMP(block, FSVALS_FR1, FTVALS_FR1); // fscmp <fsreg>,<ftreg>
else /* C.ULT.D - MIPS I */
- UML_FDCMP(block, FSVALD_FR1, FTVALD_FR1); // fdcmp f0,f1
- UML_SETc(block, COND_U, I0); // set i0,u
- UML_SETc(block, COND_B, I1); // set i1,b
- UML_OR(block, I0, I0, I1); // or i0,i0,i1
+ UML_FDCMP(block, FSVALD_FR1, FTVALD_FR1); // fdcmp f0,f1
+ UML_SETc(block, COND_U, I0); // set i0,u
+ UML_SETc(block, COND_B, I1); // set i1,b
+ UML_OR(block, I0, I0, I1); // or i0,i0,i1
UML_ROLINS(block, CCR132(31), I0, FCCSHIFT(op >> 8), FCCMASK(op >> 8)); // rolins ccr31,i0,fccshift,fcc
return TRUE;
case 0x36:
case 0x3e:
if (IS_SINGLE(op)) /* C.OLE.S - MIPS I */
- UML_FSCMP(block, FSVALS_FR1, FTVALS_FR1); // fscmp <fsreg>,<ftreg>
+ UML_FSCMP(block, FSVALS_FR1, FTVALS_FR1); // fscmp <fsreg>,<ftreg>
else /* C.OLE.D - MIPS I */
- UML_FDCMP(block, FSVALD_FR1, FTVALD_FR1); // fdcmp f0,f1
- UML_SETc(block, COND_BE, I0); // set i0,be
- UML_SETc(block, COND_NU, I1); // set i1,nu
- UML_AND(block, I0, I0, I1); // and i0,i0,i1
+ UML_FDCMP(block, FSVALD_FR1, FTVALD_FR1); // fdcmp f0,f1
+ UML_SETc(block, COND_BE, I0); // set i0,be
+ UML_SETc(block, COND_NU, I1); // set i1,nu
+ UML_AND(block, I0, I0, I1); // and i0,i0,i1
UML_ROLINS(block, CCR132(31), I0, FCCSHIFT(op >> 8), FCCMASK(op >> 8)); // rolins ccr31,i0,fccshift,fcc
return TRUE;
case 0x37:
case 0x3f:
if (IS_SINGLE(op)) /* C.ULE.S - MIPS I */
- UML_FSCMP(block, FSVALS_FR1, FTVALS_FR1); // fscmp <fsreg>,<ftreg>
+ UML_FSCMP(block, FSVALS_FR1, FTVALS_FR1); // fscmp <fsreg>,<ftreg>
else /* C.ULE.D - MIPS I */
- UML_FDCMP(block, FSVALD_FR1, FTVALD_FR1); // fdcmp f0,f1
- UML_SETc(block, COND_U, I0); // set i0,u
- UML_SETc(block, COND_BE, I1); // set i1,be
- UML_OR(block, I0, I0, I1); // or i0,i0,i1
+ UML_FDCMP(block, FSVALD_FR1, FTVALD_FR1); // fdcmp f0,f1
+ UML_SETc(block, COND_U, I0); // set i0,u
+ UML_SETc(block, COND_BE, I1); // set i1,be
+ UML_OR(block, I0, I0, I1); // or i0,i0,i1
UML_ROLINS(block, CCR132(31), I0, FCCSHIFT(op >> 8), FCCMASK(op >> 8)); // rolins ccr31,i0,fccshift,fcc
return TRUE;
}
@@ -3737,33 +3737,33 @@ int mips3_device::generate_cop1x_fr0(drcuml_block *block, compiler_state *compil
switch (op & 0x3f)
{
case 0x00: /* LWXC1 - MIPS IV */
- UML_ADD(block, I0, R32(RSREG), R32(RTREG)); // add i0,<rsreg>,<rtreg>
- UML_CALLH(block, *m_read32[m_core->mode >> 1]); // callh read32
- UML_MOV(block, FDVALS_FR0, I0); // mov <cpr1_fd>,i0
+ UML_ADD(block, I0, R32(RSREG), R32(RTREG)); // add i0,<rsreg>,<rtreg>
+ UML_CALLH(block, *m_read32[m_core->mode >> 1]); // callh read32
+ UML_MOV(block, FDVALS_FR0, I0); // mov <cpr1_fd>,i0
if (!in_delay_slot)
generate_update_cycles(block, compiler, desc->pc + 4, TRUE);
return TRUE;
case 0x01: /* LDXC1 - MIPS IV */
- UML_ADD(block, I0, R32(RSREG), R32(RTREG)); // add i0,<rsreg>,<rtreg>
- UML_CALLH(block, *m_read64[m_core->mode >> 1]); // callh read64
+ UML_ADD(block, I0, R32(RSREG), R32(RTREG)); // add i0,<rsreg>,<rtreg>
+ UML_CALLH(block, *m_read64[m_core->mode >> 1]); // callh read64
generate_set_cop1_reg64_i2d(block, compiler, desc, RTREG, I0);
if (!in_delay_slot)
generate_update_cycles(block, compiler, desc->pc + 4, TRUE);
return TRUE;
case 0x08: /* SWXC1 - MIPS IV */
- UML_ADD(block, I0, R32(RSREG), R32(RTREG)); // add i0,<rsreg>,<rtreg>
- UML_MOV(block, I1, FSVALS_FR0); // mov i1,<cpr1_fs>
- UML_CALLH(block, *m_write32[m_core->mode >> 1]); // callh write32
+ UML_ADD(block, I0, R32(RSREG), R32(RTREG)); // add i0,<rsreg>,<rtreg>
+ UML_MOV(block, I1, FSVALS_FR0); // mov i1,<cpr1_fs>
+ UML_CALLH(block, *m_write32[m_core->mode >> 1]); // callh write32
if (!in_delay_slot)
generate_update_cycles(block, compiler, desc->pc + 4, TRUE);
return TRUE;
case 0x09: /* SDXC1 - MIPS IV */
generate_get_cop1_reg64_d2i(block, compiler, desc, FSREG, I1);
- UML_ADD(block, I0, R32(RSREG), R32(RTREG)); // add i0,<rsreg>,<rtreg>
- UML_CALLH(block, *m_write64[m_core->mode >> 1]); // callh write64
+ UML_ADD(block, I0, R32(RSREG), R32(RTREG)); // add i0,<rsreg>,<rtreg>
+ UML_CALLH(block, *m_write64[m_core->mode >> 1]); // callh write64
if (!in_delay_slot)
generate_update_cycles(block, compiler, desc->pc + 4, TRUE);
return TRUE;
@@ -3772,61 +3772,61 @@ int mips3_device::generate_cop1x_fr0(drcuml_block *block, compiler_state *compil
return TRUE;
case 0x20: /* MADD.S - MIPS IV */
- UML_FSMUL(block, F0, FSVALS_FR0, FTVALS_FR0); // fsmul f0,<fsreg>,<ftreg>
- UML_FSADD(block, FDVALS_FR0, F0, FRVALS_FR0); // fsadd <fdreg>,f0,<frreg>
+ UML_FSMUL(block, F0, FSVALS_FR0, FTVALS_FR0); // fsmul f0,<fsreg>,<ftreg>
+ UML_FSADD(block, FDVALS_FR0, F0, FRVALS_FR0); // fsadd <fdreg>,f0,<frreg>
return TRUE;
case 0x21: /* MADD.D - MIPS IV */
generate_get_cop1_reg64(block, compiler, desc, FSREG, F0);
generate_get_cop1_reg64(block, compiler, desc, FTREG, F1);
generate_get_cop1_reg64(block, compiler, desc, FRREG, F2);
- UML_FDMUL(block, F3, F0, F1); // fdmul f3,f0,f1
- UML_FDADD(block, F3, F3, F2); // fdadd f3,f3,f2
- generate_set_cop1_reg64(block, compiler, desc, FDREG, F3); // dmov <fdreg>,f3
+ UML_FDMUL(block, F3, F0, F1); // fdmul f3,f0,f1
+ UML_FDADD(block, F3, F3, F2); // fdadd f3,f3,f2
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, F3); // dmov <fdreg>,f3
return TRUE;
case 0x28: /* MSUB.S - MIPS IV */
- UML_FSMUL(block, F0, FSVALS_FR0, FTVALS_FR0); // fsmul f0,<fsreg>,<ftreg>
- UML_FSSUB(block, FDVALS_FR0, F0, FRVALS_FR0); // fssub <fdreg>,f0,<frreg>
+ UML_FSMUL(block, F0, FSVALS_FR0, FTVALS_FR0); // fsmul f0,<fsreg>,<ftreg>
+ UML_FSSUB(block, FDVALS_FR0, F0, FRVALS_FR0); // fssub <fdreg>,f0,<frreg>
return TRUE;
case 0x29: /* MSUB.D - MIPS IV */
generate_get_cop1_reg64(block, compiler, desc, FSREG, F0);
generate_get_cop1_reg64(block, compiler, desc, FTREG, F1);
generate_get_cop1_reg64(block, compiler, desc, FRREG, F2);
- UML_FDMUL(block, F3, F0, F1); // fdmul f3,f0,f1
- UML_FDSUB(block, F3, F3, F2); // fdadd f3,f3,f2
- generate_set_cop1_reg64(block, compiler, desc, FDREG, F3); // dmov <fdreg>,f3
+ UML_FDMUL(block, F3, F0, F1); // fdmul f3,f0,f1
+ UML_FDSUB(block, F3, F3, F2); // fdadd f3,f3,f2
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, F3); // dmov <fdreg>,f3
return TRUE;
case 0x30: /* NMADD.S - MIPS IV */
- UML_FSMUL(block, F0, FSVALS_FR0, FTVALS_FR0); // fsmul f0,<fsreg>,<ftreg>
- UML_FSADD(block, F0, F0, FRVALS_FR0); // fsadd f0,f0,<frreg>
- UML_FSNEG(block, FDVALS_FR0, F0); // fsneg <fdreg>,f0
+ UML_FSMUL(block, F0, FSVALS_FR0, FTVALS_FR0); // fsmul f0,<fsreg>,<ftreg>
+ UML_FSADD(block, F0, F0, FRVALS_FR0); // fsadd f0,f0,<frreg>
+ UML_FSNEG(block, FDVALS_FR0, F0); // fsneg <fdreg>,f0
return TRUE;
case 0x31: /* NMADD.D - MIPS IV */
generate_get_cop1_reg64(block, compiler, desc, FSREG, F0);
generate_get_cop1_reg64(block, compiler, desc, FTREG, F1);
generate_get_cop1_reg64(block, compiler, desc, FRREG, F2);
- UML_FDMUL(block, F3, F0, F1); // fdmul f3,f0,f1
- UML_FDADD(block, F3, F3, F2); // fdadd f3,f3,f2
- UML_FDNEG(block, F3, F3); // fdneg f3,f3
- generate_set_cop1_reg64(block, compiler, desc, FDREG, F3); // dmov <fdreg>,f3
+ UML_FDMUL(block, F3, F0, F1); // fdmul f3,f0,f1
+ UML_FDADD(block, F3, F3, F2); // fdadd f3,f3,f2
+ UML_FDNEG(block, F3, F3); // fdneg f3,f3
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, F3); // dmov <fdreg>,f3
return TRUE;
case 0x38: /* NMSUB.S - MIPS IV */
- UML_FSMUL(block, F0, FSVALS_FR0, FTVALS_FR0); // fsmul f0,<fsreg>,<ftreg>
- UML_FSSUB(block, FDVALS_FR0, FRVALS_FR0, F0); // fssub <fdreg>,<frreg>,f0
+ UML_FSMUL(block, F0, FSVALS_FR0, FTVALS_FR0); // fsmul f0,<fsreg>,<ftreg>
+ UML_FSSUB(block, FDVALS_FR0, FRVALS_FR0, F0); // fssub <fdreg>,<frreg>,f0
return TRUE;
case 0x39: /* NMSUB.D - MIPS IV */
generate_get_cop1_reg64(block, compiler, desc, FSREG, F0);
generate_get_cop1_reg64(block, compiler, desc, FTREG, F1);
generate_get_cop1_reg64(block, compiler, desc, FRREG, F2);
- UML_FDMUL(block, F3, F0, F1); // fdmul f4,f0,f1
- UML_FDSUB(block, F3, F2, F0); // fdsub f3,f2,f0
- generate_set_cop1_reg64(block, compiler, desc, FDREG, F3); // dmov <fdreg>,f3
+ UML_FDMUL(block, F3, F0, F1); // fdmul f4,f0,f1
+ UML_FDSUB(block, F3, F2, F0); // fdsub f3,f2,f0
+ generate_set_cop1_reg64(block, compiler, desc, FDREG, F3); // dmov <fdreg>,f3
return TRUE;
default:
@@ -3850,24 +3850,24 @@ int mips3_device::generate_cop1x_fr1(drcuml_block *block, compiler_state *compil
switch (op & 0x3f)
{
case 0x00: /* LWXC1 - MIPS IV */
- UML_ADD(block, I0, R32(RSREG), R32(RTREG)); // add i0,<rsreg>,<rtreg>
- UML_CALLH(block, *m_read32[m_core->mode >> 1]); // callh read32
- UML_MOV(block, FDVALS_FR1, I0); // mov <cpr1_fd>,i0
+ UML_ADD(block, I0, R32(RSREG), R32(RTREG)); // add i0,<rsreg>,<rtreg>
+ UML_CALLH(block, *m_read32[m_core->mode >> 1]); // callh read32
+ UML_MOV(block, FDVALS_FR1, I0); // mov <cpr1_fd>,i0
if (!in_delay_slot)
generate_update_cycles(block, compiler, desc->pc + 4, TRUE);
return TRUE;
case 0x01: /* LDXC1 - MIPS IV */
- UML_ADD(block, I0, R32(RSREG), R32(RTREG)); // add i0,<rsreg>,<rtreg>
+ UML_ADD(block, I0, R32(RSREG), R32(RTREG)); // add i0,<rsreg>,<rtreg>
UML_CALLH(block, *m_read64[m_core->mode >> 1]); // callh read64
- UML_DMOV(block, FDVALD_FR1, I0); // dmov <cpr1_fd>,i0
+ UML_DMOV(block, FDVALD_FR1, I0); // dmov <cpr1_fd>,i0
if (!in_delay_slot)
generate_update_cycles(block, compiler, desc->pc + 4, TRUE);
return TRUE;
case 0x08: /* SWXC1 - MIPS IV */
- UML_ADD(block, I0, R32(RSREG), R32(RTREG)); // add i0,<rsreg>,<rtreg>
- UML_MOV(block, I1, FSVALS_FR1); // mov i1,<cpr1_fs>
+ UML_ADD(block, I0, R32(RSREG), R32(RTREG)); // add i0,<rsreg>,<rtreg>
+ UML_MOV(block, I1, FSVALS_FR1); // mov i1,<cpr1_fs>
UML_CALLH(block, *m_write32[m_core->mode >> 1]);// callh write32
if (!in_delay_slot)
generate_update_cycles(block, compiler, desc->pc + 4, TRUE);
@@ -3885,45 +3885,45 @@ int mips3_device::generate_cop1x_fr1(drcuml_block *block, compiler_state *compil
return TRUE;
case 0x20: /* MADD.S - MIPS IV */
- UML_FSMUL(block, F0, FSVALS_FR1, FTVALS_FR1); // fsmul f0,<fsreg>,<ftreg>
- UML_FSADD(block, FDVALS_FR1, F0, FRVALS_FR1); // fsadd <fdreg>,f0,<frreg>
+ UML_FSMUL(block, F0, FSVALS_FR1, FTVALS_FR1); // fsmul f0,<fsreg>,<ftreg>
+ UML_FSADD(block, FDVALS_FR1, F0, FRVALS_FR1); // fsadd <fdreg>,f0,<frreg>
return TRUE;
case 0x21: /* MADD.D - MIPS IV */
- UML_FDMUL(block, F0, FSVALD_FR1, FTVALD_FR1); // fdmul f0,<fsreg>,<ftreg>
- UML_FDADD(block, FDVALD_FR1, F0, FRVALD_FR1); // fdadd <fdreg>,f0,<frreg>
+ UML_FDMUL(block, F0, FSVALD_FR1, FTVALD_FR1); // fdmul f0,<fsreg>,<ftreg>
+ UML_FDADD(block, FDVALD_FR1, F0, FRVALD_FR1); // fdadd <fdreg>,f0,<frreg>
return TRUE;
case 0x28: /* MSUB.S - MIPS IV */
- UML_FSMUL(block, F0, FSVALS_FR1, FTVALS_FR1); // fsmul f0,<fsreg>,<ftreg>
- UML_FSSUB(block, FDVALS_FR1, F0, FRVALS_FR1); // fssub <fdreg>,f0,<frreg>
+ UML_FSMUL(block, F0, FSVALS_FR1, FTVALS_FR1); // fsmul f0,<fsreg>,<ftreg>
+ UML_FSSUB(block, FDVALS_FR1, F0, FRVALS_FR1); // fssub <fdreg>,f0,<frreg>
return TRUE;
case 0x29: /* MSUB.D - MIPS IV */
- UML_FDMUL(block, F0, FSVALD_FR1, FTVALD_FR1); // fdmul f0,<fsreg>,<ftreg>
- UML_FDSUB(block, FDVALD_FR1, F0, FRVALD_FR1); // fdsub <fdreg>,f0,<frreg>
+ UML_FDMUL(block, F0, FSVALD_FR1, FTVALD_FR1); // fdmul f0,<fsreg>,<ftreg>
+ UML_FDSUB(block, FDVALD_FR1, F0, FRVALD_FR1); // fdsub <fdreg>,f0,<frreg>
return TRUE;
case 0x30: /* NMADD.S - MIPS IV */
- UML_FSMUL(block, F0, FSVALS_FR1, FTVALS_FR1); // fsmul f0,<fsreg>,<ftreg>
- UML_FSADD(block, F0, F0, FRVALS_FR1); // fsadd f0,f0,<frreg>
- UML_FSNEG(block, FDVALS_FR1, F0); // fsneg <fdreg>,f0
+ UML_FSMUL(block, F0, FSVALS_FR1, FTVALS_FR1); // fsmul f0,<fsreg>,<ftreg>
+ UML_FSADD(block, F0, F0, FRVALS_FR1); // fsadd f0,f0,<frreg>
+ UML_FSNEG(block, FDVALS_FR1, F0); // fsneg <fdreg>,f0
return TRUE;
case 0x31: /* NMADD.D - MIPS IV */
- UML_FDMUL(block, F0, FSVALD_FR1, FTVALD_FR1); // fdmul f0,<fsreg>,<ftreg>
- UML_FDADD(block, F0, F0, FRVALD_FR1); // fdadd f0,f0,<frreg>
- UML_FDNEG(block, FDVALD_FR1, F0); // fdneg <fdreg>,f0
+ UML_FDMUL(block, F0, FSVALD_FR1, FTVALD_FR1); // fdmul f0,<fsreg>,<ftreg>
+ UML_FDADD(block, F0, F0, FRVALD_FR1); // fdadd f0,f0,<frreg>
+ UML_FDNEG(block, FDVALD_FR1, F0); // fdneg <fdreg>,f0
return TRUE;
case 0x38: /* NMSUB.S - MIPS IV */
- UML_FSMUL(block, F0, FSVALS_FR1, FTVALS_FR1); // fsmul f0,<fsreg>,<ftreg>
- UML_FSSUB(block, FDVALS_FR1, FRVALS_FR1, F0); // fssub <fdreg>,<frreg>,f0
+ UML_FSMUL(block, F0, FSVALS_FR1, FTVALS_FR1); // fsmul f0,<fsreg>,<ftreg>
+ UML_FSSUB(block, FDVALS_FR1, FRVALS_FR1, F0); // fssub <fdreg>,<frreg>,f0
return TRUE;
case 0x39: /* NMSUB.D - MIPS IV */
- UML_FDMUL(block, F0, FSVALD_FR1, FTVALD_FR1); // fdmul f0,<fsreg>,<ftreg>
- UML_FDSUB(block, FDVALD_FR1, FRVALD_FR1, F1); // fdsub <fdreg>,<frreg>,f0
+ UML_FDMUL(block, F0, FSVALD_FR1, FTVALD_FR1); // fdmul f0,<fsreg>,<ftreg>
+ UML_FDSUB(block, FDVALD_FR1, FRVALD_FR1, F1); // fdsub <fdreg>,<frreg>,f0
return TRUE;
default:
diff --git a/src/devices/cpu/powerpc/ppccom.cpp b/src/devices/cpu/powerpc/ppccom.cpp
index f83e28e5750..ce7249a6414 100644
--- a/src/devices/cpu/powerpc/ppccom.cpp
+++ b/src/devices/cpu/powerpc/ppccom.cpp
@@ -951,7 +951,7 @@ void ppc_device::device_start()
if (beinfo.direct_iregs > 7)
m_regmap[2] = uml::I7;
-
+
if (beinfo.direct_fregs > 3)
m_fdregmap[0] = uml::F3;
if (beinfo.direct_fregs > 4)
diff --git a/src/devices/cpu/sm510/sm500.h b/src/devices/cpu/sm510/sm500.h
index aaf083c293a..0743632609d 100644
--- a/src/devices/cpu/sm510/sm500.h
+++ b/src/devices/cpu/sm510/sm500.h
@@ -39,7 +39,7 @@ O46 47 | | 14 K3
O36 48 | * | 13 K2
|________________________________________________/
- 1 2 3 4 5 6 7 8 9 10 11 12
+ 1 2 3 4 5 6 7 8 9 10 11 12
O26 O16 R4 R3 R2 R1 GND _T bt al ACL K1 note: bt = beta symbol, al = alpha symbol
*/
@@ -57,7 +57,7 @@ protected:
// opcode handlers
virtual void op_lb() override;
virtual void op_incb() override;
-
+
virtual void op_comcb();
virtual void op_ssr();
virtual void op_trs();
diff --git a/src/devices/cpu/sm510/sm500op.cpp b/src/devices/cpu/sm510/sm500op.cpp
index bb0bc6f043b..ee4571b4e76 100644
--- a/src/devices/cpu/sm510/sm500op.cpp
+++ b/src/devices/cpu/sm510/sm500op.cpp
@@ -92,4 +92,3 @@ void sm500_device::op_comcn()
}
// Test instructions
-
diff --git a/src/devices/cpu/sm510/sm510.cpp b/src/devices/cpu/sm510/sm510.cpp
index a602e611d99..b5eb56ab24f 100644
--- a/src/devices/cpu/sm510/sm510.cpp
+++ b/src/devices/cpu/sm510/sm510.cpp
@@ -3,7 +3,7 @@
/*
Known chips: (* means not emulated yet)
-
+
Sharp SM510 MCU family:
- SM510: 2.7Kx8 ROM, 128x4 RAM(32x4 for LCD)
- SM511: 4Kx8 ROM, 128x4 RAM(32x4 for LCD), melody controller
@@ -16,7 +16,7 @@
- *SM530: x
- *SM531: x
- *KB1013VK1-2: Soviet-era clone of SM500, minor differences
-
+
References:
- 1990 Sharp Microcomputers Data Book
- 1996 Sharp Microcomputer Databook
diff --git a/src/devices/cpu/sm510/sm510d.cpp b/src/devices/cpu/sm510/sm510d.cpp
index 7c78c33b318..ba765a716e2 100644
--- a/src/devices/cpu/sm510/sm510d.cpp
+++ b/src/devices/cpu/sm510/sm510d.cpp
@@ -26,14 +26,14 @@ enum e_mnemonics
mRM, mSM,
mPRE, mSME, mRME, mTMEL,
mSKIP, mCEND, mIDIV, mDR, mDTA,
-
+
// SM500-specific
mCOMCB, mRTN, mRTNS, mSSR, mTR, mTRS,
mADDC, mPDTW, mTW, mDTW,
mATS, mEXKSA, mEXKFA,
mRMF, mSMF, mCOMCN,
mTA, mTM2, mTG,
-
+
// KB1013VK1-2 aliases
mLC, mLM, mLE, mLAF, mLAS, mLDF, mBS0, mBS1, mXL, mXM, mXI, mXEI, mXD, mXED, mXE, mBM0, mBM1, mSM1,
mAM, mAC, mA10, mAS, mCLL, mCOM, mCLC, mSTC, mSCO, mSAO, mINC, mDEC, mSAM, mSAL, mNOP,
@@ -81,7 +81,7 @@ static const UINT8 s_bits[] =
2, 2,
8, 0, 0, 0,
0, 0, 0, 0, 0,
-
+
//
0, 0, 0, 4, 6, 6,
0, 0, 0, 0,
diff --git a/src/devices/cpu/sm510/sm511core.cpp b/src/devices/cpu/sm510/sm511core.cpp
index e98374f5905..c4c59d2d06a 100644
--- a/src/devices/cpu/sm510/sm511core.cpp
+++ b/src/devices/cpu/sm510/sm511core.cpp
@@ -159,7 +159,7 @@ void sm511_device::execute_one()
break; // 0xfc
} // big switch
-
+
// BM high bit is only valid for 1 step
m_sbm = (m_op == 0x02);
}
diff --git a/src/devices/machine/am9517a.cpp b/src/devices/machine/am9517a.cpp
index 6238d6e2d08..3465ee58b87 100644
--- a/src/devices/machine/am9517a.cpp
+++ b/src/devices/machine/am9517a.cpp
@@ -1337,4 +1337,3 @@ void pcxport_dmac_device::end_of_process()
m_state = STATE_SI;
}
-
diff --git a/src/devices/machine/gen_latch.cpp b/src/devices/machine/gen_latch.cpp
index a72305bcaa4..2a595595c14 100644
--- a/src/devices/machine/gen_latch.cpp
+++ b/src/devices/machine/gen_latch.cpp
@@ -32,7 +32,7 @@ generic_latch_8_device::generic_latch_8_device(const machine_config &mconfig, co
READ8_MEMBER( generic_latch_8_device::read )
{
- m_latch_read = 1;
+ m_latch_read = 1;
return m_latched_value;
}
@@ -114,7 +114,7 @@ generic_latch_16_device::generic_latch_16_device(const machine_config &mconfig,
READ16_MEMBER( generic_latch_16_device::read )
{
- m_latch_read = 1;
+ m_latch_read = 1;
return m_latched_value;
}
@@ -171,5 +171,3 @@ void generic_latch_16_device::device_start()
save_item(NAME(m_latched_value));
save_item(NAME(m_latch_read));
}
-
-
diff --git a/src/devices/machine/gen_latch.h b/src/devices/machine/gen_latch.h
index 2da8ca41cfb..ee1dc5d14cc 100644
--- a/src/devices/machine/gen_latch.h
+++ b/src/devices/machine/gen_latch.h
@@ -35,7 +35,7 @@ public:
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
-
+
DECLARE_WRITE8_MEMBER( preset_w );
DECLARE_WRITE8_MEMBER( clear_w );
DECLARE_WRITE_LINE_MEMBER( preset_w );
@@ -43,7 +43,7 @@ public:
protected:
virtual void device_start() override;
-
+
void sync_callback(void *ptr, INT32 param);
private:
UINT16 m_latched_value;
@@ -64,7 +64,7 @@ public:
DECLARE_READ16_MEMBER( read );
DECLARE_WRITE16_MEMBER( write );
-
+
DECLARE_WRITE16_MEMBER( preset_w );
DECLARE_WRITE16_MEMBER( clear_w );
DECLARE_WRITE_LINE_MEMBER( preset_w );
@@ -72,7 +72,7 @@ public:
protected:
virtual void device_start() override;
-
+
void sync_callback(void *ptr, INT32 param);
private:
UINT16 m_latched_value;
diff --git a/src/devices/machine/hp_taco.cpp b/src/devices/machine/hp_taco.cpp
index bde624733a2..553cf6fb4c3 100644
--- a/src/devices/machine/hp_taco.cpp
+++ b/src/devices/machine/hp_taco.cpp
@@ -189,52 +189,52 @@ enum {
#define CMD_CODE(reg) \
(((reg) >> 10) & 0x1f)
#define DIR_FWD(reg) \
- (BIT(reg , 15))
+ (BIT(reg , 15))
#define AUTO_STOP(reg) \
- (BIT(reg , 9))
+ (BIT(reg , 9))
#define LONG_GAP(reg) \
- (BIT(reg , 8))
+ (BIT(reg , 8))
#define SPEED_FAST(reg) \
(BIT(reg , 7))
#define CMD_OPT(reg) \
- (BIT(reg , 6))
+ (BIT(reg , 6))
#define DIR_FWD_MASK BIT_MASK(15) // Direction = forward
#define SPEED_FAST_MASK BIT_MASK(7) // Speed = fast
// Commands
enum {
- CMD_INDTA_INGAP, // 00: scan for data first then for gap
- CMD_UNK_01, // 01: unknown
- CMD_FINAL_GAP, // 02: write final gap
- CMD_INIT_WRITE, // 03: write words for tape formatting
- CMD_STOP, // 04: stop
- CMD_UNK_05, // 05: unknown
- CMD_SET_TRACK, // 06: set A/B track
- CMD_UNK_07, // 07: unknown
- CMD_UNK_08, // 08: unknown
- CMD_UNK_09, // 09: unknown
- CMD_MOVE, // 0a: move tape
- CMD_UNK_0b, // 0b: unknown
- CMD_INGAP_MOVE, // 0c: scan for gap then move a bit further (used to gain some margin when inverting tape movement)
- CMD_UNK_0d, // 0d: unknown
- CMD_CLEAR, // 0e: clear errors/unlatch status bits
- CMD_UNK_0f, // 0f: unknown
- CMD_NOT_INDTA, // 10: scan for end of data
- CMD_UNK_11, // 11: unknown
- CMD_UNK_12, // 12: unknown
- CMD_UNK_13, // 13: unknown
- CMD_UNK_14, // 14: unknown
- CMD_UNK_15, // 15: unknown
- CMD_WRITE_IRG, // 16: write inter-record gap
- CMD_UNK_17, // 17: unknown
- CMD_SCAN_RECORDS, // 18: scan records (count IRGs)
- CMD_RECORD_WRITE, // 19: write record words
- CMD_MOVE_INDTA, // 1a: move then scan for data
- CMD_UNK_1b, // 1b: unknown (for now it seems harmless to handle it as NOP)
- CMD_MOVE_INGAP, // 1c: move tape a given distance then scan for gap (as cmd 0c but in reverse order)
- CMD_START_READ, // 1d: start record reading
- CMD_DELTA_MOVE_IRG, // 1e: move tape a given distance, detect gaps in parallel
- CMD_END_READ // 1f: stop reading
+ CMD_INDTA_INGAP, // 00: scan for data first then for gap
+ CMD_UNK_01, // 01: unknown
+ CMD_FINAL_GAP, // 02: write final gap
+ CMD_INIT_WRITE, // 03: write words for tape formatting
+ CMD_STOP, // 04: stop
+ CMD_UNK_05, // 05: unknown
+ CMD_SET_TRACK, // 06: set A/B track
+ CMD_UNK_07, // 07: unknown
+ CMD_UNK_08, // 08: unknown
+ CMD_UNK_09, // 09: unknown
+ CMD_MOVE, // 0a: move tape
+ CMD_UNK_0b, // 0b: unknown
+ CMD_INGAP_MOVE, // 0c: scan for gap then move a bit further (used to gain some margin when inverting tape movement)
+ CMD_UNK_0d, // 0d: unknown
+ CMD_CLEAR, // 0e: clear errors/unlatch status bits
+ CMD_UNK_0f, // 0f: unknown
+ CMD_NOT_INDTA, // 10: scan for end of data
+ CMD_UNK_11, // 11: unknown
+ CMD_UNK_12, // 12: unknown
+ CMD_UNK_13, // 13: unknown
+ CMD_UNK_14, // 14: unknown
+ CMD_UNK_15, // 15: unknown
+ CMD_WRITE_IRG, // 16: write inter-record gap
+ CMD_UNK_17, // 17: unknown
+ CMD_SCAN_RECORDS, // 18: scan records (count IRGs)
+ CMD_RECORD_WRITE, // 19: write record words
+ CMD_MOVE_INDTA, // 1a: move then scan for data
+ CMD_UNK_1b, // 1b: unknown (for now it seems harmless to handle it as NOP)
+ CMD_MOVE_INGAP, // 1c: move tape a given distance then scan for gap (as cmd 0c but in reverse order)
+ CMD_START_READ, // 1d: start record reading
+ CMD_DELTA_MOVE_IRG, // 1e: move tape a given distance, detect gaps in parallel
+ CMD_END_READ // 1f: stop reading
};
// Bits of status register
@@ -304,34 +304,34 @@ hp_taco_device::hp_taco_device(const machine_config &mconfig, const char *tag, d
WRITE16_MEMBER(hp_taco_device::reg_w)
{
- LOG_0(("wr R%u = %04x\n", 4 + offset , data));
-
- // Any I/O activity clears IRQ
- irq_w(false);
-
- switch (offset) {
- case 0:
- // Data register
- m_data_reg = data;
- m_data_reg_full = true;
- break;
-
- case 1:
- // Command register
- start_cmd_exec(data & CMD_REG_MASK);
- break;
-
- case 2:
- // Tachometer register
- m_tach_reg = data;
- freeze_tach_reg(true);
- break;
-
- case 3:
- // Timing register
- m_timing_reg = data;
- break;
- }
+ LOG_0(("wr R%u = %04x\n", 4 + offset , data));
+
+ // Any I/O activity clears IRQ
+ irq_w(false);
+
+ switch (offset) {
+ case 0:
+ // Data register
+ m_data_reg = data;
+ m_data_reg_full = true;
+ break;
+
+ case 1:
+ // Command register
+ start_cmd_exec(data & CMD_REG_MASK);
+ break;
+
+ case 2:
+ // Tachometer register
+ m_tach_reg = data;
+ freeze_tach_reg(true);
+ break;
+
+ case 3:
+ // Timing register
+ m_timing_reg = data;
+ break;
+ }
}
READ16_MEMBER(hp_taco_device::reg_r)
@@ -352,18 +352,18 @@ READ16_MEMBER(hp_taco_device::reg_r)
res = (m_cmd_reg & CMD_REG_MASK) | (m_status_reg & STATUS_REG_MASK);
break;
- case 2:
- // Tachometer register
- update_tach_reg();
- res = m_tach_reg;
- break;
-
- case 3:
- // Checksum register: it clears when read
- res = m_checksum_reg;
- m_clear_checksum_reg = true;
- break;
- }
+ case 2:
+ // Tachometer register
+ update_tach_reg();
+ res = m_tach_reg;
+ break;
+
+ case 3:
+ // Checksum register: it clears when read
+ res = m_checksum_reg;
+ m_clear_checksum_reg = true;
+ break;
+ }
LOG_0(("rd R%u = %04x\n", 4 + offset , res));
@@ -390,38 +390,38 @@ void hp_taco_device::device_config_complete()
// device_start
void hp_taco_device::device_start()
{
- LOG(("device_start"));
- m_irq_handler.resolve_safe();
- m_flg_handler.resolve_safe();
- m_sts_handler.resolve_safe();
-
- save_item(NAME(m_data_reg));
- save_item(NAME(m_data_reg_full));
- save_item(NAME(m_cmd_reg));
- //save_item(NAME(m_cmd_state));
- save_item(NAME(m_status_reg));
- save_item(NAME(m_tach_reg));
- save_item(NAME(m_tach_reg_ref));
- save_item(NAME(m_tach_reg_frozen));
- save_item(NAME(m_checksum_reg));
- save_item(NAME(m_clear_checksum_reg));
- save_item(NAME(m_timing_reg));
- save_item(NAME(m_irq));
- save_item(NAME(m_flg));
- save_item(NAME(m_sts));
- save_item(NAME(m_tape_pos));
- save_item(NAME(m_start_time));
- save_item(NAME(m_tape_fwd));
- save_item(NAME(m_tape_fast));
- save_item(NAME(m_image_dirty));
- save_item(NAME(m_tape_wr));
- save_item(NAME(m_rw_pos));
- save_item(NAME(m_next_word));
- save_item(NAME(m_rd_it_valid));
- save_item(NAME(m_gap_detect_start));
-
- m_tape_timer = timer_alloc(TAPE_TMR_ID);
- m_hole_timer = timer_alloc(HOLE_TMR_ID);
+ LOG(("device_start"));
+ m_irq_handler.resolve_safe();
+ m_flg_handler.resolve_safe();
+ m_sts_handler.resolve_safe();
+
+ save_item(NAME(m_data_reg));
+ save_item(NAME(m_data_reg_full));
+ save_item(NAME(m_cmd_reg));
+ //save_item(NAME(m_cmd_state));
+ save_item(NAME(m_status_reg));
+ save_item(NAME(m_tach_reg));
+ save_item(NAME(m_tach_reg_ref));
+ save_item(NAME(m_tach_reg_frozen));
+ save_item(NAME(m_checksum_reg));
+ save_item(NAME(m_clear_checksum_reg));
+ save_item(NAME(m_timing_reg));
+ save_item(NAME(m_irq));
+ save_item(NAME(m_flg));
+ save_item(NAME(m_sts));
+ save_item(NAME(m_tape_pos));
+ save_item(NAME(m_start_time));
+ save_item(NAME(m_tape_fwd));
+ save_item(NAME(m_tape_fast));
+ save_item(NAME(m_image_dirty));
+ save_item(NAME(m_tape_wr));
+ save_item(NAME(m_rw_pos));
+ save_item(NAME(m_next_word));
+ save_item(NAME(m_rd_it_valid));
+ save_item(NAME(m_gap_detect_start));
+
+ m_tape_timer = timer_alloc(TAPE_TMR_ID);
+ m_hole_timer = timer_alloc(HOLE_TMR_ID);
}
// device_stop
@@ -445,92 +445,92 @@ void hp_taco_device::device_reset()
void hp_taco_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
- update_tape_pos();
-
- switch (id) {
- case TAPE_TMR_ID:
- LOG_0(("Tape tmr @%g cmd %02x st %d\n" , machine().time().as_double() , CMD_CODE(m_cmd_reg) , m_cmd_state));
-
- cmd_fsm();
- break;
-
- case HOLE_TMR_ID:
- LOG_0(("Hole tmr @%g cmd %02x st %d\n" , machine().time().as_double() , CMD_CODE(m_cmd_reg) , m_cmd_state));
-
- BIT_SET(m_status_reg , STATUS_HOLE_BIT);
-
- if (m_cmd_state >= CMD_PH0 && m_cmd_state <= CMD_END) {
- switch (CMD_CODE(m_cmd_reg)) {
- case CMD_FINAL_GAP:
- case CMD_WRITE_IRG:
- write_gap(m_rw_pos , m_tape_pos);
- m_rw_pos = m_tape_pos;
- break;
-
- case CMD_SCAN_RECORDS:
- // Cmds 18 is terminated at first hole
- terminate_cmd_now();
- // No reloading of hole timer
- return;
-
- case CMD_MOVE_INGAP:
- m_hole_timer->adjust(time_to_next_hole());
- // No IRQ at holes
- return;
-
- case CMD_DELTA_MOVE_IRG:
- // Hit hole before end of programmed pulses
- terminate_cmd_now();
- update_tach_reg();
- freeze_tach_reg(true);
- return;
-
- case CMD_START_READ:
- case CMD_END_READ:
- set_error(true);
- break;
-
- default:
- // Other cmds: default processing (update tape pos, set IRQ, schedule timer for next hole)
- break;
- }
-
- irq_w(true);
- }
- m_hole_timer->adjust(time_to_next_hole());
- break;
-
- default:
- break;
- }
+ update_tape_pos();
+
+ switch (id) {
+ case TAPE_TMR_ID:
+ LOG_0(("Tape tmr @%g cmd %02x st %d\n" , machine().time().as_double() , CMD_CODE(m_cmd_reg) , m_cmd_state));
+
+ cmd_fsm();
+ break;
+
+ case HOLE_TMR_ID:
+ LOG_0(("Hole tmr @%g cmd %02x st %d\n" , machine().time().as_double() , CMD_CODE(m_cmd_reg) , m_cmd_state));
+
+ BIT_SET(m_status_reg , STATUS_HOLE_BIT);
+
+ if (m_cmd_state >= CMD_PH0 && m_cmd_state <= CMD_END) {
+ switch (CMD_CODE(m_cmd_reg)) {
+ case CMD_FINAL_GAP:
+ case CMD_WRITE_IRG:
+ write_gap(m_rw_pos , m_tape_pos);
+ m_rw_pos = m_tape_pos;
+ break;
+
+ case CMD_SCAN_RECORDS:
+ // Cmds 18 is terminated at first hole
+ terminate_cmd_now();
+ // No reloading of hole timer
+ return;
+
+ case CMD_MOVE_INGAP:
+ m_hole_timer->adjust(time_to_next_hole());
+ // No IRQ at holes
+ return;
+
+ case CMD_DELTA_MOVE_IRG:
+ // Hit hole before end of programmed pulses
+ terminate_cmd_now();
+ update_tach_reg();
+ freeze_tach_reg(true);
+ return;
+
+ case CMD_START_READ:
+ case CMD_END_READ:
+ set_error(true);
+ break;
+
+ default:
+ // Other cmds: default processing (update tape pos, set IRQ, schedule timer for next hole)
+ break;
+ }
+
+ irq_w(true);
+ }
+ m_hole_timer->adjust(time_to_next_hole());
+ break;
+
+ default:
+ break;
+ }
}
void hp_taco_device::clear_state(void)
{
- m_data_reg = 0;
- m_data_reg_full = false;
- m_cmd_reg = 0;
- m_status_reg = 0;
- m_tach_reg = 0;
- m_tach_reg_ref = m_tape_pos;
- m_tach_reg_frozen = true;
- m_checksum_reg = 0;
- m_clear_checksum_reg = false;
- m_timing_reg = 0;
- m_cmd_state = CMD_IDLE;
- // m_tape_pos is not reset, tape stays where it is
- m_start_time = attotime::never;
- m_tape_fwd = false;
- m_tape_fast = false;
- // m_image_dirty is not touched
- m_tape_wr = false;
- m_rw_pos = 0;
- m_next_word = 0;
- m_rd_it_valid = false;
- m_gap_detect_start = NULL_TAPE_POS;
-
- set_tape_present(false);
- set_tape_present(is_loaded());
+ m_data_reg = 0;
+ m_data_reg_full = false;
+ m_cmd_reg = 0;
+ m_status_reg = 0;
+ m_tach_reg = 0;
+ m_tach_reg_ref = m_tape_pos;
+ m_tach_reg_frozen = true;
+ m_checksum_reg = 0;
+ m_clear_checksum_reg = false;
+ m_timing_reg = 0;
+ m_cmd_state = CMD_IDLE;
+ // m_tape_pos is not reset, tape stays where it is
+ m_start_time = attotime::never;
+ m_tape_fwd = false;
+ m_tape_fast = false;
+ // m_image_dirty is not touched
+ m_tape_wr = false;
+ m_rw_pos = 0;
+ m_next_word = 0;
+ m_rd_it_valid = false;
+ m_gap_detect_start = NULL_TAPE_POS;
+
+ set_tape_present(false);
+ set_tape_present(is_loaded());
}
void hp_taco_device::irq_w(bool state)
@@ -551,14 +551,14 @@ void hp_taco_device::set_error(bool state)
bool hp_taco_device::is_braking(void) const
{
- return m_cmd_state == CMD_INVERTING || m_cmd_state == CMD_STOPPING;
+ return m_cmd_state == CMD_INVERTING || m_cmd_state == CMD_STOPPING;
}
unsigned hp_taco_device::speed_to_tick_freq(void) const
{
- return is_braking() ?
- (m_tape_fast ? TACH_FREQ_BRAKE_FAST * TAPE_POS_FRACT : TACH_FREQ_BRAKE_SLOW * TAPE_POS_FRACT) :
- (m_tape_fast ? TACH_FREQ_FAST * TAPE_POS_FRACT : TACH_FREQ_SLOW * TAPE_POS_FRACT);
+ return is_braking() ?
+ (m_tape_fast ? TACH_FREQ_BRAKE_FAST * TAPE_POS_FRACT : TACH_FREQ_BRAKE_SLOW * TAPE_POS_FRACT) :
+ (m_tape_fast ? TACH_FREQ_FAST * TAPE_POS_FRACT : TACH_FREQ_SLOW * TAPE_POS_FRACT);
}
bool hp_taco_device::pos_offset(tape_pos_t& pos , tape_pos_t offset) const
@@ -587,78 +587,78 @@ bool hp_taco_device::pos_offset(tape_pos_t& pos , tape_pos_t offset) const
hp_taco_device::tape_pos_t hp_taco_device::current_tape_pos(void) const
{
- if (m_start_time.is_never()) {
- // Tape not moving
- return m_tape_pos;
- }
+ if (m_start_time.is_never()) {
+ // Tape not moving
+ return m_tape_pos;
+ }
- attotime delta_time(machine().time() - m_start_time);
- LOG_0(("delta_time = %g\n" , delta_time.as_double()));
- // How many tachometer ticks has the tape moved?
- tape_pos_t delta_tach = (tape_pos_t)(delta_time.as_ticks(speed_to_tick_freq()));
- LOG_0(("delta_tach = %u\n" , delta_tach));
+ attotime delta_time(machine().time() - m_start_time);
+ LOG_0(("delta_time = %g\n" , delta_time.as_double()));
+ // How many tachometer ticks has the tape moved?
+ tape_pos_t delta_tach = (tape_pos_t)(delta_time.as_ticks(speed_to_tick_freq()));
+ LOG_0(("delta_tach = %u\n" , delta_tach));
- tape_pos_t tape_pos = m_tape_pos;
- if (!pos_offset(tape_pos , delta_tach)) {
- LOG(("Tape unspooled!\n"));
- }
+ tape_pos_t tape_pos = m_tape_pos;
+ if (!pos_offset(tape_pos , delta_tach)) {
+ LOG(("Tape unspooled!\n"));
+ }
- return tape_pos;
+ return tape_pos;
}
void hp_taco_device::update_tape_pos(void)
{
- if (m_start_time.is_never()) {
- // Tape not moving
- return;
- }
+ if (m_start_time.is_never()) {
+ // Tape not moving
+ return;
+ }
- m_tape_pos = current_tape_pos();
- m_start_time = machine().time();
- LOG_0(("Tape pos = %u\n" , m_tape_pos));
+ m_tape_pos = current_tape_pos();
+ m_start_time = machine().time();
+ LOG_0(("Tape pos = %u\n" , m_tape_pos));
- // Gap detection
- bool gap_detected = false;
- if (m_gap_detect_start != NULL_TAPE_POS && abs(m_gap_detect_start - m_tape_pos) >= min_gap_size()) {
- tape_pos_t tmp = m_tape_pos;
- pos_offset(tmp , -min_gap_size());
- gap_detected = just_gap(tmp , m_tape_pos);
- }
- if (gap_detected) {
- BIT_SET(m_status_reg, STATUS_GAP_BIT);
- } else {
- BIT_CLR(m_status_reg, STATUS_GAP_BIT);
- }
- // Tach register update
- update_tach_reg();
+ // Gap detection
+ bool gap_detected = false;
+ if (m_gap_detect_start != NULL_TAPE_POS && abs(m_gap_detect_start - m_tape_pos) >= min_gap_size()) {
+ tape_pos_t tmp = m_tape_pos;
+ pos_offset(tmp , -min_gap_size());
+ gap_detected = just_gap(tmp , m_tape_pos);
+ }
+ if (gap_detected) {
+ BIT_SET(m_status_reg, STATUS_GAP_BIT);
+ } else {
+ BIT_CLR(m_status_reg, STATUS_GAP_BIT);
+ }
+ // Tach register update
+ update_tach_reg();
}
void hp_taco_device::update_tach_reg(void)
{
- if (m_tach_reg_frozen) {
- LOG_0(("Tach reg frozen\n"));
- return;
- }
+ if (m_tach_reg_frozen) {
+ LOG_0(("Tach reg frozen\n"));
+ return;
+ }
- tape_pos_t pos = current_tape_pos();
- tape_pos_t pos_int = pos / TAPE_POS_FRACT;
- tape_pos_t ref_int = m_tach_reg_ref / TAPE_POS_FRACT;
- UINT16 reg_value = (UINT16)(abs(pos_int - ref_int) + m_tach_reg);
+ tape_pos_t pos = current_tape_pos();
+ tape_pos_t pos_int = pos / TAPE_POS_FRACT;
+ tape_pos_t ref_int = m_tach_reg_ref / TAPE_POS_FRACT;
+ UINT16 reg_value = (UINT16)(abs(pos_int - ref_int) + m_tach_reg);
- LOG_0(("Tach = %04x @ pos = %d, ref_pos = %d\n" , reg_value , pos , m_tach_reg_ref));
+ LOG_0(("Tach = %04x @ pos = %d, ref_pos = %d\n" , reg_value , pos , m_tach_reg_ref));
- m_tach_reg = reg_value;
- m_tach_reg_ref = pos;
+ m_tach_reg = reg_value;
+ m_tach_reg_ref = pos;
}
void hp_taco_device::freeze_tach_reg(bool freeze)
{
- if (freeze) {
- m_tach_reg_frozen = true;
- } else {
- m_tach_reg_frozen = false;
- m_tach_reg_ref = current_tape_pos();
- }
+ if (freeze) {
+ m_tach_reg_frozen = true;
+ } else {
+ m_tach_reg_frozen = false;
+ m_tach_reg_ref = current_tape_pos();
+ }
}
@@ -710,62 +710,62 @@ attotime hp_taco_device::time_to_target(tape_pos_t target) const
attotime hp_taco_device::time_to_stopping_pos(void) const
{
- return time_to_distance(m_tape_fast ? FAST_BRAKE_DIST : SLOW_BRAKE_DIST);
+ return time_to_distance(m_tape_fast ? FAST_BRAKE_DIST : SLOW_BRAKE_DIST);
}
bool hp_taco_device::start_tape_cmd(UINT16 cmd_reg , UINT16 must_be_1 , UINT16 must_be_0)
{
- m_cmd_reg = cmd_reg;
+ m_cmd_reg = cmd_reg;
- UINT16 to_be_tested = (m_cmd_reg & CMD_REG_MASK) | (m_status_reg & STATUS_REG_MASK);
- // Bits in STATUS_ERR_MASK must always be 0
- must_be_0 |= STATUS_ERR_MASK;
+ UINT16 to_be_tested = (m_cmd_reg & CMD_REG_MASK) | (m_status_reg & STATUS_REG_MASK);
+ // Bits in STATUS_ERR_MASK must always be 0
+ must_be_0 |= STATUS_ERR_MASK;
- // It's not an error if the error state is already set (sts false)
- if (((to_be_tested & (must_be_1 | must_be_0)) ^ must_be_1) != 0) {
- return false;
- } else {
- bool prev_tape_wr = m_tape_wr;
- bool prev_tape_fwd = m_tape_fwd;
- bool prev_tape_fast = m_tape_fast;
- bool prev_tape_braking = is_braking();
- bool not_moving = m_start_time.is_never();
-
- m_start_time = machine().time();
- m_tape_wr = (must_be_0 & STATUS_WPR_MASK) != 0;
- m_tape_fwd = DIR_FWD(m_cmd_reg);
- m_tape_fast = SPEED_FAST(m_cmd_reg);
- // TODO: remove?
- BIT_CLR(m_status_reg, STATUS_HOLE_BIT);
-
- if (m_tape_wr) {
- // Write command: disable gap detector
- m_gap_detect_start = NULL_TAPE_POS;
- BIT_CLR(m_status_reg, STATUS_GAP_BIT);
- m_image_dirty = true;
- } else if (not_moving || prev_tape_braking || prev_tape_wr != m_tape_wr || prev_tape_fwd != m_tape_fwd || prev_tape_fast != m_tape_fast) {
- // Tape started or re-started right now, switched from writing to reading, direction changed or speed changed: (re)start gap detector
- m_gap_detect_start = m_tape_pos;
- BIT_CLR(m_status_reg, STATUS_GAP_BIT);
- }
-
- if (!not_moving && !prev_tape_braking && prev_tape_fwd != m_tape_fwd) {
- // Tape direction inverted, stop tape before executing command
- m_tape_fwd = prev_tape_fwd;
- m_tape_fast = prev_tape_fast;
- m_cmd_state = CMD_INVERTING;
- LOG_0(("Direction reversed! fwd = %d fast = %d\n" , m_tape_fwd , m_tape_fast));
- m_tape_timer->adjust(time_to_stopping_pos());
- } else {
- // No change in direction, immediate execution
- m_cmd_state = CMD_PH0;
- m_tape_timer->adjust(attotime::zero);
- }
-
- m_hole_timer->reset();
-
- return true;
- }
+ // It's not an error if the error state is already set (sts false)
+ if (((to_be_tested & (must_be_1 | must_be_0)) ^ must_be_1) != 0) {
+ return false;
+ } else {
+ bool prev_tape_wr = m_tape_wr;
+ bool prev_tape_fwd = m_tape_fwd;
+ bool prev_tape_fast = m_tape_fast;
+ bool prev_tape_braking = is_braking();
+ bool not_moving = m_start_time.is_never();
+
+ m_start_time = machine().time();
+ m_tape_wr = (must_be_0 & STATUS_WPR_MASK) != 0;
+ m_tape_fwd = DIR_FWD(m_cmd_reg);
+ m_tape_fast = SPEED_FAST(m_cmd_reg);
+ // TODO: remove?
+ BIT_CLR(m_status_reg, STATUS_HOLE_BIT);
+
+ if (m_tape_wr) {
+ // Write command: disable gap detector
+ m_gap_detect_start = NULL_TAPE_POS;
+ BIT_CLR(m_status_reg, STATUS_GAP_BIT);
+ m_image_dirty = true;
+ } else if (not_moving || prev_tape_braking || prev_tape_wr != m_tape_wr || prev_tape_fwd != m_tape_fwd || prev_tape_fast != m_tape_fast) {
+ // Tape started or re-started right now, switched from writing to reading, direction changed or speed changed: (re)start gap detector
+ m_gap_detect_start = m_tape_pos;
+ BIT_CLR(m_status_reg, STATUS_GAP_BIT);
+ }
+
+ if (!not_moving && !prev_tape_braking && prev_tape_fwd != m_tape_fwd) {
+ // Tape direction inverted, stop tape before executing command
+ m_tape_fwd = prev_tape_fwd;
+ m_tape_fast = prev_tape_fast;
+ m_cmd_state = CMD_INVERTING;
+ LOG_0(("Direction reversed! fwd = %d fast = %d\n" , m_tape_fwd , m_tape_fast));
+ m_tape_timer->adjust(time_to_stopping_pos());
+ } else {
+ // No change in direction, immediate execution
+ m_cmd_state = CMD_PH0;
+ m_tape_timer->adjust(attotime::zero);
+ }
+
+ m_hole_timer->reset();
+
+ return true;
+ }
}
void hp_taco_device::stop_tape(void)
@@ -909,23 +909,23 @@ hp_taco_device::adv_res_t hp_taco_device::adv_it(tape_track_t::iterator& it)
attotime hp_taco_device::fetch_next_wr_word(void)
{
- if (m_data_reg_full) {
- m_next_word = m_data_reg;
- m_data_reg_full = false;
- LOG_0(("next %04x (DR)\n" , m_next_word));
- } else {
- // When data register is empty, write checksum word
- m_next_word = m_checksum_reg;
- LOG_0(("next %04x (CS)\n" , m_next_word));
- }
- if (m_clear_checksum_reg) {
- m_checksum_reg = 0;
- m_clear_checksum_reg = false;
- }
- // Update checksum with new word
- m_checksum_reg += m_next_word;
+ if (m_data_reg_full) {
+ m_next_word = m_data_reg;
+ m_data_reg_full = false;
+ LOG_0(("next %04x (DR)\n" , m_next_word));
+ } else {
+ // When data register is empty, write checksum word
+ m_next_word = m_checksum_reg;
+ LOG_0(("next %04x (CS)\n" , m_next_word));
+ }
+ if (m_clear_checksum_reg) {
+ m_checksum_reg = 0;
+ m_clear_checksum_reg = false;
+ }
+ // Update checksum with new word
+ m_checksum_reg += m_next_word;
- return time_to_distance(word_length(m_next_word));
+ return time_to_distance(word_length(m_next_word));
}
attotime hp_taco_device::time_to_rd_next_word(tape_pos_t& word_rd_pos)
@@ -940,7 +940,7 @@ attotime hp_taco_device::time_to_rd_next_word(tape_pos_t& word_rd_pos)
hp_taco_device::tape_pos_t hp_taco_device::min_gap_size(void) const
{
- return LONG_GAP(m_cmd_reg) ? LONG_GAP_LENGTH : SHORT_GAP_LENGTH;
+ return LONG_GAP(m_cmd_reg) ? LONG_GAP_LENGTH : SHORT_GAP_LENGTH;
}
/**
@@ -1156,498 +1156,498 @@ attotime hp_taco_device::time_to_tach_pulses(void) const
void hp_taco_device::terminate_cmd_now(void)
{
- m_cmd_state = CMD_END;
- m_tape_timer->adjust(attotime::zero);
- m_hole_timer->reset();
+ m_cmd_state = CMD_END;
+ m_tape_timer->adjust(attotime::zero);
+ m_hole_timer->reset();
}
void hp_taco_device::cmd_fsm(void)
{
- if (m_cmd_state == CMD_END) {
- // Command ended
- m_cmd_state = CMD_IDLE;
- m_hole_timer->reset();
- irq_w(true);
- if (AUTO_STOP(m_cmd_reg)) {
- // Automatic stop after command execution
- LOG_0(("Tape clamped\n"));
- m_cmd_state = CMD_STOPPING;
- m_tape_timer->adjust(time_to_stopping_pos());
- }
- } else if (m_cmd_state == CMD_STOPPING) {
- // Braking phase ended
- m_cmd_state = CMD_IDLE;
- stop_tape();
- if (CMD_CODE(m_cmd_reg) == CMD_STOP) {
- irq_w(true);
- }
- } else {
- attotime cmd_duration = attotime::never;
-
- if (m_cmd_state == CMD_INVERTING) {
- m_tape_fwd = DIR_FWD(m_cmd_reg);
- m_tape_fast = SPEED_FAST(m_cmd_reg);
- m_cmd_state = CMD_PH0;
- }
-
- if (m_cmd_state == CMD_PH0) {
- m_hole_timer->adjust(time_to_next_hole());
- }
-
- switch (CMD_CODE(m_cmd_reg)) {
- case CMD_INDTA_INGAP:
- if (m_cmd_state == CMD_PH0) {
- // PH0
- if (next_data(m_rd_it , m_tape_pos , true)) {
- cmd_duration = time_to_target(farthest_end(m_rd_it));
- }
- m_cmd_state = CMD_PH1;
- } else {
- // PH1
- tape_pos_t target = m_tape_pos;
- if (next_n_gap(target, 1, min_gap_size())) {
- cmd_duration = time_to_target(target);
- }
- m_cmd_state = CMD_END;
- }
- break;
-
- case CMD_FINAL_GAP:
- if (m_cmd_state == CMD_PH0) {
- // PH0
- m_rw_pos = m_tape_pos;
- cmd_duration = time_to_distance(END_GAP_LENGTH);
- m_cmd_state = CMD_PH1;
- } else {
- // PH1
- write_gap(m_rw_pos , m_tape_pos);
- cmd_duration = attotime::zero;
- m_cmd_state = CMD_END;
- }
- break;
-
- case CMD_RECORD_WRITE:
- if (m_cmd_state == CMD_PH0) {
- // PH0
- // Search for preamble first
- m_rd_it_valid = next_data(m_rd_it , m_tape_pos , false);
- cmd_duration = time_to_rd_next_word(m_rw_pos);
- m_cmd_state = CMD_PH1;
- break;
- } else if (m_cmd_state == CMD_PH1) {
- // PH1
- if (m_rd_it->second == PREAMBLE_WORD) {
- LOG_0(("Got preamble\n"));
- m_cmd_state = CMD_PH2;
- // m_rw_pos already at correct position
- cmd_duration = fetch_next_wr_word();
- irq_w(true);
- } else {
- adv_res_t res = adv_it(m_rd_it);
- if (res != ADV_NO_MORE_DATA) {
- cmd_duration = time_to_rd_next_word(m_rw_pos);
- }
- }
- break;
- }
- // Intentional fall-through on PH2
-
- case CMD_INIT_WRITE:
- if (m_cmd_state == CMD_PH0) {
- // PH0
- m_next_word = PREAMBLE_WORD;
- m_rw_pos = m_tape_pos;
- cmd_duration = time_to_distance(word_length(m_next_word));
- m_cmd_state = CMD_PH1;
- } else {
- // PH1 & PH2 of CMD_RECORD_WRITE
- tape_pos_t length;
- write_word(m_rw_pos , m_next_word , length);
- pos_offset(m_rw_pos , length);
- // Just to be sure..
- m_tape_pos = m_rw_pos;
- cmd_duration = fetch_next_wr_word();
- irq_w(true);
- }
- break;
-
- case CMD_SET_TRACK:
- // PH0
- // When b9 is 0, set track A/B
- // When b9 is 1, ignore command (in TACO chip it has an unknown purpose)
- if (!AUTO_STOP(m_cmd_reg)) {
- if (CMD_OPT(m_cmd_reg)) {
- BIT_SET(m_status_reg, STATUS_TRACKB_BIT);
- } else {
- BIT_CLR(m_status_reg, STATUS_TRACKB_BIT);
- }
- }
- cmd_duration = attotime::from_usec(QUICK_CMD_USEC);
- m_hole_timer->reset();
- m_cmd_state = CMD_END;
- break;
-
- case CMD_MOVE:
- // PH0
- // Endless movement: not setting cmd_duration
- m_cmd_state = CMD_END;
- break;
-
- case CMD_INGAP_MOVE:
- if (m_cmd_state == CMD_PH0) {
- // PH0
- tape_pos_t target = m_tape_pos;
- if (next_n_gap(target, 1, min_gap_size())) {
- LOG_0(("IRG @%d\n" , target));
- cmd_duration = time_to_target(target);
- }
- m_cmd_state = CMD_PH1;
- } else {
- // PH1
- cmd_duration = time_to_tach_pulses();
- freeze_tach_reg(false);
- m_cmd_state = CMD_END;
- }
- break;
-
- case CMD_NOT_INDTA:
- if (m_cmd_state == CMD_PH0) {
- // PH0
- if (next_data(m_rd_it , m_tape_pos , true)) {
- cmd_duration = time_to_target(farthest_end(m_rd_it));
- }
- m_cmd_state = CMD_PH1;
- } else {
- // PH1
- tape_pos_t target = m_tape_pos;
- if (next_n_gap(target, 1, NO_DATA_GAP)) {
- LOG_0(("End of data @%d\n" , target));
- cmd_duration = time_to_target(target);
- }
- m_cmd_state = CMD_END;
- }
- break;
-
- case CMD_WRITE_IRG:
- if (m_cmd_state == CMD_PH0) {
- // PH0
- freeze_tach_reg(false);
- m_rw_pos = m_tape_pos;
- cmd_duration = time_to_tach_pulses();
- m_cmd_state = CMD_PH1;
- } else {
- // PH1
- write_gap(m_rw_pos , m_tape_pos);
- cmd_duration = attotime::zero;
- m_cmd_state = CMD_END;
- }
- break;
-
- case CMD_SCAN_RECORDS:
- if (m_cmd_state == CMD_PH0) {
- // PH0
- if (next_data(m_rd_it , m_tape_pos , true)) {
- cmd_duration = time_to_target(farthest_end(m_rd_it));
- }
- m_cmd_state = CMD_PH1;
- } else {
- // PH1
- tape_pos_t target = m_tape_pos;
- // b8 seems to select size of gaps
- // Tach. register is incremented at each gap. Command ends when this register goes positive (b15 = 0).
- unsigned n_gaps;
- if (BIT(m_tach_reg , 15)) {
- n_gaps = 0x10000U - m_tach_reg;
- m_tach_reg = 0;
- } else {
- n_gaps = 1;
- m_tach_reg++;
- }
- if (next_n_gap(target, n_gaps, min_gap_size())) {
- LOG_0(("%u gaps @%d\n" , n_gaps, target));
- cmd_duration = time_to_target(target);
- }
- m_cmd_state = CMD_END;
- }
- break;
-
- case CMD_MOVE_INDTA:
- if (m_cmd_state == CMD_PH0) {
- // PH0
- freeze_tach_reg(false);
- cmd_duration = time_to_tach_pulses();
- m_cmd_state = CMD_PH1;
- } else {
- // PH1
- if (next_data(m_rd_it , m_tape_pos , true)) {
- cmd_duration = time_to_target(farthest_end(m_rd_it));
- }
- m_cmd_state = CMD_END;
- }
- break;
-
- case CMD_UNK_1b:
- // PH0
- // Unknown purpose, but make it a NOP (it's used in "T" test of test ROM)
- cmd_duration = attotime::from_usec(QUICK_CMD_USEC);
- m_cmd_state = CMD_END;
- break;
-
- case CMD_MOVE_INGAP:
- if (m_cmd_state == CMD_PH0) {
- // PH0
- freeze_tach_reg(false);
- cmd_duration = time_to_tach_pulses();
- m_cmd_state = CMD_PH1;
- } else {
- // PH1
- tape_pos_t target = m_tape_pos;
- if (next_n_gap(target, 1, min_gap_size())) {
- LOG_0(("GAP @%d\n" , target));
- cmd_duration = time_to_target(target);
- }
- m_cmd_state = CMD_END;
- }
- break;
-
- case CMD_START_READ:
- if (m_cmd_state == CMD_PH0) {
- // PH0
- // Should also check if tape position has gone too far to read word @ m_rd_it
- if (!m_rd_it_valid) {
- // Search for preamble first
- m_rd_it_valid = next_data(m_rd_it , m_tape_pos , false);
- m_cmd_state = CMD_PH1;
- } else {
- // Resume reading from last position, skip preamble search
- m_cmd_state = CMD_PH2;
- }
-
- cmd_duration = time_to_rd_next_word(m_rw_pos);
- } else {
- // Just to be sure..
- m_tape_pos = m_rw_pos;
-
- if (m_cmd_state == CMD_PH3) {
- // PH3: delayed setting of error condition
- set_error(true);
- m_cmd_state = CMD_PH2;
- }
-
- if (m_cmd_state == CMD_PH1) {
- // PH1
- // Any word with at least a 0 will do as preamble.
- // But anything that's not the correct preamble word (0) will cause a wrong alignment
- // with word boundaries. TACO will read garbage data in this case (this effect is not simulated here).
- if (m_rd_it->second != 0xffff) {
- m_cmd_state = CMD_PH2;
- LOG_0(("Got preamble %04x\n" , m_rd_it->second));
- }
- } else {
- // PH2
- irq_w(true);
- m_data_reg = m_rd_it->second;
- if (m_clear_checksum_reg) {
- m_checksum_reg = 0;
- m_clear_checksum_reg = false;
- }
- m_checksum_reg += m_data_reg;
- LOG_0(("RD %04x\n" , m_data_reg));
- }
- adv_res_t res = adv_it(m_rd_it);
- LOG_0(("adv_it %d\n" , res));
- if (res == ADV_NO_MORE_DATA) {
- m_rd_it_valid = false;
- } else {
- cmd_duration = time_to_rd_next_word(m_rw_pos);
- if (res == ADV_DISCONT_DATA) {
- // Wild guess: TACO sets error flag when it stumbles on a gap between words
- if (m_cmd_state == CMD_PH2 && abs(m_tape_pos - m_rw_pos) > ((tape_pos_t)(0.25 * ONE_INCH_POS))) {
- m_cmd_state = CMD_PH3;
- } else {
- // Hit a gap, restart preamble search
- // TODO: is this ok?
- m_cmd_state = CMD_PH1;
- }
- }
- }
- }
- break;
-
- case CMD_DELTA_MOVE_IRG:
- // PH0
- freeze_tach_reg(false);
- cmd_duration = time_to_tach_pulses();
- m_cmd_state = CMD_END;
- break;
-
- case CMD_END_READ:
- if (m_cmd_state == CMD_PH0) {
- // PH0
- cmd_duration = time_to_rd_next_word(m_rw_pos);
- m_cmd_state = CMD_PH1;
- } else {
- // PH1
- m_tape_pos = m_rw_pos;
- // Note: checksum is not updated
- m_data_reg = m_rd_it->second;
- LOG_0(("Final RD %04x\n" , m_data_reg));
- adv_res_t res = adv_it(m_rd_it);
- if (res == ADV_NO_MORE_DATA) {
- m_rd_it_valid = false;
- }
- cmd_duration = attotime::zero;
- m_cmd_state = CMD_END;
- }
- break;
-
- default:
- break;
- }
-
- m_tape_timer->adjust(cmd_duration);
- }
+ if (m_cmd_state == CMD_END) {
+ // Command ended
+ m_cmd_state = CMD_IDLE;
+ m_hole_timer->reset();
+ irq_w(true);
+ if (AUTO_STOP(m_cmd_reg)) {
+ // Automatic stop after command execution
+ LOG_0(("Tape clamped\n"));
+ m_cmd_state = CMD_STOPPING;
+ m_tape_timer->adjust(time_to_stopping_pos());
+ }
+ } else if (m_cmd_state == CMD_STOPPING) {
+ // Braking phase ended
+ m_cmd_state = CMD_IDLE;
+ stop_tape();
+ if (CMD_CODE(m_cmd_reg) == CMD_STOP) {
+ irq_w(true);
+ }
+ } else {
+ attotime cmd_duration = attotime::never;
+
+ if (m_cmd_state == CMD_INVERTING) {
+ m_tape_fwd = DIR_FWD(m_cmd_reg);
+ m_tape_fast = SPEED_FAST(m_cmd_reg);
+ m_cmd_state = CMD_PH0;
+ }
+
+ if (m_cmd_state == CMD_PH0) {
+ m_hole_timer->adjust(time_to_next_hole());
+ }
+
+ switch (CMD_CODE(m_cmd_reg)) {
+ case CMD_INDTA_INGAP:
+ if (m_cmd_state == CMD_PH0) {
+ // PH0
+ if (next_data(m_rd_it , m_tape_pos , true)) {
+ cmd_duration = time_to_target(farthest_end(m_rd_it));
+ }
+ m_cmd_state = CMD_PH1;
+ } else {
+ // PH1
+ tape_pos_t target = m_tape_pos;
+ if (next_n_gap(target, 1, min_gap_size())) {
+ cmd_duration = time_to_target(target);
+ }
+ m_cmd_state = CMD_END;
+ }
+ break;
+
+ case CMD_FINAL_GAP:
+ if (m_cmd_state == CMD_PH0) {
+ // PH0
+ m_rw_pos = m_tape_pos;
+ cmd_duration = time_to_distance(END_GAP_LENGTH);
+ m_cmd_state = CMD_PH1;
+ } else {
+ // PH1
+ write_gap(m_rw_pos , m_tape_pos);
+ cmd_duration = attotime::zero;
+ m_cmd_state = CMD_END;
+ }
+ break;
+
+ case CMD_RECORD_WRITE:
+ if (m_cmd_state == CMD_PH0) {
+ // PH0
+ // Search for preamble first
+ m_rd_it_valid = next_data(m_rd_it , m_tape_pos , false);
+ cmd_duration = time_to_rd_next_word(m_rw_pos);
+ m_cmd_state = CMD_PH1;
+ break;
+ } else if (m_cmd_state == CMD_PH1) {
+ // PH1
+ if (m_rd_it->second == PREAMBLE_WORD) {
+ LOG_0(("Got preamble\n"));
+ m_cmd_state = CMD_PH2;
+ // m_rw_pos already at correct position
+ cmd_duration = fetch_next_wr_word();
+ irq_w(true);
+ } else {
+ adv_res_t res = adv_it(m_rd_it);
+ if (res != ADV_NO_MORE_DATA) {
+ cmd_duration = time_to_rd_next_word(m_rw_pos);
+ }
+ }
+ break;
+ }
+ // Intentional fall-through on PH2
+
+ case CMD_INIT_WRITE:
+ if (m_cmd_state == CMD_PH0) {
+ // PH0
+ m_next_word = PREAMBLE_WORD;
+ m_rw_pos = m_tape_pos;
+ cmd_duration = time_to_distance(word_length(m_next_word));
+ m_cmd_state = CMD_PH1;
+ } else {
+ // PH1 & PH2 of CMD_RECORD_WRITE
+ tape_pos_t length;
+ write_word(m_rw_pos , m_next_word , length);
+ pos_offset(m_rw_pos , length);
+ // Just to be sure..
+ m_tape_pos = m_rw_pos;
+ cmd_duration = fetch_next_wr_word();
+ irq_w(true);
+ }
+ break;
+
+ case CMD_SET_TRACK:
+ // PH0
+ // When b9 is 0, set track A/B
+ // When b9 is 1, ignore command (in TACO chip it has an unknown purpose)
+ if (!AUTO_STOP(m_cmd_reg)) {
+ if (CMD_OPT(m_cmd_reg)) {
+ BIT_SET(m_status_reg, STATUS_TRACKB_BIT);
+ } else {
+ BIT_CLR(m_status_reg, STATUS_TRACKB_BIT);
+ }
+ }
+ cmd_duration = attotime::from_usec(QUICK_CMD_USEC);
+ m_hole_timer->reset();
+ m_cmd_state = CMD_END;
+ break;
+
+ case CMD_MOVE:
+ // PH0
+ // Endless movement: not setting cmd_duration
+ m_cmd_state = CMD_END;
+ break;
+
+ case CMD_INGAP_MOVE:
+ if (m_cmd_state == CMD_PH0) {
+ // PH0
+ tape_pos_t target = m_tape_pos;
+ if (next_n_gap(target, 1, min_gap_size())) {
+ LOG_0(("IRG @%d\n" , target));
+ cmd_duration = time_to_target(target);
+ }
+ m_cmd_state = CMD_PH1;
+ } else {
+ // PH1
+ cmd_duration = time_to_tach_pulses();
+ freeze_tach_reg(false);
+ m_cmd_state = CMD_END;
+ }
+ break;
+
+ case CMD_NOT_INDTA:
+ if (m_cmd_state == CMD_PH0) {
+ // PH0
+ if (next_data(m_rd_it , m_tape_pos , true)) {
+ cmd_duration = time_to_target(farthest_end(m_rd_it));
+ }
+ m_cmd_state = CMD_PH1;
+ } else {
+ // PH1
+ tape_pos_t target = m_tape_pos;
+ if (next_n_gap(target, 1, NO_DATA_GAP)) {
+ LOG_0(("End of data @%d\n" , target));
+ cmd_duration = time_to_target(target);
+ }
+ m_cmd_state = CMD_END;
+ }
+ break;
+
+ case CMD_WRITE_IRG:
+ if (m_cmd_state == CMD_PH0) {
+ // PH0
+ freeze_tach_reg(false);
+ m_rw_pos = m_tape_pos;
+ cmd_duration = time_to_tach_pulses();
+ m_cmd_state = CMD_PH1;
+ } else {
+ // PH1
+ write_gap(m_rw_pos , m_tape_pos);
+ cmd_duration = attotime::zero;
+ m_cmd_state = CMD_END;
+ }
+ break;
+
+ case CMD_SCAN_RECORDS:
+ if (m_cmd_state == CMD_PH0) {
+ // PH0
+ if (next_data(m_rd_it , m_tape_pos , true)) {
+ cmd_duration = time_to_target(farthest_end(m_rd_it));
+ }
+ m_cmd_state = CMD_PH1;
+ } else {
+ // PH1
+ tape_pos_t target = m_tape_pos;
+ // b8 seems to select size of gaps
+ // Tach. register is incremented at each gap. Command ends when this register goes positive (b15 = 0).
+ unsigned n_gaps;
+ if (BIT(m_tach_reg , 15)) {
+ n_gaps = 0x10000U - m_tach_reg;
+ m_tach_reg = 0;
+ } else {
+ n_gaps = 1;
+ m_tach_reg++;
+ }
+ if (next_n_gap(target, n_gaps, min_gap_size())) {
+ LOG_0(("%u gaps @%d\n" , n_gaps, target));
+ cmd_duration = time_to_target(target);
+ }
+ m_cmd_state = CMD_END;
+ }
+ break;
+
+ case CMD_MOVE_INDTA:
+ if (m_cmd_state == CMD_PH0) {
+ // PH0
+ freeze_tach_reg(false);
+ cmd_duration = time_to_tach_pulses();
+ m_cmd_state = CMD_PH1;
+ } else {
+ // PH1
+ if (next_data(m_rd_it , m_tape_pos , true)) {
+ cmd_duration = time_to_target(farthest_end(m_rd_it));
+ }
+ m_cmd_state = CMD_END;
+ }
+ break;
+
+ case CMD_UNK_1b:
+ // PH0
+ // Unknown purpose, but make it a NOP (it's used in "T" test of test ROM)
+ cmd_duration = attotime::from_usec(QUICK_CMD_USEC);
+ m_cmd_state = CMD_END;
+ break;
+
+ case CMD_MOVE_INGAP:
+ if (m_cmd_state == CMD_PH0) {
+ // PH0
+ freeze_tach_reg(false);
+ cmd_duration = time_to_tach_pulses();
+ m_cmd_state = CMD_PH1;
+ } else {
+ // PH1
+ tape_pos_t target = m_tape_pos;
+ if (next_n_gap(target, 1, min_gap_size())) {
+ LOG_0(("GAP @%d\n" , target));
+ cmd_duration = time_to_target(target);
+ }
+ m_cmd_state = CMD_END;
+ }
+ break;
+
+ case CMD_START_READ:
+ if (m_cmd_state == CMD_PH0) {
+ // PH0
+ // Should also check if tape position has gone too far to read word @ m_rd_it
+ if (!m_rd_it_valid) {
+ // Search for preamble first
+ m_rd_it_valid = next_data(m_rd_it , m_tape_pos , false);
+ m_cmd_state = CMD_PH1;
+ } else {
+ // Resume reading from last position, skip preamble search
+ m_cmd_state = CMD_PH2;
+ }
+
+ cmd_duration = time_to_rd_next_word(m_rw_pos);
+ } else {
+ // Just to be sure..
+ m_tape_pos = m_rw_pos;
+
+ if (m_cmd_state == CMD_PH3) {
+ // PH3: delayed setting of error condition
+ set_error(true);
+ m_cmd_state = CMD_PH2;
+ }
+
+ if (m_cmd_state == CMD_PH1) {
+ // PH1
+ // Any word with at least a 0 will do as preamble.
+ // But anything that's not the correct preamble word (0) will cause a wrong alignment
+ // with word boundaries. TACO will read garbage data in this case (this effect is not simulated here).
+ if (m_rd_it->second != 0xffff) {
+ m_cmd_state = CMD_PH2;
+ LOG_0(("Got preamble %04x\n" , m_rd_it->second));
+ }
+ } else {
+ // PH2
+ irq_w(true);
+ m_data_reg = m_rd_it->second;
+ if (m_clear_checksum_reg) {
+ m_checksum_reg = 0;
+ m_clear_checksum_reg = false;
+ }
+ m_checksum_reg += m_data_reg;
+ LOG_0(("RD %04x\n" , m_data_reg));
+ }
+ adv_res_t res = adv_it(m_rd_it);
+ LOG_0(("adv_it %d\n" , res));
+ if (res == ADV_NO_MORE_DATA) {
+ m_rd_it_valid = false;
+ } else {
+ cmd_duration = time_to_rd_next_word(m_rw_pos);
+ if (res == ADV_DISCONT_DATA) {
+ // Wild guess: TACO sets error flag when it stumbles on a gap between words
+ if (m_cmd_state == CMD_PH2 && abs(m_tape_pos - m_rw_pos) > ((tape_pos_t)(0.25 * ONE_INCH_POS))) {
+ m_cmd_state = CMD_PH3;
+ } else {
+ // Hit a gap, restart preamble search
+ // TODO: is this ok?
+ m_cmd_state = CMD_PH1;
+ }
+ }
+ }
+ }
+ break;
+
+ case CMD_DELTA_MOVE_IRG:
+ // PH0
+ freeze_tach_reg(false);
+ cmd_duration = time_to_tach_pulses();
+ m_cmd_state = CMD_END;
+ break;
+
+ case CMD_END_READ:
+ if (m_cmd_state == CMD_PH0) {
+ // PH0
+ cmd_duration = time_to_rd_next_word(m_rw_pos);
+ m_cmd_state = CMD_PH1;
+ } else {
+ // PH1
+ m_tape_pos = m_rw_pos;
+ // Note: checksum is not updated
+ m_data_reg = m_rd_it->second;
+ LOG_0(("Final RD %04x\n" , m_data_reg));
+ adv_res_t res = adv_it(m_rd_it);
+ if (res == ADV_NO_MORE_DATA) {
+ m_rd_it_valid = false;
+ }
+ cmd_duration = attotime::zero;
+ m_cmd_state = CMD_END;
+ }
+ break;
+
+ default:
+ break;
+ }
+
+ m_tape_timer->adjust(cmd_duration);
+ }
}
void hp_taco_device::start_cmd_exec(UINT16 new_cmd_reg)
{
- LOG_0(("New cmd %02x @ %g cmd %02x st %d\n" , CMD_CODE(new_cmd_reg) , machine().time().as_double() , CMD_CODE(m_cmd_reg) , m_cmd_state));
+ LOG_0(("New cmd %02x @ %g cmd %02x st %d\n" , CMD_CODE(new_cmd_reg) , machine().time().as_double() , CMD_CODE(m_cmd_reg) , m_cmd_state));
- update_tape_pos();
+ update_tape_pos();
- unsigned new_cmd_code = CMD_CODE(new_cmd_reg);
+ unsigned new_cmd_code = CMD_CODE(new_cmd_reg);
- if (new_cmd_code != CMD_START_READ &&
- new_cmd_code != CMD_END_READ &&
- new_cmd_code != CMD_CLEAR) {
- m_rd_it_valid = false;
- }
+ if (new_cmd_code != CMD_START_READ &&
+ new_cmd_code != CMD_END_READ &&
+ new_cmd_code != CMD_CLEAR) {
+ m_rd_it_valid = false;
+ }
- bool started = false;
-
- switch (new_cmd_code) {
- case CMD_INDTA_INGAP:
- // Errors: CART OUT,FAST SPEED
- started = start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK);
- break;
-
- case CMD_FINAL_GAP:
- // Errors: WP,CART OUT
- started = start_tape_cmd(new_cmd_reg , 0 , STATUS_WPR_MASK);
- break;
-
- case CMD_INIT_WRITE:
- // Errors: WP,CART OUT,fast speed,reverse
- started = start_tape_cmd(new_cmd_reg , DIR_FWD_MASK , STATUS_WPR_MASK | SPEED_FAST_MASK);
- break;
-
- case CMD_STOP:
- m_cmd_reg = new_cmd_reg;
- freeze_tach_reg(false);
- m_hole_timer->reset();
- if (m_cmd_state == CMD_INVERTING || m_cmd_state == CMD_STOPPING) {
- // Already braking
- // m_tape_timer already set
- } else if (m_start_time.is_never()) {
- // Tape is already stopped
- LOG_0(("Already stopped\n"));
- m_tape_timer->adjust(attotime::from_usec(QUICK_CMD_USEC));
- } else {
- // Start braking timer
- m_cmd_state = CMD_STOPPING;
- m_tape_timer->adjust(time_to_stopping_pos());
- }
- m_cmd_state = CMD_STOPPING;
- return;
+ bool started = false;
- case CMD_SET_TRACK:
- // Don't know if this command really starts the tape or not (probably it doesn't)
- started = start_tape_cmd(new_cmd_reg , 0 , 0);
- break;
-
- case CMD_MOVE:
- started = start_tape_cmd(new_cmd_reg , 0 , 0);
- break;
-
- case CMD_INGAP_MOVE:
- // Errors: CART OUT,FAST SPEED
- started = start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK);
- break;
-
- case CMD_CLEAR:
- set_error(false);
- BIT_CLR(m_status_reg, STATUS_HOLE_BIT);
- BIT_CLR(m_status_reg, STATUS_CART_OUT_BIT);
- BIT_CLR(m_status_reg, STATUS_WPR_BIT);
- set_tape_present(is_loaded());
- // This is a special command: it doesn't raise IRQ at completion and it
- // doesn't replace current command
- return;
+ switch (new_cmd_code) {
+ case CMD_INDTA_INGAP:
+ // Errors: CART OUT,FAST SPEED
+ started = start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK);
+ break;
- case CMD_NOT_INDTA:
- // Errors: CART OUT,FAST SPEED
- started = start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK);
- break;
-
- case CMD_WRITE_IRG:
- // Errors: WP,CART OUT
- started = start_tape_cmd(new_cmd_reg , 0 , STATUS_WPR_MASK);
- break;
-
- case CMD_SCAN_RECORDS:
- // Errors: CART OUT
- started = start_tape_cmd(new_cmd_reg , 0 , 0);
- break;
-
- case CMD_RECORD_WRITE:
- // Errors: WP,CART OUT,fast speed,reverse
- started = start_tape_cmd(new_cmd_reg , DIR_FWD_MASK , STATUS_WPR_MASK | SPEED_FAST_MASK);
- break;
-
- case CMD_MOVE_INDTA:
- // Errors: CART OUT,FAST SPEED
- started = start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK);
- break;
-
- case CMD_UNK_1b:
- started = start_tape_cmd(new_cmd_reg , 0 , 0);
- break;
-
- case CMD_MOVE_INGAP:
- started = start_tape_cmd(new_cmd_reg , 0 , 0);
- break;
-
- case CMD_START_READ:
- // Yes, you can read tape backwards: test "C" does that!
- // Because of this DIR_FWD_MASK is not in the "must be 1" mask.
- started = start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK);
- break;
-
- case CMD_DELTA_MOVE_IRG:
- started = start_tape_cmd(new_cmd_reg , 0 , 0);
- break;
-
- case CMD_END_READ:
- // This command only makes sense after CMD_START_READ
- if (CMD_CODE(m_cmd_reg) == CMD_START_READ &&
- (m_cmd_state == CMD_PH2 || m_cmd_state == CMD_PH3)) {
- started = start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK);
- LOG_0(("END_READ %d\n" , m_rd_it_valid));
- }
- break;
-
- default:
- LOG(("Unrecognized command\n"));
- started = false;
- break;
- }
+ case CMD_FINAL_GAP:
+ // Errors: WP,CART OUT
+ started = start_tape_cmd(new_cmd_reg , 0 , STATUS_WPR_MASK);
+ break;
- if (!started) {
- set_error(true);
- m_cmd_state = CMD_IDLE;
- m_tape_timer->reset();
- m_hole_timer->reset();
- }
+ case CMD_INIT_WRITE:
+ // Errors: WP,CART OUT,fast speed,reverse
+ started = start_tape_cmd(new_cmd_reg , DIR_FWD_MASK , STATUS_WPR_MASK | SPEED_FAST_MASK);
+ break;
+
+ case CMD_STOP:
+ m_cmd_reg = new_cmd_reg;
+ freeze_tach_reg(false);
+ m_hole_timer->reset();
+ if (m_cmd_state == CMD_INVERTING || m_cmd_state == CMD_STOPPING) {
+ // Already braking
+ // m_tape_timer already set
+ } else if (m_start_time.is_never()) {
+ // Tape is already stopped
+ LOG_0(("Already stopped\n"));
+ m_tape_timer->adjust(attotime::from_usec(QUICK_CMD_USEC));
+ } else {
+ // Start braking timer
+ m_cmd_state = CMD_STOPPING;
+ m_tape_timer->adjust(time_to_stopping_pos());
+ }
+ m_cmd_state = CMD_STOPPING;
+ return;
+
+ case CMD_SET_TRACK:
+ // Don't know if this command really starts the tape or not (probably it doesn't)
+ started = start_tape_cmd(new_cmd_reg , 0 , 0);
+ break;
+
+ case CMD_MOVE:
+ started = start_tape_cmd(new_cmd_reg , 0 , 0);
+ break;
+
+ case CMD_INGAP_MOVE:
+ // Errors: CART OUT,FAST SPEED
+ started = start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK);
+ break;
+
+ case CMD_CLEAR:
+ set_error(false);
+ BIT_CLR(m_status_reg, STATUS_HOLE_BIT);
+ BIT_CLR(m_status_reg, STATUS_CART_OUT_BIT);
+ BIT_CLR(m_status_reg, STATUS_WPR_BIT);
+ set_tape_present(is_loaded());
+ // This is a special command: it doesn't raise IRQ at completion and it
+ // doesn't replace current command
+ return;
+
+ case CMD_NOT_INDTA:
+ // Errors: CART OUT,FAST SPEED
+ started = start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK);
+ break;
+
+ case CMD_WRITE_IRG:
+ // Errors: WP,CART OUT
+ started = start_tape_cmd(new_cmd_reg , 0 , STATUS_WPR_MASK);
+ break;
+
+ case CMD_SCAN_RECORDS:
+ // Errors: CART OUT
+ started = start_tape_cmd(new_cmd_reg , 0 , 0);
+ break;
+
+ case CMD_RECORD_WRITE:
+ // Errors: WP,CART OUT,fast speed,reverse
+ started = start_tape_cmd(new_cmd_reg , DIR_FWD_MASK , STATUS_WPR_MASK | SPEED_FAST_MASK);
+ break;
+
+ case CMD_MOVE_INDTA:
+ // Errors: CART OUT,FAST SPEED
+ started = start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK);
+ break;
+
+ case CMD_UNK_1b:
+ started = start_tape_cmd(new_cmd_reg , 0 , 0);
+ break;
+
+ case CMD_MOVE_INGAP:
+ started = start_tape_cmd(new_cmd_reg , 0 , 0);
+ break;
+
+ case CMD_START_READ:
+ // Yes, you can read tape backwards: test "C" does that!
+ // Because of this DIR_FWD_MASK is not in the "must be 1" mask.
+ started = start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK);
+ break;
+
+ case CMD_DELTA_MOVE_IRG:
+ started = start_tape_cmd(new_cmd_reg , 0 , 0);
+ break;
+
+ case CMD_END_READ:
+ // This command only makes sense after CMD_START_READ
+ if (CMD_CODE(m_cmd_reg) == CMD_START_READ &&
+ (m_cmd_state == CMD_PH2 || m_cmd_state == CMD_PH3)) {
+ started = start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK);
+ LOG_0(("END_READ %d\n" , m_rd_it_valid));
+ }
+ break;
+
+ default:
+ LOG(("Unrecognized command\n"));
+ started = false;
+ break;
+ }
+
+ if (!started) {
+ set_error(true);
+ m_cmd_state = CMD_IDLE;
+ m_tape_timer->reset();
+ m_hole_timer->reset();
+ }
}
bool hp_taco_device::call_load()
@@ -1688,7 +1688,7 @@ void hp_taco_device::call_unload()
void hp_taco_device::call_display()
{
-/*
+/*
// Mostly lifted from cassette_image_device::call_display ;)
// Do not show anything if image not loaded or tape not moving
@@ -1715,13 +1715,13 @@ void hp_taco_device::call_display()
snprintf(buffer , sizeof(buffer) , "%c %c %c%c [%04d/1824]" , track , r_w , m1 , m2 , pos_in);
- float x, y;
- x = 0.2f;
- y = 0.5f;
- y *= device().machine().ui().get_line_height() + 2.0f * UI_BOX_TB_BORDER;
+ float x, y;
+ x = 0.2f;
+ y = 0.5f;
+ y *= device().machine().ui().get_line_height() + 2.0f * UI_BOX_TB_BORDER;
- device().machine().ui().draw_text_box(&device().machine().render().ui_container(), buffer, JUSTIFY_LEFT, x, y, UI_BACKGROUND_COLOR);
- */
+ device().machine().ui().draw_text_box(&device().machine().render().ui_container(), buffer, JUSTIFY_LEFT, x, y, UI_BACKGROUND_COLOR);
+ */
}
const char *hp_taco_device::file_extensions() const
diff --git a/src/devices/machine/hp_taco.h b/src/devices/machine/hp_taco.h
index 288b1db3218..d8807616204 100644
--- a/src/devices/machine/hp_taco.h
+++ b/src/devices/machine/hp_taco.h
@@ -72,116 +72,116 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
private:
- // Storage of tracks: mapping from a tape position to word stored there
- typedef std::map<tape_pos_t , tape_word_t> tape_track_t;
-
- devcb_write_line m_irq_handler;
- devcb_write_line m_flg_handler;
- devcb_write_line m_sts_handler;
-
- // Registers
- UINT16 m_data_reg;
- bool m_data_reg_full;
- UINT16 m_cmd_reg;
- UINT16 m_status_reg;
- UINT16 m_tach_reg;
- tape_pos_t m_tach_reg_ref;
- bool m_tach_reg_frozen;
- UINT16 m_checksum_reg;
- bool m_clear_checksum_reg;
- UINT16 m_timing_reg;
-
- // State
- bool m_irq;
- bool m_flg;
- bool m_sts;
-
- // Command FSM state
- typedef enum {
- CMD_IDLE,
- CMD_INVERTING,
- CMD_PH0,
- CMD_PH1,
- CMD_PH2,
- CMD_PH3,
- CMD_END,
- CMD_STOPPING
- } cmd_state_t;
- cmd_state_t m_cmd_state;
-
- // Tape position & motion
- tape_pos_t m_tape_pos;
- attotime m_start_time; // Tape moving if != never
- bool m_tape_fwd;
- bool m_tape_fast;
-
- // Timers
- emu_timer *m_tape_timer;
- emu_timer *m_hole_timer;
-
- // Content of tape tracks
- tape_track_t m_tracks[ 2 ];
- bool m_image_dirty;
-
- // Reading & writing
- bool m_tape_wr;
- tape_pos_t m_rw_pos;
- UINT16 m_next_word;
- tape_track_t::iterator m_rd_it;
- bool m_rd_it_valid;
-
- // Gap detection
- tape_pos_t m_gap_detect_start;
-
- typedef enum {
- ADV_NO_MORE_DATA,
- ADV_CONT_DATA,
- ADV_DISCONT_DATA
- } adv_res_t;
-
- void clear_state(void);
- void irq_w(bool state);
- void set_error(bool state);
- bool is_braking(void) const;
- unsigned speed_to_tick_freq(void) const;
- bool pos_offset(tape_pos_t& pos , tape_pos_t offset) const;
- tape_pos_t current_tape_pos(void) const;
- void update_tape_pos(void);
- void update_tach_reg(void);
- void freeze_tach_reg(bool freeze);
- static void ensure_a_lt_b(tape_pos_t& a , tape_pos_t& b);
- tape_pos_t next_hole(void) const;
- attotime time_to_distance(tape_pos_t distance) const;
- attotime time_to_target(tape_pos_t target) const;
- attotime time_to_stopping_pos(void) const;
- bool start_tape_cmd(UINT16 cmd_reg , UINT16 must_be_1 , UINT16 must_be_0);
- void stop_tape(void);
- tape_track_t& current_track(void);
- static tape_pos_t word_length(tape_word_t w);
- static tape_pos_t word_end_pos(const tape_track_t::iterator& it);
- static void adjust_it(tape_track_t& track , tape_track_t::iterator& it , tape_pos_t pos);
- void write_word(tape_pos_t start , tape_word_t word , tape_pos_t& length);
- void write_gap(tape_pos_t a , tape_pos_t b);
- bool just_gap(tape_pos_t a , tape_pos_t b);
- tape_pos_t farthest_end(const tape_track_t::iterator& it) const;
- bool next_data(tape_track_t::iterator& it , tape_pos_t pos , bool inclusive);
- adv_res_t adv_it(tape_track_t::iterator& it);
- attotime fetch_next_wr_word(void);
- attotime time_to_rd_next_word(tape_pos_t& word_rd_pos);
- tape_pos_t min_gap_size(void) const;
- bool next_n_gap(tape_pos_t& pos , tape_track_t::iterator it , unsigned n_gaps , tape_pos_t min_gap);
- bool next_n_gap(tape_pos_t& pos , unsigned n_gaps , tape_pos_t min_gap);
- void clear_tape(void);
- void dump_sequence(tape_track_t::const_iterator it_start , unsigned n_words);
- void save_tape(void);
- bool load_track(tape_track_t& track);
- bool load_tape(void);
- void set_tape_present(bool present);
- attotime time_to_next_hole(void) const;
- attotime time_to_tach_pulses(void) const;
- void terminate_cmd_now(void);
- void cmd_fsm(void);
- void start_cmd_exec(UINT16 new_cmd_reg);
+ // Storage of tracks: mapping from a tape position to word stored there
+ typedef std::map<tape_pos_t , tape_word_t> tape_track_t;
+
+ devcb_write_line m_irq_handler;
+ devcb_write_line m_flg_handler;
+ devcb_write_line m_sts_handler;
+
+ // Registers
+ UINT16 m_data_reg;
+ bool m_data_reg_full;
+ UINT16 m_cmd_reg;
+ UINT16 m_status_reg;
+ UINT16 m_tach_reg;
+ tape_pos_t m_tach_reg_ref;
+ bool m_tach_reg_frozen;
+ UINT16 m_checksum_reg;
+ bool m_clear_checksum_reg;
+ UINT16 m_timing_reg;
+
+ // State
+ bool m_irq;
+ bool m_flg;
+ bool m_sts;
+
+ // Command FSM state
+ typedef enum {
+ CMD_IDLE,
+ CMD_INVERTING,
+ CMD_PH0,
+ CMD_PH1,
+ CMD_PH2,
+ CMD_PH3,
+ CMD_END,
+ CMD_STOPPING
+ } cmd_state_t;
+ cmd_state_t m_cmd_state;
+
+ // Tape position & motion
+ tape_pos_t m_tape_pos;
+ attotime m_start_time; // Tape moving if != never
+ bool m_tape_fwd;
+ bool m_tape_fast;
+
+ // Timers
+ emu_timer *m_tape_timer;
+ emu_timer *m_hole_timer;
+
+ // Content of tape tracks
+ tape_track_t m_tracks[ 2 ];
+ bool m_image_dirty;
+
+ // Reading & writing
+ bool m_tape_wr;
+ tape_pos_t m_rw_pos;
+ UINT16 m_next_word;
+ tape_track_t::iterator m_rd_it;
+ bool m_rd_it_valid;
+
+ // Gap detection
+ tape_pos_t m_gap_detect_start;
+
+ typedef enum {
+ ADV_NO_MORE_DATA,
+ ADV_CONT_DATA,
+ ADV_DISCONT_DATA
+ } adv_res_t;
+
+ void clear_state(void);
+ void irq_w(bool state);
+ void set_error(bool state);
+ bool is_braking(void) const;
+ unsigned speed_to_tick_freq(void) const;
+ bool pos_offset(tape_pos_t& pos , tape_pos_t offset) const;
+ tape_pos_t current_tape_pos(void) const;
+ void update_tape_pos(void);
+ void update_tach_reg(void);
+ void freeze_tach_reg(bool freeze);
+ static void ensure_a_lt_b(tape_pos_t& a , tape_pos_t& b);
+ tape_pos_t next_hole(void) const;
+ attotime time_to_distance(tape_pos_t distance) const;
+ attotime time_to_target(tape_pos_t target) const;
+ attotime time_to_stopping_pos(void) const;
+ bool start_tape_cmd(UINT16 cmd_reg , UINT16 must_be_1 , UINT16 must_be_0);
+ void stop_tape(void);
+ tape_track_t& current_track(void);
+ static tape_pos_t word_length(tape_word_t w);
+ static tape_pos_t word_end_pos(const tape_track_t::iterator& it);
+ static void adjust_it(tape_track_t& track , tape_track_t::iterator& it , tape_pos_t pos);
+ void write_word(tape_pos_t start , tape_word_t word , tape_pos_t& length);
+ void write_gap(tape_pos_t a , tape_pos_t b);
+ bool just_gap(tape_pos_t a , tape_pos_t b);
+ tape_pos_t farthest_end(const tape_track_t::iterator& it) const;
+ bool next_data(tape_track_t::iterator& it , tape_pos_t pos , bool inclusive);
+ adv_res_t adv_it(tape_track_t::iterator& it);
+ attotime fetch_next_wr_word(void);
+ attotime time_to_rd_next_word(tape_pos_t& word_rd_pos);
+ tape_pos_t min_gap_size(void) const;
+ bool next_n_gap(tape_pos_t& pos , tape_track_t::iterator it , unsigned n_gaps , tape_pos_t min_gap);
+ bool next_n_gap(tape_pos_t& pos , unsigned n_gaps , tape_pos_t min_gap);
+ void clear_tape(void);
+ void dump_sequence(tape_track_t::const_iterator it_start , unsigned n_words);
+ void save_tape(void);
+ bool load_track(tape_track_t& track);
+ bool load_tape(void);
+ void set_tape_present(bool present);
+ attotime time_to_next_hole(void) const;
+ attotime time_to_tach_pulses(void) const;
+ void terminate_cmd_now(void);
+ void cmd_fsm(void);
+ void start_cmd_exec(UINT16 new_cmd_reg);
};
// device type definition
diff --git a/src/devices/machine/rtc9701.cpp b/src/devices/machine/rtc9701.cpp
index 86f5378d2b4..5023df7ec31 100644
--- a/src/devices/machine/rtc9701.cpp
+++ b/src/devices/machine/rtc9701.cpp
@@ -106,7 +106,7 @@ void rtc9701_device::device_start()
rtc_state = RTC9701_CMD_WAIT;
cmd_stream_pos = 0;
current_cmd = 0;
-
+
save_item(NAME(m_latch));
save_item(NAME(m_reset_line));
save_item(NAME(m_clock_line));
diff --git a/src/devices/machine/serflash.cpp b/src/devices/machine/serflash.cpp
index 1746b4583eb..c8c3eb89797 100644
--- a/src/devices/machine/serflash.cpp
+++ b/src/devices/machine/serflash.cpp
@@ -43,7 +43,7 @@ void serflash_device::device_start()
m_flashwritemap.resize(m_length / FLASH_PAGE_SIZE);
memset(&m_flashwritemap[0], 0, m_length / FLASH_PAGE_SIZE);
-
+
save_item(NAME(m_flash_state));
save_item(NAME(m_flash_enab));
save_item(NAME(m_flash_cmd_seq));
diff --git a/src/devices/machine/smpc.cpp b/src/devices/machine/smpc.cpp
index 6ce2e2f275f..eebbd4f6a22 100644
--- a/src/devices/machine/smpc.cpp
+++ b/src/devices/machine/smpc.cpp
@@ -345,16 +345,16 @@ TIMER_CALLBACK_MEMBER( saturn_state::stv_smpc_intback )
}
/*
- [0] port status:
- 0x04 Sega-tap
- 0x16 Multi-tap
- 0x2x clock serial peripheral
- 0xf0 peripheral isn't connected
- 0xf1 peripheral is connected
- [1] Peripheral ID (note: lowest four bits determines the size of the input packet)
- 0x02 digital pad
- 0x25 (tested by Game Basic?)
- 0x34 keyboard
+ [0] port status:
+ 0x04 Sega-tap
+ 0x16 Multi-tap
+ 0x2x clock serial peripheral
+ 0xf0 peripheral isn't connected
+ 0xf1 peripheral is connected
+ [1] Peripheral ID (note: lowest four bits determines the size of the input packet)
+ 0x02 digital pad
+ 0x25 (tested by Game Basic?)
+ 0x34 keyboard
Lower 4 bits of the port status tell the number of controllers to check for the port
Lower 4 bits of the peripheral ID tell the number of registers used by each controller
@@ -366,7 +366,7 @@ TIMER_CALLBACK_MEMBER( saturn_state::stv_smpc_intback )
- and so on... until the 4th (for SegaTap) or 6th (for Multitap) controller is read
TODO: how does the multitap check if a controller is connected? does it ask for the
controller status of each subport? how does this work exactly?
- currently, there is a small problem in some specific controller config which seems to
+ currently, there is a small problem in some specific controller config which seems to
lose track of one controller. E.g. if I put multitap in port2 with inserted joy1, joy2 and joy4
it does not see joy4 controller, but if I put joy1, joy2, joy4 and joy5 it sees
all four of them. The same happens if I skip controllers with id = 0xff...
@@ -376,18 +376,18 @@ TIMER_CALLBACK_MEMBER( saturn_state::stv_smpc_intback )
TIMER_CALLBACK_MEMBER( saturn_state::intback_peripheral )
{
// if (LOG_SMPC) logerror("SMPC: providing PAD data for intback, pad %d\n", intback_stage-2);
-
+
// doesn't work?
//pad_num = m_smpc.intback_stage - 1;
-
+
if(LOG_PAD_CMD) printf("%d %d %d\n", m_smpc.intback_stage - 1, machine().first_screen()->vpos(), (int)machine().first_screen()->frame_number());
UINT8 status1 = m_ctrl1 ? m_ctrl1->read_status() : 0xf0;
UINT8 status2 = m_ctrl2 ? m_ctrl2->read_status() : 0xf0;
UINT8 reg_offset = 0;
- UINT8 ctrl1_offset = 0; // this is used when there is segatap or multitap connected
- UINT8 ctrl2_offset = 0; // this is used when there is segatap or multitap connected
+ UINT8 ctrl1_offset = 0; // this is used when there is segatap or multitap connected
+ UINT8 ctrl2_offset = 0; // this is used when there is segatap or multitap connected
m_smpc.OREG[reg_offset++] = status1;
// read ctrl1
@@ -836,7 +836,7 @@ UINT8 saturn_state::smpc_direct_mode(UINT8 pad_n)
{
int hshake = (pad_n == 0) ? ((m_smpc.PDR1 >> 5) & 3) : ((m_smpc.PDR2 >> 5) & 3);
const int shift_bit[4] = { 4, 12, 8, 0 };
-
+
UINT16 ctrl_read = 0;
if (m_ctrl1 && pad_n == 0)
ctrl_read = m_ctrl1->read_direct();
diff --git a/src/devices/video/epic12.cpp b/src/devices/video/epic12.cpp
index 5f399292c49..4417172c744 100644
--- a/src/devices/video/epic12.cpp
+++ b/src/devices/video/epic12.cpp
@@ -49,7 +49,7 @@ void epic12_device::device_start()
m_blitter_delay_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(epic12_device::blitter_delay_callback),this));
m_blitter_delay_timer->adjust(attotime::never);
-
+
save_item(NAME(m_gfx_addr));
save_item(NAME(m_gfx_scroll_0_x));
save_item(NAME(m_gfx_scroll_0_y));
diff --git a/src/emu/devfind.h b/src/emu/devfind.h
index 8ea8e59908c..af2626c9797 100644
--- a/src/emu/devfind.h
+++ b/src/emu/devfind.h
@@ -359,7 +359,7 @@ class optional_region_ptr : public region_ptr_finder<_PointerType, false>
{
public:
optional_region_ptr(device_t &base, const char *tag, size_t length = 0) : region_ptr_finder<_PointerType, false>(base, tag, length) { }
- optional_region_ptr(device_t &base, size_t length = 0) : region_ptr_finder<_PointerType, false>(base, FINDER_DUMMY_TAG, length) { }
+ optional_region_ptr(device_t &base, size_t length = 0) : region_ptr_finder<_PointerType, false>(base, FINDER_DUMMY_TAG, length) { }
};
// required region pointer finder
@@ -368,7 +368,7 @@ class required_region_ptr : public region_ptr_finder<_PointerType, true>
{
public:
required_region_ptr(device_t &base, const char *tag, size_t length = 0) : region_ptr_finder<_PointerType, true>(base, tag, length) { }
- required_region_ptr(device_t &base, size_t length = 0) : region_ptr_finder<_PointerType, true>(base, FINDER_DUMMY_TAG, length) { }
+ required_region_ptr(device_t &base, size_t length = 0) : region_ptr_finder<_PointerType, true>(base, FINDER_DUMMY_TAG, length) { }
};
diff --git a/src/emu/diimage.cpp b/src/emu/diimage.cpp
index c1e1e6de409..198be9d1ac0 100644
--- a/src/emu/diimage.cpp
+++ b/src/emu/diimage.cpp
@@ -65,7 +65,7 @@ device_image_interface::device_image_interface(const machine_config &mconfig, de
m_from_swlist(false),
m_create_format(0),
m_create_args(nullptr),
- m_user_loadable(TRUE),
+ m_user_loadable(TRUE),
m_is_loading(FALSE)
{
}
diff --git a/src/emu/diimage.h b/src/emu/diimage.h
index 10b4144e27f..89c402b47fa 100644
--- a/src/emu/diimage.h
+++ b/src/emu/diimage.h
@@ -129,7 +129,7 @@ typedef void (*device_image_partialhash_func)(hash_collection &, const unsigned
#define DEVICE_IMAGE_UNLOAD_DELEGATE(_class,_name) device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_name),#_class "::device_image_unload_" #_name, downcast<_class *>(device->owner()))
#define MCFG_SET_IMAGE_LOADABLE(_usrload) \
- device_image_interface::static_set_user_loadable(*device, _usrload);
+ device_image_interface::static_set_user_loadable(*device, _usrload);
// ======================> device_image_interface
@@ -237,15 +237,15 @@ public:
int reopen_for_write(const char *path);
static void software_name_split(const char *swlist_swname, std::string &swlist_name, std::string &swname, std::string &swpart);
- static void static_set_user_loadable(device_t &device, bool user_loadable) {
- device_image_interface *img;
- if (!device.interface(img))
- throw emu_fatalerror("MCFG_SET_IMAGE_LOADABLE called on device '%s' with no image interface\n", device.tag());
-
- img->m_user_loadable = user_loadable;
- }
+ static void static_set_user_loadable(device_t &device, bool user_loadable) {
+ device_image_interface *img;
+ if (!device.interface(img))
+ throw emu_fatalerror("MCFG_SET_IMAGE_LOADABLE called on device '%s' with no image interface\n", device.tag());
- bool user_loadable() const { return m_user_loadable; }
+ img->m_user_loadable = user_loadable;
+ }
+
+ bool user_loadable() const { return m_user_loadable; }
protected:
bool load_internal(const char *path, bool is_create, int create_format, option_resolution *create_args, bool just_load);
@@ -318,13 +318,13 @@ protected:
std::string m_brief_instance_name;
std::string m_instance_name;
-
+
/* creation info */
simple_list<image_device_format> m_formatlist;
- /* in the case of arcade cabinet with fixed carts inserted,
- we want to disable command line cart loading... */
- bool m_user_loadable;
+ /* in the case of arcade cabinet with fixed carts inserted,
+ we want to disable command line cart loading... */
+ bool m_user_loadable;
bool m_is_loading;
};
diff --git a/src/emu/dispatch.h b/src/emu/dispatch.h
index fae34197100..dbaaeb32a96 100644
--- a/src/emu/dispatch.h
+++ b/src/emu/dispatch.h
@@ -33,7 +33,7 @@ template<int N> class devcb_line_dispatch_device : public device_t {
public:
devcb_line_dispatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, DEVCB_LINE_DISPATCH_2, "DEVCB_LINE_DISPATCH_2", tag, owner, clock, "devcb_line_dispatch_2", __FILE__) { }
-
+
void init_fwd() {
for(auto & elem : fwd_cb)
elem = new devcb_write_line(*this);
diff --git a/src/emu/emuopts.h b/src/emu/emuopts.h
index 891355a4eeb..a47b1381dbb 100644
--- a/src/emu/emuopts.h
+++ b/src/emu/emuopts.h
@@ -15,7 +15,7 @@
#include "options.h"
-#define OPTION_PRIORITY_CMDLINE OPTION_PRIORITY_HIGH + 1
+#define OPTION_PRIORITY_CMDLINE OPTION_PRIORITY_HIGH + 1
// core options
#define OPTION_SYSTEMNAME core_options::unadorned(0)
#define OPTION_SOFTWARENAME core_options::unadorned(1)
@@ -369,7 +369,7 @@ public:
const char *no_plugin() const { return value(OPTION_NO_PLUGIN); }
const char *language() const { return value(OPTION_LANGUAGE); }
-
+
// cache frequently used options in members
void update_cached_options();
diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp
index 2555cda4c2e..a11afa2ab5b 100644
--- a/src/emu/machine.cpp
+++ b/src/emu/machine.cpp
@@ -258,7 +258,7 @@ void running_machine::start()
m_render->resolve_tags();
manager().create_custom(*this);
-
+
// register callbacks for the devices, then start them
add_notifier(MACHINE_NOTIFY_RESET, machine_notify_delegate(FUNC(running_machine::reset_all_devices), this));
add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(running_machine::stop_all_devices), this));
diff --git a/src/emu/machine.h b/src/emu/machine.h
index 9cdc893a2d2..008a350c78d 100644
--- a/src/emu/machine.h
+++ b/src/emu/machine.h
@@ -289,7 +289,7 @@ private:
std::unique_ptr<input_manager> m_input; // internal data from input.cpp
std::unique_ptr<sound_manager> m_sound; // internal data from sound.cpp
std::unique_ptr<video_manager> m_video; // internal data from video.cpp
- ui_manager *m_ui; // internal data from ui.cpp
+ ui_manager *m_ui; // internal data from ui.cpp
std::unique_ptr<ui_input_manager> m_ui_input; // internal data from uiinput.cpp
std::unique_ptr<tilemap_manager> m_tilemap; // internal data from tilemap.cpp
std::unique_ptr<debug_view_manager> m_debug_view; // internal data from debugvw.cpp
diff --git a/src/emu/main.h b/src/emu/main.h
index b8aaf3b838a..1225e5c21a6 100644
--- a/src/emu/main.h
+++ b/src/emu/main.h
@@ -88,7 +88,7 @@ public:
protected:
osd_interface & m_osd; // reference to OSD system
emu_options & m_options; // reference to options
- running_machine * m_machine;
+ running_machine * m_machine;
};
diff --git a/src/emu/mconfig.cpp b/src/emu/mconfig.cpp
index 9cd039701cd..17e948f7844 100644
--- a/src/emu/mconfig.cpp
+++ b/src/emu/mconfig.cpp
@@ -34,7 +34,7 @@ machine_config::machine_config(const game_driver &gamedrv, emu_options &options)
bool is_selected_driver = core_stricmp(gamedrv.name,options.system_name())==0;
// intialize slot devices - make sure that any required devices have been allocated
-
+
for (device_slot_interface &slot : slot_interface_iterator(root_device()))
{
device_t &owner = slot.device();
diff --git a/src/emu/rendfont.cpp b/src/emu/rendfont.cpp
index 70d87856378..9687206f85b 100644
--- a/src/emu/rendfont.cpp
+++ b/src/emu/rendfont.cpp
@@ -420,11 +420,11 @@ float render_font::string_width(float height, float aspect, const char *string)
const char *ends = string + strlen(string);
const char *s = string;
unicode_char schar;
-
+
// loop over characters
while (*s != 0)
{
- int scharcount = uchar_from_utf8(&schar, s, ends - s);
+ int scharcount = uchar_from_utf8(&schar, s, ends - s);
totwidth += get_char(schar).width;
s += scharcount;
}
diff --git a/src/emu/rendlay.cpp b/src/emu/rendlay.cpp
index 5b945b09d04..9c9a854e512 100644
--- a/src/emu/rendlay.cpp
+++ b/src/emu/rendlay.cpp
@@ -950,12 +950,12 @@ void layout_element::component::draw_text(running_machine &machine, bitmap_argb3
const char *ends = origs + strlen(origs);
const char *s = origs;
unicode_char schar;
-
+
// loop over characters
while (*s != 0)
{
- int scharcount = uchar_from_utf8(&schar, s, ends - s);
-
+ int scharcount = uchar_from_utf8(&schar, s, ends - s);
+
if (scharcount == -1)
break;
@@ -1124,8 +1124,8 @@ void layout_element::component::draw_reel(running_machine &machine, bitmap_argb3
// loop over characters
while (*s != 0)
{
- int scharcount = uchar_from_utf8(&schar, s, ends - s);
-
+ int scharcount = uchar_from_utf8(&schar, s, ends - s);
+
if (scharcount == -1)
break;
@@ -1285,8 +1285,8 @@ void layout_element::component::draw_beltreel(running_machine &machine, bitmap_a
// loop over characters
while (*s != 0)
{
- int scharcount = uchar_from_utf8(&schar, s, ends - s);
-
+ int scharcount = uchar_from_utf8(&schar, s, ends - s);
+
if (scharcount == -1)
break;
diff --git a/src/emu/romload.cpp b/src/emu/romload.cpp
index a03e25e91ed..2efc80a4dc5 100644
--- a/src/emu/romload.cpp
+++ b/src/emu/romload.cpp
@@ -1449,7 +1449,7 @@ rom_load_manager::rom_load_manager(running_machine &machine)
: m_machine(machine)
{
/* figure out which BIOS we are using */
-
+
for (device_t &device : device_iterator(machine.config().root_device()))
{
if (device.rom_region())
diff --git a/src/emu/ui/uimain.h b/src/emu/ui/uimain.h
index 9230892adca..48fbdff5c18 100644
--- a/src/emu/ui/uimain.h
+++ b/src/emu/ui/uimain.h
@@ -57,11 +57,11 @@ enum class ui_menu_item_type
class ui_menu_item
{
public:
- const char *text;
- const char *subtext;
- UINT32 flags;
- void *ref;
- ui_menu_item_type type; // item type (eventually will go away when itemref is proper ui_menu_item class rather than void*)
+ const char *text;
+ const char *subtext;
+ UINT32 flags;
+ void *ref;
+ ui_menu_item_type type; // item type (eventually will go away when itemref is proper ui_menu_item class rather than void*)
inline bool is_selectable() const;
};
@@ -73,27 +73,27 @@ public:
ui_manager(running_machine &machine) : m_machine(machine),m_use_natural_keyboard(false),m_show_timecode_counter(false),m_show_timecode_total(false) { }
virtual ~ui_manager() { }
-
+
virtual void set_startup_text(const char *text, bool force) { }
-
+
virtual bool is_menu_active() { return false; }
-
+
bool use_natural_keyboard() const { return m_use_natural_keyboard; }
-
+
void set_show_timecode_counter(bool value) { m_show_timecode_counter = value; m_show_timecode_total = true; }
bool show_timecode_counter() const { return m_show_timecode_counter; }
- bool show_timecode_total() const { return m_show_timecode_total; }
-
- virtual void popup_time_string(int seconds, std::string message) { }
+ bool show_timecode_total() const { return m_show_timecode_total; }
+
+ virtual void popup_time_string(int seconds, std::string message) { }
virtual void image_display(const device_type &type, device_image_interface *image) { }
-
+
template <typename Format, typename... Params> void popup_time(int seconds, Format &&fmt, Params &&... args);
-
+
protected:
// instance variables
- running_machine & m_machine;
+ running_machine & m_machine;
bool m_use_natural_keyboard;
bool m_show_timecode_counter;
bool m_show_timecode_total;
diff --git a/src/emu/validity.h b/src/emu/validity.h
index eec10069aaa..cca0eda18da 100644
--- a/src/emu/validity.h
+++ b/src/emu/validity.h
@@ -112,7 +112,7 @@ private:
const char * m_current_ioport;
int_map m_region_map;
std::unordered_set<std::string> m_already_checked;
- bool m_validate_all;
+ bool m_validate_all;
};
#endif
diff --git a/src/frontend/mame/info.cpp b/src/frontend/mame/info.cpp
index b23c8296992..f20175e4998 100644
--- a/src/frontend/mame/info.cpp
+++ b/src/frontend/mame/info.cpp
@@ -514,7 +514,7 @@ void info_xml_creator::output_bios()
// skip if no ROMs
if (m_drivlist.driver().rom == nullptr)
return;
-
+
// first determine the default BIOS name
std::string defaultname;
for (const rom_entry *rom = m_drivlist.driver().rom; !ROMENTRY_ISEND(rom); rom++)
@@ -819,472 +819,471 @@ void info_xml_creator::output_sound(device_t &device)
void info_xml_creator::output_input(const ioport_list &portlist)
{
- // enumerated list of control types
- // NOTE: the order is chosen so that 'spare' button inputs are assigned to the
- // most-likely-correct input device when info is output (you can think of it as
- // a sort of likelihood order of having buttons)
- enum
- {
- CTRL_DIGITAL_BUTTONS,
- CTRL_DIGITAL_JOYSTICK,
- CTRL_ANALOG_JOYSTICK,
- CTRL_ANALOG_LIGHTGUN,
- CTRL_ANALOG_DIAL,
- CTRL_ANALOG_POSITIONAL,
- CTRL_ANALOG_TRACKBALL,
- CTRL_ANALOG_MOUSE,
- CTRL_ANALOG_PADDLE,
- CTRL_ANALOG_PEDAL,
- CTRL_DIGITAL_KEYPAD,
- CTRL_DIGITAL_KEYBOARD,
- CTRL_DIGITAL_MAHJONG,
- CTRL_DIGITAL_HANAFUDA,
- CTRL_DIGITAL_GAMBLING,
- CTRL_COUNT
- };
-
- enum
- {
- CTRL_P1,
- CTRL_P2,
- CTRL_P3,
- CTRL_P4,
- CTRL_P5,
- CTRL_P6,
- CTRL_P7,
- CTRL_P8,
+ // enumerated list of control types
+ // NOTE: the order is chosen so that 'spare' button inputs are assigned to the
+ // most-likely-correct input device when info is output (you can think of it as
+ // a sort of likelihood order of having buttons)
+ enum
+ {
+ CTRL_DIGITAL_BUTTONS,
+ CTRL_DIGITAL_JOYSTICK,
+ CTRL_ANALOG_JOYSTICK,
+ CTRL_ANALOG_LIGHTGUN,
+ CTRL_ANALOG_DIAL,
+ CTRL_ANALOG_POSITIONAL,
+ CTRL_ANALOG_TRACKBALL,
+ CTRL_ANALOG_MOUSE,
+ CTRL_ANALOG_PADDLE,
+ CTRL_ANALOG_PEDAL,
+ CTRL_DIGITAL_KEYPAD,
+ CTRL_DIGITAL_KEYBOARD,
+ CTRL_DIGITAL_MAHJONG,
+ CTRL_DIGITAL_HANAFUDA,
+ CTRL_DIGITAL_GAMBLING,
+ CTRL_COUNT
+ };
+
+ enum
+ {
+ CTRL_P1,
+ CTRL_P2,
+ CTRL_P3,
+ CTRL_P4,
+ CTRL_P5,
+ CTRL_P6,
+ CTRL_P7,
+ CTRL_P8,
CTRL_P9,
CTRL_P10,
- CTRL_PCOUNT
- };
-
- // directions
- const UINT8 DIR_UP = 0x01;
- const UINT8 DIR_DOWN = 0x02;
- const UINT8 DIR_LEFT = 0x04;
- const UINT8 DIR_RIGHT = 0x08;
-
- // initialize the list of control types
- struct
- {
- const char * type; // general type of input
- int player; // player which the input belongs to
- int nbuttons; // total number of buttons
- int maxbuttons; // max index of buttons (using IPT_BUTTONn) [probably to be removed soonish]
- int ways; // directions for joystick
- bool analog; // is analog input?
- UINT8 helper[3]; // for dual joysticks [possibly to be removed soonish]
- INT32 min; // analog minimum value
- INT32 max; // analog maximum value
- INT32 sensitivity; // default analog sensitivity
- INT32 keydelta; // default analog keydelta
- bool reverse; // default analog reverse setting
- } control_info[CTRL_COUNT * CTRL_PCOUNT];
-
- memset(&control_info, 0, sizeof(control_info));
-
- // tracking info as we iterate
- int nplayer = 0;
- int ncoin = 0;
- bool service = false;
- bool tilt = false;
-
- // iterate over the ports
- for (ioport_port &port : portlist)
- {
- int ctrl_type = CTRL_DIGITAL_BUTTONS;
- bool ctrl_analog = FALSE;
- for (ioport_field &field : port.fields())
- {
-
- // track the highest player number
- if (nplayer < field.player() + 1)
- nplayer = field.player() + 1;
-
- // switch off of the type
- switch (field.type())
- {
- // map joysticks
- case IPT_JOYSTICK_UP:
- ctrl_type = CTRL_DIGITAL_JOYSTICK;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
- control_info[field.player() * CTRL_COUNT + ctrl_type].helper[0] |= DIR_UP;
- break;
- case IPT_JOYSTICK_DOWN:
- ctrl_type = CTRL_DIGITAL_JOYSTICK;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
- control_info[field.player() * CTRL_COUNT + ctrl_type].helper[0] |= DIR_DOWN;
- break;
- case IPT_JOYSTICK_LEFT:
- ctrl_type = CTRL_DIGITAL_JOYSTICK;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
- control_info[field.player() * CTRL_COUNT + ctrl_type].helper[0] |= DIR_LEFT;
- break;
- case IPT_JOYSTICK_RIGHT:
- ctrl_type = CTRL_DIGITAL_JOYSTICK;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
- control_info[field.player() * CTRL_COUNT + ctrl_type].helper[0] |= DIR_RIGHT;
- break;
-
- case IPT_JOYSTICKLEFT_UP:
- ctrl_type = CTRL_DIGITAL_JOYSTICK;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
- control_info[field.player() * CTRL_COUNT + ctrl_type].helper[1] |= DIR_UP;
- break;
- case IPT_JOYSTICKLEFT_DOWN:
- ctrl_type = CTRL_DIGITAL_JOYSTICK;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
- control_info[field.player() * CTRL_COUNT + ctrl_type].helper[1] |= DIR_DOWN;
- break;
- case IPT_JOYSTICKLEFT_LEFT:
- ctrl_type = CTRL_DIGITAL_JOYSTICK;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
- control_info[field.player() * CTRL_COUNT + ctrl_type].helper[1] |= DIR_LEFT;
- break;
- case IPT_JOYSTICKLEFT_RIGHT:
- ctrl_type = CTRL_DIGITAL_JOYSTICK;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
- control_info[field.player() * CTRL_COUNT + ctrl_type].helper[1] |= DIR_RIGHT;
- break;
-
- case IPT_JOYSTICKRIGHT_UP:
- ctrl_type = CTRL_DIGITAL_JOYSTICK;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
- control_info[field.player() * CTRL_COUNT + ctrl_type].helper[2] |= DIR_UP;
- break;
- case IPT_JOYSTICKRIGHT_DOWN:
- ctrl_type = CTRL_DIGITAL_JOYSTICK;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
- control_info[field.player() * CTRL_COUNT + ctrl_type].helper[2] |= DIR_DOWN;
- break;
- case IPT_JOYSTICKRIGHT_LEFT:
- ctrl_type = CTRL_DIGITAL_JOYSTICK;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
- control_info[field.player() * CTRL_COUNT + ctrl_type].helper[2] |= DIR_LEFT;
- break;
- case IPT_JOYSTICKRIGHT_RIGHT:
- ctrl_type = CTRL_DIGITAL_JOYSTICK;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
- control_info[field.player() * CTRL_COUNT + ctrl_type].helper[2] |= DIR_RIGHT;
- break;
-
- // map analog inputs
- case IPT_AD_STICK_X:
- case IPT_AD_STICK_Y:
- case IPT_AD_STICK_Z:
- ctrl_analog = TRUE;
- ctrl_type = CTRL_ANALOG_JOYSTICK;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "stick";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].analog = TRUE;
- break;
-
- case IPT_PADDLE:
- case IPT_PADDLE_V:
- ctrl_analog = TRUE;
- ctrl_type = CTRL_ANALOG_PADDLE;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "paddle";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].analog = TRUE;
- break;
-
- case IPT_PEDAL:
- case IPT_PEDAL2:
- case IPT_PEDAL3:
- ctrl_analog = TRUE;
- ctrl_type = CTRL_ANALOG_PEDAL;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "pedal";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].analog = TRUE;
- break;
-
- case IPT_LIGHTGUN_X:
- case IPT_LIGHTGUN_Y:
- ctrl_analog = TRUE;
- ctrl_type = CTRL_ANALOG_LIGHTGUN;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "lightgun";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].analog = TRUE;
- break;
-
- case IPT_POSITIONAL:
- case IPT_POSITIONAL_V:
- ctrl_analog = TRUE;
- ctrl_type = CTRL_ANALOG_POSITIONAL;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "positional";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].analog = TRUE;
- break;
-
- case IPT_DIAL:
- case IPT_DIAL_V:
- ctrl_analog = TRUE;
- ctrl_type = CTRL_ANALOG_DIAL;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "dial";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].analog = TRUE;
- break;
-
- case IPT_TRACKBALL_X:
- case IPT_TRACKBALL_Y:
- ctrl_analog = TRUE;
- ctrl_type = CTRL_ANALOG_TRACKBALL;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "trackball";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].analog = TRUE;
- break;
-
- case IPT_MOUSE_X:
- case IPT_MOUSE_Y:
- ctrl_analog = TRUE;
- ctrl_type = CTRL_ANALOG_MOUSE;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "mouse";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].analog = TRUE;
- break;
-
- // map buttons
- case IPT_BUTTON1:
- case IPT_BUTTON2:
- case IPT_BUTTON3:
- case IPT_BUTTON4:
- case IPT_BUTTON5:
- case IPT_BUTTON6:
- case IPT_BUTTON7:
- case IPT_BUTTON8:
- case IPT_BUTTON9:
- case IPT_BUTTON10:
- case IPT_BUTTON11:
- case IPT_BUTTON12:
- case IPT_BUTTON13:
- case IPT_BUTTON14:
- case IPT_BUTTON15:
- case IPT_BUTTON16:
- ctrl_analog = FALSE;
- if (control_info[field.player() * CTRL_COUNT + ctrl_type].type == nullptr)
- {
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "only_buttons";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].analog = FALSE;
- }
- control_info[field.player() * CTRL_COUNT + ctrl_type].maxbuttons = MAX(control_info[field.player() * CTRL_COUNT + ctrl_type].maxbuttons, field.type() - IPT_BUTTON1 + 1);
- control_info[field.player() * CTRL_COUNT + ctrl_type].nbuttons++;
- break;
-
- // track maximum coin index
- case IPT_COIN1:
- case IPT_COIN2:
- case IPT_COIN3:
- case IPT_COIN4:
- case IPT_COIN5:
- case IPT_COIN6:
- case IPT_COIN7:
- case IPT_COIN8:
+ CTRL_PCOUNT
+ };
+
+ // directions
+ const UINT8 DIR_UP = 0x01;
+ const UINT8 DIR_DOWN = 0x02;
+ const UINT8 DIR_LEFT = 0x04;
+ const UINT8 DIR_RIGHT = 0x08;
+
+ // initialize the list of control types
+ struct
+ {
+ const char * type; // general type of input
+ int player; // player which the input belongs to
+ int nbuttons; // total number of buttons
+ int maxbuttons; // max index of buttons (using IPT_BUTTONn) [probably to be removed soonish]
+ int ways; // directions for joystick
+ bool analog; // is analog input?
+ UINT8 helper[3]; // for dual joysticks [possibly to be removed soonish]
+ INT32 min; // analog minimum value
+ INT32 max; // analog maximum value
+ INT32 sensitivity; // default analog sensitivity
+ INT32 keydelta; // default analog keydelta
+ bool reverse; // default analog reverse setting
+ } control_info[CTRL_COUNT * CTRL_PCOUNT];
+
+ memset(&control_info, 0, sizeof(control_info));
+
+ // tracking info as we iterate
+ int nplayer = 0;
+ int ncoin = 0;
+ bool service = false;
+ bool tilt = false;
+
+ // iterate over the ports
+ for (ioport_port &port : portlist)
+ {
+ int ctrl_type = CTRL_DIGITAL_BUTTONS;
+ bool ctrl_analog = FALSE;
+ for (ioport_field &field : port.fields())
+ {
+ // track the highest player number
+ if (nplayer < field.player() + 1)
+ nplayer = field.player() + 1;
+
+ // switch off of the type
+ switch (field.type())
+ {
+ // map joysticks
+ case IPT_JOYSTICK_UP:
+ ctrl_type = CTRL_DIGITAL_JOYSTICK;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
+ control_info[field.player() * CTRL_COUNT + ctrl_type].helper[0] |= DIR_UP;
+ break;
+ case IPT_JOYSTICK_DOWN:
+ ctrl_type = CTRL_DIGITAL_JOYSTICK;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
+ control_info[field.player() * CTRL_COUNT + ctrl_type].helper[0] |= DIR_DOWN;
+ break;
+ case IPT_JOYSTICK_LEFT:
+ ctrl_type = CTRL_DIGITAL_JOYSTICK;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
+ control_info[field.player() * CTRL_COUNT + ctrl_type].helper[0] |= DIR_LEFT;
+ break;
+ case IPT_JOYSTICK_RIGHT:
+ ctrl_type = CTRL_DIGITAL_JOYSTICK;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
+ control_info[field.player() * CTRL_COUNT + ctrl_type].helper[0] |= DIR_RIGHT;
+ break;
+
+ case IPT_JOYSTICKLEFT_UP:
+ ctrl_type = CTRL_DIGITAL_JOYSTICK;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
+ control_info[field.player() * CTRL_COUNT + ctrl_type].helper[1] |= DIR_UP;
+ break;
+ case IPT_JOYSTICKLEFT_DOWN:
+ ctrl_type = CTRL_DIGITAL_JOYSTICK;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
+ control_info[field.player() * CTRL_COUNT + ctrl_type].helper[1] |= DIR_DOWN;
+ break;
+ case IPT_JOYSTICKLEFT_LEFT:
+ ctrl_type = CTRL_DIGITAL_JOYSTICK;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
+ control_info[field.player() * CTRL_COUNT + ctrl_type].helper[1] |= DIR_LEFT;
+ break;
+ case IPT_JOYSTICKLEFT_RIGHT:
+ ctrl_type = CTRL_DIGITAL_JOYSTICK;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
+ control_info[field.player() * CTRL_COUNT + ctrl_type].helper[1] |= DIR_RIGHT;
+ break;
+
+ case IPT_JOYSTICKRIGHT_UP:
+ ctrl_type = CTRL_DIGITAL_JOYSTICK;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
+ control_info[field.player() * CTRL_COUNT + ctrl_type].helper[2] |= DIR_UP;
+ break;
+ case IPT_JOYSTICKRIGHT_DOWN:
+ ctrl_type = CTRL_DIGITAL_JOYSTICK;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
+ control_info[field.player() * CTRL_COUNT + ctrl_type].helper[2] |= DIR_DOWN;
+ break;
+ case IPT_JOYSTICKRIGHT_LEFT:
+ ctrl_type = CTRL_DIGITAL_JOYSTICK;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
+ control_info[field.player() * CTRL_COUNT + ctrl_type].helper[2] |= DIR_LEFT;
+ break;
+ case IPT_JOYSTICKRIGHT_RIGHT:
+ ctrl_type = CTRL_DIGITAL_JOYSTICK;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "joy";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].ways = field.way();
+ control_info[field.player() * CTRL_COUNT + ctrl_type].helper[2] |= DIR_RIGHT;
+ break;
+
+ // map analog inputs
+ case IPT_AD_STICK_X:
+ case IPT_AD_STICK_Y:
+ case IPT_AD_STICK_Z:
+ ctrl_analog = TRUE;
+ ctrl_type = CTRL_ANALOG_JOYSTICK;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "stick";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].analog = TRUE;
+ break;
+
+ case IPT_PADDLE:
+ case IPT_PADDLE_V:
+ ctrl_analog = TRUE;
+ ctrl_type = CTRL_ANALOG_PADDLE;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "paddle";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].analog = TRUE;
+ break;
+
+ case IPT_PEDAL:
+ case IPT_PEDAL2:
+ case IPT_PEDAL3:
+ ctrl_analog = TRUE;
+ ctrl_type = CTRL_ANALOG_PEDAL;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "pedal";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].analog = TRUE;
+ break;
+
+ case IPT_LIGHTGUN_X:
+ case IPT_LIGHTGUN_Y:
+ ctrl_analog = TRUE;
+ ctrl_type = CTRL_ANALOG_LIGHTGUN;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "lightgun";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].analog = TRUE;
+ break;
+
+ case IPT_POSITIONAL:
+ case IPT_POSITIONAL_V:
+ ctrl_analog = TRUE;
+ ctrl_type = CTRL_ANALOG_POSITIONAL;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "positional";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].analog = TRUE;
+ break;
+
+ case IPT_DIAL:
+ case IPT_DIAL_V:
+ ctrl_analog = TRUE;
+ ctrl_type = CTRL_ANALOG_DIAL;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "dial";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].analog = TRUE;
+ break;
+
+ case IPT_TRACKBALL_X:
+ case IPT_TRACKBALL_Y:
+ ctrl_analog = TRUE;
+ ctrl_type = CTRL_ANALOG_TRACKBALL;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "trackball";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].analog = TRUE;
+ break;
+
+ case IPT_MOUSE_X:
+ case IPT_MOUSE_Y:
+ ctrl_analog = TRUE;
+ ctrl_type = CTRL_ANALOG_MOUSE;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "mouse";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].analog = TRUE;
+ break;
+
+ // map buttons
+ case IPT_BUTTON1:
+ case IPT_BUTTON2:
+ case IPT_BUTTON3:
+ case IPT_BUTTON4:
+ case IPT_BUTTON5:
+ case IPT_BUTTON6:
+ case IPT_BUTTON7:
+ case IPT_BUTTON8:
+ case IPT_BUTTON9:
+ case IPT_BUTTON10:
+ case IPT_BUTTON11:
+ case IPT_BUTTON12:
+ case IPT_BUTTON13:
+ case IPT_BUTTON14:
+ case IPT_BUTTON15:
+ case IPT_BUTTON16:
+ ctrl_analog = FALSE;
+ if (control_info[field.player() * CTRL_COUNT + ctrl_type].type == nullptr)
+ {
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "only_buttons";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].analog = FALSE;
+ }
+ control_info[field.player() * CTRL_COUNT + ctrl_type].maxbuttons = MAX(control_info[field.player() * CTRL_COUNT + ctrl_type].maxbuttons, field.type() - IPT_BUTTON1 + 1);
+ control_info[field.player() * CTRL_COUNT + ctrl_type].nbuttons++;
+ break;
+
+ // track maximum coin index
+ case IPT_COIN1:
+ case IPT_COIN2:
+ case IPT_COIN3:
+ case IPT_COIN4:
+ case IPT_COIN5:
+ case IPT_COIN6:
+ case IPT_COIN7:
+ case IPT_COIN8:
case IPT_COIN9:
case IPT_COIN10:
case IPT_COIN11:
case IPT_COIN12:
- ncoin = MAX(ncoin, field.type() - IPT_COIN1 + 1);
- break;
-
- // track presence of keypads and keyboards
- case IPT_KEYPAD:
- ctrl_type = CTRL_DIGITAL_KEYPAD;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "keypad";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].nbuttons++;
- break;
-
- case IPT_KEYBOARD:
- ctrl_type = CTRL_DIGITAL_KEYBOARD;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "keyboard";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].nbuttons++;
- break;
-
- // additional types
- case IPT_SERVICE:
- service = true;
- break;
-
- case IPT_TILT:
- tilt = true;
- break;
-
- default:
- if (field.type() > IPT_MAHJONG_FIRST && field.type() < IPT_MAHJONG_LAST)
- {
- ctrl_type = CTRL_DIGITAL_MAHJONG;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "mahjong";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].nbuttons++;
- }
- else if (field.type() > IPT_HANAFUDA_FIRST && field.type() < IPT_HANAFUDA_LAST)
- {
- ctrl_type = CTRL_DIGITAL_HANAFUDA;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "hanafuda";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].nbuttons++;
- }
- else if (field.type() > IPT_GAMBLING_FIRST && field.type() < IPT_GAMBLING_LAST)
- {
- ctrl_type = CTRL_DIGITAL_GAMBLING;
- control_info[field.player() * CTRL_COUNT + ctrl_type].type = "gambling";
- control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
- control_info[field.player() * CTRL_COUNT + ctrl_type].nbuttons++;
- }
- break;
- }
-
- if (ctrl_analog)
- {
- // get the analog stats
- if (field.minval() != 0)
- control_info[field.player() * CTRL_COUNT + ctrl_type].min = field.minval();
- if (field.maxval() != 0)
- control_info[field.player() * CTRL_COUNT + ctrl_type].max = field.maxval();
- if (field.sensitivity() != 0)
- control_info[field.player() * CTRL_COUNT + ctrl_type].sensitivity = field.sensitivity();
- if (field.delta() != 0)
- control_info[field.player() * CTRL_COUNT + ctrl_type].keydelta = field.delta();
- if (field.analog_reverse() != 0)
- control_info[field.player() * CTRL_COUNT + ctrl_type].reverse = TRUE;
- }
- }
- }
-
- // Clean-up those entries, if any, where buttons were defined in a separate port than the actual controller they belong to.
- // This is quite often the case, especially for arcades where controls can be easily mapped to separate input ports on PCB.
- // If such situation would only happen for joystick, it would be possible to work it around by initializing differently
- // ctrl_type above, but it is quite common among analog inputs as well (for instance, this is the tipical situation
- // for lightguns) and therefore we really need this separate loop.
- for (int i = 0; i < CTRL_PCOUNT; i++)
- {
- bool fix_done = FALSE;
- for (int j = 1; j < CTRL_COUNT; j++)
- if (control_info[i * CTRL_COUNT].type != nullptr && control_info[i * CTRL_COUNT + j].type != nullptr && !fix_done)
- {
- control_info[i * CTRL_COUNT + j].nbuttons += control_info[i * CTRL_COUNT].nbuttons;
- control_info[i * CTRL_COUNT + j].maxbuttons = MAX(control_info[i * CTRL_COUNT + j].maxbuttons, control_info[i * CTRL_COUNT].maxbuttons);
-
- memset(&control_info[i * CTRL_COUNT], 0, sizeof(control_info[0]));
- fix_done = TRUE;
- }
- }
-
- // Output the input info
- // First basic info
- fprintf(m_output, "\t\t<input");
- fprintf(m_output, " players=\"%d\"", nplayer);
- if (ncoin != 0)
- fprintf(m_output, " coins=\"%d\"", ncoin);
- if (service)
- fprintf(m_output, " service=\"yes\"");
- if (tilt)
- fprintf(m_output, " tilt=\"yes\"");
- fprintf(m_output, ">\n");
-
- // Then controller specific ones
- for (auto & elem : control_info)
- if (elem.type != nullptr)
- {
- //printf("type %s - player %d - buttons %d\n", elem.type, elem.player, elem.nbuttons);
- if (elem.analog)
- {
- fprintf(m_output, "\t\t\t<control type=\"%s\"", xml_normalize_string(elem.type));
- if (nplayer > 1)
- fprintf(m_output, " player=\"%d\"", elem.player);
- if (elem.nbuttons > 0)
- fprintf(m_output, " buttons=\"%d\"", strcmp(elem.type, "stick") ? elem.nbuttons : elem.maxbuttons);
- if (elem.min != 0 || elem.max != 0)
- {
- fprintf(m_output, " minimum=\"%d\"", elem.min);
- fprintf(m_output, " maximum=\"%d\"", elem.max);
- }
- if (elem.sensitivity != 0)
- fprintf(m_output, " sensitivity=\"%d\"", elem.sensitivity);
- if (elem.keydelta != 0)
- fprintf(m_output, " keydelta=\"%d\"", elem.keydelta);
- if (elem.reverse)
- fprintf(m_output, " reverse=\"yes\"");
-
- fprintf(m_output, "/>\n");
- }
- else
- {
- if (elem.helper[1] == 0 && elem.helper[2] != 0) { elem.helper[1] = elem.helper[2]; elem.helper[2] = 0; }
- if (elem.helper[0] == 0 && elem.helper[1] != 0) { elem.helper[0] = elem.helper[1]; elem.helper[1] = 0; }
- if (elem.helper[1] == 0 && elem.helper[2] != 0) { elem.helper[1] = elem.helper[2]; elem.helper[2] = 0; }
- const char *joys = (elem.helper[2] != 0) ? "triple" : (elem.helper[1] != 0) ? "double" : "";
- fprintf(m_output, "\t\t\t<control type=\"%s%s\"", joys, xml_normalize_string(elem.type));
- if (nplayer > 1)
- fprintf(m_output, " player=\"%d\"", elem.player);
- if (elem.nbuttons > 0)
- fprintf(m_output, " buttons=\"%d\"", strcmp(elem.type, "joy") ? elem.nbuttons : elem.maxbuttons);
- for (int lp = 0; lp < 3 && elem.helper[lp] != 0; lp++)
- {
- const char *plural = (lp==2) ? "3" : (lp==1) ? "2" : "";
- const char *ways;
- std::string helper;
- switch (elem.helper[lp] & (DIR_UP | DIR_DOWN | DIR_LEFT | DIR_RIGHT))
- {
- case DIR_UP | DIR_DOWN | DIR_LEFT | DIR_RIGHT:
- helper = string_format("%d", (elem.ways == 0) ? 8 : elem.ways);
- ways = helper.c_str();
- break;
- case DIR_LEFT | DIR_RIGHT:
- ways = "2";
- break;
- case DIR_UP | DIR_DOWN:
- ways = "vertical2";
- break;
- case DIR_UP:
- case DIR_DOWN:
- case DIR_LEFT:
- case DIR_RIGHT:
- ways = "1";
- break;
- case DIR_UP | DIR_DOWN | DIR_LEFT:
- case DIR_UP | DIR_DOWN | DIR_RIGHT:
- case DIR_UP | DIR_LEFT | DIR_RIGHT:
- case DIR_DOWN | DIR_LEFT | DIR_RIGHT:
- ways = (elem.ways == 4) ? "3 (half4)" : "5 (half8)";
- break;
- default:
- ways = "strange2";
- break;
- }
- fprintf(m_output, " ways%s=\"%s\"", plural, ways);
- }
- fprintf(m_output, "/>\n");
- }
- }
-
- fprintf(m_output, "\t\t</input>\n");
+ ncoin = MAX(ncoin, field.type() - IPT_COIN1 + 1);
+ break;
+
+ // track presence of keypads and keyboards
+ case IPT_KEYPAD:
+ ctrl_type = CTRL_DIGITAL_KEYPAD;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "keypad";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].nbuttons++;
+ break;
+
+ case IPT_KEYBOARD:
+ ctrl_type = CTRL_DIGITAL_KEYBOARD;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "keyboard";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].nbuttons++;
+ break;
+
+ // additional types
+ case IPT_SERVICE:
+ service = true;
+ break;
+
+ case IPT_TILT:
+ tilt = true;
+ break;
+
+ default:
+ if (field.type() > IPT_MAHJONG_FIRST && field.type() < IPT_MAHJONG_LAST)
+ {
+ ctrl_type = CTRL_DIGITAL_MAHJONG;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "mahjong";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].nbuttons++;
+ }
+ else if (field.type() > IPT_HANAFUDA_FIRST && field.type() < IPT_HANAFUDA_LAST)
+ {
+ ctrl_type = CTRL_DIGITAL_HANAFUDA;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "hanafuda";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].nbuttons++;
+ }
+ else if (field.type() > IPT_GAMBLING_FIRST && field.type() < IPT_GAMBLING_LAST)
+ {
+ ctrl_type = CTRL_DIGITAL_GAMBLING;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].type = "gambling";
+ control_info[field.player() * CTRL_COUNT + ctrl_type].player = field.player() + 1;
+ control_info[field.player() * CTRL_COUNT + ctrl_type].nbuttons++;
+ }
+ break;
+ }
+
+ if (ctrl_analog)
+ {
+ // get the analog stats
+ if (field.minval() != 0)
+ control_info[field.player() * CTRL_COUNT + ctrl_type].min = field.minval();
+ if (field.maxval() != 0)
+ control_info[field.player() * CTRL_COUNT + ctrl_type].max = field.maxval();
+ if (field.sensitivity() != 0)
+ control_info[field.player() * CTRL_COUNT + ctrl_type].sensitivity = field.sensitivity();
+ if (field.delta() != 0)
+ control_info[field.player() * CTRL_COUNT + ctrl_type].keydelta = field.delta();
+ if (field.analog_reverse() != 0)
+ control_info[field.player() * CTRL_COUNT + ctrl_type].reverse = TRUE;
+ }
+ }
+ }
+
+ // Clean-up those entries, if any, where buttons were defined in a separate port than the actual controller they belong to.
+ // This is quite often the case, especially for arcades where controls can be easily mapped to separate input ports on PCB.
+ // If such situation would only happen for joystick, it would be possible to work it around by initializing differently
+ // ctrl_type above, but it is quite common among analog inputs as well (for instance, this is the tipical situation
+ // for lightguns) and therefore we really need this separate loop.
+ for (int i = 0; i < CTRL_PCOUNT; i++)
+ {
+ bool fix_done = FALSE;
+ for (int j = 1; j < CTRL_COUNT; j++)
+ if (control_info[i * CTRL_COUNT].type != nullptr && control_info[i * CTRL_COUNT + j].type != nullptr && !fix_done)
+ {
+ control_info[i * CTRL_COUNT + j].nbuttons += control_info[i * CTRL_COUNT].nbuttons;
+ control_info[i * CTRL_COUNT + j].maxbuttons = MAX(control_info[i * CTRL_COUNT + j].maxbuttons, control_info[i * CTRL_COUNT].maxbuttons);
+
+ memset(&control_info[i * CTRL_COUNT], 0, sizeof(control_info[0]));
+ fix_done = TRUE;
+ }
+ }
+
+ // Output the input info
+ // First basic info
+ fprintf(m_output, "\t\t<input");
+ fprintf(m_output, " players=\"%d\"", nplayer);
+ if (ncoin != 0)
+ fprintf(m_output, " coins=\"%d\"", ncoin);
+ if (service)
+ fprintf(m_output, " service=\"yes\"");
+ if (tilt)
+ fprintf(m_output, " tilt=\"yes\"");
+ fprintf(m_output, ">\n");
+
+ // Then controller specific ones
+ for (auto & elem : control_info)
+ if (elem.type != nullptr)
+ {
+ //printf("type %s - player %d - buttons %d\n", elem.type, elem.player, elem.nbuttons);
+ if (elem.analog)
+ {
+ fprintf(m_output, "\t\t\t<control type=\"%s\"", xml_normalize_string(elem.type));
+ if (nplayer > 1)
+ fprintf(m_output, " player=\"%d\"", elem.player);
+ if (elem.nbuttons > 0)
+ fprintf(m_output, " buttons=\"%d\"", strcmp(elem.type, "stick") ? elem.nbuttons : elem.maxbuttons);
+ if (elem.min != 0 || elem.max != 0)
+ {
+ fprintf(m_output, " minimum=\"%d\"", elem.min);
+ fprintf(m_output, " maximum=\"%d\"", elem.max);
+ }
+ if (elem.sensitivity != 0)
+ fprintf(m_output, " sensitivity=\"%d\"", elem.sensitivity);
+ if (elem.keydelta != 0)
+ fprintf(m_output, " keydelta=\"%d\"", elem.keydelta);
+ if (elem.reverse)
+ fprintf(m_output, " reverse=\"yes\"");
+
+ fprintf(m_output, "/>\n");
+ }
+ else
+ {
+ if (elem.helper[1] == 0 && elem.helper[2] != 0) { elem.helper[1] = elem.helper[2]; elem.helper[2] = 0; }
+ if (elem.helper[0] == 0 && elem.helper[1] != 0) { elem.helper[0] = elem.helper[1]; elem.helper[1] = 0; }
+ if (elem.helper[1] == 0 && elem.helper[2] != 0) { elem.helper[1] = elem.helper[2]; elem.helper[2] = 0; }
+ const char *joys = (elem.helper[2] != 0) ? "triple" : (elem.helper[1] != 0) ? "double" : "";
+ fprintf(m_output, "\t\t\t<control type=\"%s%s\"", joys, xml_normalize_string(elem.type));
+ if (nplayer > 1)
+ fprintf(m_output, " player=\"%d\"", elem.player);
+ if (elem.nbuttons > 0)
+ fprintf(m_output, " buttons=\"%d\"", strcmp(elem.type, "joy") ? elem.nbuttons : elem.maxbuttons);
+ for (int lp = 0; lp < 3 && elem.helper[lp] != 0; lp++)
+ {
+ const char *plural = (lp==2) ? "3" : (lp==1) ? "2" : "";
+ const char *ways;
+ std::string helper;
+ switch (elem.helper[lp] & (DIR_UP | DIR_DOWN | DIR_LEFT | DIR_RIGHT))
+ {
+ case DIR_UP | DIR_DOWN | DIR_LEFT | DIR_RIGHT:
+ helper = string_format("%d", (elem.ways == 0) ? 8 : elem.ways);
+ ways = helper.c_str();
+ break;
+ case DIR_LEFT | DIR_RIGHT:
+ ways = "2";
+ break;
+ case DIR_UP | DIR_DOWN:
+ ways = "vertical2";
+ break;
+ case DIR_UP:
+ case DIR_DOWN:
+ case DIR_LEFT:
+ case DIR_RIGHT:
+ ways = "1";
+ break;
+ case DIR_UP | DIR_DOWN | DIR_LEFT:
+ case DIR_UP | DIR_DOWN | DIR_RIGHT:
+ case DIR_UP | DIR_LEFT | DIR_RIGHT:
+ case DIR_DOWN | DIR_LEFT | DIR_RIGHT:
+ ways = (elem.ways == 4) ? "3 (half4)" : "5 (half8)";
+ break;
+ default:
+ ways = "strange2";
+ break;
+ }
+ fprintf(m_output, " ways%s=\"%s\"", plural, ways);
+ }
+ fprintf(m_output, "/>\n");
+ }
+ }
+
+ fprintf(m_output, "\t\t</input>\n");
}
@@ -1446,10 +1445,10 @@ void info_xml_creator::output_images(device_t &device, const char *root_tag)
// is this device available as media switch?
if (!loadable)
fprintf(m_output, " fixed_image=\"1\"");
-
- // is this device mandatory?
- if (imagedev.must_be_loaded())
- fprintf(m_output, " mandatory=\"1\"");
+
+ // is this device mandatory?
+ if (imagedev.must_be_loaded())
+ fprintf(m_output, " mandatory=\"1\"");
if (imagedev.image_interface() && imagedev.image_interface()[0])
fprintf(m_output, " interface=\"%s\"", xml_normalize_string(imagedev.image_interface()));
@@ -1457,27 +1456,27 @@ void info_xml_creator::output_images(device_t &device, const char *root_tag)
// close the XML tag
fprintf(m_output, ">\n");
- if (loadable)
- {
- const char *name = imagedev.instance_name();
- const char *shortname = imagedev.brief_instance_name();
-
- fprintf(m_output, "\t\t\t<instance");
- fprintf(m_output, " name=\"%s\"", xml_normalize_string(name));
- fprintf(m_output, " briefname=\"%s\"", xml_normalize_string(shortname));
- fprintf(m_output, "/>\n");
-
- std::string extensions(imagedev.file_extensions());
-
- char *ext = strtok((char *)extensions.c_str(), ",");
- while (ext != nullptr)
- {
- fprintf(m_output, "\t\t\t<extension");
- fprintf(m_output, " name=\"%s\"", xml_normalize_string(ext));
- fprintf(m_output, "/>\n");
- ext = strtok(nullptr, ",");
- }
- }
+ if (loadable)
+ {
+ const char *name = imagedev.instance_name();
+ const char *shortname = imagedev.brief_instance_name();
+
+ fprintf(m_output, "\t\t\t<instance");
+ fprintf(m_output, " name=\"%s\"", xml_normalize_string(name));
+ fprintf(m_output, " briefname=\"%s\"", xml_normalize_string(shortname));
+ fprintf(m_output, "/>\n");
+
+ std::string extensions(imagedev.file_extensions());
+
+ char *ext = strtok((char *)extensions.c_str(), ",");
+ while (ext != nullptr)
+ {
+ fprintf(m_output, "\t\t\t<extension");
+ fprintf(m_output, " name=\"%s\"", xml_normalize_string(ext));
+ fprintf(m_output, "/>\n");
+ ext = strtok(nullptr, ",");
+ }
+ }
fprintf(m_output, "\t\t</device>\n");
}
}
diff --git a/src/frontend/mame/luaengine.cpp b/src/frontend/mame/luaengine.cpp
index 72c36e3bd47..2d5d458bfff 100644
--- a/src/frontend/mame/luaengine.cpp
+++ b/src/frontend/mame/luaengine.cpp
@@ -1469,7 +1469,7 @@ int lua_engine::lua_screen::l_draw_line(lua_State *L)
//-------------------------------------------------
// draw_text - draw text on a screen container
-// if x is a position, then y is a pixel position, otherwise x and y are screen size relative
+// if x is a position, then y is a pixel position, otherwise x and y are screen size relative
// -> manager:machine().screens[":screen"]:draw_text(x, y, message)
//-------------------------------------------------
@@ -2093,26 +2093,26 @@ int lua_engine::lua_machine::l_logerror(lua_State *L)
std::string lua_engine::get_print_buffer(lua_State *L)
{
- int nargs = lua_gettop(L);
-
- const std::string sep = " ";
-
- std::ostringstream ss;
- bool first = true;
-
- for (int i = 1; i <= nargs; i++) {
- const char* c = lua_tostring(L, i);
- const std::string str = c ? c : "<nil>";
- if (first) first = false;
- else ss << sep;
- ss << str;
- }
+ int nargs = lua_gettop(L);
+
+ const std::string sep = " ";
+
+ std::ostringstream ss;
+ bool first = true;
+
+ for (int i = 1; i <= nargs; i++) {
+ const char* c = lua_tostring(L, i);
+ const std::string str = c ? c : "<nil>";
+ if (first) first = false;
+ else ss << sep;
+ ss << str;
+ }
return ss.str();
}
int lua_engine::l_osd_printf_verbose(lua_State *L)
{
- osd_printf_verbose("%s\n",get_print_buffer(L).c_str());
+ osd_printf_verbose("%s\n",get_print_buffer(L).c_str());
return 0;
}
diff --git a/src/frontend/mame/mame.cpp b/src/frontend/mame/mame.cpp
index c162e5ff12a..782645998eb 100644
--- a/src/frontend/mame/mame.cpp
+++ b/src/frontend/mame/mame.cpp
@@ -54,7 +54,7 @@ mame_machine_manager::mame_machine_manager(emu_options &options,osd_interface &o
m_lua(global_alloc(lua_engine)),
m_new_driver_pending(nullptr),
m_firstrun(true),
- m_autoboot_timer(nullptr)
+ m_autoboot_timer(nullptr)
{
}
@@ -263,17 +263,17 @@ void mame_machine_manager::reset()
// setup autoboot if needed
m_autoboot_timer->adjust(attotime(options().autoboot_delay(),0),0);
}
-
+
ui_manager* mame_machine_manager::create_ui(running_machine& machine)
{
m_ui = std::make_unique<mame_ui_manager>(machine);
m_ui->init();
machine.add_notifier(MACHINE_NOTIFY_RESET, machine_notify_delegate(FUNC(mame_machine_manager::reset), this));
-
+
// start the inifile manager
m_inifile = std::make_unique<inifile_manager>(machine);
-
+
m_ui->set_startup_text("Initializing...", true);
// allocate autoboot timer
@@ -288,8 +288,8 @@ ui_manager* mame_machine_manager::create_ui(running_machine& machine)
return m_ui.get();
}
-void mame_machine_manager::create_custom(running_machine& machine)
-{
+void mame_machine_manager::create_custom(running_machine& machine)
+{
// set up the cheat engine
m_cheat = std::make_unique<cheat_manager>(machine);
}
@@ -335,4 +335,4 @@ void emulator_info::periodic_check()
bool emulator_info::frame_hook()
{
return mame_machine_manager::instance()->lua()->frame_hook();
-} \ No newline at end of file
+}
diff --git a/src/frontend/mame/mame.h b/src/frontend/mame/mame.h
index 8cf1a29d50b..cb7fd1c7ed6 100644
--- a/src/frontend/mame/mame.h
+++ b/src/frontend/mame/mame.h
@@ -46,16 +46,16 @@ public:
lua_engine *lua() { return m_lua; }
virtual void update_machine() override;
-
+
void reset();
TIMER_CALLBACK_MEMBER(autoboot_callback);
-
+
virtual ui_manager* create_ui(running_machine& machine) override;
virtual void create_custom(running_machine& machine) override;
virtual void ui_initialize(running_machine& machine) override;
-
+
/* execute as configured by the OPTION_SYSTEMNAME option on the specified options */
int execute();
void start_luaengine();
diff --git a/src/frontend/mame/mameopts.cpp b/src/frontend/mame/mameopts.cpp
index a0754f4cfd5..9d894709d58 100644
--- a/src/frontend/mame/mameopts.cpp
+++ b/src/frontend/mame/mameopts.cpp
@@ -423,4 +423,3 @@ bool mame_options::parse_one_ini(emu_options &options, const char *basename, int
return result;
}
-
diff --git a/src/frontend/mame/ui/filemngr.cpp b/src/frontend/mame/ui/filemngr.cpp
index a0400e234bb..685b91869a0 100644
--- a/src/frontend/mame/ui/filemngr.cpp
+++ b/src/frontend/mame/ui/filemngr.cpp
@@ -180,13 +180,12 @@ void ui_menu_file_manager::handle()
selected_device = (device_image_interface *) event->itemref;
if (selected_device != nullptr)
{
-
m_curr_selected = TRUE;
floppy_image_device *floppy_device = dynamic_cast<floppy_image_device *>(selected_device);
if (floppy_device != nullptr)
{
ui_menu::stack_push(global_alloc_clear<ui_menu_control_floppy_image>(machine(), container, floppy_device));
- }
+ }
else
{
ui_menu::stack_push(global_alloc_clear<ui_menu_control_device_image>(machine(), container, selected_device));
diff --git a/src/frontend/mame/ui/floppycntrl.cpp b/src/frontend/mame/ui/floppycntrl.cpp
index 05a4e03c825..b19f9b0d256 100644
--- a/src/frontend/mame/ui/floppycntrl.cpp
+++ b/src/frontend/mame/ui/floppycntrl.cpp
@@ -83,7 +83,7 @@ void ui_menu_control_floppy_image::hook_load(std::string filename, bool softlist
osd_file::error filerr;
std::string tmp_path;
util::core_file::ptr tmp_file;
- // attempt to open the file for writing but *without* create
+ // attempt to open the file for writing but *without* create
filerr = util::zippath_fopen(filename.c_str(), OPEN_FLAG_READ | OPEN_FLAG_WRITE, tmp_file, tmp_path);
if(filerr == osd_file::error::NONE)
tmp_file.reset();
@@ -167,4 +167,4 @@ void ui_menu_control_floppy_image::handle()
default:
ui_menu_control_device_image::handle();
}
-} \ No newline at end of file
+}
diff --git a/src/frontend/mame/ui/floppycntrl.h b/src/frontend/mame/ui/floppycntrl.h
index 08ac1e85d68..f9fe4307e2e 100644
--- a/src/frontend/mame/ui/floppycntrl.h
+++ b/src/frontend/mame/ui/floppycntrl.h
@@ -33,4 +33,4 @@ protected:
};
-#endif /* __UI_FLOPPY_IMAGE_H__ */ \ No newline at end of file
+#endif /* __UI_FLOPPY_IMAGE_H__ */
diff --git a/src/frontend/mame/ui/menu.cpp b/src/frontend/mame/ui/menu.cpp
index c26d22562aa..9f89fdfef2b 100644
--- a/src/frontend/mame/ui/menu.cpp
+++ b/src/frontend/mame/ui/menu.cpp
@@ -557,37 +557,37 @@ void ui_menu::draw(UINT32 flags, float origx0, float origy0)
float visible_left = (1.0f - visible_width) * 0.5f;
float visible_top = (1.0f - (visible_main_menu_height + visible_extra_menu_height)) * 0.5f;
-/* float visible_left;
- float visible_top;
- if (origx0 == 0.0f && origy0 == 0.0f)
- {
- visible_left = (1.0f - visible_width) * 0.5f;
- visible_top = (1.0f - (visible_main_menu_height + visible_extra_menu_height)) * 0.5f;
- }
- else
- {
- INT32 mouse_target_x, mouse_target_y;
- float m_x, m_y;
- render_target *mouse_target = machine().ui_input().find_mouse(&mouse_target_x, &mouse_target_y, &mouse_button);
- if (mouse_target != nullptr)
- {
- if (mouse_target->map_point_container(origx0, origy0, *container, m_x, m_y))
- {
- visible_left = m_x;
- visible_top = m_y;
- }
- else
- {
- visible_left = (1.0f - visible_width) * 0.5f;
- visible_top = (1.0f - (visible_main_menu_height + visible_extra_menu_height)) * 0.5f;
- }
- }
- else
- {
- visible_left = (1.0f - visible_width) * 0.5f;
- visible_top = (1.0f - (visible_main_menu_height + visible_extra_menu_height)) * 0.5f;
- }
- }
+/* float visible_left;
+ float visible_top;
+ if (origx0 == 0.0f && origy0 == 0.0f)
+ {
+ visible_left = (1.0f - visible_width) * 0.5f;
+ visible_top = (1.0f - (visible_main_menu_height + visible_extra_menu_height)) * 0.5f;
+ }
+ else
+ {
+ INT32 mouse_target_x, mouse_target_y;
+ float m_x, m_y;
+ render_target *mouse_target = machine().ui_input().find_mouse(&mouse_target_x, &mouse_target_y, &mouse_button);
+ if (mouse_target != nullptr)
+ {
+ if (mouse_target->map_point_container(origx0, origy0, *container, m_x, m_y))
+ {
+ visible_left = m_x;
+ visible_top = m_y;
+ }
+ else
+ {
+ visible_left = (1.0f - visible_width) * 0.5f;
+ visible_top = (1.0f - (visible_main_menu_height + visible_extra_menu_height)) * 0.5f;
+ }
+ }
+ else
+ {
+ visible_left = (1.0f - visible_width) * 0.5f;
+ visible_top = (1.0f - (visible_main_menu_height + visible_extra_menu_height)) * 0.5f;
+ }
+ }
*/
// if the menu is at the bottom of the extra, adjust
visible_top += customtop;
diff --git a/src/frontend/mame/ui/menu.h b/src/frontend/mame/ui/menu.h
index 39458546397..4741751614f 100644
--- a/src/frontend/mame/ui/menu.h
+++ b/src/frontend/mame/ui/menu.h
@@ -59,11 +59,11 @@ enum ui_menu_reset_options
// menu-related events
struct ui_menu_event
{
- void *itemref; // reference for the selected item
- ui_menu_item_type type; // item type (eventually will go away when itemref is proper ui_menu_item class rather than void*)
- int iptkey; // one of the IPT_* values from inptport.h
- unicode_char unichar; // unicode character if iptkey == IPT_SPECIAL
- render_bounds mouse; // mouse position if iptkey == IPT_CUSTOM
+ void *itemref; // reference for the selected item
+ ui_menu_item_type type; // item type (eventually will go away when itemref is proper ui_menu_item class rather than void*)
+ int iptkey; // one of the IPT_* values from inptport.h
+ unicode_char unichar; // unicode character if iptkey == IPT_SPECIAL
+ render_bounds mouse; // mouse position if iptkey == IPT_CUSTOM
};
struct ui_menu_pool
diff --git a/src/frontend/mame/ui/miscmenu.cpp b/src/frontend/mame/ui/miscmenu.cpp
index 38a2d944533..b997efd6f17 100644
--- a/src/frontend/mame/ui/miscmenu.cpp
+++ b/src/frontend/mame/ui/miscmenu.cpp
@@ -824,7 +824,7 @@ void ui_menu_machine_configure::custom_render(void *selectedref, float top, floa
// compute our bounds
float x1 = 0.5f - 0.5f * maxwidth;
-// float x1 = origx1;
+// float x1 = origx1;
float x2 = x1 + maxwidth;
float y1 = origy1 - top;
float y2 = origy1 - UI_BOX_TB_BORDER;
@@ -856,7 +856,7 @@ void ui_menu_machine_configure::setup_bios()
for (const rom_entry *rom = m_drv->rom; !ROMENTRY_ISEND(rom); ++rom)
if (ROMENTRY_ISDEFAULT_BIOS(rom))
default_name = ROM_GETNAME(rom);
-
+
int bios_count = 0;
for (const rom_entry *rom = m_drv->rom; !ROMENTRY_ISEND(rom); ++rom)
{
diff --git a/src/frontend/mame/ui/selgame.cpp b/src/frontend/mame/ui/selgame.cpp
index 25411715817..9af54557662 100644
--- a/src/frontend/mame/ui/selgame.cpp
+++ b/src/frontend/mame/ui/selgame.cpp
@@ -1018,14 +1018,14 @@ void ui_menu_select_game::inkey_select(const ui_menu_event *m_event)
// special case for configure options
if ((FPTR)driver == CONF_OPTS)
ui_menu::stack_push(global_alloc_clear<ui_menu_game_options>(machine(), container));
-
+
// special case for configure machine
else if ((FPTR)driver == CONF_MACHINE)
{
- if (m_prev_selected != nullptr)
- ui_menu::stack_push(global_alloc_clear<ui_menu_machine_configure>(machine(), container, (const game_driver *)m_prev_selected));
- else
- return;
+ if (m_prev_selected != nullptr)
+ ui_menu::stack_push(global_alloc_clear<ui_menu_machine_configure>(machine(), container, (const game_driver *)m_prev_selected));
+ else
+ return;
}
// special case for configure plugins
diff --git a/src/frontend/mame/ui/sliders.cpp b/src/frontend/mame/ui/sliders.cpp
index 75d40c2ace3..72fe2398745 100644
--- a/src/frontend/mame/ui/sliders.cpp
+++ b/src/frontend/mame/ui/sliders.cpp
@@ -142,21 +142,21 @@ void ui_menu_sliders::populate()
std::vector<ui_menu_item> ui_sliders = mame_machine_manager::instance()->ui().get_slider_list();
for (ui_menu_item item : ui_sliders)
{
- if (item.type == ui_menu_item_type::SLIDER)
- {
- slider_state* slider = reinterpret_cast<slider_state *>(item.ref);
- INT32 curval = (*slider->update)(machine(), slider->arg, slider->id, &tempstring, SLIDER_NOCHANGE);
- UINT32 flags = 0;
- if (curval > slider->minval)
- flags |= MENU_FLAG_LEFT_ARROW;
- if (curval < slider->maxval)
- flags |= MENU_FLAG_RIGHT_ARROW;
- item_append(slider->description, tempstring.c_str(), flags, (void *)slider, ui_menu_item_type::SLIDER);
- }
- else
- {
- item_append(item);
- }
+ if (item.type == ui_menu_item_type::SLIDER)
+ {
+ slider_state* slider = reinterpret_cast<slider_state *>(item.ref);
+ INT32 curval = (*slider->update)(machine(), slider->arg, slider->id, &tempstring, SLIDER_NOCHANGE);
+ UINT32 flags = 0;
+ if (curval > slider->minval)
+ flags |= MENU_FLAG_LEFT_ARROW;
+ if (curval < slider->maxval)
+ flags |= MENU_FLAG_RIGHT_ARROW;
+ item_append(slider->description, tempstring.c_str(), flags, (void *)slider, ui_menu_item_type::SLIDER);
+ }
+ else
+ {
+ item_append(item);
+ }
}
item_append(ui_menu_item_type::SEPARATOR);
@@ -165,21 +165,21 @@ void ui_menu_sliders::populate()
std::vector<ui_menu_item> osd_sliders = machine().osd().get_slider_list();
for (ui_menu_item item : osd_sliders)
{
- if (item.type == ui_menu_item_type::SLIDER)
- {
- slider_state* slider = reinterpret_cast<slider_state *>(item.ref);
- INT32 curval = (*slider->update)(machine(), slider->arg, slider->id, &tempstring, SLIDER_NOCHANGE);
- UINT32 flags = 0;
- if (curval > slider->minval)
- flags |= MENU_FLAG_LEFT_ARROW;
- if (curval < slider->maxval)
- flags |= MENU_FLAG_RIGHT_ARROW;
- item_append(slider->description, tempstring.c_str(), flags, (void *)slider, ui_menu_item_type::SLIDER);
- }
- else
- {
- item_append(item);
- }
+ if (item.type == ui_menu_item_type::SLIDER)
+ {
+ slider_state* slider = reinterpret_cast<slider_state *>(item.ref);
+ INT32 curval = (*slider->update)(machine(), slider->arg, slider->id, &tempstring, SLIDER_NOCHANGE);
+ UINT32 flags = 0;
+ if (curval > slider->minval)
+ flags |= MENU_FLAG_LEFT_ARROW;
+ if (curval < slider->maxval)
+ flags |= MENU_FLAG_RIGHT_ARROW;
+ item_append(slider->description, tempstring.c_str(), flags, (void *)slider, ui_menu_item_type::SLIDER);
+ }
+ else
+ {
+ item_append(item);
+ }
}
custombottom = 2.0f * mame_machine_manager::instance()->ui().get_line_height() + 2.0f * UI_BOX_TB_BORDER;
diff --git a/src/frontend/mame/ui/submenu.h b/src/frontend/mame/ui/submenu.h
index 8168ab4bb7a..535de308cd2 100644
--- a/src/frontend/mame/ui/submenu.h
+++ b/src/frontend/mame/ui/submenu.h
@@ -153,8 +153,8 @@ static std::vector<ui_submenu::option> video_submenu_options = {
};
//static std::vector<ui_submenu::option> export_submenu_options = {
-// { ui_submenu::COMMAND, __("Export XML format (like -listxml)"), "exportxml" },
-// { ui_submenu::COMMAND, __("Export TXT format (like -listfull)"), "exporttxt" },
+// { ui_submenu::COMMAND, __("Export XML format (like -listxml)"), "exportxml" },
+// { ui_submenu::COMMAND, __("Export TXT format (like -listfull)"), "exporttxt" },
//};
#endif /* __UI_SUBMENU_H__ */
diff --git a/src/frontend/mame/ui/ui.cpp b/src/frontend/mame/ui/ui.cpp
index c075c884d1b..031013a5a2d 100644
--- a/src/frontend/mame/ui/ui.cpp
+++ b/src/frontend/mame/ui/ui.cpp
@@ -267,18 +267,18 @@ static const UINT32 mouse_bitmap[32*32] =
//-------------------------------------------------
mame_ui_manager::mame_ui_manager(running_machine &machine)
- : ui_manager(machine),
- m_font(nullptr),
- m_handler_callback(nullptr),
- m_handler_param(0),
- m_single_step(false),
- m_showfps(false),
- m_showfps_end(0),
- m_show_profiler(false),
- m_popup_text_end(0),
- m_mouse_arrow_texture(nullptr),
- m_mouse_show(false),
- m_load_save_hold(false)
+ : ui_manager(machine),
+ m_font(nullptr),
+ m_handler_callback(nullptr),
+ m_handler_param(0),
+ m_single_step(false),
+ m_showfps(false),
+ m_showfps_end(0),
+ m_show_profiler(false),
+ m_popup_text_end(0),
+ m_mouse_arrow_texture(nullptr),
+ m_mouse_show(false),
+ m_load_save_hold(false)
{
}
@@ -2068,17 +2068,17 @@ std::vector<ui_menu_item> mame_ui_manager::slider_init(running_machine &machine)
}
#endif
- std::vector<ui_menu_item> items;
- for (slider_state *slider : sliders)
- {
- ui_menu_item item;
- item.text = slider->description;
- item.subtext = "";
- item.flags = 0;
- item.ref = slider;
- item.type = ui_menu_item_type::SLIDER;
- items.push_back(item);
- }
+ std::vector<ui_menu_item> items;
+ for (slider_state *slider : sliders)
+ {
+ ui_menu_item item;
+ item.text = slider->description;
+ item.subtext = "";
+ item.flags = 0;
+ item.ref = slider;
+ item.type = ui_menu_item_type::SLIDER;
+ items.push_back(item);
+ }
return items;
}
@@ -2734,5 +2734,5 @@ void mame_ui_manager::popup_time_string(int seconds, std::string message)
messagebox_backcolor = UI_BACKGROUND_COLOR;
// set a timer
- m_popup_text_end = osd_ticks() + osd_ticks_per_second() * seconds;
+ m_popup_text_end = osd_ticks() + osd_ticks_per_second() * seconds;
}
diff --git a/src/frontend/mame/ui/ui.h b/src/frontend/mame/ui/ui.h
index b45d20c6e63..29cad32fefd 100644
--- a/src/frontend/mame/ui/ui.h
+++ b/src/frontend/mame/ui/ui.h
@@ -155,7 +155,7 @@ public:
std::string &game_info_astring(std::string &str);
// slider controls
- std::vector<ui_menu_item>& get_slider_list(void);
+ std::vector<ui_menu_item>& get_slider_list(void);
// other
void process_natural_keyboard();
@@ -166,7 +166,7 @@ public:
// draw an outlined box with given line color and filled with a texture
void draw_textured_box(render_container *container, float x0, float y0, float x1, float y1, rgb_t backcolor, rgb_t linecolor, render_texture *texture = nullptr, UINT32 flags = PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
virtual void popup_time_string(int seconds, std::string message) override;
-
+
virtual void image_display(const device_type &type, device_image_interface *image) override;
private:
// instance variables
diff --git a/src/lib/netlist/macro/nlm_ttl74xx.cpp b/src/lib/netlist/macro/nlm_ttl74xx.cpp
index 96038049473..ed74a8e305c 100644
--- a/src/lib/netlist/macro/nlm_ttl74xx.cpp
+++ b/src/lib/netlist/macro/nlm_ttl74xx.cpp
@@ -30,7 +30,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()
@@ -69,7 +69,7 @@ NETLIST_START(TTL_7400_DIP)
s2.B, /* B2 |5 10| B3 */ s3.B,
s2.Q, /* Y2 |6 9| A3 */ s3.A,
GND.I, /* GND |7 8| Y3 */ s3.Q
- /* +--------------+ */
+ /* +--------------+ */
)
NETLIST_END()
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index b5c26a2262c..a0c66a258af 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -1301,7 +1301,7 @@ protected:
pstring m_name;
setup_t *m_setup;
plog_base<NL_DEBUG> m_log;
- pdynlib *m_lib; // external lib needs to be loaded as long as netlist exists
+ pdynlib *m_lib; // external lib needs to be loaded as long as netlist exists
};
// -----------------------------------------------------------------------------
diff --git a/src/lib/netlist/nl_util.h b/src/lib/netlist/nl_util.h
index 352b20d0003..7c1f3d61915 100644
--- a/src/lib/netlist/nl_util.h
+++ b/src/lib/netlist/nl_util.h
@@ -28,18 +28,18 @@ public:
static const pstring buildpath(std::initializer_list<pstring> list )
{
pstring ret = "";
- for( auto elem : list )
- {
- if (ret == "")
- ret = elem;
- else
+ for( auto elem : list )
+ {
+ if (ret == "")
+ ret = elem;
+ else
#ifdef _WIN32
- ret = ret + '\\' + elem;
+ ret = ret + '\\' + elem;
#else
- ret = ret + '/' + elem;
+ ret = ret + '/' + elem;
#endif
- }
- return ret;
+ }
+ return ret;
}
static const pstring environment(const pstring &var, const pstring &default_val = "")
diff --git a/src/lib/netlist/plib/pdynlib.cpp b/src/lib/netlist/plib/pdynlib.cpp
index 71b0dc2bfcc..bbf741896bc 100644
--- a/src/lib/netlist/plib/pdynlib.cpp
+++ b/src/lib/netlist/plib/pdynlib.cpp
@@ -24,7 +24,7 @@ pdynlib::pdynlib(const pstring libname)
if (m_lib != nullptr)
m_isLoaded = true;
//else
- // fprintf(stderr, "win: library <%s> not found!\n", libname.cstr());
+ // fprintf(stderr, "win: library <%s> not found!\n", libname.cstr());
#else
//printf("loading <%s>\n", libname.cstr());
if (libname != "")
@@ -34,7 +34,7 @@ pdynlib::pdynlib(const pstring libname)
if (m_lib != nullptr)
m_isLoaded = true;
//else
- // printf("library <%s> not found!\n", libname.cstr());
+ // printf("library <%s> not found!\n", libname.cstr());
#endif
}
@@ -88,4 +88,3 @@ void *pdynlib::getsym_p(const pstring name)
return dlsym(m_lib, name.cstr());
#endif
}
-
diff --git a/src/lib/netlist/solver/nld_ms_direct.h b/src/lib/netlist/solver/nld_ms_direct.h
index 91cb7c9385f..d6896cbe97d 100644
--- a/src/lib/netlist/solver/nld_ms_direct.h
+++ b/src/lib/netlist/solver/nld_ms_direct.h
@@ -46,7 +46,7 @@ struct ti_t
volatile std::atomic<int> lo;
thr_intf *intf;
void *params;
-// int _block[29]; /* make it 256 bytes */
+// int _block[29]; /* make it 256 bytes */
};
static ti_t ti[MAXTHR];
@@ -287,7 +287,7 @@ void matrix_solver_direct_t<m_N, _storage_N>::LE_solve()
#else
vec_add_mult_scalar(kN-i-1,pj,f1,pi);
//for (unsigned k = i+1; k < kN; k++)
- // pj[k] = pj[k] + pi[k] * f1;
+ // pj[k] = pj[k] + pi[k] * f1;
//for (unsigned k = i+1; k < kN; k++)
//A(j,k) += A(i,k) * f1;
RHS(j) += RHS(i) * f1;
diff --git a/src/lib/netlist/solver/nld_ms_sm.h b/src/lib/netlist/solver/nld_ms_sm.h
index f83240c789a..f38ee5a5783 100644
--- a/src/lib/netlist/solver/nld_ms_sm.h
+++ b/src/lib/netlist/solver/nld_ms_sm.h
@@ -13,9 +13,9 @@
* In this specific implementation, u is a unit vector specifying the row which
* changed. Thus v contains the changed column.
*
- * Than z = A⁻¹ u , w = transpose(A⁻¹) v , lambda = v z
+ * Than z = A^-1 u , w = transpose(A^-1) v , lambda = v z
*
- * A⁻¹ <- 1.0 / (1.0 + lambda) * (z x w)
+ * A^-1 <- 1.0 / (1.0 + lambda) * (z x w)
*
* The approach is iterative and applied for each row changed.
*
diff --git a/src/lib/netlist/solver/nld_ms_sor_mat.h b/src/lib/netlist/solver/nld_ms_sor_mat.h
index b57ba3cded1..eb59a7a94ac 100644
--- a/src/lib/netlist/solver/nld_ms_sor_mat.h
+++ b/src/lib/netlist/solver/nld_ms_sor_mat.h
@@ -23,7 +23,6 @@ NETLIB_NAMESPACE_DEVICES_START()
template <unsigned m_N, unsigned _storage_N>
class matrix_solver_SOR_mat_t: public matrix_solver_direct_t<m_N, _storage_N>
{
-
friend class matrix_solver_t;
public:
diff --git a/src/lib/netlist/solver/nld_ms_w.h b/src/lib/netlist/solver/nld_ms_w.h
index fe7a4389566..89f83dea6cc 100644
--- a/src/lib/netlist/solver/nld_ms_w.h
+++ b/src/lib/netlist/solver/nld_ms_w.h
@@ -15,7 +15,7 @@
* Whilst the book proposes to invert the matrix R=(I+transpose(V)*Z) we define
*
* w = transpose(V)*y
- * a = R⁻¹ * w
+ * a = R^-1 * w
*
* and consequently
*
diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp
index 5341d1b70d1..9fa0ee16c60 100644
--- a/src/lib/netlist/solver/nld_solver.cpp
+++ b/src/lib/netlist/solver/nld_solver.cpp
@@ -180,7 +180,7 @@ ATTR_COLD void matrix_solver_t::setup_base(analog_net_t::list_t &nets)
if (net_proxy_output == nullptr)
{
//net_proxy_output = palloc(analog_output_t(*this,
- // this->name() + "." + pfmt("m{1}")(m_inps.size())));
+ // this->name() + "." + pfmt("m{1}")(m_inps.size())));
net_proxy_output = palloc(analog_output_t);
net_proxy_output->init_object(*this, this->name() + "." + pfmt("m{1}")(m_inps.size()));
diff --git a/src/lib/util/flac.cpp b/src/lib/util/flac.cpp
index fedcd6cd73e..ced56cd3115 100644
--- a/src/lib/util/flac.cpp
+++ b/src/lib/util/flac.cpp
@@ -277,18 +277,18 @@ FLAC__StreamEncoderWriteStatus flac_encoder::write_callback(const FLAC__byte buf
flac_decoder::flac_decoder()
: m_decoder(FLAC__stream_decoder_new()),
- m_file(nullptr),
- m_sample_rate(0),
- m_channels(0),
- m_bits_per_sample(0),
- m_compressed_offset(0),
- m_compressed_start(nullptr),
- m_compressed_length(0),
- m_compressed2_start(nullptr),
- m_compressed2_length(0),
- m_uncompressed_offset(0),
- m_uncompressed_length(0),
- m_uncompressed_swap(false)
+ m_file(nullptr),
+ m_sample_rate(0),
+ m_channels(0),
+ m_bits_per_sample(0),
+ m_compressed_offset(0),
+ m_compressed_start(nullptr),
+ m_compressed_length(0),
+ m_compressed2_start(nullptr),
+ m_compressed2_length(0),
+ m_uncompressed_offset(0),
+ m_uncompressed_length(0),
+ m_uncompressed_swap(false)
{
}
diff --git a/src/lib/util/options.cpp b/src/lib/util/options.cpp
index cd1ce38fce1..096499fe88c 100644
--- a/src/lib/util/options.cpp
+++ b/src/lib/util/options.cpp
@@ -841,4 +841,4 @@ core_options::entry *core_options::get_entry(const char *name) const
{
auto curentry = m_entrymap.find(name);
return (curentry != m_entrymap.end()) ? curentry->second : nullptr;
-} \ No newline at end of file
+}
diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp
index 7b7762539d1..0774deb527a 100644
--- a/src/mame/drivers/apple2.cpp
+++ b/src/mame/drivers/apple2.cpp
@@ -438,7 +438,7 @@ UINT32 napple2_state::screen_update_jp(screen_device &screen, bitmap_ind16 &bitm
if (m_video->m_mix)
{
m_video->hgr_update(screen, bitmap, cliprect, 0, 159);
- m_video->text_update_jplus(screen, bitmap, cliprect, 160, 191);
+ m_video->text_update_jplus(screen, bitmap, cliprect, 160, 191);
}
else
{
@@ -538,7 +538,7 @@ void napple2_state::do_io(address_space &space, int offset)
m_an1 = true; break;
case 0x5c: // AN2 off
- m_an2 = false;
+ m_an2 = false;
m_video->m_an2 = false;
break;
@@ -1533,7 +1533,7 @@ ROM_END
/*
J-Plus ROM numbers confirmed by:
http://mirrors.apple2.org.za/Apple%20II%20Documentation%20Project/Computers/Apple%20II/Apple%20II%20j-plus/Photos/Apple%20II%20j-plus%20-%20Motherboard.jpg
-
+
*/
ROM_START(apple2jp)
diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp
index d31c411405f..ff35b6845d7 100644
--- a/src/mame/drivers/apple2e.cpp
+++ b/src/mame/drivers/apple2e.cpp
@@ -2437,8 +2437,8 @@ static ADDRESS_MAP_START( lcbank_map, AS_PROGRAM, 8, apple2e_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( spectred_keyb_map, AS_PROGRAM, 8, apple2e_state )
- AM_RANGE(0x0000, 0x07ff) AM_ROM
- AM_RANGE(0x0800, 0x0fff) AM_RAM
+ AM_RANGE(0x0000, 0x07ff) AM_ROM
+ AM_RANGE(0x0800, 0x0fff) AM_RAM
ADDRESS_MAP_END
/***************************************************************************
@@ -3373,8 +3373,8 @@ static MACHINE_CONFIG_DERIVED( spectred, apple2e )
MCFG_CPU_ADD("keyb_mcu", I8035, XTAL_4MHz) /* guessed frequency */
MCFG_CPU_PROGRAM_MAP(spectred_keyb_map)
- //TODO: implement the actual interfacing to this 8035 MCU and
- // and then remove the keyb CPU inherited from apple2e
+ //TODO: implement the actual interfacing to this 8035 MCU and
+ // and then remove the keyb CPU inherited from apple2e
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tk3000, apple2e )
@@ -3646,17 +3646,17 @@ ROM_END
ROM_START(spectred)
- ROM_REGION(0x8000,"gfx1",0)
- ROM_LOAD ( "spm-c_ed_06-08-85.u6", 0x0000, 0x8000, CRC(a1b9ffe4) SHA1(3cb281f19f91372e24685792b7bff778944f99ed) )
+ ROM_REGION(0x8000,"gfx1",0)
+ ROM_LOAD ( "spm-c_ed_06-08-85.u6", 0x0000, 0x8000, CRC(a1b9ffe4) SHA1(3cb281f19f91372e24685792b7bff778944f99ed) )
- ROM_REGION(0x8000,"maincpu",0)
- ROM_LOAD ( "spm-c_ed_50-09-86.u50.H", 0x0000, 0x4000, CRC(1fccaf24) SHA1(1de1438ee8789f83cbc97f75c0485d1fd0f58a38))
- ROM_LOAD ( "spm-c_ed_51-09-86.u51.H", 0x4000, 0x4000, CRC(fae8d36c) SHA1(69bed61513482ccb578b89c2fb8e7ba2258e82a5))
+ ROM_REGION(0x8000,"maincpu",0)
+ ROM_LOAD ( "spm-c_ed_50-09-86.u50.H", 0x0000, 0x4000, CRC(1fccaf24) SHA1(1de1438ee8789f83cbc97f75c0485d1fd0f58a38))
+ ROM_LOAD ( "spm-c_ed_51-09-86.u51.H", 0x4000, 0x4000, CRC(fae8d36c) SHA1(69bed61513482ccb578b89c2fb8e7ba2258e82a5))
- ROM_REGION( 0x800, "keyboard", ROMREGION_ERASE00 )
- ROM_LOAD( "342-0132-c.e12", 0x000, 0x800, BAD_DUMP CRC(e47045f4) SHA1(12a2e718f5f4acd69b6c33a45a4a940b1440a481) ) // copied from apple2e
+ ROM_REGION( 0x800, "keyboard", ROMREGION_ERASE00 )
+ ROM_LOAD( "342-0132-c.e12", 0x000, 0x800, BAD_DUMP CRC(e47045f4) SHA1(12a2e718f5f4acd69b6c33a45a4a940b1440a481) ) // copied from apple2e
- ROM_REGION(0x1000, "keyb_mcu", 0)
+ ROM_REGION(0x1000, "keyb_mcu", 0)
ROM_LOAD( "167_8980.u5", 0x0000, 0x1000, CRC(a501f197) SHA1(136c2b562999a6e340fe0e9a3776cea8c2e3647e) )
ROM_END
diff --git a/src/mame/drivers/aristmk5.cpp b/src/mame/drivers/aristmk5.cpp
index 2719c76eee3..89bb3a3d38c 100644
--- a/src/mame/drivers/aristmk5.cpp
+++ b/src/mame/drivers/aristmk5.cpp
@@ -2166,7 +2166,7 @@ ROM_END_REGIONS
ROM_START( mtreenz )
ARISTOCRAT_MK5_BIOS
- ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
+ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF )
ROM_LOAD32_WORD("MONEYTREE NZ.u11", 0x0000002, 0x0080000, CRC(7a03e436) SHA1(016e6e36f7ca6f4c3b427cf98a1415ef6aa57225) )
ROM_LOAD32_WORD("MONEYTREE NZ.u12", 0x0100002, 0x0080000, CRC(b11f51d0) SHA1(1579a24d470f418713334259368c7a4e35e8b5d3) )
ROM_LOAD32_WORD("MONEYTREE NZ.u13", 0x0200002, 0x0080000, CRC(e1f23c3f) SHA1(fe74c219c738625257fb62806e271a60075aaa07) )
diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp
index cb1baad7a80..486b3bcc452 100644
--- a/src/mame/drivers/aristmk6.cpp
+++ b/src/mame/drivers/aristmk6.cpp
@@ -266,7 +266,7 @@ MACHINE_CONFIG_END
ROM_LOAD32_WORD_BIOS( 7, "System 04 Eprom Set -1MB-M27V800 Right", 0x0000000, 0x0100000, CRC(3daefb7a) SHA1(411471713219f4bab5ccf5fe7a12a6c138c8c550) ) \
ROM_SYSTEM_BIOS( 8, "bios8", "Aristocrat MK6 Base (05010601)" ) \
ROM_LOAD32_WORD_BIOS( 8, "05010601_SYSTEM_EPROM_NSW_LEFT", 0x0000000, 0x0100000, CRC(b3e6b4a0) SHA1(3bf398c9257579f8e51ce716d6ebfa74fa510273) ) /* From Thai Princess & Venetian Nights */ \
- ROM_LOAD32_WORD_BIOS( 8, "05010601_SYSTEM_EPROM_NSW_RIGHT", 0x0000000, 0x0100000, CRC(c12eac11) SHA1(683b9ddc323865ace7dca37d13b55de6e42759a5) ) \
+ ROM_LOAD32_WORD_BIOS( 8, "05010601_SYSTEM_EPROM_NSW_RIGHT", 0x0000000, 0x0100000, CRC(c12eac11) SHA1(683b9ddc323865ace7dca37d13b55de6e42759a5) ) \
ROM_SYSTEM_BIOS( 9, "bios9", "Aristocrat MK6 Base (13012001)" ) \
ROM_LOAD32_WORD_BIOS( 9, "System 13012001_left", 0x0000000, 0x0400000, CRC(d346773f) SHA1(baa9103478fd667eecd13064cfa051a06763c6ca) ) /* From Queen of the Nile */ \
ROM_LOAD32_WORD_BIOS( 9, "System 13012001_right", 0x0000000, 0x0400000, CRC(4c8bfa18) SHA1(cac4932a5b19ed8c2798693ac387cc1a6f0201c7) ) \
@@ -2754,12 +2754,12 @@ ROM_START( whlcshus )
ROM_LOAD32_WORD("whales of cash 68DE.u72", 0x0800002, 0x0400000, CRC(f138de3f) SHA1(69a54457c8090f23023f197f0eba1d645a260f3f) )
ROM_LOAD32_WORD("whales of cash 3517.u73", 0x0000002, 0x0400000, CRC(74c93c56) SHA1(34c48620b08c3a03f0d6a333acbc45c14a91d3cb) )
ROM_LOAD32_WORD("whales of cash 59AF.u86", 0x0000000, 0x0400000, CRC(a7118016) SHA1(725a46ac861bf4abaf9cc0e7084cfa20913c2299) )
-ROM_END
+ROM_END
ROM_START( whlcshusa )
ARISTMK6_BIOS
ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF)
- // 2nd, incomplete, set?
+ // 2nd, incomplete, set?
ROM_LOAD32_WORD("whalesofcash.u72", 0x0800002, 0x0400000, CRC(e9ddd951) SHA1(16863b49b5db1881afda30ea19a55f6122981eba) )
ROM_LOAD32_WORD("whalesofcash.u73", 0x0000002, 0x0400000, CRC(22785960) SHA1(2ebfd230209fd438338f981c1c133e6576a67468) )
ROM_LOAD32_WORD("whalesofcash.u86", 0x0000000, 0x0400000, CRC(8aef1004) SHA1(270379b0a3abc98adfb1a9b031a5e98050635a80) ) // missing a rom?
@@ -3427,6 +3427,3 @@ Sweet Hearts II
Venetian Nights MK5 version is possibly rare
Wicked Winnings Only seen a Cash Express Hyperlink version so far, not to be confused with the more common 'Wicked Winnings II - Power Pay'
*/
-
-
-
diff --git a/src/mame/drivers/attckufo.cpp b/src/mame/drivers/attckufo.cpp
index e0af08c1076..8d03c8f7f0d 100644
--- a/src/mame/drivers/attckufo.cpp
+++ b/src/mame/drivers/attckufo.cpp
@@ -2,11 +2,11 @@
// copyright-holders:Tomasz Slanina
/***************************************************************************
- "Attack UFO" © 1980 Ryoto Electric Co.
+ "Attack UFO" (c) 1980 Ryoto Electric Co.
- TODO:
- - Verify I/O chip
- - Is game speed ok? A bit slow sometimes
+ TODO:
+ - Verify I/O chip
+ - Is game speed ok? A bit slow sometimes
***************************************************************************/
diff --git a/src/mame/drivers/balsente.cpp b/src/mame/drivers/balsente.cpp
index b4816e41df1..c802794d525 100644
--- a/src/mame/drivers/balsente.cpp
+++ b/src/mame/drivers/balsente.cpp
@@ -2402,4 +2402,3 @@ GAME( 1986, shrike, 0, shrike, shrike, balsente_state, shrike, RO
GAME( 1987, rescraida,rescraid, balsente, rescraid, balsente_state, rescraid, ROT0, "Bally Midway", "Rescue Raider (stand-alone)", MACHINE_SUPPORTS_SAVE )
GAME( 198?, grudge, 0, balsente, grudge, balsente_state, grudge, ROT0, "Bally Midway", "Grudge Match (prototype)", MACHINE_SUPPORTS_SAVE )
GAME( 1985, teamht, 0, balsente, teamht, balsente_state, teamht, ROT0, "Bally/Sente", "Team Hat Trick", MACHINE_SUPPORTS_SAVE )
-
diff --git a/src/mame/drivers/cclimber.cpp b/src/mame/drivers/cclimber.cpp
index 72466a164ae..6886598ada6 100644
--- a/src/mame/drivers/cclimber.cpp
+++ b/src/mame/drivers/cclimber.cpp
@@ -2468,8 +2468,6 @@ ROM_END
DRIVER_INIT_MEMBER(cclimber_state,yamato)
{
-
-
save_item(NAME(m_yamato_p0));
save_item(NAME(m_yamato_p1));
}
diff --git a/src/mame/drivers/chihiro.cpp b/src/mame/drivers/chihiro.cpp
index 443523e8cd6..0e615f95aae 100644
--- a/src/mame/drivers/chihiro.cpp
+++ b/src/mame/drivers/chihiro.cpp
@@ -1128,7 +1128,7 @@ static MACHINE_CONFIG_DERIVED_CLASS(chihiro_base, xbox_base, chihiro_state)
MCFG_DEVICE_SLOT_INTERFACE(ide_baseboard, nullptr, true)
MCFG_DEVICE_MODIFY("ide:1")
MCFG_DEVICE_SLOT_INTERFACE(ide_baseboard, "bb", true)
-
+
// next line is temporary
MCFG_DEVICE_ADD("ohci_hlean2131qc", OHCI_HLEAN2131QC, 0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/chsuper.cpp b/src/mame/drivers/chsuper.cpp
index 6f7f5349119..261809d255e 100644
--- a/src/mame/drivers/chsuper.cpp
+++ b/src/mame/drivers/chsuper.cpp
@@ -9,7 +9,7 @@
Notes:
- To init chsuper3, chmpnum & chmpnuma, just keep pressed both service keys (9 & 0),
- and do a soft-reset (F3).
+ and do a soft-reset (F3).
TODO:
- sound.
diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp
index 49b04eb1006..2fdda773170 100644
--- a/src/mame/drivers/cps1.cpp
+++ b/src/mame/drivers/cps1.cpp
@@ -12340,4 +12340,3 @@ CONS( 1995, sfach, sfzch, 0, cps1_12MHz, sfzch, cps_state, cps1, "Capc
CONS( 1995, sfzbch, sfzch, 0, cps1_12MHz, sfzch, cps_state, cps1, "Capcom", "Street Fighter Zero (CPS Changer, Brazil 950727)", MACHINE_SUPPORTS_SAVE )
// Ken Sei Mogura: Street Fighter II - see kenseim.c
-
diff --git a/src/mame/drivers/crospang.cpp b/src/mame/drivers/crospang.cpp
index 40f839628a3..472abdbd0e2 100644
--- a/src/mame/drivers/crospang.cpp
+++ b/src/mame/drivers/crospang.cpp
@@ -93,7 +93,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( bestria_map, AS_PROGRAM, 16, crospang_state )
AM_IMPORT_FROM(crospang_base_map)
- AM_RANGE(0x100000, 0x100001) AM_WRITENOP // ??
+ AM_RANGE(0x100000, 0x100001) AM_WRITENOP // ??
AM_RANGE(0x100006, 0x100007) AM_WRITE(bestri_fg_scrollx_w)
AM_RANGE(0x100008, 0x100009) AM_WRITE(bestri_fg_scrolly_w)
AM_RANGE(0x10000a, 0x10000b) AM_WRITE(bestri_bg_scrollx_w)
diff --git a/src/mame/drivers/cshooter.cpp b/src/mame/drivers/cshooter.cpp
index f64d950dc61..60fec640c9f 100644
--- a/src/mame/drivers/cshooter.cpp
+++ b/src/mame/drivers/cshooter.cpp
@@ -80,30 +80,30 @@ Stephh's notes (based on the game Z80 code and some tests) :
/*
- Custom SIMM module placement
+ Custom SIMM module placement
- The Air Raid PCB has 3 custom modules shown
- in the rough diagram of the PCB below.
+ The Air Raid PCB has 3 custom modules shown
+ in the rough diagram of the PCB below.
- The modules do not appear to be 100%
- identical based on external shapes visible.
+ The modules do not appear to be 100%
+ identical based on external shapes visible.
- The data they contain is as follows
- MODULE1
- Background tilemap graphic data
- Background tilemap layout data
+ The data they contain is as follows
+ MODULE1
+ Background tilemap graphic data
+ Background tilemap layout data
- MODULE2
- Foreground tilemap graphic data
- Foreground tilemap layout data
+ MODULE2
+ Foreground tilemap graphic data
+ Foreground tilemap layout data
- MODULE3
- Sprite graphic data
+ MODULE3
+ Sprite graphic data
+
+ it's also possible each module contains a
+ 0x100 colour look up table for that layer.
- it's also possible each module contains a
- 0x100 colour look up table for that layer.
-
|-------------------------------------------------|
| A B C D E F G H I J K |
20| ##MOD1####### |
@@ -267,12 +267,11 @@ WRITE8_MEMBER(cshooter_state::cshooter_txram_w)
void cshooter_state::video_start()
{
-
// there might actually be 4 banks of 2048 x 16 tilemaps in here as the upper scroll bits are with the rom banking.
m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cshooter_state::get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(cshooter_state::bg_scan),this),16,16,2048, 64);
-
+
// which could in turn mean this is actually 256 x 128, not 256 x 512
-// m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cshooter_state::get_fg_tile_info),this),tilemap_mapper_delegate(FUNC(cshooter_state::fg_scan),this),16,16,256, 512);
+// m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cshooter_state::get_fg_tile_info),this),tilemap_mapper_delegate(FUNC(cshooter_state::fg_scan),this),16,16,256, 512);
m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(cshooter_state::get_fg_tile_info),this),tilemap_mapper_delegate(FUNC(cshooter_state::fg_scan),this),16,16,256, 128);
m_fg_tilemap->set_transparent_pen(0);
@@ -304,7 +303,6 @@ void cshooter_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec
UINT32 cshooter_state::screen_update_airraid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
-
UINT16 bgscrolly = DM_GETSCROLL(0x6);
// this is more likely to be 'bank' than scroll, like NMK16
bgscrolly += ((m_hw & 0xc0) >> 6) * 256;
@@ -374,7 +372,7 @@ WRITE8_MEMBER(cshooter_state::cshooter_c700_w)
WRITE8_MEMBER(cshooter_state::bank_w)
{
// format of this address is TTBB tbfs
-
+
// TT = bg tilemap upper scroll bits (probably bg tilemap bank select?)
// BB = prg ROM bank select
// t = text layer enable
@@ -382,7 +380,7 @@ WRITE8_MEMBER(cshooter_state::bank_w)
// f = fg layer disable
// s = sprite layer enable
-// printf("bankw %02x\n", data & 0xc0);
+// printf("bankw %02x\n", data & 0xc0);
m_hw = data;
@@ -419,18 +417,18 @@ static ADDRESS_MAP_START( airraid_map, AS_PROGRAM, 8, cshooter_state )
AM_RANGE(0xc003, 0xc003) AM_READ_PORT("DSW2")
AM_RANGE(0xc004, 0xc004) AM_READ_PORT("DSW1")
AM_RANGE(0xc500, 0xc500) AM_WRITE(cshooter_c500_w)
-// AM_RANGE(0xc600, 0xc600) AM_WRITE(cshooter_c600_w) // see notes
+// AM_RANGE(0xc600, 0xc600) AM_WRITE(cshooter_c600_w) // see notes
AM_RANGE(0xc700, 0xc700) AM_WRITE(cshooter_c700_w)
-// AM_RANGE(0xc801, 0xc801) AM_WRITE(cshooter_c801_w) // see notes
+// AM_RANGE(0xc801, 0xc801) AM_WRITE(cshooter_c801_w) // see notes
AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(cshooter_txram_w) AM_SHARE("txram")
AM_RANGE(0xd800, 0xd8ff) AM_RAM AM_SHARE("paletteram")
AM_RANGE(0xda00, 0xdaff) AM_RAM AM_SHARE("paletteram2")
AM_RANGE(0xdc11, 0xdc11) AM_WRITE(bank_w)
AM_RANGE(0xdc00, 0xdc0f) AM_RAM_WRITE(vregs_w) AM_SHARE("vregs")
-// AM_RANGE(0xdc10, 0xdc10) AM_RAM
-// AM_RANGE(0xdc19, 0xdc19) AM_RAM
-// AM_RANGE(0xdc1e, 0xdc1e) AM_RAM
-// AM_RANGE(0xdc1f, 0xdc1f) AM_RAM
+// AM_RANGE(0xdc10, 0xdc10) AM_RAM
+// AM_RANGE(0xdc19, 0xdc19) AM_RAM
+// AM_RANGE(0xdc1e, 0xdc1e) AM_RAM
+// AM_RANGE(0xdc1f, 0xdc1f) AM_RAM
AM_RANGE(0xde00, 0xde0f) AM_READWRITE(seibu_sound_comms_r,seibu_sound_comms_w)
AM_RANGE(0xe000, 0xfdff) AM_RAM AM_SHARE("mainram")
@@ -661,7 +659,7 @@ ROM_START( cshootere )
ROM_REGION( 0x100, "tx_clut", 0 ) // taken from parent set (need proper IC locations for this PCB type)
ROM_LOAD( "63s281.16a", 0x0000, 0x0100, CRC(0b8b914b) SHA1(8cf4910b846de79661cc187887171ed8ebfd6719) ) // clut
-
+
ROM_REGION( 0x220, "proms", 0 ) // taken from parent set (need proper IC locations for this PCB type)
ROM_LOAD( "82s123.7a", 0x0000, 0x0020, CRC(93e2d292) SHA1(af8edd0cfe85f28ede9604cfaf4516d54e5277c9) ) // sprite color related? (not used)
ROM_LOAD( "82s129.9s", 0x0020, 0x0100, CRC(cf14ba30) SHA1(3284b6809075756b3c8e07d9705fc7eacb7556f1) ) // timing? (not used)
@@ -686,13 +684,13 @@ ROM_START( cshootere )
ROM_LOAD16_BYTE( "fg_tiles_odd", 0x00001, 0x20000, NO_DUMP )
ROM_REGION( 0x100, "fg_clut", 0 )
ROM_LOAD( "fg_clut", 0x000, 0x100, NO_DUMP )
-
+
/* ### MODULE 3 ### Sprite graphics */
ROM_REGION( 0x40000, "spr_gfx", 0 )
ROM_LOAD16_BYTE( "sprite_tiles_even", 0x00000, 0x20000, NO_DUMP )
ROM_LOAD16_BYTE( "sprite_tiles_odd", 0x00001, 0x20000, NO_DUMP )
ROM_REGION( 0x100, "spr_clut", 0 )
- ROM_LOAD( "spr_clut", 0x000, 0x100, NO_DUMP )
+ ROM_LOAD( "spr_clut", 0x000, 0x100, NO_DUMP )
ROM_END
/*
@@ -758,13 +756,13 @@ ROM_START( airraid )
ROM_LOAD16_BYTE( "fg_tiles_odd", 0x00001, 0x20000, NO_DUMP )
ROM_REGION( 0x100, "fg_clut", 0 )
ROM_LOAD( "fg_clut", 0x000, 0x100, NO_DUMP )
-
+
/* ### MODULE 3 ### Sprite graphics */
ROM_REGION( 0x40000, "spr_gfx", 0 )
ROM_LOAD16_BYTE( "sprite_tiles_even", 0x00000, 0x20000, NO_DUMP )
ROM_LOAD16_BYTE( "sprite_tiles_odd", 0x00001, 0x20000, NO_DUMP )
ROM_REGION( 0x100, "spr_clut", 0 )
- ROM_LOAD( "spr_clut", 0x000, 0x100, NO_DUMP )
+ ROM_LOAD( "spr_clut", 0x000, 0x100, NO_DUMP )
ROM_END
diff --git a/src/mame/drivers/gaelco2.cpp b/src/mame/drivers/gaelco2.cpp
index a8769872e56..ce2da07d012 100644
--- a/src/mame/drivers/gaelco2.cpp
+++ b/src/mame/drivers/gaelco2.cpp
@@ -19,10 +19,10 @@
Snow Board | 1996 | CG-1V 366 | 960419/1 | Lattice IspLSI 1016-80LJ
Bang! | 1998 | CG-1V 388 | 980921/1 | No
- Notes:
- touchgok:
- sounds cut out sometimes, others are often missing (sound status reads as busy,
- so no attempt made to play new sound) probably bug in devices\sound\gaelco.cpp ??
+ Notes:
+ touchgok:
+ sounds cut out sometimes, others are often missing (sound status reads as busy,
+ so no attempt made to play new sound) probably bug in devices\sound\gaelco.cpp ??
***************************************************************************/
diff --git a/src/mame/drivers/galaxi.cpp b/src/mame/drivers/galaxi.cpp
index 86c1736e98d..72506f0506c 100644
--- a/src/mame/drivers/galaxi.cpp
+++ b/src/mame/drivers/galaxi.cpp
@@ -545,7 +545,7 @@ ROM_END
2x DS1230Y-100 (u4, u5) not dumped.
PLDs:
- 1x A40MX04-PL84 (u29) read protected.
+ 1x A40MX04-PL84 (u29) read protected.
Others:
1x 28x2 JAMMA edge connector.
diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp
index a40ebca0f2a..9e4eacf040f 100644
--- a/src/mame/drivers/galaxian.cpp
+++ b/src/mame/drivers/galaxian.cpp
@@ -2228,7 +2228,7 @@ static INPUT_PORTS_START( kamikazp )
PORT_DIPSETTING( 0x03, "6C / 3C" ) // first 3 coins give 1 credit, 2nd 3 coins give 2 credits
PORT_DIPSETTING( 0x0b, "7C / 3C" )
PORT_DIPSETTING( 0x0d, DEF_STR( 4C_2C ) ) // first 3 coins give 1 credit, next coin gives 1 credit
- PORT_DIPSETTING( 0x04, DEF_STR( 2C_1C ) ) // 2
+ PORT_DIPSETTING( 0x04, DEF_STR( 2C_1C ) ) // 2
PORT_DIPSETTING( 0x09, DEF_STR( 3C_2C ) ) // first 2 coins give 1 credit, next coin gives 1 credit
PORT_DIPSETTING( 0x05, DEF_STR( 4C_3C ) ) // first 2 coins give 1 credit, 2nd 2 coins give 2 credits
PORT_DIPSETTING( 0x08, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp
index 88e4c6e4922..5bf49b37fa7 100644
--- a/src/mame/drivers/hh_tms1k.cpp
+++ b/src/mame/drivers/hh_tms1k.cpp
@@ -5068,9 +5068,9 @@ MACHINE_CONFIG_END
* PCB label WS 8107-1
* TMS1730 MCU, label MP3005N (die label 1700 MP3005)
* 4 LEDs, 1-bit sound
-
+
This is a simplified rerelease of Copy Cat, 10(!) years later.
-
+
3 variations exist, each with a different colored case. Let's assume that
they're on the same hardware.
- white case, yellow orange green red buttons and leds (same as model 7-520)
diff --git a/src/mame/drivers/himesiki.cpp b/src/mame/drivers/himesiki.cpp
index 1ebc2696426..0230d03d30f 100644
--- a/src/mame/drivers/himesiki.cpp
+++ b/src/mame/drivers/himesiki.cpp
@@ -11,7 +11,7 @@ Android (C) 198? Nasco
// Android uses PCBS MK-P102 and MK-P101 ONLY, there is no MK-P103 (extra sprites used on Himeshikibu)
// Real hardware video of parent set can be seen at https://www.youtube.com/watch?v=5rtqZqMBACI (uploaded by Chris Hardy)
-// for some reason music fails to play the 2nd attract loop in MAME?
+// for some reason music fails to play the 2nd attract loop in MAME?
@@ -323,7 +323,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( androidp )
PORT_INCLUDE(androidpo)
-
+
PORT_MODIFY("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -346,7 +346,7 @@ static INPUT_PORTS_START( androidp )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
- PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) )
+ PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_3C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) )
@@ -456,7 +456,7 @@ static MACHINE_CONFIG_START( himesiki, himesiki_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2203", YM2203, CLK2/4) // ??
+ MCFG_SOUND_ADD("ym2203", YM2203, CLK2/4) // ??
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("sub", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.10)
MCFG_SOUND_ROUTE(1, "mono", 0.10)
diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp
index 9353ab4ed48..d8399aa739c 100644
--- a/src/mame/drivers/hp9845.cpp
+++ b/src/mame/drivers/hp9845.cpp
@@ -418,10 +418,10 @@ void hp9845b_state::video_render_buff(unsigned line_in_row, bool buff_idx)
const rgb_t *palette = m_palette->palette()->entry_list_raw();
if (m_video_blanked) {
- // Blank scanline
- for (unsigned i = 0; i < (80 * 9); i++) {
- m_bitmap.pix32(m_video_scanline , i) = palette[ 0 ];
- }
+ // Blank scanline
+ for (unsigned i = 0; i < (80 * 9); i++) {
+ m_bitmap.pix32(m_video_scanline , i) = palette[ 0 ];
+ }
} else {
bool cursor_line = line_in_row == 12;
bool ul_line = line_in_row == 14;
@@ -718,15 +718,15 @@ static MACHINE_CONFIG_START( hp9845b, hp9845b_state )
MCFG_TACO_FLG_HANDLER(WRITELINE(hp9845b_state , t15_flg_w))
MCFG_TACO_STS_HANDLER(WRITELINE(hp9845b_state , t15_sts_w))
- // In real machine there were 8 slots for LPU ROMs and 8 slots for PPU ROMs in
- // right-hand side and left-hand side drawers, respectively.
- // Here we do away with the distinction between LPU & PPU ROMs: in the end they
- // are visible to both CPUs at the same addresses.
- // For now we define just a couple of slots..
- MCFG_DEVICE_ADD("drawer1", HP_OPTROM_SLOT, 0)
- MCFG_DEVICE_SLOT_INTERFACE(hp_optrom_slot_device, NULL, false)
- MCFG_DEVICE_ADD("drawer2", HP_OPTROM_SLOT, 0)
- MCFG_DEVICE_SLOT_INTERFACE(hp_optrom_slot_device, NULL, false)
+ // In real machine there were 8 slots for LPU ROMs and 8 slots for PPU ROMs in
+ // right-hand side and left-hand side drawers, respectively.
+ // Here we do away with the distinction between LPU & PPU ROMs: in the end they
+ // are visible to both CPUs at the same addresses.
+ // For now we define just a couple of slots..
+ MCFG_DEVICE_ADD("drawer1", HP_OPTROM_SLOT, 0)
+ MCFG_DEVICE_SLOT_INTERFACE(hp_optrom_slot_device, NULL, false)
+ MCFG_DEVICE_ADD("drawer2", HP_OPTROM_SLOT, 0)
+ MCFG_DEVICE_SLOT_INTERFACE(hp_optrom_slot_device, NULL, false)
MCFG_SOFTWARE_LIST_ADD("optrom_list", "hp9845b_rom")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/igs009.cpp b/src/mame/drivers/igs009.cpp
index 49db3b223e7..bbf226f8935 100644
--- a/src/mame/drivers/igs009.cpp
+++ b/src/mame/drivers/igs009.cpp
@@ -725,7 +725,7 @@ static const gfx_layout layout_8x8x6 =
8, 8,
RGN_FRAC(1, 3),
6,
- { RGN_FRAC(0,3)+8,RGN_FRAC(0,3)+0,
+ { RGN_FRAC(0,3)+8,RGN_FRAC(0,3)+0,
RGN_FRAC(1,3)+8,RGN_FRAC(1,3)+0,
RGN_FRAC(2,3)+8,RGN_FRAC(2,3)+0 },
{ STEP8(0,1) },
@@ -738,7 +738,7 @@ static const gfx_layout layout_8x32x6 =
8, 32,
RGN_FRAC(1, 3),
6,
- { RGN_FRAC(0,3)+8,RGN_FRAC(0,3)+0,
+ { RGN_FRAC(0,3)+8,RGN_FRAC(0,3)+0,
RGN_FRAC(1,3)+8,RGN_FRAC(1,3)+0,
RGN_FRAC(2,3)+8,RGN_FRAC(2,3)+0 },
{ STEP8(0,1) },
@@ -794,9 +794,9 @@ void igs009_state::machine_start()
void igs009_state::machine_reset()
{
- m_nmi_enable = 0;
- m_hopper = 0;
- m_video_enable = 1;
+ m_nmi_enable = 0;
+ m_hopper = 0;
+ m_video_enable = 1;
}
INTERRUPT_GEN_MEMBER(igs009_state::interrupt)
@@ -1159,7 +1159,7 @@ ROM_END
/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
GAME( 1997, jingbell, 0, jingbell, jingbell, igs009_state, jingbell, ROT0, "IGS", "Jingle Bell (US, V157US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, jingbella, jingbell, jingbell, jingbell, igs009_state, jingbell, ROT0, "IGS", "Jingle Bell (EU, V155UE)", MACHINE_SUPPORTS_SAVE ) // Shows V154UE in test mode!
+GAME( 1997, jingbella, jingbell, jingbell, jingbell, igs009_state, jingbell, ROT0, "IGS", "Jingle Bell (EU, V155UE)", MACHINE_SUPPORTS_SAVE ) // Shows V154UE in test mode!
GAME( 1997, jingbellb, jingbell, jingbell, jingbell, igs009_state, jingbell, ROT0, "IGS", "Jingle Bell (EU, V153UE)", MACHINE_SUPPORTS_SAVE )
GAME( 1995, jingbellc, jingbell, jingbell, jingbell, igs009_state, jingbelli, ROT0, "IGS", "Jingle Bell (EU, V141UE)", MACHINE_SUPPORTS_SAVE )
GAME( 1995?, jingbelli, jingbell, jingbell, jingbell, igs009_state, jingbelli, ROT0, "IGS", "Jingle Bell (Italy, V133I)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/intv.cpp b/src/mame/drivers/intv.cpp
index 084d7b492ba..68dec527564 100644
--- a/src/mame/drivers/intv.cpp
+++ b/src/mame/drivers/intv.cpp
@@ -471,8 +471,8 @@ static MACHINE_CONFIG_START( intv, intv_state )
MCFG_PALETTE_INDIRECT_ENTRIES(32)
MCFG_PALETTE_INIT_OWNER(intv_state, intv)
- MCFG_INTV_CONTROL_PORT_ADD("iopt_right_ctrl", intv_control_port_devices, "handctrl")
- MCFG_INTV_CONTROL_PORT_ADD("iopt_left_ctrl", intv_control_port_devices, "handctrl")
+ MCFG_INTV_CONTROL_PORT_ADD("iopt_right_ctrl", intv_control_port_devices, "handctrl")
+ MCFG_INTV_CONTROL_PORT_ADD("iopt_left_ctrl", intv_control_port_devices, "handctrl")
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/jongkyo.cpp b/src/mame/drivers/jongkyo.cpp
index ae5ff7faed5..2697805726f 100644
--- a/src/mame/drivers/jongkyo.cpp
+++ b/src/mame/drivers/jongkyo.cpp
@@ -499,7 +499,7 @@ static MACHINE_CONFIG_START( jongkyo, jongkyo_state )
MCFG_SEGACRPT_SET_SIZE(0x6c00)
MCFG_SEGACRPT_SET_NUMBANKS(8)
MCFG_SEGACRPT_SET_BANKSIZE(0x400)
- // sega_decode(rom, opcodes, 0x6c00, convtable, 8, 0x400);
+ // sega_decode(rom, opcodes, 0x6c00, convtable, 8, 0x400);
/* video hardware */
@@ -557,7 +557,6 @@ ROM_END
DRIVER_INIT_MEMBER(jongkyo_state,jongkyo)
{
-
UINT8 *rom = memregion("maincpu")->base();
/* first of all, do a simple bitswap */
@@ -595,5 +594,3 @@ DRIVER_INIT_MEMBER(jongkyo_state,jongkyo)
*************************************/
GAME( 1985, jongkyo, 0, jongkyo, jongkyo, jongkyo_state, jongkyo, ROT0, "Kiwako", "Jongkyo", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
-
-
diff --git a/src/mame/drivers/jungleyo.cpp b/src/mame/drivers/jungleyo.cpp
index 01c16722e79..ddaae91f254 100644
--- a/src/mame/drivers/jungleyo.cpp
+++ b/src/mame/drivers/jungleyo.cpp
@@ -4,24 +4,24 @@
/*
CPUs
-QTY Type clock position function
-1x MC68HC000FN10 u3 16/32-bit Microprocessor - main
-1x u6295 u98 4-Channel Mixing ADCPM Voice Synthesis LSI - sound
-1x HA17358 u101 Dual Operational Amplifier - sound
-1x TDA2003 u104 Audio Amplifier - sound
-1x oscillator 12.000MHz osc1
+QTY Type clock position function
+1x MC68HC000FN10 u3 16/32-bit Microprocessor - main
+1x u6295 u98 4-Channel Mixing ADCPM Voice Synthesis LSI - sound
+1x HA17358 u101 Dual Operational Amplifier - sound
+1x TDA2003 u104 Audio Amplifier - sound
+1x oscillator 12.000MHz osc1
ROMs
-QTY Type position status
-2x M27C1001 2,3 dumped
-1x M27C2001 1 dumped
-3x M27C4001 4,5,6 dumped
+QTY Type position status
+2x M27C1001 2,3 dumped
+1x M27C2001 1 dumped
+3x M27C4001 4,5,6 dumped
RAMs
-QTY Type position
-11x LH52B256-10PLL u16a,u17a,u27,u28,u29,u30,u39,u40,u74,u75,u76
+QTY Type position
+11x LH52B256-10PLL u16a,u17a,u27,u28,u29,u30,u39,u40,u74,u75,u76
PLDs
-QTY Type position status
-1x ATF20V8B-15PC u37 read protected
-2x A40MX04-F-PL84 u83,u86 read protected
+QTY Type position status
+1x ATF20V8B-15PC u37 read protected
+2x A40MX04-F-PL84 u83,u86 read protected
Others
1x 28x2 JAMMA edge connector
@@ -31,7 +31,7 @@ Others
1x battery 3.6V (BT1)
Notes
-PCB silkscreened: "MADE IN TAIWAN YONSHI PCB NO-006F"
+PCB silkscreened: "MADE IN TAIWAN YONSHI PCB NO-006F"
*/
@@ -95,9 +95,9 @@ static const gfx_layout jungleyo16_layout =
{ 0,1,2,3,4,5,6,7 },
{ 0*8,1*8,2*8,3*8,4*8,5*8,6*8,7*8 },
{ 0*64, 1*64, 2*64, 3*64, 4*64, 5*64, 6*64, 7*64,
- 8*64, 9*64,10*64,11*64,12*64,13*64,14*64,15*64,
- 16*64,17*64,18*64,19*64,20*64,21*64,22*64,23*64,
- 24*64,25*64,26*64,27*64,28*64,29*64,30*64,31*64 },
+ 8*64, 9*64,10*64,11*64,12*64,13*64,14*64,15*64,
+ 16*64,17*64,18*64,19*64,20*64,21*64,22*64,23*64,
+ 24*64,25*64,26*64,27*64,28*64,29*64,30*64,31*64 },
8*64*4
};
diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp
index 718c49c1852..6c9003594a3 100644
--- a/src/mame/drivers/ksys573.cpp
+++ b/src/mame/drivers/ksys573.cpp
@@ -2754,18 +2754,18 @@ static INPUT_PORTS_START( hyperbbc )
PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER( 3 )
PORT_BIT( 0x00000400, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x00000800, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER( 3 )
- PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_MODIFY( "IN3" )
- PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x00000800, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_MODIFY( "IN3" )
+ PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x00000800, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( hypbbc2p )
diff --git a/src/mame/drivers/lwings.cpp b/src/mame/drivers/lwings.cpp
index d5bfd179a06..7a7e735f681 100644
--- a/src/mame/drivers/lwings.cpp
+++ b/src/mame/drivers/lwings.cpp
@@ -1746,5 +1746,3 @@ GAME( 1987, buraikenb, avengers, avengersb,avengers, lwings_state, avengersb, RO
// cloned lwings hardware
GAME( 1992, fball, 0, fball, fball, driver_device, 0, ROT0, "FM Work", "Fire Ball (FM Work)", MACHINE_SUPPORTS_SAVE )
-
-
diff --git a/src/mame/drivers/m92.cpp b/src/mame/drivers/m92.cpp
index 713ba75a8c1..c7b8dd95e97 100644
--- a/src/mame/drivers/m92.cpp
+++ b/src/mame/drivers/m92.cpp
@@ -1311,7 +1311,7 @@ ROM_START( majtitl2a )
ROM_REGION( 0x80000, "irem", 0 )
ROM_LOAD( "k0d.ic8", 0x000000, 0x80000, CRC(713b9e9f) SHA1(91384d67d4ba9c7d926fbecb077293c661b8ec83) )
-
+
ROM_REGION( 0x4000, "eeprom", 0 ) /* D28C64C-20 EEPROM */
ROM_LOAD( "mt2eep", 0x000000, 0x800, CRC(208af971) SHA1(69384cac24b7af35a031f9b60e035131a8b10cb2) )
diff --git a/src/mame/drivers/mac.cpp b/src/mame/drivers/mac.cpp
index 4c77db5d91a..d3cec088a75 100644
--- a/src/mame/drivers/mac.cpp
+++ b/src/mame/drivers/mac.cpp
@@ -2219,8 +2219,8 @@ ROM_END
ROM_START( utrn1024 )
ROM_REGION16_BE(0x20000, "bootrom", 0)
// CRCs match the original "Lonely Hearts" version 1 Mac Plus ROM
- ROM_LOAD16_BYTE( "macplus_mem_h.e6", 0x000000, 0x010000, CRC(5095fe39) SHA1(be780580033d914b5035d60b5ebbd66bd1d28a9b) )
- ROM_LOAD16_BYTE( "macplus_mem_l.e7", 0x000001, 0x010000, CRC(fb766270) SHA1(679f529fbfc05f9cc98924c53457d2996dfcb1a7) )
+ ROM_LOAD16_BYTE( "macplus_mem_h.e6", 0x000000, 0x010000, CRC(5095fe39) SHA1(be780580033d914b5035d60b5ebbd66bd1d28a9b) )
+ ROM_LOAD16_BYTE( "macplus_mem_l.e7", 0x000001, 0x010000, CRC(fb766270) SHA1(679f529fbfc05f9cc98924c53457d2996dfcb1a7) )
ROM_END
ROM_START( mac512ke )
diff --git a/src/mame/drivers/macs.cpp b/src/mame/drivers/macs.cpp
index 5ca2a36f4fa..150b13c657b 100644
--- a/src/mame/drivers/macs.cpp
+++ b/src/mame/drivers/macs.cpp
@@ -70,8 +70,8 @@ public:
: driver_device(mconfig, type, tag),
m_ram2(*this, "ram2"),
m_maincpu(*this,"maincpu"),
- m_cart1(*this, "slot_a"),
- m_cart2(*this, "slot_b")
+ m_cart1(*this, "slot_a"),
+ m_cart2(*this, "slot_b")
{ }
UINT8 m_mux_data;
@@ -87,13 +87,13 @@ public:
DECLARE_DRIVER_INIT(kisekaem);
DECLARE_DRIVER_INIT(macs2);
DECLARE_MACHINE_RESET(macs);
- DECLARE_MACHINE_START(macs);
+ DECLARE_MACHINE_START(macs);
UINT32 screen_update_macs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
optional_device<st0016_cpu_device> m_maincpu;
- optional_device<generic_slot_device> m_cart1;
- optional_device<generic_slot_device> m_cart2;
+ optional_device<generic_slot_device> m_cart1;
+ optional_device<generic_slot_device> m_cart2;
};
@@ -115,7 +115,7 @@ ADDRESS_MAP_END
WRITE8_MEMBER(macs_state::rambank_w)
{
- membank("bank3")->set_entry(2 + (data & 1));
+ membank("bank3")->set_entry(2 + (data & 1));
}
READ8_MEMBER(macs_state::macs_input_r)
@@ -153,12 +153,12 @@ READ8_MEMBER(macs_state::macs_input_r)
WRITE8_MEMBER(macs_state::macs_rom_bank_w)
{
- membank("bank1")->set_entry(macs_cart_slot * 0x100 + data);
+ membank("bank1")->set_entry(macs_cart_slot * 0x100 + data);
}
WRITE8_MEMBER(macs_state::macs_output_w)
{
- switch(offset)
+ switch(offset)
{
case 0:
/*
@@ -169,13 +169,13 @@ WRITE8_MEMBER(macs_state::macs_output_w)
if(m_rev == 1)
{
- /* FIXME: dunno if this RAM bank is right, DASM tracking made on the POST
- screens indicates that there's just one RAM bank, but then MACS2 games
- locks up. */
- membank("bank3")->set_entry(BIT(data, 5));
+ /* FIXME: dunno if this RAM bank is right, DASM tracking made on the POST
+ screens indicates that there's just one RAM bank, but then MACS2 games
+ locks up. */
+ membank("bank3")->set_entry(BIT(data, 5));
macs_cart_slot = (data & 0xc) >> 2;
- membank("bank4")->set_entry(macs_cart_slot * 0x100);
+ membank("bank4")->set_entry(macs_cart_slot * 0x100);
}
membank("bank2")->set_entry(BIT(data, 5));
@@ -492,7 +492,7 @@ static MACHINE_CONFIG_START( macs, macs_state )
MCFG_CPU_VBLANK_INT_DRIVER("screen", macs_state, irq0_line_hold)
- MCFG_MACHINE_START_OVERRIDE(macs_state,macs)
+ MCFG_MACHINE_START_OVERRIDE(macs_state,macs)
MCFG_MACHINE_RESET_OVERRIDE(macs_state,macs)
/* video hardware */
@@ -504,10 +504,10 @@ static MACHINE_CONFIG_START( macs, macs_state )
MCFG_SCREEN_UPDATE_DRIVER(macs_state, screen_update_macs)
MCFG_SCREEN_PALETTE("maincpu:palette")
- MCFG_GENERIC_CARTSLOT_ADD_WITH_DEFAULT("slot_a", generic_plain_slot, "macs_cart", "rom")
- MCFG_SET_IMAGE_LOADABLE(FALSE)
- MCFG_GENERIC_CARTSLOT_ADD_WITH_DEFAULT("slot_b", generic_plain_slot, "macs_cart", "rom")
- MCFG_SET_IMAGE_LOADABLE(FALSE)
+ MCFG_GENERIC_CARTSLOT_ADD_WITH_DEFAULT("slot_a", generic_plain_slot, "macs_cart", "rom")
+ MCFG_SET_IMAGE_LOADABLE(FALSE)
+ MCFG_GENERIC_CARTSLOT_ADD_WITH_DEFAULT("slot_b", generic_plain_slot, "macs_cart", "rom")
+ MCFG_SET_IMAGE_LOADABLE(FALSE)
MACHINE_CONFIG_END
@@ -528,8 +528,8 @@ ROM_START( macsbios )
ROM_REGION( 0x1000000, "maincpu", 0 )
ROM_COPY( "bios", 0x000000, 0x000000, 0x400000 )
- ROM_REGION( 0x400000, "slot_a:rom", ROMREGION_ERASEFF )
- ROM_REGION( 0x400000, "slot_b:rom", ROMREGION_ERASEFF )
+ ROM_REGION( 0x400000, "slot_a:rom", ROMREGION_ERASEFF )
+ ROM_REGION( 0x400000, "slot_b:rom", ROMREGION_ERASEFF )
ROM_END
ROM_START( mac2bios )
@@ -538,8 +538,8 @@ ROM_START( mac2bios )
ROM_REGION( 0x1000000, "maincpu", 0 )
ROM_COPY( "bios", 0x000000, 0x000000, 0x400000 )
- ROM_REGION( 0x400000, "slot_a:rom", ROMREGION_ERASEFF )
- ROM_REGION( 0x400000, "slot_b:rom", ROMREGION_ERASEFF )
+ ROM_REGION( 0x400000, "slot_a:rom", ROMREGION_ERASEFF )
+ ROM_REGION( 0x400000, "slot_b:rom", ROMREGION_ERASEFF )
ROM_END
ROM_START( kisekaem )
@@ -548,12 +548,12 @@ ROM_START( kisekaem )
ROM_REGION( 0x1000000, "maincpu", 0 )
ROM_COPY( "bios", 0x000000, 0x000000, 0x400000 )
- ROM_REGION( 0x400000, "slot_a:rom", 0 )
- ROM_LOAD16_BYTE( "am-mj.u8", 0x000000, 0x100000, CRC(3cf85151) SHA1(e05400065c384730f04ef565db5ba27eb3973d15) )
- ROM_LOAD16_BYTE( "am-mj.u7", 0x000001, 0x100000, CRC(4b645354) SHA1(1dbf9141c3724e5dff2cd8066117fb1b94671a80) )
- ROM_LOAD16_BYTE( "am-mj.u6", 0x200000, 0x100000, CRC(23b3aa24) SHA1(bfabdb16f9b1b60230bb636a944ab46fdfda49d7) )
- ROM_LOAD16_BYTE( "am-mj.u5", 0x200001, 0x100000, CRC(b4d53e29) SHA1(d7683fdd5531bf1aa0ef1e4e6f517b31e2d5829e) )
- ROM_REGION( 0x400000, "slot_b:rom", ROMREGION_ERASEFF )
+ ROM_REGION( 0x400000, "slot_a:rom", 0 )
+ ROM_LOAD16_BYTE( "am-mj.u8", 0x000000, 0x100000, CRC(3cf85151) SHA1(e05400065c384730f04ef565db5ba27eb3973d15) )
+ ROM_LOAD16_BYTE( "am-mj.u7", 0x000001, 0x100000, CRC(4b645354) SHA1(1dbf9141c3724e5dff2cd8066117fb1b94671a80) )
+ ROM_LOAD16_BYTE( "am-mj.u6", 0x200000, 0x100000, CRC(23b3aa24) SHA1(bfabdb16f9b1b60230bb636a944ab46fdfda49d7) )
+ ROM_LOAD16_BYTE( "am-mj.u5", 0x200001, 0x100000, CRC(b4d53e29) SHA1(d7683fdd5531bf1aa0ef1e4e6f517b31e2d5829e) )
+ ROM_REGION( 0x400000, "slot_b:rom", ROMREGION_ERASEFF )
ROM_END
ROM_START( kisekaeh )
@@ -562,19 +562,19 @@ ROM_START( kisekaeh )
ROM_REGION( 0x1000000, "maincpu", 0 )
ROM_COPY( "bios", 0x000000, 0x000000, 0x400000 )
- ROM_REGION( 0x400000, "slot_a:rom", 0 )
- ROM_LOAD16_BYTE( "kh-u8.bin", 0x000000, 0x100000, CRC(601b9e6a) SHA1(54508a6db3928f78897df64ce400791e4789d0f6) )
- ROM_LOAD16_BYTE( "kh-u7.bin", 0x000001, 0x100000, CRC(8f6e4bb3) SHA1(361545189feeda0887f930727d25655309b84629) )
- ROM_LOAD16_BYTE( "kh-u6.bin", 0x200000, 0x100000, CRC(8e700204) SHA1(876e5530d749828de077293cb109a71b67cef140) )
- ROM_LOAD16_BYTE( "kh-u5.bin", 0x200001, 0x100000, CRC(709bf7c8) SHA1(0a93e0c4f9be22a3302a1c5d2a6ec4739b202ea8) )
- ROM_REGION( 0x400000, "slot_b:rom", ROMREGION_ERASEFF )
+ ROM_REGION( 0x400000, "slot_a:rom", 0 )
+ ROM_LOAD16_BYTE( "kh-u8.bin", 0x000000, 0x100000, CRC(601b9e6a) SHA1(54508a6db3928f78897df64ce400791e4789d0f6) )
+ ROM_LOAD16_BYTE( "kh-u7.bin", 0x000001, 0x100000, CRC(8f6e4bb3) SHA1(361545189feeda0887f930727d25655309b84629) )
+ ROM_LOAD16_BYTE( "kh-u6.bin", 0x200000, 0x100000, CRC(8e700204) SHA1(876e5530d749828de077293cb109a71b67cef140) )
+ ROM_LOAD16_BYTE( "kh-u5.bin", 0x200001, 0x100000, CRC(709bf7c8) SHA1(0a93e0c4f9be22a3302a1c5d2a6ec4739b202ea8) )
+ ROM_REGION( 0x400000, "slot_b:rom", ROMREGION_ERASEFF )
ROM_END
ROM_START( cultname ) // uses printer - two different games ? (slot a - checks for printer, slot b - not)
MACS_BIOS
- ROM_REGION( 0x1000000, "maincpu", 0 )
- ROM_COPY( "bios", 0x000000, 0x000000, 0x400000 )
+ ROM_REGION( 0x1000000, "maincpu", 0 )
+ ROM_COPY( "bios", 0x000000, 0x000000, 0x400000 )
ROM_REGION( 0x400000, "slot_a:rom", 0 )
ROM_LOAD16_BYTE( "cult-d0.u8", 0x000000, 0x100000, CRC(394bc1a6) SHA1(98df5406862234815b46c7b0ac0b19e4b597d1b6) )
@@ -602,8 +602,8 @@ ROM_START( yuka )
ROM_REGION( 0x400000, "slot_b:rom", ROMREGION_ERASE00 )
- ROM_REGION( 0x1000000, "maincpu", 0 )
- ROM_COPY( "slot_a:rom", 0x000000, 0x000000, 0x400000 )
+ ROM_REGION( 0x1000000, "maincpu", 0 )
+ ROM_COPY( "slot_a:rom", 0x000000, 0x000000, 0x400000 )
ROM_END
ROM_START( yujan )
@@ -617,8 +617,8 @@ ROM_START( yujan )
ROM_REGION( 0x400000, "slot_b:rom", ROMREGION_ERASEFF )
- ROM_REGION( 0x1000000, "maincpu", 0 )
- ROM_COPY( "slot_a:rom", 0x000000, 0x000000, 0x400000 )
+ ROM_REGION( 0x1000000, "maincpu", 0 )
+ ROM_COPY( "slot_a:rom", 0x000000, 0x000000, 0x400000 )
ROM_END
#if 0
@@ -639,27 +639,27 @@ static const UINT8 ramdata[160]=
MACHINE_START_MEMBER(macs_state,macs)
{
- membank("bank1")->configure_entries(0 , 256, memregion("maincpu")->base(), 0x4000);
- membank("bank1")->configure_entries(256, 256, m_cart1->get_rom_base(), 0x4000);
- membank("bank1")->configure_entries(512, 256, m_cart2->get_rom_base(), 0x4000);
- membank("bank1")->set_entry(0);
+ membank("bank1")->configure_entries(0 , 256, memregion("maincpu")->base(), 0x4000);
+ membank("bank1")->configure_entries(256, 256, m_cart1->get_rom_base(), 0x4000);
+ membank("bank1")->configure_entries(512, 256, m_cart2->get_rom_base(), 0x4000);
+ membank("bank1")->set_entry(0);
- membank("bank2")->configure_entries(0, 2, m_ram1.get() + 0x2000, 0x800);
- membank("bank2")->set_entry(0);
+ membank("bank2")->configure_entries(0, 2, m_ram1.get() + 0x2000, 0x800);
+ membank("bank2")->set_entry(0);
- membank("bank3")->configure_entries(0, 4, m_ram1.get(), 0x800);
- membank("bank3")->set_entry(2);
+ membank("bank3")->configure_entries(0, 4, m_ram1.get(), 0x800);
+ membank("bank3")->set_entry(2);
- membank("bank4")->configure_entries(0 , 256, memregion("maincpu")->base(), 0x4000);
- membank("bank4")->configure_entries(256, 256, m_cart1->get_rom_base(), 0x4000);
- membank("bank4")->configure_entries(512, 256, m_cart2->get_rom_base(), 0x4000);
- membank("bank4")->set_entry(0);
+ membank("bank4")->configure_entries(0 , 256, memregion("maincpu")->base(), 0x4000);
+ membank("bank4")->configure_entries(256, 256, m_cart1->get_rom_base(), 0x4000);
+ membank("bank4")->configure_entries(512, 256, m_cart2->get_rom_base(), 0x4000);
+ membank("bank4")->set_entry(0);
}
MACHINE_RESET_MEMBER(macs_state,macs)
{
#if 0
- UINT8 *macs_ram1 = m_ram1.get();
+ UINT8 *macs_ram1 = m_ram1.get();
UINT8 *macs_ram2 = m_ram2;
/*
BIOS ram init:
diff --git a/src/mame/drivers/magic10.cpp b/src/mame/drivers/magic10.cpp
index 6ab8e9b6e35..faa32093d2d 100644
--- a/src/mame/drivers/magic10.cpp
+++ b/src/mame/drivers/magic10.cpp
@@ -886,7 +886,7 @@ ROM_END
1x TDA2003 (u24) Audio Amplifier (sound).
1x 20.000MHz. oscillator (OSC1, close to main CPU).
- 1x 30.000MHz. oscillator (OSC2, close to sound).
+ 1x 30.000MHz. oscillator (OSC2, close to sound).
1x blu resonator 1000J (XTAL1, close to sound).
ROMs:
diff --git a/src/mame/drivers/mhavoc.cpp b/src/mame/drivers/mhavoc.cpp
index f19c5b3f225..d9e7cde80a4 100644
--- a/src/mame/drivers/mhavoc.cpp
+++ b/src/mame/drivers/mhavoc.cpp
@@ -302,7 +302,7 @@ ADDRESS_MAP_END
* Gamma CPU memory handlers
*
*************************************/
-
+
/*
a15 a14 a13 a12 a11 a10 a09 a08 a07 a06 a05 a04 a03 a02 a01 a00
0 0 0 x x * * * * * * * * * * * RW ZRAM (6116 SRAM@9PQ)
diff --git a/src/mame/drivers/neogeo_noslot.cpp b/src/mame/drivers/neogeo_noslot.cpp
index f26bc91687a..bb69040a1f9 100644
--- a/src/mame/drivers/neogeo_noslot.cpp
+++ b/src/mame/drivers/neogeo_noslot.cpp
@@ -3730,7 +3730,7 @@ ROM_START( dragonsh )
NO_DELTAT_REGION
ROM_REGION( 0x2000000, "sprites", 0 )
- ROM_LOAD16_BYTE( "no3.bin", 0x000000, 0x1000000, CRC(81821826) SHA1(b7c1a53e32633383675206a16c68f6f2ff984865) )
+ ROM_LOAD16_BYTE( "no3.bin", 0x000000, 0x1000000, CRC(81821826) SHA1(b7c1a53e32633383675206a16c68f6f2ff984865) )
ROM_LOAD16_BYTE( "no4.bin", 0x000001, 0x1000000, CRC(3601d568) SHA1(800323e52f5d33b402f84d31850b42c688082d67) )
ROM_END
diff --git a/src/mame/drivers/ng_aes.cpp b/src/mame/drivers/ng_aes.cpp
index 755b1e2c01e..471eeba8feb 100644
--- a/src/mame/drivers/ng_aes.cpp
+++ b/src/mame/drivers/ng_aes.cpp
@@ -1180,7 +1180,7 @@ MACHINE_START_MEMBER(ngcd_state,neocd)
MACHINE_RESET_MEMBER(ngcd_state,neocd)
{
MACHINE_RESET_CALL_MEMBER( neogeo );
-
+
NeoSpriteRAM = memregion("sprites")->base();
YM2610ADPCMAROM = memregion("ymsnd")->base();
NeoZ80ROMActive = memregion("audiocpu")->base();
diff --git a/src/mame/drivers/opwolf.cpp b/src/mame/drivers/opwolf.cpp
index 8503b06559f..f1e607c482f 100644
--- a/src/mame/drivers/opwolf.cpp
+++ b/src/mame/drivers/opwolf.cpp
@@ -393,7 +393,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( opwolfp_map, AS_PROGRAM, 16, opwolf_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x107fff) AM_RAM
-
+
AM_RANGE(0x200000, 0x200fff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
AM_RANGE(0x380000, 0x380003) AM_READ(opwolf_dsw_r) /* dip switches */
AM_RANGE(0x380000, 0x380003) AM_WRITE(opwolf_spritectrl_w) // usually 0x4, changes when you fire
@@ -563,7 +563,7 @@ ADDRESS_MAP_END
CUSTOM_INPUT_MEMBER(opwolf_state::opwolf_gun_x_r )
{
- /* P1X - Have to remap 8 bit input value, into 0-319 visible range */
+ /* P1X - Have to remap 8 bit input value, into 0-319 visible range */
int scaled = (ioport(P1X_PORT_TAG)->read() * 320 ) / 256;
return (scaled + 0x15 + m_opwolf_gun_xoffs);
}
@@ -625,11 +625,11 @@ static INPUT_PORTS_START( opwolf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
+
PORT_START("IN2")
PORT_BIT( 0x01ff, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, opwolf_state, opwolf_gun_x_r, nullptr)
PORT_BIT( 0xfe00, IP_ACTIVE_LOW, IPT_UNUSED )
-
+
PORT_START("IN3")
PORT_BIT( 0x01ff, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, opwolf_state, opwolf_gun_y_r, nullptr)
PORT_BIT( 0xfe00, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/pc.cpp b/src/mame/drivers/pc.cpp
index 7452b907f44..a6d5d3b29fe 100644
--- a/src/mame/drivers/pc.cpp
+++ b/src/mame/drivers/pc.cpp
@@ -516,7 +516,7 @@ COMP( 1990, mc1702, ibm5150, 0, pccga, pccga, driver_device
COMP( 1987, zdsupers, ibm5150, 0, zenith, pccga, driver_device, 0, "Zenith Data Systems", "SuperSport", 0)
COMP( 1985, sicpc1605, ibm5150, 0, siemens, pccga, driver_device, 0, "Siemens", "Sicomp PC16-05", MACHINE_NOT_WORKING)
-COMP( 1985, ncrpc4i, ibm5150, 0, pccga, pccga, driver_device, 0, "NCR","PC4i", MACHINE_NOT_WORKING)
+COMP( 1985, ncrpc4i, ibm5150, 0, pccga, pccga, driver_device, 0, "NCR","PC4i", MACHINE_NOT_WORKING)
COMP( 198?, olivm15, ibm5150, 0, m15, pccga, driver_device, 0, "Olivetti", "M15", 0)
diff --git a/src/mame/drivers/pockchal.cpp b/src/mame/drivers/pockchal.cpp
index 868c685133c..1aee3e7693a 100644
--- a/src/mame/drivers/pockchal.cpp
+++ b/src/mame/drivers/pockchal.cpp
@@ -32,7 +32,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_cart(*this, "cartslot")
- { }
+ { }
virtual void machine_start() override;
virtual void machine_reset() override;
@@ -98,7 +98,7 @@ static MACHINE_CONFIG_START( pockchalv1, pockchalv1_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMP90845,8000000) /* ? MHz */
MCFG_CPU_PROGRAM_MAP(pockchalv1_map)
-// MCFG_CPU_VBLANK_INT_DRIVER("screen", pockchalv1_state, irq0_line_hold)
+// MCFG_CPU_VBLANK_INT_DRIVER("screen", pockchalv1_state, irq0_line_hold)
// wrong, it's a b&w / greyscale thing
MCFG_PALETTE_ADD("palette", 0x100)
@@ -113,7 +113,7 @@ static MACHINE_CONFIG_START( pockchalv1, pockchalv1_state )
MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1)
MCFG_SCREEN_UPDATE_DRIVER(pockchalv1_state, screen_update_pockchalv1)
MCFG_SCREEN_PALETTE("palette")
-
+
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "pockchalv1_cart")
MCFG_GENERIC_EXTENSIONS("bin")
MCFG_GENERIC_LOAD(pockchalv1_state, pockchalv1_cart)
diff --git a/src/mame/drivers/r9751.cpp b/src/mame/drivers/r9751.cpp
index 49b2e756a02..c118ae8a97b 100644
--- a/src/mame/drivers/r9751.cpp
+++ b/src/mame/drivers/r9751.cpp
@@ -125,12 +125,12 @@ UINT32 r9751_state::debug_a6()
UINT32 r9751_state::debug_a5()
{
- return m_maincpu->space(AS_PROGRAM).read_dword(ptr_m68000->dar[13]);
+ return m_maincpu->space(AS_PROGRAM).read_dword(ptr_m68000->dar[13]);
}
UINT32 r9751_state::debug_a5_20()
{
- return m_maincpu->space(AS_PROGRAM).read_dword(ptr_m68000->dar[13] + 0x20);
+ return m_maincpu->space(AS_PROGRAM).read_dword(ptr_m68000->dar[13] + 0x20);
}
READ8_MEMBER(r9751_state::pdc_dma_r)
diff --git a/src/mame/drivers/segag80r.cpp b/src/mame/drivers/segag80r.cpp
index be9bc6db239..bc79d600800 100644
--- a/src/mame/drivers/segag80r.cpp
+++ b/src/mame/drivers/segag80r.cpp
@@ -1515,8 +1515,6 @@ DRIVER_INIT_MEMBER(segag80r_state,monsterb)
DRIVER_INIT_MEMBER(segag80r_state,monster2)
{
-
-
address_space &iospace = m_maincpu->space(AS_IO);
address_space &pgmspace = m_maincpu->space(AS_PROGRAM);
@@ -1565,8 +1563,6 @@ DRIVER_INIT_MEMBER(segag80r_state,pignewt)
DRIVER_INIT_MEMBER(segag80r_state,sindbadm)
{
-
-
address_space &iospace = m_maincpu->space(AS_IO);
address_space &pgmspace = m_maincpu->space(AS_PROGRAM);
diff --git a/src/mame/drivers/senjyo.cpp b/src/mame/drivers/senjyo.cpp
index e97a29ac19f..5c5b02aee20 100644
--- a/src/mame/drivers/senjyo.cpp
+++ b/src/mame/drivers/senjyo.cpp
@@ -917,16 +917,12 @@ DRIVER_INIT_MEMBER(senjyo_state,starforc)
}
DRIVER_INIT_MEMBER(senjyo_state,starfore)
{
-
-
m_is_senjyo = 0;
m_scrollhack = 0;
}
DRIVER_INIT_MEMBER(senjyo_state,starfora)
{
-
-
m_is_senjyo = 0;
m_scrollhack = 1;
}
diff --git a/src/mame/drivers/snookr10.cpp b/src/mame/drivers/snookr10.cpp
index 4c85c99c78c..c6f51e64117 100644
--- a/src/mame/drivers/snookr10.cpp
+++ b/src/mame/drivers/snookr10.cpp
@@ -40,7 +40,7 @@
Other: 1x 28x2 edge connector.
1x 15-pins connector.
- 1x 7 pins connector (JTAG?) (on Crystals Colours boards).
+ 1x 7 pins connector (JTAG?) (on Crystals Colours boards).
1x trimmer (volume).
1x 8 DIP switches.
1x 3.6 Volt, 55-80 mAh battery.
@@ -508,7 +508,7 @@
- Added proper default NVRAM.
- Added technical notes.
-
+
[2013/05/12]
Crystals Colours:
@@ -1158,7 +1158,7 @@ ROM_END
/*
Crystals Colours
-
+
Ver 1.01
The top left bonus is called "Pool"
@@ -1174,7 +1174,7 @@ ROM_END
- Coin B: 10 credits per coin.
- Key In: 100 credits per coin.
-*/
+*/
ROM_START( crystalc )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "crystals_colours_1__(1.02).u2", 0x8000, 0x8000, CRC(a803d857) SHA1(8eb34f6b4f820776459d92f9c589794bec7547ea) )
diff --git a/src/mame/drivers/spyhuntertec.cpp b/src/mame/drivers/spyhuntertec.cpp
index d0bfa8f2aa4..464ae6e3b0d 100644
--- a/src/mame/drivers/spyhuntertec.cpp
+++ b/src/mame/drivers/spyhuntertec.cpp
@@ -409,7 +409,7 @@ READ8_MEMBER(spyhuntertec_state::spyhuntertec_in2_r)
*/
// printf("%04x spyhuntertec_in2_r\n", space.device().safe_pc());
-
+
return (ioport("IN2")->read() & ~0x40) | ((m_analog_count == 0) ? 0x40 : 0x00);
}
diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp
index bf14bd45e66..85986bfcfa7 100644
--- a/src/mame/drivers/stv.cpp
+++ b/src/mame/drivers/stv.cpp
@@ -3499,8 +3499,8 @@ GAME( 1996, nclubv2, stvbios, stv_5838, stv, stv_state, decathlt, ROT0
GAME( 1997, nclubv3, stvbios, stv, stv, stv_state, nameclv3, ROT0, "Sega", "Name Club Ver.3 (J 970723 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING ) // no protection
-
-
+
+
/* Doing something.. but not enough yet */
GAME( 1995, vfremix, stvbios, stv, stv, stv_state, vfremix, ROT0, "Sega", "Virtua Fighter Remix (JUETBKAL 950428 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp
index 8490bcb0d31..9c27b83fc71 100644
--- a/src/mame/drivers/subsino2.cpp
+++ b/src/mame/drivers/subsino2.cpp
@@ -603,7 +603,7 @@ VIDEO_START_MEMBER(subsino2_state,subsino2)
// SS9601 Regs:
m_ss9601_tilesize = TILE_8x8;
- m_ss9601_scrollctrl = 0xfd; // not written by mtrain, default to reels on
+ m_ss9601_scrollctrl = 0xfd; // not written by mtrain, default to reels on
m_ss9601_disable = 0x00;
// SS9601 Layers:
@@ -2515,7 +2515,7 @@ Others:
trimmer (volume)(VR1)
8x2 switches DIP(DS1)
3x 3 legs jumper (JP1,JP2,JP4)
- battery 3V
+ battery 3V
***************************************************************************/
diff --git a/src/mame/drivers/symbolics.cpp b/src/mame/drivers/symbolics.cpp
index a5a550f0e4d..3071f36f1f4 100644
--- a/src/mame/drivers/symbolics.cpp
+++ b/src/mame/drivers/symbolics.cpp
@@ -105,29 +105,29 @@ READ16_MEMBER(symbolics_state::fep_paddle_id_prom_r) // bits 8 and 9 do somethin
/*
READ16_MEMBER(symbolics_state::ram_parity_hack_r)
{
- UINT16 *ram = (UINT16 *)(memregion("fepdram")->base());
- //m_maincpu->set_input_line(M68K_IRQ_7, CLEAR_LINE);
- m_maincpu->set_input_line_and_vector(M68K_IRQ_7, CLEAR_LINE, M68K_INT_ACK_AUTOVECTOR);
- if (!(m_parity_error_has_occurred[offset]))
- {
- //m_maincpu->set_input_line(M68K_IRQ_7, ASSERT_LINE);
- m_maincpu->set_input_line_and_vector(M68K_IRQ_7, ASSERT_LINE, M68K_INT_ACK_AUTOVECTOR);
- m_parity_error_has_occurred[offset] = true;
- }
- ram += offset;
- return *ram;
+ UINT16 *ram = (UINT16 *)(memregion("fepdram")->base());
+ //m_maincpu->set_input_line(M68K_IRQ_7, CLEAR_LINE);
+ m_maincpu->set_input_line_and_vector(M68K_IRQ_7, CLEAR_LINE, M68K_INT_ACK_AUTOVECTOR);
+ if (!(m_parity_error_has_occurred[offset]))
+ {
+ //m_maincpu->set_input_line(M68K_IRQ_7, ASSERT_LINE);
+ m_maincpu->set_input_line_and_vector(M68K_IRQ_7, ASSERT_LINE, M68K_INT_ACK_AUTOVECTOR);
+ m_parity_error_has_occurred[offset] = true;
+ }
+ ram += offset;
+ return *ram;
}
WRITE16_MEMBER(symbolics_state::ram_parity_hack_w)
{
- UINT16 *ram = (UINT16 *)(memregion("fepdram")->base());
- m_maincpu->set_input_line_and_vector(M68K_IRQ_7, CLEAR_LINE, M68K_INT_ACK_AUTOVECTOR);
- if (!(m_parity_error_has_occurred[offset]))
- {
- m_maincpu->set_input_line_and_vector(M68K_IRQ_7, ASSERT_LINE, M68K_INT_ACK_AUTOVECTOR);
- m_parity_error_has_occurred[offset] = true;
- }
- COMBINE_DATA(&ram[offset]);
+ UINT16 *ram = (UINT16 *)(memregion("fepdram")->base());
+ m_maincpu->set_input_line_and_vector(M68K_IRQ_7, CLEAR_LINE, M68K_INT_ACK_AUTOVECTOR);
+ if (!(m_parity_error_has_occurred[offset]))
+ {
+ m_maincpu->set_input_line_and_vector(M68K_IRQ_7, ASSERT_LINE, M68K_INT_ACK_AUTOVECTOR);
+ m_parity_error_has_occurred[offset] = true;
+ }
+ COMBINE_DATA(&ram[offset]);
}
*/
@@ -289,7 +289,7 @@ void symbolics_state::machine_start()
void symbolics_state::machine_reset()
{
/*for(int i=0; i < 0x20000; i++)
- m_parity_error_has_occurred[i] = false;
+ m_parity_error_has_occurred[i] = false;
*/
}
diff --git a/src/mame/drivers/system1.cpp b/src/mame/drivers/system1.cpp
index 066c23a406d..2243b0f1e66 100644
--- a/src/mame/drivers/system1.cpp
+++ b/src/mame/drivers/system1.cpp
@@ -2232,118 +2232,118 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1ppix_315_5178, sys1ppi )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5178, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5178, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1ppix_315_5051, sys1ppi )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5051, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5051, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1ppix_315_5048, sys1ppi )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5048, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5048, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1ppix_315_5033, sys1ppi )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5033, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5033, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1ppix_315_5065, sys1ppi )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5065, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5065, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1ppix_315_5098, sys1ppi )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5098, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5098, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1piox_315_5177, sys1pio )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5177, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5177, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1piox_315_5162, sys1pio )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5162, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5162, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1piox_317_0006, sys1pio )
- MCFG_CPU_REPLACE("maincpu", SEGA_317_0006, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_317_0006, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1piox_315_5135, sys1pio )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5135, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5135, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1piox_315_5132, sys1pio )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5132, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5132, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1piox_315_5155, sys1pio )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5155, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5155, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1piox_315_5110, sys1pio )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5110, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5110, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1piox_315_5051, sys1pio )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5051, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5051, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1piox_315_5098, sys1pio )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5098, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5098, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1piox_315_5102, sys1pio )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5102, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5102, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1piox_315_5133, sys1pio )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5133, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5133, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1piox_315_5093, sys1pio )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5093, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5093, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1piox_315_5065, sys1pio )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5065, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5065, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
@@ -2357,26 +2357,26 @@ static MACHINE_CONFIG_DERIVED( sys1pios, sys1pio )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1piosx_315_5099, sys1pios )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5065, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5065, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1piosx_315_spat, sys1pios )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_SPAT, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_SPAT, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1ppisx_315_5064, sys1ppis )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5064, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5064, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys1ppisx_315_5041, sys1ppis )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5041, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5041, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
@@ -2436,25 +2436,25 @@ static MACHINE_CONFIG_DERIVED( sys2x, sys2 )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys2_315_5177, sys2 )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5177, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5177, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys2_315_5176, sys2 )
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5176, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5176, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys2_317_0006, sys2 )
- MCFG_CPU_REPLACE("maincpu", SEGA_317_0006, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_317_0006, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys2_317_0007, sys2 )
- MCFG_CPU_REPLACE("maincpu", SEGA_317_0007, MASTER_CLOCK)
+ MCFG_CPU_REPLACE("maincpu", SEGA_317_0007, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
diff --git a/src/mame/includes/klax.h b/src/mame/includes/klax.h
index dc70f771cd5..cf7f0d8195e 100644
--- a/src/mame/includes/klax.h
+++ b/src/mame/includes/klax.h
@@ -39,5 +39,5 @@ private:
required_device<tilemap_device> m_playfield_tilemap;
required_device<atari_motion_objects_device> m_mob;
- required_ioport m_p1;
+ required_ioport m_p1;
};
diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h
index 6b3fcf7c564..41984596c09 100644
--- a/src/mame/includes/megadriv.h
+++ b/src/mame/includes/megadriv.h
@@ -218,4 +218,3 @@ public:
DECLARE_READ16_MEMBER(tmss_r);
DECLARE_WRITE16_MEMBER(tmss_swap_w);
};
-
diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h
index 3994a818796..bf7acfba103 100644
--- a/src/mame/includes/neogeo.h
+++ b/src/mame/includes/neogeo.h
@@ -173,7 +173,7 @@ protected:
UINT8 m_el_value;
UINT8 m_led1_value;
UINT8 m_led2_value;
-
+
optional_ioport m_dsw;
optional_ioport m_trackx;
optional_ioport m_tracky;
diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h
index 464d10709c2..198e47886fd 100644
--- a/src/mame/includes/segas24.h
+++ b/src/mame/includes/segas24.h
@@ -148,5 +148,3 @@ public:
TIMER_CALLBACK_MEMBER(gground_hack_timer_callback);
emu_timer *m_gground_hack_timer;
};
-
-
diff --git a/src/mame/machine/315-5838_317-0229_comp.cpp b/src/mame/machine/315-5838_317-0229_comp.cpp
index 5f6428c6d2b..9c340e7cc38 100644
--- a/src/mame/machine/315-5838_317-0229_comp.cpp
+++ b/src/mame/machine/315-5838_317-0229_comp.cpp
@@ -5,7 +5,7 @@
315-5838 - Decathlete (ST-V)
317-0229 - Dead or Alive (Model 2A)
317-0229 - Name Club / Name Club Ver 2 (ST-V) (tested as RCDD2 in the service menu!)
- 317-0230 - Winnie The Pooh Vol 2 / 3
+ 317-0230 - Winnie The Pooh Vol 2 / 3
317-0231 - Print Club Love Love / Print Club Love Love Ver 2 (ST-V)
Several Print Club (ST-V) carts have
diff --git a/src/mame/machine/dec_lk201.cpp b/src/mame/machine/dec_lk201.cpp
index e8ebfc1bd6e..ca640dc7add 100644
--- a/src/mame/machine/dec_lk201.cpp
+++ b/src/mame/machine/dec_lk201.cpp
@@ -21,7 +21,7 @@
________|D7 |D6 |D5 |D4 |D3 |D2 |D1 |D0
..KBD17:|[R] |F19 |[R] |F20|PF4|N- | N,| Enter (numpad)
-........| | | | | | NOTE1)
+........| | | | | | NOTE1)
........| |G22 | |G23|E23|D23|C23| A23
--------|----|----|----|---|---|---|---|---
..KBD16:|F18 |PF3 |[R] |N9 |C:D|N6 |N3 |N.
diff --git a/src/mame/machine/intv.cpp b/src/mame/machine/intv.cpp
index 55915b00254..0e5d05071cf 100644
--- a/src/mame/machine/intv.cpp
+++ b/src/mame/machine/intv.cpp
@@ -436,4 +436,3 @@ INTERRUPT_GEN_MEMBER(intv_state::intv_interrupt)
m_stic->screenrefresh();
}
-
diff --git a/src/mame/machine/m3comm.cpp b/src/mame/machine/m3comm.cpp
index 34f9460796a..35a9d1d852b 100644
--- a/src/mame/machine/m3comm.cpp
+++ b/src/mame/machine/m3comm.cpp
@@ -202,7 +202,7 @@ void m3comm_device::device_timer(emu_timer &timer, device_timer_id id, int param
return;
m_commcpu->set_input_line(M68K_IRQ_5, ASSERT_LINE);
- timer.adjust(attotime::from_usec(10000)); // there is it from actually ??????
+ timer.adjust(attotime::from_usec(10000)); // there is it from actually ??????
}
///////////// Internal MMIO
@@ -220,19 +220,19 @@ READ16_MEMBER(m3comm_device::ctrl_r)
WRITE16_MEMBER(m3comm_device::ctrl_w)
{
switch (offset) {
- case 0x00 / 2: // Communication RAM bank switch (flipped in IRQ2 and IRQ5 handlers)
+ case 0x00 / 2: // Communication RAM bank switch (flipped in IRQ2 and IRQ5 handlers)
m_commbank = data;
membank("comm_ram")->set_base(m_ram->pointer() + ((m_commbank & 1) ? 0x10000 : 0));
break;
- case 0x40 / 2: // IRQ 5 ACK
+ case 0x40 / 2: // IRQ 5 ACK
m_commcpu->set_input_line(M68K_IRQ_5, CLEAR_LINE);
break;
- case 0xA0 / 2: // IRQ 2 ACK
+ case 0xA0 / 2: // IRQ 2 ACK
m_commcpu->set_input_line(M68K_IRQ_2, CLEAR_LINE);
break;
- case 0x80 / 2: // LEDs
- case 0xC0 / 2: // possible node unique ID and broadcast flag (7FFF) ????
- case 0xE0 / 2: // unknown, conditionally cleared in IRQ6 (receive complete) handler
+ case 0x80 / 2: // LEDs
+ case 0xC0 / 2: // possible node unique ID and broadcast flag (7FFF) ????
+ case 0xE0 / 2: // unknown, conditionally cleared in IRQ6 (receive complete) handler
break;
default:
logerror("M3COMM CtrlWrite to %04x %04x mask %04x\n", offset * 2, data, mem_mask);
@@ -242,12 +242,12 @@ WRITE16_MEMBER(m3comm_device::ctrl_w)
READ16_MEMBER(m3comm_device::ioregs_r)
{
switch (offset) {
- case 0x00 / 2: // UNK, Model3 host wait it to be NZ then write 0
- // perhaps Model3 IO regs 0-80 mapped not to M68K C0000-80 ?
+ case 0x00 / 2: // UNK, Model3 host wait it to be NZ then write 0
+ // perhaps Model3 IO regs 0-80 mapped not to M68K C0000-80 ?
return 1;
- case 0x10 / 2: // receive result/status
+ case 0x10 / 2: // receive result/status
return 5; // dbg random
- case 0x18 / 2: // transmit result/status
+ case 0x18 / 2: // transmit result/status
return 5; // dbg random
case 0x88 / 2:
return m_status0;
@@ -261,47 +261,47 @@ READ16_MEMBER(m3comm_device::ioregs_r)
WRITE16_MEMBER(m3comm_device::ioregs_w)
{
switch (offset) {
- case 0x14 / 2: // written 80 at data receive enable, 0 then 1 at IRQ6 handler
+ case 0x14 / 2: // written 80 at data receive enable, 0 then 1 at IRQ6 handler
if ((data & 0xFF) != 0x80)
m_commcpu->set_input_line(M68K_IRQ_6, CLEAR_LINE);
- break; // it seems one of these ^v is IRQ6 ON/ACK, another is data transfer enable
+ break; // it seems one of these ^v is IRQ6 ON/ACK, another is data transfer enable
case 0x16 / 2: // written 8C at data receive enable, 0 at IRQ6 handler
if ((data & 0xFF) == 0x8C) {
logerror("M3COMM Receive offs %04x size %04x\n", recv_offset, recv_size);
/*
- if (!m_line_rx.is_open())
- {
- logerror("M3COMM: listen on %s\n", m_localhost);
- m_line_rx.open(m_localhost);
- }
- if (m_line_rx.is_open())
- {
- UINT8 *commram = (UINT8*)membank("comm_ram")->base();
- m_line_rx.read(&commram[recv_offset], recv_size);
- }
+ if (!m_line_rx.is_open())
+ {
+ logerror("M3COMM: listen on %s\n", m_localhost);
+ m_line_rx.open(m_localhost);
+ }
+ if (m_line_rx.is_open())
+ {
+ UINT8 *commram = (UINT8*)membank("comm_ram")->base();
+ m_line_rx.read(&commram[recv_offset], recv_size);
+ }
*/
- m_commcpu->set_input_line(M68K_IRQ_6, ASSERT_LINE); // debug hack
+ m_commcpu->set_input_line(M68K_IRQ_6, ASSERT_LINE); // debug hack
}
break;
- case 0x1A / 2: // written 80 at data transmit enable, 0 at IRQ4 handler
- break; // it seems one of these ^v is IRQ4 ON/ACK, another is data transfer enable
- case 0x1C / 2: // written 8C at data transmit enable, 0 at IRQ4 handler
+ case 0x1A / 2: // written 80 at data transmit enable, 0 at IRQ4 handler
+ break; // it seems one of these ^v is IRQ4 ON/ACK, another is data transfer enable
+ case 0x1C / 2: // written 8C at data transmit enable, 0 at IRQ4 handler
if ((data & 0xFF) == 0x8C) {
logerror("M3COMM Send offs %04x size %04x\n", send_offset, send_size);
/*
- if (!m_line_tx.is_open())
- {
- logerror("M3COMM: connect to %s\n", m_remotehost);
- m_line_tx.open(m_remotehost);
- }
- if (m_line_tx.is_open())
- {
- UINT8 *commram = (UINT8*)membank("comm_ram")->base();
- m_line_tx.write(&commram[send_offset], send_size);
- }
+ if (!m_line_tx.is_open())
+ {
+ logerror("M3COMM: connect to %s\n", m_remotehost);
+ m_line_tx.open(m_remotehost);
+ }
+ if (m_line_tx.is_open())
+ {
+ UINT8 *commram = (UINT8*)membank("comm_ram")->base();
+ m_line_tx.write(&commram[send_offset], send_size);
+ }
*/
}
- m_commcpu->set_input_line(M68K_IRQ_4, ((data & 0xFF) == 0x8C) ? ASSERT_LINE : CLEAR_LINE); // debug hack
+ m_commcpu->set_input_line(M68K_IRQ_4, ((data & 0xFF) == 0x8C) ? ASSERT_LINE : CLEAR_LINE); // debug hack
break;
case 0x40 / 2:
recv_offset = (recv_offset >> 8) | (data << 8);
@@ -334,12 +334,12 @@ WRITE16_MEMBER(m3comm_device::ioregs_w)
READ16_MEMBER(m3comm_device::m3_m68k_ram_r)
{
- UINT16 value = m68k_ram[offset]; // FIXME endian
+ UINT16 value = m68k_ram[offset]; // FIXME endian
return swapb16(value);
}
WRITE16_MEMBER(m3comm_device::m3_m68k_ram_w)
{
- m68k_ram[offset] = swapb16(data); // FIXME endian
+ m68k_ram[offset] = swapb16(data); // FIXME endian
}
READ8_MEMBER(m3comm_device::m3_comm_ram_r)
{
@@ -372,27 +372,27 @@ READ16_MEMBER(m3comm_device::naomi_r)
{
switch (offset)
{
- case 0: // 5F7018
+ case 0: // 5F7018
return naomi_control;
- case 1: // 5F701C
+ case 1: // 5F701C
return naomi_offset;
- case 2: // 5F7020
+ case 2: // 5F7020
{
-// logerror("M3COMM read @ %08x\n", (naomi_control << 16) | naomi_offset);
+// logerror("M3COMM read @ %08x\n", (naomi_control << 16) | naomi_offset);
UINT16 value;
if (naomi_control & 1)
- value = m68k_ram[naomi_offset / 2]; // FIXME endian
+ value = m68k_ram[naomi_offset / 2]; // FIXME endian
else {
UINT16 *commram = (UINT16*)membank("comm_ram")->base();
- value = commram[naomi_offset / 2]; // FIXME endian
+ value = commram[naomi_offset / 2]; // FIXME endian
}
naomi_offset += 2;
return value;
}
- case 3: // 5F7024
+ case 3: // 5F7024
return m_status0;
- case 4: // 5F7028
+ case 4: // 5F7028
return m_status1;
default:
return 0;
@@ -402,7 +402,7 @@ WRITE16_MEMBER(m3comm_device::naomi_w)
{
switch (offset)
{
- case 0: // 5F7018
+ case 0: // 5F7018
// bit 0: access RAM is 0 - communication RAM / 1 - M68K RAM
// bit 1: comm RAM bank ??? (not really used)
// bit 5: M68K Reset
@@ -410,27 +410,27 @@ WRITE16_MEMBER(m3comm_device::naomi_w)
// bit 7: ???
// bit 14: G1 DMA bus master 0 - active / 1 - disabled
// bit 15: 0 - enable / 1 - disable this device ???
-// logerror("M3COMM control write %04x\n", data);
+// logerror("M3COMM control write %04x\n", data);
naomi_control = data;
m_commcpu->set_input_line(INPUT_LINE_RESET, (naomi_control & 0x20) ? CLEAR_LINE : ASSERT_LINE);
break;
- case 1: // 5F701C
+ case 1: // 5F701C
naomi_offset = data;
break;
- case 2: // 5F7020
-// logerror("M3COMM write @ %08x %04x\n", (naomi_control << 16) | naomi_offset, data);
+ case 2: // 5F7020
+// logerror("M3COMM write @ %08x %04x\n", (naomi_control << 16) | naomi_offset, data);
if (naomi_control & 1)
- m68k_ram[naomi_offset / 2] = data; // FIXME endian
+ m68k_ram[naomi_offset / 2] = data; // FIXME endian
else {
UINT16 *commram = (UINT16*)membank("comm_ram")->base();
- commram[naomi_offset / 2] = data; // FIXME endian
+ commram[naomi_offset / 2] = data; // FIXME endian
}
naomi_offset += 2;
break;
- case 3: // 5F7024
+ case 3: // 5F7024
m_status0 = data;
break;
- case 4: // 5F7028
+ case 4: // 5F7028
m_status1 = data;
break;
}
diff --git a/src/mame/machine/model1.cpp b/src/mame/machine/model1.cpp
index eeacab5cc57..6b8424ed200 100644
--- a/src/mame/machine/model1.cpp
+++ b/src/mame/machine/model1.cpp
@@ -268,11 +268,11 @@ TGP_FUNCTION( model1_state::triangle_normal )
nn = 0;
else
nn = 1/nn;
-
+
nx *= nn;
ny *= nn;
nz *= nn;
-
+
logerror("TGP triangle_normal %f, %f, %f, %f, %f, %f, %f, %f, %f (%x)\n", p1x, p1y, p1z, p2x, p2y,p2z, p3x, p3y, p3z, m_pushpc);
fifoout_push_f(nx);
fifoout_push_f(ny);
diff --git a/src/mame/machine/n64.cpp b/src/mame/machine/n64.cpp
index 734f76359ba..0dca7b5f877 100644
--- a/src/mame/machine/n64.cpp
+++ b/src/mame/machine/n64.cpp
@@ -2157,7 +2157,7 @@ WRITE32_MEMBER( n64_periphs::si_reg_w )
// PIF RAM -> RDRAM
if(si_status & 1)
{
- si_status |= 8; //DMA Error, overlapping request
+ si_status |= 8; //DMA Error, overlapping request
return; // SI Busy, ignore request
}
si_pif_addr = data;
@@ -2171,7 +2171,7 @@ WRITE32_MEMBER( n64_periphs::si_reg_w )
// RDRAM -> PIF RAM
if(si_status & 1)
{
- si_status |= 8; //DMA Error, overlapping request
+ si_status |= 8; //DMA Error, overlapping request
return; // SI Busy, ignore request
}
si_pif_addr = data;
diff --git a/src/mame/machine/segacrp2_device.cpp b/src/mame/machine/segacrp2_device.cpp
index 5c0db860879..729a363e95e 100644
--- a/src/mame/machine/segacrp2_device.cpp
+++ b/src/mame/machine/segacrp2_device.cpp
@@ -215,7 +215,7 @@ void sega_315_5162_device::decrypt()
sega_315_5178_device::sega_315_5178_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : segacrp2_z80_device(mconfig, tag, owner, clock) {}
void sega_315_5178_device::decrypt()
-{ // 315-5178
+{ // 315-5178
static const UINT8 xor_table[128] =
{
0x00,0x55,0x45,0x05,0x11,0x41,0x01,0x14,0x44,0x50,0x10,
@@ -263,7 +263,7 @@ void sega_315_5178_device::decrypt()
sega_315_5179_device::sega_315_5179_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : segacrp2_z80_device(mconfig, tag, owner, clock) {}
void sega_315_5179_device::decrypt()
-{ // 315-5179
+{ // 315-5179
static const UINT8 xor_table[128] =
{
0x00,0x45,0x41,0x14,0x10,0x55,0x51,0x01,0x04,0x40,0x45,0x11,0x14,0x50,
@@ -345,7 +345,7 @@ void _sega_decode_317(UINT8 *rom, UINT8 *decrypted, int shift)
sega_317_0004_device::sega_317_0004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : segacrp2_z80_device(mconfig, tag, owner, clock) {}
void sega_317_0004_device::decrypt()
-{ // 317-0004
+{ // 317-0004
_sega_decode_317(memregion(tag())->base(), (UINT8*)memshare(m_decrypted_tag)->ptr(), 0);
}
@@ -353,19 +353,19 @@ void sega_317_0004_device::decrypt()
sega_317_0005_device::sega_317_0005_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : segacrp2_z80_device(mconfig, tag, owner, clock) {}
void sega_317_0005_device::decrypt()
-{ // 317-0005
+{ // 317-0005
_sega_decode_317(memregion(tag())->base(), (UINT8*)memshare(m_decrypted_tag)->ptr(), 1);
}
sega_317_0006_device::sega_317_0006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : segacrp2_z80_device(mconfig, tag, owner, clock) {}
void sega_317_0006_device::decrypt()
-{ // 317-0006
+{ // 317-0006
_sega_decode_317(memregion(tag())->base(), (UINT8*)memshare(m_decrypted_tag)->ptr(), 2);
}
sega_317_0007_device::sega_317_0007_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : segacrp2_z80_device(mconfig, tag, owner, clock) {}
void sega_317_0007_device::decrypt()
-{ // 317-0006
+{ // 317-0006
_sega_decode_317(memregion(tag())->base(), (UINT8*)memshare(m_decrypted_tag)->ptr(), 3);
-} \ No newline at end of file
+}
diff --git a/src/mame/machine/segacrp2_device.h b/src/mame/machine/segacrp2_device.h
index f6e90820209..dca1c0aeae2 100644
--- a/src/mame/machine/segacrp2_device.h
+++ b/src/mame/machine/segacrp2_device.h
@@ -120,4 +120,3 @@ extern const device_type SEGA_317_0007;
#endif /// __SEGACRP2_Z80__
-
diff --git a/src/mame/machine/segacrpt_device.cpp b/src/mame/machine/segacrpt_device.cpp
index c7b8395fb43..ba2da69d7fd 100644
--- a/src/mame/machine/segacrpt_device.cpp
+++ b/src/mame/machine/segacrpt_device.cpp
@@ -306,7 +306,7 @@ void segacrpt_z80_device::device_reset()
{
m_decrypted_ptr = (UINT8*)memshare(m_decrypted_tag)->ptr();
}
-
+
if (m_region_ptr == nullptr)
{
m_region_ptr = (UINT8*)memregion(tag())->base();
@@ -944,7 +944,6 @@ void sega_315_5061_device::decrypt()
sega_315_5018_device::sega_315_5018_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : segacrpt_z80_device(mconfig, tag, owner, clock) {}
void sega_315_5018_device::decrypt()
{
-
static const UINT8 convtable[32][4] =
{
/* opcode data address */
@@ -975,7 +974,6 @@ void sega_315_5018_device::decrypt()
sega_315_5010_device::sega_315_5010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : segacrpt_z80_device(mconfig, tag, owner, clock) {}
void sega_315_5010_device::decrypt()
{
-
static const UINT8 convtable[32][4] =
{
/* opcode data address */
@@ -1065,7 +1063,6 @@ void sega_315_5028_device::decrypt()
sega_315_5084_device::sega_315_5084_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : segacrpt_z80_device(mconfig, tag, owner, clock) {}
void sega_315_5084_device::decrypt()
{
-
static const UINT8 convtable[32][4] =
{
/* opcode data address */
diff --git a/src/mame/machine/segacrpt_device.h b/src/mame/machine/segacrpt_device.h
index 0c4491f5c3c..12b057918b1 100644
--- a/src/mame/machine/segacrpt_device.h
+++ b/src/mame/machine/segacrpt_device.h
@@ -293,4 +293,3 @@ extern const device_type SEGA_315_5084;
#endif /// __SEGACRPT_Z80__
-
diff --git a/src/mame/machine/xbox.cpp b/src/mame/machine/xbox.cpp
index 7a428d6f65a..3698688ea2f 100644
--- a/src/mame/machine/xbox.cpp
+++ b/src/mame/machine/xbox.cpp
@@ -637,7 +637,7 @@ WRITE32_MEMBER(ohci_usb_controller::write)
}
if (offset >= HcRhPortStatus1) {
int port = offset - HcRhPortStatus1 + 1; // port 0 not used
- // bit 0 R:CurrentConnectStatus W:ClearPortEnable: 1 clears PortEnableStatus
+ // bit 0 R:CurrentConnectStatus W:ClearPortEnable: 1 clears PortEnableStatus
if (data & CCS) {
ohcist.hc_regs[offset] &= ~PES;
ohcist.address[ohcist.ports[port].address].port = -1;
@@ -790,7 +790,7 @@ void ohci_usb_controller::device_timer(emu_timer &timer, device_timer_id id, int
pid = InPid; // in
R = (int)ohcist.framenumber - (int)ohcist.isochronous_transfer_descriptor.sf;
//if ((R < 0) || (R > (int)ohcist.isochronous_transfer_descriptor.fc))
- // ; // greater than fc should be an error
+ // ; // greater than fc should be an error
if (R == (int)ohcist.isochronous_transfer_descriptor.fc)
a = ohcist.isochronous_transfer_descriptor.be;
else {
@@ -1213,11 +1213,11 @@ void ohci_usb_controller::usb_ohci_plug(int port, ohci_function_device *function
void ohci_usb_controller::usb_ohci_interrupts()
{
- if (((ohcist.hc_regs[HcInterruptStatus] & ohcist.hc_regs[HcInterruptEnable]) != 0) && ((ohcist.hc_regs[HcInterruptEnable] & MasterInterruptEnable) != 0))
+ if (((ohcist.hc_regs[HcInterruptStatus] & ohcist.hc_regs[HcInterruptEnable]) != 0) && ((ohcist.hc_regs[HcInterruptEnable] & MasterInterruptEnable) != 0))
{
//pic8259_1->ir1_w(1);
m_interrupt_handler(1);
- } else
+ } else
{
//pic8259_1->ir1_w(0);
m_interrupt_handler(0);
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 5d0a7e6ef97..6036498afb6 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -31,7 +31,7 @@
@source:1945kiii.cpp
1945kiii // (c) 2000 Oriental
-1945kiiio // (c) 1999 Oriental
+1945kiiio // (c) 1999 Oriental
flagrall // ?
@source:20pacgal.cpp
@@ -2457,7 +2457,7 @@ gghost // (c) 1984
gimeabrk // (c) 1985
grudge // prototype - Bally/Midway
hattrick // (c) 1984
-teamht //
+teamht //
minigolf // (c) 1985
minigolf2 // (c) 1985
nametune // (c) 1986
@@ -2566,7 +2566,7 @@ bbcbc // 1985 BBC Bridge Companion
bbusters // A9003 'BB' (c) 1989
bbustersu // A9003 'BB' (c) 1989
bbustersua // A9003 'BB' (c) 1989
-bbustersj //
+bbustersj //
mechatt // A8002 'MA' (c) 1989
mechattj // A8002 'MA' (c) 1989
mechattu // A8002 'MA' (c) 1989
@@ -10246,7 +10246,7 @@ crimfghtj // GX821 (c) 1989 (Japan)
@source:crospang.cpp
bestri // (c) F2 System
-bestria //
+bestria //
crospang // (c) 1998 F2 System
heuksun // (c) 1998 Oksan / F2 System
@@ -12440,7 +12440,7 @@ snowboara // (c) 1996 - Ref 960419/1
touchgo // (c) 1995 - Ref 950906
touchgoe // (c) 1995 - Ref 950510-1
touchgon // (c) 1995 - Ref 950906
-touchgok // (c) 1995 - Ref 950510-1
+touchgok // (c) 1995 - Ref 950510-1
wrally2 // (c) 1995 - Ref 950510
@source:gaelco3d.cpp
@@ -12597,7 +12597,7 @@ monsterz // (c) 1982 Nihon (Arcade TV Game List - P.102,
moonal2 // [1980] Nichibutsu
moonal2b // [1980] Nichibutsu
moonaln // [Nichibutsu] (Karateco license) or hack
-kamikazp // bootleg (Potomac Games)
+kamikazp // bootleg (Potomac Games)
mooncmw // bootleg
mooncptc // bootleg (Petaco S.A.)
mooncreg // bootleg
@@ -17181,7 +17181,7 @@ leaguemn // (c) 1993 Irem (Japan)
lethalth // (c) 1991 Irem (World)
majtitl2 // (c) 1992 Irem (World)
majtitl2a //
-majtitl2b //
+majtitl2b //
majtitl2j // (c) 1992 Irem (Japan)
mysticri // (c) 1992 Irem (World)
mysticrib // bootleg?
@@ -17239,7 +17239,7 @@ macse30 // 1989 Apple Macintosh SE/30
macsefd // 1988 Apple Macintosh SE (FDHD)
pmac6100 // 1993 Apple Power Macintosh 6100
unitron // 1985 Unitron
-utrn1024 // 1986 Unitron 1024
+utrn1024 // 1986 Unitron 1024
@source:macpci.cpp
pippin //
@@ -19929,7 +19929,7 @@ mkla3 // (c) 1992 Midway
mkla4 // (c) 1992 Midway
mknifty // hack
mknifty666 // hack
-mkrep // hack
+mkrep // hack
mkprot4 // (c) 1992 Midway
mkprot8 // (c) 1992 Midway
mkprot9 // (c) 1992 Midway
@@ -27705,7 +27705,7 @@ cosmogng // (c) 1991 (US)
cosmogngj // (c) 1991 (Japan)
dirtfoxj // (c) 1989 (Japan)
dsaber // (c) 1990
-dsabera //
+dsabera //
dsaberj // (c) 1990 (Japan)
finalap2 // 90.8 Final Lap 2
finalap2j // 90.8 Final Lap 2 (Japan)
@@ -28636,7 +28636,7 @@ rdaction // UPL-87003?(c) 1987 + World Games license
robokid // UPL-88013 (c) 1988
robokidj // UPL-88013 (c) 1988
robokidj2 // UPL-88013 (c) 1988
-robokidj3 //
+robokidj3 //
@source:ninjaw.cpp
darius2 // C07 (c) 1989 Taito Corporation (Japan)
@@ -28909,7 +28909,7 @@ opwolfa // B20 (c) 1987 Taito Corporation Japan (World)
opwolfb // bootleg
opwolfj // B20 (c) 1987 Taito Corporation (Japan)
opwolfu // B20 (c) 1987 Taito America Corporation (US)
-opwolfp // prototype?
+opwolfp // prototype?
@source:orao.cpp
orao //
@@ -29206,7 +29206,7 @@ sicpc1605 //
ssam88s //
sx16 // Sanyo SX-16
zdsupers //
-ncrpc4i // NCR PC4i
+ncrpc4i // NCR PC4i
@source:pc100.cpp
pc100 //
@@ -29966,7 +29966,7 @@ ddpdoja //
ddpdojb //
ddpdojblk //
ddpdojblka //
-ddpdojblkbl //
+ddpdojblkbl //
dmnfrnt // (c) 2002 Demon Front
dmnfrnta //
dmnfrntb //
@@ -29984,7 +29984,7 @@ dw2v100x //
dwex // (c) 1998 Dragon World 3 EX
dwpc // (c) 2001 Dragon World Pretty Chance
espgal // (c) 2003 Espgaluda
-espgalbl //
+espgalbl //
happy6 // (c) 2004 Happy 6
happy6101 //
ket // (c) 2002 Ketsui
@@ -29997,7 +29997,7 @@ ketarr151 // hack
ketarrf // hack
ketarrs15 // hack
ketarrs151 // hack
-ketb //
+ketb //
ketbl //
killbld // (c) 1998 The Killing Blade
killbld104 //
@@ -30273,7 +30273,7 @@ pc_moglf // (c) 1991 Nintendo
pc_mtoid // (c) 1986 Nintendo
pc_ngai2 // (c) 1990 Tecmo (Nintendo of America license)
pc_ngai3 // (c) 1991 Tecmo (Nintendo of America license)
-pc_ttoon //
+pc_ttoon //
pc_ngaid // (c) 1989 Tecmo (Nintendo of America license)
pc_pinbt // (c) 1988 Rare (Nintendo of America license)
pc_pwbld // (c) 1991 Taito (Nintendo of America license)
@@ -31040,7 +31040,7 @@ raidendxa2 // (c) 1994 Seibu Kaihatsu + Metrotainment licen
raidendxch //
raidendxg // (c) 1994 Seibu Kaihatsu + Tuning license
raidendxj // (c) 1994 Seibu Kaihatsu
-raidendxja // (c) 1994 Seibu Kaihatsu
+raidendxja // (c) 1994 Seibu Kaihatsu
raidendxk // (c) 1994 Seibu Kaihatsu
raidendxnl // (c) 1994 Seibu Kaihatsu
raidendxu // (c) 1994 Seibu Kaihatsu + Fabtek license
@@ -33805,12 +33805,12 @@ nclubv3 // 1997.07 Name Club Ver. 3
othellos // 1998.07 Othello Shiyouyo (Success)
pblbeach // 1996.03 Pebble Beach the Great Shot (T&E Soft)
pclb2elk // 1997.07 Print Club Custom
-pckobe99 // Print Club Custom 3
+pckobe99 // Print Club Custom 3
pclove //
pclove2 //
pclub2 // 1997.09 Print Club 2
pclub26w //
-pclub26wa //
+pclub26wa //
pclub27s //
pclub2fc // 1997.04 Print Club 2 Felix The Cat
pclub2kc // 1997.02 Print Club Kome Kome Club
@@ -33821,17 +33821,17 @@ pclub2wb //
pclubol // 1998.07 Print Club Olive
pclubor // 1999.11 Print Club Goukakenran
pclubpok // 1999.11 Print Club Pokemon
-pcpooh2 //
-pcpooh3 //
+pcpooh2 //
+pcpooh3 //
pclubyo2 //
-prc28su // Vol 8. Summer 97
-prc29au // Vol 9. Autumn 97
+prc28su // Vol 8. Summer 97
+prc29au // Vol 9. Autumn 97
prc297wi // 1997.10 Print Club 2 '97 Winter Ver
prc297wia //
prc298au // 1998.08 Print Club 2 '98 Autumn Ver
prc298sp // 1997.10 Print Club 2 '98 Spring Ver
prc298su //
-prc2ksu // Print Club Summer 2000
+prc2ksu // Print Club Summer 2000
prikura // 1996.10 Prikura Daisakusen (Atlus)
puyosun // 1996.12 Puyo Puyo SUN (Compile)
rsgun // 1998.05 Radient Silver Gun (Treasure)
@@ -34202,7 +34202,7 @@ wboy4 // 834-5984 (c) 1986 + Escape license (S1)
wboy5 // 834-5984 (c) 1986 + Escape license (S1)
wboyo // 834-5984 (c) 1986 + Escape license (S1)
wboysys2 // 834-5984 (c) 1986 + Escape license (S1)
-wboysys2a //
+wboysys2a //
wboyu // 834-5753 (? maybe a conversion) (c) 1986 + Escape license (S1)
wboyub // bootleg of wboyu
wmatch // (c) 1984 (S1)
diff --git a/src/mame/nl.lst b/src/mame/nl.lst
index 0b36b3e4e6f..50d5aa2138c 100644
--- a/src/mame/nl.lst
+++ b/src/mame/nl.lst
@@ -53,4 +53,3 @@ spelunkr // (c) 1985 licensed from Broderbund
spelunkrj // (c) 1985 licensed from Broderbund
yanchamr // (c) 1986 (Japan)
youjyudn // (c) 1986 (Japan)
-
diff --git a/src/mame/video/apple2.cpp b/src/mame/video/apple2.cpp
index 61a4dbe3488..787f9ff8f35 100644
--- a/src/mame/video/apple2.cpp
+++ b/src/mame/video/apple2.cpp
@@ -827,7 +827,7 @@ void a2_video_device::plot_text_character_orig(bitmap_ind16 &bitmap, int xpos, i
bg = i;
}
}
- else if (code < 0x40) // inverse: flip FG and BG
+ else if (code < 0x40) // inverse: flip FG and BG
{
i = fg;
fg = bg;
@@ -868,7 +868,7 @@ void a2_video_device::plot_text_character_jplus(bitmap_ind16 &bitmap, int xpos,
bg = i;
}
}
- else if (code < 0x40) // inverse: flip FG and BG
+ else if (code < 0x40) // inverse: flip FG and BG
{
i = fg;
fg = bg;
diff --git a/src/mame/video/deco16ic.cpp b/src/mame/video/deco16ic.cpp
index 97ece12b825..4bb4c37f0c6 100644
--- a/src/mame/video/deco16ic.cpp
+++ b/src/mame/video/deco16ic.cpp
@@ -865,20 +865,20 @@ void deco16ic_device::pf_update( const UINT16 *rowscroll_1_ptr, const UINT16 *ro
void deco16ic_device::print_debug_info(bitmap_ind16 &bitmap)
{
-/* char buf[64*5];
+/* char buf[64*5];
- if (machine().input().code_pressed(KEYCODE_O))
- return;
+ if (machine().input().code_pressed(KEYCODE_O))
+ return;
- if (m_pf12_control)
- {
- sprintf(buf,"%04X %04X %04X %04X\n", m_pf12_control[0], m_pf12_control[1], m_pf12_control[2], m_pf12_control[3]);
- sprintf(&buf[strlen(buf)],"%04X %04X %04X %04X\n", m_pf12_control[4], m_pf12_control[5], m_pf12_control[6], m_pf12_control[7]);
- }
- else
- sprintf(buf, "\n\n");
+ if (m_pf12_control)
+ {
+ sprintf(buf,"%04X %04X %04X %04X\n", m_pf12_control[0], m_pf12_control[1], m_pf12_control[2], m_pf12_control[3]);
+ sprintf(&buf[strlen(buf)],"%04X %04X %04X %04X\n", m_pf12_control[4], m_pf12_control[5], m_pf12_control[6], m_pf12_control[7]);
+ }
+ else
+ sprintf(buf, "\n\n");
- machine().ui().draw_text(&machine().render().ui_container(), buf, 60, 40);*/
+ machine().ui().draw_text(&machine().render().ui_container(), buf, 60, 40);*/
}
/*****************************************************************************************/
diff --git a/src/mame/video/dynduke.cpp b/src/mame/video/dynduke.cpp
index f9b9dea6b03..83005fa25c0 100644
--- a/src/mame/video/dynduke.cpp
+++ b/src/mame/video/dynduke.cpp
@@ -176,7 +176,7 @@ void dynduke_state::draw_background(bitmap_ind16 &bitmap, const rectangle &clipr
scrolly = ((m_scroll_ram[0x01]&0x30)<<4)+((m_scroll_ram[0x02]&0x7f)<<1)+((m_scroll_ram[0x02]&0x80)>>7);
scrollx = ((m_scroll_ram[0x09]&0x30)<<4)+((m_scroll_ram[0x0a]&0x7f)<<1)+((m_scroll_ram[0x0a]&0x80)>>7);
-
+
if (flip_screen())
{
scrolly = 256 - scrolly;
diff --git a/src/mame/video/namcos22.cpp b/src/mame/video/namcos22.cpp
index ddd733a3313..93a70616b81 100644
--- a/src/mame/video/namcos22.cpp
+++ b/src/mame/video/namcos22.cpp
@@ -1978,7 +1978,7 @@ void namcos22_state::namcos22_mix_text_layer(screen_device &screen, bitmap_rgb32
for (int x = cliprect.min_x; x <= cliprect.max_x; x++)
{
UINT32 pixel = dest[x];
-
+
// skip if transparent or under poly
if (pri[x] == 2)
{
diff --git a/src/mame/video/ssv.cpp b/src/mame/video/ssv.cpp
index 0eaf75a120d..d27a20f5027 100644
--- a/src/mame/video/ssv.cpp
+++ b/src/mame/video/ssv.cpp
@@ -928,13 +928,13 @@ void ssv_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect)
}
}
-// #ifdef MAME_DEBUG
-// if (machine().input().code_pressed(KEYCODE_Z)) /* Display some info on each sprite */
-// { char buf[30];
-// sprintf(buf, "%02X",/*(s2[2] & ~0x3ff)>>8*/mode>>8);
-// machine().ui().draw_text(&machine().render().ui_container(), buf, sx, sy);
-// }
-// #endif
+// #ifdef MAME_DEBUG
+// if (machine().input().code_pressed(KEYCODE_Z)) /* Display some info on each sprite */
+// { char buf[30];
+// sprintf(buf, "%02X",/*(s2[2] & ~0x3ff)>>8*/mode>>8);
+// machine().ui().draw_text(&machine().render().ui_container(), buf, sx, sy);
+// }
+// #endif
} /* sprite type */
diff --git a/src/mame/video/taito_f3.cpp b/src/mame/video/taito_f3.cpp
index 9e354dfdd07..a7d1a7899e7 100644
--- a/src/mame/video/taito_f3.cpp
+++ b/src/mame/video/taito_f3.cpp
@@ -326,75 +326,75 @@ pri_alp_bitmap
void taito_f3_state::print_debug_info(bitmap_rgb32 &bitmap)
{
-/* UINT16 *f3_line_ram = m_f3_line_ram.get();
- int l[16];
- char buf[64*16];
- char *bufptr = buf;
-
- bufptr += sprintf(bufptr,"%04X %04X %04X %04X\n",m_f3_control_0[0]>>6,m_f3_control_0[1]>>6,m_f3_control_0[2]>>6,m_f3_control_0[3]>>6);
- bufptr += sprintf(bufptr,"%04X %04X %04X %04X\n",m_f3_control_0[4]>>7,m_f3_control_0[5]>>7,m_f3_control_0[6]>>7,m_f3_control_0[7]>>7);
- bufptr += sprintf(bufptr,"%04X %04X %04X %04X\n",m_f3_control_1[0],m_f3_control_1[1],m_f3_control_1[2],m_f3_control_1[3]);
- bufptr += sprintf(bufptr,"%04X %04X %04X %04X\n",m_f3_control_1[4],m_f3_control_1[5],m_f3_control_1[6],m_f3_control_1[7]);
-
- bufptr += sprintf(bufptr,"%04X %04X %04X %04X %04X %04X %04X %04X\n",m_spriteram16_buffered[0],m_spriteram16_buffered[1],m_spriteram16_buffered[2],m_spriteram16_buffered[3],m_spriteram16_buffered[4],m_spriteram16_buffered[5],m_spriteram16_buffered[6],m_spriteram16_buffered[7]);
- bufptr += sprintf(bufptr,"%04X %04X %04X %04X %04X %04X %04X %04X\n",m_spriteram16_buffered[8],m_spriteram16_buffered[9],m_spriteram16_buffered[10],m_spriteram16_buffered[11],m_spriteram16_buffered[12],m_spriteram16_buffered[13],m_spriteram16_buffered[14],m_spriteram16_buffered[15]);
- bufptr += sprintf(bufptr,"%04X %04X %04X %04X %04X %04X %04X %04X\n",m_spriteram16_buffered[16],m_spriteram16_buffered[17],m_spriteram16_buffered[18],m_spriteram16_buffered[19],m_spriteram16_buffered[20],m_spriteram16_buffered[21],m_spriteram16_buffered[22],m_spriteram16_buffered[23]);
-
- l[0]=f3_line_ram[0x0040*2]&0xffff;
- l[1]=f3_line_ram[0x00c0*2]&0xffff;
- l[2]=f3_line_ram[0x0140*2]&0xffff;
- l[3]=f3_line_ram[0x01c0*2]&0xffff;
- bufptr += sprintf(bufptr,"Ctr1: %04x %04x %04x %04x\n",l[0],l[1],l[2],l[3]);
-
- l[0]=f3_line_ram[0x0240*2]&0xffff;
- l[1]=f3_line_ram[0x02c0*2]&0xffff;
- l[2]=f3_line_ram[0x0340*2]&0xffff;
- l[3]=f3_line_ram[0x03c0*2]&0xffff;
- bufptr += sprintf(bufptr,"Ctr2: %04x %04x %04x %04x\n",l[0],l[1],l[2],l[3]);
-
- l[0]=f3_line_ram[0x2c60*2]&0xffff;
- l[1]=f3_line_ram[0x2ce0*2]&0xffff;
- l[2]=f3_line_ram[0x2d60*2]&0xffff;
- l[3]=f3_line_ram[0x2de0*2]&0xffff;
- bufptr += sprintf(bufptr,"Pri : %04x %04x %04x %04x\n",l[0],l[1],l[2],l[3]);
-
- l[0]=f3_line_ram[0x2060*2]&0xffff;
- l[1]=f3_line_ram[0x20e0*2]&0xffff;
- l[2]=f3_line_ram[0x2160*2]&0xffff;
- l[3]=f3_line_ram[0x21e0*2]&0xffff;
- bufptr += sprintf(bufptr,"Zoom: %04x %04x %04x %04x\n",l[0],l[1],l[2],l[3]);
-
- l[0]=f3_line_ram[0x2860*2]&0xffff;
- l[1]=f3_line_ram[0x28e0*2]&0xffff;
- l[2]=f3_line_ram[0x2960*2]&0xffff;
- l[3]=f3_line_ram[0x29e0*2]&0xffff;
- bufptr += sprintf(bufptr,"Line: %04x %04x %04x %04x\n",l[0],l[1],l[2],l[3]);
-
- l[0]=f3_line_ram[0x1c60*2]&0xffff;
- l[1]=f3_line_ram[0x1ce0*2]&0xffff;
- l[2]=f3_line_ram[0x1d60*2]&0xffff;
- l[3]=f3_line_ram[0x1de0*2]&0xffff;
- bufptr += sprintf(bufptr,"Sprt: %04x %04x %04x %04x\n",l[0],l[1],l[2],l[3]);
-
- l[0]=f3_line_ram[0x1860*2]&0xffff;
- l[1]=f3_line_ram[0x18e0*2]&0xffff;
- l[2]=f3_line_ram[0x1960*2]&0xffff;
- l[3]=f3_line_ram[0x19e0*2]&0xffff;
- bufptr += sprintf(bufptr,"Pivt: %04x %04x %04x %04x\n",l[0],l[1],l[2],l[3]);
-
- l[0]=f3_line_ram[0x1060*2]&0xffff;
- l[1]=f3_line_ram[0x10e0*2]&0xffff;
- l[2]=f3_line_ram[0x1160*2]&0xffff;
- l[3]=f3_line_ram[0x11e0*2]&0xffff;
- bufptr += sprintf(bufptr,"Colm: %04x %04x %04x %04x\n",l[0],l[1],l[2],l[3]);
-
- l[0]=f3_line_ram[0x1460*2]&0xffff;
- l[1]=f3_line_ram[0x14e0*2]&0xffff;
- l[2]=f3_line_ram[0x1560*2]&0xffff;
- l[3]=f3_line_ram[0x15e0*2]&0xffff;
- bufptr += sprintf(bufptr,"5000: %04x %04x %04x %04x\n",l[0],l[1],l[2],l[3]);
-
- machine().ui().draw_text(&machine().render().ui_container(), buf, 60, 40);*/
+/* UINT16 *f3_line_ram = m_f3_line_ram.get();
+ int l[16];
+ char buf[64*16];
+ char *bufptr = buf;
+
+ bufptr += sprintf(bufptr,"%04X %04X %04X %04X\n",m_f3_control_0[0]>>6,m_f3_control_0[1]>>6,m_f3_control_0[2]>>6,m_f3_control_0[3]>>6);
+ bufptr += sprintf(bufptr,"%04X %04X %04X %04X\n",m_f3_control_0[4]>>7,m_f3_control_0[5]>>7,m_f3_control_0[6]>>7,m_f3_control_0[7]>>7);
+ bufptr += sprintf(bufptr,"%04X %04X %04X %04X\n",m_f3_control_1[0],m_f3_control_1[1],m_f3_control_1[2],m_f3_control_1[3]);
+ bufptr += sprintf(bufptr,"%04X %04X %04X %04X\n",m_f3_control_1[4],m_f3_control_1[5],m_f3_control_1[6],m_f3_control_1[7]);
+
+ bufptr += sprintf(bufptr,"%04X %04X %04X %04X %04X %04X %04X %04X\n",m_spriteram16_buffered[0],m_spriteram16_buffered[1],m_spriteram16_buffered[2],m_spriteram16_buffered[3],m_spriteram16_buffered[4],m_spriteram16_buffered[5],m_spriteram16_buffered[6],m_spriteram16_buffered[7]);
+ bufptr += sprintf(bufptr,"%04X %04X %04X %04X %04X %04X %04X %04X\n",m_spriteram16_buffered[8],m_spriteram16_buffered[9],m_spriteram16_buffered[10],m_spriteram16_buffered[11],m_spriteram16_buffered[12],m_spriteram16_buffered[13],m_spriteram16_buffered[14],m_spriteram16_buffered[15]);
+ bufptr += sprintf(bufptr,"%04X %04X %04X %04X %04X %04X %04X %04X\n",m_spriteram16_buffered[16],m_spriteram16_buffered[17],m_spriteram16_buffered[18],m_spriteram16_buffered[19],m_spriteram16_buffered[20],m_spriteram16_buffered[21],m_spriteram16_buffered[22],m_spriteram16_buffered[23]);
+
+ l[0]=f3_line_ram[0x0040*2]&0xffff;
+ l[1]=f3_line_ram[0x00c0*2]&0xffff;
+ l[2]=f3_line_ram[0x0140*2]&0xffff;
+ l[3]=f3_line_ram[0x01c0*2]&0xffff;
+ bufptr += sprintf(bufptr,"Ctr1: %04x %04x %04x %04x\n",l[0],l[1],l[2],l[3]);
+
+ l[0]=f3_line_ram[0x0240*2]&0xffff;
+ l[1]=f3_line_ram[0x02c0*2]&0xffff;
+ l[2]=f3_line_ram[0x0340*2]&0xffff;
+ l[3]=f3_line_ram[0x03c0*2]&0xffff;
+ bufptr += sprintf(bufptr,"Ctr2: %04x %04x %04x %04x\n",l[0],l[1],l[2],l[3]);
+
+ l[0]=f3_line_ram[0x2c60*2]&0xffff;
+ l[1]=f3_line_ram[0x2ce0*2]&0xffff;
+ l[2]=f3_line_ram[0x2d60*2]&0xffff;
+ l[3]=f3_line_ram[0x2de0*2]&0xffff;
+ bufptr += sprintf(bufptr,"Pri : %04x %04x %04x %04x\n",l[0],l[1],l[2],l[3]);
+
+ l[0]=f3_line_ram[0x2060*2]&0xffff;
+ l[1]=f3_line_ram[0x20e0*2]&0xffff;
+ l[2]=f3_line_ram[0x2160*2]&0xffff;
+ l[3]=f3_line_ram[0x21e0*2]&0xffff;
+ bufptr += sprintf(bufptr,"Zoom: %04x %04x %04x %04x\n",l[0],l[1],l[2],l[3]);
+
+ l[0]=f3_line_ram[0x2860*2]&0xffff;
+ l[1]=f3_line_ram[0x28e0*2]&0xffff;
+ l[2]=f3_line_ram[0x2960*2]&0xffff;
+ l[3]=f3_line_ram[0x29e0*2]&0xffff;
+ bufptr += sprintf(bufptr,"Line: %04x %04x %04x %04x\n",l[0],l[1],l[2],l[3]);
+
+ l[0]=f3_line_ram[0x1c60*2]&0xffff;
+ l[1]=f3_line_ram[0x1ce0*2]&0xffff;
+ l[2]=f3_line_ram[0x1d60*2]&0xffff;
+ l[3]=f3_line_ram[0x1de0*2]&0xffff;
+ bufptr += sprintf(bufptr,"Sprt: %04x %04x %04x %04x\n",l[0],l[1],l[2],l[3]);
+
+ l[0]=f3_line_ram[0x1860*2]&0xffff;
+ l[1]=f3_line_ram[0x18e0*2]&0xffff;
+ l[2]=f3_line_ram[0x1960*2]&0xffff;
+ l[3]=f3_line_ram[0x19e0*2]&0xffff;
+ bufptr += sprintf(bufptr,"Pivt: %04x %04x %04x %04x\n",l[0],l[1],l[2],l[3]);
+
+ l[0]=f3_line_ram[0x1060*2]&0xffff;
+ l[1]=f3_line_ram[0x10e0*2]&0xffff;
+ l[2]=f3_line_ram[0x1160*2]&0xffff;
+ l[3]=f3_line_ram[0x11e0*2]&0xffff;
+ bufptr += sprintf(bufptr,"Colm: %04x %04x %04x %04x\n",l[0],l[1],l[2],l[3]);
+
+ l[0]=f3_line_ram[0x1460*2]&0xffff;
+ l[1]=f3_line_ram[0x14e0*2]&0xffff;
+ l[2]=f3_line_ram[0x1560*2]&0xffff;
+ l[3]=f3_line_ram[0x15e0*2]&0xffff;
+ bufptr += sprintf(bufptr,"5000: %04x %04x %04x %04x\n",l[0],l[1],l[2],l[3]);
+
+ machine().ui().draw_text(&machine().render().ui_container(), buf, 60, 40);*/
}
/******************************************************************************/
diff --git a/src/osd/modules/debugger/debugimgui.cpp b/src/osd/modules/debugger/debugimgui.cpp
index c8f6554b476..87ee61f8d19 100644
--- a/src/osd/modules/debugger/debugimgui.cpp
+++ b/src/osd/modules/debugger/debugimgui.cpp
@@ -79,16 +79,16 @@ class debug_imgui : public osd_module, public debug_module
public:
debug_imgui()
: osd_module(OSD_DEBUG_PROVIDER, "imgui"), debug_module(),
- m_machine(nullptr),
- m_mouse_x(0),
- m_mouse_y(0),
- m_mouse_button(false),
- m_prev_mouse_button(false),
- m_running(false),
- font_name(nullptr),
- font_size(0),
+ m_machine(nullptr),
+ m_mouse_x(0),
+ m_mouse_y(0),
+ m_mouse_button(false),
+ m_prev_mouse_button(false),
+ m_running(false),
+ font_name(nullptr),
+ font_size(0),
m_key_char(0),
- m_hide(false),
+ m_hide(false),
m_win_count(0)
{
}
@@ -154,7 +154,7 @@ static void view_list_remove(debug_area* item)
return;
it = std::find(view_list.begin(),view_list.end(),item);
view_list.erase(it);
-
+
}
static debug_area *dview_alloc(running_machine &machine, debug_view_type type)
@@ -245,7 +245,7 @@ void debug_imgui::handle_mouse_views()
void debug_imgui::handle_keys()
{
- ImGuiIO& io = ImGui::GetIO();
+ ImGuiIO& io = ImGui::GetIO();
ui_event event;
// global keys
@@ -289,35 +289,35 @@ void debug_imgui::handle_keys()
m_hide = true;
}
-/* if(m_machine->input().code_pressed_once(KEYCODE_UP))
- io.KeysDown[ImGuiKey_UpArrow] = true;
- if(m_machine->input().code_pressed_once(KEYCODE_DOWN))
- io.KeysDown[ImGuiKey_DownArrow] = true;
- if(m_machine->input().code_pressed_once(KEYCODE_LEFT))
- io.KeysDown[ImGuiKey_LeftArrow] = true;
- if(m_machine->input().code_pressed_once(KEYCODE_RIGHT))
- io.KeysDown[ImGuiKey_RightArrow] = true;
-
- if(m_machine->input().code_pressed(KEYCODE_TAB))
- io.KeysDown[ImGuiKey_Tab] = true;
-
- if(m_machine->input().code_pressed_once(KEYCODE_PGUP))
- {
- io.KeysDown[ImGuiKey_PageUp] = true;
- }
- if(m_machine->input().code_pressed_once(KEYCODE_PGDN))
- {
- io.KeysDown[ImGuiKey_PageDown] = true;
- }
-
- if(m_machine->input().code_pressed_once(KEYCODE_HOME))
- {
- io.KeysDown[ImGuiKey_Home] = true;
- }
- if(m_machine->input().code_pressed_once(KEYCODE_END))
- {
- io.KeysDown[ImGuiKey_End] = true;
- }*/
+/* if(m_machine->input().code_pressed_once(KEYCODE_UP))
+ io.KeysDown[ImGuiKey_UpArrow] = true;
+ if(m_machine->input().code_pressed_once(KEYCODE_DOWN))
+ io.KeysDown[ImGuiKey_DownArrow] = true;
+ if(m_machine->input().code_pressed_once(KEYCODE_LEFT))
+ io.KeysDown[ImGuiKey_LeftArrow] = true;
+ if(m_machine->input().code_pressed_once(KEYCODE_RIGHT))
+ io.KeysDown[ImGuiKey_RightArrow] = true;
+
+ if(m_machine->input().code_pressed(KEYCODE_TAB))
+ io.KeysDown[ImGuiKey_Tab] = true;
+
+ if(m_machine->input().code_pressed_once(KEYCODE_PGUP))
+ {
+ io.KeysDown[ImGuiKey_PageUp] = true;
+ }
+ if(m_machine->input().code_pressed_once(KEYCODE_PGDN))
+ {
+ io.KeysDown[ImGuiKey_PageDown] = true;
+ }
+
+ if(m_machine->input().code_pressed_once(KEYCODE_HOME))
+ {
+ io.KeysDown[ImGuiKey_Home] = true;
+ }
+ if(m_machine->input().code_pressed_once(KEYCODE_END))
+ {
+ io.KeysDown[ImGuiKey_End] = true;
+ }*/
if(m_machine->input().code_pressed(KEYCODE_LCONTROL))
io.KeyCtrl = true;
else
@@ -351,7 +351,7 @@ void debug_imgui::handle_keys()
break;
}
}
-
+
if(ImGui::IsKeyPressed(ITEM_ID_D) && ImGui::IsKeyDown(ITEM_ID_LCONTROL))
add_disasm(++m_win_count);
if(ImGui::IsKeyPressed(ITEM_ID_M) && ImGui::IsKeyDown(ITEM_ID_LCONTROL))
@@ -380,7 +380,7 @@ void debug_imgui::handle_keys_views()
// if no view has focus, then there's nothing to do
if(focus_view == nullptr)
return;
-
+
// pass keypresses to debug view with focus
if(m_machine->input().code_pressed_once(KEYCODE_UP))
focus_view->view->process_char(DCH_UP);
@@ -489,7 +489,7 @@ void debug_imgui::draw_bpoints(debug_area* view_ptr, bool* opened)
totalsize = view_ptr->view->total_size();
view_ptr->view->set_visible_size(totalsize);
vsize = view_ptr->view->visible_size();
-
+
ImGui::BeginChild("##break_output", ImVec2(ImGui::GetWindowWidth() - 16,ImGui::GetWindowHeight() - ImGui::GetTextLineHeight() - ImGui::GetCursorPosY())); // account for title bar and widgets already drawn
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0,0));
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0,0));
@@ -587,7 +587,7 @@ void debug_imgui::draw_log(debug_area* view_ptr, bool* opened)
totalsize.y = 100;
view_ptr->view->set_visible_size(totalsize);
vsize = view_ptr->view->visible_size();
-
+
ImGui::BeginChild("##log_output", ImVec2(ImGui::GetWindowWidth() - 16,ImGui::GetWindowHeight() - ImGui::GetTextLineHeight() - ImGui::GetCursorPosY())); // account for title bar and widgets already drawn
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0,0));
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0,0));
@@ -644,7 +644,7 @@ void debug_imgui::draw_disasm(debug_area* view_ptr, bool* opened)
std::string cpu_list = "";
const debug_view_source* src = view_ptr->view->first_source();
- // build source CPU list
+ // build source CPU list
while(src != nullptr)
{
cpu_list += src->name();
@@ -682,7 +682,7 @@ void debug_imgui::draw_disasm(debug_area* view_ptr, bool* opened)
disasm->set_right_column(DASM_RIGHTCOL_NONE);
if(ImGui::MenuItem("Comments", nullptr,(rightcol == DASM_RIGHTCOL_COMMENTS) ? true : false))
disasm->set_right_column(DASM_RIGHTCOL_COMMENTS);
-
+
ImGui::EndMenu();
}
ImGui::EndMenuBar();
@@ -705,7 +705,7 @@ void debug_imgui::draw_disasm(debug_area* view_ptr, bool* opened)
totalsize.y = 50;
view_ptr->view->set_visible_size(totalsize);
vsize = view_ptr->view->visible_size();
-
+
ImGui::BeginChild("##disasm_output", ImVec2(ImGui::GetWindowWidth() - 16,ImGui::GetWindowHeight() - ImGui::GetTextLineHeight() - ImGui::GetCursorPosY())); // account for title bar and widgets already drawn
src = view_ptr->view->first_source();
idx = 0;
@@ -801,7 +801,7 @@ void debug_imgui::draw_memory(debug_area* view_ptr, bool* opened)
ImVec2 xy1,xy2;
ImVec2 fsize = ImGui::CalcTextSize("A"); // any character will do, we should be using a monospaced font
ImDrawList* drawlist;
-
+
if(ImGui::BeginMenuBar())
{
if(ImGui::BeginMenu("Options"))
@@ -811,7 +811,7 @@ void debug_imgui::draw_memory(debug_area* view_ptr, bool* opened)
bool rev = mem->reverse();
int format = mem->get_data_format();
UINT32 chunks = mem->chunks_per_row();
-
+
if(ImGui::MenuItem("1-byte chunks", nullptr,(format == 1) ? true : false))
mem->set_data_format(1);
if(ImGui::MenuItem("2-byte chunks", nullptr,(format == 2) ? true : false))
@@ -844,12 +844,12 @@ void debug_imgui::draw_memory(debug_area* view_ptr, bool* opened)
}
ImGui::EndMenuBar();
}
-
+
ImGuiInputTextFlags flags = ImGuiInputTextFlags_EnterReturnsTrue;
ImGui::PushItemWidth(100.0f);
if(m_running)
flags |= ImGuiInputTextFlags_ReadOnly;
- // build source CPU list
+ // build source CPU list
while(src != nullptr)
{
region_list += src->name();
@@ -865,7 +865,7 @@ void debug_imgui::draw_memory(debug_area* view_ptr, bool* opened)
ImGui::Combo("##region",&view_ptr->src_sel,region_list.c_str());
ImGui::PopItemWidth();
ImGui::Separator();
-
+
// memory editor portion
viewdata = view_ptr->view->viewdata();
totalsize = view_ptr->view->total_size();
@@ -873,7 +873,7 @@ void debug_imgui::draw_memory(debug_area* view_ptr, bool* opened)
totalsize.y = 256;
view_ptr->view->set_visible_size(totalsize);
vsize = view_ptr->view->visible_size();
-
+
ImGui::BeginChild("##memory_output", ImVec2(ImGui::GetWindowWidth() - 16,ImGui::GetWindowHeight() - ImGui::GetTextLineHeight() - ImGui::GetCursorPosY())); // account for title bar and widgets already drawn
src = view_ptr->view->first_source();
idx = 0;
@@ -975,13 +975,13 @@ void debug_imgui::draw_console()
{
if(ImGui::MenuItem("New disassembly window", "Ctrl+D"))
add_disasm(++m_win_count);
- if(ImGui::MenuItem("New memory window", "Ctrl+M"))
+ if(ImGui::MenuItem("New memory window", "Ctrl+M"))
add_memory(++m_win_count);
- if(ImGui::MenuItem("New breakpoints window", "Ctrl+B"))
+ if(ImGui::MenuItem("New breakpoints window", "Ctrl+B"))
add_bpoints(++m_win_count);
- if(ImGui::MenuItem("New watchpoints window", "Ctrl+W"))
+ if(ImGui::MenuItem("New watchpoints window", "Ctrl+W"))
add_wpoints(++m_win_count);
- if(ImGui::MenuItem("New log window", "Ctrl+L"))
+ if(ImGui::MenuItem("New log window", "Ctrl+L"))
add_log(++m_win_count);
ImGui::Separator();
if(ImGui::MenuItem("Run", "F5"))
@@ -1013,7 +1013,7 @@ void debug_imgui::draw_console()
debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step_over();
if(ImGui::MenuItem("Step out", "F9"))
debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step_out();
-
+
ImGui::EndMenu();
}
if(ImGui::BeginMenu("Window"))
@@ -1046,13 +1046,13 @@ void debug_imgui::draw_console()
}
ImGui::EndMenuBar();
}
-
+
// CPU state portion
viewdata = view_main_regs->view->viewdata();
totalsize = view_main_regs->view->total_size();
view_main_regs->view->set_visible_size(totalsize);
vsize = view_main_regs->view->visible_size();
-
+
ImGui::BeginChild("##state_output", ImVec2(180,ImGui::GetWindowHeight() - ImGui::GetTextLineHeight()*2)); // account for title bar and menu
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0,0));
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0,0));
@@ -1092,9 +1092,9 @@ void debug_imgui::draw_console()
totalsize = view_main_disasm->view->total_size();
totalsize.y = 20;
view_main_disasm->view->set_visible_size(totalsize);
-// height = ImGui::GetTextLineHeight();
+// height = ImGui::GetTextLineHeight();
vsize = view_main_disasm->view->visible_size();
-
+
ImGui::BeginChild("##disasm_output", ImVec2(ImGui::GetWindowWidth() - ImGui::GetCursorPosX() - 8,(ImGui::GetWindowHeight() - ImGui::GetTextLineHeight()*4)/2));
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0,0));
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0,0));
@@ -1147,7 +1147,7 @@ void debug_imgui::draw_console()
if(totalsize.y > 100)
totalsize.y = 100;
view_main_console->view->set_visible_size(totalsize);
-// height = ImGui::GetTextLineHeight();
+// height = ImGui::GetTextLineHeight();
vsize = view_main_console->view->visible_size();
ImGui::BeginChild("##console_output", ImVec2(ImGui::GetWindowWidth() - ImGui::GetCursorPosX() - 8,(ImGui::GetWindowHeight() - ImGui::GetTextLineHeight()*4)/2 - ImGui::GetTextLineHeight()));
@@ -1180,7 +1180,7 @@ void debug_imgui::draw_console()
ImGui::EndChild();
ImGui::Separator();
//if(ImGui::IsWindowFocused())
- // ImGui::SetKeyboardFocusHere();
+ // ImGui::SetKeyboardFocusHere();
ImGuiInputTextFlags flags = ImGuiInputTextFlags_EnterReturnsTrue;
if(m_running)
flags |= ImGuiInputTextFlags_ReadOnly;
@@ -1254,7 +1254,7 @@ void debug_imgui::update()
void debug_imgui::init_debugger(running_machine &machine)
{
- ImGuiIO& io = ImGui::GetIO();
+ ImGuiIO& io = ImGui::GetIO();
m_machine = &machine;
m_mouse_button = false;
if(strcmp(downcast<osd_options &>(m_machine->options()).video(),"bgfx") != 0)
@@ -1314,12 +1314,12 @@ void debug_imgui::wait_for_debugger(device_t &device, bool firststop)
}
if(firststop)
{
-// debug_show_all();
+// debug_show_all();
device.machine().ui_input().reset();
m_running = false;
}
m_hide = false;
-// m_machine->ui_input().frame_update();
+// m_machine->ui_input().frame_update();
handle_mouse();
handle_keys();
handle_console(m_machine);
diff --git a/src/osd/modules/diagnostics/diagnostics_module.h b/src/osd/modules/diagnostics/diagnostics_module.h
index 5e92178d492..2f2c64b672b 100644
--- a/src/osd/modules/diagnostics/diagnostics_module.h
+++ b/src/osd/modules/diagnostics/diagnostics_module.h
@@ -28,7 +28,7 @@ public:
// starts the profiler
virtual void start_profiler(std::uint32_t max_seconds, std::uint8_t stack_depth) = 0;
-
+
// stops the currently active profiler
virtual void stop_profiler() = 0;
@@ -39,4 +39,4 @@ public:
static diagnostics_module* get_instance();
};
-#endif \ No newline at end of file
+#endif
diff --git a/src/osd/modules/diagnostics/diagnostics_win32.cpp b/src/osd/modules/diagnostics/diagnostics_win32.cpp
index 2b6d182d844..d24bffe75a7 100644
--- a/src/osd/modules/diagnostics/diagnostics_win32.cpp
+++ b/src/osd/modules/diagnostics/diagnostics_win32.cpp
@@ -1083,4 +1083,3 @@ diagnostics_module * diagnostics_module::get_instance()
#endif // WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
#endif
-
diff --git a/src/osd/modules/diagnostics/none.cpp b/src/osd/modules/diagnostics/none.cpp
index 502a919a7e1..8a731fe9009 100644
--- a/src/osd/modules/diagnostics/none.cpp
+++ b/src/osd/modules/diagnostics/none.cpp
@@ -52,4 +52,4 @@ diagnostics_module* diagnostics_module::get_instance()
static diagnostics_none s_instance;
return &s_instance;
}
-#endif \ No newline at end of file
+#endif
diff --git a/src/osd/modules/input/input_dinput.cpp b/src/osd/modules/input/input_dinput.cpp
index 5aa925edefe..d8400a8346c 100644
--- a/src/osd/modules/input/input_dinput.cpp
+++ b/src/osd/modules/input/input_dinput.cpp
@@ -128,8 +128,8 @@ void dinput_keyboard_device::reset()
dinput_api_helper::dinput_api_helper(int version)
: m_dinput(nullptr),
- m_dinput_version(version),
- m_pfn_DirectInputCreate("DirectInputCreateW", L"dinput.dll")
+ m_dinput_version(version),
+ m_pfn_DirectInputCreate("DirectInputCreateW", L"dinput.dll")
{
}
@@ -200,7 +200,7 @@ protected:
public:
dinput_module(const char* type, const char* name)
: wininput_module(type, name),
- m_dinput_helper(nullptr)
+ m_dinput_helper(nullptr)
{
}
diff --git a/src/osd/modules/input/input_dinput.h b/src/osd/modules/input/input_dinput.h
index f06520cb285..3d3cf7e6544 100644
--- a/src/osd/modules/input/input_dinput.h
+++ b/src/osd/modules/input/input_dinput.h
@@ -23,7 +23,7 @@ public:
struct dinput_callback_context
{
device_enum_interface * self;
- void * state;
+ void * state;
};
virtual ~device_enum_interface()
diff --git a/src/osd/modules/input/input_sdl.cpp b/src/osd/modules/input/input_sdl.cpp
index f91d083371d..50ddf09cf33 100644
--- a/src/osd/modules/input/input_sdl.cpp
+++ b/src/osd/modules/input/input_sdl.cpp
@@ -702,24 +702,24 @@ public:
: sdl_input_module(OSD_JOYSTICKINPUT_PROVIDER), m_sixaxis_mode(false)
{
}
-
+
virtual void exit() override
{
sdl_input_module::exit();
-
+
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
- }
-
+ }
+
virtual void input_init(running_machine &machine) override
{
- SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0");
+ SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0");
if (SDL_InitSubSystem(SDL_INIT_JOYSTICK))
{
osd_printf_error("Could not initialize SDL Joystick: %s.\n", SDL_GetError());
return;
}
-
+
sdl_input_module::input_init(machine);
char tempname[512];
diff --git a/src/osd/modules/input/input_sdlcommon.h b/src/osd/modules/input/input_sdlcommon.h
index abdc4ddf4ed..cfc5a647793 100644
--- a/src/osd/modules/input/input_sdlcommon.h
+++ b/src/osd/modules/input/input_sdlcommon.h
@@ -63,7 +63,7 @@ class sdl_event_subscriber
{
public:
virtual ~sdl_event_subscriber() {}
- virtual void handle_event(SDL_Event &sdlevent) = 0;
+ virtual void handle_event(SDL_Event &sdlevent) = 0;
};
template <class TSubscriber>
diff --git a/src/osd/modules/input/input_winhybrid.cpp b/src/osd/modules/input/input_winhybrid.cpp
index 22534b75453..60418f2f023 100644
--- a/src/osd/modules/input/input_winhybrid.cpp
+++ b/src/osd/modules/input/input_winhybrid.cpp
@@ -275,10 +275,10 @@ private:
}
//-----------------------------------------------------------------------------
- // Enum each PNP device using WMI and check each device ID to see if it contains
+ // Enum each PNP device using WMI and check each device ID to see if it contains
// "IG_" (ex. "VID_045E&PID_028E&IG_00"). If it does, then it's an XInput device
// Unfortunately this information can not be found by just using DirectInput.
- // Checking against a VID/PID of 0x028E/0x045E won't find 3rd party or future
+ // Checking against a VID/PID of 0x028E/0x045E won't find 3rd party or future
// XInput devices.
//-----------------------------------------------------------------------------
HRESULT get_xinput_devices(std::list<DWORD> &xinput_id_list) const
@@ -317,7 +317,7 @@ private:
bstrDeviceID = bstr_ptr(SysAllocString(L"DeviceID"));
bstrClassName = bstr_ptr(SysAllocString(L"Win32_PNPEntity"));
- // Connect to WMI
+ // Connect to WMI
hr = pIWbemLocator->ConnectServer(
bstrNamespace.get(),
nullptr,
@@ -377,7 +377,7 @@ private:
if (SUCCEEDED(hr) && var.vt == VT_BSTR && var.bstrVal != nullptr)
{
// Check if the device ID contains "IG_". If it does, then it's an XInput device
- // Unfortunately this information can not be found by just using DirectInput
+ // Unfortunately this information can not be found by just using DirectInput
if (wcsstr(var.bstrVal, L"IG_"))
{
// If it does, then get the VID/PID from var.bstrVal
diff --git a/src/osd/modules/input/input_xinput.cpp b/src/osd/modules/input/input_xinput.cpp
index c3725ffbf08..9226011c273 100644
--- a/src/osd/modules/input/input_xinput.cpp
+++ b/src/osd/modules/input/input_xinput.cpp
@@ -115,7 +115,7 @@ xinput_joystick_device::xinput_joystick_device(running_machine &machine, const c
gamepad({{0}}),
xinput_state({0}),
m_xinput_helper(helper),
- m_configured(false)
+ m_configured(false)
{
}
diff --git a/src/osd/modules/input/input_xinput.h b/src/osd/modules/input/input_xinput.h
index 4474a3f58f7..791fc36f310 100644
--- a/src/osd/modules/input/input_xinput.h
+++ b/src/osd/modules/input/input_xinput.h
@@ -131,7 +131,7 @@ private:
public:
xinput_joystick_device(running_machine &machine, const char *name, input_module &module, std::shared_ptr<xinput_api_helper> helper);
-
+
void poll() override;
void reset() override;
void configure();
diff --git a/src/osd/modules/ipc/rtc_tcp_connection.cpp b/src/osd/modules/ipc/rtc_tcp_connection.cpp
index 1cc800b7d77..861eaa8d247 100644
--- a/src/osd/modules/ipc/rtc_tcp_connection.cpp
+++ b/src/osd/modules/ipc/rtc_tcp_connection.cpp
@@ -100,7 +100,7 @@ void rtc_tcp_connection::user_on_tcp_connection_read()
{
break;
}
- }
+ }
else // Incomplete packet.
{
// Check if the buffer is full.
diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h
index fc0d2f7a925..5c26b55a6d5 100644
--- a/src/osd/modules/lib/osdobj_common.h
+++ b/src/osd/modules/lib/osdobj_common.h
@@ -84,7 +84,7 @@ class ui_menu_item;
#define OSDOPTION_BGFX_DEBUG "bgfx_debug"
#define OSDOPTION_BGFX_SCREEN_CHAINS "bgfx_screen_chains"
#define OSDOPTION_BGFX_SHADOW_MASK "bgfx_shadow_mask"
-#define OSDOPTION_BGFX_AVI_NAME "bgfx_avi_name"
+#define OSDOPTION_BGFX_AVI_NAME "bgfx_avi_name"
//============================================================
// TYPE DEFINITIONS
diff --git a/src/osd/modules/osdwindow.cpp b/src/osd/modules/osdwindow.cpp
index b9afc8047cd..3868f83e6ea 100644
--- a/src/osd/modules/osdwindow.cpp
+++ b/src/osd/modules/osdwindow.cpp
@@ -22,7 +22,7 @@
#endif
osd_window::~osd_window()
-{
+{
}
std::unique_ptr<osd_renderer> osd_renderer::make_for_type(int mode, std::shared_ptr<osd_window> window, int extra_flags)
diff --git a/src/osd/modules/osdwindow.h b/src/osd/modules/osdwindow.h
index 072924693d8..a2ab9228454 100644
--- a/src/osd/modules/osdwindow.h
+++ b/src/osd/modules/osdwindow.h
@@ -162,7 +162,7 @@ public:
m_platform_window = window;
}
- std::shared_ptr<osd_window> main_window() const { return m_main; }
+ std::shared_ptr<osd_window> main_window() const { return m_main; }
void set_main_window(std::shared_ptr<osd_window> main) { m_main = main; }
// Clips the pointer to the bounds of this window
@@ -187,7 +187,7 @@ public:
render_primitive_list *m_primlist;
osd_window_config m_win_config;
- int m_index;
+ int m_index;
protected:
int m_prescale;
private:
@@ -253,8 +253,8 @@ protected:
/* Internal flags */
static const int FI_CHANGED = 0x010000;
- bool m_sliders_dirty;
- std::vector<ui_menu_item> m_sliders;
+ bool m_sliders_dirty;
+ std::vector<ui_menu_item> m_sliders;
private:
std::weak_ptr<osd_window> m_window;
diff --git a/src/osd/modules/output/network.cpp b/src/osd/modules/output/network.cpp
index 95f898fbf41..081e721ae19 100644
--- a/src/osd/modules/output/network.cpp
+++ b/src/osd/modules/output/network.cpp
@@ -21,7 +21,6 @@ class output_network_server :
public raw_tcp_server::listener,
public raw_tcp_connection::listener
{
-
public:
output_network_server(uv_loop_t* loop) { m_tcp_server = new raw_tcp_server(loop, "0.0.0.0", 8000, 256, this, this); }
@@ -48,17 +47,17 @@ public:
virtual ~output_network() {
}
- virtual int init(const osd_options &options) override {
+ virtual int init(const osd_options &options) override {
m_loop = new uv_loop_t;
int err = uv_loop_init(m_loop);
if (err) {
return 1;
}
m_working_thread = std::thread([](output_network* self) { self->process_output(); }, this);
- return 0;
+ return 0;
}
- virtual void exit() override {
+ virtual void exit() override {
m_server->terminate_all();
m_working_thread.join();
uv_loop_close(m_loop);
@@ -76,7 +75,7 @@ public:
m_server = new output_network_server(m_loop);
uv_run(m_loop, UV_RUN_DEFAULT);
}
-
+
private:
std::thread m_working_thread;
uv_loop_t* m_loop;
diff --git a/src/osd/modules/render/aviwrite.cpp b/src/osd/modules/render/aviwrite.cpp
index 6a27c567a43..9ff7c5ab17d 100644
--- a/src/osd/modules/render/aviwrite.cpp
+++ b/src/osd/modules/render/aviwrite.cpp
@@ -112,7 +112,7 @@ void avi_write::end_avi_recording()
m_output_file.reset();
}
- m_recording = false;
+ m_recording = false;
m_output_file = nullptr;
m_frame = 0;
}
@@ -158,4 +158,4 @@ void avi_write::audio_frame(const INT16 *buffer, int samples_this_frame)
end_avi_recording();
}
}
-} \ No newline at end of file
+}
diff --git a/src/osd/modules/render/aviwrite.h b/src/osd/modules/render/aviwrite.h
index 2a948964eb8..ce6325d6815 100644
--- a/src/osd/modules/render/aviwrite.h
+++ b/src/osd/modules/render/aviwrite.h
@@ -34,12 +34,12 @@ private:
void begin_avi_recording(std::string name);
void end_avi_recording();
- running_machine& m_machine;
+ running_machine& m_machine;
- bool m_recording;
+ bool m_recording;
- uint32_t m_width;
- uint32_t m_height;
+ uint32_t m_width;
+ uint32_t m_height;
avi_file::ptr m_output_file;
@@ -48,4 +48,4 @@ private:
attotime m_next_frame_time;
};
-#endif // __RENDER_AVIWRITE__ \ No newline at end of file
+#endif // __RENDER_AVIWRITE__
diff --git a/src/osd/modules/render/bgfx/chain.cpp b/src/osd/modules/render/bgfx/chain.cpp
index 8c517c8dc2f..9e399fef255 100644
--- a/src/osd/modules/render/bgfx/chain.cpp
+++ b/src/osd/modules/render/bgfx/chain.cpp
@@ -63,13 +63,13 @@ bgfx_chain::~bgfx_chain()
void bgfx_chain::process(render_primitive* prim, int view, int screen, texture_manager& textures, osd_window& window, uint64_t blend)
{
screen_device_iterator screen_iterator(window.machine().root_device());
- screen_device* screen_device = screen_iterator.byindex(screen);
+ screen_device* screen_device = screen_iterator.byindex(screen);
render_container &screen_container = screen_device->container();
int current_view = view;
uint16_t screen_width(floor((prim->bounds.x1 - prim->bounds.x0) + 0.5f));
uint16_t screen_height(floor((prim->bounds.y1 - prim->bounds.y0) + 0.5f));
- uint32_t rotation_type =
+ uint32_t rotation_type =
(window.target()->orientation() & ROT90) == ROT90 ? 1 :
(window.target()->orientation() & ROT180) == ROT180 ? 2 :
(window.target()->orientation() & ROT270) == ROT270 ? 3 : 0;
diff --git a/src/osd/modules/render/bgfx/chain.h b/src/osd/modules/render/bgfx/chain.h
index 4e7a0587cd9..eff50f2aedb 100644
--- a/src/osd/modules/render/bgfx/chain.h
+++ b/src/osd/modules/render/bgfx/chain.h
@@ -42,15 +42,15 @@ public:
private:
std::string m_name;
std::string m_author;
- bool m_transform;
- target_manager& m_targets;
+ bool m_transform;
+ target_manager& m_targets;
std::vector<bgfx_slider*> m_sliders;
std::vector<bgfx_parameter*> m_params;
std::vector<bgfx_chain_entry*> m_entries;
- std::vector<bgfx_target*> m_target_list;
+ std::vector<bgfx_target*> m_target_list;
std::map<std::string, bgfx_slider*> m_slider_map;
int64_t m_current_time;
- uint32_t m_screen_index;
+ uint32_t m_screen_index;
};
#endif // __DRAWBGFX_CHAIN__
diff --git a/src/osd/modules/render/bgfx/chainentry.h b/src/osd/modules/render/bgfx/chainentry.h
index 271941537a7..4f4bede5327 100644
--- a/src/osd/modules/render/bgfx/chainentry.h
+++ b/src/osd/modules/render/bgfx/chainentry.h
@@ -61,7 +61,7 @@ private:
std::string m_name;
bgfx_effect* m_effect;
- clear_state* m_clear;
+ clear_state* m_clear;
std::vector<bgfx_suppressor*> m_suppressors;
std::vector<bgfx_input_pair*> m_inputs;
std::vector<bgfx_entry_uniform*> m_uniforms;
diff --git a/src/osd/modules/render/bgfx/chainmanager.cpp b/src/osd/modules/render/bgfx/chainmanager.cpp
index f1f530271f5..8614149b7eb 100644
--- a/src/osd/modules/render/bgfx/chainmanager.cpp
+++ b/src/osd/modules/render/bgfx/chainmanager.cpp
@@ -38,22 +38,22 @@ using namespace rapidjson;
const uint32_t chain_manager::CHAIN_NONE = 0;
chain_manager::chain_manager(running_machine& machine, osd_options& options, texture_manager& textures, target_manager& targets, effect_manager& effects, uint32_t window_index, slider_dirty_notifier& slider_notifier)
- : m_machine(machine)
- , m_options(options)
- , m_textures(textures)
- , m_targets(targets)
- , m_effects(effects)
- , m_window_index(window_index)
- , m_slider_notifier(slider_notifier)
- , m_screen_count(0)
+ : m_machine(machine)
+ , m_options(options)
+ , m_textures(textures)
+ , m_targets(targets)
+ , m_effects(effects)
+ , m_window_index(window_index)
+ , m_slider_notifier(slider_notifier)
+ , m_screen_count(0)
{
refresh_available_chains();
- parse_chain_selections(options.bgfx_screen_chains());
+ parse_chain_selections(options.bgfx_screen_chains());
}
chain_manager::~chain_manager()
{
- destroy_chains();
+ destroy_chains();
}
void chain_manager::refresh_available_chains()
@@ -181,280 +181,280 @@ bgfx_chain* chain_manager::load_chain(std::string name, uint32_t screen_index)
void chain_manager::parse_chain_selections(std::string chain_str)
{
- std::vector<std::string> chain_names = split_option_string(chain_str);
-
- while (m_current_chain.size() != chain_names.size())
- {
- m_screen_chains.push_back(nullptr);
- m_chain_names.push_back("");
- m_current_chain.push_back(CHAIN_NONE);
- }
-
- for (size_t index = 0; index < chain_names.size(); index++)
- {
- size_t chain_index = 0;
- for (chain_index = 0; chain_index < m_available_chains.size(); chain_index++)
- {
- if (m_available_chains[chain_index].m_name == chain_names[index])
- {
- break;
- }
- }
-
- if (chain_index < m_available_chains.size())
- {
- m_current_chain[index] = chain_index;
- m_chain_names[index] = m_available_chains[chain_index].m_name;
- }
- else
- {
- m_current_chain[index] = CHAIN_NONE;
- m_chain_names[index] = "";
- }
- }
+ std::vector<std::string> chain_names = split_option_string(chain_str);
+
+ while (m_current_chain.size() != chain_names.size())
+ {
+ m_screen_chains.push_back(nullptr);
+ m_chain_names.push_back("");
+ m_current_chain.push_back(CHAIN_NONE);
+ }
+
+ for (size_t index = 0; index < chain_names.size(); index++)
+ {
+ size_t chain_index = 0;
+ for (chain_index = 0; chain_index < m_available_chains.size(); chain_index++)
+ {
+ if (m_available_chains[chain_index].m_name == chain_names[index])
+ {
+ break;
+ }
+ }
+
+ if (chain_index < m_available_chains.size())
+ {
+ m_current_chain[index] = chain_index;
+ m_chain_names[index] = m_available_chains[chain_index].m_name;
+ }
+ else
+ {
+ m_current_chain[index] = CHAIN_NONE;
+ m_chain_names[index] = "";
+ }
+ }
}
std::vector<std::string> chain_manager::split_option_string(std::string chain_str) const
{
- std::vector<std::string> chain_names;
-
- uint32_t length = chain_str.length();
- uint32_t win = 0;
- uint32_t last_start = 0;
- for (uint32_t i = 0; i < length + 1; i++)
- {
- if (i == length || chain_str[i] == ',' || chain_str[i] == ':')
- {
- if (win == m_window_index)
- {
- chain_names.push_back(chain_str.substr(last_start, i - last_start));
- }
- last_start = i + 1;
- if (chain_str[i] == ':')
- {
- win++;
- }
- }
- }
-
- return chain_names;
+ std::vector<std::string> chain_names;
+
+ uint32_t length = chain_str.length();
+ uint32_t win = 0;
+ uint32_t last_start = 0;
+ for (uint32_t i = 0; i < length + 1; i++)
+ {
+ if (i == length || chain_str[i] == ',' || chain_str[i] == ':')
+ {
+ if (win == m_window_index)
+ {
+ chain_names.push_back(chain_str.substr(last_start, i - last_start));
+ }
+ last_start = i + 1;
+ if (chain_str[i] == ':')
+ {
+ win++;
+ }
+ }
+ }
+
+ return chain_names;
}
void chain_manager::load_chains()
{
- for (size_t chain = 0; chain < m_current_chain.size() && chain < m_screen_chains.size(); chain++)
- {
- if (m_current_chain[chain] != CHAIN_NONE)
- {
+ for (size_t chain = 0; chain < m_current_chain.size() && chain < m_screen_chains.size(); chain++)
+ {
+ if (m_current_chain[chain] != CHAIN_NONE)
+ {
chain_desc& desc = m_available_chains[m_current_chain[chain]];
m_chain_names[chain] = desc.m_name;
- m_screen_chains[chain] = load_chain(desc.m_path + "/" + desc.m_name, uint32_t(chain));
- }
- }
+ m_screen_chains[chain] = load_chain(desc.m_path + "/" + desc.m_name, uint32_t(chain));
+ }
+ }
}
void chain_manager::destroy_chains()
{
- for (size_t index = 0; index < m_screen_chains.size(); index++)
- {
- if (m_screen_chains[index] != nullptr)
- {
- delete m_screen_chains[index];
- m_screen_chains[index] = nullptr;
- }
- }
+ for (size_t index = 0; index < m_screen_chains.size(); index++)
+ {
+ if (m_screen_chains[index] != nullptr)
+ {
+ delete m_screen_chains[index];
+ m_screen_chains[index] = nullptr;
+ }
+ }
}
void chain_manager::reload_chains()
{
- destroy_chains();
- load_chains();
+ destroy_chains();
+ load_chains();
}
bgfx_chain* chain_manager::screen_chain(uint32_t screen)
{
- if (screen >= m_screen_chains.size())
- {
- return m_screen_chains[m_screen_chains.size() - 1];
- }
- else
- {
- return m_screen_chains[screen];
- }
+ if (screen >= m_screen_chains.size())
+ {
+ return m_screen_chains[m_screen_chains.size() - 1];
+ }
+ else
+ {
+ return m_screen_chains[screen];
+ }
}
void chain_manager::process_screen_quad(uint32_t view, uint32_t screen, render_primitive* prim, osd_window &window)
{
- uint16_t tex_width(prim->texture.width);
- uint16_t tex_height(prim->texture.height);
+ uint16_t tex_width(prim->texture.width);
+ uint16_t tex_height(prim->texture.height);
- const bgfx::Memory* mem = bgfx_util::mame_texture_data_to_bgfx_texture_data(prim->flags & PRIMFLAG_TEXFORMAT_MASK,
- tex_width, tex_height, prim->texture.rowpixels, prim->texture.palette, prim->texture.base);
+ const bgfx::Memory* mem = bgfx_util::mame_texture_data_to_bgfx_texture_data(prim->flags & PRIMFLAG_TEXFORMAT_MASK,
+ tex_width, tex_height, prim->texture.rowpixels, prim->texture.palette, prim->texture.base);
- std::string full_name = "screen" + std::to_string(screen);
- bgfx_texture *texture = new bgfx_texture(full_name, bgfx::TextureFormat::RGBA8, tex_width, tex_height, mem, BGFX_TEXTURE_U_CLAMP | BGFX_TEXTURE_V_CLAMP | BGFX_TEXTURE_MIN_POINT | BGFX_TEXTURE_MAG_POINT | BGFX_TEXTURE_MIP_POINT);
- m_textures.add_provider(full_name, texture);
+ std::string full_name = "screen" + std::to_string(screen);
+ bgfx_texture *texture = new bgfx_texture(full_name, bgfx::TextureFormat::RGBA8, tex_width, tex_height, mem, BGFX_TEXTURE_U_CLAMP | BGFX_TEXTURE_V_CLAMP | BGFX_TEXTURE_MIN_POINT | BGFX_TEXTURE_MAG_POINT | BGFX_TEXTURE_MIP_POINT);
+ m_textures.add_provider(full_name, texture);
- m_targets.update_target_sizes(screen, tex_width, tex_height, TARGET_STYLE_GUEST);
+ m_targets.update_target_sizes(screen, tex_width, tex_height, TARGET_STYLE_GUEST);
- bgfx_chain* chain = screen_chain(screen);
- chain->process(prim, view, screen, m_textures, window, bgfx_util::get_blend_state(PRIMFLAG_GET_BLENDMODE(prim->flags)));
- view += chain->applicable_passes();
+ bgfx_chain* chain = screen_chain(screen);
+ chain->process(prim, view, screen, m_textures, window, bgfx_util::get_blend_state(PRIMFLAG_GET_BLENDMODE(prim->flags)));
+ view += chain->applicable_passes();
- m_textures.add_provider(full_name, nullptr);
- delete texture;
+ m_textures.add_provider(full_name, nullptr);
+ delete texture;
}
std::vector<render_primitive*> chain_manager::count_screens(render_primitive* prim)
{
- std::vector<render_primitive*> screens;
+ std::vector<render_primitive*> screens;
- int screen_count = 0;
- while (prim != nullptr)
- {
- if (PRIMFLAG_GET_SCREENTEX(prim->flags))
- {
+ int screen_count = 0;
+ while (prim != nullptr)
+ {
+ if (PRIMFLAG_GET_SCREENTEX(prim->flags))
+ {
screen_count++;
screens.push_back(prim);
- }
- prim = prim->next();
- }
+ }
+ prim = prim->next();
+ }
- if (screen_count > 0)
- {
+ if (screen_count > 0)
+ {
update_screen_count(screen_count);
- m_targets.update_screen_count(screen_count);
- }
+ m_targets.update_screen_count(screen_count);
+ }
- return screens;
+ return screens;
}
void chain_manager::update_screen_count(uint32_t screen_count)
{
if (screen_count != m_screen_count)
{
- m_slider_notifier.set_sliders_dirty();
+ m_slider_notifier.set_sliders_dirty();
m_screen_count = screen_count;
- // Ensure we have one screen chain entry per screen
- while (m_screen_chains.size() < m_screen_count)
- {
- m_screen_chains.push_back(nullptr);
- m_chain_names.push_back("");
- m_current_chain.push_back(CHAIN_NONE);
- }
-
- // Ensure we have a screen chain selection slider per screen
- while (m_selection_sliders.size() < m_screen_count)
- {
- create_selection_slider(m_selection_sliders.size());
- }
-
- load_chains();
+ // Ensure we have one screen chain entry per screen
+ while (m_screen_chains.size() < m_screen_count)
+ {
+ m_screen_chains.push_back(nullptr);
+ m_chain_names.push_back("");
+ m_current_chain.push_back(CHAIN_NONE);
+ }
+
+ // Ensure we have a screen chain selection slider per screen
+ while (m_selection_sliders.size() < m_screen_count)
+ {
+ create_selection_slider(m_selection_sliders.size());
+ }
+
+ load_chains();
}
}
static INT32 update_trampoline(running_machine &machine, void *arg, int id, std::string *str, INT32 newval)
{
- if (arg != nullptr)
- {
- return reinterpret_cast<chain_manager*>(arg)->chain_changed(id, str, newval);
- }
- return 0;
+ if (arg != nullptr)
+ {
+ return reinterpret_cast<chain_manager*>(arg)->chain_changed(id, str, newval);
+ }
+ return 0;
}
int32_t chain_manager::chain_changed(int32_t id, std::string *str, int32_t newval)
{
- if (newval != SLIDER_NOCHANGE)
- {
- m_current_chain[id] = newval;
+ if (newval != SLIDER_NOCHANGE)
+ {
+ m_current_chain[id] = newval;
std::vector<std::vector<float>> settings = slider_settings();
- reload_chains();
- restore_slider_settings(id, settings);
+ reload_chains();
+ restore_slider_settings(id, settings);
- m_slider_notifier.set_sliders_dirty();
- }
+ m_slider_notifier.set_sliders_dirty();
+ }
- if (str != nullptr)
- {
- *str = string_format("%s", m_available_chains[m_current_chain[id]].m_name.c_str());
- }
+ if (str != nullptr)
+ {
+ *str = string_format("%s", m_available_chains[m_current_chain[id]].m_name.c_str());
+ }
- return m_current_chain[id];
+ return m_current_chain[id];
}
void chain_manager::create_selection_slider(uint32_t screen_index)
{
- if (screen_index < m_selection_sliders.size())
- {
- return;
- }
-
- std::string description = "Window " + std::to_string(m_window_index) + ", Screen " + std::to_string(screen_index) + " Effect:";
- size_t size = sizeof(slider_state) + description.length();
- slider_state *state = reinterpret_cast<slider_state *>(auto_alloc_array_clear(m_machine, UINT8, size));
-
- state->minval = 0;
- state->defval = m_current_chain[screen_index];
- state->maxval = m_available_chains.size() - 1;
- state->incval = 1;
- state->update = update_trampoline;
- state->arg = this;
- state->id = screen_index;
- strcpy(state->description, description.c_str());
-
- ui_menu_item item;
- item.text = state->description;
- item.subtext = "";
- item.flags = 0;
- item.ref = state;
- item.type = ui_menu_item_type::SLIDER;
- m_selection_sliders.push_back(item);
+ if (screen_index < m_selection_sliders.size())
+ {
+ return;
+ }
+
+ std::string description = "Window " + std::to_string(m_window_index) + ", Screen " + std::to_string(screen_index) + " Effect:";
+ size_t size = sizeof(slider_state) + description.length();
+ slider_state *state = reinterpret_cast<slider_state *>(auto_alloc_array_clear(m_machine, UINT8, size));
+
+ state->minval = 0;
+ state->defval = m_current_chain[screen_index];
+ state->maxval = m_available_chains.size() - 1;
+ state->incval = 1;
+ state->update = update_trampoline;
+ state->arg = this;
+ state->id = screen_index;
+ strcpy(state->description, description.c_str());
+
+ ui_menu_item item;
+ item.text = state->description;
+ item.subtext = "";
+ item.flags = 0;
+ item.ref = state;
+ item.type = ui_menu_item_type::SLIDER;
+ m_selection_sliders.push_back(item);
}
uint32_t chain_manager::handle_screen_chains(uint32_t view, render_primitive *starting_prim, osd_window& window)
{
- std::vector<render_primitive*> screens = count_screens(starting_prim);
-
- if (screens.size() == 0)
- {
- return 0;
- }
-
- // Process each screen as necessary
- uint32_t used_views = 0;
- uint32_t screen_index = 0;
- for (render_primitive* prim : screens)
- {
- if (m_current_chain[screen_index] == CHAIN_NONE || screen_chain(screen_index) == nullptr)
- {
+ std::vector<render_primitive*> screens = count_screens(starting_prim);
+
+ if (screens.size() == 0)
+ {
+ return 0;
+ }
+
+ // Process each screen as necessary
+ uint32_t used_views = 0;
+ uint32_t screen_index = 0;
+ for (render_primitive* prim : screens)
+ {
+ if (m_current_chain[screen_index] == CHAIN_NONE || screen_chain(screen_index) == nullptr)
+ {
screen_index++;
- continue;
- }
+ continue;
+ }
- uint16_t screen_width(floor((prim->bounds.x1 - prim->bounds.x0) + 0.5f));
- uint16_t screen_height(floor((prim->bounds.y1 - prim->bounds.y0) + 0.5f));
- if (window.swap_xy())
- {
- std::swap(screen_width, screen_height);
- }
+ uint16_t screen_width(floor((prim->bounds.x1 - prim->bounds.x0) + 0.5f));
+ uint16_t screen_height(floor((prim->bounds.y1 - prim->bounds.y0) + 0.5f));
+ if (window.swap_xy())
+ {
+ std::swap(screen_width, screen_height);
+ }
- m_targets.update_target_sizes(screen_index, screen_width, screen_height, TARGET_STYLE_NATIVE);
- process_screen_quad(view + used_views, screen_index, prim, window);
- used_views += screen_chain(screen_index)->applicable_passes();
+ m_targets.update_target_sizes(screen_index, screen_width, screen_height, TARGET_STYLE_NATIVE);
+ process_screen_quad(view + used_views, screen_index, prim, window);
+ used_views += screen_chain(screen_index)->applicable_passes();
- screen_index++;
- }
+ screen_index++;
+ }
- bgfx::setViewFrameBuffer(view + used_views, BGFX_INVALID_HANDLE);
+ bgfx::setViewFrameBuffer(view + used_views, BGFX_INVALID_HANDLE);
- return used_views;
+ return used_views;
}
bool chain_manager::has_applicable_chain(uint32_t screen)
{
- return screen < m_screen_count && m_current_chain[screen] != CHAIN_NONE && m_screen_chains[screen] != nullptr;
+ return screen < m_screen_count && m_current_chain[screen] != CHAIN_NONE && m_screen_chains[screen] != nullptr;
}
bool chain_manager::needs_sliders()
@@ -464,79 +464,79 @@ bool chain_manager::needs_sliders()
void chain_manager::restore_slider_settings(int32_t id, std::vector<std::vector<float>>& settings)
{
- if (!needs_sliders())
- {
- return;
- }
+ if (!needs_sliders())
+ {
+ return;
+ }
- for (size_t index = 0; index < m_screen_chains.size() && index < m_screen_count; index++)
- {
+ for (size_t index = 0; index < m_screen_chains.size() && index < m_screen_count; index++)
+ {
if (index == id)
{
continue;
}
- bgfx_chain* chain = m_screen_chains[index];
- if (chain == nullptr)
- {
- continue;
- }
+ bgfx_chain* chain = m_screen_chains[index];
+ if (chain == nullptr)
+ {
+ continue;
+ }
- std::vector<bgfx_slider*> chain_sliders = chain->sliders();
+ std::vector<bgfx_slider*> chain_sliders = chain->sliders();
for (size_t slider = 0; slider < chain_sliders.size(); slider++)
{
chain_sliders[slider]->import(settings[index][slider]);
}
- }
+ }
}
std::vector<std::vector<float>> chain_manager::slider_settings()
{
std::vector<std::vector<float>> curr;
- if (!needs_sliders())
- {
- return curr;
- }
+ if (!needs_sliders())
+ {
+ return curr;
+ }
- for (size_t index = 0; index < m_screen_chains.size() && index < m_screen_count; index++)
- {
+ for (size_t index = 0; index < m_screen_chains.size() && index < m_screen_count; index++)
+ {
curr.push_back(std::vector<float>());
- bgfx_chain* chain = m_screen_chains[index];
- if (chain == nullptr)
- {
- continue;
- }
+ bgfx_chain* chain = m_screen_chains[index];
+ if (chain == nullptr)
+ {
+ continue;
+ }
- std::vector<bgfx_slider*> chain_sliders = chain->sliders();
- for (bgfx_slider* slider : chain_sliders)
- {
+ std::vector<bgfx_slider*> chain_sliders = chain->sliders();
+ for (bgfx_slider* slider : chain_sliders)
+ {
curr[index].push_back(slider->value());
- }
- }
+ }
+ }
- return curr;
+ return curr;
}
std::vector<ui_menu_item> chain_manager::get_slider_list()
{
std::vector<ui_menu_item> sliders;
- if (!needs_sliders())
- {
- return sliders;
- }
+ if (!needs_sliders())
+ {
+ return sliders;
+ }
- for (size_t index = 0; index < m_screen_chains.size() && index < m_screen_count; index++)
- {
- bgfx_chain* chain = m_screen_chains[index];
+ for (size_t index = 0; index < m_screen_chains.size() && index < m_screen_count; index++)
+ {
+ bgfx_chain* chain = m_screen_chains[index];
sliders.push_back(m_selection_sliders[index]);
- if (chain == nullptr)
- {
- continue;
- }
+ if (chain == nullptr)
+ {
+ continue;
+ }
std::vector<bgfx_chain_entry*> chain_entries = chain->entries();
for (bgfx_chain_entry* entry : chain_entries)
@@ -552,34 +552,34 @@ std::vector<ui_menu_item> chain_manager::get_slider_list()
}
}
- std::vector<bgfx_slider*> chain_sliders = chain->sliders();
- for (bgfx_slider* slider : chain_sliders)
- {
- slider_state* core_slider = slider->core_slider();
-
- ui_menu_item item;
- item.text = core_slider->description;
- item.subtext = "";
- item.flags = 0;
- item.ref = core_slider;
- item.type = ui_menu_item_type::SLIDER;
- m_selection_sliders.push_back(item);
-
- sliders.push_back(item);
- }
-
- if (chain_sliders.size() > 0)
- {
- ui_menu_item item;
- item.text = MENU_SEPARATOR_ITEM;
- item.subtext = "";
- item.flags = 0;
- item.ref = nullptr;
- item.type = ui_menu_item_type::SEPARATOR;
-
- sliders.push_back(item);
+ std::vector<bgfx_slider*> chain_sliders = chain->sliders();
+ for (bgfx_slider* slider : chain_sliders)
+ {
+ slider_state* core_slider = slider->core_slider();
+
+ ui_menu_item item;
+ item.text = core_slider->description;
+ item.subtext = "";
+ item.flags = 0;
+ item.ref = core_slider;
+ item.type = ui_menu_item_type::SLIDER;
+ m_selection_sliders.push_back(item);
+
+ sliders.push_back(item);
+ }
+
+ if (chain_sliders.size() > 0)
+ {
+ ui_menu_item item;
+ item.text = MENU_SEPARATOR_ITEM;
+ item.subtext = "";
+ item.flags = 0;
+ item.ref = nullptr;
+ item.type = ui_menu_item_type::SEPARATOR;
+
+ sliders.push_back(item);
}
- }
+ }
- return sliders;
+ return sliders;
}
diff --git a/src/osd/modules/render/bgfx/chainmanager.h b/src/osd/modules/render/bgfx/chainmanager.h
index 0907cd27f57..979c487a237 100644
--- a/src/osd/modules/render/bgfx/chainmanager.h
+++ b/src/osd/modules/render/bgfx/chainmanager.h
@@ -49,10 +49,10 @@ public:
chain_manager(running_machine& machine, osd_options& options, texture_manager& textures, target_manager& targets, effect_manager& effects, uint32_t window_index, slider_dirty_notifier& slider_notifier);
~chain_manager();
- uint32_t handle_screen_chains(uint32_t view, render_primitive *starting_prim, osd_window& window);
- int32_t chain_changed(int32_t index, std::string *str, int32_t newval);
+ uint32_t handle_screen_chains(uint32_t view, render_primitive *starting_prim, osd_window& window);
+ int32_t chain_changed(int32_t index, std::string *str, int32_t newval);
- // Getters
+ // Getters
running_machine& machine() { return m_machine; }
osd_options& options() { return m_options; }
texture_manager& textures() { return m_textures; }
@@ -61,48 +61,48 @@ public:
slider_dirty_notifier& slider_notifier() { return m_slider_notifier; }
uint32_t window_index() { return m_window_index; }
uint32_t screen_count() { return m_screen_count; }
- bgfx_chain* screen_chain(uint32_t screen);
- bgfx_chain* load_chain(std::string name, uint32_t screen_index);
- bool has_applicable_chain(uint32_t screen);
- std::vector<ui_menu_item> get_slider_list();
- std::vector<std::vector<float>> slider_settings();
+ bgfx_chain* screen_chain(ui