From 7238415d1f30cae0b47e54dd04eb0b5e558c132e Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 27 Nov 2016 09:56:49 +1100 Subject: srcclean (nw) --- hash/bbcb_flop.xml | 92 +- hash/megadriv.xml | 2 +- hash/pico.xml | 16 +- hash/sawatte.xml | 4 +- hash/sms.xml | 4 +- hash/snes.xml | 2 +- plugins/README.md | 2 +- plugins/cheat/plugin.json | 6 +- plugins/cheatfind/plugin.json | 6 +- plugins/console/plugin.json | 6 +- plugins/data/load_dat.lua | 2 +- plugins/data/plugin.json | 6 +- plugins/dummy/plugin.json | 8 +- plugins/hiscore/plugin.json | 8 +- plugins/json/plugin.json | 8 +- plugins/layout/plugin.json | 6 +- plugins/timer/init.lua | 22 +- plugins/timer/plugin.json | 6 +- scripts/src/3rdparty.lua | 6 +- scripts/src/main.lua | 4 +- scripts/src/osd/uwp.lua | 12 +- scripts/src/tests.lua | 2 +- scripts/target/mame/arcade.lua | 2 +- src/devices/bus/hp9845_io/98034.cpp | 14 +- src/devices/bus/hp9845_io/98035.cpp | 56 +- src/devices/bus/hp9845_io/98035.h | 14 +- src/devices/bus/hp9845_io/hp9845_io.h | 4 +- src/devices/cpu/arc/arcdasm.cpp | 2 +- src/devices/cpu/arm/arm.cpp | 2 +- src/devices/cpu/asap/asapdasm.cpp | 2 +- src/devices/cpu/dsp16/dsp16dis.cpp | 2 +- src/devices/cpu/dsp32/dsp32dis.cpp | 6 +- src/devices/cpu/h6280/6280dasm.cpp | 2 +- src/devices/cpu/m6809/6x09dasm.cpp | 1424 ++++++++++---------- src/devices/cpu/mips/mips3.h | 2 +- src/devices/cpu/mips/mips3drc.cpp | 2 +- src/devices/cpu/nanoprocessor/nanoprocessor.cpp | 6 +- src/devices/cpu/nanoprocessor/nanoprocessor.h | 24 +- .../cpu/nanoprocessor/nanoprocessor_dasm.cpp | 4 +- src/devices/cpu/rsp/rsp.cpp | 2 +- src/devices/cpu/sh4/sh4.cpp | 6 +- src/devices/cpu/sh4/sh4.h | 2 +- src/devices/cpu/sh4/sh4comn.cpp | 64 +- src/devices/cpu/tlcs90/tlcs90.cpp | 32 +- src/devices/cpu/tms34010/34010dsm.cpp | 2 +- src/devices/cpu/tms9900/tms9900.cpp | 8 +- src/devices/machine/68230pit.cpp | 8 +- src/devices/machine/7400.cpp | 2 +- src/devices/machine/7400.h | 28 +- src/devices/machine/7404.cpp | 2 +- src/devices/machine/7404.h | 52 +- src/devices/machine/74161.cpp | 2 +- src/devices/machine/74161.h | 76 +- src/devices/machine/74175.cpp | 4 +- src/devices/machine/74175.h | 60 +- src/devices/machine/82s129.cpp | 2 +- src/devices/machine/82s129.h | 48 +- src/devices/machine/aakart.cpp | 2 +- src/devices/machine/am2847.h | 38 +- src/devices/machine/com8116.h | 4 +- src/devices/machine/dm9334.cpp | 2 +- src/devices/machine/dm9334.h | 100 +- src/devices/machine/fga002.cpp | 14 +- src/devices/machine/i82371sb.cpp | 78 +- src/devices/machine/i82371sb.h | 8 +- src/devices/machine/scnxx562.cpp | 12 +- src/devices/machine/z80dart.cpp | 4 +- src/devices/machine/z80scc.cpp | 46 +- src/devices/machine/z80scc.h | 68 +- src/devices/machine/z80sio.cpp | 12 +- src/devices/machine/z80sio.h | 4 +- src/devices/video/stvvdp2.cpp | 12 +- src/emu/addrmap.cpp | 6 +- src/emu/inpttype.h | 2 +- src/emu/layout/README.md | 2 +- src/frontend/mame/luaengine.cpp | 4 +- src/frontend/mame/ui/pluginopt.h | 4 +- src/lib/util/delegate.h | 6 +- src/mame/audio/rax.cpp | 60 +- src/mame/audio/rax.h | 58 +- src/mame/drivers/amusco.cpp | 6 +- src/mame/drivers/aristmk5.cpp | 1224 ++++++++--------- src/mame/drivers/aristmk6.cpp | 4 +- src/mame/drivers/bionicc.cpp | 4 +- src/mame/drivers/clshroad.cpp | 2 +- src/mame/drivers/concept.cpp | 6 +- src/mame/drivers/crystal.cpp | 24 +- src/mame/drivers/didact.cpp | 90 +- src/mame/drivers/dynduke.cpp | 2 +- src/mame/drivers/fccpu30.cpp | 70 +- src/mame/drivers/fcscsi.cpp | 2 +- src/mame/drivers/fidel6502.cpp | 6 +- src/mame/drivers/hazeltin.cpp | 248 ++-- src/mame/drivers/hh_tms1k.cpp | 6 +- src/mame/drivers/indy_indigo2.cpp | 16 +- src/mame/drivers/jangou.cpp | 2 +- src/mame/drivers/kron.cpp | 22 +- src/mame/drivers/lsasquad.cpp | 2 +- src/mame/drivers/mac128.cpp | 120 +- src/mame/drivers/micro20.cpp | 54 +- src/mame/drivers/mirage.cpp | 16 +- src/mame/drivers/mw8080bw.cpp | 24 +- src/mame/drivers/mzr8105.cpp | 22 +- src/mame/drivers/nightgal.cpp | 14 +- src/mame/drivers/octopus.cpp | 6 +- src/mame/drivers/pacman.cpp | 2 +- src/mame/drivers/pcipc.cpp | 12 +- src/mame/drivers/peplus.cpp | 2 +- src/mame/drivers/pg685.cpp | 20 +- src/mame/drivers/polepos.cpp | 8 +- src/mame/drivers/psikyosh.cpp | 6 +- src/mame/drivers/quizpun2.cpp | 30 +- src/mame/drivers/rainbow.cpp | 148 +- src/mame/drivers/risc2500.cpp | 14 +- src/mame/drivers/seta.cpp | 6 +- src/mame/drivers/statriv2.cpp | 6 +- src/mame/drivers/tumbleb.cpp | 2 +- src/mame/drivers/tv910.cpp | 112 +- src/mame/drivers/tv950.cpp | 2 +- src/mame/drivers/zn.cpp | 4 +- src/mame/drivers/zorba.cpp | 2 +- src/mame/includes/apple2gs.h | 6 +- src/mame/includes/darkmist.h | 2 +- src/mame/includes/lsasquad.h | 2 +- src/mame/layout/README.md | 2 +- src/mame/layout/esbattle.lay | 2 +- src/mame/layout/risc2500.lay | 20 +- src/mame/machine/apple2gs.cpp | 18 +- src/mame/machine/atarixga.cpp | 38 +- src/mame/machine/atarixga.h | 16 +- src/mame/machine/cedar_magnet_board.h | 2 +- src/mame/machine/cedar_magnet_sound.cpp | 20 +- src/mame/machine/cedar_magnet_sound.h | 4 +- src/mame/machine/fmt_icmem.cpp | 2 +- src/mame/machine/fmt_icmem.h | 2 +- src/mame/machine/msx_matsushita.cpp | 2 +- src/mame/machine/znmcu.cpp | 2 +- src/mame/mame.lst | 10 +- src/mame/video/darkmist.cpp | 20 +- src/osd/eivc.h | 2 +- src/osd/modules/debugger/osx/debugconsole.mm | 34 +- src/osd/modules/debugger/osx/debugview.mm | 24 +- src/osd/modules/debugger/osx/debugwindowhandler.mm | 2 +- src/osd/modules/debugger/osx/deviceinfoviewer.mm | 6 +- src/osd/modules/debugger/osx/devicesviewer.mm | 12 +- src/osd/modules/debugger/osx/disassemblyview.mm | 12 +- src/osd/modules/debugger/osx/disassemblyviewer.mm | 12 +- src/osd/modules/debugger/osx/errorlogviewer.mm | 6 +- src/osd/modules/debugger/osx/memoryview.mm | 22 +- src/osd/modules/debugger/osx/memoryviewer.mm | 8 +- src/osd/modules/debugger/osx/pointsviewer.mm | 10 +- src/osd/modules/debugger/osx/registersview.mm | 6 +- src/osd/modules/font/font_dwrite.cpp | 2 +- src/osd/modules/input/input_module.h | 2 +- src/osd/modules/input/input_uwp.cpp | 52 +- src/osd/modules/render/d3d/d3dcomm.h | 2 +- src/osd/modules/render/drawd3d.h | 2 +- src/osd/modules/sound/xaudio2_sound.cpp | 2 +- src/osd/uwp/uwpcompat.cpp | 2 +- src/osd/uwp/window.cpp | 20 +- src/osd/windows/winmain.cpp | 4 +- src/tools/aueffectutil.mm | 8 +- src/tools/imgtool/imgtool.cpp | 4 +- src/tools/imgtool/library.h | 2 +- 164 files changed, 2771 insertions(+), 2769 deletions(-) diff --git a/hash/bbcb_flop.xml b/hash/bbcb_flop.xml index 2df54c26461..6463c9774f9 100644 --- a/hash/bbcb_flop.xml +++ b/hash/bbcb_flop.xml @@ -50,11 +50,11 @@ @@ -360,12 +360,12 @@ @@ -1074,11 +1074,11 @@ @@ -1299,11 +1299,11 @@ @@ -1342,16 +1342,16 @@ @@ -1367,16 +1367,16 @@ @@ -1390,11 +1390,11 @@ diff --git a/hash/megadriv.xml b/hash/megadriv.xml index d2b1b7e2e16..cad9024a60d 100644 --- a/hash/megadriv.xml +++ b/hash/megadriv.xml @@ -1681,7 +1681,7 @@ Info on Sega chip labels (from Sunbeam / Digital Corruption) - + Cool Spot (Euro, Prototype) 1993 diff --git a/hash/pico.xml b/hash/pico.xml index 4fc2fa3cc21..f0b33dd69cd 100644 --- a/hash/pico.xml +++ b/hash/pico.xml @@ -662,7 +662,7 @@ Published by Others (T-yyy*** serial codes, for yyy depending on the publisher) - + Cooking Pico (Kor) @@ -675,7 +675,7 @@ Published by Others (T-yyy*** serial codes, for yyy depending on the publisher) - + Crayola - Create a World (USA) 19?? @@ -4757,8 +4757,8 @@ But how do later protos fit with this theory? Maybe the later protos were from t - - + + UltraHero (Jpn) 1995 @@ -5151,8 +5151,8 @@ But how do later protos fit with this theory? Maybe the later protos were from t - - + + Heisei Kyouiku Iinkai Jr. (Jpn, Prototype) 1995 @@ -6057,7 +6057,7 @@ But how do later protos fit with this theory? Maybe the later protos were from t - + Muat Tago Galka (Kor) @@ -6069,7 +6069,7 @@ But how do later protos fit with this theory? Maybe the later protos were from t - + Dreamland Tour (Kor) diff --git a/hash/sawatte.xml b/hash/sawatte.xml index ecb9d48af11..d19585c6784 100644 --- a/hash/sawatte.xml +++ b/hash/sawatte.xml @@ -29,7 +29,7 @@ - + Mickey no Kudamonoya-san 1996 @@ -102,7 +102,7 @@ - + Tokyo Disneyland - Mickey no Nakayoshi Tankentai 1998 diff --git a/hash/sms.xml b/hash/sms.xml index 26bc45410b8..d4b2592e4fb 100644 --- a/hash/sms.xml +++ b/hash/sms.xml @@ -7600,10 +7600,10 @@ - + - + diff --git a/hash/snes.xml b/hash/snes.xml index d3a430f1d3b..c3f47ec1ac4 100644 --- a/hash/snes.xml +++ b/hash/snes.xml @@ -2907,7 +2907,7 @@ Beyond that last category are the roms waiting to be classified. - + Tecmo Super NBA Basketball (USA, Prototype 19921026) diff --git a/plugins/README.md b/plugins/README.md index bb222b77f68..de97ed84391 100644 --- a/plugins/README.md +++ b/plugins/README.md @@ -1,3 +1,3 @@ # **Plugins** # -LUA plugins contains code from various sources so license is per file. \ No newline at end of file +LUA plugins contains code from various sources so license is per file. diff --git a/plugins/cheat/plugin.json b/plugins/cheat/plugin.json index 4067fdbc479..08f77a68793 100644 --- a/plugins/cheat/plugin.json +++ b/plugins/cheat/plugin.json @@ -1,9 +1,9 @@ { "plugin": { - "name": "cheat", + "name": "cheat", "description": "Cheat plugin", - "version": "0.0.1", - "author": "Carl", + "version": "0.0.1", + "author": "Carl", "type": "plugin", "start": "false" } diff --git a/plugins/cheatfind/plugin.json b/plugins/cheatfind/plugin.json index 8316cb5f334..a4ecb052712 100644 --- a/plugins/cheatfind/plugin.json +++ b/plugins/cheatfind/plugin.json @@ -1,9 +1,9 @@ { "plugin": { - "name": "cheatfind", + "name": "cheatfind", "description": "Cheat finder helper library", - "version": "0.0.1", - "author": "Carl", + "version": "0.0.1", + "author": "Carl", "type": "plugin", "start": "false" } diff --git a/plugins/console/plugin.json b/plugins/console/plugin.json index 182bb887785..6ada19c52a8 100644 --- a/plugins/console/plugin.json +++ b/plugins/console/plugin.json @@ -1,9 +1,9 @@ { "plugin": { - "name": "console", + "name": "console", "description": "Console plugin", - "version": "0.0.1", - "author": "Carl", + "version": "0.0.1", + "author": "Carl", "type": "plugin", "start": "false" } diff --git a/plugins/data/load_dat.lua b/plugins/data/load_dat.lua index 881ed40f5b3..4a9fa9b67b6 100644 --- a/plugins/data/load_dat.lua +++ b/plugins/data/load_dat.lua @@ -49,7 +49,7 @@ function datfile.open(file, vertag, fixupcb) dbver = stmt:get_value(0) end stmt:finalize() - + if not dbver then db:exec("CREATE TABLE \"" .. file .. [[_idx" ( type VARCHAR NOT NULL, diff --git a/plugins/data/plugin.json b/plugins/data/plugin.json index 89c36d6bd36..d2f64d0efc7 100644 --- a/plugins/data/plugin.json +++ b/plugins/data/plugin.json @@ -1,9 +1,9 @@ { "plugin": { - "name": "data", + "name": "data", "description": "Data plugin", - "version": "0.0.1", - "author": "Carl", + "version": "0.0.1", + "author": "Carl", "type": "plugin", "start": "true" } diff --git a/plugins/dummy/plugin.json b/plugins/dummy/plugin.json index 45c14b019e7..9ce532139aa 100644 --- a/plugins/dummy/plugin.json +++ b/plugins/dummy/plugin.json @@ -1,10 +1,10 @@ { "plugin": { - "name": "dummy", + "name": "dummy", "description": "Dummy test plugin", - "version": "0.0.1", - "author": "Miodrag Milanovic", + "version": "0.0.1", + "author": "Miodrag Milanovic", "type": "plugin", "start": "false" } -} \ No newline at end of file +} diff --git a/plugins/hiscore/plugin.json b/plugins/hiscore/plugin.json index 38d81289a63..62e02e431d6 100644 --- a/plugins/hiscore/plugin.json +++ b/plugins/hiscore/plugin.json @@ -1,10 +1,10 @@ { "plugin": { - "name": "hiscore", + "name": "hiscore", "description": "Hiscore support", - "version": "1.0.0", - "author": "borgar@borgar.net", + "version": "1.0.0", + "author": "borgar@borgar.net", "type": "plugin", "start": "false" } -} \ No newline at end of file +} diff --git a/plugins/json/plugin.json b/plugins/json/plugin.json index c089e2cf178..28ddb388fcc 100644 --- a/plugins/json/plugin.json +++ b/plugins/json/plugin.json @@ -1,9 +1,9 @@ { "plugin": { - "name": "json", + "name": "json", "description": "json library", - "version": "2.5.0", - "author": "David Kolf", + "version": "2.5.0", + "author": "David Kolf", "type": "library" } -} \ No newline at end of file +} diff --git a/plugins/layout/plugin.json b/plugins/layout/plugin.json index e50da000893..996e09d6a07 100644 --- a/plugins/layout/plugin.json +++ b/plugins/layout/plugin.json @@ -1,9 +1,9 @@ { "plugin": { - "name": "layout", + "name": "layout", "description": "Layout helper plugin", - "version": "0.0.1", - "author": "Carl", + "version": "0.0.1", + "author": "Carl", "type": "plugin", "start": "false" } diff --git a/plugins/timer/init.lua b/plugins/timer/init.lua index c0f47836398..b5b6d355a03 100644 --- a/plugins/timer/init.lua +++ b/plugins/timer/init.lua @@ -23,18 +23,18 @@ function timer.startplugin() total_time = total_time + (os.time() - start_time) local db = assert(sqlite3.open(timer_db)) - + local insert_stmt = assert( db:prepare("INSERT OR IGNORE INTO timer VALUES (?, ?, 0, 0)") ) insert_stmt:bind_values(emu.romname(), emu.softname()) insert_stmt:step() insert_stmt:reset() - + local update_stmt = assert( db:prepare("UPDATE timer SET total_time=?, play_count=? WHERE driver=? AND software=?") ) update_stmt:bind_values(total_time, play_count,emu.romname(), emu.softname()) update_stmt:step() update_stmt:reset() - - assert(db:close() == sqlite3.OK) + + assert(db:close() == sqlite3.OK) end @@ -48,13 +48,13 @@ function timer.startplugin() local db = assert(sqlite3.open(timer_db)) local found=false db:exec([[select * from sqlite_master where name='timer';]], function(...) found=true return 0 end) - if not found then + if not found then db:exec[[ CREATE TABLE timer ( - driver VARCHAR(32) PRIMARY KEY, - software VARCHAR(40), - total_time INTEGER NOT NULL, - play_count INTEGER NOT NULL - ); ]] + driver VARCHAR(32) PRIMARY KEY, + software VARCHAR(40), + total_time INTEGER NOT NULL, + play_count INTEGER NOT NULL + ); ]] end local stmt, row @@ -69,7 +69,7 @@ function timer.startplugin() total_time = 0 end - assert(db:close() == sqlite3.OK) + assert(db:close() == sqlite3.OK) start_time = os.time() play_count = play_count + 1 diff --git a/plugins/timer/plugin.json b/plugins/timer/plugin.json index 3c4629ba60d..005a0fad9a4 100644 --- a/plugins/timer/plugin.json +++ b/plugins/timer/plugin.json @@ -1,9 +1,9 @@ { "plugin": { - "name": "timer", + "name": "timer", "description": "Timer plugin", - "version": "0.0.1", - "author": "Carl", + "version": "0.0.1", + "author": "Carl", "type": "plugin", "start": "false" } diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 3eced474d17..8bdc39eddb0 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -587,7 +587,7 @@ end forcedincludes { MAME_DIR .. "src/osd/uwp/uwpcompat.h" } - + configuration {} files { @@ -1521,12 +1521,12 @@ end "-Wno-discarded-qualifiers", "-Wno-unused-but-set-variable", } - + configuration { "mingw-clang"} buildoptions_c { "-Wno-incompatible-pointer-types-discards-qualifiers" } - + configuration { "osx*"} buildoptions { "-Wno-undef", diff --git a/scripts/src/main.lua b/scripts/src/main.lua index a5559ef151b..ccc0eb30236 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -86,7 +86,7 @@ end } configuration "**/scripts/resources/uwp/assets/*.png" flags { "DeploymentContent" } - + -- Effects and Shaders configuration { "winstore*" } files { @@ -233,7 +233,7 @@ end } if (STANDALONE~=true) then links { - "frontend", + "frontend", } end if (MACHINES["NETLIST"]~=null) then diff --git a/scripts/src/osd/uwp.lua b/scripts/src/osd/uwp.lua index 540116fe018..47e8e149e24 100644 --- a/scripts/src/osd/uwp.lua +++ b/scripts/src/osd/uwp.lua @@ -43,10 +43,10 @@ project ("osd_" .. _OPTIONS["osd"]) removeflags { "SingleOutputDir", } - + dofile("uwp_cfg.lua") osdmodulesbuild() - + includedirs { MAME_DIR .. "src/emu", MAME_DIR .. "src/devices", -- accessing imagedev from debugger @@ -80,17 +80,17 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/uwp/uwpcompat.h", MAME_DIR .. "src/osd/osdepend.h", } - + project ("ocore_" .. _OPTIONS["osd"]) uuid (os.uuid("ocore_" .. _OPTIONS["osd"])) kind (LIBTYPE) removeflags { - "SingleOutputDir", + "SingleOutputDir", } dofile("uwp_cfg.lua") - + includedirs { MAME_DIR .. "3rdparty", MAME_DIR .. "src/emu", @@ -99,7 +99,7 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", } - + files { MAME_DIR .. "src/osd/osdcomm.h", MAME_DIR .. "src/osd/osdcore.cpp", diff --git a/scripts/src/tests.lua b/scripts/src/tests.lua index 7b4185f5005..cb0bd3ee3ad 100644 --- a/scripts/src/tests.lua +++ b/scripts/src/tests.lua @@ -63,7 +63,7 @@ project("mametests") configuration { "rpi" } targetextension "" - + configuration { } links { diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index f3670262e62..84fbe513f1e 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -4575,7 +4575,7 @@ files { MAME_DIR .. "src/mame/drivers/quizo.cpp", MAME_DIR .. "src/mame/drivers/quizpun2.cpp", MAME_DIR .. "src/mame/audio/rax.cpp", - MAME_DIR .. "src/mame/audio/rax.h", + MAME_DIR .. "src/mame/audio/rax.h", MAME_DIR .. "src/mame/drivers/rbmk.cpp", MAME_DIR .. "src/mame/drivers/rcorsair.cpp", MAME_DIR .. "src/mame/drivers/re900.cpp", diff --git a/src/devices/bus/hp9845_io/98034.cpp b/src/devices/bus/hp9845_io/98034.cpp index 9dfec3a35c5..ab213c132ee 100644 --- a/src/devices/bus/hp9845_io/98034.cpp +++ b/src/devices/bus/hp9845_io/98034.cpp @@ -2,14 +2,14 @@ // copyright-holders: F. Ulivi /********************************************************************* - 98034.cpp + 98034.cpp - 98034 module (HPIB interface) + 98034 module (HPIB interface) - TODO: Implement Parallel Poll response + TODO: Implement Parallel Poll response - The main reference for this module is: - HP 98034-90001, 98034 Installation and Service Manual + The main reference for this module is: + HP 98034-90001, 98034 Installation and Service Manual *********************************************************************/ @@ -146,8 +146,8 @@ WRITE16_MEMBER(hp98034_io_card::reg_w) // ========== // 7-4 1 // 3-2 ~offset - // 1 0 - // 0 1 + // 1 0 + // 0 1 m_mode_reg = (uint8_t)((offset << 2) ^ 0xfd); m_force_flg = true; diff --git a/src/devices/bus/hp9845_io/98035.cpp b/src/devices/bus/hp9845_io/98035.cpp index 7f5718b497c..20f5f306c1d 100644 --- a/src/devices/bus/hp9845_io/98035.cpp +++ b/src/devices/bus/hp9845_io/98035.cpp @@ -93,16 +93,16 @@ #define BIT_SET(w , n) ((w) |= BIT_MASK(n)) // Frequency of digit multiplexing in clock chip -#define DIGIT_MUX_FREQ (XTAL_32_768kHz / 64) +#define DIGIT_MUX_FREQ (XTAL_32_768kHz / 64) // Duration of key presses -#define KEY_PRESS_SHORT 1 // 1.95 ms -#define KEY_PRESS_LONG 512 // 1 s +#define KEY_PRESS_SHORT 1 // 1.95 ms +#define KEY_PRESS_LONG 512 // 1 s // Mask of keys in m_clock_keys -#define KEY_READ_MASK 1 -#define KEY_SET_MASK 2 -#define KEY_CHG_MASK 4 +#define KEY_READ_MASK 1 +#define KEY_SET_MASK 2 +#define KEY_CHG_MASK 4 // Timers enum { @@ -112,33 +112,33 @@ enum { // 7-segment display // Mapping of 7 segments on NP input port is as follows: -// Bit Segment +// Bit Segment // ============ -// 7 N/U (1) -// 6 N/U (1) -// 5 Seg "G" -// 4 Seg "F" -// 3 Seg "E" -// 2 Seg "C" -// 1 Seg "B" -// 0 Seg "A" +// 7 N/U (1) +// 6 N/U (1) +// 5 Seg "G" +// 4 Seg "F" +// 3 Seg "E" +// 2 Seg "C" +// 1 Seg "B" +// 0 Seg "A" // // Segment "D" is not mapped as it's not needed to tell decimal digits apart. // A segment is ON when its bit is "0". -#define SEVEN_SEG_OFF 0xff // All segments off -#define SEVEN_SEG_A 0xc0 // "A" -#define SEVEN_SEG_P 0xc4 // "P" +#define SEVEN_SEG_OFF 0xff // All segments off +#define SEVEN_SEG_A 0xc0 // "A" +#define SEVEN_SEG_P 0xc4 // "P" static const uint8_t dec_2_seven_segs[] = { - 0xe0, // 0 - 0xf9, // 1 - 0xd4, // 2 - 0xd8, // 3 - 0xc9, // 4 - 0xca, // 5 - 0xc2, // 6 - 0xf8, // 7 - 0xc0, // 8 - 0xc8 // 9 + 0xe0, // 0 + 0xf9, // 1 + 0xd4, // 2 + 0xd8, // 3 + 0xc9, // 4 + 0xca, // 5 + 0xc2, // 6 + 0xf8, // 7 + 0xc0, // 8 + 0xc8 // 9 }; hp98035_io_card::hp98035_io_card(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/hp9845_io/98035.h b/src/devices/bus/hp9845_io/98035.h index e0b034c80ea..fb190b30a98 100644 --- a/src/devices/bus/hp9845_io/98035.h +++ b/src/devices/bus/hp9845_io/98035.h @@ -83,13 +83,13 @@ private: // Clock chip emulation typedef enum { - CLOCK_OFF, // Display OFF - CLOCK_HHMM, // Show HH:mm - CLOCK_SS, // Show :SS - CLOCK_HH, // Show HH: A/P - CLOCK_MIN, // Show :mm - CLOCK_MON, // Show MM: - CLOCK_DOM, // Show :DD + CLOCK_OFF, // Display OFF + CLOCK_HHMM, // Show HH:mm + CLOCK_SS, // Show :SS + CLOCK_HH, // Show HH: A/P + CLOCK_MIN, // Show :mm + CLOCK_MON, // Show MM: + CLOCK_DOM, // Show :DD } clock_state_t; emu_timer *m_clock_timer; diff --git a/src/devices/bus/hp9845_io/hp9845_io.h b/src/devices/bus/hp9845_io/hp9845_io.h index 1c159fc862a..36ef8025039 100644 --- a/src/devices/bus/hp9845_io/hp9845_io.h +++ b/src/devices/bus/hp9845_io/hp9845_io.h @@ -21,9 +21,9 @@ #define HP9845_IO_FIRST_SC 1 // Lowest SC used by I/O cards -#define MCFG_HP9845_IO_SC(_default_sc) \ +#define MCFG_HP9845_IO_SC(_default_sc) \ PORT_START("SC") \ - PORT_CONFNAME(0xf , (_default_sc) - HP9845_IO_FIRST_SC , "Select Code") \ + PORT_CONFNAME(0xf , (_default_sc) - HP9845_IO_FIRST_SC , "Select Code") \ PORT_CONFSETTING(0 , "1")\ PORT_CONFSETTING(1 , "2")\ PORT_CONFSETTING(2 , "3")\ diff --git a/src/devices/cpu/arc/arcdasm.cpp b/src/devices/cpu/arc/arcdasm.cpp index 752ece7a150..e8c2d425736 100644 --- a/src/devices/cpu/arc/arcdasm.cpp +++ b/src/devices/cpu/arc/arcdasm.cpp @@ -180,7 +180,7 @@ static const char *regnames[0x40] = #define ARC_REGOP_SHIMM ((op & 0x000001ff) >> 0 ) // aka D -CPU_DISASSEMBLE(arc) +CPU_DISASSEMBLE(arc) { uint32_t op = oprom[0] | (oprom[1] << 8) | (oprom[2] << 16) | (oprom[3] << 24); op = big_endianize_int32(op); diff --git a/src/devices/cpu/arm/arm.cpp b/src/devices/cpu/arm/arm.cpp index a46bdb03ed6..eb4de54e86d 100644 --- a/src/devices/cpu/arm/arm.cpp +++ b/src/devices/cpu/arm/arm.cpp @@ -1182,7 +1182,7 @@ void arm_cpu_device::HandleMemBlock( uint32_t insn ) } else result = loadDec( insn&0xffff, rbp, insn&INSN_BDT_S, &deferredR15, &defer ); - + if (insn & INSN_BDT_W) { if (rb==0xf) diff --git a/src/devices/cpu/asap/asapdasm.cpp b/src/devices/cpu/asap/asapdasm.cpp index f26c6db046f..840c50f2635 100644 --- a/src/devices/cpu/asap/asapdasm.cpp +++ b/src/devices/cpu/asap/asapdasm.cpp @@ -141,6 +141,6 @@ CPU_DISASSEMBLE(asap) util::stream_format(stream, "jmp%s %s[%s]", setcond[cond], reg[rsrc1], src2(op,2)); break; case 0x1f: util::stream_format(stream, "trap $1f"); flags = DASMFLAG_STEP_OVER; break; - } + } return 4 | flags | DASMFLAG_SUPPORTED; } diff --git a/src/devices/cpu/dsp16/dsp16dis.cpp b/src/devices/cpu/dsp16/dsp16dis.cpp index c1166dd105f..eb371719cb6 100644 --- a/src/devices/cpu/dsp16/dsp16dis.cpp +++ b/src/devices/cpu/dsp16/dsp16dis.cpp @@ -339,7 +339,7 @@ CPU_DISASSEMBLE(dsp16a) std::string fString = disasmF1Field(F1, D, S); std::string xString = (X ? "*pt++i" : "*pt++"); std::string aString = (opcode == 0x19) ? "a0" : "a1"; - + if (Y != 0x00) util::stream_format(stream, "UNKNOWN"); else diff --git a/src/devices/cpu/dsp32/dsp32dis.cpp b/src/devices/cpu/dsp32/dsp32dis.cpp index aaf9dc63abb..88399882df9 100644 --- a/src/devices/cpu/dsp32/dsp32dis.cpp +++ b/src/devices/cpu/dsp32/dsp32dis.cpp @@ -313,13 +313,13 @@ static unsigned dasm_dsp32(std::ostream &stream, unsigned pc, uint32_t op) util::stream_format(stream, "a%d = %s(%s)", (op >> 21) & 3, // aN functable[(op >> 23) & 15], // G - dasm_XYZ((op >> 7) & 0x7f)); // Y + dasm_XYZ((op >> 7) & 0x7f)); // Y else util::stream_format(stream, "%s = a%d = %s(%s)", - dasm_XYZ((op >> 0) & 0x7f), // Z + dasm_XYZ((op >> 0) & 0x7f), // Z (op >> 21) & 3, // aN functable[(op >> 23) & 15], // G - dasm_XYZ((op >> 7) & 0x7f)); // Y + dasm_XYZ((op >> 7) & 0x7f)); // Y break; /* CA formats 0/1 */ diff --git a/src/devices/cpu/h6280/6280dasm.cpp b/src/devices/cpu/h6280/6280dasm.cpp index 5679ab17226..c214a058c52 100644 --- a/src/devices/cpu/h6280/6280dasm.cpp +++ b/src/devices/cpu/h6280/6280dasm.cpp @@ -249,6 +249,6 @@ CPU_DISASSEMBLE(h6280) default: util::stream_format(stream, "%-5s$%02X", token[opc], OP >> 1); - } + } return (PC - pc) | flags | DASMFLAG_SUPPORTED; } diff --git a/src/devices/cpu/m6809/6x09dasm.cpp b/src/devices/cpu/m6809/6x09dasm.cpp index 1018db9385c..7d2e262ff13 100644 --- a/src/devices/cpu/m6809/6x09dasm.cpp +++ b/src/devices/cpu/m6809/6x09dasm.cpp @@ -3,17 +3,17 @@ /***************************************************************************** 6x09dasm.cpp - a 6809/6309/Konami opcode disassembler - - Based on: - 6809dasm.c - a 6809 opcode disassembler - Version 1.0 5-AUG-2000 - Copyright Tim Lindner - and + Based on: + 6809dasm.c - a 6809 opcode disassembler + Version 1.0 5-AUG-2000 + Copyright Tim Lindner - 6809dasm.c - a 6809 opcode disassembler - Version 1.4 1-MAR-95 - Copyright Sean Riddle + and + + 6809dasm.c - a 6809 opcode disassembler + Version 1.4 1-MAR-95 + Copyright Sean Riddle Thanks to Franklin Bowen for bug fixes, ideas @@ -32,8 +32,8 @@ enum m6x09_addressing_mode { INH, // Inherent - PSHS, PSHU, // Push - PULS, PULU, // Pull + PSHS, PSHU, // Push + PULS, PULU, // Pull DIR, // Direct DIR_IM, // Direct in memory (6309 only) IND, // Indexed @@ -72,12 +72,12 @@ public: const char *name() const { return m_name; } private: - uint16_t m_opcode; // 8-bit opcode value - uint8_t m_length; // Opcode length in bytes - m6x09_addressing_mode m_mode : 6; // Addressing mode - m6x09_instruction_level m_level : 2; // General, or 6309 only? - unsigned m_flags; // Disassembly flags - const char * m_name; // Opcode name + uint16_t m_opcode; // 8-bit opcode value + uint8_t m_length; // Opcode length in bytes + m6x09_addressing_mode m_mode : 6; // Addressing mode + m6x09_instruction_level m_level : 2; // General, or 6309 only? + unsigned m_flags; // Disassembly flags + const char * m_name; // Opcode name }; static const char *const m6x09_regs[5] = { "X", "Y", "U", "S", "PC" }; @@ -358,518 +358,518 @@ offs_t m6x09_disassembler_base::disassemble(std::ostream &stream, offs_t pc, con static const opcodeinfo m6x09_opcodes[] = { // Page 0 opcodes (single byte) - { 0x00, 2, "NEG", DIR, M6x09_GENERAL }, - { 0x01, 3, "OIM", DIR_IM, HD6309_EXCLUSIVE }, - { 0x02, 3, "AIM", DIR_IM, HD6309_EXCLUSIVE }, - { 0x03, 2, "COM", DIR, M6x09_GENERAL }, - { 0x04, 2, "LSR", DIR, M6x09_GENERAL }, - { 0x05, 3, "EIM", DIR_IM, HD6309_EXCLUSIVE }, - { 0x06, 2, "ROR", DIR, M6x09_GENERAL }, - { 0x07, 2, "ASR", DIR, M6x09_GENERAL }, - { 0x08, 2, "ASL", DIR, M6x09_GENERAL }, - { 0x09, 2, "ROL", DIR, M6x09_GENERAL }, - { 0x0A, 2, "DEC", DIR, M6x09_GENERAL }, - { 0x0B, 3, "TIM", DIR_IM, HD6309_EXCLUSIVE }, - { 0x0C, 2, "INC", DIR, M6x09_GENERAL }, - { 0x0D, 2, "TST", DIR, M6x09_GENERAL }, - { 0x0E, 2, "JMP", DIR, M6x09_GENERAL }, - { 0x0F, 2, "CLR", DIR, M6x09_GENERAL }, - - { 0x10, 1, "page1", PG1, M6x09_GENERAL }, - { 0x11, 1, "page2", PG2, M6x09_GENERAL }, - { 0x12, 1, "NOP", INH, M6x09_GENERAL }, - { 0x13, 1, "SYNC", INH, M6x09_GENERAL }, - { 0x14, 1, "SEXW", INH, HD6309_EXCLUSIVE }, - { 0x16, 3, "LBRA", LREL, M6x09_GENERAL }, - { 0x17, 3, "LBSR", LREL, M6x09_GENERAL, DASMFLAG_STEP_OVER }, - { 0x19, 1, "DAA", INH, M6x09_GENERAL }, - { 0x1A, 2, "ORCC", IMM, M6x09_GENERAL }, - { 0x1C, 2, "ANDCC", IMM, M6x09_GENERAL }, - { 0x1D, 1, "SEX", INH, M6x09_GENERAL }, - { 0x1E, 2, "EXG", IMM_RR, M6x09_GENERAL }, - { 0x1F, 2, "TFR", IMM_RR, M6x09_GENERAL }, - - { 0x20, 2, "BRA", REL, M6x09_GENERAL }, - { 0x21, 2, "BRN", REL, M6x09_GENERAL }, - { 0x22, 2, "BHI", REL, M6x09_GENERAL }, - { 0x23, 2, "BLS", REL, M6x09_GENERAL }, - { 0x24, 2, "BCC", REL, M6x09_GENERAL }, - { 0x25, 2, "BCS", REL, M6x09_GENERAL }, - { 0x26, 2, "BNE", REL, M6x09_GENERAL }, - { 0x27, 2, "BEQ", REL, M6x09_GENERAL }, - { 0x28, 2, "BVC", REL, M6x09_GENERAL }, - { 0x29, 2, "BVS", REL, M6x09_GENERAL }, - { 0x2A, 2, "BPL", REL, M6x09_GENERAL }, - { 0x2B, 2, "BMI", REL, M6x09_GENERAL }, - { 0x2C, 2, "BGE", REL, M6x09_GENERAL }, - { 0x2D, 2, "BLT", REL, M6x09_GENERAL }, - { 0x2E, 2, "BGT", REL, M6x09_GENERAL }, - { 0x2F, 2, "BLE", REL, M6x09_GENERAL }, - - { 0x30, 2, "LEAX", IND, M6x09_GENERAL }, - { 0x31, 2, "LEAY", IND, M6x09_GENERAL }, - { 0x32, 2, "LEAS", IND, M6x09_GENERAL }, - { 0x33, 2, "LEAU", IND, M6x09_GENERAL }, - { 0x34, 2, "PSHS", PSHS, M6x09_GENERAL }, - { 0x35, 2, "PULS", PULS, M6x09_GENERAL }, - { 0x36, 2, "PSHU", PSHU, M6x09_GENERAL }, - { 0x37, 2, "PULU", PULU, M6x09_GENERAL }, - { 0x39, 1, "RTS", INH , M6x09_GENERAL }, - { 0x3A, 1, "ABX", INH, M6x09_GENERAL }, - { 0x3B, 1, "RTI", INH, M6x09_GENERAL }, - { 0x3C, 2, "CWAI", IMM, M6x09_GENERAL }, - { 0x3D, 1, "MUL", INH, M6x09_GENERAL }, - { 0x3F, 1, "SWI", INH, M6x09_GENERAL }, - - { 0x40, 1, "NEGA", INH, M6x09_GENERAL }, - { 0x43, 1, "COMA", INH, M6x09_GENERAL }, - { 0x44, 1, "LSRA", INH, M6x09_GENERAL }, - { 0x46, 1, "RORA", INH, M6x09_GENERAL }, - { 0x47, 1, "ASRA", INH, M6x09_GENERAL }, - { 0x48, 1, "ASLA", INH, M6x09_GENERAL }, - { 0x49, 1, "ROLA", INH, M6x09_GENERAL }, - { 0x4A, 1, "DECA", INH, M6x09_GENERAL }, - { 0x4C, 1, "INCA", INH, M6x09_GENERAL }, - { 0x4D, 1, "TSTA", INH, M6x09_GENERAL }, - { 0x4F, 1, "CLRA", INH, M6x09_GENERAL }, - - { 0x50, 1, "NEGB", INH, M6x09_GENERAL }, - { 0x53, 1, "COMB", INH, M6x09_GENERAL }, - { 0x54, 1, "LSRB", INH, M6x09_GENERAL }, - { 0x56, 1, "RORB", INH, M6x09_GENERAL }, - { 0x57, 1, "ASRB", INH, M6x09_GENERAL }, - { 0x58, 1, "ASLB", INH, M6x09_GENERAL }, - { 0x59, 1, "ROLB", INH, M6x09_GENERAL }, - { 0x5A, 1, "DECB", INH, M6x09_GENERAL }, - { 0x5C, 1, "INCB", INH, M6x09_GENERAL }, - { 0x5D, 1, "TSTB", INH, M6x09_GENERAL }, - { 0x5F, 1, "CLRB", INH, M6x09_GENERAL }, - - { 0x60, 2, "NEG", IND, M6x09_GENERAL }, - { 0x61, 3, "OIM", IND, HD6309_EXCLUSIVE }, - { 0x62, 3, "AIM", IND, HD6309_EXCLUSIVE }, - { 0x63, 2, "COM", IND, M6x09_GENERAL }, - { 0x64, 2, "LSR", IND, M6x09_GENERAL }, - { 0x65, 3, "EIM", IND, HD6309_EXCLUSIVE }, - { 0x66, 2, "ROR", IND, M6x09_GENERAL }, - { 0x67, 2, "ASR", IND, M6x09_GENERAL }, - { 0x68, 2, "ASL", IND, M6x09_GENERAL }, - { 0x69, 2, "ROL", IND, M6x09_GENERAL }, - { 0x6A, 2, "DEC", IND, M6x09_GENERAL }, - { 0x6B, 3, "TIM", IND, HD6309_EXCLUSIVE }, - { 0x6C, 2, "INC", IND, M6x09_GENERAL }, - { 0x6D, 2, "TST", IND, M6x09_GENERAL }, - { 0x6E, 2, "JMP", IND, M6x09_GENERAL }, - { 0x6F, 2, "CLR", IND, M6x09_GENERAL }, - - { 0x70, 3, "NEG", EXT, M6x09_GENERAL }, - { 0x71, 4, "OIM", EXT, HD6309_EXCLUSIVE }, - { 0x72, 4, "AIM", EXT, HD6309_EXCLUSIVE }, - { 0x73, 3, "COM", EXT, M6x09_GENERAL }, - { 0x74, 3, "LSR", EXT, M6x09_GENERAL }, - { 0x75, 4, "EIM", EXT, HD6309_EXCLUSIVE }, - { 0x76, 3, "ROR", EXT, M6x09_GENERAL }, - { 0x77, 3, "ASR", EXT, M6x09_GENERAL }, - { 0x78, 3, "ASL", EXT, M6x09_GENERAL }, - { 0x79, 3, "ROL", EXT, M6x09_GENERAL }, - { 0x7A, 3, "DEC", EXT, M6x09_GENERAL }, - { 0x7B, 4, "TIM", EXT, HD6309_EXCLUSIVE }, - { 0x7C, 3, "INC", EXT, M6x09_GENERAL }, - { 0x7D, 3, "TST", EXT, M6x09_GENERAL }, - { 0x7E, 3, "JMP", EXT, M6x09_GENERAL }, - { 0x7F, 3, "CLR", EXT, M6x09_GENERAL }, - - { 0x80, 2, "SUBA", IMM, M6x09_GENERAL }, - { 0x81, 2, "CMPA", IMM, M6x09_GENERAL }, - { 0x82, 2, "SBCA", IMM, M6x09_GENERAL }, - { 0x83, 3, "SUBD", IMM, M6x09_GENERAL }, - { 0x84, 2, "ANDA", IMM, M6x09_GENERAL }, - { 0x85, 2, "BITA", IMM, M6x09_GENERAL }, - { 0x86, 2, "LDA", IMM, M6x09_GENERAL }, - { 0x88, 2, "EORA", IMM, M6x09_GENERAL }, - { 0x89, 2, "ADCA", IMM, M6x09_GENERAL }, - { 0x8A, 2, "ORA", IMM, M6x09_GENERAL }, - { 0x8B, 2, "ADDA", IMM, M6x09_GENERAL }, - { 0x8C, 3, "CMPX", IMM, M6x09_GENERAL }, - { 0x8D, 2, "BSR", REL, M6x09_GENERAL , DASMFLAG_STEP_OVER }, - { 0x8E, 3, "LDX", IMM, M6x09_GENERAL }, - - { 0x90, 2, "SUBA", DIR, M6x09_GENERAL }, - { 0x91, 2, "CMPA", DIR, M6x09_GENERAL }, - { 0x92, 2, "SBCA", DIR, M6x09_GENERAL }, - { 0x93, 2, "SUBD", DIR, M6x09_GENERAL }, - { 0x94, 2, "ANDA", DIR, M6x09_GENERAL }, - { 0x95, 2, "BITA", DIR, M6x09_GENERAL }, - { 0x96, 2, "LDA", DIR, M6x09_GENERAL }, - { 0x97, 2, "STA", DIR, M6x09_GENERAL }, - { 0x98, 2, "EORA", DIR, M6x09_GENERAL }, - { 0x99, 2, "ADCA", DIR, M6x09_GENERAL }, - { 0x9A, 2, "ORA", DIR, M6x09_GENERAL }, - { 0x9B, 2, "ADDA", DIR, M6x09_GENERAL }, - { 0x9C, 2, "CMPX", DIR, M6x09_GENERAL }, - { 0x9D, 2, "JSR", DIR, M6x09_GENERAL , DASMFLAG_STEP_OVER }, - { 0x9E, 2, "LDX", DIR, M6x09_GENERAL }, - { 0x9F, 2, "STX", DIR, M6x09_GENERAL }, - - { 0xA0, 2, "SUBA", IND, M6x09_GENERAL }, - { 0xA1, 2, "CMPA", IND, M6x09_GENERAL }, - { 0xA2, 2, "SBCA", IND, M6x09_GENERAL }, - { 0xA3, 2, "SUBD", IND, M6x09_GENERAL }, - { 0xA4, 2, "ANDA", IND, M6x09_GENERAL }, - { 0xA5, 2, "BITA", IND, M6x09_GENERAL }, - { 0xA6, 2, "LDA", IND, M6x09_GENERAL }, - { 0xA7, 2, "STA", IND, M6x09_GENERAL }, - { 0xA8, 2, "EORA", IND, M6x09_GENERAL }, - { 0xA9, 2, "ADCA", IND, M6x09_GENERAL }, - { 0xAA, 2, "ORA", IND, M6x09_GENERAL }, - { 0xAB, 2, "ADDA", IND, M6x09_GENERAL }, - { 0xAC, 2, "CMPX", IND, M6x09_GENERAL }, - { 0xAD, 2, "JSR", IND, M6x09_GENERAL, DASMFLAG_STEP_OVER }, - { 0xAE, 2, "LDX", IND, M6x09_GENERAL }, - { 0xAF, 2, "STX", IND, M6x09_GENERAL }, - - { 0xB0, 3, "SUBA", EXT, M6x09_GENERAL }, - { 0xB1, 3, "CMPA", EXT, M6x09_GENERAL }, - { 0xB2, 3, "SBCA", EXT, M6x09_GENERAL }, - { 0xB3, 3, "SUBD", EXT, M6x09_GENERAL }, - { 0xB4, 3, "ANDA", EXT, M6x09_GENERAL }, - { 0xB5, 3, "BITA", EXT, M6x09_GENERAL }, - { 0xB6, 3, "LDA", EXT, M6x09_GENERAL }, - { 0xB7, 3, "STA", EXT, M6x09_GENERAL }, - { 0xB8, 3, "EORA", EXT, M6x09_GENERAL }, - { 0xB9, 3, "ADCA", EXT, M6x09_GENERAL }, - { 0xBA, 3, "ORA", EXT, M6x09_GENERAL }, - { 0xBB, 3, "ADDA", EXT, M6x09_GENERAL }, - { 0xBC, 3, "CMPX", EXT, M6x09_GENERAL }, - { 0xBD, 3, "JSR", EXT, M6x09_GENERAL, DASMFLAG_STEP_OVER }, - { 0xBE, 3, "LDX", EXT, M6x09_GENERAL }, - { 0xBF, 3, "STX", EXT, M6x09_GENERAL }, - - { 0xC0, 2, "SUBB", IMM, M6x09_GENERAL }, - { 0xC1, 2, "CMPB", IMM, M6x09_GENERAL }, - { 0xC2, 2, "SBCB", IMM, M6x09_GENERAL }, - { 0xC3, 3, "ADDD", IMM, M6x09_GENERAL }, - { 0xC4, 2, "ANDB", IMM, M6x09_GENERAL }, - { 0xC5, 2, "BITB", IMM, M6x09_GENERAL }, - { 0xC6, 2, "LDB", IMM, M6x09_GENERAL }, - { 0xC8, 2, "EORB", IMM, M6x09_GENERAL }, - { 0xC9, 2, "ADCB", IMM, M6x09_GENERAL }, - { 0xCA, 2, "ORB", IMM, M6x09_GENERAL }, - { 0xCB, 2, "ADDB", IMM, M6x09_GENERAL }, - { 0xCC, 3, "LDD", IMM, M6x09_GENERAL }, - { 0xCD, 5, "LDQ", IMM, HD6309_EXCLUSIVE }, - { 0xCE, 3, "LDU", IMM, M6x09_GENERAL }, - - { 0xD0, 2, "SUBB", DIR, M6x09_GENERAL }, - { 0xD1, 2, "CMPB", DIR, M6x09_GENERAL }, - { 0xD2, 2, "SBCB", DIR, M6x09_GENERAL }, - { 0xD3, 2, "ADDD", DIR, M6x09_GENERAL }, - { 0xD4, 2, "ANDB", DIR, M6x09_GENERAL }, - { 0xD5, 2, "BITB", DIR, M6x09_GENERAL }, - { 0xD6, 2, "LDB", DIR, M6x09_GENERAL }, - { 0xD7, 2, "STB", DIR, M6x09_GENERAL }, - { 0xD8, 2, "EORB", DIR, M6x09_GENERAL }, - { 0xD9, 2, "ADCB", DIR, M6x09_GENERAL }, - { 0xDA, 2, "ORB", DIR, M6x09_GENERAL }, - { 0xDB, 2, "ADDB", DIR, M6x09_GENERAL }, - { 0xDC, 2, "LDD", DIR, M6x09_GENERAL }, - { 0xDD, 2, "STD", DIR, M6x09_GENERAL }, - { 0xDE, 2, "LDU", DIR, M6x09_GENERAL }, - { 0xDF, 2, "STU", DIR, M6x09_GENERAL }, - - { 0xE0, 2, "SUBB", IND, M6x09_GENERAL }, - { 0xE1, 2, "CMPB", IND, M6x09_GENERAL }, - { 0xE2, 2, "SBCB", IND, M6x09_GENERAL }, - { 0xE3, 2, "ADDD", IND, M6x09_GENERAL }, - { 0xE4, 2, "ANDB", IND, M6x09_GENERAL }, - { 0xE5, 2, "BITB", IND, M6x09_GENERAL }, - { 0xE6, 2, "LDB", IND, M6x09_GENERAL }, - { 0xE7, 2, "STB", IND, M6x09_GENERAL }, - { 0xE8, 2, "EORB", IND, M6x09_GENERAL }, - { 0xE9, 2, "ADCB", IND, M6x09_GENERAL }, - { 0xEA, 2, "ORB", IND, M6x09_GENERAL }, - { 0xEB, 2, "ADDB", IND, M6x09_GENERAL }, - { 0xEC, 2, "LDD", IND, M6x09_GENERAL }, - { 0xED, 2, "STD", IND, M6x09_GENERAL }, - { 0xEE, 2, "LDU", IND, M6x09_GENERAL }, - { 0xEF, 2, "STU", IND, M6x09_GENERAL }, - - { 0xF0, 3, "SUBB", EXT, M6x09_GENERAL }, - { 0xF1, 3, "CMPB", EXT, M6x09_GENERAL }, - { 0xF2, 3, "SBCB", EXT, M6x09_GENERAL }, - { 0xF3, 3, "ADDD", EXT, M6x09_GENERAL }, - { 0xF4, 3, "ANDB", EXT, M6x09_GENERAL }, - { 0xF5, 3, "BITB", EXT, M6x09_GENERAL }, - { 0xF6, 3, "LDB", EXT, M6x09_GENERAL }, - { 0xF7, 3, "STB", EXT, M6x09_GENERAL }, - { 0xF8, 3, "EORB", EXT, M6x09_GENERAL }, - { 0xF9, 3, "ADCB", EXT, M6x09_GENERAL }, - { 0xFA, 3, "ORB", EXT, M6x09_GENERAL }, - { 0xFB, 3, "ADDB", EXT, M6x09_GENERAL }, - { 0xFC, 3, "LDD", EXT, M6x09_GENERAL }, - { 0xFD, 3, "STD", EXT, M6x09_GENERAL }, - { 0xFE, 3, "LDU", EXT, M6x09_GENERAL }, - { 0xFF, 3, "STU", EXT, M6x09_GENERAL }, + { 0x00, 2, "NEG", DIR, M6x09_GENERAL }, + { 0x01, 3, "OIM", DIR_IM, HD6309_EXCLUSIVE }, + { 0x02, 3, "AIM", DIR_IM, HD6309_EXCLUSIVE }, + { 0x03, 2, "COM", DIR, M6x09_GENERAL }, + { 0x04, 2, "LSR", DIR, M6x09_GENERAL }, + { 0x05, 3, "EIM", DIR_IM, HD6309_EXCLUSIVE }, + { 0x06, 2, "ROR", DIR, M6x09_GENERAL }, + { 0x07, 2, "ASR", DIR, M6x09_GENERAL }, + { 0x08, 2, "ASL", DIR, M6x09_GENERAL }, + { 0x09, 2, "ROL", DIR, M6x09_GENERAL }, + { 0x0A, 2, "DEC", DIR, M6x09_GENERAL }, + { 0x0B, 3, "TIM", DIR_IM, HD6309_EXCLUSIVE }, + { 0x0C, 2, "INC", DIR, M6x09_GENERAL }, + { 0x0D, 2, "TST", DIR, M6x09_GENERAL }, + { 0x0E, 2, "JMP", DIR, M6x09_GENERAL }, + { 0x0F, 2, "CLR", DIR, M6x09_GENERAL }, + + { 0x10, 1, "page1", PG1, M6x09_GENERAL }, + { 0x11, 1, "page2", PG2, M6x09_GENERAL }, + { 0x12, 1, "NOP", INH, M6x09_GENERAL }, + { 0x13, 1, "SYNC", INH, M6x09_GENERAL }, + { 0x14, 1, "SEXW", INH, HD6309_EXCLUSIVE }, + { 0x16, 3, "LBRA", LREL, M6x09_GENERAL }, + { 0x17, 3, "LBSR", LREL, M6x09_GENERAL, DASMFLAG_STEP_OVER }, + { 0x19, 1, "DAA", INH, M6x09_GENERAL }, + { 0x1A, 2, "ORCC", IMM, M6x09_GENERAL }, + { 0x1C, 2, "ANDCC", IMM, M6x09_GENERAL }, + { 0x1D, 1, "SEX", INH, M6x09_GENERAL }, + { 0x1E, 2, "EXG", IMM_RR, M6x09_GENERAL }, + { 0x1F, 2, "TFR", IMM_RR, M6x09_GENERAL }, + + { 0x20, 2, "BRA", REL, M6x09_GENERAL }, + { 0x21, 2, "BRN", REL, M6x09_GENERAL }, + { 0x22, 2, "BHI", REL, M6x09_GENERAL }, + { 0x23, 2, "BLS", REL, M6x09_GENERAL }, + { 0x24, 2, "BCC", REL, M6x09_GENERAL }, + { 0x25, 2, "BCS", REL, M6x09_GENERAL }, + { 0x26, 2, "BNE", REL, M6x09_GENERAL }, + { 0x27, 2, "BEQ", REL, M6x09_GENERAL }, + { 0x28, 2, "BVC", REL, M6x09_GENERAL }, + { 0x29, 2, "BVS", REL, M6x09_GENERAL }, + { 0x2A, 2, "BPL", REL, M6x09_GENERAL }, + { 0x2B, 2, "BMI", REL, M6x09_GENERAL }, + { 0x2C, 2, "BGE", REL, M6x09_GENERAL }, + { 0x2D, 2, "BLT", REL, M6x09_GENERAL }, + { 0x2E, 2, "BGT", REL, M6x09_GENERAL }, + { 0x2F, 2, "BLE", REL, M6x09_GENERAL }, + + { 0x30, 2, "LEAX", IND, M6x09_GENERAL }, + { 0x31, 2, "LEAY", IND, M6x09_GENERAL }, + { 0x32, 2, "LEAS", IND, M6x09_GENERAL }, + { 0x33, 2, "LEAU", IND, M6x09_GENERAL }, + { 0x34, 2, "PSHS", PSHS, M6x09_GENERAL }, + { 0x35, 2, "PULS", PULS, M6x09_GENERAL }, + { 0x36, 2, "PSHU", PSHU, M6x09_GENERAL }, + { 0x37, 2, "PULU", PULU, M6x09_GENERAL }, + { 0x39, 1, "RTS", INH , M6x09_GENERAL }, + { 0x3A, 1, "ABX", INH, M6x09_GENERAL }, + { 0x3B, 1, "RTI", INH, M6x09_GENERAL }, + { 0x3C, 2, "CWAI", IMM, M6x09_GENERAL }, + { 0x3D, 1, "MUL", INH, M6x09_GENERAL }, + { 0x3F, 1, "SWI", INH, M6x09_GENERAL }, + + { 0x40, 1, "NEGA", INH, M6x09_GENERAL }, + { 0x43, 1, "COMA", INH, M6x09_GENERAL }, + { 0x44, 1, "LSRA", INH, M6x09_GENERAL }, + { 0x46, 1, "RORA", INH, M6x09_GENERAL }, + { 0x47, 1, "ASRA", INH, M6x09_GENERAL }, + { 0x48, 1, "ASLA", INH, M6x09_GENERAL }, + { 0x49, 1, "ROLA", INH, M6x09_GENERAL }, + { 0x4A, 1, "DECA", INH, M6x09_GENERAL }, + { 0x4C, 1, "INCA", INH, M6x09_GENERAL }, + { 0x4D, 1, "TSTA", INH, M6x09_GENERAL }, + { 0x4F, 1, "CLRA", INH, M6x09_GENERAL }, + + { 0x50, 1, "NEGB", INH, M6x09_GENERAL }, + { 0x53, 1, "COMB", INH, M6x09_GENERAL }, + { 0x54, 1, "LSRB", INH, M6x09_GENERAL }, + { 0x56, 1, "RORB", INH, M6x09_GENERAL }, + { 0x57, 1, "ASRB", INH, M6x09_GENERAL }, + { 0x58, 1, "ASLB", INH, M6x09_GENERAL }, + { 0x59, 1, "ROLB", INH, M6x09_GENERAL }, + { 0x5A, 1, "DECB", INH, M6x09_GENERAL }, + { 0x5C, 1, "INCB", INH, M6x09_GENERAL }, + { 0x5D, 1, "TSTB", INH, M6x09_GENERAL }, + { 0x5F, 1, "CLRB", INH, M6x09_GENERAL }, + + { 0x60, 2, "NEG", IND, M6x09_GENERAL }, + { 0x61, 3, "OIM", IND, HD6309_EXCLUSIVE }, + { 0x62, 3, "AIM", IND, HD6309_EXCLUSIVE }, + { 0x63, 2, "COM", IND, M6x09_GENERAL }, + { 0x64, 2, "LSR", IND, M6x09_GENERAL }, + { 0x65, 3, "EIM", IND, HD6309_EXCLUSIVE }, + { 0x66, 2, "ROR", IND, M6x09_GENERAL }, + { 0x67, 2, "ASR", IND, M6x09_GENERAL }, + { 0x68, 2, "ASL", IND, M6x09_GENERAL }, + { 0x69, 2, "ROL", IND, M6x09_GENERAL }, + { 0x6A, 2, "DEC", IND, M6x09_GENERAL }, + { 0x6B, 3, "TIM", IND, HD6309_EXCLUSIVE }, + { 0x6C, 2, "INC", IND, M6x09_GENERAL }, + { 0x6D, 2, "TST", IND, M6x09_GENERAL }, + { 0x6E, 2, "JMP", IND, M6x09_GENERAL }, + { 0x6F, 2, "CLR", IND, M6x09_GENERAL }, + + { 0x70, 3, "NEG", EXT, M6x09_GENERAL }, + { 0x71, 4, "OIM", EXT, HD6309_EXCLUSIVE }, + { 0x72, 4, "AIM", EXT, HD6309_EXCLUSIVE }, + { 0x73, 3, "COM", EXT, M6x09_GENERAL }, + { 0x74, 3, "LSR", EXT, M6x09_GENERAL }, + { 0x75, 4, "EIM", EXT, HD6309_EXCLUSIVE }, + { 0x76, 3, "ROR", EXT, M6x09_GENERAL }, + { 0x77, 3, "ASR", EXT, M6x09_GENERAL }, + { 0x78, 3, "ASL", EXT, M6x09_GENERAL }, + { 0x79, 3, "ROL", EXT, M6x09_GENERAL }, + { 0x7A, 3, "DEC", EXT, M6x09_GENERAL }, + { 0x7B, 4, "TIM", EXT, HD6309_EXCLUSIVE }, + { 0x7C, 3, "INC", EXT, M6x09_GENERAL }, + { 0x7D, 3, "TST", EXT, M6x09_GENERAL }, + { 0x7E, 3, "JMP", EXT, M6x09_GENERAL }, + { 0x7F, 3, "CLR", EXT, M6x09_GENERAL }, + + { 0x80, 2, "SUBA", IMM, M6x09_GENERAL }, + { 0x81, 2, "CMPA", IMM, M6x09_GENERAL }, + { 0x82, 2, "SBCA", IMM, M6x09_GENERAL }, + { 0x83, 3, "SUBD", IMM, M6x09_GENERAL }, + { 0x84, 2, "ANDA", IMM, M6x09_GENERAL }, + { 0x85, 2, "BITA", IMM, M6x09_GENERAL }, + { 0x86, 2, "LDA", IMM, M6x09_GENERAL }, + { 0x88, 2, "EORA", IMM, M6x09_GENERAL }, + { 0x89, 2, "ADCA", IMM, M6x09_GENERAL }, + { 0x8A, 2, "ORA", IMM, M6x09_GENERAL }, + { 0x8B, 2, "ADDA", IMM, M6x09_GENERAL }, + { 0x8C, 3, "CMPX", IMM, M6x09_GENERAL }, + { 0x8D, 2, "BSR", REL, M6x09_GENERAL, DASMFLAG_STEP_OVER }, + { 0x8E, 3, "LDX", IMM, M6x09_GENERAL }, + + { 0x90, 2, "SUBA", DIR, M6x09_GENERAL }, + { 0x91, 2, "CMPA", DIR, M6x09_GENERAL }, + { 0x92, 2, "SBCA", DIR, M6x09_GENERAL }, + { 0x93, 2, "SUBD", DIR, M6x09_GENERAL }, + { 0x94, 2, "ANDA", DIR, M6x09_GENERAL }, + { 0x95, 2, "BITA", DIR, M6x09_GENERAL }, + { 0x96, 2, "LDA", DIR, M6x09_GENERAL }, + { 0x97, 2, "STA", DIR, M6x09_GENERAL }, + { 0x98, 2, "EORA", DIR, M6x09_GENERAL }, + { 0x99, 2, "ADCA", DIR, M6x09_GENERAL }, + { 0x9A, 2, "ORA", DIR, M6x09_GENERAL }, + { 0x9B, 2, "ADDA", DIR, M6x09_GENERAL }, + { 0x9C, 2, "CMPX", DIR, M6x09_GENERAL }, + { 0x9D, 2, "JSR", DIR, M6x09_GENERAL, DASMFLAG_STEP_OVER }, + { 0x9E, 2, "LDX", DIR, M6x09_GENERAL }, + { 0x9F, 2, "STX", DIR, M6x09_GENERAL }, + + { 0xA0, 2, "SUBA", IND, M6x09_GENERAL }, + { 0xA1, 2, "CMPA", IND, M6x09_GENERAL }, + { 0xA2, 2, "SBCA", IND, M6x09_GENERAL }, + { 0xA3, 2, "SUBD", IND, M6x09_GENERAL }, + { 0xA4, 2, "ANDA", IND, M6x09_GENERAL }, + { 0xA5, 2, "BITA", IND, M6x09_GENERAL }, + { 0xA6, 2, "LDA", IND, M6x09_GENERAL }, + { 0xA7, 2, "STA", IND, M6x09_GENERAL }, + { 0xA8, 2, "EORA", IND, M6x09_GENERAL }, + { 0xA9, 2, "ADCA", IND, M6x09_GENERAL }, + { 0xAA, 2, "ORA", IND, M6x09_GENERAL }, + { 0xAB, 2, "ADDA", IND, M6x09_GENERAL }, + { 0xAC, 2, "CMPX", IND, M6x09_GENERAL }, + { 0xAD, 2, "JSR", IND, M6x09_GENERAL, DASMFLAG_STEP_OVER }, + { 0xAE, 2, "LDX", IND, M6x09_GENERAL }, + { 0xAF, 2, "STX", IND, M6x09_GENERAL }, + + { 0xB0, 3, "SUBA", EXT, M6x09_GENERAL }, + { 0xB1, 3, "CMPA", EXT, M6x09_GENERAL }, + { 0xB2, 3, "SBCA", EXT, M6x09_GENERAL }, + { 0xB3, 3, "SUBD", EXT, M6x09_GENERAL }, + { 0xB4, 3, "ANDA", EXT, M6x09_GENERAL }, + { 0xB5, 3, "BITA", EXT, M6x09_GENERAL }, + { 0xB6, 3, "LDA", EXT, M6x09_GENERAL }, + { 0xB7, 3, "STA", EXT, M6x09_GENERAL }, + { 0xB8, 3, "EORA", EXT, M6x09_GENERAL }, + { 0xB9, 3, "ADCA", EXT, M6x09_GENERAL }, + { 0xBA, 3, "ORA", EXT, M6x09_GENERAL }, + { 0xBB, 3, "ADDA", EXT, M6x09_GENERAL }, + { 0xBC, 3, "CMPX", EXT, M6x09_GENERAL }, + { 0xBD, 3, "JSR", EXT, M6x09_GENERAL, DASMFLAG_STEP_OVER }, + { 0xBE, 3, "LDX", EXT, M6x09_GENERAL }, + { 0xBF, 3, "STX", EXT, M6x09_GENERAL }, + + { 0xC0, 2, "SUBB", IMM, M6x09_GENERAL }, + { 0xC1, 2, "CMPB", IMM, M6x09_GENERAL }, + { 0xC2, 2, "SBCB", IMM, M6x09_GENERAL }, + { 0xC3, 3, "ADDD", IMM, M6x09_GENERAL }, + { 0xC4, 2, "ANDB", IMM, M6x09_GENERAL }, + { 0xC5, 2, "BITB", IMM, M6x09_GENERAL }, + { 0xC6, 2, "LDB", IMM, M6x09_GENERAL }, + { 0xC8, 2, "EORB", IMM, M6x09_GENERAL }, + { 0xC9, 2, "ADCB", IMM, M6x09_GENERAL }, + { 0xCA, 2, "ORB", IMM, M6x09_GENERAL }, + { 0xCB, 2, "ADDB", IMM, M6x09_GENERAL }, + { 0xCC, 3, "LDD", IMM, M6x09_GENERAL }, + { 0xCD, 5, "LDQ", IMM, HD6309_EXCLUSIVE }, + { 0xCE, 3, "LDU", IMM, M6x09_GENERAL }, + + { 0xD0, 2, "SUBB", DIR, M6x09_GENERAL }, + { 0xD1, 2, "CMPB", DIR, M6x09_GENERAL }, + { 0xD2, 2, "SBCB", DIR, M6x09_GENERAL }, + { 0xD3, 2, "ADDD", DIR, M6x09_GENERAL }, + { 0xD4, 2, "ANDB", DIR, M6x09_GENERAL }, + { 0xD5, 2, "BITB", DIR, M6x09_GENERAL }, + { 0xD6, 2, "LDB", DIR, M6x09_GENERAL }, + { 0xD7, 2, "STB", DIR, M6x09_GENERAL }, + { 0xD8, 2, "EORB", DIR, M6x09_GENERAL }, + { 0xD9, 2, "ADCB", DIR, M6x09_GENERAL }, + { 0xDA, 2, "ORB", DIR, M6x09_GENERAL }, + { 0xDB, 2, "ADDB", DIR, M6x09_GENERAL }, + { 0xDC, 2, "LDD", DIR, M6x09_GENERAL }, + { 0xDD, 2, "STD", DIR, M6x09_GENERAL }, + { 0xDE, 2, "LDU", DIR, M6x09_GENERAL }, + { 0xDF, 2, "STU", DIR, M6x09_GENERAL }, + + { 0xE0, 2, "SUBB", IND, M6x09_GENERAL }, + { 0xE1, 2, "CMPB", IND, M6x09_GENERAL }, + { 0xE2, 2, "SBCB", IND, M6x09_GENERAL }, + { 0xE3, 2, "ADDD", IND, M6x09_GENERAL }, + { 0xE4, 2, "ANDB", IND, M6x09_GENERAL }, + { 0xE5, 2, "BITB", IND, M6x09_GENERAL }, + { 0xE6, 2, "LDB", IND, M6x09_GENERAL }, + { 0xE7, 2, "STB", IND, M6x09_GENERAL }, + { 0xE8, 2, "EORB", IND, M6x09_GENERAL }, + { 0xE9, 2, "ADCB", IND, M6x09_GENERAL }, + { 0xEA, 2, "ORB", IND, M6x09_GENERAL }, + { 0xEB, 2, "ADDB", IND, M6x09_GENERAL }, + { 0xEC, 2, "LDD", IND, M6x09_GENERAL }, + { 0xED, 2, "STD", IND, M6x09_GENERAL }, + { 0xEE, 2, "LDU", IND, M6x09_GENERAL }, + { 0xEF, 2, "STU", IND, M6x09_GENERAL }, + + { 0xF0, 3, "SUBB", EXT, M6x09_GENERAL }, + { 0xF1, 3, "CMPB", EXT, M6x09_GENERAL }, + { 0xF2, 3, "SBCB", EXT, M6x09_GENERAL }, + { 0xF3, 3, "ADDD", EXT, M6x09_GENERAL }, + { 0xF4, 3, "ANDB", EXT, M6x09_GENERAL }, + { 0xF5, 3, "BITB", EXT, M6x09_GENERAL }, + { 0xF6, 3, "LDB", EXT, M6x09_GENERAL }, + { 0xF7, 3, "STB", EXT, M6x09_GENERAL }, + { 0xF8, 3, "EORB", EXT, M6x09_GENERAL }, + { 0xF9, 3, "ADCB", EXT, M6x09_GENERAL }, + { 0xFA, 3, "ORB", EXT, M6x09_GENERAL }, + { 0xFB, 3, "ADDB", EXT, M6x09_GENERAL }, + { 0xFC, 3, "LDD", EXT, M6x09_GENERAL }, + { 0xFD, 3, "STD", EXT, M6x09_GENERAL }, + { 0xFE, 3, "LDU", EXT, M6x09_GENERAL }, + { 0xFF, 3, "STU", EXT, M6x09_GENERAL }, // Page 1 opcodes (0x10 0x..) - { 0x1021, 4, "LBRN", LREL, M6x09_GENERAL }, - { 0x1022, 4, "LBHI", LREL, M6x09_GENERAL }, - { 0x1023, 4, "LBLS", LREL, M6x09_GENERAL }, - { 0x1024, 4, "LBCC", LREL, M6x09_GENERAL }, - { 0x1025, 4, "LBCS", LREL, M6x09_GENERAL }, - { 0x1026, 4, "LBNE", LREL, M6x09_GENERAL }, - { 0x1027, 4, "LBEQ", LREL, M6x09_GENERAL }, - { 0x1028, 4, "LBVC", LREL, M6x09_GENERAL }, - { 0x1029, 4, "LBVS", LREL, M6x09_GENERAL }, - { 0x102A, 4, "LBPL", LREL, M6x09_GENERAL }, - { 0x102B, 4, "LBMI", LREL, M6x09_GENERAL }, - { 0x102C, 4, "LBGE", LREL, M6x09_GENERAL }, - { 0x102D, 4, "LBLT", LREL, M6x09_GENERAL }, - { 0x102E, 4, "LBGT", LREL, M6x09_GENERAL }, - { 0x102F, 4, "LBLE", LREL, M6x09_GENERAL }, - - { 0x1030, 3, "ADDR", IMM_RR, HD6309_EXCLUSIVE }, - { 0x1031, 3, "ADCR", IMM_RR, HD6309_EXCLUSIVE }, - { 0x1032, 3, "SUBR", IMM_RR, HD6309_EXCLUSIVE }, - { 0x1033, 3, "SBCR", IMM_RR, HD6309_EXCLUSIVE }, - { 0x1034, 3, "ANDR", IMM_RR, HD6309_EXCLUSIVE }, - { 0x1035, 3, "ORR", IMM_RR, HD6309_EXCLUSIVE }, - { 0x1036, 3, "EORR", IMM_RR, HD6309_EXCLUSIVE }, - { 0x1037, 3, "CMPR", IMM_RR, HD6309_EXCLUSIVE }, - - { 0x1038, 2, "PSHSW", INH, HD6309_EXCLUSIVE }, - { 0x1039, 2, "PULSW", INH, HD6309_EXCLUSIVE }, - { 0x103A, 2, "PSHUW", INH, HD6309_EXCLUSIVE }, - { 0x103B, 2, "PULUW", INH, HD6309_EXCLUSIVE }, - - { 0x103F, 2, "SWI2", INH, HD6309_EXCLUSIVE }, - - { 0x1040, 2, "NEGD", INH, HD6309_EXCLUSIVE }, - { 0x1043, 2, "COMD", INH, HD6309_EXCLUSIVE }, - { 0x1044, 2, "LSRD", INH, HD6309_EXCLUSIVE }, - { 0x1046, 2, "RORD", INH, HD6309_EXCLUSIVE }, - { 0x1047, 2, "ASRD", INH, HD6309_EXCLUSIVE }, - { 0x1048, 2, "ASLD", INH, HD6309_EXCLUSIVE }, - { 0x1049, 2, "ROLD", INH, HD6309_EXCLUSIVE }, - - { 0x104A, 2, "DECD", INH, HD6309_EXCLUSIVE }, - { 0x104C, 2, "INCD", INH, HD6309_EXCLUSIVE }, - { 0x104D, 2, "TSTD", INH, HD6309_EXCLUSIVE }, - { 0x104f, 2, "CLRD", INH, HD6309_EXCLUSIVE }, - - { 0x1053, 2, "COMW", INH, HD6309_EXCLUSIVE }, - { 0x1054, 2, "LSRW", INH, HD6309_EXCLUSIVE }, - { 0x1056, 2, "RORW", INH, HD6309_EXCLUSIVE }, - { 0x1059, 2, "ROLW", INH, HD6309_EXCLUSIVE }, - { 0x105A, 2, "DECW", INH, HD6309_EXCLUSIVE }, - { 0x105C, 2, "INCW", INH, HD6309_EXCLUSIVE }, - { 0x105D, 2, "TSTW", INH, HD6309_EXCLUSIVE }, - { 0x105F, 2, "CLRW", INH, HD6309_EXCLUSIVE }, - { 0x1080, 4, "SUBW", IMM, HD6309_EXCLUSIVE }, - { 0x1081, 4, "CMPW", IMM, HD6309_EXCLUSIVE }, - { 0x1082, 4, "SBCD", IMM, HD6309_EXCLUSIVE }, - - { 0x1083, 4, "CMPD", IMM, M6x09_GENERAL }, - - { 0x1084, 4, "ANDD", IMM, HD6309_EXCLUSIVE }, - { 0x1085, 4, "BITD", IMM, HD6309_EXCLUSIVE }, - { 0x1086, 4, "LDW", IMM, HD6309_EXCLUSIVE }, - { 0x1088, 4, "EORD", IMM, HD6309_EXCLUSIVE }, - { 0x1089, 4, "ADCD", IMM, HD6309_EXCLUSIVE }, - { 0x108A, 4, "ORD", IMM, HD6309_EXCLUSIVE }, - { 0x108B, 4, "ADDW", IMM, HD6309_EXCLUSIVE }, - - { 0x108C, 4, "CMPY", IMM, M6x09_GENERAL }, - { 0x108E, 4, "LDY", IMM, M6x09_GENERAL }, - - { 0x1090, 3, "SUBW", DIR, HD6309_EXCLUSIVE }, - { 0x1091, 3, "CMPW", DIR, HD6309_EXCLUSIVE }, - { 0x1092, 3, "SBCD", DIR, HD6309_EXCLUSIVE }, - - { 0x1093, 3, "CMPD", DIR, M6x09_GENERAL }, - - { 0x1094, 3, "ANDD", DIR, HD6309_EXCLUSIVE }, - { 0x1095, 3, "BITD", DIR, HD6309_EXCLUSIVE }, - { 0x1096, 3, "LDW", DIR, HD6309_EXCLUSIVE }, - { 0x1097, 3, "STW", DIR, HD6309_EXCLUSIVE }, - { 0x1098, 3, "EORD", DIR, HD6309_EXCLUSIVE }, - { 0x1099, 3, "ADCD", DIR, HD6309_EXCLUSIVE }, - { 0x109A, 3, "ORD", DIR, HD6309_EXCLUSIVE }, - { 0x109B, 3, "ADDW", DIR, HD6309_EXCLUSIVE }, - - { 0x109C, 3, "CMPY", DIR, M6x09_GENERAL }, - { 0x109E, 3, "LDY", DIR, M6x09_GENERAL }, - { 0x109F, 3, "STY", DIR, M6x09_GENERAL }, - - { 0x10A0, 3, "SUBW", IND, HD6309_EXCLUSIVE }, - { 0x10A1, 3, "CMPW", IND, HD6309_EXCLUSIVE }, - { 0x10A2, 3, "SBCD", IND, HD6309_EXCLUSIVE }, - - { 0x10A3, 3, "CMPD", IND, M6x09_GENERAL }, - - { 0x10A4, 3, "ANDD", IND, HD6309_EXCLUSIVE }, - { 0x10A5, 3, "BITD", IND, HD6309_EXCLUSIVE }, - - { 0x10A6, 3, "LDW", IND, HD6309_EXCLUSIVE }, - { 0x10A7, 3, "STW", IND, HD6309_EXCLUSIVE }, - { 0x10A8, 3, "EORD", IND, HD6309_EXCLUSIVE }, - { 0x10A9, 3, "ADCD", IND, HD6309_EXCLUSIVE }, - { 0x10AA, 3, "ORD", IND, HD6309_EXCLUSIVE }, - { 0x10AB, 3, "ADDW", IND, HD6309_EXCLUSIVE }, - - { 0x10AC, 3, "CMPY", IND, M6x09_GENERAL }, - { 0x10AE, 3, "LDY", IND, M6x09_GENERAL }, - { 0x10AF, 3, "STY", IND, M6x09_GENERAL }, - - { 0x10B0, 4, "SUBW", EXT, HD6309_EXCLUSIVE }, - { 0x10B1, 4, "CMPW", EXT, HD6309_EXCLUSIVE }, - { 0x10B2, 4, "SBCD", EXT, HD6309_EXCLUSIVE }, - - { 0x10B3, 4, "CMPD", EXT, M6x09_GENERAL }, - - { 0x10B4, 4, "ANDD", EXT, HD6309_EXCLUSIVE }, - { 0x10B5, 4, "BITD", EXT, HD6309_EXCLUSIVE }, - { 0x10B6, 4, "LDW", EXT, HD6309_EXCLUSIVE }, - { 0x10B7, 4, "STW", EXT, HD6309_EXCLUSIVE }, - { 0x10B8, 4, "EORD", EXT, HD6309_EXCLUSIVE }, - { 0x10B9, 4, "ADCD", EXT, HD6309_EXCLUSIVE }, - { 0x10BA, 4, "ORD", EXT, HD6309_EXCLUSIVE }, - { 0x10BB, 4, "ADDW", EXT, HD6309_EXCLUSIVE }, - - { 0x10BC, 4, "CMPY", EXT, M6x09_GENERAL }, - { 0x10BE, 4, "LDY", EXT, M6x09_GENERAL }, - { 0x10BF, 4, "STY", EXT, M6x09_GENERAL }, - { 0x10CE, 4, "LDS", IMM, M6x09_GENERAL }, - - { 0x10DC, 3, "LDQ", DIR, HD6309_EXCLUSIVE }, - { 0x10DD, 3, "STQ", DIR, HD6309_EXCLUSIVE }, - - { 0x10DE, 3, "LDS", DIR, M6x09_GENERAL }, - { 0x10DF, 3, "STS", DIR, M6x09_GENERAL }, - - { 0x10EC, 3, "LDQ", IND, HD6309_EXCLUSIVE }, - { 0x10ED, 3, "STQ", IND, HD6309_EXCLUSIVE }, - - { 0x10EE, 3, "LDS", IND, M6x09_GENERAL }, - { 0x10EF, 3, "STS", IND, M6x09_GENERAL }, - - { 0x10FC, 4, "LDQ", EXT, HD6309_EXCLUSIVE }, - { 0x10FD, 4, "STQ", EXT, HD6309_EXCLUSIVE }, - - { 0x10FE, 4, "LDS", EXT, M6x09_GENERAL }, - { 0x10FF, 4, "STS", EXT, M6x09_GENERAL }, + { 0x1021, 4, "LBRN", LREL, M6x09_GENERAL }, + { 0x1022, 4, "LBHI", LREL, M6x09_GENERAL }, + { 0x1023, 4, "LBLS", LREL, M6x09_GENERAL }, + { 0x1024, 4, "LBCC", LREL, M6x09_GENERAL }, + { 0x1025, 4, "LBCS", LREL, M6x09_GENERAL }, + { 0x1026, 4, "LBNE", LREL, M6x09_GENERAL }, + { 0x1027, 4, "LBEQ", LREL, M6x09_GENERAL }, + { 0x1028, 4, "LBVC", LREL, M6x09_GENERAL }, + { 0x1029, 4, "LBVS", LREL, M6x09_GENERAL }, + { 0x102A, 4, "LBPL", LREL, M6x09_GENERAL }, + { 0x102B, 4, "LBMI", LREL, M6x09_GENERAL }, + { 0x102C, 4, "LBGE", LREL, M6x09_GENERAL }, + { 0x102D, 4, "LBLT", LREL, M6x09_GENERAL }, + { 0x102E, 4, "LBGT", LREL, M6x09_GENERAL }, + { 0x102F, 4, "LBLE", LREL, M6x09_GENERAL }, + + { 0x1030, 3, "ADDR", IMM_RR, HD6309_EXCLUSIVE }, + { 0x1031, 3, "ADCR", IMM_RR, HD6309_EXCLUSIVE }, + { 0x1032, 3, "SUBR", IMM_RR, HD6309_EXCLUSIVE }, + { 0x1033, 3, "SBCR", IMM_RR, HD6309_EXCLUSIVE }, + { 0x1034, 3, "ANDR", IMM_RR, HD6309_EXCLUSIVE }, + { 0x1035, 3, "ORR", IMM_RR, HD6309_EXCLUSIVE }, + { 0x1036, 3, "EORR", IMM_RR, HD6309_EXCLUSIVE }, + { 0x1037, 3, "CMPR", IMM_RR, HD6309_EXCLUSIVE }, + + { 0x1038, 2, "PSHSW", INH, HD6309_EXCLUSIVE }, + { 0x1039, 2, "PULSW", INH, HD6309_EXCLUSIVE }, + { 0x103A, 2, "PSHUW", INH, HD6309_EXCLUSIVE }, + { 0x103B, 2, "PULUW", INH, HD6309_EXCLUSIVE }, + + { 0x103F, 2, "SWI2", INH, HD6309_EXCLUSIVE }, + + { 0x1040, 2, "NEGD", INH, HD6309_EXCLUSIVE }, + { 0x1043, 2, "COMD", INH, HD6309_EXCLUSIVE }, + { 0x1044, 2, "LSRD", INH, HD6309_EXCLUSIVE }, + { 0x1046, 2, "RORD", INH, HD6309_EXCLUSIVE }, + { 0x1047, 2, "ASRD", INH, HD6309_EXCLUSIVE }, + { 0x1048, 2, "ASLD", INH, HD6309_EXCLUSIVE }, + { 0x1049, 2, "ROLD", INH, HD6309_EXCLUSIVE }, + + { 0x104A, 2, "DECD", INH, HD6309_EXCLUSIVE }, + { 0x104C, 2, "INCD", INH, HD6309_EXCLUSIVE }, + { 0x104D, 2, "TSTD", INH, HD6309_EXCLUSIVE }, + { 0x104f, 2, "CLRD", INH, HD6309_EXCLUSIVE }, + + { 0x1053, 2, "COMW", INH, HD6309_EXCLUSIVE }, + { 0x1054, 2, "LSRW", INH, HD6309_EXCLUSIVE }, + { 0x1056, 2, "RORW", INH, HD6309_EXCLUSIVE }, + { 0x1059, 2, "ROLW", INH, HD6309_EXCLUSIVE }, + { 0x105A, 2, "DECW", INH, HD6309_EXCLUSIVE }, + { 0x105C, 2, "INCW", INH, HD6309_EXCLUSIVE }, + { 0x105D, 2, "TSTW", INH, HD6309_EXCLUSIVE }, + { 0x105F, 2, "CLRW", INH, HD6309_EXCLUSIVE }, + { 0x1080, 4, "SUBW", IMM, HD6309_EXCLUSIVE }, + { 0x1081, 4, "CMPW", IMM, HD6309_EXCLUSIVE }, + { 0x1082, 4, "SBCD", IMM, HD6309_EXCLUSIVE }, + + { 0x1083, 4, "CMPD", IMM, M6x09_GENERAL }, + + { 0x1084, 4, "ANDD", IMM, HD6309_EXCLUSIVE }, + { 0x1085, 4, "BITD", IMM, HD6309_EXCLUSIVE }, + { 0x1086, 4, "LDW", IMM, HD6309_EXCLUSIVE }, + { 0x1088, 4, "EORD", IMM, HD6309_EXCLUSIVE }, + { 0x1089, 4, "ADCD", IMM, HD6309_EXCLUSIVE }, + { 0x108A, 4, "ORD", IMM, HD6309_EXCLUSIVE }, + { 0x108B, 4, "ADDW", IMM, HD6309_EXCLUSIVE }, + + { 0x108C, 4, "CMPY", IMM, M6x09_GENERAL }, + { 0x108E, 4, "LDY", IMM, M6x09_GENERAL }, + + { 0x1090, 3, "SUBW", DIR, HD6309_EXCLUSIVE }, + { 0x1091, 3, "CMPW", DIR, HD6309_EXCLUSIVE }, + { 0x1092, 3, "SBCD", DIR, HD6309_EXCLUSIVE }, + + { 0x1093, 3, "CMPD", DIR, M6x09_GENERAL }, + + { 0x1094, 3, "ANDD", DIR, HD6309_EXCLUSIVE }, + { 0x1095, 3, "BITD", DIR, HD6309_EXCLUSIVE }, + { 0x1096, 3, "LDW", DIR, HD6309_EXCLUSIVE }, + { 0x1097, 3, "STW", DIR, HD6309_EXCLUSIVE }, + { 0x1098, 3, "EORD", DIR, HD6309_EXCLUSIVE }, + { 0x1099, 3, "ADCD", DIR, HD6309_EXCLUSIVE }, + { 0x109A, 3, "ORD", DIR, HD6309_EXCLUSIVE }, + { 0x109B, 3, "ADDW", DIR, HD6309_EXCLUSIVE }, + + { 0x109C, 3, "CMPY", DIR, M6x09_GENERAL }, + { 0x109E, 3, "LDY", DIR, M6x09_GENERAL }, + { 0x109F, 3, "STY", DIR, M6x09_GENERAL }, + + { 0x10A0, 3, "SUBW", IND, HD6309_EXCLUSIVE }, + { 0x10A1, 3, "CMPW", IND, HD6309_EXCLUSIVE }, + { 0x10A2, 3, "SBCD", IND, HD6309_EXCLUSIVE }, + + { 0x10A3, 3, "CMPD", IND, M6x09_GENERAL }, + + { 0x10A4, 3, "ANDD", IND, HD6309_EXCLUSIVE }, + { 0x10A5, 3, "BITD", IND, HD6309_EXCLUSIVE }, + + { 0x10A6, 3, "LDW", IND, HD6309_EXCLUSIVE }, + { 0x10A7, 3, "STW", IND, HD6309_EXCLUSIVE }, + { 0x10A8, 3, "EORD", IND, HD6309_EXCLUSIVE }, + { 0x10A9, 3, "ADCD", IND, HD6309_EXCLUSIVE }, + { 0x10AA, 3, "ORD", IND, HD6309_EXCLUSIVE }, + { 0x10AB, 3, "ADDW", IND, HD6309_EXCLUSIVE }, + + { 0x10AC, 3, "CMPY", IND, M6x09_GENERAL }, + { 0x10AE, 3, "LDY", IND, M6x09_GENERAL }, + { 0x10AF, 3, "STY", IND, M6x09_GENERAL }, + + { 0x10B0, 4, "SUBW", EXT, HD6309_EXCLUSIVE }, + { 0x10B1, 4, "CMPW", EXT, HD6309_EXCLUSIVE }, + { 0x10B2, 4, "SBCD", EXT, HD6309_EXCLUSIVE }, + + { 0x10B3, 4, "CMPD", EXT, M6x09_GENERAL }, + + { 0x10B4, 4, "ANDD", EXT, HD6309_EXCLUSIVE }, + { 0x10B5, 4, "BITD", EXT, HD6309_EXCLUSIVE }, + { 0x10B6, 4, "LDW", EXT, HD6309_EXCLUSIVE }, + { 0x10B7, 4, "STW", EXT, HD6309_EXCLUSIVE }, + { 0x10B8, 4, "EORD", EXT, HD6309_EXCLUSIVE }, + { 0x10B9, 4, "ADCD", EXT, HD6309_EXCLUSIVE }, + { 0x10BA, 4, "ORD", EXT, HD6309_EXCLUSIVE }, + { 0x10BB, 4, "ADDW", EXT, HD6309_EXCLUSIVE }, + + { 0x10BC, 4, "CMPY", EXT, M6x09_GENERAL }, + { 0x10BE, 4, "LDY", EXT, M6x09_GENERAL }, + { 0x10BF, 4, "STY", EXT, M6x09_GENERAL }, + { 0x10CE, 4, "LDS", IMM, M6x09_GENERAL }, + + { 0x10DC, 3, "LDQ", DIR, HD6309_EXCLUSIVE }, + { 0x10DD, 3, "STQ", DIR, HD6309_EXCLUSIVE }, + + { 0x10DE, 3, "LDS", DIR, M6x09_GENERAL }, + { 0x10DF, 3, "STS", DIR, M6x09_GENERAL }, + + { 0x10EC, 3, "LDQ", IND, HD6309_EXCLUSIVE }, + { 0x10ED, 3, "STQ", IND, HD6309_EXCLUSIVE }, + + { 0x10EE, 3, "LDS", IND, M6x09_GENERAL }, + { 0x10EF, 3, "STS", IND, M6x09_GENERAL }, + + { 0x10FC, 4, "LDQ", EXT, HD6309_EXCLUSIVE }, + { 0x10FD, 4, "STQ", EXT, HD6309_EXCLUSIVE }, + + { 0x10FE, 4, "LDS", EXT, M6x09_GENERAL }, + { 0x10FF, 4, "STS", EXT, M6x09_GENERAL }, // Page 2 opcodes (0x11 0x..) - { 0x1130, 4, "BAND", IMM_BW, HD6309_EXCLUSIVE }, - { 0x1131, 4, "BIAND", IMM_BW, HD6309_EXCLUSIVE }, - { 0x1132, 4, "BOR", IMM_BW, HD6309_EXCLUSIVE }, - { 0x1133, 4, "BIOR", IMM_BW, HD6309_EXCLUSIVE }, - { 0x1134, 4, "BEOR", IMM_BW, HD6309_EXCLUSIVE }, - { 0x1135, 4, "BIEOR", IMM_BW, HD6309_EXCLUSIVE }, + { 0x1130, 4, "BAND", IMM_BW, HD6309_EXCLUSIVE }, + { 0x1131, 4, "BIAND", IMM_BW, HD6309_EXCLUSIVE }, + { 0x1132, 4, "BOR", IMM_BW, HD6309_EXCLUSIVE }, + { 0x1133, 4, "BIOR", IMM_BW, HD6309_EXCLUSIVE }, + { 0x1134, 4, "BEOR", IMM_BW, HD6309_EXCLUSIVE }, + { 0x1135, 4, "BIEOR", IMM_BW, HD6309_EXCLUSIVE }, - { 0x1136, 4, "LDBT", IMM_BW, HD6309_EXCLUSIVE }, - { 0x1137, 4, "STBT", IMM_BW, HD6309_EXCLUSIVE }, + { 0x1136, 4, "LDBT", IMM_BW, HD6309_EXCLUSIVE }, + { 0x1137, 4, "STBT", IMM_BW, HD6309_EXCLUSIVE }, - { 0x1138, 3, "TFM", IMM_TFM, HD6309_EXCLUSIVE }, - { 0x1139, 3, "TFM", IMM_TFM, HD6309_EXCLUSIVE }, - { 0x113A, 3, "TFM", IMM_TFM, HD6309_EXCLUSIVE }, - { 0x113B, 3, "TFM", IMM_TFM, HD6309_EXCLUSIVE }, + { 0x1138, 3, "TFM", IMM_TFM, HD6309_EXCLUSIVE }, + { 0x1139, 3, "TFM", IMM_TFM, HD6309_EXCLUSIVE }, + { 0x113A, 3, "TFM", IMM_TFM, HD6309_EXCLUSIVE }, + { 0x113B, 3, "TFM", IMM_TFM, HD6309_EXCLUSIVE }, - { 0x113C, 3, "BITMD", IMM, HD6309_EXCLUSIVE }, - { 0x113D, 3, "LDMD", IMM, HD6309_EXCLUSIVE }, + { 0x113C, 3, "BITMD", IMM, HD6309_EXCLUSIVE }, + { 0x113D, 3, "LDMD", IMM, HD6309_EXCLUSIVE }, - { 0x113F, 2, "SWI3", INH, M6x09_GENERAL }, + { 0x113F, 2, "SWI3", INH, M6x09_GENERAL }, - { 0x1143, 2, "COME", INH, HD6309_EXCLUSIVE }, - { 0x114A, 2, "DECE", INH, HD6309_EXCLUSIVE }, - { 0x114C, 2, "INCE", INH, HD6309_EXCLUSIVE }, - { 0x114D, 2, "TSTE", INH, HD6309_EXCLUSIVE }, - { 0x114F, 2, "CLRE", INH, HD6309_EXCLUSIVE }, - { 0x1153, 2, "COMF", INH, HD6309_EXCLUSIVE }, - { 0x115A, 2, "DECF", INH, HD6309_EXCLUSIVE }, - { 0x115C, 2, "INCF", INH, HD6309_EXCLUSIVE }, - { 0x115D, 2, "TSTF", INH, HD6309_EXCLUSIVE }, - { 0x115F, 2, "CLRF", INH, HD6309_EXCLUSIVE }, + { 0x1143, 2, "COME", INH, HD6309_EXCLUSIVE }, + { 0x114A, 2, "DECE", INH, HD6309_EXCLUSIVE }, + { 0x114C, 2, "INCE", INH, HD6309_EXCLUSIVE }, + { 0x114D, 2, "TSTE", INH, HD6309_EXCLUSIVE }, + { 0x114F, 2, "CLRE", INH, HD6309_EXCLUSIVE }, + { 0x1153, 2, "COMF", INH, HD6309_EXCLUSIVE }, + { 0x115A, 2, "DECF", INH, HD6309_EXCLUSIVE }, + { 0x115C, 2, "INCF", INH, HD6309_EXCLUSIVE }, + { 0x115D, 2, "TSTF", INH, HD6309_EXCLUSIVE }, + { 0x115F, 2, "CLRF", INH, HD6309_EXCLUSIVE }, - { 0x1180, 3, "SUBE", IMM, HD6309_EXCLUSIVE }, - { 0x1181, 3, "CMPE", IMM, HD6309_EXCLUSIVE }, + { 0x1180, 3, "SUBE", IMM, HD6309_EXCLUSIVE }, + { 0x1181, 3, "CMPE", IMM, HD6309_EXCLUSIVE }, - { 0x1183, 4, "CMPU", IMM, M6x09_GENERAL }, + { 0x1183, 4, "CMPU", IMM, M6x09_GENERAL }, - { 0x1186, 3, "LDE", IMM, HD6309_EXCLUSIVE }, - { 0x118B, 3, "ADDE", IMM, HD6309_EXCLUSIVE }, + { 0x1186, 3, "LDE", IMM, HD6309_EXCLUSIVE }, + { 0x118B, 3, "ADDE", IMM, HD6309_EXCLUSIVE }, - { 0x118C, 4, "CMPS", IMM, M6x09_GENERAL }, + { 0x118C, 4, "CMPS", IMM, M6x09_GENERAL }, - { 0x118D, 3, "DIVD", IMM, HD6309_EXCLUSIVE }, - { 0x118E, 4, "DIVQ", IMM, HD6309_EXCLUSIVE }, - { 0x118F, 4, "MULD", IMM, HD6309_EXCLUSIVE }, - { 0x1190, 3, "SUBE", DIR, HD6309_EXCLUSIVE }, - { 0x1191, 3, "CMPE", DIR, HD6309_EXCLUSIVE }, + { 0x118D, 3, "DIVD", IMM, HD6309_EXCLUSIVE }, + { 0x118E, 4, "DIVQ", IMM, HD6309_EXCLUSIVE }, + { 0x118F, 4, "MULD", IMM, HD6309_EXCLUSIVE }, + { 0x1190, 3, "SUBE", DIR, HD6309_EXCLUSIVE }, + { 0x1191, 3, "CMPE", DIR, HD6309_EXCLUSIVE }, - { 0x1193, 3, "CMPU", DIR, M6x09_GENERAL }, + { 0x1193, 3, "CMPU", DIR, M6x09_GENERAL }, - { 0x1196, 3, "LDE", DIR, HD6309_EXCLUSIVE }, - { 0x1197, 3, "STE", DIR, HD6309_EXCLUSIVE }, - { 0x119B, 3, "ADDE", DIR, HD6309_EXCLUSIVE }, + { 0x1196, 3, "LDE", DIR, HD6309_EXCLUSIVE }, + { 0x1197, 3, "STE", DIR, HD6309_EXCLUSIVE }, + { 0x119B, 3, "ADDE", DIR, HD6309_EXCLUSIVE }, - { 0x119C, 3, "CMPS", DIR, M6x09_GENERAL }, + { 0x119C, 3, "CMPS", DIR, M6x09_GENERAL }, - { 0x119D, 3, "DIVD", DIR, HD6309_EXCLUSIVE }, - { 0x119E, 3, "DIVQ", DIR, HD6309_EXCLUSIVE }, - { 0x119F, 3, "MULD", DIR, HD6309_EXCLUSIVE }, + { 0x119D, 3, "DIVD", DIR, HD6309_EXCLUSIVE }, + { 0x119E, 3, "DIVQ", DIR, HD6309_EXCLUSIVE }, + { 0x119F, 3, "MULD", DIR, HD6309_EXCLUSIVE }, - { 0x11A0, 3, "SUBE", IND, HD6309_EXCLUSIVE }, - { 0x11A1, 3, "CMPE", IND, HD6309_EXCLUSIVE }, + { 0x11A0, 3, "SUBE", IND, HD6309_EXCLUSIVE }, + { 0x11A1, 3, "CMPE", IND, HD6309_EXCLUSIVE }, - { 0x11A3, 3, "CMPU", IND, M6x09_GENERAL }, + { 0x11A3, 3, "CMPU", IND, M6x09_GENERAL }, - { 0x11A6, 3, "LDE", IND, HD6309_EXCLUSIVE }, - { 0x11A7, 3, "STE", IND, HD6309_EXCLUSIVE }, - { 0x11AB, 3, "ADDE", IND, HD6309_EXCLUSIVE }, + { 0x11A6, 3, "LDE", IND, HD6309_EXCLUSIVE }, + { 0x11A7, 3, "STE", IND, HD6309_EXCLUSIVE }, + { 0x11AB, 3, "ADDE", IND, HD6309_EXCLUSIVE }, - { 0x11AC, 3, "CMPS", IND, M6x09_GENERAL }, + { 0x11AC, 3, "CMPS", IND, M6x09_GENERAL }, - { 0x11AD, 3, "DIVD", IND, HD6309_EXCLUSIVE }, - { 0x11AE, 3, "DIVQ", IND, HD6309_EXCLUSIVE }, - { 0x11AF, 3, "MULD", IND, HD6309_EXCLUSIVE }, - { 0x11B0, 4, "SUBE", EXT, HD6309_EXCLUSIVE }, - { 0x11B1, 4, "CMPE", EXT, HD6309_EXCLUSIVE }, + { 0x11AD, 3, "DIVD", IND, HD6309_EXCLUSIVE }, + { 0x11AE, 3, "DIVQ", IND, HD6309_EXCLUSIVE }, + { 0x11AF, 3, "MULD", IND, HD6309_EXCLUSIVE }, + { 0x11B0, 4, "SUBE", EXT, HD6309_EXCLUSIVE }, + { 0x11B1, 4, "CMPE", EXT, HD6309_EXCLUSIVE }, - { 0x11B3, 4, "CMPU", EXT, M6x09_GENERAL }, + { 0x11B3, 4, "CMPU", EXT, M6x09_GENERAL }, - { 0x11B6, 4, "LDE", EXT, HD6309_EXCLUSIVE }, - { 0x11B7, 4, "STE", EXT, HD6309_EXCLUSIVE }, + { 0x11B6, 4, "LDE", EXT, HD6309_EXCLUSIVE }, + { 0x11B7, 4, "STE", EXT, HD6309_EXCLUSIVE }, - { 0x11BB, 4, "ADDE", EXT, HD6309_EXCLUSIVE }, - { 0x11BC, 4, "CMPS", EXT, M6x09_GENERAL }, + { 0x11BB, 4, "ADDE", EXT, HD6309_EXCLUSIVE }, + { 0x11BC, 4, "CMPS", EXT, M6x09_GENERAL }, - { 0x11BD, 4, "DIVD", EXT, HD6309_EXCLUSIVE }, - { 0x11BE, 4, "DIVQ", EXT, HD6309_EXCLUSIVE }, - { 0x11BF, 4, "MULD", EXT, HD6309_EXCLUSIVE }, + { 0x11BD, 4, "DIVD", EXT, HD6309_EXCLUSIVE }, + { 0x11BE, 4, "DIVQ", EXT, HD6309_EXCLUSIVE }, + { 0x11BF, 4, "MULD", EXT, HD6309_EXCLUSIVE }, - { 0x11C0, 3, "SUBF", IMM, HD6309_EXCLUSIVE }, - { 0x11C1, 3, "CMPF", IMM, HD6309_EXCLUSIVE }, - { 0x11C6, 3, "LDF", IMM, HD6309_EXCLUSIVE }, - { 0x11CB, 3, "ADDF", IMM, HD6309_EXCLUSIVE }, + { 0x11C0, 3, "SUBF", IMM, HD6309_EXCLUSIVE }, + { 0x11C1, 3, "CMPF", IMM, HD6309_EXCLUSIVE }, + { 0x11C6, 3, "LDF", IMM, HD6309_EXCLUSIVE }, + { 0x11CB, 3, "ADDF", IMM, HD6309_EXCLUSIVE }, - { 0x11D0, 3, "SUBF", DIR, HD6309_EXCLUSIVE }, - { 0x11D1, 3, "CMPF", DIR, HD6309_EXCLUSIVE }, - { 0x11D6, 3, "LDF", DIR, HD6309_EXCLUSIVE }, - { 0x11D7, 3, "STF", DIR, HD6309_EXCLUSIVE }, - { 0x11DB, 3, "ADDF", DIR, HD6309_EXCLUSIVE }, + { 0x11D0, 3, "SUBF", DIR, HD6309_EXCLUSIVE }, + { 0x11D1, 3, "CMPF", DIR, HD6309_EXCLUSIVE }, + { 0x11D6, 3, "LDF", DIR, HD6309_EXCLUSIVE }, + { 0x11D7, 3, "STF", DIR, HD6309_EXCLUSIVE }, + { 0x11DB, 3, "ADDF", DIR, HD6309_EXCLUSIVE }, - { 0x11E0, 3, "SUBF", IND, HD6309_EXCLUSIVE }, - { 0x11E1, 3, "CMPF", IND, HD6309_EXCLUSIVE }, - { 0x11E6, 3, "LDF", IND, HD6309_EXCLUSIVE }, - { 0x11E7, 3, "STF", IND, HD6309_EXCLUSIVE }, - { 0x11EB, 3, "ADDF", IND, HD6309_EXCLUSIVE }, + { 0x11E0, 3, "SUBF", IND, HD6309_EXCLUSIVE }, + { 0x11E1, 3, "CMPF", IND, HD6309_EXCLUSIVE }, + { 0x11E6, 3, "LDF", IND, HD6309_EXCLUSIVE }, + { 0x11E7, 3, "STF", IND, HD6309_EXCLUSIVE }, + { 0x11EB, 3, "ADDF", IND, HD6309_EXCLUSIVE }, - { 0x11F0, 4, "SUBF", EXT, HD6309_EXCLUSIVE }, - { 0x11F1, 4, "CMPF", EXT, HD6309_EXCLUSIVE }, - { 0x11F6, 4, "LDF", EXT, HD6309_EXCLUSIVE }, - { 0x11F7, 4, "STF", EXT, HD6309_EXCLUSIVE }, - { 0x11FB, 4, "ADDF", EXT, HD6309_EXCLUSIVE } + { 0x11F0, 4, "SUBF", EXT, HD6309_EXCLUSIVE }, + { 0x11F1, 4, "CMPF", EXT, HD6309_EXCLUSIVE }, + { 0x11F6, 4, "LDF", EXT, HD6309_EXCLUSIVE }, + { 0x11F7, 4, "STF", EXT, HD6309_EXCLUSIVE }, + { 0x11FB, 4, "ADDF", EXT, HD6309_EXCLUSIVE } }; @@ -986,7 +986,7 @@ void m6x09_disassembler::indirect(std::ostream &stream, uint8_t pb, const uint8_ util::stream_format(stream, "$%04X,", (offset < 0) ? -offset : offset); util::stream_format(stream, "%s", m6x09_regs[reg]); break; - + case 0x8a: // (+/- F),R util::stream_format(stream, "F,%s", m6x09_regs[reg]); break; @@ -1109,216 +1109,216 @@ CPU_DISASSEMBLE(hd6309) static const opcodeinfo konami_opcodes[] = { - { 0x08, 2, "LEAX", IND, M6x09_GENERAL }, - { 0x09, 2, "LEAY", IND, M6x09_GENERAL }, - { 0x0A, 2, "LEAU", IND, M6x09_GENERAL }, - { 0x0B, 2, "LEAS", IND, M6x09_GENERAL }, - { 0x0C, 2, "PUSHS", PSHS, M6x09_GENERAL }, - { 0x0D, 2, "PUSHU", PSHU, M6x09_GENERAL }, - { 0x0E, 2, "PULLS", PULS, M6x09_GENERAL }, - { 0x0F, 2, "PULLU", PULU, M6x09_GENERAL }, - - { 0x10, 2, "LDA", IMM, M6x09_GENERAL }, - { 0x11, 2, "LDB", IMM, M6x09_GENERAL }, - { 0x12, 2, "LDA", IND, M6x09_GENERAL }, - { 0x13, 2, "LDB", IND, M6x09_GENERAL }, - { 0x14, 2, "ADDA", IMM, M6x09_GENERAL }, - { 0x15, 2, "ADDB", IMM, M6x09_GENERAL }, - { 0x16, 2, "ADDA", IND, M6x09_GENERAL }, - { 0x17, 2, "ADDB", IND, M6x09_GENERAL }, - { 0x18, 2, "ADCA", IMM, M6x09_GENERAL }, - { 0x19, 2, "ADCB", IMM, M6x09_GENERAL }, - { 0x1A, 2, "ADCA", IND, M6x09_GENERAL }, - { 0x1B, 2, "ADCB", IND, M6x09_GENERAL }, - { 0x1C, 2, "SUBA", IMM, M6x09_GENERAL }, - { 0x1D, 2, "SUBB", IMM, M6x09_GENERAL }, - { 0x1E, 2, "SUBA", IND, M6x09_GENERAL }, - { 0x1F, 2, "SUBB", IND, M6x09_GENERAL }, - - { 0x20, 2, "SBCA", IMM, M6x09_GENERAL }, - { 0x21, 2, "SBCB", IMM, M6x09_GENERAL }, - { 0x22, 2, "SBCA", IND, M6x09_GENERAL }, - { 0x23, 2, "SBCB", IND, M6x09_GENERAL }, - { 0x24, 2, "ANDA", IMM, M6x09_GENERAL }, - { 0x25, 2, "ANDB", IMM, M6x09_GENERAL }, - { 0x26, 2, "ANDA", IND, M6x09_GENERAL }, - { 0x27, 2, "ANDB", IND, M6x09_GENERAL }, - { 0x28, 2, "BITA", IMM, M6x09_GENERAL }, - { 0x29, 2, "BITB", IMM, M6x09_GENERAL }, - { 0x2A, 2, "BITA", IND, M6x09_GENERAL }, - { 0x2B, 2, "BITB", IND, M6x09_GENERAL }, - { 0x2C, 2, "EORA", IMM, M6x09_GENERAL }, - { 0x2D, 2, "EORB", IMM, M6x09_GENERAL }, - { 0x2E, 2, "EORA", IND, M6x09_GENERAL }, - { 0x2F, 2, "EORB", IND, M6x09_GENERAL }, - - { 0x30, 2, "ORA", IMM, M6x09_GENERAL }, - { 0x31, 2, "ORB", IMM, M6x09_GENERAL }, - { 0x32, 2, "ORA", IND, M6x09_GENERAL }, - { 0x33, 2, "ORB", IND, M6x09_GENERAL }, - { 0x34, 2, "CMPA", IMM, M6x09_GENERAL }, - { 0x35, 2, "CMPB", IMM, M6x09_GENERAL }, - { 0x36, 2, "CMPA", IND, M6x09_GENERAL }, - { 0x37, 2, "CMPB", IND, M6x09_GENERAL }, - { 0x38, 2, "SETLINES", IMM, M6x09_GENERAL }, - { 0x39, 2, "SETLINES", IND, M6x09_GENERAL }, - { 0x3A, 2, "STA", IND, M6x09_GENERAL }, - { 0x3B, 2, "STB", IND, M6x09_GENERAL }, - { 0x3C, 2, "ANDCC", IMM, M6x09_GENERAL }, - { 0x3D, 2, "ORCC", IMM, M6x09_GENERAL }, - { 0x3E, 2, "EXG", IMM_RR, M6x09_GENERAL }, - { 0x3F, 2, "TFR", IMM_RR, M6x09_GENERAL }, - - { 0x40, 3, "LDD", IMM, M6x09_GENERAL }, - { 0x41, 2, "LDD", IND, M6x09_GENERAL }, - { 0x42, 3, "LDX", IMM, M6x09_GENERAL }, - { 0x43, 2, "LDX", IND, M6x09_GENERAL }, - { 0x44, 3, "LDY", IMM, M6x09_GENERAL }, - { 0x45, 2, "LDY", IND, M6x09_GENERAL }, - { 0x46, 3, "LDU", IMM, M6x09_GENERAL }, - { 0x47, 2, "LDU", IND, M6x09_GENERAL }, - { 0x48, 3, "LDS", IMM, M6x09_GENERAL }, - { 0x49, 2, "LDS", IND, M6x09_GENERAL }, - { 0x4A, 3, "CMPD", IMM, M6x09_GENERAL }, - { 0x4B, 2, "CMPD", IND, M6x09_GENERAL }, - { 0x4C, 3, "CMPX", IMM, M6x09_GENERAL }, - { 0x4D, 2, "CMPX", IND, M6x09_GENERAL }, - { 0x4E, 3, "CMPY", IMM, M6x09_GENERAL }, - { 0x4F, 2, "CMPY", IND, M6x09_GENERAL }, - - { 0x50, 3, "CMPU", IMM, M6x09_GENERAL }, - { 0x51, 2, "CMPU", IND, M6x09_GENERAL }, - { 0x52, 3, "CMPS", IMM, M6x09_GENERAL }, - { 0x53, 2, "CMPS", IND, M6x09_GENERAL }, - { 0x54, 3, "ADDD", IMM, M6x09_GENERAL }, - { 0x55, 2, "ADDD", IND, M6x09_GENERAL }, - { 0x56, 3, "SUBD", IMM, M6x09_GENERAL }, - { 0x57, 2, "SUBD", IND, M6x09_GENERAL }, - { 0x58, 2, "STD", IND, M6x09_GENERAL }, - { 0x59, 2, "STX", IND, M6x09_GENERAL }, - { 0x5A, 2, "STY", IND, M6x09_GENERAL }, - { 0x5B, 2, "STU", IND, M6x09_GENERAL }, - { 0x5C, 2, "STS", IND, M6x09_GENERAL }, - - { 0x60, 2, "BRA", REL, M6x09_GENERAL }, - { 0x61, 2, "BHI", REL, M6x09_GENERAL }, - { 0x62, 2, "BCC", REL, M6x09_GENERAL }, - { 0x63, 2, "BNE", REL, M6x09_GENERAL }, - { 0x64, 2, "BVC", REL, M6x09_GENERAL }, - { 0x65, 2, "BPL", REL, M6x09_GENERAL }, - { 0x66, 2, "BGE", REL, M6x09_GENERAL }, - { 0x67, 2, "BGT", REL, M6x09_GENERAL }, - { 0x68, 3, "LBRA", LREL, M6x09_GENERAL }, - { 0x69, 3, "LBHI", LREL, M6x09_GENERAL }, - { 0x6A, 3, "LBCC", LREL, M6x09_GENERAL }, - { 0x6B, 3, "LBNE", LREL, M6x09_GENERAL }, - { 0x6C, 3, "LBVC", LREL, M6x09_GENERAL }, - { 0x6D, 3, "LBPL", LREL, M6x09_GENERAL }, - { 0x6E, 3, "LBGE", LREL, M6x09_GENERAL }, - { 0x6F, 3, "LBGT", LREL, M6x09_GENERAL }, - - { 0x70, 2, "BRN", REL, M6x09_GENERAL }, - { 0x71, 2, "BLS", REL, M6x09_GENERAL }, - { 0x72, 2, "BCS", REL, M6x09_GENERAL }, - { 0x73, 2, "BEQ", REL, M6x09_GENERAL }, - { 0x74, 2, "BVS", REL, M6x09_GENERAL }, - { 0x75, 2, "BMI", REL, M6x09_GENERAL }, - { 0x76, 2, "BLT", REL, M6x09_GENERAL }, - { 0x77, 2, "BLE", REL, M6x09_GENERAL }, - { 0x78, 3, "LBRN", LREL, M6x09_GENERAL }, - { 0x79, 3, "LBLS", LREL, M6x09_GENERAL }, - { 0x7A, 3, "LBCS", LREL, M6x09_GENERAL }, - { 0x7B, 3, "LBEQ", LREL, M6x09_GENERAL }, - { 0x7C, 3, "LBVS", LREL, M6x09_GENERAL }, - { 0x7D, 3, "LBMI", LREL, M6x09_GENERAL }, - { 0x7E, 3, "LBLT", LREL, M6x09_GENERAL }, - { 0x7F, 3, "LBLE", LREL, M6x09_GENERAL }, - - { 0x80, 1, "CLRA", INH, M6x09_GENERAL }, - { 0x81, 1, "CLRB", INH, M6x09_GENERAL }, - { 0x82, 2, "CLR", IND, M6x09_GENERAL }, - { 0x83, 1, "COMA", INH, M6x09_GENERAL }, - { 0x84, 1, "COMB", INH, M6x09_GENERAL }, - { 0x85, 2, "COM", IND, M6x09_GENERAL }, - { 0x86, 1, "NEGA", INH, M6x09_GENERAL }, - { 0x87, 1, "NEGB", INH, M6x09_GENERAL }, - { 0x88, 2, "NEG", IND, M6x09_GENERAL }, - { 0x89, 1, "INCA", INH, M6x09_GENERAL }, - { 0x8A, 1, "INCB", INH, M6x09_GENERAL }, - { 0x8B, 2, "INC", IND, M6x09_GENERAL }, - { 0x8C, 1, "DECA", INH, M6x09_GENERAL }, - { 0x8D, 1, "DECB", INH, M6x09_GENERAL }, - { 0x8E, 2, "DEC", IND, M6x09_GENERAL }, - { 0x8F, 1, "RTS", INH , M6x09_GENERAL }, - - { 0x90, 1, "TSTA", INH, M6x09_GENERAL }, - { 0x91, 1, "TSTB", INH, M6x09_GENERAL }, - { 0x92, 2, "TST", IND, M6x09_GENERAL }, - { 0x93, 1, "LSRA", INH, M6x09_GENERAL }, - { 0x94, 1, "LSRB", INH, M6x09_GENERAL }, - { 0x95, 2, "LSR", IND, M6x09_GENERAL }, - { 0x96, 1, "RORA", INH, M6x09_GENERAL }, - { 0x97, 1, "RORB", INH, M6x09_GENERAL }, - { 0x98, 2, "ROR", IND, M6x09_GENERAL }, - { 0x99, 1, "ASRA", INH, M6x09_GENERAL }, - { 0x9A, 1, "ASRB", INH, M6x09_GENERAL }, - { 0x9B, 2, "ASR", IND, M6x09_GENERAL }, - { 0x9C, 1, "ASLA", INH, M6x09_GENERAL }, - { 0x9D, 1, "ASLB", INH, M6x09_GENERAL }, - { 0x9E, 2, "ASL", IND, M6x09_GENERAL }, - { 0x9F, 1, "RTI", INH , M6x09_GENERAL }, - - { 0xA0, 1, "ROLA", INH, M6x09_GENERAL }, - { 0xA1, 1, "ROLB", INH, M6x09_GENERAL }, - { 0xA2, 2, "ROL", IND, M6x09_GENERAL }, - { 0xA3, 2, "LSRW", IND, M6x09_GENERAL }, - { 0xA4, 2, "RORW", IND, M6x09_GENERAL }, - { 0xA5, 2, "ASRW", IND, M6x09_GENERAL }, - { 0xA6, 2, "ASLW", IND, M6x09_GENERAL }, - { 0xA7, 2, "ROLW", IND, M6x09_GENERAL }, - { 0xA8, 2, "JMP", IND, M6x09_GENERAL }, - { 0xA9, 2, "JSR", IND, M6x09_GENERAL, DASMFLAG_STEP_OVER }, - { 0xAA, 2, "BSR", REL, M6x09_GENERAL, DASMFLAG_STEP_OVER }, - { 0xAB, 3, "LBSR", LREL, M6x09_GENERAL, DASMFLAG_STEP_OVER }, - { 0xAC, 2, "DECB,JNZ", REL, M6x09_GENERAL }, - { 0xAD, 2, "DECX,JNZ", REL, M6x09_GENERAL }, - { 0xAE, 1, "NOP", INH, M6x09_GENERAL }, - - { 0xB0, 1, "ABX", INH, M6x09_GENERAL }, - { 0xB1, 1, "DAA", INH, M6x09_GENERAL }, - { 0xB2, 1, "SEX", INH, M6x09_GENERAL }, - { 0xB3, 1, "MUL", INH, M6x09_GENERAL }, - { 0xB4, 1, "LMUL", INH, M6x09_GENERAL }, - { 0xB5, 1, "DIV X,B", INH, M6x09_GENERAL }, - { 0xB6, 1, "BMOVE Y,X,U", INH , M6x09_GENERAL }, - { 0xB7, 1, "MOVE Y,X,U", INH , M6x09_GENERAL }, - { 0xB8, 2, "LSRD", IMM, M6x09_GENERAL }, - { 0xB9, 2, "LSRD", IND, M6x09_GENERAL }, - { 0xBA, 2, "RORD", IMM, M6x09_GENERAL }, - { 0xBB, 2, "RORD", IND, M6x09_GENERAL }, - { 0xBC, 2, "ASRD", IMM, M6x09_GENERAL }, - { 0xBD, 2, "ASRD", IND, M6x09_GENERAL }, - { 0xBE, 2, "ASLD", IMM, M6x09_GENERAL }, - { 0xBF, 2, "ASLD", IND, M6x09_GENERAL }, - - { 0xC0, 2, "ROLD", IMM, M6x09_GENERAL }, - { 0xC1, 2, "ROLD", IND, M6x09_GENERAL }, - { 0xC2, 1, "CLRD", INH, M6x09_GENERAL }, - { 0xC3, 2, "CLRW", IND, M6x09_GENERAL }, - { 0xC4, 1, "NEGD", INH, M6x09_GENERAL }, - { 0xC5, 2, "NEGW", IND, M6x09_GENERAL }, - { 0xC6, 1, "INCD", INH, M6x09_GENERAL }, - { 0xC7, 2, "INCW", IND, M6x09_GENERAL }, - { 0xC8, 1, "DECD", INH, M6x09_GENERAL }, - { 0xC9, 2, "DECW", IND, M6x09_GENERAL }, - { 0xCA, 1, "TSTD", INH, M6x09_GENERAL }, - { 0xCB, 2, "TSTW", IND, M6x09_GENERAL }, - { 0xCC, 1, "ABSA", INH, M6x09_GENERAL }, - { 0xCD, 1, "ABSB", INH, M6x09_GENERAL }, - { 0xCE, 1, "ABSD", INH, M6x09_GENERAL }, - { 0xCF, 1, "BSET A,X,U", INH, M6x09_GENERAL }, - - { 0xD0, 1, "BSET D,X,U", INH, M6x09_GENERAL } + { 0x08, 2, "LEAX", IND, M6x09_GENERAL }, + { 0x09, 2, "LEAY", IND, M6x09_GENERAL }, + { 0x0A, 2, "LEAU", IND, M6x09_GENERAL }, + { 0x0B, 2, "LEAS", IND, M6x09_GENERAL }, + { 0x0C, 2, "PUSHS", PSHS, M6x09_GENERAL }, + { 0x0D, 2, "PUSHU", PSHU, M6x09_GENERAL }, + { 0x0E, 2, "PULLS", PULS, M6x09_GENERAL }, + { 0x0F, 2, "PULLU", PULU, M6x09_GENERAL }, + + { 0x10, 2, "LDA", IMM, M6x09_GENERAL }, + { 0x11, 2, "LDB", IMM, M6x09_GENERAL }, + { 0x12, 2, "LDA", IND, M6x09_GENERAL }, + { 0x13, 2, "LDB", IND, M6x09_GENERAL }, + { 0x14, 2, "ADDA", IMM, M6x09_GENERAL }, + { 0x15, 2, "ADDB", IMM, M6x09_GENERAL }, + { 0x16, 2, "ADDA", IND, M6x09_GENERAL }, + { 0x17, 2, "ADDB", IND, M6x09_GENERAL }, + { 0x18, 2, "ADCA", IMM, M6x09_GENERAL }, + { 0x19, 2, "ADCB", IMM, M6x09_GENERAL }, + { 0x1A, 2, "ADCA", IND, M6x09_GENERAL }, + { 0x1B, 2, "ADCB", IND, M6x09_GENERAL }, + { 0x1C, 2, "SUBA", IMM, M6x09_GENERAL }, + { 0x1D, 2, "SUBB", IMM, M6x09_GENERAL }, + { 0x1E, 2, "SUBA", IND, M6x09_GENERAL }, + { 0x1F, 2, "SUBB", IND, M6x09_GENERAL }, + + { 0x20, 2, "SBCA", IMM, M6x09_GENERAL }, + { 0x21, 2, "SBCB", IMM, M6x09_GENERAL }, + { 0x22, 2, "SBCA", IND, M6x09_GENERAL }, + { 0x23, 2, "SBCB", IND, M6x09_GENERAL }, + { 0x24, 2, "ANDA", IMM, M6x09_GENERAL }, + { 0x25, 2, "ANDB", IMM, M6x09_GENERAL }, + { 0x26, 2, "ANDA", IND, M6x09_GENERAL }, + { 0x27, 2, "ANDB", IND, M6x09_GENERAL }, + { 0x28, 2, "BITA", IMM, M6x09_GENERAL }, + { 0x29, 2, "BITB", IMM, M6x09_GENERAL }, + { 0x2A, 2, "BITA", IND, M6x09_GENERAL }, + { 0x2B, 2, "BITB", IND, M6x09_GENERAL }, + { 0x2C, 2, "EORA", IMM, M6x09_GENERAL }, + { 0x2D, 2, "EORB", IMM, M6x09_GENERAL }, + { 0x2E, 2, "EORA", IND, M6x09_GENERAL }, + { 0x2F, 2, "EORB", IND, M6x09_GENERAL }, + + { 0x30, 2, "ORA", IMM, M6x09_GENERAL }, + { 0x31, 2, "ORB", IMM, M6x09_GENERAL }, + { 0x32, 2, "ORA", IND, M6x09_GENERAL }, + { 0x33, 2, "ORB", IND, M6x09_GENERAL }, + { 0x34, 2, "CMPA", IMM, M6x09_GENERAL }, + { 0x35, 2, "CMPB", IMM, M6x09_GENERAL }, + { 0x36, 2, "CMPA", IND, M6x09_GENERAL }, + { 0x37, 2, "CMPB", IND, M6x09_GENERAL }, + { 0x38, 2, "SETLINES", IMM, M6x09_GENERAL }, + { 0x39, 2, "SETLINES", IND, M6x09_GENERAL }, + { 0x3A, 2, "STA", IND, M6x09_GENERAL }, + { 0x3B, 2, "STB", IND, M6x09_GENERAL }, + { 0x3C, 2, "ANDCC", IMM, M6x09_GENERAL }, + { 0x3D, 2, "ORCC", IMM, M6x09_GENERAL }, + { 0x3E, 2, "EXG", IMM_RR, M6x09_GENERAL }, + { 0x3F, 2, "TFR", IMM_RR, M6x09_GENERAL }, + + { 0x40, 3, "LDD", IMM, M6x09_GENERAL }, + { 0x41, 2, "LDD", IND, M6x09_GENERAL }, + { 0x42, 3, "LDX", IMM, M6x09_GENERAL }, + { 0x43, 2, "LDX", IND, M6x09_GENERAL }, + { 0x44, 3, "LDY", IMM, M6x09_GENERAL }, + { 0x45, 2, "LDY", IND, M6x09_GENERAL }, + { 0x46, 3, "LDU", IMM, M6x09_GENERAL }, + { 0x47, 2, "LDU", IND, M6x09_GENERAL }, + { 0x48, 3, "LDS", IMM, M6x09_GENERAL }, + { 0x49, 2, "LDS", IND, M6x09_GENERAL }, + { 0x4A, 3, "CMPD", IMM, M6x09_GENERAL }, + { 0x4B, 2, "CMPD", IND, M6x09_GENERAL }, + { 0x4C, 3, "CMPX", IMM, M6x09_GENERAL }, + { 0x4D, 2, "CMPX", IND, M6x09_GENERAL }, + { 0x4E, 3, "CMPY", IMM, M6x09_GENERAL }, + { 0x4F, 2, "CMPY", IND, M6x09_GENERAL }, + + { 0x50, 3, "CMPU", IMM, M6x09_GENERAL }, + { 0x51, 2, "CMPU", IND, M6x09_GENERAL }, + { 0x52, 3, "CMPS", IMM, M6x09_GENERAL }, + { 0x53, 2, "CMPS", IND, M6x09_GENERAL }, + { 0x54, 3, "ADDD", IMM, M6x09_GENERAL }, + { 0x55, 2, "ADDD", IND, M6x09_GENERAL }, + { 0x56, 3, "SUBD", IMM, M6x09_GENERAL }, + { 0x57, 2, "SUBD", IND, M6x09_GENERAL }, + { 0x58, 2, "STD", IND, M6x09_GENERAL }, + { 0x59, 2, "STX", IND, M6x09_GENERAL }, + { 0x5A, 2, "STY", IND, M6x09_GENERAL }, + { 0x5B, 2, "STU", IND, M6x09_GENERAL }, + { 0x5C, 2, "STS", IND, M6x09_GENERAL }, + + { 0x60, 2, "BRA", REL, M6x09_GENERAL }, + { 0x61, 2, "BHI", REL, M6x09_GENERAL }, + { 0x62, 2, "BCC", REL, M6x09_GENERAL }, + { 0x63, 2, "BNE", REL, M6x09_GENERAL }, + { 0x64, 2, "BVC", REL, M6x09_GENERAL }, + { 0x65, 2, "BPL", REL, M6x09_GENERAL }, + { 0x66, 2, "BGE", REL, M6x09_GENERAL }, + { 0x67, 2, "BGT", REL, M6x09_GENERAL }, + { 0x68, 3, "LBRA", LREL, M6x09_GENERAL }, + { 0x69, 3, "LBHI", LREL, M6x09_GENERAL }, + { 0x6A, 3, "LBCC", LREL, M6x09_GENERAL }, + { 0x6B, 3, "LBNE", LREL, M6x09_GENERAL }, + { 0x6C, 3, "LBVC", LREL, M6x09_GENERAL }, + { 0x6D, 3, "LBPL", LREL, M6x09_GENERAL }, + { 0x6E, 3, "LBGE", LREL, M6x09_GENERAL }, + { 0x6F, 3, "LBGT", LREL, M6x09_GENERAL }, + + { 0x70, 2, "BRN", REL, M6x09_GENERAL }, + { 0x71, 2, "BLS", REL, M6x09_GENERAL }, + { 0x72, 2, "BCS", REL, M6x09_GENERAL }, + { 0x73, 2, "BEQ", REL, M6x09_GENERAL }, + { 0x74, 2, "BVS", REL, M6x09_GENERAL }, + { 0x75, 2, "BMI", REL, M6x09_GENERAL }, + { 0x76, 2, "BLT", REL, M6x09_GENERAL }, + { 0x77, 2, "BLE", REL, M6x09_GENERAL }, + { 0x78, 3, "LBRN", LREL, M6x09_GENERAL }, + { 0x79, 3, "LBLS", LREL, M6x09_GENERAL }, + { 0x7A, 3, "LBCS", LREL, M6x09_GENERAL }, + { 0x7B, 3, "LBEQ", LREL, M6x09_GENERAL }, + { 0x7C, 3, "LBVS", LREL, M6x09_GENERAL }, + { 0x7D, 3, "LBMI", LREL, M6x09_GENERAL }, + { 0x7E, 3, "LBLT", LREL, M6x09_GENERAL }, + { 0x7F, 3, "LBLE", LREL, M6x09_GENERAL }, + + { 0x80, 1, "CLRA", INH, M6x09_GENERAL }, + { 0x81, 1, "CLRB", INH, M6x09_GENERAL }, + { 0x82, 2, "CLR", IND, M6x09_GENERAL }, + { 0x83, 1, "COMA", INH, M6x09_GENERAL }, + { 0x84, 1, "COMB", INH, M6x09_GENERAL }, + { 0x85, 2, "COM", IND, M6x09_GENERAL }, + { 0x86, 1, "NEGA", INH, M6x09_GENERAL }, + { 0x87, 1, "NEGB", INH, M6x09_GENERAL }, + { 0x88, 2, "NEG", IND, M6x09_GENERAL }, + { 0x89, 1, "INCA", INH, M6x09_GENERAL }, + { 0x8A, 1, "INCB", INH, M6x09_GENERAL }, + { 0x8B, 2, "INC", IND, M6x09_GENERAL }, + { 0x8C, 1, "DECA", INH, M6x09_GENERAL }, + { 0x8D, 1, "DECB", INH, M6x09_GENERAL }, + { 0x8E, 2, "DEC", IND, M6x09_GENERAL }, + { 0x8F, 1, "RTS", INH , M6x09_GENERAL }, + + { 0x90, 1, "TSTA", INH, M6x09_GENERAL }, + { 0x91, 1, "TSTB", INH, M6x09_GENERAL }, + { 0x92, 2, "TST", IND, M6x09_GENERAL }, + { 0x93, 1, "LSRA", INH, M6x09_GENERAL }, + { 0x94, 1, "LSRB", INH, M6x09_GENERAL }, + { 0x95, 2, "LSR", IND, M6x09_GENERAL }, + { 0x96, 1, "RORA", INH, M6x09_GENERAL }, + { 0x97, 1, "RORB", INH, M6x09_GENERAL }, + { 0x98, 2, "ROR", IND, M6x09_GENERAL }, + { 0x99, 1, "ASRA", INH, M6x09_GENERAL }, + { 0x9A, 1, "ASRB", INH, M6x09_GENERAL }, + { 0x9B, 2, "ASR", IND, M6x09_GENERAL }, + { 0x9C, 1, "ASLA", INH, M6x09_GENERAL }, + { 0x9D, 1, "ASLB", INH, M6x09_GENERAL }, + { 0x9E, 2, "ASL", IND, M6x09_GENERAL }, + { 0x9F, 1, "RTI", INH , M6x09_GENERAL }, + + { 0xA0, 1, "ROLA", INH, M6x09_GENERAL }, + { 0xA1, 1, "ROLB", INH, M6x09_GENERAL }, + { 0xA2, 2, "ROL", IND, M6x09_GENERAL }, + { 0xA3, 2, "LSRW", IND, M6x09_GENERAL }, + { 0xA4, 2, "RORW", IND, M6x09_GENERAL }, + { 0xA5, 2, "ASRW", IND, M6x09_GENERAL }, + { 0xA6, 2, "ASLW", IND, M6x09_GENERAL }, + { 0xA7, 2, "ROLW", IND, M6x09_GENERAL }, + { 0xA8, 2, "JMP", IND, M6x09_GENERAL }, + { 0xA9, 2, "JSR", IND, M6x09_GENERAL, DASMFLAG_STEP_OVER }, + { 0xAA, 2, "BSR", REL, M6x09_GENERAL, DASMFLAG_STEP_OVER }, + { 0xAB, 3, "LBSR", LREL, M6x09_GENERAL, DASMFLAG_STEP_OVER }, + { 0xAC, 2, "DECB,JNZ", REL, M6x09_GENERAL }, + { 0xAD, 2, "DECX,JNZ", REL, M6x09_GENERAL }, + { 0xAE, 1, "NOP", INH, M6x09_GENERAL }, + + { 0xB0, 1, "ABX", INH, M6x09_GENERAL }, + { 0xB1, 1, "DAA", INH, M6x09_GENERAL }, + { 0xB2, 1, "SEX", INH, M6x09_GENERAL }, + { 0xB3, 1, "MUL", INH, M6x09_GENERAL }, + { 0xB4, 1, "LMUL", INH, M6x09_GENERAL }, + { 0xB5, 1, "DIV X,B", INH, M6x09_GENERAL }, + { 0xB6, 1, "BMOVE Y,X,U", INH , M6x09_GENERAL }, + { 0xB7, 1, "MOVE Y,X,U", INH , M6x09_GENERAL }, + { 0xB8, 2, "LSRD", IMM, M6x09_GENERAL }, + { 0xB9, 2, "LSRD", IND, M6x09_GENERAL }, + { 0xBA, 2, "RORD", IMM, M6x09_GENERAL }, + { 0xBB, 2, "RORD", IND, M6x09_GENERAL }, + { 0xBC, 2, "ASRD", IMM, M6x09_GENERAL }, + { 0xBD, 2, "ASRD", IND, M6x09_GENERAL }, + { 0xBE, 2, "ASLD", IMM, M6x09_GENERAL }, + { 0xBF, 2, "ASLD", IND, M6x09_GENERAL }, + + { 0xC0, 2, "ROLD", IMM, M6x09_GENERAL }, + { 0xC1, 2, "ROLD", IND, M6x09_GENERAL }, + { 0xC2, 1, "CLRD", INH, M6x09_GENERAL }, + { 0xC3, 2, "CLRW", IND, M6x09_GENERAL }, + { 0xC4, 1, "NEGD", INH, M6x09_GENERAL }, + { 0xC5, 2, "NEGW", IND, M6x09_GENERAL }, + { 0xC6, 1, "INCD", INH, M6x09_GENERAL }, + { 0xC7, 2, "INCW", IND, M6x09_GENERAL }, + { 0xC8, 1, "DECD", INH, M6x09_GENERAL }, + { 0xC9, 2, "DECW", IND, M6x09_GENERAL }, + { 0xCA, 1, "TSTD", INH, M6x09_GENERAL }, + { 0xCB, 2, "TSTW", IND, M6x09_GENERAL }, + { 0xCC, 1, "ABSA", INH, M6x09_GENERAL }, + { 0xCD, 1, "ABSB", INH, M6x09_GENERAL }, + { 0xCE, 1, "ABSD", INH, M6x09_GENERAL }, + { 0xCF, 1, "BSET A,X,U", INH, M6x09_GENERAL }, + + { 0xD0, 1, "BSET D,X,U", INH, M6x09_GENERAL } }; @@ -1391,8 +1391,10 @@ void konami_disassembler::indirect(std::ostream &stream, uint8_t mode, const uin break; } } - else { - switch (type & 7) { + else + { + switch (type & 7) + { case 0x00: /* register a */ util::stream_format(stream, "a,%s", index_reg[idx]); break; diff --git a/src/devices/cpu/mips/mips3.h b/src/devices/cpu/mips/mips3.h index a1a1270ac63..6d03dc1e5cc 100644 --- a/src/devices/cpu/mips/mips3.h +++ b/src/devices/cpu/mips/mips3.h @@ -767,7 +767,7 @@ private: /*************************************************************************** - DISASSEMBLING + DISASSEMBLING ***************************************************************************/ unsigned dasmmips3(std::ostream &stream, unsigned pc, uint32_t op); diff --git a/src/devices/cpu/mips/mips3drc.cpp b/src/devices/cpu/mips/mips3drc.cpp index 92299fa3808..258748b29a6 100644 --- a/src/devices/cpu/mips/mips3drc.cpp +++ b/src/devices/cpu/mips/mips3drc.cpp @@ -4090,7 +4090,7 @@ void mips3_device::log_opcode_desc(drcuml_state *drcuml, const opcode_desc *desc } else buffer << "???"; - + const std::string buffer_string = buffer.str(); drcuml->log_printf("%08X [%08X] t:%08X f:%s: %-30s", desclist->pc, desclist->physpc, desclist->targetpc, log_desc_flags_to_string(desclist->flags), buffer_string.c_str()); diff --git a/src/devices/cpu/nanoprocessor/nanoprocessor.cpp b/src/devices/cpu/nanoprocessor/nanoprocessor.cpp index a67bd8465c1..c74885b445d 100644 --- a/src/devices/cpu/nanoprocessor/nanoprocessor.cpp +++ b/src/devices/cpu/nanoprocessor/nanoprocessor.cpp @@ -37,9 +37,9 @@ enum { #define BIT_SET(w , n) ((w) |= BIT_MASK(n)) // Bits in m_flags -#define NANO_DC0_BIT 0 // DC0 -#define NANO_E_BIT (NANO_DC0_BIT + HP_NANO_DC_NO) // Extend flag -#define NANO_I_BIT (NANO_E_BIT + 1) // Interrupt flag +#define NANO_DC0_BIT 0 // DC0 +#define NANO_E_BIT (NANO_DC0_BIT + HP_NANO_DC_NO) // Extend flag +#define NANO_I_BIT (NANO_E_BIT + 1) // Interrupt flag const device_type HP_NANOPROCESSOR = &device_creator; diff --git a/src/devices/cpu/nanoprocessor/nanoprocessor.h b/src/devices/cpu/nanoprocessor/nanoprocessor.h index d94c5159599..fb112d647e0 100644 --- a/src/devices/cpu/nanoprocessor/nanoprocessor.h +++ b/src/devices/cpu/nanoprocessor/nanoprocessor.h @@ -53,21 +53,21 @@ #ifndef _NANOPROCESSOR_H_ #define _NANOPROCESSOR_H_ -#define HP_NANO_REGS 16 // Number of GP registers -#define HP_NANO_PC_MASK 0x7ff // Mask of PC meaningful bits: 11 bits available -#define HP_NANO_DC_NO 8 // Number of direct control lines (DC7 is typically used as interrupt mask) -#define HP_NANO_IE_DC 7 // DC line used as interrupt enable/mask (DC7) +#define HP_NANO_REGS 16 // Number of GP registers +#define HP_NANO_PC_MASK 0x7ff // Mask of PC meaningful bits: 11 bits available +#define HP_NANO_DC_NO 8 // Number of direct control lines (DC7 is typically used as interrupt mask) +#define HP_NANO_IE_DC 7 // DC line used as interrupt enable/mask (DC7) // DC changed callback // The callback receives a 8-bit word holding the state of all DC lines. // DC0 is in bit 0, DC1 in bit 1 and so on. // Keep in mind that DC7 usually masks the interrupt signal. -#define MCFG_HP_NANO_DC_CHANGED(_devcb) \ +#define MCFG_HP_NANO_DC_CHANGED(_devcb) \ hp_nanoprocessor_device::set_dc_changed_func(*device , DEVCB_##_devcb); // Callback to read the input state of DC lines // All lines that are not in input are to be reported at "1" -#define MCFG_HP_NANO_READ_DC_CB(_devcb) \ +#define MCFG_HP_NANO_READ_DC_CB(_devcb) \ hp_nanoprocessor_device::set_read_dc_func(*device , DEVCB_##_devcb); class hp_nanoprocessor_device : public cpu_device @@ -110,12 +110,12 @@ private: int m_icount; // State of processor - uint8_t m_reg_A; // Accumulator - uint8_t m_reg_R[ HP_NANO_REGS ]; // General purpose registers - uint16_t m_reg_PA; // Program counter ("Program Address" in HP doc) - uint16_t m_reg_SSR; // Subroutine stack register - uint16_t m_reg_ISR; // Interrupt stack register - uint16_t m_flags; // Flags: extend flag (E) & direct control lines (DC0-7) + uint8_t m_reg_A; // Accumulator + uint8_t m_reg_R[ HP_NANO_REGS ]; // General purpose registers + uint16_t m_reg_PA; // Program counter ("Program Address" in HP doc) + uint16_t m_reg_SSR; // Subroutine stack register + uint16_t m_reg_ISR; // Interrupt stack register + uint16_t m_flags; // Flags: extend flag (E) & direct control lines (DC0-7) address_space_config m_program_config; address_space_config m_io_config; diff --git a/src/devices/cpu/nanoprocessor/nanoprocessor_dasm.cpp b/src/devices/cpu/nanoprocessor/nanoprocessor_dasm.cpp index 418d6f57c7f..6ec1239dbc6 100644 --- a/src/devices/cpu/nanoprocessor/nanoprocessor_dasm.cpp +++ b/src/devices/cpu/nanoprocessor/nanoprocessor_dasm.cpp @@ -114,9 +114,9 @@ static const dis_entry_t dis_table[] = { CPU_DISASSEMBLE(hp_nanoprocessor) { - const uint8_t opcode = *oprom; + const uint8_t opcode = *oprom; - opram++; + opram++; for (const dis_entry_t& ent : dis_table) { if ((opcode & ent.m_op_mask) == ent.m_opcode) { diff --git a/src/devices/cpu/rsp/rsp.cpp b/src/devices/cpu/rsp/rsp.cpp index cfad28e91f3..2745b22ae54 100644 --- a/src/devices/cpu/rsp/rsp.cpp +++ b/src/devices/cpu/rsp/rsp.cpp @@ -735,7 +735,7 @@ void rsp_device::execute_run() { int i, l; static uint32_t prev_regs[32]; - + util::ovectorstream string; rsp_dasm_one(string, m_ppc, op); string.put('\0'); diff --git a/src/devices/cpu/sh4/sh4.cpp b/src/devices/cpu/sh4/sh4.cpp index 0dce1e5c744..72ceae2c0a2 100644 --- a/src/devices/cpu/sh4/sh4.cpp +++ b/src/devices/cpu/sh4/sh4.cpp @@ -198,8 +198,8 @@ void sh4_base_device::LDTLB(const uint16_t opcode) // these come from PTEH m_utlb[replace].VPN = (m_m[PTEH] & 0xfffffc00) >> 10; -// m_utlb[replace].D = (m_m[PTEH] & 0x00000200) >> 9; // from PTEL -// m_utlb[replace].V = (m_m[PTEH] & 0x00000100) >> 8; // from PTEL +// m_utlb[replace].D = (m_m[PTEH] & 0x00000200) >> 9; // from PTEL +// m_utlb[replace].V = (m_m[PTEH] & 0x00000100) >> 8; // from PTEL m_utlb[replace].ASID = (m_m[PTEH] & 0x000000ff) >> 0; // these come from PTEL m_utlb[replace].PPN = (m_m[PTEL] & 0x1ffffc00) >> 10; @@ -4070,7 +4070,7 @@ void sh34_base_device::execute_run() debugger_instruction_hook(this, m_pc & AM); uint16_t opcode; - + if (!m_sh4_mmu_enabled) opcode = m_direct->read_word(m_pc & AM, WORD2_XOR_LE(0)); else opcode = RW(m_pc); // should probably use a different function as this needs to go through the ITLB diff --git a/src/devices/cpu/sh4/sh4.h b/src/devices/cpu/sh4/sh4.h index 0720ec9375d..b170b25d4c0 100644 --- a/src/devices/cpu/sh4/sh4.h +++ b/src/devices/cpu/sh4/sh4.h @@ -137,7 +137,7 @@ struct sh4_ddt_dma }; -// ASID [7:0] | VPN [31:10] | V | | PPN [28:10] | SZ[1:0] | SH | C | PR[1:0] | D | WT | SA[2:0] | TC +// ASID [7:0] | VPN [31:10] | V | | PPN [28:10] | SZ[1:0] | SH | C | PR[1:0] | D | WT | SA[2:0] | TC struct sh4_utlb { diff --git a/src/devices/cpu/sh4/sh4comn.cpp b/src/devices/cpu/sh4/sh4comn.cpp index dbb794e0c82..4f7ae411e7d 100644 --- a/src/devices/cpu/sh4/sh4comn.cpp +++ b/src/devices/cpu/sh4/sh4comn.cpp @@ -676,17 +676,17 @@ WRITE32_MEMBER( sh4_base_device::sh4_internal_w ) // printf("sh4_internal_w: Write %08x (%x), %08x @ %08x\n", 0xfe000000+((offset & 0x3fc0) << 11)+((offset & 0x3f) << 2), offset, data, mem_mask); - switch( offset ) + switch( offset ) { case PTEH: // for use with LDTLB opcode m_m[PTEH] &= 0xffffffff; /* - NNNN NNNN NNNN NNNN NNNN NN-- AAAA AAAA + NNNN NNNN NNNN NNNN NNNN NN-- AAAA AAAA - N = VPM = Virtual Page Number - A = ASID = Address Space Identifier + N = VPM = Virtual Page Number + A = ASID = Address Space Identifier - same as the address table part of the utlb but with 2 unused bits (these are sourced from PTEL instead when LDTLB is called) + same as the address table part of the utlb but with 2 unused bits (these are sourced from PTEL instead when LDTLB is called) */ @@ -695,18 +695,18 @@ WRITE32_MEMBER( sh4_base_device::sh4_internal_w ) case PTEL: m_m[PTEL] &= 0xffffffff; /* - ---P PPPP PPPP PPPP PPPP PP-V zRRz CDHW + ---P PPPP PPPP PPPP PPPP PP-V zRRz CDHW - same format as data array 1 of the utlb + same format as data array 1 of the utlb */ break; case PTEA: m_m[PTEA] &= 0xffffffff; /* - ---- ---- ---- ---- ---- ---- ---- TSSS + ---- ---- ---- ---- ---- ---- ---- TSSS - same format as data array 2 of the utlb + same format as data array 2 of the utlb */ break; @@ -725,18 +725,18 @@ WRITE32_MEMBER( sh4_base_device::sh4_internal_w ) logerror("%s: MMUCR %08x\n", machine().describe_context(), data); m_m[MMUCR] &= 0xffffffff; /* - LLLL LL-- BBBB BB-- CCCC CCQV ---- -T-A - - L = LRUI = Least recently used ITLB - B = URB = UTLB replace boundary - C = URC = UTLB replace counter - Q = SQMD = Store Queue Mode Bit - V = SV = Single Virtual Mode Bit - T = TI = TLB invaldiate - A = AT = Address translation bit (enable) + LLLL LL-- BBBB BB-- CCCC CCQV ---- -T-A + + L = LRUI = Least recently used ITLB + B = URB = UTLB replace boundary + C = URC = UTLB replace counter + Q = SQMD = Store Queue Mode Bit + V = SV = Single Virtual Mode Bit + T = TI = TLB invaldiate + A = AT = Address translation bit (enable) */ - + if (data & MMUCR_AT) { @@ -750,7 +750,7 @@ WRITE32_MEMBER( sh4_base_device::sh4_internal_w ) printf("The MMU emulation is a hack specific to that system\n"); } - + if (m_mmuhack == 2) { for (int i = 0;i < 64;i++) @@ -1322,16 +1322,16 @@ uint32_t sh4_base_device::sh4_getsqremap(uint32_t address) WRITE64_MEMBER( sh4_base_device::sh4_utlb_address_array_w ) { -/* uses bits 13:8 of address to select which UTLB entry we're addressing +/* uses bits 13:8 of address to select which UTLB entry we're addressing bit 7 of the address enables 'associative' mode, causing a search - operation rather than a direct write. + operation rather than a direct write. - NNNN NNNN NNNN NNNN NNNN NNDV AAAA AAAA + NNNN NNNN NNNN NNNN NNNN NNDV AAAA AAAA - N = VPN = Virtual Page Number - D = Dirty Bit - V = Validity Bit - A = ASID = Address Space Identifier + N = VPN = Virtual Page Number + D = Dirty Bit + V = Validity Bit + A = ASID = Address Space Identifier */ logerror("sh4_utlb_address_array_w %08x %08x\n", offset, data); @@ -1433,11 +1433,11 @@ WRITE64_MEMBER( sh4_base_device::sh4_utlb_data_array2_w ) { /* uses bits 13:8 of address to select which UTLB entry we're addressing - ---- ---- ---- ---- ---- ---- ---- TSSS + ---- ---- ---- ---- ---- ---- ---- TSSS - T = TC = Timing Control - S = SA = Space attributes - - = unused (should be 0) + T = TC = Timing Control + S = SA = Space attributes + - = unused (should be 0) */ @@ -1462,4 +1462,4 @@ READ64_MEMBER(sh4_base_device::sh4_utlb_data_array2_r) ret |= m_utlb[i].SA << 0; return ret; -} \ No newline at end of file +} diff --git a/src/devices/cpu/tlcs90/tlcs90.cpp b/src/devices/cpu/tlcs90/tlcs90.cpp index 7ab13e904ed..f7e81101c98 100644 --- a/src/devices/cpu/tlcs90/tlcs90.cpp +++ b/src/devices/cpu/tlcs90/tlcs90.cpp @@ -998,11 +998,11 @@ bool tlcs90_device::stream_arg(std::ostream &stream, uint32_t pc, const char *pr { case MODE_NONE: return false; - case MODE_BIT8: util::stream_format(stream, "%s%d", pre, r ); return true; - case MODE_I8: util::stream_format(stream, "%s$%02X", pre, r ); return true; - case MODE_D8: util::stream_format(stream, "%s$%04X", pre, (pc+2+(r&0x7f)-(r&0x80))&0xffff ); return true; - case MODE_I16: util::stream_format(stream, "%s$%04X", pre, r ); return true; - case MODE_D16: util::stream_format(stream, "%s$%04X", pre, (pc+2+(r&0x7fff)-(r&0x8000))&0xffff ); return true; + case MODE_BIT8: util::stream_format(stream, "%s%d", pre, r ); return true; + case MODE_I8: util::stream_format(stream, "%s$%02X", pre, r ); return true; + case MODE_D8: util::stream_format(stream, "%s$%04X", pre, (pc+2+(r&0x7f)-(r&0x80))&0xffff ); return true; + case MODE_I16: util::stream_format(stream, "%s$%04X", pre, r ); return true; + case MODE_D16: util::stream_format(stream, "%s$%04X", pre, (pc+2+(r&0x7fff)-(r&0x8000))&0xffff ); return true; case MODE_MI16: reg_name = internal_registers_names(r); if (reg_name) @@ -1010,17 +1010,17 @@ bool tlcs90_device::stream_arg(std::ostream &stream, uint32_t pc, const char *pr else util::stream_format(stream, "%s($%04X)", pre, r ); return true; - case MODE_R8: util::stream_format(stream, "%s%s", pre, r8_names[r] ); return true; - case MODE_R16: util::stream_format(stream, "%s%s", pre, r16_names[r] ); return true; - case MODE_MR16: util::stream_format(stream, "%s(%s)", pre, r16_names[r] ); return true; + case MODE_R8: util::stream_format(stream, "%s%s", pre, r8_names[r] ); return true; + case MODE_R16: util::stream_format(stream, "%s%s", pre, r16_names[r] ); return true; + case MODE_MR16: util::stream_format(stream, "%s(%s)", pre, r16_names[r] ); return true; - case MODE_MR16R8: util::stream_format(stream, "%s(%s+%s)", pre, r16_names[r], r8_names[rb] ); return true; - case MODE_MR16D8: util::stream_format(stream, "%s(%s%c$%02X)", pre, r16_names[r], (rb&0x80)?'-':'+', (rb&0x80)?((rb^0xff)+1):rb ); return true; + case MODE_MR16R8: util::stream_format(stream, "%s(%s+%s)", pre, r16_names[r], r8_names[rb] ); return true; + case MODE_MR16D8: util::stream_format(stream, "%s(%s%c$%02X)", pre, r16_names[r], (rb&0x80)?'-':'+', (rb&0x80)?((rb^0xff)+1):rb ); return true; - case MODE_CC: util::stream_format(stream, "%s%s", pre, cc_names[r] ); return true; + case MODE_CC: util::stream_format(stream, "%s%s", pre, cc_names[r] ); return true; - case MODE_R16R8: util::stream_format(stream, "%s%s+%s", pre, r16_names[r], r8_names[rb] ); return true; - case MODE_R16D8: util::stream_format(stream, "%s%s%c$%02X", pre, r16_names[r], (rb&0x80)?'-':'+', (rb&0x80)?((rb^0xff)+1):rb ); return true; + case MODE_R16R8: util::stream_format(stream, "%s%s+%s", pre, r16_names[r], r8_names[rb] ); return true; + case MODE_R16D8: util::stream_format(stream, "%s%s%c$%02X", pre, r16_names[r], (rb&0x80)?'-':'+', (rb&0x80)?((rb^0xff)+1):rb ); return true; default: fatalerror("%04x: unimplemented addr mode = %d\n",pc,mode); @@ -1037,9 +1037,9 @@ offs_t tlcs90_device::disasm_disassemble(std::ostream &stream, offs_t pc, const decode(); m_op &= ~OP_16; - util::stream_format (stream, "%-5s", op_names[ m_op ] ); // strlen("callr") == 5 - bool streamed = stream_arg (stream, pc, " ", m_mode1, m_r1, m_r1b ); - stream_arg (stream, pc, streamed ?",":"", m_mode2, m_r2, m_r2b ); + util::stream_format (stream, "%-5s", op_names[ m_op ] ); // strlen("callr") == 5 + bool streamed = stream_arg (stream, pc, " ", m_mode1, m_r1, m_r1b ); + stream_arg (stream, pc, streamed ?",":"", m_mode2, m_r2, m_r2b ); return (m_addr - pc) | DASMFLAG_SUPPORTED; } diff --git a/src/devices/cpu/tms34010/34010dsm.cpp b/src/devices/cpu/tms34010/34010dsm.cpp index 56fcc3100c0..d6fa113e6f3 100644 --- a/src/devices/cpu/tms34010/34010dsm.cpp +++ b/src/devices/cpu/tms34010/34010dsm.cpp @@ -34,7 +34,7 @@ static void print_reg(std::ostream &stream, uint8_t reg) { if (reg != 0x0f) { - util::stream_format(stream, "%c%d", rf, reg); + util::stream_format(stream, "%c%d", rf, reg); } else { diff --git a/src/devices/cpu/tms9900/tms9900.cpp b/src/devices/cpu/tms9900/tms9900.cpp index 4ee73dc4197..f5b95e4392f 100644 --- a/src/devices/cpu/tms9900/tms9900.cpp +++ b/src/devices/cpu/tms9900/tms9900.cpp @@ -101,10 +101,10 @@ - State save - HOLD state should be tested; I don't have test cases yet - - Previous implementation with valuable info inside: - https://github.com/mamedev/mame/blob/677ec78eb50decdc40fad3d30daa3560feaff3cc/src/devices/cpu/tms9900/99xxcore.h - + + Previous implementation with valuable info inside: + https://github.com/mamedev/mame/blob/677ec78eb50decdc40fad3d30daa3560feaff3cc/src/devices/cpu/tms9900/99xxcore.h + Michael Zapf, June 2012 */ diff --git a/src/devices/machine/68230pit.cpp b/src/devices/machine/68230pit.cpp index 5cbddd47df2..9e66dcb10b5 100644 --- a/src/devices/machine/68230pit.cpp +++ b/src/devices/machine/68230pit.cpp @@ -28,8 +28,8 @@ #define VERBOSE 0 #define LOGPRINT(x) { do { if (VERBOSE) logerror x; } while (0); } -#define LOG(x) {} LOGPRINT(x) -#define LOGR(x) {} LOGPRINT(x) +#define LOG(x) {} LOGPRINT(x) +#define LOGR(x) {} LOGPRINT(x) #define LOGINT(x) {} LOGPRINT(x) #define LOGSETUP(x) {} LOGPRINT(x) #if VERBOSE > 1 @@ -237,8 +237,8 @@ void pit68230_device::wr_pitreg_pgcr(uint8_t data) LOG(("%s(%02x) \"%s\": %s - %02x\n", FUNCNAME, data, tag(), FUNCNAME, data)); LOGSETUP(("PGCR - Mode %d,", (data >> 6) & 3 )); LOGSETUP((" H34:%s, H12:%s,", (data & 0x20) ? "enabled" : "disabled", (data & 0x10) ? "enabled" : "disabled" )); - LOGSETUP((" Sense assert H4:%s, H3:%s, H2:%s, H1:%s\n", - data & 0x04 ? "Hi" : "Lo", data & 0x03 ? "Hi" : "Lo", + LOGSETUP((" Sense assert H4:%s, H3:%s, H2:%s, H1:%s\n", + data & 0x04 ? "Hi" : "Lo", data & 0x03 ? "Hi" : "Lo", data & 0x02 ? "Hi" : "Lo", data & 0x01 ? "Hi" : "Lo")); m_pgcr = data; } diff --git a/src/devices/machine/7400.cpp b/src/devices/machine/7400.cpp index ad1024e1f01..ef20c91df9a 100644 --- a/src/devices/machine/7400.cpp +++ b/src/devices/machine/7400.cpp @@ -2,7 +2,7 @@ // copyright-holders:Ryan Holtz /***************************************************************************** - 7400 Quad 2-Input NAND Gate + 7400 Quad 2-Input NAND Gate *****************************************************************************/ diff --git a/src/devices/machine/7400.h b/src/devices/machine/7400.h index 0ea10e0149f..9766e001d55 100644 --- a/src/devices/machine/7400.h +++ b/src/devices/machine/7400.h @@ -2,11 +2,11 @@ // copyright-holders:Ryan Holtz /***************************************************************************** - 7400 Quad 2-Input NAND Gate + 7400 Quad 2-Input NAND Gate *********************************************************************** - Connection Diagram: + Connection Diagram: ___ ___ 1A 1 |* u | 14 Vcc 1B 2 | | 13 4B @@ -16,15 +16,15 @@ 2Y 6 | | 9 3A GND 7 |_______| 8 3Y - Truth Table: - ___________ - | A | B | Y | - |---|---|---| - | 0 | 0 | 0 | - | 0 | 1 | 0 | - | 1 | 0 | 0 | - | 1 | 1 | 1 | - |___|___|___| + Truth Table: + ___________ + | A | B | Y | + |---|---|---| + | 0 | 0 | 0 | + | 0 | 1 | 0 | + | 1 | 0 | 0 | + | 1 | 1 | 1 | + |___|___|___| **********************************************************************/ @@ -97,11 +97,11 @@ private: devcb_write_line m_y4_func; // inputs - uint8_t m_a; // pins 1,4,9,12 - uint8_t m_b; // pins 2,5,10,13 + uint8_t m_a; // pins 1,4,9,12 + uint8_t m_b; // pins 2,5,10,13 // outputs - uint8_t m_y; // pins 3,6,8,11 + uint8_t m_y; // pins 3,6,8,11 }; // device type definition diff --git a/src/devices/machine/7404.cpp b/src/devices/machine/7404.cpp index 030950d40e9..8491d848149 100644 --- a/src/devices/machine/7404.cpp +++ b/src/devices/machine/7404.cpp @@ -2,7 +2,7 @@ // copyright-holders:Ryan Holtz /***************************************************************************** - 5/7404 Hex Inverters + 5/7404 Hex Inverters *****************************************************************************/ diff --git a/src/devices/machine/7404.h b/src/devices/machine/7404.h index 57043c1b93e..c6516cd3b38 100644 --- a/src/devices/machine/7404.h +++ b/src/devices/machine/7404.h @@ -2,16 +2,16 @@ // copyright-holders:Ryan Holtz /***************************************************************************** - 5/7404 Hex Inverters + 5/7404 Hex Inverters *********************************************************************** - Connection Diagram: + Connection Diagram: - SN5404 J Package - SN54LS04, SN54S04 J or W Package - SN7404 D, DB, N or NS Package - SN74S04 D or N Package + SN5404 J Package + SN54LS04, SN54S04 J or W Package + SN7404 D, DB, N or NS Package + SN74S04 D or N Package ___ ___ 1A 1 |* u | 14 Vcc 1Y 2 | | 13 6A @@ -22,7 +22,7 @@ GND 7 |_______| 8 4Y - SN5404 W Package + SN5404 W Package ___ ___ 1A 1 |* u | 14 1Y 2Y 2 | | 13 6A @@ -33,25 +33,25 @@ 4A 7 |_______| 8 4Y - SN54LS04, SN54S04 FK Package + SN54LS04, SN54S04 FK Package 1Y 1A NC Vcc 6A - _______________________ - / |_| |_| |_| |_| |_| | - |_ 3 2 1 20 19 _| - 2A |_| 18|_| 6Y - |_ _| - NC |_| 17|_| NC - |_ _| - 2Y |_| 16|_| 5A - |_ _| - NC |_| 15|_| NC - |_ _| - 3A |_| 14|_| 5Y - | 9 10 11 12 13 | - |__|=|_|=|_|=|_|=|_|=|__| - - 3Y GND NC 4Y 4A + _______________________ + / |_| |_| |_| |_| |_| | + |_ 3 2 1 20 19 _| + 2A |_| 18|_| 6Y + |_ _| + NC |_| 17|_| NC + |_ _| + 2Y |_| 16|_| 5A + |_ _| + NC |_| 15|_| NC + |_ _| + 3A |_| 14|_| 5Y + | 9 10 11 12 13 | + |__|=|_|=|_|=|_|=|_|=|__| + + 3Y GND NC 4Y 4A **********************************************************************/ @@ -133,10 +133,10 @@ private: devcb_write_line m_y6_func; // inputs - uint8_t m_a; // pins 1,3,5,9,11,13 + uint8_t m_a; // pins 1,3,5,9,11,13 // outputs - uint8_t m_y; // pins 2,4,6,8,10,12 + uint8_t m_y; // pins 2,4,6,8,10,12 }; // device type definition diff --git a/src/devices/machine/74161.cpp b/src/devices/machine/74161.cpp index cc746aae092..96279e57f1b 100644 --- a/src/devices/machine/74161.cpp +++ b/src/devices/machine/74161.cpp @@ -2,7 +2,7 @@ // copyright-holders:Ryan Holtz /***************************************************************************** - 54/74161 4-bit binary counter + 54/74161 4-bit binary counter *****************************************************************************/ diff --git a/src/devices/machine/74161.h b/src/devices/machine/74161.h index ad514a4280d..5a646962531 100644 --- a/src/devices/machine/74161.h +++ b/src/devices/machine/74161.h @@ -2,11 +2,11 @@ // copyright-holders:Ryan Holtz /***************************************************************************** - 5/74160..3 BCD decade counter / 4-bit binary counter + 5/74160..3 BCD decade counter / 4-bit binary counter *********************************************************************** - Connection Diagram: + Connection Diagram: ___ ___ *R 1 |* u | 16 Vcc CP 2 | | 15 TC @@ -17,38 +17,38 @@ CEP 7 | | 10 CET GND 8 |_______| 9 /PE - *MR for 160 and 161 - *SR for 162 and 163 - - Logic Symbol: - - 9 3 4 5 6 - | | | | | - ____|___|___|___|___|____ - | | - | PE P0 P1 P2 P3 | - 7 ---| CEP | - | | - 10 ---| CET TC |--- 15 - | | - 2 ---| CP | - | MR Q0 Q1 Q2 Q3 | - |_________________________| - | | | | | - | | | | | + *MR for 160 and 161 + *SR for 162 and 163 + + Logic Symbol: + + 9 3 4 5 6 + | | | | | + ____|___|___|___|___|____ + | | + | PE P0 P1 P2 P3 | + 7 ---| CEP | + | | + 10 ---| CET TC |--- 15 + | | + 2 ---| CP | + | MR Q0 Q1 Q2 Q3 | + |_________________________| + | | | | | + | | | | | 1 14 13 12 11 *********************************************************************** - Mode Select Table: + Mode Select Table: - MR PE CET CEP Action on clock edge - L X X X Reset (clear) - H L X X Load Pn..Qn - H H H H Count (increment) - H H L X No change (hold) - H H X L No change (hold) + MR PE CET CEP Action on clock edge + L X X X Reset (clear) + H L X X Load Pn..Qn + H H H H Count (increment) + H H L X No change (hold) + H H X L No change (hold) **********************************************************************/ @@ -137,19 +137,19 @@ private: devcb_write_line m_tc_func; // inputs - uint8_t m_clear; // pin 1 - uint8_t m_pe; // pin 9 - uint8_t m_cet; // pin 10 - uint8_t m_cep; // pin 7 - uint8_t m_clock; // pin 2 - uint8_t m_p; // pins 3-6 from LSB to MSB + uint8_t m_clear; // pin 1 + uint8_t m_pe; // pin 9 + uint8_t m_cet; // pin 10 + uint8_t m_cep; // pin 7 + uint8_t m_clock; // pin 2 + uint8_t m_p; // pins 3-6 from LSB to MSB // outputs - uint8_t m_out; // pins 14-11 from LSB to MSB - uint8_t m_tc; // pin 15 + uint8_t m_out; // pins 14-11 from LSB to MSB + uint8_t m_tc; // pin 15 - const bool m_synchronous_reset; - const uint8_t m_limit; + const bool m_synchronous_reset; + const uint8_t m_limit; }; class ttl74160_device : public ttl7416x_device diff --git a/src/devices/machine/74175.cpp b/src/devices/machine/74175.cpp index a96ffb57dd0..5de13e040f9 100644 --- a/src/devices/machine/74175.cpp +++ b/src/devices/machine/74175.cpp @@ -2,7 +2,7 @@ // copyright-holders:Ryan Holtz /***************************************************************************** - 5/74174/5 Hex/Quad D Flip-Flops with Clear + 5/74174/5 Hex/Quad D Flip-Flops with Clear *****************************************************************************/ @@ -245,4 +245,4 @@ void ttl74175_device::tick() m_not_q3_func(m_q3 ^ 1); if (last_q4 != m_q1) m_not_q4_func(m_q4 ^ 1); -} \ No newline at end of file +} diff --git a/src/devices/machine/74175.h b/src/devices/machine/74175.h index 165c13a0ed1..381d3e5f6ef 100644 --- a/src/devices/machine/74175.h +++ b/src/devices/machine/74175.h @@ -2,43 +2,43 @@ // copyright-holders:Ryan Holtz /********************************************************************** - 5/74174/5 Hex/Quad D Flip-Flops with Clear + 5/74174/5 Hex/Quad D Flip-Flops with Clear *********************************************************************** - Connection Diagram: - ___ ___ ___ ___ - CLEAR 1 |* u | 16 Vcc CLEAR 1 |* u | 16 Vcc - Q1 2 | | 15 Q6 Q1 2 | | 15 Q4 - D1 3 | | 14 D6 /Q1 3 | | 14 /Q4 - D2 4 | | 13 D5 D1 4 | | 13 D4 - Q2 5 | | 12 Q5 D2 5 | | 12 D3 - D3 6 | | 11 D4 /Q2 6 | | 11 /Q3 - Q3 7 | | 10 Q4 Q2 7 | | 10 Q3 - GND 8 |_______| 9 CLOCK GND 8 |_______| 9 CLOCK + Connection Diagram: + ___ ___ ___ ___ + CLEAR 1 |* u | 16 Vcc CLEAR 1 |* u | 16 Vcc + Q1 2 | | 15 Q6 Q1 2 | | 15 Q4 + D1 3 | | 14 D6 /Q1 3 | | 14 /Q4 + D2 4 | | 13 D5 D1 4 | | 13 D4 + Q2 5 | | 12 Q5 D2 5 | | 12 D3 + D3 6 | | 11 D4 /Q2 6 | | 11 /Q3 + Q3 7 | | 10 Q4 Q2 7 | | 10 Q3 + GND 8 |_______| 9 CLOCK GND 8 |_______| 9 CLOCK - 5/74174 5/74175 + 5/74174 5/74175 *********************************************************************** - Function Table: - _________________________________ - | Inputs | Outputs* | - |---------------------|-----------| - | Clear | Clock | D | Q | /Q | - |-------|-------|-----|-----|-----| - | L | X | X | L | H | - | H | ^ | H | H | L | - | H | ^ | L | L | H | - | H | L | X | Q0 | Q0 | - |_______|_______|_____|_____|_____| - - H = High Level (steady state) - L = Low Level (steady state) - X = Don't Care - ^ = Transition from low to high level - Q0 = The level of Q before the indicated steady-state input conditions were established. - * = 175 only + Function Table: + _________________________________ + | Inputs | Outputs* | + |---------------------|-----------| + | Clear | Clock | D | Q | /Q | + |-------|-------|-----|-----|-----| + | L | X | X | L | H | + | H | ^ | H | H | L | + | H | ^ | L | L | H | + | H | L | X | Q0 | Q0 | + |_______|_______|_____|_____|_____| + + H = High Level (steady state) + L = Low Level (steady state) + X = Don't Care + ^ = Transition from low to high level + Q0 = The level of Q before the indicated steady-state input conditions were established. + * = 175 only **********************************************************************/ diff --git a/src/devices/machine/82s129.cpp b/src/devices/machine/82s129.cpp index d701c14c45d..afc368acf9f 100644 --- a/src/devices/machine/82s129.cpp +++ b/src/devices/machine/82s129.cpp @@ -2,7 +2,7 @@ // copyright-holders:Ryan Holtz /***************************************************************************** - (DM)9334 8-Bit Addressable Latch + (DM)9334 8-Bit Addressable Latch *****************************************************************************/ diff --git a/src/devices/machine/82s129.h b/src/devices/machine/82s129.h index cc13839efd5..3758d9f3dd9 100644 --- a/src/devices/machine/82s129.h +++ b/src/devices/machine/82s129.h @@ -2,13 +2,13 @@ // copyright-holders:Ryan Holtz /***************************************************************************** - 82S129/6 1K-bit TTL bipolar PROM + 82S129/6 1K-bit TTL bipolar PROM ****************************************************************************** - Connection Diagrams: + Connection Diagrams: - N Package + N Package ___ ___ A6 1 |* u | 16 Vcc A5 2 | | 15 A7 @@ -22,21 +22,21 @@ A Package - 3 2 1 20 19 - | | | | | - /---------------------| - | A5 A6 NC Vcc A7 | - | | - 4 -| A4 /CE2 |- 18 - 5 -| A3 /CE1 |- 17 - 6 -| A0 O1 |- 16 - 7 -| A1 NC |- 15 - 8 -| A2 O2 |- 14 - | | - | NC GND NC O4 O3 | - |_____________________| - | | | | | - 9 10 11 12 13 + 3 2 1 20 19 + | | | | | + /---------------------| + | A5 A6 NC Vcc A7 | + | | + 4 -| A4 /CE2 |- 18 + 5 -| A3 /CE1 |- 17 + 6 -| A0 O1 |- 16 + 7 -| A1 NC |- 15 + 8 -| A2 O2 |- 14 + | | + | NC GND NC O4 O3 | + |_____________________| + | | | | | + 9 10 11 12 13 **********************************************************************/ @@ -127,7 +127,7 @@ private: void init(); void update(); - required_memory_region m_region; + required_memory_region m_region; // callbacks devcb_write_line m_out_func; @@ -137,15 +137,15 @@ private: devcb_write_line m_o4_func; // inputs - uint8_t m_ce1; // pin 13 - uint8_t m_ce2; // pin 14 - uint8_t m_a; // pins 5,6,7,4,3,2,1,15 from LSB to MSB + uint8_t m_ce1; // pin 13 + uint8_t m_ce2; // pin 14 + uint8_t m_a; // pins 5,6,7,4,3,2,1,15 from LSB to MSB // outputs - uint8_t m_out; // pins 12-9 from LSB to MSB + uint8_t m_out; // pins 12-9 from LSB to MSB // data - std::unique_ptr m_data; + std::unique_ptr m_data; static const uint32_t PROM_SIZE; }; diff --git a/src/devices/machine/aakart.cpp b/src/devices/machine/aakart.cpp index 8cb3b508e62..687a40e9481 100644 --- a/src/devices/machine/aakart.cpp +++ b/src/devices/machine/aakart.cpp @@ -136,7 +136,7 @@ void aakart_device::device_timer(emu_timer &timer, device_timer_id id, int param m_queue_size--; for(int i=0; i("vga"); memory_space->install_rom(0x000c0000, 0x000c7fff, m_vga_region->base()); memory_space->install_readwrite_handler(0xa0000,0xbffff,read8_delegate(FUNC(vga_device::mem_r),m_vga),write8_delegate(FUNC(vga_device::mem_w),m_vga),0xffffffff); @@ -683,7 +683,7 @@ WRITE_LINE_MEMBER( i82371sb_isa_device::at_dma8237_out_eop ) { m_cur_eop = state == ASSERT_LINE; //if(m_dma_channel != -1) -// m_isabus->eop_w(m_dma_channel, m_cur_eop ? ASSERT_LINE : CLEAR_LINE ); +// m_isabus->eop_w(m_dma_channel, m_cur_eop ? ASSERT_LINE : CLEAR_LINE ); } void i82371sb_isa_device::pc_select_dma_channel(int channel, bool state) @@ -691,12 +691,12 @@ void i82371sb_isa_device::pc_select_dma_channel(int channel, bool state) if(!state) { m_dma_channel = channel; //if(m_cur_eop) -// m_isabus->eop_w(channel, ASSERT_LINE ); +// m_isabus->eop_w(channel, ASSERT_LINE ); } else if(m_dma_channel == channel) { m_dma_channel = -1; //if(m_cur_eop) -// m_isabus->eop_w(channel, CLEAR_LINE ); +// m_isabus->eop_w(channel, CLEAR_LINE ); } } diff --git a/src/devices/machine/i82371sb.h b/src/devices/machine/i82371sb.h index 18a7005c318..b35fe2f988a 100644 --- a/src/devices/machine/i82371sb.h +++ b/src/devices/machine/i82371sb.h @@ -84,7 +84,7 @@ public: DECLARE_WRITE8_MEMBER (ctltmr_w); DECLARE_READ8_MEMBER (cthtmr_r); DECLARE_WRITE8_MEMBER (cthtmr_w); - + // southbridge DECLARE_READ8_MEMBER(at_page8_r); DECLARE_WRITE8_MEMBER(at_page8_w); @@ -131,7 +131,7 @@ public: DECLARE_WRITE8_MEMBER(pc_dma_write_byte); DECLARE_READ8_MEMBER(pc_dma_read_word); DECLARE_WRITE8_MEMBER(pc_dma_write_word); - + protected: virtual void device_start() override; virtual void device_reset() override; @@ -145,7 +145,7 @@ private: uint8_t dlc, smicntl, ftmr, ctlmtr, cthmtr; void map_bios(address_space *memory_space, uint32_t start, uint32_t end); - + //southbridge required_device m_maincpu; @@ -158,7 +158,7 @@ private: required_device m_speaker; required_device m_ds12885; required_device m_pc_kbdc; - + uint8_t m_at_spkrdata; uint8_t m_pit_out2; int m_dma_channel; diff --git a/src/devices/machine/scnxx562.cpp b/src/devices/machine/scnxx562.cpp index 4c7e52e5594..7dfdfdc624f 100644 --- a/src/devices/machine/scnxx562.cpp +++ b/src/devices/machine/scnxx562.cpp @@ -88,12 +88,12 @@ DONE (x) (p=partly) NMOS CMOS #define VERBOSE 0 #define LOGPRINT(x) { do { if (VERBOSE) logerror x; } while (0); } -#define LOG(x) {} -#define LOGR(x) {} -#define LOGTX(x) {} -#define LOGRX(x) {} -#define LOGSETUP(x) {} LOGPRINT(x) -#define LOGINT(x) {} +#define LOG(x) {} +#define LOGR(x) {} +#define LOGTX(x) {} +#define LOGRX(x) {} +#define LOGSETUP(x) {} LOGPRINT(x) +#define LOGINT(x) {} #if VERBOSE > 1 #define logerror printf diff --git a/src/devices/machine/z80dart.cpp b/src/devices/machine/z80dart.cpp index 59f6dccabba..4a3db5ca229 100644 --- a/src/devices/machine/z80dart.cpp +++ b/src/devices/machine/z80dart.cpp @@ -537,8 +537,8 @@ void z80dart_channel::device_start() // state saving save_item(NAME(m_rr)); save_item(NAME(m_wr)); - // save_item(NAME(m_rx_data_fifo)); - // save_item(NAME(m_rx_error_fifo)); + // save_item(NAME(m_rx_data_fifo)); + // save_item(NAME(m_rx_error_fifo)); save_item(NAME(m_rx_clock)); save_item(NAME(m_rx_first)); save_item(NAME(m_rx_break)); diff --git a/src/devices/machine/z80scc.cpp b/src/devices/machine/z80scc.cpp index 21debec0ec9..c531c6b79a7 100644 --- a/src/devices/machine/z80scc.cpp +++ b/src/devices/machine/z80scc.cpp @@ -295,30 +295,30 @@ conditions. In addition, there are four sources per channel: 0) Transmitt 1) Ext which affects the way the interrupt vector is formed. The sources in more detail INT_RECEIVE: The sources of receive interrupts consist of Receive Character Available and Special Receive Condition. - The Special Receive Condition can be subdivided into Receive Overrun, Framing Error (Asynchronous) or - End of Frame (SDLC). In addition, a parity error can be a special receive condition by programming + The Special Receive Condition can be subdivided into Receive Overrun, Framing Error (Asynchronous) or + End of Frame (SDLC). In addition, a parity error can be a special receive condition by programming INT_EXTERNAL: The External/status interrupts have several sources which may be individually enabled in WR15. The sources are zero count, /DCD, Sync/Hunt, /CTS, transmitter under-run/EOM and Break/Abort. INT_TRANSMIT: The NMOS/CMOS version of the SCC only has a one byte deep transmit buffer. The status of the - transmit buffer can be determined through TBE bit in RR0, bit D2, which shows whether the - transmit buffer is empty or not. After a hardware reset (including a hardware reset by software), or - a channel reset, this bit is set to 1. - While transmit interrupts are enabled, the NMOS/CMOS version sets the Transmit Interrupt Pending - (TxIP) bit whenever the transmit buffer becomes empty. This means that the transmit buffer - must be full before the TxIP can be set. Thus, when transmit interrupts are first enabled, the TxIP - will not be set until after the first character is written to the NMOS/CMOS. + transmit buffer can be determined through TBE bit in RR0, bit D2, which shows whether the + transmit buffer is empty or not. After a hardware reset (including a hardware reset by software), or + a channel reset, this bit is set to 1. + While transmit interrupts are enabled, the NMOS/CMOS version sets the Transmit Interrupt Pending + (TxIP) bit whenever the transmit buffer becomes empty. This means that the transmit buffer + must be full before the TxIP can be set. Thus, when transmit interrupts are first enabled, the TxIP + will not be set until after the first character is written to the NMOS/CMOS. INT_SPECIAL: This mode allows the receiver to interrupt only on characters with a special receive condition. When an interrupt occurs, the data containing the error - is held in the Receive FIFO until an Error Reset command is issued. When using this mode in conjunction - with a DMA, the DMA is initialized and enabled before any characters have been - received by the ESCC. This eliminates the time-critical section of code required in the Receive - Interrupt on First Character or Special Condition mode. Hence, all data can be transferred via the - DMA so that the CPU need not handle the first received character as a special case. In SDLC - mode, if the SDLC Frame Status FIFO is enabled and an EOF is received, an interrupt with vector - for receive data available is generated and the Receive FIFO is not locked. + is held in the Receive FIFO until an Error Reset command is issued. When using this mode in conjunction + with a DMA, the DMA is initialized and enabled before any characters have been + received by the ESCC. This eliminates the time-critical section of code required in the Receive + Interrupt on First Character or Special Condition mode. Hence, all data can be transferred via the + DMA so that the CPU need not handle the first received character as a special case. In SDLC + mode, if the SDLC Frame Status FIFO is enabled and an EOF is received, an interrupt with vector + for receive data available is generated and the Receive FIFO is not locked. To allow for control over the daisy chain, the SCC has a Disable Lower Chain (DLC) software command (WR9 bit 2) that pulls IEO Low. This selectively deactivates parts of the daisy chain regardless of the interrupt status. @@ -1847,9 +1847,9 @@ void z80scc_channel::do_sccreg_wr4(uint8_t data) m_wr4 = data; LOG(("- Parity : %s\n", (data & WR4_PARITY_ENABLE) ? ((data & WR4_PARITY_EVEN) ? "Even" : "Odd") : "None")); LOG(("- Stop Bits : %s\n", data & WR4_STOP_BITS_MASK ? stop_bits_tostring(get_stop_bits()) : "not used, sync modes enabled" )); - LOG(("- Sync Mode : %s\n", !(data & WR4_STOP_BITS_MASK) ? - (data & WR4_BIT5 ? - (data & WR4_BIT4 ? "External Sync Mode - /SYNC is used as input!" : "SDLC - not implemented") + LOG(("- Sync Mode : %s\n", !(data & WR4_STOP_BITS_MASK) ? + (data & WR4_BIT5 ? + (data & WR4_BIT4 ? "External Sync Mode - /SYNC is used as input!" : "SDLC - not implemented") : (data & WR4_BIT4 ? "16 bit" : "8 bit")) : "Disabled")); LOG(("- Clock Mode: %uX\n", get_clock_mode())); @@ -1946,7 +1946,7 @@ void z80scc_channel::do_sccreg_wr9(uint8_t data) } } -/* WR10 contains miscellaneous control bits for both the receiver and the transmitter. +/* WR10 contains miscellaneous control bits for both the receiver and the transmitter. On the ESCC and 85C30 with the Extended Read option enabled, this register may be read as RR11.*/ void z80scc_channel::do_sccreg_wr10(uint8_t data) { @@ -2420,7 +2420,7 @@ void z80scc_channel::data_write(uint8_t data) } } else - { + { LOGTX(("- Transmitter disabled\n")); } /* "While transmit interrupts are enabled, the nmos/cmos version sets the transmit interrupt pending @@ -2520,7 +2520,7 @@ WRITE_LINE_MEMBER( z80scc_channel::cts_w ) if (state) m_rr0 |= RR0_CTS; else m_rr0 &= ~RR0_CTS; // Raw pin/status value if (m_extint_latch == 0 && (m_wr1 & WR1_EXT_INT_ENABLE) && (m_wr15 & WR15_CTS)) - { + { // trigger interrupt LOGCTS((" - Trigger CTS interrupt\n")); m_uart->trigger_interrupt(m_index, INT_EXTERNAL); @@ -2755,7 +2755,7 @@ void z80scc_channel::update_serial() parity = PARITY_ODD; } else - { + { parity = PARITY_NONE; } diff --git a/src/devices/machine/z80scc.h b/src/devices/machine/z80scc.h index 41a5c257de7..fa5f806c12c 100644 --- a/src/devices/machine/z80scc.h +++ b/src/devices/machine/z80scc.h @@ -310,10 +310,10 @@ protected: { REG_WR0_COMMAND_REGPT = 0, REG_WR1_INT_DMA_ENABLE = 1, - REG_WR2_INT_VECTOR = 2, - REG_WR3_RX_CONTROL = 3, - REG_WR4_RX_TX_MODES = 4, - REG_WR5_TX_CONTROL = 5, + REG_WR2_INT_VECTOR = 2, + REG_WR3_RX_CONTROL = 3, + REG_WR4_RX_TX_MODES = 4, + REG_WR5_TX_CONTROL = 5, REG_WR6_SYNC_OR_SDLC_A = 6, REG_WR7_SYNC_OR_SDLC_F = 7, REG_WR8_TRANSMIT_DATA = 8, @@ -322,30 +322,30 @@ protected: REG_WR11_CLOCK_MODES = 11, REG_WR12_LO_BAUD_GEN = 12, REG_WR13_HI_BAUD_GEN = 13, - REG_WR14_MISC_CTRL = 14, + REG_WR14_MISC_CTRL = 14, REG_WR15_EXT_ST_INT_CTRL= 15 }; enum { RR0_RX_CHAR_AVAILABLE = 0x01, - RR0_ZC = 0x02, - RR0_TX_BUFFER_EMPTY = 0x04, - RR0_DCD = 0x08, - RR0_SYNC_HUNT = 0x10, - RR0_CTS = 0x20, - RR0_TX_UNDERRUN = 0x40, - RR0_BREAK_ABORT = 0x80 + RR0_ZC = 0x02, + RR0_TX_BUFFER_EMPTY = 0x04, + RR0_DCD = 0x08, + RR0_SYNC_HUNT = 0x10, + RR0_CTS = 0x20, + RR0_TX_UNDERRUN = 0x40, + RR0_BREAK_ABORT = 0x80 }; enum { - RR1_ALL_SENT = 0x01, + RR1_ALL_SENT = 0x01, RR1_RESIDUE_CODE_MASK = 0x0e, - RR1_PARITY_ERROR = 0x10, + RR1_PARITY_ERROR = 0x10, RR1_RX_OVERRUN_ERROR = 0x20, RR1_CRC_FRAMING_ERROR = 0x40, - RR1_END_OF_FRAME = 0x80 + RR1_END_OF_FRAME = 0x80 }; enum @@ -413,17 +413,17 @@ protected: WR1_RX_INT_ALL = 0x18, WR1_WRDY_ON_RX_TX = 0x20, WR1_WRDY_FUNCTION = 0x40, - WR1_WRDY_ENABLE = 0x80 + WR1_WRDY_ENABLE = 0x80 }; enum { - WR3_RX_ENABLE = 0x01, + WR3_RX_ENABLE = 0x01, WR3_SYNC_CHAR_LOAD_INHIBIT = 0x02, WR3_ADDRESS_SEARCH_MODE = 0x04, - WR3_RX_CRC_ENABLE = 0x08, + WR3_RX_CRC_ENABLE = 0x08, WR3_ENTER_HUNT_MODE = 0x10, - WR3_AUTO_ENABLES = 0x20, + WR3_AUTO_ENABLES = 0x20, WR3_RX_WORD_LENGTH_MASK = 0xc0, WR3_RX_WORD_LENGTH_5 = 0x00, WR3_RX_WORD_LENGTH_7 = 0x40, @@ -442,9 +442,9 @@ protected: WR4_SYNC_MODE_MASK = 0x30, WR4_SYNC_MODE_8_BIT = 0x00, WR4_SYNC_MODE_16_BIT = 0x10, - WR4_BIT4 = 0x10, + WR4_BIT4 = 0x10, WR4_SYNC_MODE_SDLC = 0x20, - WR4_BIT5 = 0x20, + WR4_BIT5 = 0x20, WR4_SYNC_MODE_EXT = 0x30, WR4_CLOCK_RATE_MASK = 0xc0, WR4_CLOCK_RATE_X1 = 0x00, @@ -455,11 +455,11 @@ protected: enum { - WR5_TX_CRC_ENABLE = 0x01, - WR5_RTS = 0x02, - WR5_CRC16 = 0x04, - WR5_TX_ENABLE = 0x08, - WR5_SEND_BREAK = 0x10, + WR5_TX_CRC_ENABLE = 0x01, + WR5_RTS = 0x02, + WR5_CRC16 = 0x04, + WR5_TX_ENABLE = 0x08, + WR5_SEND_BREAK = 0x10, WR5_TX_WORD_LENGTH_MASK = 0x60, WR5_TX_WORD_LENGTH_5 = 0x00, WR5_TX_WORD_LENGTH_6 = 0x40, @@ -481,27 +481,27 @@ protected: WR9_CMD_CHNB_RESET = 0x40, WR9_CMD_CHNA_RESET = 0x80, WR9_CMD_HW_RESET = 0xC0, - WR9_BIT_VIS = 0x01, - WR9_BIT_NV = 0x02, - WR9_BIT_DLC = 0x04, - WR9_BIT_MIE = 0x08, + WR9_BIT_VIS = 0x01, + WR9_BIT_NV = 0x02, + WR9_BIT_DLC = 0x04, + WR9_BIT_MIE = 0x08, WR9_BIT_SHSL = 0x10, WR9_BIT_IACK = 0x20 }; enum { - WR10_8_6_BIT_SYNC = 0x01, - WR10_LOOP_MODE = 0x02, + WR10_8_6_BIT_SYNC = 0x01, + WR10_LOOP_MODE = 0x02, WR10_ABORT_FLAG_UNDERRUN = 0x04, WR10_MARK_FLAG_IDLE = 0x08, WR10_GO_ACTIVE_ON_POLL = 0x10, WR10_ENCODING_MASK = 0x60, WR10_NRZ_ENCODING = 0x00, WR10_NRZI_ENCODING = 0x20, - WR10_BIT5 = 0x20, + WR10_BIT5 = 0x20, WR10_FM1_ENCODING = 0x40, - WR10_BIT6 = 0x40, + WR10_BIT6 = 0x40, WR10_FM0_ENCODING = 0x60, WR10_CRC_PRESET = 0x80 }; diff --git a/src/devices/machine/z80sio.cpp b/src/devices/machine/z80sio.cpp index 57fa516f828..bfdf250c263 100644 --- a/src/devices/machine/z80sio.cpp +++ b/src/devices/machine/z80sio.cpp @@ -1085,12 +1085,12 @@ void z80sio_channel::control_write(uint8_t data) switch (reg) { - case REG_WR0_COMMAND_REGPT: do_sioreg_wr0(data); break; - case REG_WR1_INT_DMA_ENABLE: do_sioreg_wr1(data); m_uart->check_interrupts(); break; - case REG_WR2_INT_VECTOR: do_sioreg_wr2(data); break; - case REG_WR3_RX_CONTROL: do_sioreg_wr3(data); update_serial(); break; - case REG_WR4_RX_TX_MODES: do_sioreg_wr4(data); update_serial(); break; - case REG_WR5_TX_CONTROL: do_sioreg_wr5(data); update_serial(); update_rts(); break; + case REG_WR0_COMMAND_REGPT: do_sioreg_wr0(data); break; + case REG_WR1_INT_DMA_ENABLE: do_sioreg_wr1(data); m_uart->check_interrupts(); break; + case REG_WR2_INT_VECTOR: do_sioreg_wr2(data); break; + case REG_WR3_RX_CONTROL: do_sioreg_wr3(data); update_serial(); break; + case REG_WR4_RX_TX_MODES: do_sioreg_wr4(data); update_serial(); break; + case REG_WR5_TX_CONTROL: do_sioreg_wr5(data); update_serial(); update_rts(); break; case REG_WR6_SYNC_OR_SDLC_A: do_sioreg_wr6(data); break; case REG_WR7_SYNC_OR_SDLC_F: do_sioreg_wr7(data); break; default: diff --git a/src/devices/machine/z80sio.h b/src/devices/machine/z80sio.h index 76cdd0f8cef..69c7094fd36 100644 --- a/src/devices/machine/z80sio.h +++ b/src/devices/machine/z80sio.h @@ -493,8 +493,8 @@ protected: enum { - TYPE_Z80SIO = 0x001, - TYPE_UPD7201 = 0x002 + TYPE_Z80SIO = 0x001, + TYPE_UPD7201 = 0x002 }; enum diff --git a/src/devices/video/stvvdp2.cpp b/src/devices/video/stvvdp2.cpp index 6e78b89bef3..8622f24b3c2 100644 --- a/src/devices/video/stvvdp2.cpp +++ b/src/devices/video/stvvdp2.cpp @@ -2145,7 +2145,7 @@ void saturn_state::stv_vdp2_fill_rotation_parameter_table( uint8_t rot_parameter stv_current_rotation_parameter_table.dkast= (m_vdp2_vram[address/4 + 22] & 0x03ffffc0) | ((m_vdp2_vram[address/4 + 22] & 0x02000000) ? 0xfc000000 : 0x00000000 ); stv_current_rotation_parameter_table.dkax = (m_vdp2_vram[address/4 + 23] & 0x03ffffc0) | ((m_vdp2_vram[address/4 + 23] & 0x02000000) ? 0xfc000000 : 0x00000000 ); - // check rotation parameter read control, override if specific bits are disabled + // check rotation parameter read control, override if specific bits are disabled // (Batman Forever The Riddler stage relies on this) switch(rot_parameter) { @@ -2155,7 +2155,7 @@ void saturn_state::stv_vdp2_fill_rotation_parameter_table( uint8_t rot_parameter if(!STV_VDP2_RAYSTRE) stv_current_rotation_parameter_table.yst = 0; - + if(!STV_VDP2_RAKASTRE) stv_current_rotation_parameter_table.dkax = 0; @@ -2166,13 +2166,13 @@ void saturn_state::stv_vdp2_fill_rotation_parameter_table( uint8_t rot_parameter if(!STV_VDP2_RBYSTRE) stv_current_rotation_parameter_table.yst = 0; - + if(!STV_VDP2_RBKASTRE) stv_current_rotation_parameter_table.dkax = 0; - + break; } - + #define RP stv_current_rotation_parameter_table if(LOG_ROZ == 1) logerror( "Rotation parameter table (%d)\n", rot_parameter ); @@ -4806,7 +4806,7 @@ void saturn_state::stv_vdp2_copy_roz_bitmap(bitmap_rgb32 &bitmap, } } else - { + { for (hcnt = cliprect.min_x; hcnt <= cliprect.max_x; hcnt++ ) { switch( coeff_table_size ) diff --git a/src/emu/addrmap.cpp b/src/emu/addrmap.cpp index 97579fc126a..24af3a1baac 100644 --- a/src/emu/addrmap.cpp +++ b/src/emu/addrmap.cpp @@ -311,7 +311,7 @@ bool address_map_entry::unitmask_is_appropriate(u8 width, u64 unitmask, const ch address_map::address_map(device_t &device, address_spacenum spacenum) : m_spacenum(spacenum), - m_device(&device), + m_device(&device), m_databits(0xff), m_unmapval(0), m_globalmask(0) @@ -357,7 +357,7 @@ address_map::address_map(device_t &device, address_spacenum spacenum) address_map::address_map(device_t &device, address_map_entry *entry) : m_spacenum(AS_PROGRAM), - m_device(&device), + m_device(&device), m_databits(0xff), m_unmapval(0), m_globalmask(0) @@ -375,7 +375,7 @@ address_map::address_map(device_t &device, address_map_entry *entry) address_map::address_map(const address_space &space, offs_t start, offs_t end, int bits, u64 unitmask, device_t &device, address_map_delegate submap_delegate) : m_spacenum(space.spacenum()), - m_device(&device), + m_device(&device), m_databits(space.data_width()), m_unmapval(space.unmap()), m_globalmask(space.bytemask()) diff --git a/src/emu/inpttype.h b/src/emu/inpttype.h index 9f820e1c6f4..7169c6ff9b4 100644 --- a/src/emu/inpttype.h +++ b/src/emu/inpttype.h @@ -156,7 +156,7 @@ inline void construct_core_types_P2(simple_list &typelist) INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, JOYSTICK_DOWN, "P2 Down", input_seq(KEYCODE_F, input_seq::or_code, JOYCODE_Y_DOWN_SWITCH_INDEXED(1)) ) INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, JOYSTICK_LEFT, "P2 Left", input_seq(KEYCODE_D, input_seq::or_code, JOYCODE_X_LEFT_SWITCH_INDEXED(1)) ) INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, JOYSTICK_RIGHT, "P2 Right", input_seq(KEYCODE_G, input_seq::or_code, JOYCODE_X_RIGHT_SWITCH_INDEXED(1)) ) - INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, JOYSTICKRIGHT_UP, "P2 Right Stick/Up", input_seq() ) + INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, JOYSTICKRIGHT_UP, "P2 Right Stick/Up", input_seq() ) INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, JOYSTICKRIGHT_DOWN, "P2 Right Stick/Down", input_seq() ) INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, JOYSTICKRIGHT_LEFT, "P2 Right Stick/Left", input_seq() ) INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, JOYSTICKRIGHT_RIGHT, "P2 Right Stick/Right", input_seq() ) diff --git a/src/emu/layout/README.md b/src/emu/layout/README.md index 78ef2e5e6ad..ce23c18751a 100644 --- a/src/emu/layout/README.md +++ b/src/emu/layout/README.md @@ -3,4 +3,4 @@ Layouts files are definiton files to describe look and fell of emulated machines, and are product of many different contributors. -Licensed under [CC0 1.0 Universal (CC0 1.0)](https://creativecommons.org/publicdomain/zero/1.0/) \ No newline at end of file +Licensed under [CC0 1.0 Universal (CC0 1.0)](https://creativecommons.org/publicdomain/zero/1.0/) diff --git a/src/frontend/mame/luaengine.cpp b/src/frontend/mame/luaengine.cpp index 6de0335fa77..1bdc3582fef 100644 --- a/src/frontend/mame/luaengine.cpp +++ b/src/frontend/mame/luaengine.cpp @@ -64,7 +64,7 @@ namespace sol lua_setfield(L, LUA_REGISTRYINDEX, "sol::buffer_temp"); } else - lua_pop(L, -1); + lua_pop(L, -1); luaL_pushresultsize(&buff, len); } @@ -814,7 +814,7 @@ void lua_engine::initialize() auto ret = func(); if (ret.valid()) { const char *tmp = ret.get(); - if (tmp != nullptr) + if (tmp != nullptr) ctx.result = tmp; else exit(0); diff --git a/src/frontend/mame/ui/pluginopt.h b/src/frontend/mame/ui/pluginopt.h index 8b7edd1e305..5a4b457654b 100644 --- a/src/frontend/mame/ui/pluginopt.h +++ b/src/frontend/mame/ui/pluginopt.h @@ -25,9 +25,9 @@ class menu_plugin : public menu { public: menu_plugin(mame_ui_manager &mui, render_container &container); - + static void show_menu(mame_ui_manager &mui, render_container &container, char *menu); - + virtual ~menu_plugin(); private: diff --git a/src/lib/util/delegate.h b/src/lib/util/delegate.h index 698632888cd..5e8f395776f 100644 --- a/src/lib/util/delegate.h +++ b/src/lib/util/delegate.h @@ -181,7 +181,7 @@ struct delegate_traits using static_func_type = _ReturnType(*)(_ClassType *, Params...); using static_ref_func_type = _ReturnType(*)(_ClassType &, Params...); using member_func_type = _ReturnType(_ClassType::*)(Params...); - using const_member_func_type = _ReturnType(_ClassType::*)(Params...) const; + using const_member_func_type = _ReturnType(_ClassType::*)(Params...) const; }; @@ -507,7 +507,7 @@ public: m_raw_function(nullptr), m_std_func(funcptr) { - + } // copy operator @@ -588,7 +588,7 @@ protected: late_bind_func m_latebinder; // late binding helper generic_static_func m_raw_function; // raw static function pointer delegate_mfp m_raw_mfp; // raw member function pointer - functional_type m_std_func; // std::function pointer + functional_type m_std_func; // std::function pointer }; diff --git a/src/mame/audio/rax.cpp b/src/mame/audio/rax.cpp index ca285659913..5bccf4706fd 100644 --- a/src/mame/audio/rax.cpp +++ b/src/mame/audio/rax.cpp @@ -3,7 +3,7 @@ /*************************************************************************** Acclaim RAX Sound Board - + ****************************************************************************/ #include "emu.h" @@ -93,7 +93,7 @@ READ16_MEMBER( acclaim_rax_device::adsp_control_r ) WRITE16_MEMBER( acclaim_rax_device::adsp_control_w ) { m_control_regs[offset] = data; - + switch (offset) { case 0x1: @@ -116,9 +116,9 @@ WRITE16_MEMBER( acclaim_rax_device::adsp_control_w ) uint32_t dir = (m_control_regs[BDMA_CONTROL_REG] >> 2) & 1; uint32_t type = m_control_regs[BDMA_CONTROL_REG] & 3; uint32_t src_addr = (page << 14) | m_control_regs[BDMA_EXT_ADDR_REG]; - + uint32_t count = m_control_regs[BDMA_WORD_COUNT_REG]; - + address_space* addr_space = (type == 0 ? m_program : m_data); if (dir == 0) @@ -139,7 +139,7 @@ WRITE16_MEMBER( acclaim_rax_device::adsp_control_w ) else if (type == 1) { while (count) - { + { uint16_t src_word = (adsp_rom[src_addr + 0] << 8) | adsp_rom[src_addr + 1]; addr_space->write_word(m_control_regs[BDMA_INT_ADDR_REG] * 2, src_word); @@ -152,9 +152,9 @@ WRITE16_MEMBER( acclaim_rax_device::adsp_control_w ) else { int shift = type == 2 ? 8 : 0; - + while (count) - { + { uint16_t src_word = adsp_rom[src_addr] << shift; addr_space->write_word(m_control_regs[BDMA_INT_ADDR_REG] * 2, src_word); @@ -176,7 +176,7 @@ WRITE16_MEMBER( acclaim_rax_device::adsp_control_w ) break; } - + case S1_AUTOBUF_REG: /* autobuffer off: nuke the timer, and disable the DAC */ if ((data & 0x0002) == 0) @@ -184,7 +184,7 @@ WRITE16_MEMBER( acclaim_rax_device::adsp_control_w ) dmadac_enable(&m_dmadac[1], 1, 0); } break; - + case S0_AUTOBUF_REG: /* autobuffer off: nuke the timer, and disable the DAC */ if ((data & 0x0002) == 0) @@ -193,7 +193,7 @@ WRITE16_MEMBER( acclaim_rax_device::adsp_control_w ) m_reg_timer[0]->reset(); } break; - + case S1_CONTROL_REG: if (((data >> 4) & 3) == 2) fatalerror("DCS: Oh no!, the data is compressed with u-law encoding\n"); @@ -220,7 +220,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( acclaim_rax_device::dma_timer_callback ) m_control_regs[BDMA_EXT_ADDR_REG] = param & 0x3fff; m_control_regs[BDMA_CONTROL_REG] &= ~0xff00; m_control_regs[BDMA_CONTROL_REG] |= ((param >> 14) & 0xff) << 8; - + if (m_control_regs[BDMA_CONTROL_REG] & 8) m_cpu->set_input_line(INPUT_LINE_RESET, PULSE_LINE); else @@ -298,10 +298,10 @@ void acclaim_rax_device::device_start() m_dmadac[0] = subdevice("dacl"); m_dmadac[1] = subdevice("dacr"); - + m_reg_timer[0] = subdevice("adsp_reg_timer0"); m_dma_timer = subdevice("adsp_dma_timer"); - + // 1 bank for internal membank("databank")->configure_entries(0, 5, auto_alloc_array(machine(), uint16_t, 0x2000 * 5), 0x2000*sizeof(uint16_t)); } @@ -322,15 +322,15 @@ void acclaim_rax_device::device_reset() m_adsp_snd_pf0 = 1; m_rom_bank = 0; - + /* initialize our state structure and install the transmit callback */ m_size[0] = 0; m_incs[0] = 0; m_ireg[0] = 0; - + /* initialize the ADSP control regs */ memset(m_control_regs, 0, sizeof(m_control_regs)); - + m_dmovlay_val = 0; m_data_bank = 0; update_data_ram_bank(); @@ -344,10 +344,10 @@ void acclaim_rax_device::adsp_irq(int which) /* get the index register */ int reg = m_cpu->state_int(ADSP2100_I0 + m_ireg[which]); - + /* copy the current data into the buffer */ int count = m_size[which] / (4 * (m_incs[which] ? m_incs[which] : 1)); - + int16_t buffer[0x100]; for (uint32_t i = 0; i < count; i++) @@ -378,15 +378,15 @@ TIMER_DEVICE_CALLBACK_MEMBER( acclaim_rax_device::adsp_irq0 ) void acclaim_rax_device::recompute_sample_rate(int which) { /* calculate how long until we generate an interrupt */ - + /* frequency the time per each bit sent */ attotime sample_period = attotime::from_hz(m_cpu->unscaled_clock()) * (1 * (m_control_regs[which ? S1_SCLKDIV_REG : S0_SCLKDIV_REG] + 1)); - + /* now put it down to samples, so we know what the channel frequency has to be */ sample_period = sample_period * (16 * 1); dmadac_set_frequency(&m_dmadac[0], 2, ATTOSECONDS_TO_HZ(sample_period.attoseconds())); dmadac_enable(&m_dmadac[0], 2, 1); - + /* fire off a timer which will hit every half-buffer */ if (m_incs[which]) { @@ -398,7 +398,7 @@ void acclaim_rax_device::recompute_sample_rate(int which) WRITE32_MEMBER(acclaim_rax_device::adsp_sound_tx_callback) { int which = offset; - + if (which != 0) return; @@ -413,27 +413,27 @@ WRITE32_MEMBER(acclaim_rax_device::adsp_sound_tx_callback) /* get the autobuffer registers */ int mreg, lreg; uint16_t source; - + m_ireg[which] = (m_control_regs[autobuf_reg] >> 9) & 7; mreg = (m_control_regs[autobuf_reg] >> 7) & 3; mreg |= m_ireg[which] & 0x04; /* msb comes from ireg */ lreg = m_ireg[which]; - + /* now get the register contents in a more legible format */ /* we depend on register indexes to be continuous (which is the case in our core) */ source = m_cpu->state_int(ADSP2100_I0 + m_ireg[which]); m_incs[which] = m_cpu->state_int(ADSP2100_M0 + mreg); m_size[which] = m_cpu->state_int(ADSP2100_L0 + lreg); - + /* get the base value, since we need to keep it around for wrapping */ source -= m_incs[which]; - + /* make it go back one so we dont lose the first sample */ m_cpu->set_state_int(ADSP2100_I0 + m_ireg[which], source); - + /* save it as it is now */ m_ireg_base[which] = source; - + /* recompute the sample rate and timer */ recompute_sample_rate(which); return; @@ -441,10 +441,10 @@ WRITE32_MEMBER(acclaim_rax_device::adsp_sound_tx_callback) else logerror( "ADSP SPORT1: trying to transmit and autobuffer not enabled!\n" ); } - + /* if we get there, something went wrong. Disable playing */ dmadac_enable(&m_dmadac[0], 2, 0); - + /* remove timer */ m_reg_timer[which]->reset(); } diff --git a/src/mame/audio/rax.h b/src/mame/audio/rax.h index e284771f79a..45058a82eab 100644 --- a/src/mame/audio/rax.h +++ b/src/mame/audio/rax.h @@ -22,31 +22,31 @@ public: READ16_MEMBER( data_r ); WRITE16_MEMBER( data_w ); - + READ16_MEMBER(adsp_control_r); WRITE16_MEMBER(adsp_control_w); WRITE16_MEMBER(ram_bank_w); WRITE16_MEMBER(rom_bank_w); - + READ16_MEMBER(host_r); WRITE16_MEMBER(host_w); - + void update_data_ram_bank(); void adsp_irq(int which); void recompute_sample_rate(int which); - + WRITE32_MEMBER(adsp_sound_tx_callback); - + TIMER_DEVICE_CALLBACK_MEMBER(adsp_irq0); TIMER_DEVICE_CALLBACK_MEMBER(sport0_irq); WRITE32_MEMBER(dmovlay_callback); - + required_device m_cpu; - required_shared_ptr m_adsp_pram; - required_memory_bank m_adsp_data_bank; + required_shared_ptr m_adsp_pram; + required_memory_bank m_adsp_data_bank; uint32_t m_adsp_snd_pf0; - + struct { uint16_t bdma_internal_addr; @@ -54,38 +54,38 @@ public: uint16_t bdma_control; uint16_t bdma_word_count; } m_adsp_regs; - + address_space *m_program; address_space *m_data; - - uint16_t m_control_regs[32]; - uint8_t* m_rom; - - + + uint16_t m_control_regs[32]; + uint8_t* m_rom; + + /* sound output */ - uint16_t m_size[2]; - uint16_t m_incs[2]; - dmadac_sound_device *m_dmadac[2]; - timer_device *m_reg_timer[2]; - timer_device *m_sport_timer; - uint32_t m_ireg[2]; - uint16_t m_ireg_base[2]; - - uint32_t m_data_bank; - uint32_t m_rom_bank; - uint32_t m_dmovlay_val; + uint16_t m_size[2]; + uint16_t m_incs[2]; + dmadac_sound_device *m_dmadac[2]; + timer_device *m_reg_timer[2]; + timer_device *m_sport_timer; + uint32_t m_ireg[2]; + uint16_t m_ireg_base[2]; + + uint32_t m_data_bank; + uint32_t m_rom_bank; + uint32_t m_dmovlay_val; required_device m_data_in; required_device m_data_out; - + timer_device *m_dma_timer; TIMER_DEVICE_CALLBACK_MEMBER( dma_timer_callback ); - + protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; - virtual machine_config_constructor device_mconfig_additions() const override; + virtual machine_config_constructor device_mconfig_additions() const override; }; // device type definition diff --git a/src/mame/drivers/amusco.cpp b/src/mame/drivers/amusco.cpp index 4de43260602..06ecffe728d 100644 --- a/src/mame/drivers/amusco.cpp +++ b/src/mame/drivers/amusco.cpp @@ -230,7 +230,7 @@ WRITE8_MEMBER(amusco_state::output_a_w) output().set_lamp_value(4, (data >> 4) & 1); // Lamp 4 (Hold/Disc 2) output().set_lamp_value(5, (data >> 5) & 1); // Lamp 5 (Hold/Disc 4) -// logerror("Writing %02Xh to PPI output A\n", data); +// logerror("Writing %02Xh to PPI output A\n", data); } WRITE8_MEMBER(amusco_state::output_b_w) @@ -251,12 +251,12 @@ WRITE8_MEMBER(amusco_state::output_b_w) //machine().bookkeeping().coin_counter_w(0, ~data & 0x10); // Probably not coin-related -// logerror("Writing %02Xh to PPI output B\n", data); +// logerror("Writing %02Xh to PPI output B\n", data); } WRITE8_MEMBER(amusco_state::output_c_w) { -// logerror("Writing %02Xh to PPI output C\n", data); +// logerror("Writing %02Xh to PPI output C\n", data); } WRITE8_MEMBER(amusco_state::vram_w) diff --git a/src/mame/drivers/aristmk5.cpp b/src/mame/drivers/aristmk5.cpp index bf6b59aa5f1..2327d751cda 100644 --- a/src/mame/drivers/aristmk5.cpp +++ b/src/mame/drivers/aristmk5.cpp @@ -732,11 +732,11 @@ DRIVER_INIT_MEMBER(aristmk5_state,aristmk5) { calculatedchecksum += ROM[i]; - // printf("Using address %08x, value %08x, Calculated Checksum %08x\n", i*4, ROM[i], calculatedchecksum); + // printf("Using address %08x, value %08x, Calculated Checksum %08x\n", i*4, ROM[i], calculatedchecksum); } else { - // printf("SKIPPING address %08x, value %08x, Calculated Checksum %08x\n", i*4, ROM[i], calculatedchecksum); + // printf("SKIPPING address %08x, value %08x, Calculated Checksum %08x\n", i*4, ROM[i], calculatedchecksum); } } @@ -876,27 +876,27 @@ static MACHINE_CONFIG_START( aristmk5, aristmk5_state ) // TL16C452FN U71 MCFG_DEVICE_ADD("uart_0a", NS16450, MASTER_CLOCK / 9) -// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback)) +// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback)) MCFG_DEVICE_ADD("uart_0b", NS16450, MASTER_CLOCK / 9) -// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback)) +// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback)) // TL16C452FN U72 MCFG_DEVICE_ADD("uart_1a", NS16450, MASTER_CLOCK / 9) -// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback)) +// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback)) MCFG_DEVICE_ADD("uart_1b", NS16450, MASTER_CLOCK / 9) -// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback)) +// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback)) // COMM port 4 - 5 MCFG_DEVICE_ADD("uart_2a", NS16450, MASTER_CLOCK / 9) -// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback)) +// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback)) MCFG_DEVICE_ADD("uart_2b", NS16450, MASTER_CLOCK / 9) -// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback)) +// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback)) // COMM port 6 - 7 MCFG_DEVICE_ADD("uart_3a", NS16450, MASTER_CLOCK / 9) -// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback)) +// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback)) MCFG_DEVICE_ADD("uart_3b", NS16450, MASTER_CLOCK / 9) -// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback)) +// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback)) MCFG_DS1302_ADD("rtc", XTAL_32_768kHz) @@ -963,12 +963,12 @@ ROM_END ROM_START( adonis ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000bf8 - 0x000000-0x05eb1b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xfc98a056 - Calculated Checksum 0xfc98a056 (OK) - 0x05eb1c-0x10fa8b is the non-Checksummed range still containing data but NOT covered by Checksum - 0x05eb1c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000bf8 + 0x000000-0x05eb1b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xfc98a056 + Calculated Checksum 0xfc98a056 (OK) + 0x05eb1c-0x10fa8b is the non-Checksummed range still containing data but NOT covered by Checksum + 0x05eb1c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "0200751v.u7", 0x000000, 0x80000, CRC(ab386ab0) SHA1(56c5baea4272866a9fe18bdc371a49f155251f86) ) @@ -998,12 +998,12 @@ ROM_END ROM_START( adonisa ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000bf8 - 0x000000-0x05cdc3 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x91f374c7 - Calculated Checksum 0x91f374c7 (OK) - 0x05cdc4-0x11000b is the non-Checksummed range still containing data but NOT covered by Checksum - 0x05cdc4-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000bf8 + 0x000000-0x05cdc3 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x91f374c7 + Calculated Checksum 0x91f374c7 (OK) + 0x05cdc4-0x11000b is the non-Checksummed range still containing data but NOT covered by Checksum + 0x05cdc4-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "0100751v.u7", 0x000000, 0x80000, CRC(ca3e97db) SHA1(bd0a4402e57891899d92ea85a87fb8925a44f706) ) @@ -1034,12 +1034,12 @@ ROM_END ROM_START( adonisu ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d18 - 0x000000-0x0e8a7b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xe6715f98 - Calculated Checksum 0xc80cd95e (BAD) - 0x0e8a7c-0x1c5f47 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0e8a7c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d18 + 0x000000-0x0e8a7b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xe6715f98 + Calculated Checksum 0xc80cd95e (BAD) + 0x0e8a7c-0x1c5f47 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0e8a7c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) // the checksum only covers part of the first 2 roms, marked all as BAD_DUMP because it can't be trusted without a full redump. @@ -1058,11 +1058,11 @@ ROM_START( adonisce ) ARISTOCRAT_MK5_BIOS ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) /* - Checksum code found at 0x000c44 - 0x000000-0x06ddab is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x07c97aad - Calculated Checksum 0x07c97aad (OK) - 0x06ddac-0x2a41cb is the non-Checksummed range + Checksum code found at 0x000c44 + 0x000000-0x06ddab is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x07c97aad + Calculated Checksum 0x07c97aad (OK) + 0x06ddac-0x2a41cb is the non-Checksummed range */ ROM_LOAD32_WORD("0201005v.u7", 0x0000000, 0x0080000, CRC(32149323) SHA1(abfc6a8518a39528db3700c2cb558e925ceeda6d) ) ROM_LOAD32_WORD("0201005v.u11", 0x0000002, 0x0080000, CRC(309b0b55) SHA1(669568031d305b29395345a26a5d004d83881433) ) @@ -1080,12 +1080,12 @@ ROM_END ROM_START( baddog ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000ae4 - 0x000000-0x056f3f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x15ac4012 - Calculated Checksum 0x15ac4012 (OK) - 0x056f40-0x2fb607 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x056f40-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000ae4 + 0x000000-0x056f3f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x15ac4012 + Calculated Checksum 0x15ac4012 (OK) + 0x056f40-0x2fb607 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x056f40-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) @@ -1105,12 +1105,12 @@ ROM_END ROM_START( blackpnt ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000bb0 - 0x000000-0x056d8b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xeebac434 - Calculated Checksum 0xeebac434 (OK) - 0x056d8c-0x138557 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x056d8c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000bb0 + 0x000000-0x056d8b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xeebac434 + Calculated Checksum 0xeebac434 (OK) + 0x056d8c-0x138557 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x056d8c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0200818v.u7", 0x0000000, 0x0080000, CRC(eed76145) SHA1(6a40a6ba2ce320a37b086dc4916c92c8e38c065e) ) @@ -1127,11 +1127,11 @@ ROM_END ROM_START( bootsctn ) ARISTOCRAT_MK5_BIOS /* - 0x000000-0x06c177 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xb0980753 - Calculated Checksum 0xb0980753 (OK) - 0x06c178-0x384a9b is the non-Checksummed range still containing data but NOT covered by Checksum - 0x06c178-0x3fffff is the non-Checksummed range if the additional vectors? at the end are included + 0x000000-0x06c177 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xb0980753 + Calculated Checksum 0xb0980753 (OK) + 0x06c178-0x384a9b is the non-Checksummed range still containing data but NOT covered by Checksum + 0x06c178-0x3fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0100812v.u7", 0x0000000, 0x0080000, CRC(f8e12462) SHA1(82a25757b2146204b86e557b8f1c45280e0668a8) ) @@ -1156,11 +1156,11 @@ ROM_END ROM_START( bootsctnu ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d08 - 0x000000-0x0941ab is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xdf68cecf - Calculated Checksum 0xed145d01 (BAD) - 0x0941ac-0x328187 is the non-Checksummed range (suspicious endpoint) + Checksum code found at 0x000d08 + 0x000000-0x0941ab is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xdf68cecf + Calculated Checksum 0xed145d01 (BAD) + 0x0941ac-0x328187 is the non-Checksummed range (suspicious endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) @@ -1183,11 +1183,11 @@ ROM_END ROM_START( bumblbug ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b68 - 0x000000-0x05b94b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xf5d418fe - Calculated Checksum 0xf5d418fe (OK) - 0x05b94c-0x0fc69f is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000b68 + 0x000000-0x05b94b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xf5d418fe + Calculated Checksum 0xf5d418fe (OK) + 0x05b94c-0x0fc69f is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0200510v.u7", 0x0000000, 0x0080000, CRC(d4cfce73) SHA1(735c385779afe55e521dbfe9ebfdc55fe3346349) ) @@ -1203,12 +1203,12 @@ ROM_END ROM_START( bumblbugql ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000ac8 - 0x000000-0x05554b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x66b20ae6 - Calculated Checksum 0x66b20ae6 (OK) - 0x05554c-0x1c4e2b is the non-Checksummed range still containing data but NOT covered by Checksum - 0x05554c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000ac8 + 0x000000-0x05554b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x66b20ae6 + Calculated Checksum 0x66b20ae6 (OK) + 0x05554c-0x1c4e2b is the non-Checksummed range still containing data but NOT covered by Checksum + 0x05554c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "0200456v.u7", 0x000000, 0x80000, CRC(f04dd78b) SHA1(443057fc3e02406d46cf68f95e85e5a0fd8e7b1e) ) @@ -1229,12 +1229,12 @@ ROM_END ROM_START( bumblbugu ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d08 - 0x000000-0x0b1f47 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x9f3936f9 - Calculated Checksum 0x16f5c058 (BAD) - 0x0b1f48-0x183c1f is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0b1f48-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d08 + 0x000000-0x0b1f47 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x9f3936f9 + Calculated Checksum 0x16f5c058 (BAD) + 0x0b1f48-0x183c1f is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0b1f48-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) // the checksum only covers part of the first 2 roms, marked all as BAD_DUMP because it can't be trusted without a full redump. @@ -1252,12 +1252,12 @@ ROM_END ROM_START( buttdeli ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000adc - 0x000000-0x04477f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x19143954 - Calculated Checksum 0x19143954 (OK) - 0x044780-0x1c713b is the non-Checksummed range still containing data but NOT covered by Checksum - 0x044780-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000adc + 0x000000-0x04477f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x19143954 + Calculated Checksum 0x19143954 (OK) + 0x044780-0x1c713b is the non-Checksummed range still containing data but NOT covered by Checksum + 0x044780-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0200143v.u7", 0x0000000, 0x0080000, CRC(7f69cdfc) SHA1(1241741d21334df10d60080555824a87eae93db3) ) @@ -1275,12 +1275,12 @@ ROM_START( cashcat ) ARISTOCRAT_MK5_BIOS ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) /* - Checksum code found at 0x000adc - 0x000000-0x04477f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x19143954 - Calculated Checksum 0x19143954 (OK) - 0x044780-0x1c713b is the non-Checksummed range still containing data but NOT covered by Checksum - 0x044780-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000adc + 0x000000-0x04477f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x19143954 + Calculated Checksum 0x19143954 (OK) + 0x044780-0x1c713b is the non-Checksummed range still containing data but NOT covered by Checksum + 0x044780-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_LOAD32_WORD("0300863v.u7", 0x0000000, 0x0080000, CRC(de0f0202) SHA1(994f6c47b1e2e0e133853dc69b189752104486e4) ) ROM_LOAD32_WORD("0300863v.u11", 0x0000002, 0x0080000, CRC(e60e8bd1) SHA1(ffaa7be8968047b9ee54a117d273a14cbca41028) ) @@ -1296,12 +1296,12 @@ ROM_END ROM_START( cashcham ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000ae0 - 0x000000-0x055f83 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x159a2aa3 - Calculated Checksum 0x159a2aa3 (OK) - 0x055f84-0x1dbdd7 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x055f84-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000ae0 + 0x000000-0x055f83 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x159a2aa3 + Calculated Checksum 0x159a2aa3 (OK) + 0x055f84-0x1dbdd7 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x055f84-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0100438v.u7", 0x0000000, 0x0080000, CRC(c942ef22) SHA1(4f56674f749602ae928832f98a641e680af8989b) ) @@ -1317,12 +1317,12 @@ ROM_END ROM_START( cashchama ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b00 - 0x000000-0x05ca1b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xa32ccd1b - Calculated Checksum 0xa32ccd1b (OK) - 0x05ca1c-0x1dbdd7 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x05ca1c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b00 + 0x000000-0x05ca1b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xa32ccd1b + Calculated Checksum 0xa32ccd1b (OK) + 0x05ca1c-0x1dbdd7 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x05ca1c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0200437v.u7", 0x0000000, 0x0080000, CRC(a287fd5a) SHA1(7d06f679e5ff38e0989819410856361962c93e42) ) @@ -1355,12 +1355,12 @@ ROM_END ROM_START( cashchamu ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d08 - 0x000000-0x09b413 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x741cd9a0 - Calculated Checksum 0x740e5ad7 (BAD) - 0x09b414-0x1b550b is the non-Checksummed range still containing data but NOT covered by Checksum - 0x09b414-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d08 + 0x000000-0x09b413 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x741cd9a0 + Calculated Checksum 0x740e5ad7 (BAD) + 0x09b414-0x1b550b is the non-Checksummed range still containing data but NOT covered by Checksum + 0x09b414-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) // the checksum only covers part of the first 2 roms, marked all as BAD_DUMP because it can't be trusted without a full redump. @@ -1378,12 +1378,12 @@ ROM_END ROM_START( cashcra5 ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b80 - 0x000000-0x06076b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x2c872d3e - Calculated Checksum 0x2c872d3e (OK) - 0x06076c-0x1a2ecf is the non-Checksummed range still containing data but NOT covered by Checksum - 0x06076c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b80 + 0x000000-0x06076b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x2c872d3e + Calculated Checksum 0x2c872d3e (OK) + 0x06076c-0x1a2ecf is the non-Checksummed range still containing data but NOT covered by Checksum + 0x06076c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0300467v.u7", 0x0000000, 0x0080000, CRC(b0ff2aae) SHA1(b05667ffe952cae7a6581398552db6e47921090e) ) @@ -1403,12 +1403,12 @@ ROM_END ROM_START( chariotc ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000ba8 - 0x000000-0x07dbb7 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x203ac6e8 - Calculated Checksum 0x203ac6e8 (OK) - 0x07dbb8-0x1b3787 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x07dbb8-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000ba8 + 0x000000-0x07dbb7 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x203ac6e8 + Calculated Checksum 0x203ac6e8 (OK) + 0x07dbb8-0x1b3787 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x07dbb8-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "04j00714.u7", 0x000000, 0x80000, CRC(2f3a1af7) SHA1(e1448116a81687cb79dd380dfbc8decf1f83e649) ) @@ -1425,12 +1425,12 @@ ROM_END ROM_START( chariotca ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000ba8 - 0x000000-0x0603fb is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xbe63efe6 - Calculated Checksum 0xbe63efe6 (OK) - 0x0603fc-0x17a75b is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0603fc-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000ba8 + 0x000000-0x0603fb is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xbe63efe6 + Calculated Checksum 0xbe63efe6 (OK) + 0x0603fc-0x17a75b is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0603fc-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0100787v.u7", 0x0000000, 0x0080000, CRC(845f9913) SHA1(df6121290b30ff4a9c2d0e690cf8e7797e9a8612) ) @@ -1447,12 +1447,12 @@ ROM_END ROM_START( checkma5 ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000c38 - 0x000000-0x071847 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x0de9b6ca - Calculated Checksum 0x0de9b6ca (OK) - 0x071848-0x25ff4b is the non-Checksummed range still containing data but NOT covered by Checksum - 0x071848-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000c38 + 0x000000-0x071847 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x0de9b6ca + Calculated Checksum 0x0de9b6ca (OK) + 0x071848-0x25ff4b is the non-Checksummed range still containing data but NOT covered by Checksum + 0x071848-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("01j00681.u7", 0x0000000, 0x0080000, CRC(059b940e) SHA1(f637508dafbd37169429c495a893addbc6d28834) ) @@ -1471,11 +1471,11 @@ ROM_END ROM_START( chickna5 ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b80 - 0x000000-0x053fb7 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x8afbaabc - Calculated Checksum 0x8afbaabc (OK) - 0x053fb8-0x2fda37 is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000b80 + 0x000000-0x053fb7 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x8afbaabc + Calculated Checksum 0x8afbaabc (OK) + 0x053fb8-0x2fda37 is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0100351v.u7", 0x0000000, 0x0080000, CRC(be69c21c) SHA1(8b546727b5972f33d077db0a64aa41a7fde6d417) ) @@ -1498,11 +1498,11 @@ ROM_END ROM_START( chickna5u ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d08 - 0x000000-0x0a6917 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x0d44c6b0 - Calculated Checksum 0xc47bc6b0 (BAD) - 0x0a6918-0x35040b is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000d08 + 0x000000-0x0a6917 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x0d44c6b0 + Calculated Checksum 0xc47bc6b0 (BAD) + 0x0a6918-0x35040b is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) // the checksum only covers part of the first 2 roms, marked all as BAD_DUMP because it can't be trusted without a full redump. @@ -1524,12 +1524,12 @@ ROM_END ROM_START( chickna5qld ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000ac8 - 0x000000-0x05f193 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xeff4424a - Calculated Checksum 0xeff4424a (OK) - 0x05f194-0x3a9a7f is the non-Checksummed range still containing data but NOT covered by Checksum - 0x05f194-0x3fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000ac8 + 0x000000-0x05f193 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xeff4424a + Calculated Checksum 0xeff4424a (OK) + 0x05f194-0x3a9a7f is the non-Checksummed range still containing data but NOT covered by Checksum + 0x05f194-0x3fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "0200530v.u7", 0x000000, 0x80000, CRC(2d53de96) SHA1(6f2ed8f68d0474021a302d7e06ba869c0f1f7262) ) @@ -1549,12 +1549,12 @@ ROM_END ROM_START( coralrc2 ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000be8 - 0x000000-0x05ba63 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x12fce303 - Calculated Checksum 0x12fce303 (OK) - 0x05ba64-0x12b3e3 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x05ba64-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000be8 + 0x000000-0x05ba63 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x12fce303 + Calculated Checksum 0x12fce303 (OK) + 0x05ba64-0x12b3e3 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x05ba64-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0100919v.u7", 0x0000000, 0x0080000, CRC(02c430c3) SHA1(f4bae1aa5437af1df2a04f700da044bc4fb652b7) ) @@ -1571,12 +1571,12 @@ ROM_END ROM_START( cuckoo ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b10 - 0x000000-0x05f63f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x6aa5ad46 - Calculated Checksum 0x6aa5ad46 (OK) - 0x05f640-0x1b1deb is the non-Checksummed range still containing data but NOT covered by Checksum - 0x05f640-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b10 + 0x000000-0x05f63f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x6aa5ad46 + Calculated Checksum 0x6aa5ad46 (OK) + 0x05f640-0x1b1deb is the non-Checksummed range still containing data but NOT covered by Checksum + 0x05f640-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0200753v.u7", 0x0000000, 0x0080000, CRC(5c7ef84a) SHA1(59563a076ecf391ac1779e0dcd530a1ea158a4e3) ) @@ -1596,12 +1596,12 @@ ROM_END ROM_START( cuckoou ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d18 - 0x000000-0x0a588b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x9e544942 - Calculated Checksum 0x9e544942 (OK) - 0x0a588c-0x184b17 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0a588c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d18 + 0x000000-0x0a588b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x9e544942 + Calculated Checksum 0x9e544942 (OK) + 0x0a588c-0x184b17 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0a588c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "chg1195.u7", 0x000000, 0x80000, CRC(0bd17338) SHA1(b8f467bdf8d76533a2b7d44fe93be414f25a3c31) ) @@ -1618,12 +1618,12 @@ ROM_END ROM_START( dstbloom ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000adc - 0x000000-0x0431d3 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x3a2c9103 - Calculated Checksum 0x3a2c9103 (OK) - 0x0431d4-0x1cb32b is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0431d4-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000adc + 0x000000-0x0431d3 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x3a2c9103 + Calculated Checksum 0x3a2c9103 (OK) + 0x0431d4-0x1cb32b is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0431d4-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0200111v.u7", 0x0000000, 0x0080000, CRC(fbfaa3fe) SHA1(3f915261503fc97eb556422e9ccdac81372c04cc) ) @@ -1640,11 +1640,11 @@ ROM_START( dmdfever ) ARISTOCRAT_MK5_BIOS ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) /* - Checksum code found at 0x000ad8 - 0x000000-0x054f3f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x87d3b331 - Calculated Checksum 0x87d3b331 (OK) - 0x054f40-0x0ef137 is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000ad8 + 0x000000-0x054f3f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x87d3b331 + Calculated Checksum 0x87d3b331 (OK) + 0x054f40-0x0ef137 is the non-Checksummed range (unusual endpoint) */ ROM_LOAD32_WORD( "0200302v.u7", 0x000000, 0x80000, CRC(d90032f9) SHA1(9c34e626168bdfa3ff2722d9ff1970d826135cf7) ) ROM_LOAD32_WORD( "0200302v.u11", 0x000002, 0x80000, CRC(29620f05) SHA1(172b6226c443931f0c4ddc44a63c8fc0e6be3824) ) @@ -1657,12 +1657,12 @@ ROM_END ROM_START( diamdove ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b78 - 0x000000-0x063a9f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x2dfce931 - Calculated Checksum 0x2dfce931 (OK) - 0x063aa0-0x273ea3 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x063aa0-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b78 + 0x000000-0x063a9f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x2dfce931 + Calculated Checksum 0x2dfce931 (OK) + 0x063aa0-0x273ea3 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x063aa0-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0101018v.u7", 0x0000000, 0x0080000, CRC(2ebb3704) SHA1(42567d873d6ab9221d09e5449fa57b557677d2ab) ) @@ -1696,11 +1696,11 @@ ROM_END ROM_START( dolphntr ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b08 - 0x000000-0x05c367 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x14ccd8a1 - Calculated Checksum 0x14ccd8a1 (OK) - 0x05c368-0x0fe787 is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000b08 + 0x000000-0x05c367 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x14ccd8a1 + Calculated Checksum 0x14ccd8a1 (OK) + 0x05c368-0x0fe787 is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "0200424v.u7", 0x000000, 0x80000, CRC(5dd88306) SHA1(ee8ec7d123d057e8df9be0e8dadecea7dab7aafd) ) @@ -1715,12 +1715,12 @@ ROM_END ROM_START( dolphntra ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b08 - 0x000000-0x053897 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x81967fa4 - Calculated Checksum 0x81967fa4 (OK) - 0x053898-0x1cac2f is the non-Checksummed range still containing data but NOT covered by Checksum - 0x053898-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b08 + 0x000000-0x053897 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x81967fa4 + Calculated Checksum 0x81967fa4 (OK) + 0x053898-0x1cac2f is the non-Checksummed range still containing data but NOT covered by Checksum + 0x053898-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "0100424v.u7", 0x000000, 0x80000, CRC(657faef7) SHA1(09e1f9d461e855c10cf8b825ef83dd3e7db65b43) ) @@ -1737,12 +1737,12 @@ ROM_END ROM_START( dolphntrb ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b20 - 0x000000-0x0536c3 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xeee6e6fc - Calculated Checksum 0xeee6e6fc (OK) - 0x0536c4-0x1ce293 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0536c4-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b20 + 0x000000-0x0536c3 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xeee6e6fc + Calculated Checksum 0xeee6e6fc (OK) + 0x0536c4-0x1ce293 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0536c4-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0100388v.u7", 0x0000000, 0x0080000, CRC(7463b5f6) SHA1(89e5cf8143d0b4ed54aa2c9bd8840f0aba19322e) ) @@ -1762,12 +1762,12 @@ ROM_END ROM_START( dolphntru ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d08 - 0x000000-0x08ec8b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x9caf255e - Calculated Checksum 0x9caf255e (OK) - 0x08ec8c-0x13d99f is the non-Checksummed range still containing data but NOT covered by Checksum - 0x08ec8c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d08 + 0x000000-0x08ec8b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x9caf255e + Calculated Checksum 0x9caf255e (OK) + 0x08ec8c-0x13d99f is the non-Checksummed range still containing data but NOT covered by Checksum + 0x08ec8c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "fhg407702.u7", 0x000000, 0x80000, CRC(97e3e4d0) SHA1(211b9b9e0f25dfaf9d1dfe1d3d88592522aa6f07) ) @@ -1784,12 +1784,12 @@ ROM_END ROM_START( dynajack ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b78 - 0x000000-0x07031b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xd8815d1c - Calculated Checksum 0xd8815d1c (OK) - 0x07031c-0x227a4b is the non-Checksummed range still containing data but NOT covered by Checksum - 0x07031c-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b78 + 0x000000-0x07031b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xd8815d1c + Calculated Checksum 0xd8815d1c (OK) + 0x07031c-0x227a4b is the non-Checksummed range still containing data but NOT covered by Checksum + 0x07031c-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("01j00081.u7", 0x0000000, 0x0080000, CRC(73783ecf) SHA1(280b4da540b405959f31c2eebbf87ab635d21c06) ) @@ -1808,11 +1808,11 @@ ROM_END ROM_START( eldorda5 ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b88 - 0x000000-0x06328b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xed424efa - Calculated Checksum 0xed424efa (OK) - 0x06328c-0x0d4b57 is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000b88 + 0x000000-0x06328b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xed424efa + Calculated Checksum 0xed424efa (OK) + 0x06328c-0x0d4b57 is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0100652v.u7", 0x0000000, 0x0080000, CRC(d9afe87c) SHA1(577ea5da9c4e93a393711a0c7361365301f4241e) ) @@ -1827,11 +1827,11 @@ ROM_END ROM_START( eforsta5 ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000ae4 - 0x000000-0x045da3 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x2c99855f - Calculated Checksum 0x2c99855f (OK) - 0x045da4-0x0ebd43 is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000ae4 + 0x000000-0x045da3 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x2c99855f + Calculated Checksum 0x2c99855f (OK) + 0x045da4-0x0ebd43 is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "0400122v.u7", 0x000000, 0x80000, CRC(b5829b27) SHA1(f6f84c8dc524dcee95e37b93ead9090903bdca4f) ) @@ -1850,12 +1850,12 @@ ROM_END ROM_START( eforsta5u ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d08 - 0x000000-0x0a5233 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x5de71535 - Calculated Checksum 0x5de71535 (OK) - 0x0a5234-0x15dbdf is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0a5234-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d08 + 0x000000-0x0a5233 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x5de71535 + Calculated Checksum 0x5de71535 (OK) + 0x0a5234-0x15dbdf is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0a5234-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ // if you enable the additional debug output you get 'Error in graphics EPROMs' so these ROMs are also bad even if the above passes @@ -1874,12 +1874,12 @@ ROM_END ROM_START( fortellr ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b78 - 0x000000-0x07038b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x49e7e64e - Calculated Checksum 0x49e7e64e (OK) - 0x07038c-0x3616a7 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x07038c-0x3fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b78 + 0x000000-0x07038b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x49e7e64e + Calculated Checksum 0x49e7e64e (OK) + 0x07038c-0x3616a7 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x07038c-0x3fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("01j00131.u7", 0x0000000, 0x0080000, CRC(78394106) SHA1(aedfb98d7aa515eebabf378edb9c43e01bcba010) ) @@ -1904,12 +1904,12 @@ ROM_END ROM_START( gambler ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d08 - 0x000000-0x08f46b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x9eb3c0ef - Calculated Checksum 0x9eb3c0ef (OK) - 0x08f46c-0x1354cb is the non-Checksummed range still containing data but NOT covered by Checksum - 0x08f46c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d08 + 0x000000-0x08f46b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x9eb3c0ef + Calculated Checksum 0x9eb3c0ef (OK) + 0x08f46c-0x1354cb is the non-Checksummed range still containing data but NOT covered by Checksum + 0x08f46c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) // if you enable the additional debug output you get 'Error2 in graphics EPROMs' so these ROMs are also bad even if the above passes @@ -1963,12 +1963,12 @@ ROM_END ROM_START( gnomeatw ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b68 - 0x000000-0x05ebcb is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xd396114d - Calculated Checksum 0xd396114d (OK) - 0x05ebcc-0x1bf9db is the non-Checksummed range still containing data but NOT covered by Checksum - 0x05ebcc-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b68 + 0x000000-0x05ebcb is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xd396114d + Calculated Checksum 0xd396114d (OK) + 0x05ebcc-0x1bf9db is the non-Checksummed range still containing data but NOT covered by Checksum + 0x05ebcc-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0100767v.u7", 0x0000000, 0x0080000, CRC(a5d3825e) SHA1(4ce7466eff770a2c6c3c5de620a14e05bb9fb406) ) @@ -1985,12 +1985,12 @@ ROM_END ROM_START( goldpyr ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d08 - 0x000000-0x08ec83 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x7c8c2fbf - Calculated Checksum 0x7c8c2fbf (OK) - 0x08ec84-0x1aca63 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x08ec84-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d08 + 0x000000-0x08ec83 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x7c8c2fbf + Calculated Checksum 0x7c8c2fbf (OK) + 0x08ec84-0x1aca63 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x08ec84-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "ahg120503.u7", 0x000000, 0x80000, CRC(2fbed80c) SHA1(fb0d97cb2be96da37c487fc3aef06c6120efdb46) ) @@ -2012,12 +2012,12 @@ ROM_END ROM_START( goldpyra ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d08 - 0x000000-0x08ef13 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xd3126f08 - Calculated Checksum 0x26ee6f08 (BAD) - 0x08ef14-0x1aca3b is the non-Checksummed range still containing data but NOT covered by Checksum - 0x08ef14-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d08 + 0x000000-0x08ef13 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xd3126f08 + Calculated Checksum 0x26ee6f08 (BAD) + 0x08ef14-0x1aca3b is the non-Checksummed range still containing data but NOT covered by Checksum + 0x08ef14-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) // the checksum only covers part of the first 2 roms, marked all as BAD_DUMP because it can't be trusted without a full redump. @@ -2035,12 +2035,12 @@ ROM_END ROM_START( goldenra ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b98 - 0x000000-0x068297 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x1cc81433 - Calculated Checksum 0x1cc81433 (OK) - 0x068298-0x285abf is the non-Checksummed range still containing data but NOT covered by Checksum - 0x068298-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b98 + 0x000000-0x068297 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x1cc81433 + Calculated Checksum 0x1cc81433 (OK) + 0x068298-0x285abf is the non-Checksummed range still containing data but NOT covered by Checksum + 0x068298-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0101164v.u7", 0x0000000, 0x0080000, CRC(2f75d5f7) SHA1(d7f6ecff7cf759d80733b6d3f224caa5128be0b7) ) @@ -2059,11 +2059,11 @@ ROM_END ROM_START( incasun ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000bf8 - 0x000000-0x05f56b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x86b74381 - Calculated Checksum 0x86b74381 (OK) - 0x05f56c-0x23586f is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000bf8 + 0x000000-0x05f56b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x86b74381 + Calculated Checksum 0x86b74381 (OK) + 0x05f56c-0x23586f is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0100872v.u7", 0x0000000, 0x0080000, CRC(180e098b) SHA1(48782c46a344dba0aaad407d0d4a432da091b0f5) ) @@ -2098,11 +2098,11 @@ ROM_START( incasunsp ) ARISTOCRAT_MK5_BIOS ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) /* - Checksum code found at 0x000bf8 - 0x000000-0x05f70f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x1de6e2c7 - Calculated Checksum 0x1de6e2c7 (OK) - 0x05f710-0x235a13 is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000bf8 + 0x000000-0x05f70f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x1de6e2c7 + Calculated Checksum 0x1de6e2c7 (OK) + 0x05f710-0x235a13 is the non-Checksummed range (unusual endpoint) */ ROM_LOAD32_WORD("sp__0100872v.u7", 0x0000000, 0x0080000, CRC(62919753) SHA1(0f0d186260a64b8b45671f68abf497586264793e) ) ROM_LOAD32_WORD("sp__0100872v.u11", 0x0000002, 0x0080000, CRC(f221ac71) SHA1(c2c1f8703e9a41e5c4d5ebfeac57e220a64e9657) ) @@ -2137,12 +2137,12 @@ ROM_END ROM_START( indrema5 ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000ba8 - 0x000000-0x06323f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x965e92e4 - Calculated Checksum 0x965e92e4 (OK) - 0x063240-0x1cd2d3 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x063240-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000ba8 + 0x000000-0x06323f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x965e92e4 + Calculated Checksum 0x965e92e4 (OK) + 0x063240-0x1cd2d3 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x063240-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "0100845v.u7", 0x000000, 0x80000, CRC(0c924a3e) SHA1(499b4ae601e53173e3ba5f400a40e5ae7bbaa043) ) @@ -2159,20 +2159,20 @@ ROM_END ROM_START( jungjuic ) ARISTOCRAT_MK5_BIOS /* - note, this actually contains a 2nd checksum for the game, this is likely the base/bios check only. + note, this actually contains a 2nd checksum for the game, this is likely the base/bios check only. + + Checksum code found at 0x001b74 + 0x000000-0x089a2f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x5ad8a58b + Calculated Checksum 0x5ad8a58b (OK) + 0x089a30-0x1b4043 is the non-Checksummed range (unusual endpoint) - Checksum code found at 0x001b74 - 0x000000-0x089a2f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x5ad8a58b - Calculated Checksum 0x5ad8a58b (OK) - 0x089a30-0x1b4043 is the non-Checksummed range (unusual endpoint) - */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) // these are the 'bios' for Casino games (could be moved to a different base set) ROM_LOAD32_WORD( "0700474v.u7", 0x000000, 0x80000, CRC(04b7dcbf) SHA1(eded1223336181bb08f9593247f1f79d96278b75) ) ROM_LOAD32_WORD( "0700474v.u11", 0x000002, 0x80000, CRC(a89ce1b5) SHA1(411b474a111f23ebd834bea5af0bf0cf3926d590) ) - + ROM_LOAD32_WORD( "0200240v.u8", 0x100000, 0x80000, CRC(10c61ff7) SHA1(86d17cf2492612c3a6284a1c8e41a67a5199c0eb) ) ROM_LOAD32_WORD( "0200240v.u12", 0x100002, 0x80000, CRC(ffa3d0ba) SHA1(e60e01d4d425aea483387fa2f9ae5bb69b80f829) ) @@ -2185,12 +2185,12 @@ ROM_END ROM_START( kgalah ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b28 - 0x000000-0x05af27 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xa4ff4d2a - Calculated Checksum 0xa4ff4d2a (OK) - 0x05af28-0x1b3e9f is the non-Checksummed range still containing data but NOT covered by Checksum - 0x05af28-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b28 + 0x000000-0x05af27 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xa4ff4d2a + Calculated Checksum 0xa4ff4d2a (OK) + 0x05af28-0x1b3e9f is the non-Checksummed range still containing data but NOT covered by Checksum + 0x05af28-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0200536v.u7", 0x0000000, 0x0080000, CRC(9333543a) SHA1(dbbd59de046c35e70e71836b342eb5ecf4799575) ) @@ -2210,11 +2210,11 @@ ROM_END ROM_START( koalamnt ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d18 - 0x000000-0x0ec32b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x5e570341 - Calculated Checksum 0x17df3e7d (BAD) - 0x0ec32c-0x34ebdf is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000d18 + 0x000000-0x0ec32b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x5e570341 + Calculated Checksum 0x17df3e7d (BAD) + 0x0ec32c-0x34ebdf is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) // the checksum only covers part of the first 2 roms, marked all as BAD_DUMP because it can't be trusted without a full redump. @@ -2236,12 +2236,12 @@ ROM_END ROM_START( kookabuk ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b68 - 0x000000-0x061857 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xf03ce7cb - Calculated Checksum 0xf03ce7cb (OK) - 0x061858-0x1a2757 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x061858-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b68 + 0x000000-0x061857 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xf03ce7cb + Calculated Checksum 0xf03ce7cb (OK) + 0x061858-0x1a2757 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x061858-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0100677v.u7", 0x0000000, 0x0080000, CRC(b2fdf0e8) SHA1(0dd002cfad2fa4f217a0c67066d098f4cd3ba319) ) @@ -2258,11 +2258,11 @@ ROM_END ROM_START( locoloot ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b20 - 0x000000-0x055e93 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xafd2e94d - Calculated Checksum 0xafd2e94d (OK) - 0x055e94-0x0bbf23 is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000b20 + 0x000000-0x055e93 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xafd2e94d + Calculated Checksum 0xafd2e94d (OK) + 0x055e94-0x0bbf23 is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0100472v.u7", 0x0000000, 0x0080000, CRC(4f02763c) SHA1(302cea5fb157f65fc907f123ef42a0a38cc707ac) ) @@ -2292,11 +2292,11 @@ ROM_END ROM_START( lonewolf ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b48 - 0x000000-0x0580f3 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x424e42b6 - Calculated Checksum 0x424e42b6 (OK) - 0x0580f4-0x0df6b7 is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000b48 + 0x000000-0x0580f3 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x424e42b6 + Calculated Checksum 0x424e42b6 (OK) + 0x0580f4-0x0df6b7 is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0100587v.u7", 0x0000000, 0x0080000, CRC(15024eae) SHA1(7101125aa8531c75f9d80fe357013d09dbb0fec9) ) @@ -2314,12 +2314,12 @@ ROM_END ROM_START( mgarden ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d08 - 0x000000-0x0a522b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x8b0f5dae - Calculated Checksum 0x8afcb91f (BAD) - 0x0a522c-0x15dbd7 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0a522c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d08 + 0x000000-0x0a522b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x8b0f5dae + Calculated Checksum 0x8afcb91f (BAD) + 0x0a522c-0x15dbd7 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0a522c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) // the checksum only covers part of the first 2 roms, marked all as BAD_DUMP because it can't be trusted without a full redump. @@ -2339,12 +2339,12 @@ ROM_END ROM_START( magimask ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d18 - 0x000000-0x0e8527 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x1d86deee - Calculated Checksum 0x1d86deee (OK) - 0x0e8528-0x1e4887 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0e8528-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d18 + 0x000000-0x0e8527 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x1d86deee + Calculated Checksum 0x1d86deee (OK) + 0x0e8528-0x1e4887 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0e8528-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "dhg1309.u7", 0x000000, 0x80000, CRC(17317eb9) SHA1(3ddb8d61f23461c3194af534928164550208bbee) ) @@ -2372,12 +2372,12 @@ ROM_END ROM_START( magimaska ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d18 - 0x000000-0x0e9597 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x6610851f - Calculated Checksum 0x6610851f (OK) - 0x0e9598-0x1e591f is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0e9598-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d18 + 0x000000-0x0e9597 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x6610851f + Calculated Checksum 0x6610851f (OK) + 0x0e9598-0x1e591f is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0e9598-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "ahg1548.u7", 0x000000, 0x80000, CRC(452a19c9) SHA1(aab1f4ccfc6cdb382f7a0e85491614cc58811a08) ) @@ -2411,12 +2411,12 @@ ROM_END ROM_START( marmagic ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b78 - 0x000000-0x06d93b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x59531d0a - Calculated Checksum 0x59531d0a (OK) - 0x06d93c-0x2deae3 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x06d93c-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b78 + 0x000000-0x06d93b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x59531d0a + Calculated Checksum 0x59531d0a (OK) + 0x06d93c-0x2deae3 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x06d93c-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "01j00101.u7", 0x000000, 0x80000, CRC(eee7ebaf) SHA1(bad0c08578877f84325c07d51c6ed76c40b70720) ) @@ -2440,12 +2440,12 @@ ROM_END ROM_START( marmagicu ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d18 - 0x000000-0x0eda53 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xac229593 - Calculated Checksum 0x67abc369 (BAD) - 0x0eda54-0x2fffef is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0eda54-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d18 + 0x000000-0x0eda53 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xac229593 + Calculated Checksum 0x67abc369 (BAD) + 0x0eda54-0x2fffef is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0eda54-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) // the checksum only covers part of the first 2 roms, marked all as BAD_DUMP because it can't be trusted without a full redump. @@ -2468,12 +2468,12 @@ ROM_END ROM_START( minemine ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d10 - 0x000000-0x0a7203 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x75c908a7 - Calculated Checksum 0x75c908a7 (OK) - 0x0a7204-0x1a0edf is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0a7204-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d10 + 0x000000-0x0a7203 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x75c908a7 + Calculated Checksum 0x75c908a7 (OK) + 0x0a7204-0x1a0edf is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0a7204-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "vhg0416-99.u7", 0x000000, 0x80000, CRC(41bc3714) SHA1(5a8f7d24a6a697524af7997dcedd214fcaf48768) ) @@ -2490,12 +2490,12 @@ ROM_END ROM_START( monmouse ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b80 - 0x000000-0x066077 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x569023a4 - Calculated Checksum 0x569023a4 (OK) - 0x066078-0x1faf7b is the non-Checksummed range still containing data but NOT covered by Checksum - 0x066078-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b80 + 0x000000-0x066077 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x569023a4 + Calculated Checksum 0x569023a4 (OK) + 0x066078-0x1faf7b is the non-Checksummed range still containing data but NOT covered by Checksum + 0x066078-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0400469v.u7", 0x0000000, 0x0080000, CRC(7f7972b6) SHA1(25991f476f55cd1eddc8e63af9c472c1d7e83481) ) @@ -2529,11 +2529,11 @@ ROM_END ROM_START( mountmon ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000ae4 - 0x000000-0x04ee9b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x4bb1139e - Calculated Checksum 0x4bb1139e (OK) - 0x04ee9c-0x0e3a1f is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000ae4 + 0x000000-0x04ee9b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x4bb1139e + Calculated Checksum 0x4bb1139e (OK) + 0x04ee9c-0x0e3a1f is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0100294v.u7", 0x0000000, 0x0080000, CRC(b84342af) SHA1(e27e65730ddc897b01e8875a4da3ea2d6db2b858) ) @@ -2548,12 +2548,12 @@ ROM_END ROM_START( multidrw ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b98 - 0x000000-0x07477f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xe2d3d401 - Calculated Checksum 0xe2d3d401 (OK) - 0x074780-0x2c5abb is the non-Checksummed range still containing data but NOT covered by Checksum - 0x074780-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b98 + 0x000000-0x07477f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xe2d3d401 + Calculated Checksum 0xe2d3d401 (OK) + 0x074780-0x2c5abb is the non-Checksummed range still containing data but NOT covered by Checksum + 0x074780-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) @@ -2573,11 +2573,11 @@ ROM_END ROM_START( mystgard ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000ae4 - 0x000000-0x04eea7 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x37310f71 - Calculated Checksum 0x37310f71 (OK) - 0x04eea8-0x0dce17 is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000ae4 + 0x000000-0x04eea7 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x37310f71 + Calculated Checksum 0x37310f71 (OK) + 0x04eea8-0x0dce17 is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("Mystic Garden.u7", 0x0000000, 0x0080000, CRC(28d15442) SHA1(ee33017f3efcf688a43ea1d7f2b74b4b9a6d2cae) ) @@ -2592,12 +2592,12 @@ ROM_END ROM_START( orchidms ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b20 - 0x000000-0x0677c7 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x522d283f - Calculated Checksum 0x522d283f (OK) - 0x0677c8-0x13adcb is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0677c8-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b20 + 0x000000-0x0677c7 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x522d283f + Calculated Checksum 0x522d283f (OK) + 0x0677c8-0x13adcb is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0677c8-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0100275v.u7", 0x0000000, 0x0080000, CRC(5d18ae22) SHA1(c10f7a83f51cfe75653ace8066b7dedf07e91b28) ) @@ -2614,11 +2614,11 @@ ROM_END ROM_START( oscara5 ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b80 - 0x000000-0x05d187 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xd11b30fc - Calculated Checksum 0xd11b30fc (OK) - 0x05d188-0x0e1d73 is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000b80 + 0x000000-0x05d187 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xd11b30fc + Calculated Checksum 0xd11b30fc (OK) + 0x05d188-0x0e1d73 is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0200348v.u7", 0x0000000, 0x0080000, CRC(930bdc00) SHA1(36b1a289abebc7cce64e767e201d8f8f7fe80cf2) ) @@ -2633,12 +2633,12 @@ ROM_END ROM_START( pantmag ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d18 - 0x000000-0x06d1ff is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x50122492 - Calculated Checksum 0x50122492 (OK) - 0x06d200-0x195d7b is the non-Checksummed range still containing data but NOT covered by Checksum - 0x06d200-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d18 + 0x000000-0x06d1ff is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x50122492 + Calculated Checksum 0x50122492 (OK) + 0x06d200-0x195d7b is the non-Checksummed range still containing data but NOT covered by Checksum + 0x06d200-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0101046v.u7", 0x0000000, 0x0080000, CRC(6383899d) SHA1(df96af7cb580565715da6e78b83e7ba6832028e7) ) @@ -2658,12 +2658,12 @@ ROM_END ROM_START( partygrs ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d18 - 0x000000-0x0e9b47 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x673ffb0f - Calculated Checksum 0x673ffb0f (OK) - 0x0e9b48-0x1fd2ab is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0e9b48-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d18 + 0x000000-0x0e9b47 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x673ffb0f + Calculated Checksum 0x673ffb0f (OK) + 0x0e9b48-0x1fd2ab is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0e9b48-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "ahg1567.u7", 0x000000, 0x80000, CRC(53047385) SHA1(efe50e8785047986513f2de63d2425ba80417481) ) @@ -2683,12 +2683,12 @@ ROM_END ROM_START( partygrsa ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d18 - 0x000000-0x0a69d3 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xf4a004d3 - Calculated Checksum 0x221d04d3 (BAD) - 0x0a69d4-0x1b953f is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0a69d4-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d18 + 0x000000-0x0a69d3 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xf4a004d3 + Calculated Checksum 0x221d04d3 (BAD) + 0x0a69d4-0x1b953f is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0a69d4-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) // the checksum only covers part of the first 2 roms, marked all as BAD_DUMP because it can't be trusted without a full redump. @@ -2706,12 +2706,12 @@ ROM_END ROM_START( peaflut ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b98 - 0x000000-0x0638d3 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x2ce2619f - Calculated Checksum 0x2ce2619f (OK) - 0x0638d4-0x1dbf8b is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0638d4-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b98 + 0x000000-0x0638d3 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x2ce2619f + Calculated Checksum 0x2ce2619f (OK) + 0x0638d4-0x1dbf8b is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0638d4-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("02j00011.u7", 0x0000000, 0x0080000, CRC(e4497f35) SHA1(7030aba6c17fc391564385f5669e07edc94dca61) ) @@ -2728,12 +2728,12 @@ ROM_END ROM_START( pengpay ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b68 - 0x000000-0x05c71f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x68980cb3 - Calculated Checksum 0x68980cb3 (OK) - 0x05c720-0x1aefcf is the non-Checksummed range still containing data but NOT covered by Checksum - 0x05c720-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b68 + 0x000000-0x05c71f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x68980cb3 + Calculated Checksum 0x68980cb3 (OK) + 0x05c720-0x1aefcf is the non-Checksummed range still containing data but NOT covered by Checksum + 0x05c720-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0200460v.u7", 0x0000000, 0x0080000, CRC(47145744) SHA1(74a186a15537d8b05ce23f37c53f351e8058b0b2) ) @@ -2750,12 +2750,12 @@ ROM_END ROM_START( pengpaya ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b60 - 0x000000-0x05644f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x5bc8a3d6 - Calculated Checksum 0x5bc8a3d6 (OK) - 0x056450-0x1c19f3 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x056450-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b60 + 0x000000-0x05644f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x5bc8a3d6 + Calculated Checksum 0x5bc8a3d6 (OK) + 0x056450-0x1c19f3 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x056450-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0200357v.u7", 0x0000000, 0x0080000, CRC(cb21de26) SHA1(5a730f08db4d91b18f0b5a1f489f1d982b08edcc) ) @@ -2772,12 +2772,12 @@ ROM_END ROM_START( pengpayb ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b68 - 0x000000-0x05d7b7 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xd4f9ba59 - Calculated Checksum 0xd4f9ba59 (OK) - 0x05d7b8-0x1c9acf is the non-Checksummed range still containing data but NOT covered by Checksum - 0x05d7b8-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b68 + 0x000000-0x05d7b7 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xd4f9ba59 + Calculated Checksum 0xd4f9ba59 (OK) + 0x05d7b8-0x1c9acf is the non-Checksummed range still containing data but NOT covered by Checksum + 0x05d7b8-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0200359v.u7", 0x0000000, 0x0080000, CRC(f51c4e02) SHA1(fca30b3ce0d063966df1e878338596d050664695) ) @@ -2797,12 +2797,12 @@ ROM_END ROM_START( pengpayu ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d08 - 0x000000-0x0cd21b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x7dc52ffa - Calculated Checksum 0x7dc52ffa (OK) - 0x0cd21c-0x192ed7 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0cd21c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d08 + 0x000000-0x0cd21b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x7dc52ffa + Calculated Checksum 0x7dc52ffa (OK) + 0x0cd21c-0x192ed7 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0cd21c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "bhi041703.u7", 0x000000, 0x80000, CRC(19d75260) SHA1(798472b1b5d8f5ca99d8bfe57e99a76686f0aa3f) ) @@ -2834,12 +2834,12 @@ ROM_END ROM_START( przfight ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b48 - 0x000000-0x053def is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x97c4e600 - Calculated Checksum 0x97c4e600 (OK) - 0x053df0-0x2a9f7f is the non-Checksummed range still containing data but NOT covered by Checksum - 0x053df0-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b48 + 0x000000-0x053def is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x97c4e600 + Calculated Checksum 0x97c4e600 (OK) + 0x053df0-0x2a9f7f is the non-Checksummed range still containing data but NOT covered by Checksum + 0x053df0-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0100299v.u7", 0x0000000, 0x0080000, CRC(2b1a9678) SHA1(c75de4c76cd934df746040d0515694d92e2fc145) ) @@ -2858,12 +2858,12 @@ ROM_END ROM_START( qcash ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000af4 - 0x000000-0x05d55b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x10b06e83 - Calculated Checksum 0x10b06e83 (OK) - 0x05d55c-0x1a669f is the non-Checksummed range still containing data but NOT covered by Checksum - 0x05d55c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000af4 + 0x000000-0x05d55b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x10b06e83 + Calculated Checksum 0x10b06e83 (OK) + 0x05d55c-0x1a669f is the non-Checksummed range still containing data but NOT covered by Checksum + 0x05d55c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0100706v.u7", 0x0000000, 0x0080000, CRC(591c96eb) SHA1(acd6f02206086d710a92401c618f715b3646d78a) ) @@ -2880,12 +2880,12 @@ ROM_END ROM_START( qnile ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b80 - 0x000000-0x055c83 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x53fa5304 - Calculated Checksum 0x53fa5304 (OK) - 0x055c84-0x16745b is the non-Checksummed range still containing data but NOT covered by Checksum - 0x055c84-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b80 + 0x000000-0x055c83 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x53fa5304 + Calculated Checksum 0x53fa5304 (OK) + 0x055c84-0x16745b is the non-Checksummed range still containing data but NOT covered by Checksum + 0x055c84-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) @@ -2903,12 +2903,12 @@ ROM_END ROM_START( qnilea ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b80 - 0x000000-0x064c4b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xa60cbcfa - Calculated Checksum 0xa60cbcfa (OK) - 0x064c4c-0x172a17 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x064c4c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b80 + 0x000000-0x064c4b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xa60cbcfa + Calculated Checksum 0xa60cbcfa (OK) + 0x064c4c-0x172a17 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x064c4c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0300440v.u7", 0x0000000, 0x0080000, CRC(0076da68) SHA1(ed301c102e88d5b637144ed32042da46780e5b34) ) @@ -2925,12 +2925,12 @@ ROM_END ROM_START( qnileb ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b80 - 0x000000-0x059dff is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xa63a9b3e - Calculated Checksum 0xa63a9b3e (OK) - 0x059e00-0x16b5d7 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x059e00-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b80 + 0x000000-0x059dff is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xa63a9b3e + Calculated Checksum 0xa63a9b3e (OK) + 0x059e00-0x16b5d7 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x059e00-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "0200439v.u7", 0x000000, 0x80000, CRC(d476a893) SHA1(186d6fb1830c33976f2d3c96e4f045ece885dc63) ) @@ -2947,12 +2947,12 @@ ROM_END ROM_START( qnilec ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b80 - 0x000000-0x062913 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x2d52d80f - Calculated Checksum 0x2d52d80f (OK) - 0x062914-0x1740eb is the non-Checksummed range still containing data but NOT covered by Checksum - 0x062914-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b80 + 0x000000-0x062913 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x2d52d80f + Calculated Checksum 0x2d52d80f (OK) + 0x062914-0x1740eb is the non-Checksummed range still containing data but NOT covered by Checksum + 0x062914-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "0300439v.u7", 0x000000, 0x80000, CRC(63f9129e) SHA1(a513fd47d3ca4fe007730a06e5f6ffc2891dc74f) ) @@ -2974,12 +2974,12 @@ ROM_END ROM_START( qnileu ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d08 - 0x000000-0x08ec87 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xb2ac33b8 - Calculated Checksum 0xb2ac33b8 (OK) - 0x08ec88-0x1aca67 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x08ec88-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d08 + 0x000000-0x08ec87 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xb2ac33b8 + Calculated Checksum 0xb2ac33b8 (OK) + 0x08ec88-0x1aca67 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x08ec88-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "ghg409102.u7", 0x000000, 0x80000, CRC(a00ab2cf) SHA1(eb3120fe4b1d0554c224c7646e727e86fd35975e) ) @@ -2996,11 +2996,11 @@ ROM_END ROM_START( qnilemax ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000bb8 - 0x000000-0x06fd6f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xcd901653 - Calculated Checksum 0xcd901653 (OK) - 0x06fd70-0x3864c7 is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000bb8 + 0x000000-0x06fd6f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xcd901653 + Calculated Checksum 0xcd901653 (OK) + 0x06fd70-0x3864c7 is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0401072v.u7", 0x0000000, 0x0080000, CRC(4ac2a82e) SHA1(3fc50e97ad48c57e21a37fbb6142152c72055ad4) ) @@ -3021,12 +3021,12 @@ ROM_END ROM_START( rainwrce ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000bf8 - 0x000000-0x06bb13 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x6c1aaee7 - Calculated Checksum 0x6c1aaee7 (OK) - 0x06bb14-0x367863 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x06bb14-0x3fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000bf8 + 0x000000-0x06bb13 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x6c1aaee7 + Calculated Checksum 0x6c1aaee7 (OK) + 0x06bb14-0x367863 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x06bb14-0x3fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) @@ -3048,12 +3048,12 @@ ROM_END ROM_START( reelrock ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000ba8 - 0x000000-0x062f6f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x67b49a57 - Calculated Checksum 0x67b49a57 (OK) - 0x062f70-0x1a752b is the non-Checksummed range still containing data but NOT covered by Checksum - 0x062f70-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000ba8 + 0x000000-0x062f6f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x67b49a57 + Calculated Checksum 0x67b49a57 (OK) + 0x062f70-0x1a752b is the non-Checksummed range still containing data but NOT covered by Checksum + 0x062f70-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "0100779v.u7", 0x000000, 0x80000, CRC(b60af34f) SHA1(1143380b765db234b3871c0fe04736472fde7de4) ) @@ -3070,12 +3070,12 @@ ROM_END ROM_START( retrsam ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b88 - 0x000000-0x06445b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xb6820a81 - Calculated Checksum 0xb6820a81 (OK) - 0x06445c-0x10203b is the non-Checksummed range still containing data but NOT covered by Checksum - 0x06445c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b88 + 0x000000-0x06445b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xb6820a81 + Calculated Checksum 0xb6820a81 (OK) + 0x06445c-0x10203b is the non-Checksummed range still containing data but NOT covered by Checksum + 0x06445c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("v0400549v.u7", 0x0000000, 0x0080000, CRC(129be82c) SHA1(487639b7d42d6d35a9c48b44d26667c269b5b633) ) @@ -3092,11 +3092,11 @@ ROM_END ROM_START( retrsama ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b88 - 0x000000-0x0590b7 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xa4b725ab - Calculated Checksum 0xa4b725ab (OK) - 0x0590b8-0x0ef623 is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000b88 + 0x000000-0x0590b7 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xa4b725ab + Calculated Checksum 0xa4b725ab (OK) + 0x0590b8-0x0ef623 is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) @@ -3112,11 +3112,11 @@ ROM_END ROM_START( retrsamb ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b88 - 0x000000-0x05889b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xd80cf106 - Calculated Checksum 0xd80cf106 (OK) - 0x05889c-0x0f313b is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000b88 + 0x000000-0x05889b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xd80cf106 + Calculated Checksum 0xd80cf106 (OK) + 0x05889c-0x0f313b is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0200506v.u7", 0x0000000, 0x0080000, CRC(acb913c1) SHA1(eb008b2b3d06f769f1ea1c75b52334e468c5f13c) ) @@ -3129,14 +3129,14 @@ ROM_END ROM_START( sumospin ) - ARISTOCRAT_MK5_BIOS + ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b88 - 0x000000-0x05d92b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x94d3401c - Calculated Checksum 0x94d3401c (OK) - 0x05d92c-0x18f637 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x05d92c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b88 + 0x000000-0x05d92b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x94d3401c + Calculated Checksum 0x94d3401c (OK) + 0x05d92c-0x18f637 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x05d92c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0200606v.u7", 0x0000000, 0x0080000, CRC(c3ec9f97) SHA1(62c886cc794de4b915533729c5ea5a71a4b59108) ) @@ -3153,12 +3153,12 @@ ROM_END ROM_START( sbuk2 ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b98 - 0x000000-0x06ab7f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x874caad2 - Calculated Checksum 0x874caad2 (OK) - 0x06ab80-0x1fffef is the non-Checksummed range still containing data but NOT covered by Checksum - 0x06ab80-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b98 + 0x000000-0x06ab7f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x874caad2 + Calculated Checksum 0x874caad2 (OK) + 0x06ab80-0x1fffef is the non-Checksummed range still containing data but NOT covered by Checksum + 0x06ab80-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0400501v.u7", 0x0000000, 0x0080000, CRC(f025775d) SHA1(71a94f6f17fa7cdcd997b0117b8f4afe21606a69) ) @@ -3175,12 +3175,12 @@ ROM_END ROM_START( sbuk3 ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000ba8 - 0x000000-0x05ead3 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x23d4cb22 - Calculated Checksum 0x23d4cb22 (OK) - 0x05ead4-0x114e33 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x05ead4-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000ba8 + 0x000000-0x05ead3 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x23d4cb22 + Calculated Checksum 0x23d4cb22 (OK) + 0x05ead4-0x114e33 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x05ead4-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0200711v.u7", 0x0000000, 0x0080000, CRC(e056c7db) SHA1(7a555583f750d8275b2ffd25a0efbe370a5ac43c) ) @@ -3197,11 +3197,11 @@ ROM_END ROM_START( swhr2 ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000ae0 - 0x000000-0x041803 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x4449ca76 - Calculated Checksum 0x4449ca76 (OK) - 0x041804-0x0ecbb3 is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000ae0 + 0x000000-0x041803 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x4449ca76 + Calculated Checksum 0x4449ca76 (OK) + 0x041804-0x0ecbb3 is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0200004v.u7", 0x0000000, 0x0080000, CRC(de4d6d77) SHA1(959ffb7d06359870e07cb9d761f0bc0480c45e0c) ) @@ -3220,12 +3220,12 @@ ROM_END ROM_START( swhr2u ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d08 - 0x000000-0x0b31cb is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x0720df2c - Calculated Checksum 0x3dad9905 (BAD) - 0x0b31cc-0x155097 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0b31cc-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d08 + 0x000000-0x0b31cb is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x0720df2c + Calculated Checksum 0x3dad9905 (BAD) + 0x0b31cc-0x155097 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0b31cc-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) // the checksum only covers part of the first 2 roms, marked all as BAD_DUMP because it can't be trusted without a full redump. @@ -3243,11 +3243,11 @@ ROM_END ROM_START( swhr2v ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b68 - 0x000000-0x07a763 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x014df7a2 - Calculated Checksum 0x014df7a2 (OK) - 0x07a764-0x0e360b is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000b68 + 0x000000-0x07a763 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x014df7a2 + Calculated Checksum 0x014df7a2 (OK) + 0x07a764-0x0e360b is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "01j01986.u7", 0x000000, 0x80000, CRC(f51b2faa) SHA1(dbcfdbee92af5f89a8a2611bbc687ee0cc907642) ) @@ -3275,12 +3275,12 @@ ROM_END ROM_START( trstrove ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b98 - 0x000000-0x0638d7 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x7fa3a1a8 - Calculated Checksum 0x7fa3a1a8 (OK) - 0x0638d8-0x158933 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0638d8-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b98 + 0x000000-0x0638d7 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x7fa3a1a8 + Calculated Checksum 0x7fa3a1a8 (OK) + 0x0638d8-0x158933 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0638d8-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("01j00161.u7", 0x0000000, 0x0080000, CRC(07a8b338) SHA1(7508d7d0e3494d355cb773165b240ba876a60eec) ) @@ -3297,12 +3297,12 @@ ROM_END ROM_START( tritreat ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d18 - 0x000000-0x07089b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x56d2b752 - Calculated Checksum 0x56d2b752 (OK) - 0x07089c-0x2903cf is the non-Checksummed range still containing data but NOT covered by Checksum - 0x07089c-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d18 + 0x000000-0x07089b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x56d2b752 + Calculated Checksum 0x56d2b752 (OK) + 0x07089c-0x2903cf is the non-Checksummed range still containing data but NOT covered by Checksum + 0x07089c-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) @@ -3322,12 +3322,12 @@ ROM_END ROM_START( trojhors ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000bb8 - 0x000000-0x06e9f7 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x071faa81 - Calculated Checksum 0x071faa81 (OK) - 0x06e9f8-0x2df4f7 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x06e9f8-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000bb8 + 0x000000-0x06e9f7 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x071faa81 + Calculated Checksum 0x071faa81 (OK) + 0x06e9f8-0x2df4f7 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x06e9f8-0x2fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("01j00851.u7", 0x0000000, 0x0080000, CRC(7be0caf5) SHA1(b83fba7eb4624b3dc56f763b48b7c45fe31f3396) ) @@ -3350,12 +3350,12 @@ ROM_END ROM_START( trpdlght ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d08 - 0x000000-0x0b2d1f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x910fae87 - Calculated Checksum 0x2485ae87 (BAD) - 0x0b2d20-0x15384f is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0b2d20-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d08 + 0x000000-0x0b2d1f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x910fae87 + Calculated Checksum 0x2485ae87 (BAD) + 0x0b2d20-0x15384f is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0b2d20-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) // the checksum only covers part of the first 2 roms, marked all as BAD_DUMP because it can't be trusted without a full redump. @@ -3373,12 +3373,12 @@ ROM_END ROM_START( unicornd ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000bf8 - 0x000000-0x05f36f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x2f8bff86 - Calculated Checksum 0x2f8bff86 (OK) - 0x05f370-0x1d0a3f is the non-Checksummed range still containing data but NOT covered by Checksum - 0x05f370-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000bf8 + 0x000000-0x05f36f is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x2f8bff86 + Calculated Checksum 0x2f8bff86 (OK) + 0x05f370-0x1d0a3f is the non-Checksummed range still containing data but NOT covered by Checksum + 0x05f370-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0100791v.u7", 0x0000000, 0x0080000, CRC(d785d1b3) SHA1(4aa7c61036dd5fe1cdbc6c39a89881f88f3dd148) ) @@ -3408,12 +3408,12 @@ ROM_END ROM_START( wamazon ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b68 - 0x000000-0x052b8b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xc07f695c - Calculated Checksum 0xc07f695c (OK) - 0x052b8c-0x1fffef is the non-Checksummed range still containing data but NOT covered by Checksum (unusual) - 0x052b8c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b68 + 0x000000-0x052b8b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xc07f695c + Calculated Checksum 0xc07f695c (OK) + 0x052b8c-0x1fffef is the non-Checksummed range still containing data but NOT covered by Checksum (unusual) + 0x052b8c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0200285v.u7", 0x0000000, 0x0080000, CRC(bfa21358) SHA1(6b76656401b3dbbace8d4335951468b9885fc7f0) ) @@ -3430,11 +3430,11 @@ ROM_END ROM_START( wamazona ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b68 - 0x000000-0x05c043 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x2c7f1cbb - Calculated Checksum 0x2c7f1cbb (OK) - 0x05c044-0x0f60cb is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000b68 + 0x000000-0x05c043 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x2c7f1cbb + Calculated Checksum 0x2c7f1cbb (OK) + 0x05c044-0x0f60cb is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0200507v.u7", 0x0000000, 0x0080000, CRC(44576def) SHA1(3396460444ceb394c9c88e5fc37ccedcfc4b179c) ) @@ -3448,12 +3448,12 @@ ROM_END ROM_START( wamazonv ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b68 - 0x000000-0x07b2f3 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x7b4d5882 - Calculated Checksum 0x7b4d5882 (OK) - 0x07b2f4-0x11537b is the non-Checksummed range still containing data but NOT covered by Checksum - 0x07b2f4-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b68 + 0x000000-0x07b2f3 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x7b4d5882 + Calculated Checksum 0x7b4d5882 (OK) + 0x07b2f4-0x11537b is the non-Checksummed range still containing data but NOT covered by Checksum + 0x07b2f4-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) @@ -3471,11 +3471,11 @@ ROM_END ROM_START( wildbill ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000ad8 - 0x000000-0x054e6b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xd6b20386 - Calculated Checksum 0xd6b20386 (OK) - 0x054e6c-0x0ec99f is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000ad8 + 0x000000-0x054e6b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xd6b20386 + Calculated Checksum 0xd6b20386 (OK) + 0x054e6c-0x0ec99f is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0100297v.u7", 0x0000000, 0x0080000, CRC(e3117ab7) SHA1(c13912f524f1c1d373adb6382ceddd1bc18f7f02) ) @@ -3490,12 +3490,12 @@ ROM_END ROM_START( wcougar ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000adc - 0x000000-0x043573 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x0a061a1a - Calculated Checksum 0x0a061a1a (OK) - 0x043574-0x1061fb is the non-Checksummed range still containing data but NOT covered by Checksum - 0x043574-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000adc + 0x000000-0x043573 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x0a061a1a + Calculated Checksum 0x0a061a1a (OK) + 0x043574-0x1061fb is the non-Checksummed range still containing data but NOT covered by Checksum + 0x043574-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0100167v.u7", 0x0000000, 0x0080000, CRC(47154679) SHA1(21749fbaa60f9bf1db43bdd272e6628ae73bf759) ) @@ -3515,12 +3515,12 @@ ROM_END ROM_START( wcougaru ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d08 - 0x000000-0x0b0d5b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0xdfe9eb92 - Calculated Checksum 0xdfe9eb92 (OK) - 0x0b0d5c-0x153803 is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0b0d5c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000d08 + 0x000000-0x0b0d5b is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0xdfe9eb92 + Calculated Checksum 0xdfe9eb92 (OK) + 0x0b0d5c-0x153803 is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0b0d5c-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "nhg029604.u7", 0x000000, 0x80000, CRC(7ada053f) SHA1(5102b0b9db505454624750a3fd6db455682538f3) ) @@ -3537,14 +3537,14 @@ ROM_END ROM_START( wthing ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000b74 - 0x000000-0x0673cb is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x89dd307a - Calculated Checksum 0x89dd307a (OK) - 0x0673cc-0x1b367b is the non-Checksummed range still containing data but NOT covered by Checksum - 0x0673cc-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included + Checksum code found at 0x000b74 + 0x000000-0x0673cb is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x89dd307a + Calculated Checksum 0x89dd307a (OK) + 0x0673cc-0x1b367b is the non-Checksummed range still containing data but NOT covered by Checksum + 0x0673cc-0x1fffff is the non-Checksummed range if the additional vectors? at the end are included */ - + ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD("0101158v.u7", 0x0000000, 0x0080000, CRC(eb402ffb) SHA1(49ef6ca2503a6e785f62cb29e505e5c2ba019e37) ) ROM_LOAD32_WORD("0101158v.u11", 0x0000002, 0x0080000, CRC(61d22f2e) SHA1(b836e5afbd5bb14ae68e100a6042f1953ed57a21) ) @@ -3560,11 +3560,11 @@ ROM_END ROM_START( wtiger ) ARISTOCRAT_MK5_BIOS /* - Checksum code found at 0x000d30 - 0x000000-0x060227 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) - Expected Checksum 0x61da8e77 - Calculated Checksum 0x61da8e77 (OK) - 0x060228-0x0d61cf is the non-Checksummed range (unusual endpoint) + Checksum code found at 0x000d30 + 0x000000-0x060227 is the Checksummed Range (excluding 0x000020-0x000027 where Checksum is stored) + Expected Checksum 0x61da8e77 + Calculated Checksum 0x61da8e77 (OK) + 0x060228-0x0d61cf is the non-Checksummed range (unusual endpoint) */ ROM_REGION( 0x400000, "game_prg", ROMREGION_ERASEFF ) ROM_LOAD32_WORD( "0200954v.u7", 0x000000, 0x80000, CRC(752e54c5) SHA1(9317544a7cf2d9bf29347d31fe72331fc3d018ef) ) diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp index 9887fc59f2a..1ba39870c35 100644 --- a/src/mame/drivers/aristmk6.cpp +++ b/src/mame/drivers/aristmk6.cpp @@ -46,7 +46,7 @@ public: u8 irl0pend, irl0en; u8 irl1pend, irl1en; - u8 irl2pend, irl2en; // UARTs ? + u8 irl2pend, irl2en; // UARTs ? u8 irl3pend0, irl3en0; u8 irl3pend1, irl3en1; void testIrq(); @@ -168,7 +168,7 @@ uint32_t aristmk6_state::screen_update_aristmk6(screen_device &screen, bitmap_rg uint32_t pix1; int col; - + pix1 = pix & 0xffffffff; col = 0; if (pix1) col = 1; diff --git a/src/mame/drivers/bionicc.cpp b/src/mame/drivers/bionicc.cpp index 0f13fb4e4e3..c5e74a50220 100644 --- a/src/mame/drivers/bionicc.cpp +++ b/src/mame/drivers/bionicc.cpp @@ -20,7 +20,7 @@ Horizontal scan rate: 15.606kHz Vertical scan rate: 60.024Hz - + pixel clock: 6.000MHz, 166ns per pixel htotal: 64.076us, 386 pixels @@ -373,7 +373,7 @@ static MACHINE_CONFIG_START( bionicc, bionicc_state ) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bionicc_state, bionicc_scanline, "screen", 0, 1) /* Protection MCU Intel C8751H-88 runs at 24MHz / 4 = 6MHz */ - + MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz / 4) /* EXO3 C,B=GND, A=5V ==> Divisor 2^2 */ MCFG_CPU_PROGRAM_MAP(sound_map) /* FIXME: interrupt timing diff --git a/src/mame/drivers/clshroad.cpp b/src/mame/drivers/clshroad.cpp index af0f87f3e8f..82967171193 100644 --- a/src/mame/drivers/clshroad.cpp +++ b/src/mame/drivers/clshroad.cpp @@ -372,7 +372,7 @@ MACHINE_CONFIG_END * 2 x NEC D780C ** 18.??? MHz clock - + ***************************************************************************/ ROM_START( firebatl ) diff --git a/src/mame/drivers/concept.cpp b/src/mame/drivers/concept.cpp index beded1240e8..97ba4ffbf5d 100644 --- a/src/mame/drivers/concept.cpp +++ b/src/mame/drivers/concept.cpp @@ -306,10 +306,10 @@ ROM_START( concept ) // the source code) ROM_LOAD16_WORD("cc.prm", 0x010000, 0x2000, CRC(b5a87dab) SHA1(0da59af6cfeeb38672f71731527beac323d9c3d6)) #endif - + ROM_REGION16_BE(0x2000, "macsbug", 0) - ROM_LOAD16_BYTE( "mb20h.bin", 0x000000, 0x001000, CRC(aa357112) SHA1(88211e5f59887928c557c27cdea674f48bf8eaf7) ) - ROM_LOAD16_BYTE( "mb20l.bin", 0x000001, 0x001000, CRC(b4b59de9) SHA1(3e8b8b5950b5359203c054f94af1fc5b8f0495b9) ) + ROM_LOAD16_BYTE( "mb20h.bin", 0x000000, 0x001000, CRC(aa357112) SHA1(88211e5f59887928c557c27cdea674f48bf8eaf7) ) + ROM_LOAD16_BYTE( "mb20l.bin", 0x000001, 0x001000, CRC(b4b59de9) SHA1(3e8b8b5950b5359203c054f94af1fc5b8f0495b9) ) ROM_END /* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */ diff --git a/src/mame/drivers/crystal.cpp b/src/mame/drivers/crystal.cpp index 2069bd38f23..6dc5ec1e7ae 100644 --- a/src/mame/drivers/crystal.cpp +++ b/src/mame/drivers/crystal.cpp @@ -403,7 +403,7 @@ void crystal_state::TimerStart(int which) attotime period = attotime::from_hz(43000000) * ((PD + 1) * (TCV + 1)); m_Timer[which]->adjust(period); -// printf("timer %d start, PD = %x TCV = %x period = %s\n", which, PD, TCV, period.as_string()); +// printf("timer %d start, PD = %x TCV = %x period = %s\n", which, PD, TCV, period.as_string()); } TIMER_CALLBACK_MEMBER(crystal_state::Timercb) @@ -438,7 +438,7 @@ void crystal_state::Timer_w( address_space &space, int which, uint32_t data, uin { // Timer stop m_Timer[which]->adjust(attotime::never); -// printf("timer %d stop\n", which); +// printf("timer %d stop\n", which); } } } @@ -720,15 +720,15 @@ READ32_MEMBER(crystal_state::crzyddz2_key_r) uint8_t data = 0x3f; for (int i = 0; i < sizeof(key_names)/sizeof(key_names[0]); ++i) if (!BIT(mux,i)) - data = ioport(key_names[i])->read(); + data = ioport(key_names[i])->read(); /* -crzyddz2 in out - 00 40 - 40 00 - c0 80 +crzyddz2 in out + 00 40 + 40 00 + c0 80 */ -// m_crzyddz2_prot = (m_PIO >> 8) & 0xc0) ^ 0x40; +// m_crzyddz2_prot = (m_PIO >> 8) & 0xc0) ^ 0x40; m_crzyddz2_prot = (machine().rand() & 0xc0); return 0xffffff00 | data | m_crzyddz2_prot; @@ -1242,7 +1242,7 @@ INPUT_PORTS_END static INPUT_PORTS_START(crzyddz2) - PORT_START("P1_P2") // 1500002 & 1500000 + PORT_START("P1_P2") // 1500002 & 1500000 PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) // up PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) // down (next secret code) PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) // left (inc secret code) @@ -1515,8 +1515,8 @@ ROM_START( crzyddz2 ) ROM_LOAD( "rom.u48", 0x000000, 0x1000000, CRC(0f3a1987) SHA1(6cad943846c79db31226676c7391f32216cfff79) ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) - ROM_COPY( "user1", 0x000000, 0x000000, 0x1000000 ) // copy flash here - ROM_LOAD( "27c322.u49", 0x000000, 0x0200000, CRC(b3177f39) SHA1(2a28bf8045bd2e053d88549b79fbc11f30ef9a32) ) // 1ST AND 2ND HALF IDENTICAL + ROM_COPY( "user1", 0x000000, 0x000000, 0x1000000 ) // copy flash here + ROM_LOAD( "27c322.u49", 0x000000, 0x0200000, CRC(b3177f39) SHA1(2a28bf8045bd2e053d88549b79fbc11f30ef9a32) ) // 1ST AND 2ND HALF IDENTICAL ROM_CONTINUE( 0x000000, 0x0200000 ) ROM_REGION( 0x4280, "pic", 0 ) // hy04 @@ -1539,7 +1539,7 @@ ROM_START( menghong ) ROM_LOAD( "rom.u48", 0x000000, 0x1000000, CRC(e24257c4) SHA1(569d79a61ff6d35100ba5727069363146df9e0b7) ) ROM_REGION( 0x1000000, "maincpu", 0 ) - ROM_COPY( "user1", 0x000000, 0x000000, 0x1000000 ) // copy flash here + ROM_COPY( "user1", 0x000000, 0x000000, 0x1000000 ) // copy flash here ROM_LOAD( "060511_08-01-18.u49", 0x000000, 0x0200000, CRC(b0c12107) SHA1(b1753757bbdb7d996df563ac6abdc6b46676704b) ) // 27C160 ROM_REGION( 0x4280, "pic", 0 ) // hy04 diff --git a/src/mame/drivers/didact.cpp b/src/mame/drivers/didact.cpp index 617ea7853c9..3a71f1a790d 100644 --- a/src/mame/drivers/didact.cpp +++ b/src/mame/drivers/didact.cpp @@ -9,12 +9,12 @@ * Esselte 100 and the Candela computer for the swedish schools to educate the students in assembly programming * and BASIC for electro mechanical applications such as stepper motors, simple process control, buttons * and LED:s. Didact designs were marketed by Esselte Studium to the swedish schools. The Candela computer - * was designed to be the big breakthough and developed by Candela Data AB, "a Didact Company". The Candela - * system was based around a main unit that could run OS-9 or Flex and a terminal unit that had a propietary + * was designed to be the big breakthough and developed by Candela Data AB, "a Didact Company". The Candela + * system was based around a main unit that could run OS-9 or Flex and a terminal unit that had a propietary * software including CDBASIC. The Candela system lost the battle of the swedish schools to * the Compis computer by TeleNova which was based on CP/M initially. Later both lost to IBM PC as we know. * Candela Data continued to sell their system to the swedish industry without major successes despite great - * innovation and spririt. + * innovation and spririt. * * The Esselte 1000 was an educational package based on Apple II plus software and litterature * but the relation to Didact is at this point unknown so it is probably a pure Esselte software production. @@ -30,10 +30,10 @@ * TODO: * Didact designs: mp68a, md6802, Modulab, Esselte 100, can09t, can09 * -------------------------------------------------------------------------- - * - Add PCB layouts OK OK OK OK - * - Dump ROM:s, OK OK rev2 OK OK - * - Keyboard OK OK rev2 - * - Display/CRT OK OK OK + * - Add PCB layouts OK OK OK OK + * - Dump ROM:s, OK OK rev2 OK OK + * - Keyboard OK OK rev2 + * - Display/CRT OK OK OK * - Clickable Artwork RQ RQ * - Sound NA NA * - Cassette i/f OK @@ -53,7 +53,7 @@ #include "video/mc6845.h" // For candela #include "machine/wd_fdc.h" // For candela #include "machine/clock.h" // For candela -#include "machine/ram.h" // For candela +#include "machine/ram.h" // For candela #include "video/dm9368.h" // For the mp68a #include "machine/74145.h" // For the md6802 and e100 // Features @@ -66,7 +66,7 @@ #define VERBOSE 0 #define LOGPRINT(x) do { if (VERBOSE) logerror x; } while (0) -#define LOG(x) LOGPRINT(x) +#define LOG(x) LOGPRINT(x) #define LOGSCAN(x) {} #define LOGSER(x) {} #define LOGSCREEN(x) {} @@ -839,7 +839,7 @@ ADDRESS_MAP_END * +----------------------------------+-------+------------------+ +----------+-------+-------+---------+--+----------+-------+ * */ -/* +/* * Candela Terminal * TODO: * - Map additional PIA:s on the ROM board @@ -991,15 +991,15 @@ protected: }; void can09_state::machine_reset() -{ - LOG(("%s()\n", FUNCNAME)); +{ + LOG(("%s()\n", FUNCNAME)); m_bank1->set_entry(0); } void can09_state::machine_start() -{ - LOG(("%s()\n", FUNCNAME)); - m_bank1->configure_entries(0, 8, m_ram->pointer(), 0x8000); +{ + LOG(("%s()\n", FUNCNAME)); + m_bank1->configure_entries(0, 8, m_ram->pointer(), 0x8000); } uint32_t can09_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -1012,7 +1012,7 @@ uint32_t can09_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, #endif LOGSCREEN(("%s()\n", FUNCNAME)); - // vramad = 0; + // vramad = 0; for (int row = 0; row < 72 * 8; row += 8) { for (int col = 0; col < 64 * 8; col += 8) @@ -1026,17 +1026,17 @@ uint32_t can09_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, /* plot the character */ for (y = 0; y < 8; y++) { - // if (VERBOSE && charcode != 0x20 && charcode != 0) LOGSCREEN(("\n %02x: ", *chardata)); + // if (VERBOSE && charcode != 0x20 && charcode != 0) LOGSCREEN(("\n %02x: ", *chardata)); for (x = 0; x < 8; x++) { - // if (VERBOSE && charcode != 0x20 && charcode != 0) LOGSCREEN((" %02x: ", *chardata)); + // if (VERBOSE && charcode != 0x20 && charcode != 0) LOGSCREEN((" %02x: ", *chardata)); bitmap.pix16(row + y, col + x) = x & 1; //(*chardata & (1 << x)) ? 1 : 0; } - // chardata++; + // chardata++; } - // vramad++; + // vramad++; } - // if (VERBOSE && charcode != 0x20 && charcode != 0) LOGSCREEN(("\n")); + // if (VERBOSE && charcode != 0x20 && charcode != 0) LOGSCREEN(("\n")); } return 0; @@ -1061,9 +1061,9 @@ READ8_MEMBER( can09_state::pia1_B_r ) WRITE8_MEMBER( can09_state::pia1_B_w ) { - // UINT8 *RAM = memregion("maincpu")->base(); + // UINT8 *RAM = memregion("maincpu")->base(); LOG(("%s(%02x)\n", FUNCNAME, data)); - // membank("bank1")->set_entry((data & 0x70) >> 4); + // membank("bank1")->set_entry((data & 0x70) >> 4); m_bank1->set_entry((data & 0x70) >> 4); #if 0 switch (data & 0x70){ @@ -1099,10 +1099,10 @@ static ADDRESS_MAP_START( can09_map, AS_PROGRAM, 8, can09_state ) /* * Port A=0x18 B=0x20 erase 0-7fff * Port A=0x18 B=0x30 erase 0-7fff - * Port A=0x18 B=0x00 + * Port A=0x18 B=0x00 * Port A=0x10 B= */ -// AM_RANGE(0x0000, 0x7fff) AM_RAM +// AM_RANGE(0x0000, 0x7fff) AM_RAM AM_RANGE(0x0000, 0x7fff) AM_RAM AM_RAMBANK("bank1") AM_RANGE(0xe020, 0xe020) AM_DEVWRITE("crtc", h46505_device, address_w) AM_RANGE(0xe021, 0xe021) AM_DEVWRITE("crtc", h46505_device, register_w) @@ -1408,25 +1408,25 @@ static MACHINE_CONFIG_START( can09, can09_state ) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(can09_state, crtc_update_row) #endif - /* Setup loop from data table in ROM: 0xFFCB 0xE020 (CRTC register number), 0xFFD0 0xE021 (CRTC register value) - Reg Value Comment - 0x00 0x55 Horizontal Total number of characters, - 0x01 0x40 Horizontal Displayed number of characters - 0x02 0x43 Horizontal Sync Position, character number - 0x03 0x03 Horizontal Sync width, number of charcters - 0x04 0x50 Vertical Total number of characters - 0x05 0x09 Vertical Total Adjust number of characters - 0x06 0x48 Vertical Displayed number of characters - 0x07 0x4B Vertical Sync Position, character number - 0x08 0x00 Interlace Mode/Scew, Non-Interlaced - 0x09 0x03 Max Scan Line Address Register - 0x0A 0x00 Cursor Start - 0x0B 0x0A Cursor End - 0x0C 0x00 Start Address hi - 0x0D 0x00 Start Address lo - 0x0E 0x00 Cursor hi - 0x0F 0x00 Cursor lo - Note - no init of Light Pen registers + /* Setup loop from data table in ROM: 0xFFCB 0xE020 (CRTC register number), 0xFFD0 0xE021 (CRTC register value) + Reg Value Comment + 0x00 0x55 Horizontal Total number of characters, + 0x01 0x40 Horizontal Displayed number of characters + 0x02 0x43 Horizontal Sync Position, character number + 0x03 0x03 Horizontal Sync width, number of charcters + 0x04 0x50 Vertical Total number of characters + 0x05 0x09 Vertical Total Adjust number of characters + 0x06 0x48 Vertical Displayed number of characters + 0x07 0x4B Vertical Sync Position, character number + 0x08 0x00 Interlace Mode/Scew, Non-Interlaced + 0x09 0x03 Max Scan Line Address Register + 0x0A 0x00 Cursor Start + 0x0B 0x0A Cursor End + 0x0C 0x00 Start Address hi + 0x0D 0x00 Start Address lo + 0x0E 0x00 Cursor hi + 0x0F 0x00 Cursor lo + Note - no init of Light Pen registers */ @@ -1629,7 +1629,7 @@ ROM_START( can09t ) ROM_LOAD( "ic2-mon58b-c8d7.bin", 0x0000, 0x8000, CRC(7eabfec6) SHA1(e08e2349035389b441227df903aa54f4c1e4a337) ) /* Programmable logic for the CAN09 1.4 PCB */ ROM_REGION(0x1000, "plas", 0) - ROM_LOAD( "ic10-21.1.bin", 0x0000, 0x20, CRC(b75ac72d) SHA1(689363200035b11a823d17a8d717f313eeefc3bf) ) + ROM_LOAD( "ic10-21.1.bin", 0x0000, 0x20, CRC(b75ac72d) SHA1(689363200035b11a823d17a8d717f313eeefc3bf) ) ROM_END ROM_START( can09 ) diff --git a/src/mame/drivers/dynduke.cpp b/src/mame/drivers/dynduke.cpp index 59cc165c9e5..2dcc64d7a39 100644 --- a/src/mame/drivers/dynduke.cpp +++ b/src/mame/drivers/dynduke.cpp @@ -19,7 +19,7 @@ There is a country code byte in the program to select between Seibu Kaihatsu/Fabtek/Taito licenses. - The Double Dynamites is an updated co-op version sporting different + The Double Dynamites is an updated co-op version sporting different enemy patterns and drops. Emulation by Bryan McPhail, mish@tendril.co.uk diff --git a/src/mame/drivers/fccpu30.cpp b/src/mame/drivers/fccpu30.cpp index 64b7dad0959..ffdab965674 100644 --- a/src/mame/drivers/fccpu30.cpp +++ b/src/mame/drivers/fccpu30.cpp @@ -201,11 +201,11 @@ #define VERBOSE 0 #define LOGPRINT(x) { do { if (VERBOSE) logerror x; } while (0); } -#define LOG(x) {} LOGPRINT(x) -#define LOGINIT(x) {} LOGPRINT(x) -#define LOGR(x) {} -#define LOGSETUP(x) {} -#define LOGINT(x) {} +#define LOG(x) {} LOGPRINT(x) +#define LOGINIT(x) {} LOGPRINT(x) +#define LOGR(x) {} +#define LOGSETUP(x) {} +#define LOGINT(x) {} #if VERBOSE >= 2 #define logerror printf #endif @@ -306,16 +306,16 @@ static ADDRESS_MAP_START (cpu30_mem, AS_PROGRAM, 32, cpu30_state) ADDRESS_MAP_UNMAP_HIGH AM_RANGE (0x00000000, 0x00000007) AM_ROM AM_READ (bootvect_r) /* ROM mirror just during reset */ AM_RANGE (0x00000000, 0x00000007) AM_RAM AM_WRITE (bootvect_w) /* After first write we act as RAM */ -// AM_RANGE (0x00000008, 0x003fffff) AM_RAM /* RAM installed in machine start */ +// AM_RANGE (0x00000008, 0x003fffff) AM_RAM /* RAM installed in machine start */ AM_RANGE (0xff000000, 0xff7fffff) AM_ROM AM_REGION("roms", 0x000000) AM_RANGE (0xff800c00, 0xff800dff) AM_DEVREADWRITE8("pit1", pit68230_device, read, write, 0xffffffff) AM_RANGE (0xff800e00, 0xff800fff) AM_DEVREADWRITE8("pit2", pit68230_device, read, write, 0xffffffff) AM_RANGE (0xff802000, 0xff8021ff) AM_DEVREADWRITE8("duscc", duscc68562_device, read, write, 0xffffffff) /* Port 1&2 - Dual serial port DUSCC */ AM_RANGE (0xff802200, 0xff8023ff) AM_DEVREADWRITE8("duscc2", duscc68562_device, read, write, 0xffffffff) /* Port 3&4 - Dual serial port DUSCC */ AM_RANGE (0xff803000, 0xff8031ff) AM_DEVREADWRITE8("rtc", rtc72423_device, read, write, 0xffffffff) -// AM_RANGE (0xff803400, 0xff8035ff) AM_DEVREADWRITE8("scsi", mb87033_device, read, write, 0xffffffff) /* TODO: implement MB87344 SCSI device */ +// AM_RANGE (0xff803400, 0xff8035ff) AM_DEVREADWRITE8("scsi", mb87033_device, read, write, 0xffffffff) /* TODO: implement MB87344 SCSI device */ AM_RANGE (0xff803400, 0xff8035ff) AM_READWRITE8(scsi_r, scsi_w, 0x000000ff) /* mock driver to log calls to device */ -// AM_RANGE (0xff803800, 0xff80397f) AM_DEVREADWRITE8("fdc", wd37c65c_device, read, write, 0xffffffff) /* TODO: implement WD3/C65C fdc controller */ +// AM_RANGE (0xff803800, 0xff80397f) AM_DEVREADWRITE8("fdc", wd37c65c_device, read, write, 0xffffffff) /* TODO: implement WD3/C65C fdc controller */ AM_RANGE (0xff803800, 0xff80397f) AM_READWRITE8(fdc_r, fdc_w, 0x000000ff) /* mock driver to log calls to device */ AM_RANGE (0xff803980, 0xff8039ff) AM_READ8(slot1_status_r, 0x000000ff) AM_RANGE (0xffc00000, 0xffcfffff) AM_RAM AM_SHARE ("nvram") /* On-board SRAM with battery backup (nvram) */ @@ -354,7 +354,7 @@ void cpu30_state::machine_reset () m_sysrom = (uint32_t*)(memregion ("roms")->base () + 0x800000); } -/* setup board ID */ +/* setup board ID */ DRIVER_INIT_MEMBER( cpu30_state, cpu30x ) { LOGINIT(("%s\n", FUNCNAME)); m_board_id = 0x50; } DRIVER_INIT_MEMBER( cpu30_state, cpu30xa ) { LOGINIT(("%s\n", FUNCNAME)); m_board_id = 0x50; } DRIVER_INIT_MEMBER( cpu30_state, cpu30za ) { LOGINIT(("%s\n", FUNCNAME)); m_board_id = 0x50; } @@ -363,7 +363,7 @@ DRIVER_INIT_MEMBER( cpu30_state, cpu30be8 ) { LOGINIT(("%s\n", FUNCNAME)); m_ DRIVER_INIT_MEMBER( cpu30_state, cpu30be16 ) { LOGINIT(("%s\n", FUNCNAME)); m_board_id = 0x50; } DRIVER_INIT_MEMBER( cpu30_state, cpu30lite4 ) { LOGINIT(("%s\n", FUNCNAME)); m_board_id = 0x50; } DRIVER_INIT_MEMBER( cpu30_state, cpu30lite8 ) { LOGINIT(("%s\n", FUNCNAME)); m_board_id = 0x50; } -DRIVER_INIT_MEMBER( cpu30_state, cpu33 ) { LOGINIT(("%s\n", FUNCNAME)); m_board_id = 0x68; } // 0x60 skips FGA prompt +DRIVER_INIT_MEMBER( cpu30_state, cpu33 ) { LOGINIT(("%s\n", FUNCNAME)); m_board_id = 0x68; } // 0x60 skips FGA prompt /* Mock FDC driver */ READ8_MEMBER (cpu30_state::fdc_r){ @@ -524,13 +524,13 @@ READ8_MEMBER (cpu30_state::board_mem_id_rd) { case (1024 * 1024 * 32): sz = 0; break; case (1024 * 1024 * 16): sz = 1; break; - case (1024 * 1024 * 8): sz = 2; break; - case (1024 * 1024 * 4): sz = 3; break; - case (1024 * 1024 * 2): sz = 4; break; - case (1024 * 1024 * 1): sz = 5; break; - case (1024 * 512 * 1): sz = 6; break; - case (1024 * 256 * 1): sz = 7; break; - default: + case (1024 * 1024 * 8): sz = 2; break; + case (1024 * 1024 * 4): sz = 3; break; + case (1024 * 1024 * 2): sz = 4; break; + case (1024 * 1024 * 1): sz = 5; break; + case (1024 * 512 * 1): sz = 6; break; + case (1024 * 256 * 1): sz = 7; break; + default: logerror("No supported RAM size, telling VMEPROM 4Mb\n"); sz = 4; } @@ -550,13 +550,13 @@ READ8_MEMBER (cpu30_state::board_mem_id_rd) // return 0x56;// CPU-30, 1Mb, 36MHz // return 0x53;// CPU-30, 4Mb, 36MHz // return 0x57;// CPU-30, 4Mb, 36MHz - // return 0x48 + sz;// none - // return 0x38 + sz;// none - // return 0x28 + sz;// none - // return 0x18 + sz;// CPU-23 p1 - // return 0x10 + sz;// CPU-22 p4 - // return 0x20 + sz;// p1: Wait until hard disk is up to speed - // printf("SIZE:%02x\n", sz); + // return 0x48 + sz;// none + // return 0x38 + sz;// none + // return 0x28 + sz;// none + // return 0x18 + sz;// CPU-23 p1 + // return 0x10 + sz;// CPU-22 p4 + // return 0x20 + sz;// p1: Wait until hard disk is up to speed + // printf("SIZE:%02x\n", sz); LOG(("- Board ID:%02x Size:%02x\n", m_board_id, sz)); return m_board_id + sz; } @@ -730,7 +730,7 @@ static MACHINE_CONFIG_DERIVED( cpu30x, cpu30 ) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(XTAL_16_777216MHz) /* 16.7 MHz from description, crystal needs verification */ -// MCFG_DEVICE_REMOVE("") +// MCFG_DEVICE_REMOVE("") // dual ported ram MCFG_RAM_MODIFY(RAM_TAG) @@ -796,10 +796,10 @@ MACHINE_CONFIG_END /* SYS68K/CPU-30Lite/4 68030 CPU, 25 MHz, 4 Mbyte shared DRAM, 4 Mbyte Flash, 4 serial ports, 32-bit VMEbus interface, VMEPROM firmware. */ static MACHINE_CONFIG_DERIVED( cpu30lite4, cpu30zbe ) // Enable these when added to main config -// MCFG_DEVICE_REMOVE("fpu") -// MCFG_DEVICE_REMOVE("scsi") -// MCFG_DEVICE_REMOVE("eth") -// MCFG_DEVICE_REMOVE("fdc") +// MCFG_DEVICE_REMOVE("fpu") +// MCFG_DEVICE_REMOVE("scsi") +// MCFG_DEVICE_REMOVE("eth") +// MCFG_DEVICE_REMOVE("fdc") // dual ported ram MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("4M") @@ -842,12 +842,12 @@ ROM_START (nodump) ROM_END /* These needs reality check as they has 1Mb of RAM which is not a suitable size for later CPU_30:s */ -#define rom_fccpu30x rom_fccpu30 -#define rom_fccpu30xa rom_fccpu30 -#define rom_fccpu30za rom_fccpu30 +#define rom_fccpu30x rom_fccpu30 +#define rom_fccpu30xa rom_fccpu30 +#define rom_fccpu30za rom_fccpu30 -#define rom_fccpu30zbe rom_fccpu30 -#define rom_fccpu30be8 rom_fccpu30 +#define rom_fccpu30zbe rom_fccpu30 +#define rom_fccpu30be8 rom_fccpu30 #define rom_fccpu30be16 rom_fccpu30 /* These needs dumps */ @@ -855,7 +855,7 @@ ROM_END #define rom_fccpu30lite8 rom_nodump /* These are most likelly wrong, needs dump */ -#define rom_fccpu30senr rom_nodump +#define rom_fccpu30senr rom_nodump #define rom_fccpu30senr501 rom_nodump /* diff --git a/src/mame/drivers/fcscsi.cpp b/src/mame/drivers/fcscsi.cpp index 5233e968010..580911f9962 100644 --- a/src/mame/drivers/fcscsi.cpp +++ b/src/mame/drivers/fcscsi.cpp @@ -138,7 +138,7 @@ static ADDRESS_MAP_START (fcscsi1_mem, AS_PROGRAM, 16, fcscsi1_state) AM_RANGE (0x002000, 0x01ffff) AM_RAM /* Dual Ported RAM */ AM_RANGE (0xe00000, 0xe7ffff) AM_ROM /* System EPROM Area 32Kb DEBUGGER supplied */ AM_RANGE (0xd00000, 0xd0003f) AM_DEVREADWRITE8 ("pit", pit68230_device, read, write, 0x00ff) -// AM_RANGE (0xc40000, 0xc4001f) AM_DEVREADWRITE8("scsi", ncr5386_device, read, write, 0x00ff) /* SCSI Controller interface - device support not yet available*/ +// AM_RANGE (0xc40000, 0xc4001f) AM_DEVREADWRITE8("scsi", ncr5386_device, read, write, 0x00ff) /* SCSI Controller interface - device support not yet available*/ AM_RANGE (0xc40000, 0xc4001f) AM_READWRITE8 (scsi_r, scsi_w, 0x00ff) AM_RANGE (0xc80000, 0xc800ff) AM_DEVREADWRITE("mc68450", hd63450_device, read, write) /* DMA Controller interface */ AM_RANGE (0xcc0000, 0xcc0007) AM_DEVREADWRITE8("fdc", wd1772_t, read, write, 0x00ff) /* Floppy Controller interface */ diff --git a/src/mame/drivers/fidel6502.cpp b/src/mame/drivers/fidel6502.cpp index 81e655a07b5..266788f68ee 100644 --- a/src/mame/drivers/fidel6502.cpp +++ b/src/mame/drivers/fidel6502.cpp @@ -424,7 +424,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(irq_on) { m_maincpu->set_input_line(M6502_IRQ_LINE, ASSERT_LINE); } TIMER_DEVICE_CALLBACK_MEMBER(irq_off) { m_maincpu->set_input_line(M6502_IRQ_LINE, CLEAR_LINE); } - + // CSC, SU9, RSC void csc_prepare_display(); DECLARE_READ8_MEMBER(csc_speech_r); @@ -879,7 +879,7 @@ READ8_MEMBER(fidel6502_state::fexcel_ttl_r) WRITE8_MEMBER(fidel6502_state::fdesdis_control_w) { uint8_t q3_old = m_led_select & 8; - + // a0-a2,d7: 74259 uint8_t mask = 1 << offset; m_led_select = (m_led_select & ~mask) | ((data & 0x80) ? mask : 0); @@ -904,7 +904,7 @@ WRITE8_MEMBER(fidel6502_state::fdesdis_control_w) for (int i = 0; i < 4; i++) m_display_state[i+2] = m_7seg_data >> (8*i) & 0xff; } - + m_display_maxy += 4; set_display_segmask(0x3c, 0x7f); display_update(); diff --git a/src/mame/drivers/hazeltin.cpp b/src/mame/drivers/hazeltin.cpp index 79fe88ba13d..b820ca20a3c 100644 --- a/src/mame/drivers/hazeltin.cpp +++ b/src/mame/drivers/hazeltin.cpp @@ -2,16 +2,16 @@ // copyright-holders:Ryan Holtz /*************************************************************************** - Hazeltine 1500 - original machine (c) 1977 Hazeltine Corporation + Hazeltine 1500 + original machine (c) 1977 Hazeltine Corporation - perliminary driver by Ryan Holtz + perliminary driver by Ryan Holtz TODO: - pretty much everything References: - [1]: Hazeltine_1500_Series_Maintenance_Manual_Dec77.pdf, on Bitsavers + [1]: Hazeltine_1500_Series_Maintenance_Manual_Dec77.pdf, on Bitsavers ****************************************************************************/ @@ -30,39 +30,39 @@ References: #include "machine/dm9334.h" #include "machine/kb3600.h" -#define CPU_TAG "maincpu" -#define UART_TAG "uart" -#define BAUDGEN_TAG "baudgen" -#define KBDC_TAG "ay53600" -#define CHARRAM_TAG "chrram" -#define CHARROM_TAG "chargen" -#define BAUDPORT_TAG "baud" -#define MISCPORT_TAG "misc" -#define MISCKEYS_TAG "misc_keys" -#define SCREEN_TAG "screen" -#define TMS3409A_TAG "u67" -#define TMS3409B_TAG "u57" -#define DOTCLK_TAG "dotclk" -#define DOTCLK_DISP_TAG "dotclk_dispatch" +#define CPU_TAG "maincpu" +#define UART_TAG "uart" +#define BAUDGEN_TAG "baudgen" +#define KBDC_TAG "ay53600" +#define CHARRAM_TAG "chrram" +#define CHARROM_TAG "chargen" +#define BAUDPORT_TAG "baud" +#define MISCPORT_TAG "misc" +#define MISCKEYS_TAG "misc_keys" +#define SCREEN_TAG "screen" +#define TMS3409A_TAG "u67" +#define TMS3409B_TAG "u57" +#define DOTCLK_TAG "dotclk" +#define DOTCLK_DISP_TAG "dotclk_dispatch" #define CHAR_CTR_CLK_TAG "ch_bucket_ctr_clk" -#define U58_TAG "u58" -#define U59_TAG "u59" +#define U58_TAG "u58" +#define U59_TAG "u59" #define VID_PROM_ADDR_RESET_TAG "u59_y5" -#define U61_TAG "u61" -#define U68_TAG "u68" -#define U69_PROMMSB_TAG "u69" -#define U70_PROMLSB_TAG "u70" +#define U61_TAG "u61" +#define U68_TAG "u68" +#define U69_PROMMSB_TAG "u69" +#define U70_PROMLSB_TAG "u70" #define U70_TC_LINE_TAG "u70_tc" -#define U71_PROM_TAG "u71" -#define U72_PROMDEC_TAG "u72" -#define U81_TAG "u81" -#define U83_TAG "u83" -#define U84_DIV11_TAG "u84" +#define U71_PROM_TAG "u71" +#define U72_PROMDEC_TAG "u72" +#define U81_TAG "u81" +#define U83_TAG "u83" +#define U84_DIV11_TAG "u84" #define U85_VERT_DR_UB_TAG "u85" -#define U87_TAG "u87" -#define U88_DIV9_TAG "u88" -#define U90_DIV14_TAG "u90" -#define BAUD_PROM_TAG "u39" +#define U87_TAG "u87" +#define U88_DIV9_TAG "u88" +#define U90_DIV14_TAG "u90" +#define BAUD_PROM_TAG "u39" // Number of cycles to burn when fetching the next row of characters into the line buffer: // CPU clock is 18MHz / 9 @@ -74,26 +74,26 @@ References: // 2*9*80 1 1440 * XTAL_2MHz // -------------- divided by --------- = ---------------- = 86.5 main CPU cycles per line fetch // XTAL_33_264MHz XTAL_2MHz XTAL_33_264MHz -#define LINE_FETCH_CYCLES (87) +#define LINE_FETCH_CYCLES (87) -#define SR2_FULL_DUPLEX (0x01) -#define SR2_UPPER_ONLY (0x08) +#define SR2_FULL_DUPLEX (0x01) +#define SR2_UPPER_ONLY (0x08) -#define SR3_PB_RESET (0x04) +#define SR3_PB_RESET (0x04) -#define KBD_STATUS_KBDR (0x01) -#define KBD_STATUS_TV_UB (0x40) -#define KBD_STATUS_TV_INT (0x80) +#define KBD_STATUS_KBDR (0x01) +#define KBD_STATUS_TV_UB (0x40) +#define KBD_STATUS_TV_INT (0x80) -#define SCREEN_HTOTAL (9*100) -#define SCREEN_HDISP (9*80) -#define SCREEN_HSTART (9*5) +#define SCREEN_HTOTAL (9*100) +#define SCREEN_HDISP (9*80) +#define SCREEN_HSTART (9*5) -#define SCREEN_VTOTAL (28*11) -#define SCREEN_VDISP (24*11) -#define SCREEN_VSTART (0) +#define SCREEN_VTOTAL (28*11) +#define SCREEN_VDISP (24*11) +#define SCREEN_VSTART (0) -#define VERT_UB_LINE (24*11+8) +#define VERT_UB_LINE (24*11+8) class hazl1500_state : public driver_device { @@ -131,11 +131,11 @@ public: , m_scanline_timer(nullptr) , m_status_reg_3(0) , m_kbd_status_latch(0) - , m_refresh_address(0) + , m_refresh_address(0) , m_vpos(0) - , m_hblank(false) - , m_vblank(false) - , m_delayed_vblank(false) + , m_hblank(false) + , m_vblank(false) + , m_delayed_vblank(false) { } @@ -161,7 +161,7 @@ public: DECLARE_READ_LINE_MEMBER(ay3600_control_r); DECLARE_WRITE_LINE_MEMBER(ay3600_data_ready_w); - DECLARE_WRITE8_MEMBER(refresh_address_w); + DECLARE_WRITE8_MEMBER(refresh_address_w); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; static const device_timer_id TIMER_HBLANK = 0; @@ -211,7 +211,7 @@ private: uint8_t m_status_reg_3; uint8_t m_kbd_status_latch; - uint8_t m_refresh_address; + uint8_t m_refresh_address; uint16_t m_vpos; bool m_hblank; bool m_vblank; @@ -230,7 +230,7 @@ void hazl1500_state::machine_start() save_item(NAME(m_status_reg_3)); save_item(NAME(m_kbd_status_latch)); - save_item(NAME(m_refresh_address)); + save_item(NAME(m_refresh_address)); save_item(NAME(m_vpos)); save_item(NAME(m_hblank)); save_item(NAME(m_vblank)); @@ -242,8 +242,8 @@ void hazl1500_state::machine_reset() m_status_reg_3 = 0; m_kbd_status_latch = 0; - m_refresh_address = 0; - m_screen->reset_origin(0, 0); + m_refresh_address = 0; + m_screen->reset_origin(0, 0); m_vpos = m_screen->vpos(); m_vblank = (m_vpos >= SCREEN_VDISP); m_delayed_vblank = m_vpos < VERT_UB_LINE; @@ -369,21 +369,21 @@ void hazl1500_state::device_timer(emu_timer &timer, device_timer_id id, int para WRITE8_MEMBER(hazl1500_state::refresh_address_w) { - m_refresh_address = data; - //printf("m_refresh_address %x, vpos %d, screen vpos %d\n", m_refresh_address, m_vpos, m_screen->vpos()); + m_refresh_address = data; + //printf("m_refresh_address %x, vpos %d, screen vpos %d\n", m_refresh_address, m_vpos, m_screen->vpos()); } void hazl1500_state::check_tv_interrupt() { - uint8_t char_row = m_vpos % 11; + uint8_t char_row = m_vpos % 11; bool bit_match = char_row == 2 || char_row == 3; - bool tv_interrupt = bit_match && !m_delayed_vblank; + bool tv_interrupt = bit_match && !m_delayed_vblank; //printf("interrupt for line %d (%d): %s\n", m_vpos, char_row, tv_interrupt ? "yes" : "no"); - m_kbd_status_latch &= ~KBD_STATUS_TV_INT; - m_kbd_status_latch |= tv_interrupt ? KBD_STATUS_TV_INT : 0; + m_kbd_status_latch &= ~KBD_STATUS_TV_INT; + m_kbd_status_latch |= tv_interrupt ? KBD_STATUS_TV_INT : 0; - m_maincpu->set_input_line(INPUT_LINE_IRQ0, tv_interrupt ? ASSERT_LINE : CLEAR_LINE); + m_maincpu->set_input_line(INPUT_LINE_IRQ0, tv_interrupt ? ASSERT_LINE : CLEAR_LINE); } void hazl1500_state::update_tv_unblank() @@ -525,12 +525,12 @@ static INPUT_PORTS_START( hazl1500 ) // X2 |BAKSP| 2 | 4 | 6 | 8 | 9 | -= | | | | PORT_START("X2") - PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE) PORT_NAME("Backspace") - PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('\"') - PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$') - PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&') - PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(') - PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')') + PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE) PORT_NAME("Backspace") + PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('\"') + PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$') + PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&') + PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(') + PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')') PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=') PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_UNUSED) PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_UNUSED) @@ -539,79 +539,79 @@ static INPUT_PORTS_START( hazl1500 ) // X3 | | ESC | W | R | Y | 0 | `@ | CLR |NP , |NP 9 | PORT_START("X3") PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_ESC) PORT_NAME("Esc") - PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('W') PORT_CHAR('w') - PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('R') PORT_CHAR('r') - PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y') PORT_CHAR('y') - PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') - PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('@') PORT_CHAR('`') - PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_DEL) PORT_NAME("Clr") + PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_ESC) PORT_NAME("Esc") + PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('W') PORT_CHAR('w') + PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('R') PORT_CHAR('r') + PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y') PORT_CHAR('y') + PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') + PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('@') PORT_CHAR('`') + PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_DEL) PORT_NAME("Clr") PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_DEL_PAD) - PORT_BIT(0x200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9_PAD) PORT_CHAR(UCHAR_MAMEKEY(9_PAD)) + PORT_BIT(0x200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9_PAD) PORT_CHAR(UCHAR_MAMEKEY(9_PAD)) // X4 | | Q | E | T | U | O | {[ | |\ |NP 7 |NP 6 | PORT_START("X4") PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q') PORT_CHAR('q') - PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('E') PORT_CHAR('e') - PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('T') PORT_CHAR('t') - PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('U') PORT_CHAR('u') - PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('O') PORT_CHAR('o') - PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('[') PORT_CHAR('{') - PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('\\') PORT_CHAR('|') - PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_7_PAD) PORT_CHAR(UCHAR_MAMEKEY(7_PAD)) - PORT_BIT(0x200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_6_PAD) PORT_CHAR(UCHAR_MAMEKEY(6_PAD)) + PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q') PORT_CHAR('q') + PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('E') PORT_CHAR('e') + PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('T') PORT_CHAR('t') + PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('U') PORT_CHAR('u') + PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('O') PORT_CHAR('o') + PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('[') PORT_CHAR('{') + PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('\\') PORT_CHAR('|') + PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_7_PAD) PORT_CHAR(UCHAR_MAMEKEY(7_PAD)) + PORT_BIT(0x200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_6_PAD) PORT_CHAR(UCHAR_MAMEKEY(6_PAD)) // X5 |HOME | A | D | G | I | P | *: | LF |NP 8 |NP 5 | PORT_START("X5") - PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_HOME) PORT_NAME("Home") - PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('A') PORT_CHAR('a') - PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('D') PORT_CHAR('d') - PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('G') PORT_CHAR('g') - PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('I') PORT_CHAR('i') - PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('P') PORT_CHAR('p') - PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(':') PORT_CHAR('*') - PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_PGDN) PORT_NAME("Line Feed") - PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8_PAD) PORT_CHAR(UCHAR_MAMEKEY(8_PAD)) - PORT_BIT(0x200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_5_PAD) PORT_CHAR(UCHAR_MAMEKEY(5_PAD)) + PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_HOME) PORT_NAME("Home") + PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('A') PORT_CHAR('a') + PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('D') PORT_CHAR('d') + PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('G') PORT_CHAR('g') + PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('I') PORT_CHAR('i') + PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('P') PORT_CHAR('p') + PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(':') PORT_CHAR('*') + PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_PGDN) PORT_NAME("Line Feed") + PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8_PAD) PORT_CHAR(UCHAR_MAMEKEY(8_PAD)) + PORT_BIT(0x200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_5_PAD) PORT_CHAR(UCHAR_MAMEKEY(5_PAD)) // X6 | | S | F | H | J | +; | }] | DEL |NP 4 |NP 2 | PORT_START("X6") PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('S') PORT_CHAR('s') - PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('F') PORT_CHAR('f') - PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('H') PORT_CHAR('h') - PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('J') PORT_CHAR('j') - PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('+') + PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('S') PORT_CHAR('s') + PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('F') PORT_CHAR('f') + PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('H') PORT_CHAR('h') + PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('J') PORT_CHAR('j') + PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('+') PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR(']') PORT_CHAR('}') - PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_DEL) PORT_NAME("Del") - PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_4_PAD) PORT_CHAR(UCHAR_MAMEKEY(4_PAD)) - PORT_BIT(0x200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_2_PAD) PORT_CHAR(UCHAR_MAMEKEY(2_PAD)) + PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_DEL) PORT_NAME("Del") + PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_4_PAD) PORT_CHAR(UCHAR_MAMEKEY(4_PAD)) + PORT_BIT(0x200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_2_PAD) PORT_CHAR(UCHAR_MAMEKEY(2_PAD)) // X7 | | Z | C | B | K | L | <, | CR |NP 1 |NP 3 | PORT_START("X7") PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') PORT_CHAR('z') - PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('C') PORT_CHAR('c') - PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('B') PORT_CHAR('b') - PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('K') PORT_CHAR('k') - PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('L') PORT_CHAR('l') - PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<') - PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) PORT_NAME("Return") - PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_1_PAD) PORT_CHAR(UCHAR_MAMEKEY(1_PAD)) - PORT_BIT(0x200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_3_PAD) PORT_CHAR(UCHAR_MAMEKEY(3_PAD)) + PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') PORT_CHAR('z') + PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('C') PORT_CHAR('c') + PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('B') PORT_CHAR('b') + PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('K') PORT_CHAR('k') + PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('L') PORT_CHAR('l') + PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<') + PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) PORT_NAME("Return") + PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_1_PAD) PORT_CHAR(UCHAR_MAMEKEY(1_PAD)) + PORT_BIT(0x200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_3_PAD) PORT_CHAR(UCHAR_MAMEKEY(3_PAD)) // X8 | | X | V | N |SPACE| M | >. | ?/ |NP 0 |NP . | PORT_START("X8") PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('X') PORT_CHAR('x') - PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('V') PORT_CHAR('v') - PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('N') PORT_CHAR('n') - PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') - PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('M') PORT_CHAR('m') - PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>') - PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?') - PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0_PAD) PORT_CHAR(UCHAR_MAMEKEY(0_PAD)) + PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('X') PORT_CHAR('x') + PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('V') PORT_CHAR('v') + PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('N') PORT_CHAR('n') + PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') + PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('M') PORT_CHAR('m') + PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>') + PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?') + PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0_PAD) PORT_CHAR(UCHAR_MAMEKEY(0_PAD)) PORT_BIT(0x200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER_PAD) PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD)) PORT_START(MISCKEYS_TAG) @@ -676,7 +676,7 @@ static MACHINE_CONFIG_START( hazl1500, hazl1500_state ) MCFG_CPU_ADD(CPU_TAG, I8080, XTAL_18MHz/9) // 18MHz crystal on schematics, using an i8224 clock gen/driver IC MCFG_CPU_PROGRAM_MAP(hazl1500_mem) MCFG_CPU_IO_MAP(hazl1500_io) - MCFG_QUANTUM_PERFECT_CPU(CPU_TAG) + MCFG_QUANTUM_PERFECT_CPU(CPU_TAG) /* video hardware */ MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) @@ -795,5 +795,5 @@ ROM_END /* Driver */ -/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ -COMP( 1977, hazl1500, 0, 0, hazl1500, hazl1500, driver_device, 0, "Hazeltine Corporation", "Hazeltine 1500", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW) +/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ +COMP( 1977, hazl1500, 0, 0, hazl1500, hazl1500, driver_device, 0, "Hazeltine Corporation", "Hazeltine 1500", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW) diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp index e2bac3503fd..d43084098e5 100644 --- a/src/mame/drivers/hh_tms1k.cpp +++ b/src/mame/drivers/hh_tms1k.cpp @@ -710,7 +710,7 @@ MACHINE_CONFIG_END Bandai System Control Car: Cheetah 「システムコントロールカー チーター」 * TMS1000NLL MP0915 (die label 1000B, MP0915) * 2 motors (one for back axis, one for steering), no sound - + It's a programmable buggy, like Big Track but much simpler. To add a command step in program-mode, press a direction key and one of the time delay number keys at the same time. To run the program(max 24 steps), switch to run-mode @@ -2557,7 +2557,7 @@ MACHINE_CONFIG_END Entex Space Battle * TMS1000 EN-6004 MP0920 (die label 1000B, MP0920) * 2 7seg LEDs, and other LEDs behind bezel, 1-bit sound - + The Japanese version was published by Gakken, same name. led translation table: led zz from game PCB = MAME y.x: @@ -6397,7 +6397,7 @@ MACHINE_CONFIG_END (Tandy) Radio Shack Monkey See (1982 version) * TMS1000 MP0271 (die label 1000E, MP0271), only half of ROM space used * 2 LEDs(one red, one green), 1-bit sound - + This is the TMS1000 version, the one from 1977 has a MM5780. To play, enter an equation followed by the ?-key, and the calculator will tell you if it was right(green) or wrong(red). For example 1+2=3? diff --git a/src/mame/drivers/indy_indigo2.cpp b/src/mame/drivers/indy_indigo2.cpp index 64a1f0c627c..d5c0270a1a5 100644 --- a/src/mame/drivers/indy_indigo2.cpp +++ b/src/mame/drivers/indy_indigo2.cpp @@ -63,14 +63,14 @@ #define PI1_TAG "pi1" #define KBDC_TAG "kbdc" #define PIT_TAG "pit" -#define RS232A_TAG "rs232a" -#define RS232B_TAG "rs232b" +#define RS232A_TAG "rs232a" +#define RS232B_TAG "rs232b" -#define SCC_PCLK XTAL_10MHz -#define SCC_RXA_CLK XTAL_3_6864MHz // Needs verification -#define SCC_TXA_CLK 0 -#define SCC_RXB_CLK XTAL_3_6864MHz // Needs verification -#define SCC_TXB_CLK 0 +#define SCC_PCLK XTAL_10MHz +#define SCC_RXA_CLK XTAL_3_6864MHz // Needs verification +#define SCC_TXA_CLK 0 +#define SCC_RXB_CLK XTAL_3_6864MHz // Needs verification +#define SCC_TXB_CLK 0 #define MCFG_IOC2_GUINNESS_ADD(_tag) \ MCFG_DEVICE_ADD(_tag, SGI_IOC2_GUINNESS, 0) @@ -103,7 +103,7 @@ protected: required_device m_maincpu; required_device m_scc; - required_device m_pi1; // we assume standard parallel port (SPP) mode + required_device m_pi1; // we assume standard parallel port (SPP) mode // TODO: SGI parallel port (SGIPP), HP BOISE high speed parallel port (HPBPP), and Ricoh scanner modes required_device m_kbdc; required_device m_pit; diff --git a/src/mame/drivers/jangou.cpp b/src/mame/drivers/jangou.cpp index 3a0bfc890b8..37331c61d26 100644 --- a/src/mame/drivers/jangou.cpp +++ b/src/mame/drivers/jangou.cpp @@ -763,7 +763,7 @@ static INPUT_PORTS_START( roylcrdn ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_NAME("Note In") /* Note In */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MEMORY_RESET ) PORT_TOGGLE PORT_CODE(KEYCODE_9) /* Memory Reset */ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_TOGGLE PORT_CODE(KEYCODE_0) PORT_NAME("Analyzer") /* Analyzer */ - PORT_SERVICE( 0x10, IP_ACTIVE_LOW ) /* Test Mode */ + PORT_SERVICE( 0x10, IP_ACTIVE_LOW ) /* Test Mode */ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_NAME("Coin In") /* Coin In */ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_GAMBLE_KEYOUT ) PORT_NAME("Credit Clear") /* Credit Clear */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* Spare 1 */ diff --git a/src/mame/drivers/kron.cpp b/src/mame/drivers/kron.cpp index 57170193403..3df2fa1911f 100644 --- a/src/mame/drivers/kron.cpp +++ b/src/mame/drivers/kron.cpp @@ -136,15 +136,15 @@ kron180_state(const machine_config &mconfig, device_type type, const char *tag) uint8_t *m_vram; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(keyb_interrupt); - DECLARE_WRITE8_MEMBER( sn74259_w ){ LOGIO(("%s %02x = %02x\n", FUNCNAME, offset & 0x07, offset & 0x08 ? 1 : 0)); } - DECLARE_WRITE8_MEMBER( ap5_w ){ LOGIO(("%s %02x = %02x\n", FUNCNAME, offset, data)); } - DECLARE_READ8_MEMBER( ap5_r ){ LOGIO(("%s() %02x = %02x\n", FUNCNAME, offset, 1)); return 1; } - DECLARE_WRITE8_MEMBER( wkb_w ){ LOGIO(("%s %02x = %02x\n", FUNCNAME, offset, data)); } - DECLARE_WRITE8_MEMBER( sn74299_w ){ LOGIO(("%s %02x = %02x\n", FUNCNAME, offset, data)); } - DECLARE_READ8_MEMBER( sn74299_r ){ LOGIO(("%s() %02x = %02x\n", FUNCNAME, offset, 1)); return 1; } - DECLARE_WRITE8_MEMBER( txen_w ){ LOGIO(("%s %02x = %02x\n", FUNCNAME, offset, data)); } - DECLARE_WRITE8_MEMBER( kbd_reset_w ){ LOGIO(("%s %02x = %02x\n", FUNCNAME, offset, data)); } - DECLARE_WRITE8_MEMBER( dreq_w ){ LOGIO(("%s %02x = %02x\n", FUNCNAME, offset, data)); } + DECLARE_WRITE8_MEMBER( sn74259_w ){ LOGIO(("%s %02x = %02x\n", FUNCNAME, offset & 0x07, offset & 0x08 ? 1 : 0)); } + DECLARE_WRITE8_MEMBER( ap5_w ){ LOGIO(("%s %02x = %02x\n", FUNCNAME, offset, data)); } + DECLARE_READ8_MEMBER( ap5_r ){ LOGIO(("%s() %02x = %02x\n", FUNCNAME, offset, 1)); return 1; } + DECLARE_WRITE8_MEMBER( wkb_w ){ LOGIO(("%s %02x = %02x\n", FUNCNAME, offset, data)); } + DECLARE_WRITE8_MEMBER( sn74299_w ){ LOGIO(("%s %02x = %02x\n", FUNCNAME, offset, data)); } + DECLARE_READ8_MEMBER( sn74299_r ){ LOGIO(("%s() %02x = %02x\n", FUNCNAME, offset, 1)); return 1; } + DECLARE_WRITE8_MEMBER( txen_w ){ LOGIO(("%s %02x = %02x\n", FUNCNAME, offset, data)); } + DECLARE_WRITE8_MEMBER( kbd_reset_w ){ LOGIO(("%s %02x = %02x\n", FUNCNAME, offset, data)); } + DECLARE_WRITE8_MEMBER( dreq_w ){ LOGIO(("%s %02x = %02x\n", FUNCNAME, offset, data)); } protected: required_device m_maincpu; required_shared_ptr m_videoram; @@ -320,5 +320,5 @@ ROM_START (kron180) ROM_END /* Driver */ -/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ -COMP (1995, kron180, 0, 0, kron180, kron180, driver_device, 0, "Kron Ltd", "Kron K-180", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) +/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ +COMP (1995, kron180, 0, 0, kron180, kron180, driver_device, 0, "Kron Ltd", "Kron K-180", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) diff --git a/src/mame/drivers/lsasquad.cpp b/src/mame/drivers/lsasquad.cpp index 43bf51ccd9c..3bcdbb13a74 100644 --- a/src/mame/drivers/lsasquad.cpp +++ b/src/mame/drivers/lsasquad.cpp @@ -735,7 +735,7 @@ ROM_START( lsasquad ) ROM_REGION( 0x0400, "prio_prom", 0 ) ROM_LOAD( "a64-06.9", 0x0000, 0x0400, CRC(7ced30ba) SHA1(f22de13d4fd49b7b2ffd06032eb5e14fbdeec91c) ) /* priority */ - + ROM_REGION( 0x0200, "plds", 0 ) ROM_LOAD( "pal16l8a.14", 0x0000, 0x0104, CRC(a7cc157d) SHA1(f06f750636d59a610e0b0eda8cb791780ebc57a5) ) ROM_END diff --git a/src/mame/drivers/mac128.cpp b/src/mame/drivers/mac128.cpp index 2892cf1d74e..29cbbfaa5d0 100755 --- a/src/mame/drivers/mac128.cpp +++ b/src/mame/drivers/mac128.cpp @@ -4,9 +4,9 @@ drivers/mac128.cpp Original-style Macintosh family emulation - + The cutoff here is Macs with 128k-style video and audio and no ADB - + Nate Woods, Raphael Nabet, R. Belmont 0x000000 - 0x3fffff RAM/ROM (switches based on overlay) @@ -36,7 +36,7 @@ SCC: PB_EXT (DCDB) from mouse Y circuitry PA_EXT (DCDA) from mouse X circuitry - + SCC Init: Control B: @@ -130,10 +130,10 @@ enum mac128model_t #define MAC_ALT_SND_BUF_OFFSET (0x5F00>>1) #define LOG_KEYBOARD 0 -#define LOG_GENERAL 0 -#define LOG_MAC_IWM 0 -#define LOG_VIA 0 -#define LOG_MEMORY 0 +#define LOG_GENERAL 0 +#define LOG_MAC_IWM 0 +#define LOG_VIA 0 +#define LOG_MEMORY 0 class mac128_state : public driver_device { @@ -235,7 +235,7 @@ public: DECLARE_WRITE16_MEMBER ( macplus_scsi_w ); DECLARE_WRITE_LINE_MEMBER(mac_scsi_irq); DECLARE_WRITE_LINE_MEMBER(set_scc_interrupt); - + TIMER_DEVICE_CALLBACK_MEMBER(mac_scanline); DECLARE_DRIVER_INIT(mac128k512k); DECLARE_DRIVER_INIT(mac512ke); @@ -348,7 +348,7 @@ void mac128_state::field_interrupts() take_interrupt = 1; } -// printf("field_interrupts: take %d\n", take_interrupt); +// printf("field_interrupts: take %d\n", take_interrupt); if (m_last_taken_interrupt > -1) { @@ -365,7 +365,7 @@ void mac128_state::field_interrupts() WRITE_LINE_MEMBER(mac128_state::set_scc_interrupt) { -// printf("SCC IRQ: %d\n", state); +// printf("SCC IRQ: %d\n", state); m_scc_interrupt = state; field_interrupts(); } @@ -474,59 +474,59 @@ void mac128_state::scc_mouse_irq(int x, int y) if (x && y) { - if (m_last_was_x) + if (m_last_was_x) { - if(x == 2) + if(x == 2) { - if(lastx) + if(lastx) { m_scc->dcda_w(CLEAR_LINE); m_mouse_bit_x = 0; - } - else + } + else { m_scc->dcda_w(ASSERT_LINE); m_mouse_bit_x = 1; } - } - else + } + else { - if(lastx) + if(lastx) { m_scc->dcda_w(CLEAR_LINE); m_mouse_bit_x = 1; - } - else + } + else { m_scc->dcda_w(ASSERT_LINE); m_mouse_bit_x = 0; } } lastx = !lastx; - } - else + } + else { - if(y == 2) + if(y == 2) { - if(lasty) + if(lasty) { m_scc->dcdb_w(CLEAR_LINE); m_mouse_bit_y = 0; - } - else + } + else { m_scc->dcdb_w(ASSERT_LINE); m_mouse_bit_y = 1; } - } - else + } + else { - if(lasty) + if(lasty) { m_scc->dcdb_w(CLEAR_LINE); m_mouse_bit_y = 1; - } - else + } + else { m_scc->dcdb_w(ASSERT_LINE); m_mouse_bit_y = 0; @@ -539,59 +539,59 @@ void mac128_state::scc_mouse_irq(int x, int y) } else { - if (x) + if (x) { - if(x == 2) + if(x == 2) { - if(lastx) + if(lastx) { m_scc->dcda_w(CLEAR_LINE); m_mouse_bit_x = 0; - } - else + } + else { m_scc->dcda_w(ASSERT_LINE); m_mouse_bit_x = 1; } - } - else + } + else { - if(lastx) + if(lastx) { m_scc->dcda_w(CLEAR_LINE); m_mouse_bit_x = 1; - } - else + } + else { m_scc->dcda_w(ASSERT_LINE); m_mouse_bit_x = 0; } } lastx = !lastx; - } - else + } + else { - if(y == 2) + if(y == 2) { - if(lasty) + if(lasty) { m_scc->dcdb_w(CLEAR_LINE); m_mouse_bit_y = 0; - } - else + } + else { m_scc->dcdb_w(ASSERT_LINE); m_mouse_bit_y = 1; } - } - else + } + else { - if(lasty) + if(lasty) { m_scc->dcdb_w(CLEAR_LINE); m_mouse_bit_y = 1; - } - else + } + else { m_scc->dcdb_w(ASSERT_LINE); m_mouse_bit_y = 0; @@ -740,7 +740,7 @@ WRITE8_MEMBER(mac128_state::mac_via_out_a) /* Early Mac models had VIA A4 control overlaying. In the Mac SE (and * possibly later models), overlay was set on reset, but cleared on the * first access to the ROM. */ - + if (((data & 0x10) >> 4) != m_overlay) { m_overlay = (data & 0x10) >> 4; @@ -1336,7 +1336,7 @@ static MACHINE_CONFIG_START( mac512ke, mac128_state ) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("512K") - + // software list MCFG_SOFTWARE_LIST_ADD("flop35_list","mac_flop") MCFG_SOFTWARE_LIST_ADD("hdd_list", "mac_hdd") @@ -1554,7 +1554,7 @@ ROM_END * 04 <- 20 x1 clock, Sync Modes Enable, SDLC Mode (01111110 Flag) * 0a <- e0 CRC preset to '1's, FM0 encoding scheme * 06 <- 00 Receiver SDLC ADR0-ADR7 bits - * 07 <- 7e Receiver SDLC Flag character (0x7e as expected) + * 07 <- 7e Receiver SDLC Flag character (0x7e as expected) * 0c <- 06 Low baudrate divider * 0d <- 00 Hi baudrate divider * 0e <- c0 Set FM Mode Command @@ -1562,10 +1562,10 @@ ROM_END * 02 <- 00 Interrupt vector * 0f <- 08 External/Status Control: DCD interrupts enabled * 01 <- 09 Enable External Interrupts + Rx Int On First Character or Special Condition - * 09 <- 0a Master Interrupt Control: No vector and Interrupts enabled! + * 09 <- 0a Master Interrupt Control: No vector and Interrupts enabled! * 0b <- 70 Rx Clock is DPLL Output, Tx Clock is BRG output + TTL Clock on RTxC * 0e <- 21 Enter Search Mode Command + BRG enable + RTxC as BRG clock - * 05 <- 60 Tx 8 bit, Tx disable, SDLC CRC Polynomial selected, Tx CRC disabled + * 05 <- 60 Tx 8 bit, Tx disable, SDLC CRC Polynomial selected, Tx CRC disabled * 06 <- 01 Receiver SDLC ADR0-ADR7 bits updated * 0f <- 88 External/Status Control: Abort/Break and DCD interrupts enabled */ @@ -1580,7 +1580,7 @@ ROM_START( macplus ) ROM_REGION16_BE(0x100000, "bootrom", 0) ROM_SYSTEM_BIOS(0, "v3", "Loud Harmonicas") ROMX_LOAD( "macplus.rom", 0x00000, 0x20000, CRC(b2102e8e) SHA1(7d2f808a045aa3a1b242764f0e2c7d13e288bf1f), ROM_GROUPWORD | ROM_BIOS(1) ) - ROM_FILL(0x20000, 0x2, 0xff) // ROM checks for same contents at 20000 and 40000 to determine if SCSI is present + ROM_FILL(0x20000, 0x2, 0xff) // ROM checks for same contents at 20000 and 40000 to determine if SCSI is present ROM_FILL(0x40000, 0x2, 0xaa) ROM_SYSTEM_BIOS(1, "v2", "Lonely Heifers") ROMX_LOAD( "23512-1007__342-0342-a.rom-lo.u7d", 0x000000, 0x010000, CRC(5aaa4a2f) SHA1(5dfbfbe279ddadfae691c95f552fd9db41e3ed90), ROM_SKIP(1) | ROM_BIOS(2) ) @@ -1594,8 +1594,8 @@ ROM_START( macplus ) ROM_SYSTEM_BIOS(3, "romdisk", "mac68k.info self-boot (1/1/2015)") ROMX_LOAD( "modplus-harp2.bin", 0x000000, 0x028000, CRC(ba56078d) SHA1(debdf328ac73e1662d274a044d8750224f47edef), ROM_GROUPWORD | ROM_BIOS(4) ) ROM_SYSTEM_BIOS(4, "romdisk2", "bigmessofwires.com ROMinator (2/25/2015)") - ROMX_LOAD( "rominator-20150225-lo.bin", 0x000001, 0x080000, CRC(62cf2a0b) SHA1(f78ebb0919dd9e094bef7952b853b70e66d05e01), ROM_SKIP(1) | ROM_BIOS(5) ) - ROMX_LOAD( "rominator-20150225-hi.bin", 0x000000, 0x080000, CRC(a28ba8ec) SHA1(9ddcf500727955c60db0ff24b5ca2458f53fd89a), ROM_SKIP(1) | ROM_BIOS(5) ) + ROMX_LOAD( "rominator-20150225-lo.bin", 0x000001, 0x080000, CRC(62cf2a0b) SHA1(f78ebb0919dd9e094bef7952b853b70e66d05e01), ROM_SKIP(1) | ROM_BIOS(5) ) + ROMX_LOAD( "rominator-20150225-hi.bin", 0x000000, 0x080000, CRC(a28ba8ec) SHA1(9ddcf500727955c60db0ff24b5ca2458f53fd89a), ROM_SKIP(1) | ROM_BIOS(5) ) ROM_END /* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */ diff --git a/src/mame/drivers/micro20.cpp b/src/mame/drivers/micro20.cpp index 9136d779daf..6621b066a8a 100755 --- a/src/mame/drivers/micro20.cpp +++ b/src/mame/drivers/micro20.cpp @@ -4,9 +4,9 @@ micro20.cpp GMX Micro 20 single-board computer - + 68020 + 68881 FPU - + 800a5e = end of initial 68020 torture test ****************************************************************************/ @@ -21,9 +21,9 @@ #define MAINCPU_TAG "maincpu" #define DUART_A_TAG "duarta" #define DUART_B_TAG "duartb" -#define RTC_TAG "rtc" -#define FDC_TAG "fdc" -#define PIT_TAG "pit" +#define RTC_TAG "rtc" +#define FDC_TAG "fdc" +#define PIT_TAG "pit" class micro20_state : public driver_device { @@ -41,12 +41,12 @@ public: required_memory_region m_rom; required_shared_ptr m_mainram; required_device m_pit; - + virtual void machine_start() override; virtual void machine_reset() override; - + DECLARE_WRITE_LINE_MEMBER(m68k_reset_callback); - + private: }; @@ -59,11 +59,11 @@ void micro20_state::machine_reset() { uint32_t *pROM = (uint32_t *)m_rom->base(); uint32_t *pRAM = (uint32_t *)m_mainram.target(); - + pRAM[0] = pROM[0]; pRAM[1] = pROM[1]; m_maincpu->reset(); - + m_maincpu->set_reset_callback(write_line_delegate(FUNC(micro20_state::m68k_reset_callback),this)); } @@ -80,12 +80,12 @@ WRITE_LINE_MEMBER(micro20_state::m68k_reset_callback) static ADDRESS_MAP_START(micro20_map, AS_PROGRAM, 32, micro20_state ) AM_RANGE(0x00000000, 0x001fffff) AM_RAM AM_SHARE("mainram") AM_RANGE(0x00800000, 0x0083ffff) AM_ROM AM_REGION("bootrom", 0) - AM_RANGE(0xffff8000, 0xffff8003) AM_DEVREADWRITE8(FDC_TAG, wd1772_t, status_r, cmd_w, 0xff000000) - AM_RANGE(0xffff8000, 0xffff8003) AM_DEVREADWRITE8(FDC_TAG, wd1772_t, track_r, track_w, 0x00ff0000) - AM_RANGE(0xffff8000, 0xffff8003) AM_DEVREADWRITE8(FDC_TAG, wd1772_t, sector_r, sector_w, 0x0000ff00) - AM_RANGE(0xffff8000, 0xffff8003) AM_DEVREADWRITE8(FDC_TAG, wd1772_t, data_r, data_w, 0x000000ff) + AM_RANGE(0xffff8000, 0xffff8003) AM_DEVREADWRITE8(FDC_TAG, wd1772_t, status_r, cmd_w, 0xff000000) + AM_RANGE(0xffff8000, 0xffff8003) AM_DEVREADWRITE8(FDC_TAG, wd1772_t, track_r, track_w, 0x00ff0000) + AM_RANGE(0xffff8000, 0xffff8003) AM_DEVREADWRITE8(FDC_TAG, wd1772_t, sector_r, sector_w, 0x0000ff00) + AM_RANGE(0xffff8000, 0xffff8003) AM_DEVREADWRITE8(FDC_TAG, wd1772_t, data_r, data_w, 0x000000ff) AM_RANGE(0xffff8080, 0xffff808f) AM_DEVREADWRITE8(DUART_A_TAG, mc68681_device, read, write, 0xffffffff) - AM_RANGE(0xffff80a0, 0xffff80af) AM_DEVREADWRITE8(DUART_B_TAG, mc68681_device, read, write, 0xffffffff) + AM_RANGE(0xffff80a0, 0xffff80af) AM_DEVREADWRITE8(DUART_B_TAG, mc68681_device, read, write, 0xffffffff) AM_RANGE(0xffff80c0, 0xffff80df) AM_DEVREADWRITE8(PIT_TAG, pit68230_device, read, write, 0xffffffff) ADDRESS_MAP_END @@ -93,19 +93,19 @@ static MACHINE_CONFIG_START( micro20, micro20_state ) /* basic machine hardware */ MCFG_CPU_ADD(MAINCPU_TAG, M68020, XTAL_16_67MHz) MCFG_CPU_PROGRAM_MAP(micro20_map) - + MCFG_MC68681_ADD(DUART_A_TAG, XTAL_3_6864MHz) -// MCFG_MC68681_IRQ_CALLBACK(WRITELINE(vt240_state, irq13_w)) -// MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("host", rs232_port_device, write_txd)) -// MCFG_MC68681_B_TX_CALLBACK(DEVWRITELINE("printer", rs232_port_device, write_txd)) -// MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(vt240_state, duartout_w)) +// MCFG_MC68681_IRQ_CALLBACK(WRITELINE(vt240_state, irq13_w)) +// MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("host", rs232_port_device, write_txd)) +// MCFG_MC68681_B_TX_CALLBACK(DEVWRITELINE("printer", rs232_port_device, write_txd)) +// MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(vt240_state, duartout_w)) MCFG_MC68681_ADD(DUART_B_TAG, XTAL_3_6864MHz) - + MCFG_DEVICE_ADD(RTC_TAG, MSM58321, XTAL_32_768kHz) - + MCFG_WD1772_ADD(FDC_TAG, XTAL_16_67MHz / 2) - + MCFG_DEVICE_ADD(PIT_TAG, PIT68230, XTAL_16_67MHz / 2) MACHINE_CONFIG_END @@ -121,10 +121,10 @@ INPUT_PORTS_END ROM_START( micro20 ) ROM_REGION32_BE(0x40000, "bootrom", 0) - ROM_LOAD32_BYTE( "d00-07_u6_6791.bin", 0x000003, 0x010000, CRC(63d66ea1) SHA1(c5dfbc4d81920e1d2e981c52c1af3d486d382a35) ) - ROM_LOAD32_BYTE( "d08-15_u8_0dc6.bin", 0x000002, 0x010000, CRC(d62ef21f) SHA1(2779d430b1a0b835807627e707d46547b29ef579) ) - ROM_LOAD32_BYTE( "d16-23_u10_e5b0.bin", 0x000001, 0x010000, CRC(cd7acf86) SHA1(db994ed714a1079fbb66616355e8f18d2d1a2005) ) - ROM_LOAD32_BYTE( "d24-31_u13_d115.bin", 0x000000, 0x010000, CRC(3646d943) SHA1(97ee54063e2fe49fef2ff68d0f2e39345a75eac5) ) + ROM_LOAD32_BYTE( "d00-07_u6_6791.bin", 0x000003, 0x010000, CRC(63d66ea1) SHA1(c5dfbc4d81920e1d2e981c52c1af3d486d382a35) ) + ROM_LOAD32_BYTE( "d08-15_u8_0dc6.bin", 0x000002, 0x010000, CRC(d62ef21f) SHA1(2779d430b1a0b835807627e707d46547b29ef579) ) + ROM_LOAD32_BYTE( "d16-23_u10_e5b0.bin", 0x000001, 0x010000, CRC(cd7acf86) SHA1(db994ed714a1079fbb66616355e8f18d2d1a2005) ) + ROM_LOAD32_BYTE( "d24-31_u13_d115.bin", 0x000000, 0x010000, CRC(3646d943) SHA1(97ee54063e2fe49fef2ff68d0f2e39345a75eac5) ) ROM_END COMP( 1984, micro20, 0, 0, micro20, micro20, driver_device, 0, "GMX", "Micro 20", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) diff --git a/src/mame/drivers/mirage.cpp b/src/mame/drivers/mirage.cpp index 5065501b8a2..10e7bc9749f 100644 --- a/src/mame/drivers/mirage.cpp +++ b/src/mame/drivers/mirage.cpp @@ -2,15 +2,15 @@ // copyright-holders:Angelo Salese /********************************************************************************************** - Mirage Youjuu Mahjongden (c) 1994 Mitchell + Mirage Youjuu Mahjongden (c) 1994 Mitchell - Similar to simpl156.cpp with shifted stuff around. - - TODO: - - some unknown writes (irq acks / sprite DMA start presumably); + Similar to simpl156.cpp with shifted stuff around. - Notes: - - To enter into full Test Mode you need to keep pressed the Mahjong A key at start-up. + TODO: + - some unknown writes (irq acks / sprite DMA start presumably); + + Notes: + - To enter into full Test Mode you need to keep pressed the Mahjong A key at start-up. =============================================================================================== @@ -187,7 +187,7 @@ static INPUT_PORTS_START( mirage ) PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, do_read) PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - + PORT_START("KEY0") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_E ) diff --git a/src/mame/drivers/mw8080bw.cpp b/src/mame/drivers/mw8080bw.cpp index 66b08f0e024..a5ea39de466 100644 --- a/src/mame/drivers/mw8080bw.cpp +++ b/src/mame/drivers/mw8080bw.cpp @@ -3165,20 +3165,20 @@ ROM_END /* CPUs -QTY Type clock position function -1x unknown DIP40 main PCB 2n -7x LM3900N sound PCB ic2-ic8 Quad Operational Amplifier - sound -1x LM377 sound PCB 1k Dual Audio Amplifier - sound -1x oscillator 19.968000 main PCB XTAL 8b +QTY Type clock position function +1x unknown DIP40 main PCB 2n +7x LM3900N sound PCB ic2-ic8 Quad Operational Amplifier - sound +1x LM377 sound PCB 1k Dual Audio Amplifier - sound +1x oscillator 19.968000 main PCB XTAL 8b ROMs -QTY Type position status -4x TMS2708 main PCB 1m 1n 1r 1s dumped -2x MCM2708 main PCB 1j 1l dumped +QTY Type position status +4x TMS2708 main PCB 1m 1n 1r 1s dumped +2x MCM2708 main PCB 1j 1l dumped RAMs -QTY Type position -16x D2107C main PCB 1-16 +QTY Type position +16x D2107C main PCB 1-16 Others 1x 18x2 edge connector (main PCB) @@ -3191,7 +3191,7 @@ Others Notes main PCB is marked "CS210", "SI" and is labeled "C6902575" -sound PCB is marked "CS214" and is labeled "C6902574", "VOLUME" +sound PCB is marked "CS214" and is labeled "C6902574", "VOLUME" */ ROM_START( blueshrkmr ) @@ -3252,7 +3252,7 @@ ROM_END /* 730 */ GAME( 1978, bowler, 0, bowler, bowler, driver_device, 0, ROT90, "Midway", "Bowling Alley", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) /* 739 */ GAMEL(1978, invaders, 0, invaders, invaders, driver_device, 0, ROT270, "Taito / Midway", "Space Invaders / Space Invaders M", MACHINE_SUPPORTS_SAVE, layout_invaders ) /* 742 */ GAME( 1978, blueshrk, 0, blueshrk, blueshrk, driver_device, 0, ROT0, "Midway", "Blue Shark", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) - GAME( 1978, blueshrkmr, blueshrk, blueshrk, blueshrk, driver_device, 0, ROT0, "bootleg (Model Racing)", "Blue Shark (Model Racing bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) + GAME( 1978, blueshrkmr, blueshrk, blueshrk, blueshrk, driver_device, 0, ROT0, "bootleg (Model Racing)", "Blue Shark (Model Racing bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) /* 749 4 Player Bowling Alley (cocktail, dump does not exist) */ /* 851 */ GAMEL(1980, invad2ct, 0, invad2ct, invad2ct, driver_device, 0, ROT90, "Midway", "Space Invaders II (Midway, cocktail)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_invad2ct ) /* 852 Space Invaders Deluxe (color hardware, not in this driver) */ diff --git a/src/mame/drivers/mzr8105.cpp b/src/mame/drivers/mzr8105.cpp index f20125446e9..295436fbbea 100644 --- a/src/mame/drivers/mzr8105.cpp +++ b/src/mame/drivers/mzr8105.cpp @@ -103,20 +103,20 @@ * Known boards from Mizar: * * MZX 414 - * MZ 7122 - * MZ 7132 + * MZ 7122 + * MZ 7132 * MZ 7300 Serial I/O Board (Z8530) * EMX 7320 Serial I/O Board * MZ 7400 Disk Controller Board (WD 2010; WD 1772) * MZ 7500 IEEE-488 (GPIB) Interface Board * EMX 7550 Ethernet Controller Board (AMD 7990 Lance) MAC: 00:80:F8 MIZAR, INC. - * MZ 7772 + * MZ 7772 * MZ 7810 I/O Expansion Module (6681 DUART) * MZ 7831 SCSI Expansion Module (WD 33C93A) * MZ 7850 Ethernet Expansion Module (WD 83C690) * MZ 8000 ?? * MZ 8105 3U 68000 CPU board - * MZ 8115 + * MZ 8115 * MZ 8300 3U serial board, 2 NEC 7201 and 1 AMD CTS9513 5 x 16 bit Counter/Timer * MZ 8310 timing module 2 x AM9513 * MZ 8505 IEEE-488 (GPIB) Interface Board" @@ -170,7 +170,7 @@ #include "softlist.h" // The board needs a SIO board to get a user interface so lets fake one until the VME devices is done -#define FAKEVME 1 +#define FAKEVME 1 // There are two user prom sockets #define CARDSLOT 0 @@ -253,9 +253,9 @@ static ADDRESS_MAP_START (mzr8105_mem, AS_PROGRAM, 16, mzr8105_state) AM_RANGE (0x000000, 0x003fff) AM_ROM AM_REGION("roms", 0x000000) /* System EPROM Area 16Kb OS9 DEBUG - not verified */ AM_RANGE (0x004000, 0x01ffff) AM_ROM AM_REGION("roms", 0x004000)/* System EPROM Area 112Kb for System ROM - not verified */ AM_RANGE (0x020000, 0x03ffff) AM_RAM /* Not verified */ -// AM_RANGE (0x0a0000, 0x0bffff) AM_ROM /* User EPROM/SRAM Area, max 128Kb mapped by a cartslot */ -// AM_RANGE(0x100000, 0xfeffff) AM_READWRITE(vme_a24_r, vme_a24_w) /* VMEbus Rev B addresses (24 bits) - not verified */ -// AM_RANGE(0xff0000, 0xffffff) AM_READWRITE(vme_a16_r, vme_a16_w) /* VMEbus Rev B addresses (16 bits) - not verified */ +// AM_RANGE (0x0a0000, 0x0bffff) AM_ROM /* User EPROM/SRAM Area, max 128Kb mapped by a cartslot */ +// AM_RANGE(0x100000, 0xfeffff) AM_READWRITE(vme_a24_r, vme_a24_w) /* VMEbus Rev B addresses (24 bits) - not verified */ +// AM_RANGE(0xff0000, 0xffffff) AM_READWRITE(vme_a16_r, vme_a16_w) /* VMEbus Rev B addresses (16 bits) - not verified */ #if FAKEVME // Faking a Mizar 8300 SIO UPD7201 BOARD in VME A16 adress space AM_RANGE (0xFF0000, 0xFF0001) AM_DEVREADWRITE8("upd", upd7201N_device, db_r, db_w, 0x00ff) @@ -350,13 +350,13 @@ WRITE_LINE_MEMBER (mzr8105_state::write_updterm_clock){ static MACHINE_CONFIG_START (mzr8105, mzr8105_state) MCFG_CPU_ADD ("maincpu", M68000, XTAL_10MHz) MCFG_CPU_PROGRAM_MAP (mzr8105_mem) - + /* Terminal Port config */ MCFG_UPD7201_ADD("upd", XTAL_4MHz, 0, 0, 0, 0 ) MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232trm", rs232_port_device, write_txd)) MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232trm", rs232_port_device, write_dtr)) MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232trm", rs232_port_device, write_rts)) - + MCFG_RS232_PORT_ADD ("rs232trm", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("upd", upd7201N_device, rxb_w)) MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("upd", upd7201N_device, ctsb_w)) @@ -373,7 +373,7 @@ MACHINE_CONFIG_END /* ROM definitions */ /* UPD7201 init sequence - * :upd B Reg 02 <- 04 Interrupt vector + * :upd B Reg 02 <- 04 Interrupt vector * :upd B Reg 06 <- 00 Sync byte * :upd B Reg 07 <- 00 Sync byte * :upd B Reg 03 <- c1 Rx 8 bit chars + Rx enable diff --git a/src/mame/drivers/nightgal.cpp b/src/mame/drivers/nightgal.cpp index 2353eeee918..d56b3b545d7 100644 --- a/src/mame/drivers/nightgal.cpp +++ b/src/mame/drivers/nightgal.cpp @@ -514,7 +514,7 @@ static INPUT_PORTS_START( sexygal ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) // TODO: ok for ngtbunny, not for the others - PORT_START("DSWA") + PORT_START("DSWA") PORT_DIPNAME( 0x0f, 0x0f, "Game Out Rate" ) PORT_DIPLOCATION("SWA:1,2,3,4") PORT_DIPSETTING( 0x00, "50" ) PORT_DIPSETTING( 0x01, "53" ) @@ -533,11 +533,11 @@ static INPUT_PORTS_START( sexygal ) PORT_DIPSETTING( 0x0e, "93" ) PORT_DIPSETTING( 0x0f, "96" ) PORT_DIPNAME( 0xf0, 0xf0, "Rate Max" ) PORT_DIPLOCATION("SWA:5,6,7,8") -// PORT_DIPSETTING( 0x20, "10" ) -// PORT_DIPSETTING( 0x30, "20" ) -// PORT_DIPSETTING( 0x40, "5" ) -// PORT_DIPSETTING( 0x50, "10" ) -// PORT_DIPSETTING( 0x60, "20" ) +// PORT_DIPSETTING( 0x20, "10" ) +// PORT_DIPSETTING( 0x30, "20" ) +// PORT_DIPSETTING( 0x40, "5" ) +// PORT_DIPSETTING( 0x50, "10" ) +// PORT_DIPSETTING( 0x60, "20" ) PORT_DIPSETTING( 0x80, "1" ) PORT_DIPSETTING( 0x90, "2" ) PORT_DIPSETTING( 0xc0, "3" ) @@ -549,7 +549,7 @@ static INPUT_PORTS_START( sexygal ) PORT_DIPSETTING( 0xe0, "10" ) PORT_DIPSETTING( 0xf0, "20" ) PORT_DIPSETTING( 0x70, "30" ) - + PORT_START("DSWB") PORT_DIPNAME( 0x01, 0x01, "DSWB" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) diff --git a/src/mame/drivers/octopus.cpp b/src/mame/drivers/octopus.cpp index 302fa06ab98..4504a24c902 100644 --- a/src/mame/drivers/octopus.cpp +++ b/src/mame/drivers/octopus.cpp @@ -808,7 +808,7 @@ SCN2674_DRAW_CHARACTER_MEMBER(octopus_state::display_pixels) bg = 0x7f7f7f; else bg = 0x000000; - + if(attr & 0x20) // reverse video data = ~data; } @@ -819,7 +819,7 @@ SCN2674_DRAW_CHARACTER_MEMBER(octopus_state::display_pixels) if(cursor && !blink) { bool inverse = true; - + if(!(m_dswa->read() & 0x80)) // not available in monochrome mode inverse = false; if(m_vidctrl & 0x40) // not enabled @@ -954,7 +954,7 @@ static MACHINE_CONFIG_START( octopus, octopus_state ) MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE("serial_b",rs232_port_device, write_txd)) MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("serial_a",rs232_port_device, write_rts)) MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE("serial_b",rs232_port_device, write_rts)) - + MCFG_RS232_PORT_ADD("serial_a", default_rs232_devices, nullptr) MCFG_RS232_RXD_HANDLER(DEVWRITELINE("serial",z80sio2_device, rxa_w)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("serial",z80sio2_device, ctsa_w)) MCFG_DEVCB_INVERT diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp index 6ff5b23d083..7f3c2a4ae2f 100644 --- a/src/mame/drivers/pacman.cpp +++ b/src/mame/drivers/pacman.cpp @@ -1115,7 +1115,7 @@ static ADDRESS_MAP_START( numcrash_map, AS_PROGRAM, 8, pacman_state ) AM_RANGE(0x5000, 0x5000) AM_READ_PORT("IN0") AM_RANGE(0x5040, 0x5040) AM_READ_PORT("IN1") AM_RANGE(0x5080, 0x5080) AM_READ_PORT("DSW1") -// AM_RANGE(0x50c0, 0x50c0) AM_READ_PORT("DSW2") // only one DSW on the PCB +// AM_RANGE(0x50c0, 0x50c0) AM_READ_PORT("DSW2") // only one DSW on the PCB ADDRESS_MAP_END diff --git a/src/mame/drivers/pcipc.cpp b/src/mame/drivers/pcipc.cpp index db5f6146508..e8f4074f512 100644 --- a/src/mame/drivers/pcipc.cpp +++ b/src/mame/drivers/pcipc.cpp @@ -184,7 +184,7 @@ const pcipc_state::boot_state_info pcipc_state::boot_state_infos_phoenix[] = { { 0, nullptr } }; -const pcipc_state::boot_state_info pcipc_state::boot_state_infos_award[] = { +const pcipc_state::boot_state_info pcipc_state::boot_state_infos_award[] = { {0x01, "Processor test; Processor status verification" }, {0x02, "Processor test 2; Read/Write and verify all CPU registers" }, {0x03, "Initialize chips; Disable NMI, PIE, AIE, UEI, SQWV. Disable video, parity checking, DMA. Reset math coprocessor. Clear all page registers and CMOS shutdown. Initialize DMA controller 0 and 1. Initialize interrupt controllers 0 and 1." }, @@ -251,7 +251,7 @@ const pcipc_state::boot_state_info pcipc_state::boot_state_infos_award[] = { {0xFF, "Boot loader" }, { 0, nullptr } }; - + WRITE8_MEMBER(pcipc_state::boot_state_phoenix_w) { const char *desc = ""; @@ -291,7 +291,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_START(pcipctx, pcipc_state) MCFG_CPU_ADD("maincpu", PENTIUM, 60000000) MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pci:07.0:pic8259_master", pic8259_device, inta_cb) - + MCFG_PCI_ROOT_ADD( ":pci") MCFG_I82439TX_ADD( ":pci:00.0", ":maincpu", 256*1024*1024) MCFG_I82371SB_ISA_ADD(":pci:07.0") @@ -309,9 +309,9 @@ ROM_START(pcipc) ROM_SYSTEM_BIOS(2, "crisis", "Version 07/01/98, for flash recovery") ROMX_LOAD("crisis.rom", 0x00000, 0x40000, CRC(38a1458a) SHA1(8881ac336392cca79a772b4168f63efc31f953dd), ROM_BIOS(3) ) ROM_SYSTEM_BIOS(3, "5hx29", "5hx29") \ - ROMX_LOAD("5hx29.bin", 0x20000, 0x20000, CRC(07719a55) SHA1(b63993fd5186cdb4f28c117428a507cd069e1f68), ROM_BIOS(4) ) + ROMX_LOAD("5hx29.bin", 0x20000, 0x20000, CRC(07719a55) SHA1(b63993fd5186cdb4f28c117428a507cd069e1f68), ROM_BIOS(4) ) ROM_REGION(0x8000,"ibm_vga", 0) - ROM_LOAD("ibm-vga.bin", 0x00000, 0x8000, BAD_DUMP CRC(74e3fadb) SHA1(dce6491424f1726203776dfae9a967a98a4ba7b5) ) + ROM_LOAD("ibm-vga.bin", 0x00000, 0x8000, BAD_DUMP CRC(74e3fadb) SHA1(dce6491424f1726203776dfae9a967a98a4ba7b5) ) ROM_END ROM_START(pcipctx) @@ -320,7 +320,7 @@ ROM_START(pcipctx) ROMX_LOAD("gb_ga586t2.bin", 0x20000, 0x20000, CRC(3a50a6e1) SHA1(dea859b4f1492d0d08aacd260ed1e83e00ebac08), ROM_BIOS(1)) ROM_REGION(0x8000,"ibm_vga", 0) - ROM_LOAD("ibm-vga.bin", 0x00000, 0x8000, BAD_DUMP CRC(74e3fadb) SHA1(dce6491424f1726203776dfae9a967a98a4ba7b5) ) + ROM_LOAD("ibm-vga.bin", 0x00000, 0x8000, BAD_DUMP CRC(74e3fadb) SHA1(dce6491424f1726203776dfae9a967a98a4ba7b5) ) ROM_END static INPUT_PORTS_START(pcipc) diff --git a/src/mame/drivers/peplus.cpp b/src/mame/drivers/peplus.cpp index ae8100fb4e8..b37b253dc4a 100644 --- a/src/mame/drivers/peplus.cpp +++ b/src/mame/drivers/peplus.cpp @@ -5812,7 +5812,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_LOAD( "mxo-cg2004.u75", 0x18000, 0x8000, CRC(5aaa4480) SHA1(353c4ce566c944406fce21f2c5045c856ef7a609) ) ROM_REGION( 0x100, "proms", 0 ) - ROM_LOAD( "cap740.u50", 0x0000, 0x0100, CRC(6fe619c4) SHA1(49e43dafd010ce0fe9b2a63b96a4ddedcb933c6d) ) + ROM_LOAD( "cap740.u50", 0x0000, 0x0100, CRC(6fe619c4) SHA1(49e43dafd010ce0fe9b2a63b96a4ddedcb933c6d) ) ROM_END ROM_START( pepp0445 ) /* Normal board : Aces & Faces Bonus Joker Poker (PP0445) */ diff --git a/src/mame/drivers/pg685.cpp b/src/mame/drivers/pg685.cpp index 45b87a26432..bf5c490501f 100644 --- a/src/mame/drivers/pg685.cpp +++ b/src/mame/drivers/pg685.cpp @@ -68,13 +68,13 @@ HD: SRM2064C-15, WD2010B-AL, 10,000000 MHz crystal 6ES5675-OUA11 -The PG-675 shares the housing with the PG-685, but uses dual 48 tpi floppy drives instead of the harddisk/96 tpi +The PG-675 shares the housing with the PG-685, but uses dual 48 tpi floppy drives instead of the harddisk/96 tpi drive combo. -CPU/Video: 8KB BIOS/CHAR EPROM, Intel 8088 CPU, SAB 8259AP, 12,288 MHz crystal, 2xHM6116LP-3, - HD46505SP-1 (HD68A45SP), D8279C-5, D8251AFC -Module/Floppy: Crystal 4.000 MHz, SAB 1797-02P, 2xP8255A, MM58167AN, 4xHM6116LP-3, D8251AFC -Memory: 54x 64KBit RAM, 18 empty sockets, 9 bit and 4 bit wire straps +CPU/Video: 8KB BIOS/CHAR EPROM, Intel 8088 CPU, SAB 8259AP, 12,288 MHz crystal, 2xHM6116LP-3, + HD46505SP-1 (HD68A45SP), D8279C-5, D8251AFC +Module/Floppy: Crystal 4.000 MHz, SAB 1797-02P, 2xP8255A, MM58167AN, 4xHM6116LP-3, D8251AFC +Memory: 54x 64KBit RAM, 18 empty sockets, 9 bit and 4 bit wire straps ****************************************************************************/ @@ -202,7 +202,7 @@ static ADDRESS_MAP_START(pg685oua12_mem, AS_PROGRAM, 16, pg685_state) AM_RANGE(0xf9f78, 0xf9f79) AM_WRITE8(f9f79_w, 0xff00) AM_RANGE(0xf9f80, 0xf9f81) AM_DEVREADWRITE8("crtc", mc6845_device, status_r, address_w, 0x00ff) AM_RANGE(0xf9f80, 0xf9f81) AM_DEVREADWRITE8("crtc", mc6845_device, register_r, register_w, 0xff00) - AM_RANGE(0xfc000,0xfffff) AM_RAM // BIOS RAM shadow + AM_RANGE(0xfc000,0xfffff) AM_RAM // BIOS RAM shadow AM_RANGE(0xffc000,0xffffff) AM_ROM AM_REGION("bios", 0) ADDRESS_MAP_END @@ -317,7 +317,7 @@ MC6845_UPDATE_ROW( pg685_state::crtc_update_row ) uint8_t data = fontram[ chr_base + chr * 16 ]; uint8_t fg = 1; uint8_t bg = 0; - + *p = palette[( data & 0x80 ) ? fg : bg]; p++; *p = palette[( data & 0x40 ) ? fg : bg]; p++; *p = palette[( data & 0x20 ) ? fg : bg]; p++; @@ -345,7 +345,7 @@ MC6845_UPDATE_ROW( pg685_state::crtc_update_row_oua12 ) uint8_t data = fontram[ chr_base + chr * 16 ]; uint8_t fg = 1; uint8_t bg = 0; - + *p = palette[( data & 0x80 ) ? fg : bg]; p++; *p = palette[( data & 0x40 ) ? fg : bg]; p++; *p = palette[( data & 0x20 ) ? fg : bg]; p++; @@ -402,7 +402,7 @@ static MACHINE_CONFIG_START( pg675, pg685_state ) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(pg685_state, crtc_update_row) - + // sound hardware // devices @@ -443,7 +443,7 @@ static MACHINE_CONFIG_START( pg685, pg685_state ) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(pg685_state, crtc_update_row) - + // sound hardware // devices diff --git a/src/mame/drivers/polepos.cpp b/src/mame/drivers/polepos.cpp index 4baa9b01870..3ff8dd81f42 100644 --- a/src/mame/drivers/polepos.cpp +++ b/src/mame/drivers/polepos.cpp @@ -2118,7 +2118,7 @@ ROM_END This bootleg has a TMS5220 for spanish voices instead of the Namco 52xx. Needs proper implementation. - + DIP Switches reference (to be implemented): .-------------------------------+-----+-----+-----+-----+-----+-----+-----+-----. @@ -2247,14 +2247,14 @@ ROM_START( polepos2bs ) /* the bootleg has a TMS5220, NOT the Namco 52xx */ /* unknown or unused (P)ROM data */ -// ROM_REGION( 0x0100, "user1", 0 ) -// ROM_LOAD( "74s287-a.bin", 0x0000, 0x0100, CRC(0e742cb1) SHA1(3ae43270aab4848fdeece1648e7e040ab216b08e) ) /* sync chain */ +// ROM_REGION( 0x0100, "user1", 0 ) +// ROM_LOAD( "74s287-a.bin", 0x0000, 0x0100, CRC(0e742cb1) SHA1(3ae43270aab4848fdeece1648e7e040ab216b08e) ) /* sync chain */ /* this is used for the spanish speech with a TMS5220, not properly hooked up */ ROM_REGION( 0x2000, "soundz80bl", 0 ) ROM_LOAD( "aboard-spi.11", 0x0000, 0x2000, CRC(269c1af4) SHA1(73acb28f1cf8eae26838835aef1566fea18b4138) ) -// ROM_REGION( 0x2000, "pals", 0 ) +// ROM_REGION( 0x2000, "pals", 0 ) // ...not dumped yet... ROM_END diff --git a/src/mame/drivers/psikyosh.cpp b/src/mame/drivers/psikyosh.cpp index 225734bed6e..40d6ac54e22 100644 --- a/src/mame/drivers/psikyosh.cpp +++ b/src/mame/drivers/psikyosh.cpp @@ -602,9 +602,9 @@ static INPUT_PORTS_START( soldividk ) PORT_INCLUDE( common ) PORT_START("JP4") /* jumper pads on the PCB */ -// PORT_DIPNAME( 0x01000000, 0x01000000, DEF_STR( Region ) ) /* Game is hard coded to Korea */ -// PORT_DIPSETTING( 0x00000000, DEF_STR( Japan ) ) -// PORT_DIPSETTING( 0x01000000, DEF_STR( World ) ) +// PORT_DIPNAME( 0x01000000, 0x01000000, DEF_STR( Region ) ) /* Game is hard coded to Korea */ +// PORT_DIPSETTING( 0x00000000, DEF_STR( Japan ) ) +// PORT_DIPSETTING( 0x01000000, DEF_STR( World ) ) PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, do_read) INPUT_PORTS_END diff --git a/src/mame/drivers/quizpun2.cpp b/src/mame/drivers/quizpun2.cpp index 8f27360b3f7..52e8c06f7e0 100644 --- a/src/mame/drivers/quizpun2.cpp +++ b/src/mame/drivers/quizpun2.cpp @@ -236,7 +236,7 @@ uint32_t quizpun2_state::screen_update_quizpun2(screen_device &screen, bitmap_in if (layers_ctrl & 2) m_fg_tmap->draw(screen, bitmap, cliprect, 0, 0); -// popmessage("BG: %x FG: %x", bg_scroll, fg_scroll); +// popmessage("BG: %x FG: %x", bg_scroll, fg_scroll); return 0; } @@ -458,11 +458,11 @@ ADDRESS_MAP_END READ8_MEMBER(quizpun2_state::quizpun_protection_r) { -// logerror("%s: port A read %02x\n", machine().describe_context(), m_port_a); +// logerror("%s: port A read %02x\n", machine().describe_context(), m_port_a); - /* - Upon reading this port the main cpu is stalled until the mcu provides the value to read - and explicitly un-stalls the z80. Is this possible under the current MAME architecture? + /* + Upon reading this port the main cpu is stalled until the mcu provides the value to read + and explicitly un-stalls the z80. Is this possible under the current MAME architecture? ** ghastly hack ** @@ -490,7 +490,7 @@ READ8_MEMBER(quizpun2_state::quizpun_protection_r) WRITE8_MEMBER(quizpun2_state::quizpun_protection_w) { -// logerror("%s: port A write %02x\n", machine().describe_context(), data); +// logerror("%s: port A write %02x\n", machine().describe_context(), data); m_port_a = data; m_quizpun_pending = true; m_quizpun_written = true; @@ -511,13 +511,13 @@ ADDRESS_MAP_END READ8_MEMBER(quizpun2_state::quizpun_68705_port_a_r) { -// logerror("%s: port A read %02x\n", machine().describe_context(), m_port_a); +// logerror("%s: port A read %02x\n", machine().describe_context(), m_port_a); return m_port_a; } WRITE8_MEMBER(quizpun2_state::quizpun_68705_port_a_w) { -// logerror("%s: port A write %02x\n", machine().describe_context(), data); +// logerror("%s: port A write %02x\n", machine().describe_context(), data); m_port_a = data; } @@ -530,17 +530,17 @@ READ8_MEMBER(quizpun2_state::quizpun_68705_port_b_r) // bit 0: 0 = main cpu is reading uint8_t ret = m_port_b & 0xf4; - ret |= ( m_quizpun_pending ? 0 : (1 << 3)) | - ( (m_quizpun_pending && m_quizpun_written) ? 0 : (1 << 1)) | - ( (m_quizpun_pending && !m_quizpun_written) ? 0 : (1 << 0)) ; + ret |= ( m_quizpun_pending ? 0 : (1 << 3)) | + ( (m_quizpun_pending && m_quizpun_written) ? 0 : (1 << 1)) | + ( (m_quizpun_pending && !m_quizpun_written) ? 0 : (1 << 0)) ; -// logerror("%s: port B read %02x\n", machine().describe_context(), ret); +// logerror("%s: port B read %02x\n", machine().describe_context(), ret); return ret; } WRITE8_MEMBER(quizpun2_state::quizpun_68705_port_b_w) { -// logerror("%s: port B write %02x\n", machine().describe_context(), data); +// logerror("%s: port B write %02x\n", machine().describe_context(), data); // bit 2: 0->1 run main cpu @@ -558,7 +558,7 @@ READ8_MEMBER(quizpun2_state::quizpun_68705_port_c_r) { uint8_t ret = m_port_c & 0xf7; ret |= m_eeprom->do_read() ? 0x08 : 0; -// logerror("%s: port C read %02x\n", machine().describe_context(), ret); +// logerror("%s: port C read %02x\n", machine().describe_context(), ret); return ret; } @@ -573,7 +573,7 @@ WRITE8_MEMBER(quizpun2_state::quizpun_68705_port_c_w) // clock line asserted: write latch or select next bit to read m_eeprom->clk_write((data & 0x01) ? ASSERT_LINE : CLEAR_LINE); -// logerror("%s: port C write %02x\n", machine().describe_context(), data); +// logerror("%s: port C write %02x\n", machine().describe_context(), data); m_port_c = data; } diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp index 21959f7f154..6fac84a96f2 100644 --- a/src/mame/drivers/rainbow.cpp +++ b/src/mame/drivers/rainbow.cpp @@ -7,7 +7,7 @@ //-------------------- Differences to VT240: --------------------------------------------------- // - Registers of graphics option not directly mapped (indirect access via mode register) // - write mask is 16 bits wide (not only 8) -// - scroll register is 8 bits wide - not 16. +// - scroll register is 8 bits wide - not 16. // - no "DMA SCROLL", "LINE ERASE MODE", no ZOOM hardware (factor must always be 1) // Two modes: highres and medres mode (different bank length..?) @@ -685,9 +685,9 @@ private: emu_timer *cmd_timer; const int vectors[9] = { 0x27, 0x26, 0x25, 0x24, 0x23, 0x22, 0x21, 0x20, 0x02 }; - + // VIDEO LEVELS: 0 is 100 % output; F is 0 % output. Range of 0...255. - // LIMITED RANGE levels for 100-A model (valid only for all mono + green out on COLOR MONITOR): + // LIMITED RANGE levels for 100-A model (valid only for all mono + green out on COLOR MONITOR): //const uint8_t A_MONO_GREEN_video_levels[16] = { 255 , 185, 166, 21, 255 , 185, 166, 21, 255 , 185, 166, 21, 255 , 185, 166, 21}; // FULL RANGE video levels for 100-B model, taken from page 46 of PDF @@ -712,8 +712,8 @@ m_patidx = 7; \ m_GDC_FG_BG = 0; \ m_color_map_changed = true; \ for(int i=0; i <256; i++) { m_GDC_SCROLL_BUFFER[i] = m_GDC_SCROLL_BUFFER_PRELOAD[i] = i; };\ -m_GDC_scroll_index = 255; \ -m_scroll_buffer_changed = true; \ +m_GDC_scroll_index = 255; \ +m_scroll_buffer_changed = true; \ printf("\n** NEC 7220 GDC RESET **\n"); UPD7220_DISPLAY_PIXELS_MEMBER( rainbow_state::hgdc_display_pixels ) @@ -737,8 +737,8 @@ UPD7220_DISPLAY_PIXELS_MEMBER( rainbow_state::hgdc_display_pixels ) return; // no output from graphics option // ********************* GET BITMAP DATA FOR 4 PLANES *************************************** - // _READ_ BIT MAP from 2 or 4 planes (plane 0 is least, plane 3 most significant). See page 42 / 43 - if(m_GDC_MODE_REGISTER & GDC_MODE_HIGHRES) + // _READ_ BIT MAP from 2 or 4 planes (plane 0 is least, plane 3 most significant). See page 42 / 43 + if(m_GDC_MODE_REGISTER & GDC_MODE_HIGHRES) { plane0 = m_video_ram[((address & 0x7fff) + 0x00000) >> 1]; plane1 = m_video_ram[((address & 0x7fff) + 0x10000) >> 1]; @@ -1119,14 +1119,14 @@ void rainbow_state::machine_reset() output().set_value("led1", 1); uint32_t max_sector = (info->cylinders) * (info->heads) * (info->sectors); - printf("\n%u (%3.2f) MB HARD DISK MOUNTED. GEOMETRY: %d HEADS (1..%d ARE OK).\n%d CYLINDERS (151 to %d ARE OK).\n%d SECTORS / TRACK (up to %d ARE OK). \n%d BYTES / SECTOR (128 to 1024 ARE OK).\n", + printf("\n%u (%3.2f) MB HARD DISK MOUNTED. GEOMETRY: %d HEADS (1..%d ARE OK).\n%d CYLINDERS (151 to %d ARE OK).\n%d SECTORS / TRACK (up to %d ARE OK). \n%d BYTES / SECTOR (128 to 1024 ARE OK).\n", max_sector * info->sectorbytes / 1000000, (float)max_sector * (float)info->sectorbytes / 1048576.0f, info->heads, RD51_MAX_HEAD, info->cylinders, RD51_MAX_CYLINDER, info->sectors, RD51_SECTORS_PER_TRACK, info->sectorbytes); - } + } } } @@ -1216,28 +1216,28 @@ uint32_t rainbow_state::screen_update_rainbow(screen_device &screen, bitmap_ind1 } #endif - int monitor_selected = m_inp13->read(); - if(monitor_selected != old_monitor) - { + int monitor_selected = m_inp13->read(); + if(monitor_selected != old_monitor) + { old_monitor = monitor_selected; m_color_map_changed = true; } - int palette_selected; + int palette_selected; if( m_ONBOARD_GRAPHICS_SELECTED && (monitor_selected == COLOR_MONITOR) ) - palette_selected = 2; // Color monitor; green text + palette_selected = 2; // Color monitor; green text else palette_selected = m_inp9->read(); - if(palette_selected != old_palette) - { + if(palette_selected != old_palette) + { old_palette = palette_selected; m_color_map_changed = true; } m_crtc->palette_select(palette_selected); - if( m_SCREEN_BLANK || + if( m_SCREEN_BLANK || ( (!m_ONBOARD_GRAPHICS_SELECTED) && (monitor_selected != DUAL_MONITOR) ) // blank screen 1, except when in DUAL_MONITOR mode ) m_crtc->video_blanking(bitmap, cliprect); @@ -1284,11 +1284,11 @@ void rainbow_state::lower_8088_irq(int ref) // IRQ service for 7201 (commm / printer) void rainbow_state::update_mpsc_irq() { - if (m_mpsc_irq == 0) { - lower_8088_irq(IRQ_COMM_PTR_INTR_L); - m_mpsc->m1_r(); // interrupt acknowledge - } else - raise_8088_irq(IRQ_COMM_PTR_INTR_L); + if (m_mpsc_irq == 0) { + lower_8088_irq(IRQ_COMM_PTR_INTR_L); + m_mpsc->m1_r(); // interrupt acknowledge + } else + raise_8088_irq(IRQ_COMM_PTR_INTR_L); } @@ -1503,7 +1503,7 @@ hard_disk_file *(rainbow_state::rainbow_hdc_file(int drv)) printf("\n <<< === REJECTED = (SANITY CHECK FAILED) === >>> \n"); uint32_t max_sector = info->cylinders * info->heads * info->sectors; - printf("\n%u (%3.2f) MB HARD DISK REJECTED. GEOMETRY: %d HEADS (1..%d ARE OK).\n%d CYLINDERS (151 to %d ARE OK).\n%d SECTORS / TRACK (up to %d ARE OK). \n%d BYTES / SECTOR (128 to 1024 ARE OK).\n", + printf("\n%u (%3.2f) MB HARD DISK REJECTED. GEOMETRY: %d HEADS (1..%d ARE OK).\n%d CYLINDERS (151 to %d ARE OK).\n%d SECTORS / TRACK (up to %d ARE OK). \n%d BYTES / SECTOR (128 to 1024 ARE OK).\n", max_sector * info->sectorbytes / 1000000, (float)max_sector * (float)info->sectorbytes / 1048576.0f, info->heads, RD51_MAX_HEAD, @@ -2236,7 +2236,7 @@ WRITE8_MEMBER(rainbow_state::z80_diskcontrol_w) m_floppy = con->get_device(); if (m_floppy) selected_drive = drive; -// printf("%i <- SELECTED DRIVE...\n", m_unit); +// printf("%i <- SELECTED DRIVE...\n", m_unit); } if (selected_drive == INVALID_DRIVE) @@ -2369,29 +2369,29 @@ WRITE_LINE_MEMBER(rainbow_state::GDC_vblank_irq) int xi; if(m_scroll_buffer_changed) - { + { m_scroll_buffer_changed = false; - for(xi = 0; xi < m_GDC_scroll_index; xi++) // LOAD REAL SCROLL BUFFER FROM PRELOAD (up to scroll_index...?) - m_GDC_SCROLL_BUFFER[xi] = m_GDC_SCROLL_BUFFER_PRELOAD[xi]; - } + for(xi = 0; xi < m_GDC_scroll_index; xi++) // LOAD REAL SCROLL BUFFER FROM PRELOAD (up to scroll_index...?) + m_GDC_SCROLL_BUFFER[xi] = m_GDC_SCROLL_BUFFER_PRELOAD[xi]; + } if(m_color_map_changed) - { + { m_color_map_changed = false; int mono_sum = 0; int green_sum = 0; - for(xi=0;xi<16;xi++) // DELAYED LOAD OF PALETTE ... - { + for(xi=0;xi<16;xi++) // DELAYED LOAD OF PALETTE ... + { uint8_t colordata1 = m_GDC_COLOR_MAP[xi]; - uint8_t colordata2 = m_GDC_COLOR_MAP[xi + 16]; // Does it matter if the palette is incomplete...? + uint8_t colordata2 = m_GDC_COLOR_MAP[xi + 16]; // Does it matter if the palette is incomplete...? - // Color map: 32 x 8 - // 2nd 16 Byte 1st 16 Bytes (colordata1) - // ----------- ------------ - // 7..4 3..0 7..4 3..0 - // Mono Blue Red Green + // Color map: 32 x 8 + // 2nd 16 Byte 1st 16 Bytes (colordata1) + // ----------- ------------ + // 7..4 3..0 7..4 3..0 + // Mono Blue Red Green // NOTE: 2nd 16 BYTES ARE MONO PALETTE, 1st 16 ARE COLOR PALETTE * HERE * (on the VT240 driver, it is the other way round) mono = (colordata2 & 0xF0) >> 4; // FIXME: limit palette in appropriate modes on 100-A @@ -2404,56 +2404,56 @@ WRITE_LINE_MEMBER(rainbow_state::GDC_vblank_irq) green_sum += green; switch( m_inp13->read()) - { - case MONO_MONITOR: - { + { + case MONO_MONITOR: + { switch( m_inp9->read() ) // - monochrome monitor (phosphor) type (1,2,3) - { + { case 1: // BLACK & WHITE mono = uint8_t( ( 205.0f / 80.0f) * ( video_levels[ mono ] / 3.19f) ); - m_palette2->set_pen_color(xi + 16, rgb_t( mono, mono, mono) ); + m_palette2->set_pen_color(xi + 16, rgb_t( mono, mono, mono) ); break; - case 2: // SHADES OF GREEN + case 2: // SHADES OF GREEN red = uint8_t( ( 35.0f / 80.0f) * ( video_levels[ mono ] / 3.19f) ); // 80 % = NORMAL * green = uint8_t( (145.0f / 80.0f) * ( video_levels[ mono ] / 3.19f) ); blue = uint8_t( ( 75.0f / 80.0f) * ( video_levels[ mono ] / 3.19f) ); - m_palette2->set_pen_color(xi + 16, rgb_t( red, green, blue) ); + m_palette2->set_pen_color(xi + 16, rgb_t( red, green, blue) ); break; case 3: // AMBER. Assumption: "normal" value at 80 % is 213, 146, 82 (decimal) red = uint8_t( (213.0f / 80.0f) * ( video_levels[ mono ] / 3.19f) ); // 80 % = NORMAL * is 3.19f (100 % would be 2.55f) green = uint8_t( (146.0f / 80.0f) * ( video_levels[ mono ] / 3.19f) ); blue = uint8_t( ( 82.0f / 80.0f) * ( video_levels[ mono ] / 3.19f) ); - m_palette2->set_pen_color(xi + 16, rgb_t( red, green, blue) ); + m_palette2->set_pen_color(xi + 16, rgb_t( red, green, blue) ); break; } break; } - case COLOR_MONITOR: - red = uint8_t( red * 17 * ( (255-video_levels[ red ] ) / 255.0f) ); + case COLOR_MONITOR: + red = uint8_t( red * 17 * ( (255-video_levels[ red ] ) / 255.0f) ); green = uint8_t( mono * 17 * ( (255-video_levels[ mono ]) / 255.0f) ); // BCC-17 cable (red, mono -> green, blue) blue = uint8_t( blue * 17 * ( (255-video_levels[ blue ] ) / 255.0f) ); - m_palette2->set_pen_color(xi, rgb_t( red, green, blue) ); + m_palette2->set_pen_color(xi, rgb_t( red, green, blue) ); break; - case DUAL_MONITOR: - red = uint8_t( red * 17 * ( (255-video_levels[ red ] ) / 255.0f) ); + case DUAL_MONITOR: + red = uint8_t( red * 17 * ( (255-video_levels[ red ] ) / 255.0f) ); green = uint8_t( green * 17 * ( (255-video_levels[ green ]) / 255.0f) ); // true R-G-B (homebrew cable only) blue = uint8_t( blue * 17 * ( (255-video_levels[ blue ] ) / 255.0f) ); - m_palette2->set_pen_color(xi, rgb_t( red, green, blue) ); + m_palette2->set_pen_color(xi, rgb_t( red, green, blue) ); break; } - + } // palette (loop) if(mono_sum == 0) - if ( m_inp13->read() == COLOR_MONITOR) + if ( m_inp13->read() == COLOR_MONITOR) printf(" [HINT: COLOR MONITOR (DIP SWITCH) WRONG! NO MONO PALETTE] "); if(green_sum == 0) - if ( m_inp13->read() == DUAL_MONITOR) + if ( m_inp13->read() == DUAL_MONITOR) printf(" [HINT: DUAL MONITOR (DIP SWITCH) WRONG! NO GREEN PALETTE] "); } // color map changed? } // 7220 vblank IRQ @@ -2677,36 +2677,36 @@ WRITE_LINE_MEMBER(rainbow_state::irq_hi_w) // ********************************* NEC UPD7220 *********************************************** // Readback mode: correct place? Not for vector mode (really)...? -// NOTE: "More than one plane at a time can be enabled for a write operation; however, +// NOTE: "More than one plane at a time can be enabled for a write operation; however, // only one plane can be enabled for a read operation at anyone time." READ16_MEMBER(rainbow_state::vram_r) -{ +{ if((!(m_GDC_MODE_REGISTER & GDC_MODE_VECTOR)) || space.debugger_access()) // (NOT VECTOR MODE) { // SCROLL_MAP IN BITMAP MODE ONLY...? - if(m_GDC_MODE_REGISTER & GDC_MODE_HIGHRES) + if(m_GDC_MODE_REGISTER & GDC_MODE_HIGHRES) offset = ( m_GDC_SCROLL_BUFFER[ (offset & 0x3FC0) >> 6 ] << 6) | (offset & 0x3F); else offset = ( m_GDC_SCROLL_BUFFER[ (offset & 0x1FC0) >> 6 ] << 6) | (offset & 0x3F); int readback_plane = 0; - if( !(m_GDC_MODE_REGISTER & GDC_MODE_ENABLE_WRITES) ) // 0x10 // READBACK OPERATION - if ENABLE_WRITES NOT SET - readback_plane = (m_GDC_MODE_REGISTER & GDC_MODE_READBACK_PLANE_MASK) >> 2; // READBACK PLANE 00..02, mask in bits 2+3 + if( !(m_GDC_MODE_REGISTER & GDC_MODE_ENABLE_WRITES) ) // 0x10 // READBACK OPERATION - if ENABLE_WRITES NOT SET + readback_plane = (m_GDC_MODE_REGISTER & GDC_MODE_READBACK_PLANE_MASK) >> 2; // READBACK PLANE 00..02, mask in bits 2+3 return m_video_ram[ (offset & 0x7fff) + (0x8000 * readback_plane)]; - } + } return 0xffff; } // NOTE: Rainbow has separate registers for fore and background. WRITE16_MEMBER(rainbow_state::vram_w) { - if(!(m_GDC_MODE_REGISTER & GDC_MODE_VECTOR)) + if(!(m_GDC_MODE_REGISTER & GDC_MODE_VECTOR)) { // SCROLL_MAP IN BITMAP MODE ONLY...? - if(m_GDC_MODE_REGISTER & GDC_MODE_HIGHRES) + if(m_GDC_MODE_REGISTER & GDC_MODE_HIGHRES) offset = ( m_GDC_SCROLL_BUFFER[ (offset & 0x3FC0) >> 6 ] << 6) | (offset & 0x3F); else offset = ( m_GDC_SCROLL_BUFFER[ (offset & 0x1FC0) >> 6 ] << 6) | (offset & 0x3F); @@ -2780,11 +2780,11 @@ WRITE16_MEMBER(rainbow_state::vram_w) back >>= 1; } // plane select (LOOP) - return; + return; } } -// (READ) +// (READ) // Read _preloaded_ scroll buffer (see GDC Diagnostic Disk, SCROLL BUFFER test) READ8_MEMBER(rainbow_state::GDC_EXTRA_REGISTER_r) { @@ -2794,12 +2794,12 @@ READ8_MEMBER(rainbow_state::GDC_EXTRA_REGISTER_r) case 0: out = m_PORT50; break; - + case 1: if(m_GDC_INDIRECT_REGISTER & GDC_SELECT_SCROLL_MAP ) // 0x80 - { + { // Documentation says it is always incremented (read and write): - out = m_GDC_SCROLL_BUFFER_PRELOAD[m_GDC_scroll_index++]; // // * READ * SCROLL_MAP ( 256 x 8 ) + out = m_GDC_SCROLL_BUFFER_PRELOAD[m_GDC_scroll_index++]; // // * READ * SCROLL_MAP ( 256 x 8 ) m_GDC_scroll_index &= 0xFF; // 0...255 (CPU accesses 256 bytes) break; } @@ -2832,14 +2832,14 @@ WRITE8_MEMBER(rainbow_state::GDC_EXTRA_REGISTER_w) switch(offset) { - case 0: // Mode register must be reloaded following any write to port 50 (software reset). - // FIXME: "Any write to this port also resynchronizes the - // read/modify/write memory cycles of the Graphics Option to those of the GDC." (?) + case 0: // Mode register must be reloaded following any write to port 50 (software reset). + // FIXME: "Any write to this port also resynchronizes the + // read/modify/write memory cycles of the Graphics Option to those of the GDC." (?) if( data & 1 ) // PDF QV069 suggests 1 -> 0 -> 1; most programs just set bit 0. - { + { GDC_RESET_MACRO // Graphics option software reset (separate from GDC reset...) printf("(PC=%x)\n", machine().device("maincpu")->safe_pc()); - } + } m_PORT50 = data; break; @@ -2979,7 +2979,7 @@ WRITE8_MEMBER(rainbow_state::GDC_EXTRA_REGISTER_w) // -------------------- WRITE BUFFER USED IN WORD MODE ONLY ! // "OUTPUT WRITE BUFFER IS THE INVERSE OF THE INPUT" (quote from 4-3 of the PDF) // BITSWAP SEEMS NECESSARY (see digits in DOODLE)... ! - m_GDC_WRITE_BUFFER[m_GDC_write_buffer_index++] = ~BITSWAP8(data, 0, 1, 2, 3, 4, 5, 6, 7); + m_GDC_WRITE_BUFFER[m_GDC_write_buffer_index++] = ~BITSWAP8(data, 0, 1, 2, 3, 4, 5, 6, 7); m_GDC_write_buffer_index &= 0xf; // write up to 16 bytes to port 52h. break; @@ -3007,7 +3007,7 @@ WRITE8_MEMBER(rainbow_state::GDC_EXTRA_REGISTER_w) // There is no specific order for the WRITE_MASK (according to txt/code samples in DEC's PDF). // NOTE: LOW <-> HI JUXTAPOSITION! case 4: // 54h Write Mask LOW - m_GDC_WRITE_MASK = ( BITSWAP8(data, 0, 1, 2, 3, 4, 5, 6, 7) << 8 ) | ( m_GDC_WRITE_MASK & 0x00FF ); + m_GDC_WRITE_MASK = ( BITSWAP8(data, 0, 1, 2, 3, 4, 5, 6, 7) << 8 ) | ( m_GDC_WRITE_MASK & 0x00FF ); break; case 5: // 55h Write Mask HIGH m_GDC_WRITE_MASK = ( m_GDC_WRITE_MASK & 0xFF00 ) | BITSWAP8(data, 0, 1, 2, 3, 4, 5, 6, 7); diff --git a/src/mame/drivers/risc2500.cpp b/src/mame/drivers/risc2500.cpp index 0c0d60fe1cc..a06f5a2e5d2 100644 --- a/src/mame/drivers/risc2500.cpp +++ b/src/mame/drivers/risc2500.cpp @@ -2,11 +2,11 @@ // copyright-holders:Sandro Ronco /****************************************************************************** - Saitek RISC 2500 + Saitek RISC 2500 - TODO: - - Sound is too short and high pitch, better when you underclock the cpu. - Is cpu cycle timing wrong? or waitstate on p1000_w? + TODO: + - Sound is too short and high pitch, better when you underclock the cpu. + Is cpu cycle timing wrong? or waitstate on p1000_w? ******************************************************************************/ @@ -227,7 +227,7 @@ WRITE32_MEMBER(risc2500_state::p1000_w) { if (!(data & 0x08000000)) m_vram[m_vram_addr++ & 0x7f] = data & 0xff; - } + } else if (data & 0x80000000) // Vertical LED { for(int i=0; i<8; i++) @@ -242,9 +242,9 @@ WRITE32_MEMBER(risc2500_state::p1000_w) { memset(m_vram, 0, sizeof(m_vram)); } - + m_dac->write(data >> 28 & 3); // Speaker - + m_p1000 = data; } diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index 882b2d09bb6..3c8e51e341f 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -9025,9 +9025,9 @@ static MACHINE_CONFIG_START( kiwame, seta_state ) MCFG_CPU_PROGRAM_MAP(kiwame_map) /* lev 1-7 are the same. WARNING: the interrupt table is written to. */ MCFG_CPU_VBLANK_INT_DRIVER("screen", seta_state, irq1_line_hold) - + MCFG_NVRAM_ADD_0FILL("nvram") - + MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0) MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode") MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback) @@ -10760,7 +10760,7 @@ ROM_START( kiwame ) ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_LOAD( "fp001006.bin", 0x000000, 0x080000, CRC(96cf395d) SHA1(877b291598e3a42e5003b2f50a16d162348ce72d) ) ROM_LOAD( "fp001005.bin", 0x080000, 0x080000, CRC(65b5fe9a) SHA1(35605be00c7c455551d18386fcb5ad013aa2907e) ) - + // default NVRAM, avoids "BACKUP RAM ERROR" at boot (useful for inp record/playback) ROM_REGION( 0x10000, "nvram", 0 ) ROM_LOAD( "nvram.bin", 0, 0x10000, CRC(1f719400) SHA1(c63bbe5d3a0a917f74c1bd5e57cd44389e4e645c) ) diff --git a/src/mame/drivers/statriv2.cpp b/src/mame/drivers/statriv2.cpp index df7f437290d..d226c24900d 100644 --- a/src/mame/drivers/statriv2.cpp +++ b/src/mame/drivers/statriv2.cpp @@ -1142,8 +1142,8 @@ DRIVER_INIT_MEMBER(statriv2_state,addr_lmhe) DRIVER_INIT_MEMBER(statriv2_state,laserdisc) { address_space &iospace = m_maincpu->space(AS_IO); - iospace.install_readwrite_handler(0x28, 0x2b, - read8_delegate([this](address_space &space, offs_t offset, uint8_t mem_mask) -> uint8_t + iospace.install_readwrite_handler(0x28, 0x2b, + read8_delegate([this](address_space &space, offs_t offset, uint8_t mem_mask) -> uint8_t { uint8_t result = 0x00; if (offset == 1) @@ -1151,7 +1151,7 @@ DRIVER_INIT_MEMBER(statriv2_state,laserdisc) osd_printf_debug("%s:ld read ($%02X) = %02X\n", machine().describe_context(), 0x28 + offset, result); return result; },"write_lambda"), - write8_delegate([this](address_space &space, offs_t offset, uint8_t data, uint8_t mem_mask) + write8_delegate([this](address_space &space, offs_t offset, uint8_t data, uint8_t mem_mask) { osd_printf_debug("%s:ld write ($%02X) = %02X\n", machine().describe_context(), 0x28 + offset, data); },"read_lambda") diff --git a/src/mame/drivers/tumbleb.cpp b/src/mame/drivers/tumbleb.cpp index bfee0959c6e..3854d8d855d 100644 --- a/src/mame/drivers/tumbleb.cpp +++ b/src/mame/drivers/tumbleb.cpp @@ -2271,7 +2271,7 @@ static MACHINE_CONFIG_DERIVED( chokchok, htchctch ) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) // some PCBs have left factory with a 3.57mhz while some have a 4.096 which matches other games, assuming the former are factory errors - // TODO: MAME sound cores doesn't handle on-the-fly sound frequency changes, I guess best action here is to make the sound chip a slot option, + // TODO: MAME sound cores doesn't handle on-the-fly sound frequency changes, I guess best action here is to make the sound chip a slot option, // assuming it's worth emulating a factory error in the first place. MCFG_OKIM6295_REPLACE("oki", 4096000/4, OKIM6295_PIN7_HIGH) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/tv910.cpp b/src/mame/drivers/tv910.cpp index 2feb8f07043..60471c5915d 100644 --- a/src/mame/drivers/tv910.cpp +++ b/src/mame/drivers/tv910.cpp @@ -2,22 +2,22 @@ // copyright-holders: R. Belmont /*************************************************************************** - TeleVideo TV-910 / 910 Plus - Preliminary driver by R. Belmont - + TeleVideo TV-910 / 910 Plus + Preliminary driver by R. Belmont + Hardware: 6502 CPU 6545 CRTC 6551 ACIA - + IRQ = ACIA wire-OR CRTC VBlank NMI = AY-5-3600 keyboard char present TODO: - - Character attributes: how is that even possible? (Esc-V brings up test screen) - - DIP switches don't all appear to have the expected effects - - Keyboard hookup isn't quite right - + - Character attributes: how is that even possible? (Esc-V brings up test screen) + - DIP switches don't all appear to have the expected effects + - Keyboard hookup isn't quite right + ****************************************************************************/ #include "emu.h" @@ -27,10 +27,10 @@ #include "machine/kb3600.h" #include "bus/rs232/rs232.h" -#define ACIA_TAG "acia1" -#define CRTC_TAG "crtc" -#define RS232_TAG "rs232" -#define KBDC_TAG "ay3600" +#define ACIA_TAG "acia1" +#define CRTC_TAG "crtc" +#define RS232_TAG "rs232" +#define KBDC_TAG "ay3600" #define MASTER_CLOCK (13608000) @@ -49,26 +49,26 @@ public: virtual void machine_start() override; virtual void machine_reset() override; - + MC6845_UPDATE_ROW(crtc_update_row); MC6845_ON_UPDATE_ADDR_CHANGED(crtc_update_addr); - + DECLARE_READ8_MEMBER(charset_r); DECLARE_READ8_MEMBER(kbd_ascii_r); DECLARE_READ8_MEMBER(kbd_flags_r); - + DECLARE_WRITE8_MEMBER(vbl_ack_w); DECLARE_WRITE8_MEMBER(nmi_ack_w); DECLARE_WRITE8_MEMBER(control_w); DECLARE_WRITE_LINE_MEMBER(vbl_w); DECLARE_WRITE_LINE_MEMBER(acia_irq_w); - + DECLARE_READ_LINE_MEMBER(ay3600_shift_r); DECLARE_READ_LINE_MEMBER(ay3600_control_r); DECLARE_WRITE_LINE_MEMBER(ay3600_data_ready_w); DECLARE_WRITE_LINE_MEMBER(ay3600_ako_w); - + required_device m_maincpu; required_device m_crtc; required_shared_ptr m_vram; @@ -78,21 +78,21 @@ public: private: uint8_t *m_vramptr, *m_chrrom; - + uint16_t m_lastchar, m_strobe; uint8_t m_transchar; bool m_anykeydown; int m_repeatdelay; - + uint8_t m_control; - + bool m_vbl_irq, m_aica_irq; }; static ADDRESS_MAP_START(tv910_mem, AS_PROGRAM, 8, tv910_state) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x03ff) AM_RAM - AM_RANGE(0x4000, 0x47ff) AM_RAM AM_SHARE("vram") // VRAM + AM_RANGE(0x4000, 0x47ff) AM_RAM AM_SHARE("vram") // VRAM AM_RANGE(0x8010, 0x801f) AM_READ(charset_r) AM_RANGE(0x8020, 0x8020) AM_DEVREADWRITE(CRTC_TAG, r6545_1_device, status_r, address_w) AM_RANGE(0x8021, 0x8021) AM_DEVREADWRITE(CRTC_TAG, r6545_1_device, register_r, register_w) @@ -102,8 +102,8 @@ static ADDRESS_MAP_START(tv910_mem, AS_PROGRAM, 8, tv910_state) AM_RANGE(0x8060, 0x806f) AM_READ(kbd_ascii_r) AM_RANGE(0x8070, 0x807f) AM_READ(kbd_flags_r) AM_RANGE(0x9000, 0x9000) AM_WRITE(control_w) - AM_RANGE(0x9001, 0x9001) AM_READ_PORT("DSW1") // S2 in the operator's manual - AM_RANGE(0x9002, 0x9002) AM_READ_PORT("DSW2") // S1 in the operator's manual + AM_RANGE(0x9001, 0x9001) AM_READ_PORT("DSW1") // S2 in the operator's manual + AM_RANGE(0x9002, 0x9002) AM_READ_PORT("DSW2") // S1 in the operator's manual AM_RANGE(0xf000, 0xffff) AM_ROM AM_REGION("maincpu", 0) ADDRESS_MAP_END @@ -123,7 +123,7 @@ WRITE8_MEMBER(tv910_state::control_w) READ8_MEMBER(tv910_state::charset_r) { - return 0; // 0 = US (TODO: make this configurable) + return 0; // 0 = US (TODO: make this configurable) } WRITE8_MEMBER(tv910_state::nmi_ack_w) @@ -140,11 +140,11 @@ READ8_MEMBER(tv910_state::kbd_ascii_r) READ8_MEMBER(tv910_state::kbd_flags_r) { uint8_t rv = 0; - + //rv |= m_strobe ? 0x40 : 0; - //rv |= (m_kbspecial->read() & 0x01) ? 0x00 : 0x40; // caps lock - rv |= 0x40; // must be set for keyboard reads to work, but disagrees with docs? - + //rv |= (m_kbspecial->read() & 0x01) ? 0x00 : 0x40; // caps lock + rv |= 0x40; // must be set for keyboard reads to work, but disagrees with docs? + return rv; } @@ -178,9 +178,9 @@ WRITE_LINE_MEMBER(tv910_state::ay3600_data_ready_w) m_lastchar = m_ay3600->b_r(); m_transchar = decode[m_lastchar]; m_strobe = 1; - + m_maincpu->set_input_line(M6502_NMI_LINE, ASSERT_LINE); - //printf("new char = %04x (%02x)\n", m_lastchar, m_transchar); + //printf("new char = %04x (%02x)\n", m_lastchar, m_transchar); } } @@ -233,7 +233,7 @@ static INPUT_PORTS_START( tv910 ) PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'') PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#') PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_UNUSED) - + PORT_START("X2") PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('R') PORT_CHAR('r') PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Tab") PORT_CODE(KEYCODE_TAB) PORT_CHAR(9) @@ -244,7 +244,7 @@ static INPUT_PORTS_START( tv910 ) PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('U') PORT_CHAR('u') PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('E') PORT_CHAR('e') PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_UNUSED) - + PORT_START("X3") PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('G') PORT_CHAR('g') PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('A') PORT_CHAR('a') @@ -266,9 +266,9 @@ static INPUT_PORTS_START( tv910 ) /// 040 - BRK PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('[') /// 100 - BACKTAB - + PORT_START("X5") - PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PRTSCR) PORT_CHAR(UCHAR_MAMEKEY(PRTSCR)) + PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PRTSCR) PORT_CHAR(UCHAR_MAMEKEY(PRTSCR)) PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('L') PORT_CHAR('l') PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(UTF8_LEFT) PORT_CODE(KEYCODE_LEFT) PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR(':') @@ -316,7 +316,7 @@ static INPUT_PORTS_START( tv910 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Control") PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_2) - PORT_START("DSW2") // "S1" in the Operator's Manual + PORT_START("DSW2") // "S1" in the Operator's Manual PORT_DIPNAME( 0x0f, 0x00, "Baud rate" ) PORT_DIPSETTING( 0x0, "9600" ) PORT_DIPSETTING( 0x1, "50" ) @@ -334,7 +334,7 @@ static INPUT_PORTS_START( tv910 ) PORT_DIPSETTING( 0xd, "7200" ) PORT_DIPSETTING( 0xe, "9600" ) PORT_DIPSETTING( 0xf, "19200" ) - + PORT_DIPNAME( 0x10, 0x00, "Data bits" ) PORT_DIPSETTING( 0x00, "8 bits" ) PORT_DIPSETTING( 0x10, "7 bits" ) @@ -345,19 +345,19 @@ static INPUT_PORTS_START( tv910 ) PORT_DIPNAME( 0x40, 0x00, "Parity Type" ) PORT_DIPSETTING( 0x00, "Odd Parity" ) - PORT_DIPSETTING( 0x40, "Even Parity" ) + PORT_DIPSETTING( 0x40, "Even Parity" ) PORT_DIPNAME( 0x80, 0x00, "Stop Bits" ) PORT_DIPSETTING( 0x00, "1 stop bit" ) PORT_DIPSETTING( 0x80, "2 stop bits" ) - PORT_START("DSW1") // "S2" in the Operator's Manual + PORT_START("DSW1") // "S2" in the Operator's Manual PORT_DIPNAME( 0x03, 0x00, "Term Char") PORT_DIPSETTING( 0x0, "0" ) PORT_DIPSETTING( 0x1, "1" ) PORT_DIPSETTING( 0x2, "2" ) PORT_DIPSETTING( 0x3, "3" ) - + PORT_DIPNAME( 0x0c, 0x00, "Emulation" ) PORT_DIPSETTING( 0x0, "Standard 910" ) PORT_DIPSETTING( 0x4, "ADM-3A/5" ) @@ -373,14 +373,14 @@ static INPUT_PORTS_START( tv910 ) PORT_DIPSETTING( 0x20, "Blinking underline" ) PORT_DIPSETTING( 0x40, "Steady block" ) PORT_DIPSETTING( 0x60, "Steady underline" ) - + PORT_DIPNAME( 0x80, 0x00, "Duplex" ) PORT_DIPSETTING( 0x00, "Half Duplex" ) PORT_DIPSETTING( 0x80, "Full Duplex" ) #if 0 PORT_DIPNAME( 0x100, 0x000, "Colors" ) PORT_DIPSETTING( 0x00, "Black characters on white screen" ) - PORT_DIPSETTING( 0x100, "White characters on black screen" ) + PORT_DIPSETTING( 0x100, "White characters on black screen" ) PORT_DIPNAME( 0x200, 0x200, "Data Set Ready" ) PORT_DIPSETTING( 0x00, "DSR connected" ) @@ -415,7 +415,7 @@ WRITE_LINE_MEMBER(tv910_state::vbl_w) WRITE_LINE_MEMBER(tv910_state::acia_irq_w) { m_aica_irq = (state == ASSERT_LINE) ? true : false; - + if (m_aica_irq || m_vbl_irq) { m_maincpu->set_input_line(M6502_IRQ_LINE, ASSERT_LINE); @@ -423,13 +423,13 @@ WRITE_LINE_MEMBER(tv910_state::acia_irq_w) else { m_maincpu->set_input_line(M6502_IRQ_LINE, CLEAR_LINE); - } + } } WRITE8_MEMBER(tv910_state::vbl_ack_w) { m_vbl_irq = false; - + if (m_aica_irq || m_vbl_irq) { m_maincpu->set_input_line(M6502_IRQ_LINE, ASSERT_LINE); @@ -437,7 +437,7 @@ WRITE8_MEMBER(tv910_state::vbl_ack_w) else { m_maincpu->set_input_line(M6502_IRQ_LINE, CLEAR_LINE); - } + } } MC6845_UPDATE_ROW( tv910_state::crtc_update_row ) @@ -462,8 +462,8 @@ MC6845_UPDATE_ROW( tv910_state::crtc_update_row ) data = 0xFF; } } - - if ((y % 10) >= 8) + + if ((y % 10) >= 8) { *p++ = palette[0]; *p++ = palette[0]; @@ -493,18 +493,18 @@ static MACHINE_CONFIG_START( tv910, tv910_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8) MCFG_CPU_PROGRAM_MAP(tv910_mem) - + MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK, 882, 0, 720, 370, 0, 350 ) // not real values + MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK, 882, 0, 720, 370, 0, 350 ) // not real values MCFG_SCREEN_UPDATE_DEVICE( CRTC_TAG, r6545_1_device, screen_update ) - + MCFG_MC6845_ADD(CRTC_TAG, R6545_1, "screen", MASTER_CLOCK/8) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(tv910_state, crtc_update_row) MCFG_MC6845_ADDR_CHANGED_CB(tv910_state, crtc_update_addr) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(tv910_state, vbl_w)) - + MCFG_DEVICE_ADD(KBDC_TAG, AY3600, 0) MCFG_AY3600_MATRIX_X0(IOPORT("X0")) MCFG_AY3600_MATRIX_X1(IOPORT("X1")) @@ -519,7 +519,7 @@ static MACHINE_CONFIG_START( tv910, tv910_state ) MCFG_AY3600_CONTROL_CB(READLINE(tv910_state, ay3600_control_r)) MCFG_AY3600_DATA_READY_CB(WRITELINE(tv910_state, ay3600_data_ready_w)) MCFG_AY3600_AKO_CB(WRITELINE(tv910_state, ay3600_ako_w)) - + MCFG_DEVICE_ADD(ACIA_TAG, MOS6551, 0) MCFG_MOS6551_XTAL(XTAL_1_8432MHz) MCFG_MOS6551_IRQ_HANDLER(WRITELINE(tv910_state, acia_irq_w)) @@ -538,13 +538,13 @@ MACHINE_CONFIG_END /* ROM definition */ ROM_START( tv910 ) ROM_REGION(0x1000, "maincpu", 0) - ROM_LOAD( "1800000-020e_a38_9182.bin", 0x000000, 0x001000, CRC(ae71dd7f) SHA1(a12da9329e28a4a8e3c902f795059251311d2856) ) - + ROM_LOAD( "1800000-020e_a38_9182.bin", 0x000000, 0x001000, CRC(ae71dd7f) SHA1(a12da9329e28a4a8e3c902f795059251311d2856) ) + ROM_REGION(0x2000, "graphics", 0) - ROM_LOAD( "1800000-016a_a17_85ae.bin", 0x000000, 0x001000, CRC(835445b7) SHA1(dde94fb6531dadce48e19bf551f45f61bedf905b) ) + ROM_LOAD( "1800000-016a_a17_85ae.bin", 0x000000, 0x001000, CRC(835445b7) SHA1(dde94fb6531dadce48e19bf551f45f61bedf905b) ) ROM_REGION(0x1000, "keyboard", 0) - ROM_LOAD( "1800000-019b_bell_a2_43d6.bin", 0x000000, 0x000800, CRC(de954a77) SHA1(c4f7c19799c15d12d89f08dc31064fc6be9befb0) ) + ROM_LOAD( "1800000-019b_bell_a2_43d6.bin", 0x000000, 0x000800, CRC(de954a77) SHA1(c4f7c19799c15d12d89f08dc31064fc6be9befb0) ) ROM_END /* Driver */ diff --git a/src/mame/drivers/tv950.cpp b/src/mame/drivers/tv950.cpp index 05bb745d99b..93bda1fa95b 100644 --- a/src/mame/drivers/tv950.cpp +++ b/src/mame/drivers/tv950.cpp @@ -271,7 +271,7 @@ static MACHINE_CONFIG_START( tv950, tv950_state ) MCFG_CPU_PROGRAM_MAP(tv950_mem) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK, 1200, 0, 1120, 370, 0, 250 ) // not real values + MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK, 1200, 0, 1120, 370, 0, 250 ) // not real values MCFG_SCREEN_UPDATE_DEVICE( CRTC_TAG, r6545_1_device, screen_update ) // there are many 6845 CRTC submodels, the Theory of Operation manual references the Rockwell R6545-1 specificially. diff --git a/src/mame/drivers/zn.cpp b/src/mame/drivers/zn.cpp index 9cade11d531..f06eb6a790f 100644 --- a/src/mame/drivers/zn.cpp +++ b/src/mame/drivers/zn.cpp @@ -141,7 +141,7 @@ private: std::unique_ptr m_fx1b_fram; std::unique_ptr m_nbajamex_sram; - + uint32_t m_nbajamex_rombank[2]; uint16_t m_vt83c461_latch; @@ -1891,7 +1891,7 @@ WRITE16_MEMBER(zn_state::nbajamex_bank_w) } m_nbajamex_rombank[offset] = data; - + uint32_t bankbase0 = ((m_nbajamex_rombank[0] & 0x10) ? 0x200000 : 0) + (m_nbajamex_rombank[0] & 7) * 0x400000; uint32_t bankbase1 = ((m_nbajamex_rombank[1] & 0x10) ? 0 : 0x200000) + (m_nbajamex_rombank[1] & 7) * 0x400000; diff --git a/src/mame/drivers/zorba.cpp b/src/mame/drivers/zorba.cpp index 4d5e640cf4f..a3d3c0d4b52 100644 --- a/src/mame/drivers/zorba.cpp +++ b/src/mame/drivers/zorba.cpp @@ -19,7 +19,7 @@ Instead of using a daisy chain, the IM2 vectors are calculated by a prom (u77). contents make no sense at all (mostly FF), so the vectors for IRQ0 and IRQ2 are hard-coded. Other IRQ vectors are not used as yet. -Three companies are known to have sold the Zorba over its lifetime: Telcon Industries, Modular Micros +Three companies are known to have sold the Zorba over its lifetime: Telcon Industries, Modular Micros (a subsidiary of Modular Computers (ModComp)), and Gemini Electronics. 7-inch and 9-inch models were available from Telcon and Modular Micros, while Gemini exclusively sold the 9-inch version. The ROM dumps currently used in this emulation originate from a Modular Micros Zorba. diff --git a/src/mame/includes/apple2gs.h b/src/mame/includes/apple2gs.h index 26e3a5895c6..377e0329d91 100644 --- a/src/mame/includes/apple2gs.h +++ b/src/mame/includes/apple2gs.h @@ -21,9 +21,9 @@ #include "machine/z80scc.h" #define ADBMICRO_TAG "adbmicro" -#define SCC_TAG "scc" -#define RS232A_TAG "printer" -#define RS232B_TAG "modem" +#define SCC_TAG "scc" +#define RS232A_TAG "printer" +#define RS232B_TAG "modem" // IIgs clocks as marked on the schematics #define APPLE2GS_28M (XTAL_28_63636MHz) // IIGS master clock diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h index 859495440ce..33eff4e49a9 100644 --- a/src/mame/includes/darkmist.h +++ b/src/mame/includes/darkmist.h @@ -47,7 +47,7 @@ public: DECLARE_WRITE8_MEMBER(hw_w); DECLARE_WRITE8_MEMBER(tx_vram_w); - + TILE_GET_INFO_MEMBER(get_bgtile_info); TILE_GET_INFO_MEMBER(get_fgtile_info); TILE_GET_INFO_MEMBER(get_txttile_info); diff --git a/src/mame/includes/lsasquad.h b/src/mame/includes/lsasquad.h index 33fc3aff8f3..69246e90a14 100644 --- a/src/mame/includes/lsasquad.h +++ b/src/mame/includes/lsasquad.h @@ -21,7 +21,7 @@ public: required_shared_ptr m_scrollram; required_shared_ptr m_spriteram; required_region_ptr m_priority_prom; - + /* misc */ int m_sound_pending; int m_sound_nmi_enable; diff --git a/src/mame/layout/README.md b/src/mame/layout/README.md index 8bec69ba872..63bee9e81b8 100644 --- a/src/mame/layout/README.md +++ b/src/mame/layout/README.md @@ -3,4 +3,4 @@ Layout files are definition files to describe the look and feel of emulated machines and are the product of many different contributors. -Licensed under [CC0 1.0 Universal (CC0 1.0)](https://creativecommons.org/publicdomain/zero/1.0/) \ No newline at end of file +Licensed under [CC0 1.0 Universal (CC0 1.0)](https://creativecommons.org/publicdomain/zero/1.0/) diff --git a/src/mame/layout/esbattle.lay b/src/mame/layout/esbattle.lay index c05fe9ea3b1..7c093cc8e6b 100644 --- a/src/mame/layout/esbattle.lay +++ b/src/mame/layout/esbattle.lay @@ -26,7 +26,7 @@ - + diff --git a/src/mame/layout/risc2500.lay b/src/mame/layout/risc2500.lay index e5dedf9fe1f..4adb6418077 100644 --- a/src/mame/layout/risc2500.lay +++ b/src/mame/layout/risc2500.lay @@ -188,16 +188,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/mame/machine/apple2gs.cpp b/src/mame/machine/apple2gs.cpp index 0b76ef83802..f7b382432d5 100644 --- a/src/mame/machine/apple2gs.cpp +++ b/src/mame/machine/apple2gs.cpp @@ -1052,15 +1052,15 @@ READ8_MEMBER( apple2gs_state::apple2gs_c0xx_r ) case 0x38: /* C038 - SCCBREG */ result = m_scc->cb_r(space, 0, mem_mask); break; - + case 0x39: /* C039 - SCCAREG */ result = m_scc->ca_r(space, 0, mem_mask); break; - + case 0x3A: /* C03A - SCCBDATA */ result = m_scc->db_r(space, 0, mem_mask); break; - + case 0x3B: /* C03B - SCCADATA */ result = m_scc->da_r(space, 0, mem_mask); break; @@ -1232,19 +1232,19 @@ WRITE8_MEMBER( apple2gs_state::apple2gs_c0xx_w ) case 0x38: /* C038 - SCCBREG */ m_scc->cb_w(space, 0, data); - break; - + break; + case 0x39: /* C039 - SCCAREG */ m_scc->ca_w(space, 0, data); - break; - + break; + case 0x3A: /* C03A - SCCBDATA */ m_scc->db_w(space, 0, data); - break; + break; case 0x3B: /* C03B - SCCADATA */ m_scc->da_w(space, 0, data); - break; + break; case 0x3C: /* C03C - SOUNDCTL */ case 0x3D: /* C03D - SOUNDDATA */ diff --git a/src/mame/machine/atarixga.cpp b/src/mame/machine/atarixga.cpp index 27aa4debef3..cd574d48db9 100644 --- a/src/mame/machine/atarixga.cpp +++ b/src/mame/machine/atarixga.cpp @@ -73,7 +73,7 @@ atari_136094_0072_device::atari_136094_0072_device(const machine_config &mconfig void atari_136094_0072_device::device_start() { m_ram = std::make_unique(RAM_WORDS); - + save_pointer(NAME(m_ram.get()), RAM_WORDS * sizeof(uint16_t)); save_item(NAME(m_address)); save_item(NAME(m_ciphertext)); @@ -296,7 +296,7 @@ void atari_136095_0072_device::device_start() save_pointer(NAME(m_ram.get()), RAM_WORDS * sizeof(uint16_t)); save_item(NAME(m_update.addr)); - save_item(NAME(m_update.data)); + save_item(NAME(m_update.data)); save_item(NAME(m_poly_lsb)); save_item(NAME(m_reply)); } @@ -323,7 +323,7 @@ uint16_t atari_136095_0072_device::powers2(uint8_t k, uint16_t x) { size_t i, n; uint16_t t = 1 << (x % 16); - + if ((x == 15) || (x == 16)) n = k + 13; else @@ -338,7 +338,7 @@ uint16_t atari_136095_0072_device::powers2(uint8_t k, uint16_t x) uint16_t atari_136095_0072_device::decipher(uint8_t k, uint16_t c) { uint16_t i, p = 0; - + /* key 0x00 is special, it has 15 "identical twins". */ static const uint8_t kmap[128] = { @@ -359,27 +359,27 @@ uint16_t atari_136095_0072_device::decipher(uint8_t k, uint16_t c) 0x5D,0x05,0x00,0x08,0x25,0x29,0x30,0x69, 0x00,0x4E,0x35,0x3B,0x00,0x0C,0x0A,0x2B, }; - + /* Only 128 keys internally, if high bit set, then find the 7-bit "twin" by xor 0xA8. */ if (k & 0x80) k ^= 0xA8; - + k = kmap[k]; - + if ((c & (c - 1)) == 0) { return powers2(k, ctz(c)); } - + for (i = 0; i < 15; ++i) { if (1 & (c >> i)) { p ^= powers2(k, i); } } - + if (c & 0x8000) { p ^= powers2(k, 16); } - + uint16_t x = 0xC000; for (i = 0; i < k + 13; ++i) { @@ -388,7 +388,7 @@ uint16_t atari_136095_0072_device::decipher(uint8_t k, uint16_t c) x = lfsr2(x); } - + return p; } @@ -418,7 +418,7 @@ READ32_MEMBER(atari_136095_0072_device::polylsb_read) WRITE32_MEMBER(atari_136095_0072_device::write) { uint16_t address, value = 0; - + address = offset << 2; if (ACCESSING_BITS_16_31) { @@ -429,7 +429,7 @@ WRITE32_MEMBER(atari_136095_0072_device::write) address += 2; value = uint16_t (data & 0xFFFF); } - + switch (m_mode) { case FPGA_SETKEY: @@ -443,11 +443,11 @@ WRITE32_MEMBER(atari_136095_0072_device::write) m_ram[(offset << 1) + 1] = value; } break; - + /* Send Ciphertext to FPGA for decryption. */ case FPGA_DECIPHER: uint16_t key_offset, key_byte; - + /* Algorithm to select key byte based on offset. */ key_offset = ((((address >> 8) & 1) ^ 1) << 0) | ((((address >> 2) & 1) ^ 1) << 1) @@ -464,7 +464,7 @@ WRITE32_MEMBER(atari_136095_0072_device::write) key_byte = m_ram[key_offset]; m_reply = decipher(key_byte, value); break; - + case FPGA_PROCESS: case FPGA_RESULT: default: @@ -478,12 +478,12 @@ READ32_MEMBER(atari_136095_0072_device::read) { uint16_t address; uint32_t reply = 0; - + address = offset << 2; if (ACCESSING_BITS_0_15) address += 2; - + switch (address) { case 0x0020: @@ -503,6 +503,6 @@ READ32_MEMBER(atari_136095_0072_device::read) default: break; } - + return reply; } diff --git a/src/mame/machine/atarixga.h b/src/mame/machine/atarixga.h index d8e0b76c948..5204caa5e94 100644 --- a/src/mame/machine/atarixga.h +++ b/src/mame/machine/atarixga.h @@ -40,14 +40,14 @@ public: virtual DECLARE_WRITE32_MEMBER(write) override; virtual DECLARE_READ32_MEMBER(read) override; - + protected: virtual void device_start() override; virtual void device_reset() override; private: static const size_t RAM_WORDS = 2048; - + uint16_t powers2(uint8_t k, uint16_t x); uint16_t lfsr2(uint16_t x); uint16_t lfsr1(uint16_t x); @@ -59,10 +59,10 @@ private: FPGA_SETKEY, FPGA_DECIPHER }; - + fpga_mode m_mode; uint16_t m_address; // last written address - uint16_t m_ciphertext; // last written ciphertext + uint16_t m_ciphertext; // last written ciphertext }; class atari_136095_0072_device : public atari_xga_device @@ -72,17 +72,17 @@ public: DECLARE_WRITE32_MEMBER(polylsb_write); DECLARE_READ32_MEMBER(polylsb_read); - + virtual DECLARE_WRITE32_MEMBER(write) override; virtual DECLARE_READ32_MEMBER(read) override; - + protected: virtual void device_start() override; virtual void device_reset() override; - + private: static const size_t RAM_WORDS = 4096; - + uint16_t powers2(uint8_t k, uint16_t x); uint16_t lfsr2(uint16_t x); uint16_t lfsr1(uint16_t x); diff --git a/src/mame/machine/cedar_magnet_board.h b/src/mame/machine/cedar_magnet_board.h index 1ffbcef1c05..1672f9e5e76 100644 --- a/src/mame/machine/cedar_magnet_board.h +++ b/src/mame/machine/cedar_magnet_board.h @@ -22,7 +22,7 @@ public: uint8_t* m_ram; z80_device* m_cpu; - + virtual uint8_t read_cpu_bus(int offset); virtual void write_cpu_bus(int offset, uint8_t data); diff --git a/src/mame/machine/cedar_magnet_sound.cpp b/src/mame/machine/cedar_magnet_sound.cpp index bc17672db81..37132fb77f3 100644 --- a/src/mame/machine/cedar_magnet_sound.cpp +++ b/src/mame/machine/cedar_magnet_sound.cpp @@ -62,10 +62,10 @@ static ADDRESS_MAP_START( cedar_magnet_sound_io, AS_IO, 8, cedar_magnet_sound_de AM_RANGE(0x0c, 0x0c) AM_DEVWRITE("aysnd0", ay8910_device, address_w) AM_RANGE(0x0d, 0x0d) AM_DEVWRITE("aysnd0", ay8910_device, data_w) - + AM_RANGE(0x10, 0x10) AM_DEVWRITE("aysnd1", ay8910_device, address_w) AM_RANGE(0x11, 0x11) AM_DEVWRITE("aysnd1", ay8910_device, data_w) - + AM_RANGE(0x14, 0x14) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -84,12 +84,12 @@ WRITE8_MEMBER(cedar_magnet_sound_device::ay1_porta_w) WRITE_LINE_MEMBER(cedar_magnet_sound_device::ctc0_z0_w) { -// printf("USED ctc0_z0_w %d\n", state); +// printf("USED ctc0_z0_w %d\n", state); } WRITE_LINE_MEMBER(cedar_magnet_sound_device::ctc0_z1_w) { -// printf("USED ctc0_z1_w %d\n", state); +// printf("USED ctc0_z1_w %d\n", state); } @@ -148,8 +148,8 @@ TIMER_CALLBACK_MEMBER(cedar_magnet_sound_device::reset_assert_callback) INTERRUPT_GEN_MEMBER(cedar_magnet_sound_device::fake_irq) { // these should be coming from the CTC... -// if (m_fake_counter==0) m_cpu->set_input_line_and_vector(0, HOLD_LINE,0xe6); -// if (m_fake_counter==1) m_cpu->set_input_line_and_vector(0, HOLD_LINE,0xee); +// if (m_fake_counter==0) m_cpu->set_input_line_and_vector(0, HOLD_LINE,0xe6); +// if (m_fake_counter==1) m_cpu->set_input_line_and_vector(0, HOLD_LINE,0xee); if (m_fake_counter==2) m_cpu->set_input_line_and_vector(0, HOLD_LINE,0xf6); // drives the AY, should be from ctc1 4th counter? m_fake_counter++; @@ -161,19 +161,19 @@ static MACHINE_CONFIG_FRAGMENT( cedar_magnet_sound ) MCFG_CPU_ADD("topcpu", Z80,4000000) MCFG_CPU_PROGRAM_MAP(cedar_magnet_sound_map) MCFG_CPU_IO_MAP(cedar_magnet_sound_io) -// MCFG_Z80_DAISY_CHAIN(daisy_chain) +// MCFG_Z80_DAISY_CHAIN(daisy_chain) MCFG_CPU_PERIODIC_INT_DRIVER(cedar_magnet_sound_device, fake_irq, 4*60) MCFG_DEVICE_ADD("ctc0", Z80CTC, 4000000/8 ) -// MCFG_Z80CTC_INTR_CB(INPUTLINE("topcpu", INPUT_LINE_IRQ0)) +// MCFG_Z80CTC_INTR_CB(INPUTLINE("topcpu", INPUT_LINE_IRQ0)) MCFG_Z80CTC_INTR_CB(WRITELINE(cedar_magnet_sound_device, ctc0_int_w)) MCFG_Z80CTC_ZC0_CB(WRITELINE(cedar_magnet_sound_device, ctc0_z0_w)) MCFG_Z80CTC_ZC1_CB(WRITELINE(cedar_magnet_sound_device, ctc0_z1_w)) MCFG_Z80CTC_ZC2_CB(WRITELINE(cedar_magnet_sound_device, ctc0_z2_w)) MCFG_DEVICE_ADD("ctc1", Z80CTC, 4000000/8 ) -// MCFG_Z80CTC_INTR_CB(INPUTLINE("topcpu", INPUT_LINE_IRQ0)) -// MCFG_Z80CTC_INTR_CB(DEVWRITELINE("ctc0", z80ctc_device, trg0)) +// MCFG_Z80CTC_INTR_CB(INPUTLINE("topcpu", INPUT_LINE_IRQ0)) +// MCFG_Z80CTC_INTR_CB(DEVWRITELINE("ctc0", z80ctc_device, trg0)) MCFG_Z80CTC_INTR_CB(WRITELINE(cedar_magnet_sound_device, ctc1_int_w)) MCFG_Z80CTC_ZC0_CB(WRITELINE(cedar_magnet_sound_device, ctc1_z0_w)) MCFG_Z80CTC_ZC1_CB(WRITELINE(cedar_magnet_sound_device, ctc1_z1_w)) diff --git a/src/mame/machine/cedar_magnet_sound.h b/src/mame/machine/cedar_magnet_sound.h index d4fb3a6cace..fcd498c1aa8 100644 --- a/src/mame/machine/cedar_magnet_sound.h +++ b/src/mame/machine/cedar_magnet_sound.h @@ -24,7 +24,7 @@ class cedar_magnet_sound_device : public cedar_magnet_board_device public: // construction/destruction cedar_magnet_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - + required_device m_ctc0; required_device m_ctc1; @@ -36,7 +36,7 @@ public: void write_command(uint8_t data); uint8_t m_command; - + DECLARE_WRITE_LINE_MEMBER(ctc1_z0_w); DECLARE_WRITE_LINE_MEMBER(ctc1_z1_w); DECLARE_WRITE_LINE_MEMBER(ctc1_z2_w); diff --git a/src/mame/machine/fmt_icmem.cpp b/src/mame/machine/fmt_icmem.cpp index da2679a211e..8a22f583d30 100644 --- a/src/mame/machine/fmt_icmem.cpp +++ b/src/mame/machine/fmt_icmem.cpp @@ -148,7 +148,7 @@ READ8_MEMBER(fmt_icmem_device::status_r) if(m_change) ret |= 0x80; m_change = false; - + return ret; } diff --git a/src/mame/machine/fmt_icmem.h b/src/mame/machine/fmt_icmem.h index d9eb85cbd30..dc58c6f6814 100644 --- a/src/mame/machine/fmt_icmem.h +++ b/src/mame/machine/fmt_icmem.h @@ -59,7 +59,7 @@ public: protected: virtual ioport_constructor device_input_ports() const override; - + private: required_ioport m_writeprotect; std::unique_ptr m_memcard_ram; diff --git a/src/mame/machine/msx_matsushita.cpp b/src/mame/machine/msx_matsushita.cpp index 3c6db780f42..d5b1f13e44f 100644 --- a/src/mame/machine/msx_matsushita.cpp +++ b/src/mame/machine/msx_matsushita.cpp @@ -84,7 +84,7 @@ READ8_MEMBER(msx_matsushita_device::switched_read) case 0x03: { uint8_t result = (((m_pattern & 0x80) ? m_nibble1 : m_nibble2) << 4) | ((m_pattern & 0x40) ? m_nibble1 : m_nibble2); - + if (!space.debugger_access()) m_pattern = (m_pattern << 2) | (m_pattern >> 6); diff --git a/src/mame/machine/znmcu.cpp b/src/mame/machine/znmcu.cpp index 495ff89e740..a61baa1ab14 100644 --- a/src/mame/machine/znmcu.cpp +++ b/src/mame/machine/znmcu.cpp @@ -111,4 +111,4 @@ void znmcu_device::device_timer(emu_timer &timer, device_timer_id tid, int param m_mcu_timer->adjust(attotime::from_usec(5), 1); } -} \ No newline at end of file +} diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 9291accd82e..141feb2ed16 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -14798,8 +14798,8 @@ isbc286 // isbc2861 // isbc86 // rpc86 // -isbc8605 // -isbc8630 // +isbc8605 // +isbc8630 // @source:isbc8010.cpp isbc8010 // @@ -20142,7 +20142,7 @@ mice // micral // @source:micro20.cpp -micro20 // (c) 1984 GMX +micro20 // (c) 1984 GMX @source:micro3d.cpp botss // (c) 1992 Microprose Games Inc. @@ -30361,7 +30361,7 @@ sonstwr2 // wolfman // @source:pg685.cpp -pg675 // +pg675 // pg685 // pg685oua12 // @@ -36126,7 +36126,7 @@ pyuutajr // 1982 Tomy Pyuuta Jr. tutor // 1983? Tomy Tutor @source:tv910.cpp -tv910 // +tv910 // @source:tv950.cpp tv950 // diff --git a/src/mame/video/darkmist.cpp b/src/mame/video/darkmist.cpp index 3e2f69d1d48..d6abdc78034 100644 --- a/src/mame/video/darkmist.cpp +++ b/src/mame/video/darkmist.cpp @@ -63,7 +63,7 @@ TILE_GET_INFO_MEMBER(darkmist_state::get_txttile_info) PALETTE_INIT_MEMBER(darkmist_state, darkmist) { -// palette.set_indirect_color(0x100, rgb_t::black()); +// palette.set_indirect_color(0x100, rgb_t::black()); for (int i = 0; i < 0x400; i++) { @@ -78,9 +78,9 @@ PALETTE_INIT_MEMBER(darkmist_state, darkmist) case 0x300: clut = m_tx_clut[i&0xff]; break; } -// if (clut & 0x40) // 0x40 indicates transparent pen -// ctabentry = 0x100; -// else +// if (clut & 0x40) // 0x40 indicates transparent pen +// ctabentry = 0x100; +// else { ctabentry = (clut & 0x3f); @@ -103,8 +103,8 @@ void darkmist_state::video_start() m_bgtilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(darkmist_state::get_bgtile_info),this),TILEMAP_SCAN_ROWS,16,16,512,64 ); m_fgtilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(darkmist_state::get_fgtile_info),this),TILEMAP_SCAN_ROWS,16,16,64,256 ); m_txtilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(darkmist_state::get_txttile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32 ); -// m_fgtilemap->set_transparent_pen(0); -// m_txtilemap->set_transparent_pen(0); +// m_fgtilemap->set_transparent_pen(0); +// m_txtilemap->set_transparent_pen(0); save_item(NAME(m_hw)); m_screen->register_screen_bitmap(m_temp_bitmap); @@ -164,7 +164,7 @@ void darkmist_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec palette, fx,fy, m_spriteram[i+3],m_spriteram[i+2],0 ); - } + } } uint32_t darkmist_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -178,19 +178,19 @@ uint32_t darkmist_state::screen_update(screen_device &screen, bitmap_ind16 &bitm m_temp_bitmap.fill(0,cliprect); bitmap.fill(m_palette->black_pen(), cliprect); - + if(m_hw & DISPLAY_BG) { m_bgtilemap->draw(screen, m_temp_bitmap, cliprect, 0,0); mix_layer(screen, bitmap, cliprect, m_bg_clut); } - + if(m_hw & DISPLAY_FG) { m_fgtilemap->draw(screen, m_temp_bitmap, cliprect, 0,0); mix_layer(screen, bitmap, cliprect, m_fg_clut); } - + if(m_hw & DISPLAY_SPR) { draw_sprites(m_temp_bitmap,cliprect); diff --git a/src/osd/eivc.h b/src/osd/eivc.h index cad4382c0ba..defb3e5120e 100644 --- a/src/osd/eivc.h +++ b/src/osd/eivc.h @@ -10,7 +10,7 @@ #ifndef __EIVC__ #define __EIVC__ -#include +#include #pragma intrinsic(_BitScanReverse) diff --git a/src/osd/modules/debugger/osx/debugconsole.mm b/src/osd/modules/debugger/osx/debugconsole.mm index 1d4155b6678..82d000bbd50 100644 --- a/src/osd/modules/debugger/osx/debugconsole.mm +++ b/src/osd/modules/debugger/osx/debugconsole.mm @@ -28,11 +28,11 @@ @implementation MAMEDebugConsole - (id)initWithMachine:(running_machine &)m { - NSSplitView *regSplit, *dasmSplit; - NSScrollView *regScroll, *dasmScroll, *consoleScroll; - NSView *consoleContainer; - NSPopUpButton *actionButton; - NSRect rct; + NSSplitView *regSplit, *dasmSplit; + NSScrollView *regScroll, *dasmScroll, *consoleScroll; + NSView *consoleContainer; + NSPopUpButton *actionButton; + NSRect rct; // initialise superclass if (!(self = [super initWithMachine:m title:@"Debug"])) @@ -133,24 +133,24 @@ [window makeFirstResponder:commandField]; // calculate the optimal size for everything - NSRect const available = [[NSScreen mainScreen] visibleFrame]; - NSSize const regCurrent = [regScroll frame].size; - NSSize const regSize = [NSScrollView frameSizeForContentSize:[regView maximumFrameSize] + NSRect const available = [[NSScreen mainScreen] visibleFrame]; + NSSize const regCurrent = [regScroll frame].size; + NSSize const regSize = [NSScrollView frameSizeForContentSize:[regView maximumFrameSize] hasHorizontalScroller:YES hasVerticalScroller:YES borderType:[regScroll borderType]]; - NSSize const dasmCurrent = [dasmScroll frame].size; - NSSize const dasmSize = [NSScrollView frameSizeForContentSize:[dasmView maximumFrameSize] + NSSize const dasmCurrent = [dasmScroll frame].size; + NSSize const dasmSize = [NSScrollView frameSizeForContentSize:[dasmView maximumFrameSize] hasHorizontalScroller:YES hasVerticalScroller:YES borderType:[dasmScroll borderType]]; - NSSize const consoleCurrent = [consoleContainer frame].size; - NSSize consoleSize = [NSScrollView frameSizeForContentSize:[consoleView maximumFrameSize] + NSSize const consoleCurrent = [consoleContainer frame].size; + NSSize consoleSize = [NSScrollView frameSizeForContentSize:[consoleView maximumFrameSize] hasHorizontalScroller:YES hasVerticalScroller:YES borderType:[consoleScroll borderType]]; - NSRect windowFrame = [window frame]; - NSSize adjustment; + NSRect windowFrame = [window frame]; + NSSize adjustment; consoleSize.width += consoleCurrent.width - [consoleScroll frame].size.width; consoleSize.height += consoleCurrent.height - [consoleScroll frame].size.height; @@ -405,7 +405,7 @@ } return YES; } - } + } return NO; } @@ -430,8 +430,8 @@ - (CGFloat)splitView:(NSSplitView *)sender constrainMaxCoordinate:(CGFloat)max ofSubviewAt:(NSInteger)offs { - NSSize sz = [sender bounds].size; - CGFloat allowed = ([sender isVertical] ? sz.width : sz.height) - 100 - [sender dividerThickness]; + NSSize sz = [sender bounds].size; + CGFloat allowed = ([sender isVertical] ? sz.width : sz.height) - 100 - [sender dividerThickness]; return (max > allowed) ? allowed : max; } diff --git a/src/osd/modules/debugger/osx/debugview.mm b/src/osd/modules/debugger/osx/debugview.mm index 86a3b6e8204..ecc55349283 100644 --- a/src/osd/modules/debugger/osx/debugview.mm +++ b/src/osd/modules/debugger/osx/debugview.mm @@ -117,8 +117,8 @@ static void debugwin_view_update(debug_view &view, void *osdprivate) else { data += ((position.y - view->visible_position().y) * view->visible_size().x); - int attr = -1; - NSUInteger start = 0, length = 0; + int attr = -1; + NSUInteger start = 0, length = 0; for (uint32_t col = origin.x; col < origin.x + size.x; col++) { [[text mutableString] appendFormat:@"%c", data[col - origin.x].byte]; @@ -355,8 +355,8 @@ static void debugwin_view_update(debug_view &view, void *osdprivate) for (uint32_t row = 0; row < size.y; row++, data += size.x) { // add content for the line and set colours - int attr = -1; - NSUInteger start = [text length], length = start; + int attr = -1; + NSUInteger start = [text length], length = start; for (uint32_t col = 0; col < size.x; col++) { [[text mutableString] appendFormat:@"%c", data[col].byte]; @@ -469,7 +469,7 @@ static void debugwin_view_update(debug_view &view, void *osdprivate) - (void)addContextMenuItemsToMenu:(NSMenu *)menu { - NSMenuItem *item; + NSMenuItem *item; item = [menu addItemWithTitle:@"Copy Visible" action:@selector(copyVisible:) @@ -622,8 +622,8 @@ static void debugwin_view_update(debug_view &view, void *osdprivate) // render entire lines to get character alignment right for ( ; row < clip; row++, data += size.x) { - int attr = -1; - NSUInteger start = 0, length = 0; + int attr = -1; + NSUInteger start = 0, length = 0; for (uint32_t col = origin.x; col < origin.x + size.x; col++) { [[text mutableString] appendFormat:@"%c", data[col - origin.x].byte]; @@ -729,8 +729,8 @@ static void debugwin_view_update(debug_view &view, void *osdprivate) - (void)keyDown:(NSEvent *)event { - NSUInteger modifiers = [event modifierFlags]; - NSString *str = [event charactersIgnoringModifiers]; + NSUInteger modifiers = [event modifierFlags]; + NSString *str = [event charactersIgnoringModifiers]; if ([str length] == 1) { @@ -816,8 +816,8 @@ static void debugwin_view_update(debug_view &view, void *osdprivate) - (void)insertText:(id)string { - NSUInteger len; - NSRange found; + NSUInteger len; + NSRange found; if ([string isKindOfClass:[NSAttributedString class]]) string = [string string]; for (len = [string length], found = NSMakeRange(0, 0); @@ -834,7 +834,7 @@ static void debugwin_view_update(debug_view &view, void *osdprivate) - (BOOL)validateMenuItem:(NSMenuItem *)item { - SEL action = [item action]; + SEL action = [item action]; if (action == @selector(paste:)) { diff --git a/src/osd/modules/debugger/osx/debugwindowhandler.mm b/src/osd/modules/debugger/osx/debugwindowhandler.mm index 853fe8fd4b6..28cb82cbb33 100644 --- a/src/osd/modules/debugger/osx/debugwindowhandler.mm +++ b/src/osd/modules/debugger/osx/debugwindowhandler.mm @@ -444,7 +444,7 @@ NSString *const MAMEAuxiliaryDebugWindowWillCloseNotification = @"MAMEAuxiliaryD } return YES; } - } + } return NO; } diff --git a/src/osd/modules/debugger/osx/deviceinfoviewer.mm b/src/osd/modules/debugger/osx/deviceinfoviewer.mm index 29b4186ccf9..dc2b2114005 100644 --- a/src/osd/modules/debugger/osx/deviceinfoviewer.mm +++ b/src/osd/modules/debugger/osx/deviceinfoviewer.mm @@ -11,7 +11,7 @@ @interface MAMEDeviceInfoView : NSView { - CGFloat minWidth; + CGFloat minWidth; } - (id)initWithFrame:(NSRect)frame; @@ -135,8 +135,8 @@ - (id)initWithDevice:(device_t &)d machine:(running_machine &)m console:(MAMEDebugConsole *)c { - MAMEDeviceInfoView *contentView; - NSScrollView *contentScroll; + MAMEDeviceInfoView *contentView; + NSScrollView *contentScroll; if (!(self = [super initWithMachine:m title:[NSString stringWithFormat:@"Device %s", d.tag()] diff --git a/src/osd/modules/debugger/osx/devicesviewer.mm b/src/osd/modules/debugger/osx/devicesviewer.mm index 8a87dedb1a6..2bdb0253299 100644 --- a/src/osd/modules/debugger/osx/devicesviewer.mm +++ b/src/osd/modules/debugger/osx/devicesviewer.mm @@ -13,9 +13,9 @@ @interface MAMEDeviceWrapper : NSObject { - running_machine *machine; - device_t *device; - NSArray *children; + running_machine *machine; + device_t *device; + NSArray *children; } - (id)initWithMachine:(running_machine &)m device:(device_t &)d; @@ -36,7 +36,7 @@ NSMutableArray *const tmp = [[NSMutableArray alloc] init]; for (device_t *child = device->subdevices().first(); child != nullptr; child = child->next()) { - MAMEDeviceWrapper *const wrap = [[MAMEDeviceWrapper alloc] initWithMachine:*machine + MAMEDeviceWrapper *const wrap = [[MAMEDeviceWrapper alloc] initWithMachine:*machine device:*child]; [tmp addObject:wrap]; [wrap release]; @@ -103,8 +103,8 @@ @implementation MAMEDevicesViewer - (id)initWithMachine:(running_machine &)m console:(MAMEDebugConsole *)c { - NSScrollView *devicesScroll; - NSTableColumn *tagColumn, *nameColumn; + NSScrollView *devicesScroll; + NSTableColumn *tagColumn, *nameColumn; if (!(self = [super initWithMachine:m title:@"All Devices" console:c])) return nil; diff --git a/src/osd/modules/debugger/osx/disassemblyview.mm b/src/osd/modules/debugger/osx/disassemblyview.mm index 4e99e38ddce..78388b49dba 100644 --- a/src/osd/modules/debugger/osx/disassemblyview.mm +++ b/src/osd/modules/debugger/osx/disassemblyview.mm @@ -41,8 +41,8 @@ - (NSSize)maximumFrameSize { - debug_view_xy max(0, 0); - debug_view_source const *source = view->source(); + debug_view_xy max(0, 0); + debug_view_source const *source = view->source(); for (debug_view_source const *source = view->first_source(); source != nullptr; source = source->next()) { view->set_source(*source); @@ -57,7 +57,7 @@ - (void)addContextMenuItemsToMenu:(NSMenu *)menu { - NSMenuItem *item; + NSMenuItem *item; [super addContextMenuItemsToMenu:menu]; @@ -122,7 +122,7 @@ - (void)selectSubviewAtIndex:(int)index { - const int selected = view->source_list().indexof(*view->source()); + const int selected = view->source_list().indexof(*view->source()); if (selected != index) { view->set_source(*view->source_list().find(index)); if ([[self window] firstResponder] != self) @@ -210,8 +210,8 @@ atIndex:index++]; [disableItem setKeyEquivalentModifierMask:NSShiftKeyMask]; - NSMenu *runMenu = [[menu itemWithTitle:@"Run"] submenu]; - NSMenuItem *runItem; + NSMenu *runMenu = [[menu itemWithTitle:@"Run"] submenu]; + NSMenuItem *runItem; if (runMenu != nil) { runItem = [runMenu addItemWithTitle:@"to Cursor" action:@selector(debugRunToCursor:) diff --git a/src/osd/modules/debugger/osx/disassemblyviewer.mm b/src/osd/modules/debugger/osx/disassemblyviewer.mm index 7d480b8333a..d2c3decff11 100644 --- a/src/osd/modules/debugger/osx/disassemblyviewer.mm +++ b/src/osd/modules/debugger/osx/disassemblyviewer.mm @@ -20,10 +20,10 @@ @implementation MAMEDisassemblyViewer - (id)initWithMachine:(running_machine &)m console:(MAMEDebugConsole *)c { - NSScrollView *dasmScroll; - NSView *expressionContainer; - NSPopUpButton *actionButton; - NSRect expressionFrame; + NSScrollView *dasmScroll; + NSView *expressionContainer; + NSPopUpButton *actionButton; + NSRect expressionFrame; if (!(self = [super initWithMachine:m title:@"Disassembly" console:c])) return nil; @@ -204,8 +204,8 @@ { device.debug()->breakpoint_enable(bp->index(), !bp->enabled()); machine->debugger().console().printf("Breakpoint %X %s\n", - (uint32_t)bp->index(), - bp->enabled() ? "enabled" : "disabled"); + (uint32_t)bp->index(), + bp->enabled() ? "enabled" : "disabled"); machine->debug_view().update_all(); machine->debugger().refresh_display(); } diff --git a/src/osd/modules/debugger/osx/errorlogviewer.mm b/src/osd/modules/debugger/osx/errorlogviewer.mm index 56108223cb7..c40d9f89b69 100644 --- a/src/osd/modules/debugger/osx/errorlogviewer.mm +++ b/src/osd/modules/debugger/osx/errorlogviewer.mm @@ -14,8 +14,8 @@ @implementation MAMEErrorLogViewer - (id)initWithMachine:(running_machine &)m console:(MAMEDebugConsole *)c { - NSScrollView *logScroll; - NSString *title; + NSScrollView *logScroll; + NSString *title; title = [NSString stringWithFormat:@"Error Log: %@ [%@]", [NSString stringWithUTF8String:m.system().description], @@ -38,7 +38,7 @@ // calculate the optimal size for everything { - NSSize desired = [NSScrollView frameSizeForContentSize:[logView maximumFrameSize] + NSSize desired = [NSScrollView frameSizeForContentSize:[logView maximumFrameSize] hasHorizontalScroller:YES hasVerticalScroller:YES borderType:[logScroll borderType]]; diff --git a/src/osd/modules/debugger/osx/memoryview.mm b/src/osd/modules/debugger/osx/memoryview.mm index 5a843c6e38f..e4a5f9732e6 100644 --- a/src/osd/modules/debugger/osx/memoryview.mm +++ b/src/osd/modules/debugger/osx/memoryview.mm @@ -27,9 +27,9 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item { - SEL action = [item action]; - NSInteger tag = [item tag]; - debug_view_memory *memview = downcast(view); + SEL action = [item action]; + NSInteger tag = [item tag]; + debug_view_memory *memview = downcast(view); if (action == @selector(showChunkSize:)) { @@ -63,8 +63,8 @@ - (NSSize)maximumFrameSize { - debug_view_xy max(0, 0); - debug_view_source const *source = view->source(); + debug_view_xy max(0, 0); + debug_view_source const *source = view->source(); for (debug_view_source const *source = view->first_source(); source != nullptr; source = source->next()) { view->set_source(*source); @@ -105,7 +105,7 @@ - (void)selectSubviewAtIndex:(int)index { - int const selected = view->source_list().indexof(*view->source()); + int const selected = view->source_list().indexof(*view->source()); if (selected != index) { view->set_source(*view->source_list().find(index)); if ([[self window] firstResponder] != self) @@ -199,8 +199,8 @@ - (void)insertActionItemsInMenu:(NSMenu *)menu atIndex:(NSInteger)index { NSInteger tag; for (tag = 1; tag <= 8; tag <<= 1) { - NSString *title = [NSString stringWithFormat:@"%ld-byte Chunks", (long)tag]; - NSMenuItem *chunkItem = [menu insertItemWithTitle:title + NSString *title = [NSString stringWithFormat:@"%ld-byte Chunks", (long)tag]; + NSMenuItem *chunkItem = [menu insertItemWithTitle:title action:@selector(showChunkSize:) keyEquivalent:[NSString stringWithFormat:@"%ld", (long)tag] atIndex:index++]; @@ -208,13 +208,13 @@ [chunkItem setTag:tag]; } - NSMenuItem *chunkItem = [menu insertItemWithTitle:@"32-bit floats" + NSMenuItem *chunkItem = [menu insertItemWithTitle:@"32-bit floats" action:@selector(showChunkSize:) keyEquivalent:@"F" atIndex:index++]; [chunkItem setTarget:self]; [chunkItem setTag:9]; - + NSMenuItem *chunkItem2 = [menu insertItemWithTitle:@"64-bit floats" action:@selector(showChunkSize:) keyEquivalent:@"D" @@ -228,7 +228,7 @@ atIndex:index++]; [chunkItem3 setTarget:self]; [chunkItem3 setTag:11]; - + [menu insertItem:[NSMenuItem separatorItem] atIndex:index++]; NSMenuItem *logicalItem = [menu insertItemWithTitle:@"Logical Addresses" diff --git a/src/osd/modules/debugger/osx/memoryviewer.mm b/src/osd/modules/debugger/osx/memoryviewer.mm index bd7d1941067..b30a983ac30 100644 --- a/src/osd/modules/debugger/osx/memoryviewer.mm +++ b/src/osd/modules/debugger/osx/memoryviewer.mm @@ -20,10 +20,10 @@ @implementation MAMEMemoryViewer - (id)initWithMachine:(running_machine &)m console:(MAMEDebugConsole *)c { - NSScrollView *memoryScroll; - NSView *expressionContainer; - NSPopUpButton *actionButton; - NSRect expressionFrame; + NSScrollView *memoryScroll; + NSView *expressionContainer; + NSPopUpButton *actionButton; + NSRect expressionFrame; if (!(self = [super initWithMachine:m title:@"Memory" console:c])) return nil; diff --git a/src/osd/modules/debugger/osx/pointsviewer.mm b/src/osd/modules/debugger/osx/pointsviewer.mm index d99f072a95c..e10633076aa 100644 --- a/src/osd/modules/debugger/osx/pointsviewer.mm +++ b/src/osd/modules/debugger/osx/pointsviewer.mm @@ -15,11 +15,11 @@ @implementation MAMEPointsViewer - (id)initWithMachine:(running_machine &)m console:(MAMEDebugConsole *)c { - MAMEDebugView *breakView, *watchView; - NSScrollView *breakScroll, *watchScroll; - NSTabViewItem *breakTab, *watchTab; - NSPopUpButton *actionButton, *subviewButton; - NSRect subviewFrame; + MAMEDebugView *breakView, *watchView; + NSScrollView *breakScroll, *watchScroll; + NSTabViewItem *breakTab, *watchTab; + NSPopUpButton *actionButton, *subviewButton; + NSRect subviewFrame; if (!(self = [super initWithMachine:m title:@"(Break|Watch)points" console:c])) return nil; diff --git a/src/osd/modules/debugger/osx/registersview.mm b/src/osd/modules/debugger/osx/registersview.mm index 0d1e8acd81b..37c54a1fc9c 100644 --- a/src/osd/modules/debugger/osx/registersview.mm +++ b/src/osd/modules/debugger/osx/registersview.mm @@ -28,9 +28,9 @@ - (NSSize)maximumFrameSize { - debug_view_xy max; - device_t *curcpu = machine->debugger().cpu().get_visible_cpu(); - const debug_view_source *source = view->source_for_device(curcpu); + debug_view_xy max; + device_t *curcpu = machine->debugger().cpu().get_visible_cpu(); + const debug_view_source *source = view->source_for_device(curcpu); max.x = max.y = 0; for (const debug_view_source *source = view->source_list().first(); source != nullptr; source = source->next()) diff --git a/src/osd/modules/font/font_dwrite.cpp b/src/osd/modules/font/font_dwrite.cpp index 884f2bed5f3..b408508cbe7 100644 --- a/src/osd/modules/font/font_dwrite.cpp +++ b/src/osd/modules/font/font_dwrite.cpp @@ -349,7 +349,7 @@ public: } virtual ~osd_font_dwrite() { osd_font_dwrite::close(); } - + virtual bool open(std::string const &font_path, std::string const &_name, int &height) override { if (m_d2dfactory == nullptr || m_dwriteFactory == nullptr || m_wicFactory == nullptr) diff --git a/src/osd/modules/input/input_module.h b/src/osd/modules/input/input_module.h index bb4cb44c063..d521d0d1860 100644 --- a/src/osd/modules/input/input_module.h +++ b/src/osd/modules/input/input_module.h @@ -23,7 +23,7 @@ public: } virtual ~input_module() { } - + virtual void input_init(running_machine &machine) = 0; virtual void poll_if_necessary(running_machine &machine) = 0; virtual void pause() = 0; diff --git a/src/osd/modules/input/input_uwp.cpp b/src/osd/modules/input/input_uwp.cpp index 5b3cdb76417..86e9ecfe671 100644 --- a/src/osd/modules/input/input_uwp.cpp +++ b/src/osd/modules/input/input_uwp.cpp @@ -37,7 +37,7 @@ using namespace Windows::Foundation::Collections; using namespace Windows::Gaming::Input; //============================================================ -// UWP Base device/module implementation +// UWP Base device/module implementation //============================================================ //============================================================ @@ -358,27 +358,27 @@ struct gamepad_state static input_item_id buttonlabel_to_itemid[] = { input_item_id::ITEM_ID_INVALID, // GameControllerButtonLabel::None - input_item_id::ITEM_ID_SELECT, // GameControllerButtonLabel::XboxBack - input_item_id::ITEM_ID_START, // GameControllerButtonLabel::XboxStart - input_item_id::ITEM_ID_START, // GameControllerButtonLabel::XboxMenu - input_item_id::ITEM_ID_SELECT, // GameControllerButtonLabel::XboxView - input_item_id::ITEM_ID_HAT1UP, // GameControllerButtonLabel::XboxUp + input_item_id::ITEM_ID_SELECT, // GameControllerButtonLabel::XboxBack + input_item_id::ITEM_ID_START, // GameControllerButtonLabel::XboxStart + input_item_id::ITEM_ID_START, // GameControllerButtonLabel::XboxMenu + input_item_id::ITEM_ID_SELECT, // GameControllerButtonLabel::XboxView + input_item_id::ITEM_ID_HAT1UP, // GameControllerButtonLabel::XboxUp input_item_id::ITEM_ID_HAT1DOWN, // GameControllerButtonLabel::XboxDown - input_item_id::ITEM_ID_HAT1LEFT, // GameControllerButtonLabel::XboxLeft - input_item_id::ITEM_ID_HAT1RIGHT, // GameControllerButtonLabel::XboxRight - input_item_id::ITEM_ID_BUTTON1, // GameControllerButtonLabel::XboxA - input_item_id::ITEM_ID_BUTTON2, // GameControllerButtonLabel::XboxB - input_item_id::ITEM_ID_BUTTON3, // GameControllerButtonLabel::XboxX - input_item_id::ITEM_ID_BUTTON4, // GameControllerButtonLabel::XboxY - input_item_id::ITEM_ID_BUTTON5, // GameControllerButtonLabel::XboxLeftBumper - input_item_id::ITEM_ID_ZAXIS, // GameControllerButtonLabel::XboxLeftTrigger - input_item_id::ITEM_ID_BUTTON7, // GameControllerButtonLabel::XboxLeftStickButton - input_item_id::ITEM_ID_BUTTON6, // GameControllerButtonLabel::XboxRightBumper - input_item_id::ITEM_ID_RZAXIS, // GameControllerButtonLabel::XboxRightTrigger - input_item_id::ITEM_ID_BUTTON8, // GameControllerButtonLabel::XboxRightStickButton - input_item_id::ITEM_ID_BUTTON9, // GameControllerButtonLabel::XboxPaddle1 - input_item_id::ITEM_ID_BUTTON10, // GameControllerButtonLabel::XboxPaddle2 - input_item_id::ITEM_ID_BUTTON11, // GameControllerButtonLabel::XboxPaddle3 + input_item_id::ITEM_ID_HAT1LEFT, // GameControllerButtonLabel::XboxLeft + input_item_id::ITEM_ID_HAT1RIGHT, // GameControllerButtonLabel::XboxRight + input_item_id::ITEM_ID_BUTTON1, // GameControllerButtonLabel::XboxA + input_item_id::ITEM_ID_BUTTON2, // GameControllerButtonLabel::XboxB + input_item_id::ITEM_ID_BUTTON3, // GameControllerButtonLabel::XboxX + input_item_id::ITEM_ID_BUTTON4, // GameControllerButtonLabel::XboxY + input_item_id::ITEM_ID_BUTTON5, // GameControllerButtonLabel::XboxLeftBumper + input_item_id::ITEM_ID_ZAXIS, // GameControllerButtonLabel::XboxLeftTrigger + input_item_id::ITEM_ID_BUTTON7, // GameControllerButtonLabel::XboxLeftStickButton + input_item_id::ITEM_ID_BUTTON6, // GameControllerButtonLabel::XboxRightBumper + input_item_id::ITEM_ID_RZAXIS, // GameControllerButtonLabel::XboxRightTrigger + input_item_id::ITEM_ID_BUTTON8, // GameControllerButtonLabel::XboxRightStickButton + input_item_id::ITEM_ID_BUTTON9, // GameControllerButtonLabel::XboxPaddle1 + input_item_id::ITEM_ID_BUTTON10, // GameControllerButtonLabel::XboxPaddle2 + input_item_id::ITEM_ID_BUTTON11, // GameControllerButtonLabel::XboxPaddle3 input_item_id::ITEM_ID_BUTTON12, // GameControllerButtonLabel::XboxPaddle4 input_item_id::ITEM_ID_INVALID, // GameControllerButtonLabel_Mode input_item_id::ITEM_ID_SELECT, // GameControllerButtonLabel_Select @@ -411,12 +411,12 @@ static input_item_id buttonlabel_to_itemid[] = input_item_id::ITEM_ID_OTHER_SWITCH, // GameControllerButtonLabel_Left2 input_item_id::ITEM_ID_OTHER_SWITCH, // GameControllerButtonLabel_Left3 input_item_id::ITEM_ID_BUTTON6, // GameControllerButtonLabel_RightBumper - input_item_id::ITEM_ID_RZAXIS, // GameControllerButtonLabel_RightTrigger + input_item_id::ITEM_ID_RZAXIS, // GameControllerButtonLabel_RightTrigger input_item_id::ITEM_ID_BUTTON8, // GameControllerButtonLabel_RightStickButton input_item_id::ITEM_ID_OTHER_SWITCH, // GameControllerButtonLabel_Right1 input_item_id::ITEM_ID_OTHER_SWITCH, // GameControllerButtonLabel_Right2 input_item_id::ITEM_ID_OTHER_SWITCH, // GameControllerButtonLabel_Right3 - input_item_id::ITEM_ID_BUTTON9, // GameControllerButtonLabel_Paddle1 + input_item_id::ITEM_ID_BUTTON9, // GameControllerButtonLabel_Paddle1 input_item_id::ITEM_ID_BUTTON10, // GameControllerButtonLabel_Paddle2 input_item_id::ITEM_ID_BUTTON11, // GameControllerButtonLabel_Paddle3 input_item_id::ITEM_ID_BUTTON12, // GameControllerButtonLabel_Paddle4 @@ -496,7 +496,7 @@ internal: return; GamepadReading r = m_pad->GetCurrentReading(); - + // Add the axes for (int axisnum = 0; axisnum < 4; axisnum++) { @@ -573,11 +573,11 @@ internal: // allocate the UWP implementation of the device object UwpJoystickDevice ^refdevice = ref new UwpJoystickDevice(pad, machine, name.c_str(), name.c_str(), *this->NativeModule); - + // Allocate the wrapper and add it to the list auto created_devinfo = std::make_unique(refdevice); devinfo = NativeModule->devicelist()->add_device(machine, std::move(created_devinfo)); - + // Give the UWP implementation a handle to the input_device refdevice->InputDevice = devinfo->device(); diff --git a/src/osd/modules/render/d3d/d3dcomm.h b/src/osd/modules/render/d3d/d3dcomm.h index 2d048e627c6..38b93adb7ac 100644 --- a/src/osd/modules/render/d3d/d3dcomm.h +++ b/src/osd/modules/render/d3d/d3dcomm.h @@ -155,7 +155,7 @@ private: vec2f m_rawdims; // raw dims of the texture int m_type; // what type of texture are we? int m_xprescale, m_yprescale; // X/Y prescale factor - int m_xborderpix, m_yborderpix; // X/Y border pixels + int m_xborderpix, m_yborderpix; // X/Y border pixels int m_cur_frame; // what is our current frame? IDirect3DTexture9 * m_d3dtex; // Direct3D texture pointer IDirect3DSurface9 * m_d3dsurface; // Direct3D offscreen plain surface pointer diff --git a/src/osd/modules/render/drawd3d.h b/src/osd/modules/render/drawd3d.h index 1df40d09fb5..f73f6704823 100644 --- a/src/osd/modules/render/drawd3d.h +++ b/src/osd/modules/render/drawd3d.h @@ -78,7 +78,7 @@ public: void update_presentation_parameters(); void update_gamma_ramp(); - bool device_verify_caps(); + bool device_verify_caps(); int device_test_cooperative(); int config_adapter_mode(); diff --git a/src/osd/modules/sound/xaudio2_sound.cpp b/src/osd/modules/sound/xaudio2_sound.cpp index da5907cc462..3c76ac13945 100644 --- a/src/osd/modules/sound/xaudio2_sound.cpp +++ b/src/osd/modules/sound/xaudio2_sound.cpp @@ -232,7 +232,7 @@ public: m_initialized(FALSE) { } - + virtual ~sound_xaudio2() { } bool probe() override; diff --git a/src/osd/uwp/uwpcompat.cpp b/src/osd/uwp/uwpcompat.cpp index b8f585b4e5b..e550a42086a 100644 --- a/src/osd/uwp/uwpcompat.cpp +++ b/src/osd/uwp/uwpcompat.cpp @@ -16,7 +16,7 @@ #include "emu.h" extern "C" { - + BOOL WINAPI GetVersionEx( _Inout_ LPOSVERSIONINFO lpVersionInfo ) diff --git a/src/osd/uwp/window.cpp b/src/osd/uwp/window.cpp index 12441e17290..bfee83acbed 100644 --- a/src/osd/uwp/window.cpp +++ b/src/osd/uwp/window.cpp @@ -335,7 +335,7 @@ BOOL winwindow_has_focus(void) void winwindow_process_events(running_machine &machine, bool ingame, bool nodispatch) { -// MSG message; +// MSG message; assert(GetCurrentThreadId() == main_threadid); @@ -459,8 +459,8 @@ void uwp_window_info::destroy() osd_common_t::s_window_list.remove(shared_from_this()); // destroy the window -// if (platform_window() != nullptr) - // DestroyWindow(platform_window()); +// if (platform_window() != nullptr) + // DestroyWindow(platform_window()); // free the render target machine().render().target_free(m_target); @@ -496,7 +496,7 @@ void uwp_window_info::update() //if (m_isminimized) //SendMessage(platform_window(), WM_USER_SET_MINSIZE, 0, 0); //if (m_ismaximized) -// SendMessage(platform_window(), WM_USER_SET_MAXSIZE, 0, 0); +// SendMessage(platform_window(), WM_USER_SET_MAXSIZE, 0, 0); } } @@ -1050,7 +1050,7 @@ void uwp_window_info::adjust_window_position_after_major_change() if (oldrect.left != newrect.left() || oldrect.top != newrect.top() || oldrect.right != newrect.right() || oldrect.bottom != newrect.bottom()) //SetWindowPos(platform_window(), fullscreen() ? HWND_TOPMOST : HWND_TOP, - // newrect.left(), newrect.top(), + // newrect.left(), newrect.top(), //newrect.width(), newrect.height(), 0); // take note of physical window size (used for lightgun coordinate calculation) @@ -1101,16 +1101,16 @@ void uwp_window_info::set_fullscreen(int fullscreen) //// if we have previous non-fullscreen bounds, use those //if (m_non_fullscreen_bounds.right != m_non_fullscreen_bounds.left) //{ - // SetWindowPos(platform_window(), HWND_TOP, m_non_fullscreen_bounds.left, m_non_fullscreen_bounds.top, - // rect_width(&m_non_fullscreen_bounds), rect_height(&m_non_fullscreen_bounds), - // SWP_NOZORDER); + // SetWindowPos(platform_window(), HWND_TOP, m_non_fullscreen_bounds.left, m_non_fullscreen_bounds.top, + // rect_width(&m_non_fullscreen_bounds), rect_height(&m_non_fullscreen_bounds), + // SWP_NOZORDER); //} // //// otherwise, set a small size and maximize from there //else //{ - // SetWindowPos(platform_window(), HWND_TOP, 0, 0, MIN_WINDOW_DIM, MIN_WINDOW_DIM, SWP_NOZORDER); - // maximize_window(); + // SetWindowPos(platform_window(), HWND_TOP, 0, 0, MIN_WINDOW_DIM, MIN_WINDOW_DIM, SWP_NOZORDER); + // maximize_window(); //} } diff --git a/src/osd/windows/winmain.cpp b/src/osd/windows/winmain.cpp index 57fe9565f5a..bc7d51769dd 100644 --- a/src/osd/windows/winmain.cpp +++ b/src/osd/windows/winmain.cpp @@ -439,7 +439,7 @@ windows_options::windows_options() : osd_options() { add_entries(s_option_entries); -#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) +#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) String^ path = ApplicationData::Current->LocalFolder->Path + L"\\"; set_default_value(OPTION_INIPATH, (osd::text::from_wstring((LPCWSTR)path->Data()) + ";" + ini_path()).c_str()); set_default_value(OPTION_CFG_DIRECTORY, (osd::text::from_wstring((LPCWSTR)path->Data()) + cfg_directory()).c_str()); @@ -451,7 +451,7 @@ windows_options::windows_options() set_default_value(OPTION_COMMENT_DIRECTORY, (osd::text::from_wstring((LPCWSTR)path->Data()) + comment_directory()).c_str()); set_default_value(OPTION_HOMEPATH, osd::text::from_wstring((LPCWSTR)path->Data()).c_str()); - set_default_value(OPTION_MEDIAPATH, (osd::text::from_wstring((LPCWSTR)path->Data()) + media_path()).c_str()); + set_default_value(OPTION_MEDIAPATH, (osd::text::from_wstring((LPCWSTR)path->Data()) + media_path()).c_str()); #endif } diff --git a/src/tools/aueffectutil.mm b/src/tools/aueffectutil.mm index 531d814e987..afbb7da3831 100644 --- a/src/tools/aueffectutil.mm +++ b/src/tools/aueffectutil.mm @@ -344,7 +344,7 @@ static void UpdateChangeCountCallback(void *userData, NSString *errDesc = nil; id const desc = [NSPropertyListSerialization propertyListFromData:data mutabilityOption:0 - format:NULL + format:NULL errorDescription:&errDesc]; if ((nil == desc) || ![desc isKindOfClass:[NSDictionary class]] || (nil != errDesc)) { @@ -771,7 +771,7 @@ static void UpdateChangeCountCallback(void *userData, [NSApp setServicesMenu:submenu]; [menu addItem:[NSMenuItem separatorItem]]; - + item = [menu addItemWithTitle:[NSString stringWithFormat:@"Hide %@", appName] action:@selector(hide:) keyEquivalent:@"h"]; item = [menu addItemWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@"h"]; [item setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask]; @@ -796,9 +796,9 @@ static void UpdateChangeCountCallback(void *userData, [menu setSubmenu:newEffectMenu forItem:item]; [newEffectMenu release]; item = [menu addItemWithTitle:[NSString stringWithFormat:@"Open%C", (unichar)0x2026] action:@selector(openDocument:) keyEquivalent:@"o"]; - + [menu addItem:[NSMenuItem separatorItem]]; - + item = [menu addItemWithTitle:@"Close" action:@selector(performClose:) keyEquivalent:@"w"]; item = [menu addItemWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:@"s"]; item = [menu addItemWithTitle:[NSString stringWithFormat:@"Save As%C", (unichar)0x2026] action:@selector(saveDocumentAs:) keyEquivalent:@"S"]; diff --git a/src/tools/imgtool/imgtool.cpp b/src/tools/imgtool/imgtool.cpp index 8d749931bb4..322dbe8175d 100644 --- a/src/tools/imgtool/imgtool.cpp +++ b/src/tools/imgtool/imgtool.cpp @@ -520,7 +520,7 @@ imgtoolerr_t imgtool::image::list_partitions(std::vector= partitions.size()) || (!partitions[partition_index].imgclass().get_info && !partitions[partition_index].imgclass().derived_get_info)) return IMGTOOLERR_INVALIDPARTITION; - // use this partition + // use this partition const imgtool_class &imgclass(partitions[partition_index].imgclass()); uint64_t base_block = partitions[partition_index].base_block(); uint64_t block_count = partitions[partition_index].block_count(); diff --git a/src/tools/imgtool/library.h b/src/tools/imgtool/library.h index e85ce7bebaf..6305ca8ba1f 100644 --- a/src/tools/imgtool/library.h +++ b/src/tools/imgtool/library.h @@ -263,7 +263,7 @@ namespace imgtool uint64_t block_count() const { return m_block_count; } private: - imgtool_class m_imgclass; + imgtool_class m_imgclass; uint64_t m_base_block; uint64_t m_block_count; }; -- cgit v1.2.3