Merge pull request #3 from mamedev/master

merge with base
2025-10-06 00:54:22 +03:00 · 2015-06-24 23:33:18 +02:00 · 2015-06-24 23:33:18 +02:00 · 7a07ecba2a
commit 7a07ecba2a
parent 3035213d04 cda316ccfe
710 changed files with 18395 additions and 20379 deletions
--- a/3rdparty/dxsdk/Include/d3dcommon.h
+++ b/3rdparty/dxsdk/Include/d3dcommon.h
@ -81,6 +81,21 @@ enum D3D_FEATURE_LEVEL
    } 	D3D_FEATURE_LEVEL;
 typedef 
 #define D3D_FL9_1_REQ_TEXTURE1D_U_DIMENSION          2048
 #define D3D_FL9_3_REQ_TEXTURE1D_U_DIMENSION          4096
 #define D3D_FL9_1_REQ_TEXTURE2D_U_OR_V_DIMENSION     2048
 #define D3D_FL9_3_REQ_TEXTURE2D_U_OR_V_DIMENSION     4096
 #define D3D_FL9_1_REQ_TEXTURECUBE_DIMENSION          512
 #define D3D_FL9_3_REQ_TEXTURECUBE_DIMENSION          4096
 #define D3D_FL9_1_REQ_TEXTURE3D_U_V_OR_W_DIMENSION   256
 #define D3D_FL9_1_DEFAULT_MAX_ANISOTROPY             2
 #define D3D_FL9_1_IA_PRIMITIVE_MAX_COUNT             65535
 #define D3D_FL9_2_IA_PRIMITIVE_MAX_COUNT             1048575
 #define D3D_FL9_1_SIMULTANEOUS_RENDER_TARGET_COUNT   1
 #define D3D_FL9_3_SIMULTANEOUS_RENDER_TARGET_COUNT   4
 #define D3D_FL9_1_MAX_TEXTURE_REPEAT                 128
 #define D3D_FL9_2_MAX_TEXTURE_REPEAT                 2048
 #define D3D_FL9_3_MAX_TEXTURE_REPEAT                 8192
 enum D3D_PRIMITIVE_TOPOLOGY
    {	D3D_PRIMITIVE_TOPOLOGY_UNDEFINED	= 0,
 	D3D_PRIMITIVE_TOPOLOGY_POINTLIST	= 1,
--- a/docs/config.txt
+++ b/docs/config.txt
@ -159,6 +159,14 @@ Page DN   [SDL ONLY]
 Alt+ENTER Toggles between full-screen and windowed mode.
 Scroll Lock  Default mapping for the uimodekey.  This key allows user to
          disable and enable the emulated keyboard in machines that require
          it.  All emulations which require emulated keyboards will start in
          that mode and you can only access the internal UI (hitting TAB) by
          first hitting this key.  You can change the initial status of the
          emulated keyboard is presented upon start by using -ui_active trigger
          as detailed below.
 Escape    Exits emulator.
@ -332,9 +340,29 @@ of your command:
        in the rompath are verified;  however, you can limit this list by specifying a
        specific softwarelistname (without .XML) after the -verifysoftlist command.
 OSD related options
 -------------------
 -uimodekey [keystring]
 	Key used to toggle emulated keyboard on and off.  Default setting is SCRLOCK.
 -uifontprovider
 	Chooses provider for UI font:  win, none or auto.  The Default setting is AUTO.
 OSD CLI options
 ---------------
 -listmidi
-        Create a list of list available MIDI I/O devices for use with emulation.
+        Create a list of available MIDI I/O devices for use with emulation.
 -listnetwork
 	Create a list of available Network Adapters for use with emulation.
@ -901,8 +929,8 @@ Core input options
 	the coin lockout outputs were actually connected to the coin
 	mechanisms. If this feature is enabled, then attempts to enter a coin
 	while the lockout is active will fail and will display a popup message
-	in the user interface. If this feature is disabled, the coin lockout
+	in the user interface (In debug mode). If this feature is disabled, the
-	signal will be ignored. The default is ON (-coin_lockout).
+	coin lockout signal will be ignored. The default is ON (-coin_lockout).
 -ctrlr <controller>
@ -1131,6 +1159,32 @@ Debugging options
 	(-noupdate_in_pause).
 Core communication options
 --------------------------
 -comm_localhost <string>
 	Local address to bind to.  This can be a traditional xxx.xxx.xxx.xxx
 	address or a string containing a resolvable hostname.  The default is
 	value is "0.0.0.0"
 -comm_localport <string>
 	Local port to bind to.  This can be any traditional communications port
        as an unsigned 16-bit integer (0-65535).  The default value is "15122".
 -comm_remotehost <string>
 	Remote address to connect to.  This can be a traditional xxx.xxx.xxx.xxx
        address or a string containing a resolvable hostname.  The default is
        value is "0.0.0.0"
 -comm_remoteport <string>
 	Remote port to connect to.  This can be any traditional communications port
 	as an unsigned 16-bit integer (0-65535).  The default value is "15122".
 Core misc options
 -----------------
--- a/docs/m6502.txt
+++ b/docs/m6502.txt
@ -233,8 +233,8 @@ subclass has been created.  It's called memory_interface, declared in
 m6502_device, and provides the following accessors:
 - UINT8 read(UINT16 adr)                  - normal read
- UINT8 read_direct(UINT16 adr)           - direct read
+- UINT8 read_sync(UINT16 adr)             - opcode read with sync active (first byte of opcode)
- UINT8 read_decrypted(UINT16 adr)        - decrypted data read
+- UINT8 read_arg(UINT16 adr)              - opcode read with sync inactive (rest of opcode)
 - void write(UINT16 adr, UINT8 val)       - normal write
 - UINT8 read_9(UINT16 adr)                - special y-indexed 6509 read, defaults to read()
--- a/hash/gamegear.xml
+++ b/hash/gamegear.xml
@ -3909,7 +3909,7 @@ a certain item) -->
 		<description>Lemmings 2 - The Tribes (Euro, Prototype)</description>
 		<year>1994</year>
 		<publisher>Psygnosis</publisher>
-		<part name="cart" interface="sms_cart">
+		<part name="cart" interface="gamegear_cart">
 			<dataarea name="rom" size="524288">
 				<rom name="lemmings 2 - the tribes [proto].bin" size="524288" crc="fbc807e1" sha1="ad0ce8fc8ce9e5ef9b68b76fb7f3eced4245d5c4" offset="000000" />
 			</dataarea>
--- a/hash/i7000_card.xml
+++ b/hash/i7000_card.xml
@ -78,7 +78,7 @@ cartridges data available in this softlist.
 		</part>
 	</software>
-	<software name="redelocal">
+	<software name="redelocl">
 		<description>I-7119 REDE LOCAL v1.0 R01 (Mar 21st, 1987)</description>
 		<year>1987</year>
 		<publisher>Itautec</publisher>
@ -104,7 +104,7 @@ cartridges data available in this softlist.
 		</part>
 	</software>
-	<software name="redatorv12">
+	<software name="redtrv12">
 		<description>I-71XX REDATOR v1.2 R04</description>
 		<year>198?</year>
 		<publisher>Itautec</publisher>
@ -130,7 +130,7 @@ cartridges data available in this softlist.
 		</part>
 	</software>
-	<software name="videotexto">
+	<software name="vdeotxto">
 		<description>I-71XX VIDEOTEXTO</description>
 		<year>198?</year>
 		<publisher>Itautec</publisher>
--- a/hash/n64.xml
+++ b/hash/n64.xml
@ -54,6 +54,7 @@ Info on N64 chip labels (from The Cart Scan Repository)
 <!-- List of confirmed carts (info from pictures) -->
 <softwarelist name="n64" description="Nintendo 64 cartridges">
 	<software name="007goldnu" cloneof="007goldn">
 		<description>007 - GoldenEye (USA)</description>
 		<year>1997</year>
@ -5877,12 +5878,12 @@ patched out (+ a fix for internal checksum)
 				<!-- Original release, in .z64 format -->
 				<!-- rom name="mm_debug.rom" size="67108864" crc="687d8395" sha1="b38b71d2961dffb523020a67f4807a4b704e347a" offset="000000" /-->
 				<!-- .v64 version -->
-				<rom name="mm_debug.bin" size="67108864" crc="ea2e7abb" sha1="c790b3de31196645034c76e326640ccf3b8c91dd" offset="000000" />
+				<rom name="legend of zelda, the - majora's mask (europe) (en,fr,de,es) (debug edition).bin" size="67108864" crc="ea2e7abb" sha1="c790b3de31196645034c76e326640ccf3b8c91dd" offset="000000" />
 			</dataarea>
 		</part>
 	</software>
-	<software name="zeldamaju1" cloneof="zeldamaj">
+	<software name="zeldamaju2" cloneof="zeldamaj">
 		<description>The Legend of Zelda - Majora's Mask (USA, Demo)</description>
 		<year>2000</year>
 		<publisher>Nintendo</publisher>
@ -11662,8 +11663,9 @@ patched out (+ a fix for internal checksum)
 		</part>
 	</software>
-	<!-- to be verified -->
+<!-- to be verified -->
-	<software name="zeldaootmq" cloneof="zeldaoot">
+
 	<software name="zeldaootmqd" cloneof="zeldaoot">
 		<description>The Legend of Zelda - Ocarina of Time - Master Quest (USA, Debug Edition, Ripped from GC)</description>
 		<year>2003</year>
 		<publisher>Nintendo</publisher>
@ -11674,39 +11676,104 @@ patched out (+ a fix for internal checksum)
 		</part>
 	</software>
-	<software name="zeldaootmq1" cloneof="zeldaoot">
+	<software name="zeldaootmqu" cloneof="zeldaoot">
-		<description>The Legend of Zelda - Ocarina of Time - Master Quest (Euro, Debug Edition?, Ripped from GC)</description>
+		<description>The Legend of Zelda - Ocarina of Time - Master Quest (USA, Ripped from GC)</description>
 		<year>2003</year>
 		<publisher>Nintendo</publisher>
 		<part name="cart" interface="n64_cart">
 			<dataarea name="rom" size="33554432">
-				<rom name="legend of zelda, the - ocarina of time - master quest (2003)(nintendo)[gamecube version].bin" size="33554432" crc="177fa73a" sha1="8ebf2e29313f44f2d49e5b4191971d09919e8e48" offset="000000" />
+				<rom name="legend of zelda, the - ocarina of time - master quest (usa)(2003)(nintendo)(ntsc)[gamecube version].bin" size="33554432" crc="7b89b13f" sha1="e1d070ad7b017de9f992b362164dcd9d7f820f7e" offset="000000" />
 			</dataarea>
 		</part>
 	</software>
 	<software name="zeldaootmq" cloneof="zeldaoot">
 		<description>The Legend of Zelda - Ocarina of Time - Master Quest (Euro, Ripped from GC)</description>
 		<year>2003</year>
 		<publisher>Nintendo</publisher>
 		<part name="cart" interface="n64_cart">
 			<dataarea name="rom" size="33554432">
 				<rom name="legend of zelda, the - ocarina of time - master quest (europe)(2003)(nintendo)(pal)[gamecube version].bin" size="33554432" crc="177fa73a" sha1="8ebf2e29313f44f2d49e5b4191971d09919e8e48" offset="000000" />
 			</dataarea>
 		</part>
 	</software>
 	<software name="zeldaootmqj" cloneof="zeldaoot">
 		<description>Zelda no Densetsu - Toki no Ocarina Ura (Jpn, Ripped from GC)</description>
 		<year>2003</year>
 		<publisher>Nintendo</publisher>
 		<part name="cart" interface="n64_cart">
 			<dataarea name="rom" size="33554432">
 				<rom name="zelda no densetsu - toki no ocarina ura (japan)(2003)(nintendo)(ntsc)[gamecube version].bin" size="33554432" crc="d97c20ba" sha1="06c3c098f0e14ed61811dfaf0e8e4519d7d7a826" offset="000000" />
 			</dataarea>
 		</part>
 	</software>
 	<software name="zeldaootu3" cloneof="zeldaoot">
 		<description>The Legend of Zelda - Ocarina of Time (USA, Ripped from GC)</description>
 		<year>2003</year>
 		<publisher>Nintendo</publisher>
 		<part name="cart" interface="n64_cart">
 			<dataarea name="rom" size="33554432">
 				<rom name="legend of zelda, the - ocarina of time (usa)(2003)(nintendo)(ntsc)[gamecube version].bin" size="33554432" crc="84bbc39f" sha1="44c75962911e13bdfdc31b35e0b8e3be6a6a49ab" offset="000000" />
 			</dataarea>
 		</part>
 	</software>
 	<software name="zeldaoot2" cloneof="zeldaoot">
 		<description>The Legend of Zelda - Ocarina of Time (Euro, Ripped from GC)</description>
 		<year>2003</year>
 		<publisher>Nintendo</publisher>
 		<part name="cart" interface="n64_cart">
 			<dataarea name="rom" size="33554432">
-				<rom name="legend of zelda, the - ocarina of time (2003)(nintendo)(pal)[gamecube version].v64" size="33554432" crc="6e658036" sha1="580dd0bd1b6d2c51cc20a764eece84dba558964c" offset="000000" />
+				<rom name="legend of zelda, the - ocarina of time (europe)(2003)(nintendo)(pal)[gamecube version].bin" size="33554432" crc="6e658036" sha1="580dd0bd1b6d2c51cc20a764eece84dba558964c" offset="000000" />
 			</dataarea>
 		</part>
 	</software>
-	<software name="zeldamaju2" cloneof="zeldamaj">
+	<software name="zeldaootj3" cloneof="zeldaoot">
-		<description>The Legend of Zelda - Majora's Mask (USA, Ripped from GC)</description>
+		<description>Zelda no Densetsu - Toki no Ocarina (Jpn, Ripped from GC)</description>
-		<year>2003?</year>
+		<year>2003</year>
 		<publisher>Nintendo</publisher>
 		<part name="cart" interface="n64_cart">
 			<dataarea name="rom" size="33554432">
-				<rom name="legend of zelda, the - majora's mask (2003)(nintendo)(us)[gamecube version].v64" size="33554432" crc="52245acb" sha1="8c378b87c83b3f4de20b14accf91e7590399f5dc" offset="000000" />
+				<rom name="zelda no densetsu - toki no ocarina (japan)(2003)(nintendo)(ntsc)[gamecube version].bin" size="33554432" crc="0ac22de8" sha1="245410280d152f28d5b1c0c0fc37f384db0020cd" offset="000000" />
 			</dataarea>
 		</part>
 	</software>
 	<software name="zeldamaju1" cloneof="zeldamaj">
 		<description>The Legend of Zelda - Majora's Mask (USA, Ripped from GC)</description>
 		<year>2003</year>
 		<publisher>Nintendo</publisher>
 		<part name="cart" interface="n64_cart">
 			<dataarea name="rom" size="33554432">
 				<rom name="legend of zelda, the - majora's mask (2003)(nintendo)(us)[gamecube version].bin" size="33554432" crc="52245acb" sha1="8c378b87c83b3f4de20b14accf91e7590399f5dc" offset="000000" />
 			</dataarea>
 		</part>
 	</software>
 	<software name="zeldamaj2" cloneof="zeldamaj">
 		<description>The Legend of Zelda - Majora's Mask (Euro, Ripped from GC)</description>
 		<year>2003</year>
 		<publisher>Nintendo</publisher>
 		<part name="cart" interface="n64_cart">
 			<dataarea name="rom" size="33554432">
 				<rom name="legend of zelda, the - majora's mask (2003)(nintendo)(europe)[gamecube version].bin" size="33554432" crc="19139e89" sha1="f4b0bedafc45c78c4428882036d46d691b650d8b" offset="000000" />
 			</dataarea>
 		</part>
 	</software>
 	<software name="zeldamajj2" cloneof="zeldamaj">
 		<description>Zelda no Densetsu - Mujura no Kamen (Jpn, Ripped from GC)</description>
 		<year>2003</year>
 		<publisher>Nintendo</publisher>
 		<part name="cart" interface="n64_cart">
 			<dataarea name="rom" size="33554432">
 				<rom name="zelda no densetsu - mujura no kamen (2003)(nintendo)(japan)[gamecube version].bin" size="33554432" crc="766ebdeb" sha1="7beadea493f24f77b5be85bf2c1dbd813481549b" offset="000000" />
 			</dataarea>
 		</part>
 	</software>
 <!-- Non game cartridges -->
@ -11834,5 +11901,4 @@ patched out (+ a fix for internal checksum)
 		</part>
 	</software>
 </softwarelist>
--- a/21
+++ b/21
@ -89,6 +89,8 @@
 # QT_HOME = /usr/lib64/qt48/
 # DRIVERS = src/mame/drivers/1942.c,src/mame/drivers/cops.c
 -include useroptions.mak
 ###########################################################################
@ -242,6 +244,15 @@ ifndef NOASM
 endif
 endif
 # Emscripten
 ifeq ($(findstring emcc,$(CC)),emcc)
 TARGETOS := asmjs
 ARCHITECTURE :=
 ifndef NOASM
 	NOASM := 1
 endif
 endif
 # Autodetect BIGENDIAN
 # MacOSX
 ifndef BIGENDIAN
@ -597,6 +608,10 @@ ifdef QT_HOME
 PARAMS += --QT_HOME='$(QT_HOME)'
 endif
 ifdef DRIVERS
 PARAMS += --DRIVERS='$(DRIVERS)'
 endif
 #-------------------------------------------------
 # All scripts
 #-------------------------------------------------
@ -619,9 +634,13 @@ SCRIPTS = scripts/genie.lua \
 	scripts/src/netlist.lua \
 	scripts/toolchain.lua \
 	scripts/src/osd/modules.lua \
 	scripts/target/$(TARGET)/$(SUBTARGET).lua \
 	$(wildcard src/osd/$(OSD)/$(OSD).mak) \
 	$(wildcard src/$(TARGET)/$(SUBTARGET).mak)
 ifndef DRIVERS
 SCRIPTS += scripts/target/$(TARGET)/$(SUBTARGET).lua
 endif
 ifdef REGENIE
 SCRIPTS+= regenie
 endif
--- a/nl_examples/kidniki.c
+++ b/nl_examples/kidniki.c
@ -3,8 +3,8 @@
 #include "netlist/devices/nld_system.h"
 #include "netlist/analog/nld_bjt.h"
-#define USE_FRONTIERS 0
+#define USE_FRONTIERS 1
-#define USE_FIXED_STV 0
+#define USE_FIXED_STV 1
 NETLIST_START(dummy)
 	SOLVER(Solver, 12000)
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@ -355,6 +355,11 @@ newoption {
 	}
 }
 newoption {
 	trigger = "DRIVERS",
 	description = "List of drivers to compile.",
 }
 if _OPTIONS["SHLIB"]=="1" then
 	LIBTYPE = "SharedLib"
 else
@ -488,11 +493,16 @@ msgarchiving ("Archiving $(notdir $@)...")
 messageskip { "SkipCreatingMessage", "SkipBuildingMessage", "SkipCleaningMessage" }
-if (not os.isfile(path.join("target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua"))) then
+if (_OPTIONS["DRIVERS"] == nil) then 
-	error("File definition for TARGET=" .. _OPTIONS["target"] .. " SUBTARGET=" .. _OPTIONS["subtarget"] .. " does not exist")
+	if (not os.isfile(path.join("target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua"))) then
 		error("File definition for TARGET=" .. _OPTIONS["target"] .. " SUBTARGET=" .. _OPTIONS["subtarget"] .. " does not exist")
 	end
 	dofile (path.join("target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua"))
 else
 	OUT_STR = os.outputof( PYTHON .. " " .. MAME_DIR .. "src/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["DRIVERS"] .. " target " .. _OPTIONS["subtarget"])
 	load(OUT_STR)()
 	os.outputof( PYTHON .. " " .. MAME_DIR .. "src/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["DRIVERS"] .. " drivers " .. _OPTIONS["subtarget"] .. " > ".. GEN_DIR  .. _OPTIONS["target"] .. "/" .. _OPTIONS["subtarget"].."/drivlist.c")
 end
 dofile (path.join("target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua"))
 configuration { "gmake" }
 	flags {
 		"SingleOutputDir",
@ -800,7 +810,7 @@ if _OPTIONS["OPTIMIZE"] then
 		}
 	end
 	if _OPTIONS["LTO"]=="1" then
-- -flto=4 -> 4 threads
+-- -flto=4 -> 4 threads, reduce if you are low on memory (less than 8G)
 		buildoptions {
 			"-flto=4",
 		}
@ -826,7 +836,8 @@ end
 if _OPTIONS["SSE2"]=="1" then
 	buildoptions {
-		"-msse2",
+		"-msse",
 		"-msse2"
 	}
 end
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@ -11,7 +11,7 @@
 -------------------------------------------------
 --
--@src/emu/bus/a7800/a78_slot.h,BUSES += A7800
+--@src/emu/bus/a7800/a78_slot.h,BUSES["A7800"] = true
 ---------------------------------------------------
 if (BUSES["A7800"]~=null) then
@ -33,7 +33,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/a800/a800_slot.h,BUSES += A800
+--@src/emu/bus/a800/a800_slot.h,BUSES["A800"] = true
 ---------------------------------------------------
 if (BUSES["A800"]~=null) then
@ -53,7 +53,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/a8sio/a8sio.h,BUSES += A8SIO
+--@src/emu/bus/a8sio/a8sio.h,BUSES["A8SIO"] = true
 ---------------------------------------------------
 if (BUSES["A8SIO"]~=null) then
@ -68,7 +68,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/abcbus/abcbus.h,BUSES += ABCBUS
+--@src/emu/bus/abcbus/abcbus.h,BUSES["ABCBUS"] = true
 ---------------------------------------------------
 if (BUSES["ABCBUS"]~=null) then
@ -107,7 +107,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/adam/exp.h,BUSES += ADAM
+--@src/emu/bus/adam/exp.h,BUSES["ADAM"] = true
 ---------------------------------------------------
 if (BUSES["ADAM"]~=null) then
@ -126,7 +126,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/adamnet/adamnet.h,BUSES += ADAMNET
+--@src/emu/bus/adamnet/adamnet.h,BUSES["ADAMNET"] = true
 ---------------------------------------------------
 if (BUSES["ADAMNET"]~=null) then
@ -149,7 +149,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/apf/slot.h,BUSES += APF
+--@src/emu/bus/apf/slot.h,BUSES["APF"] = true
 ---------------------------------------------------
 if (BUSES["APF"]~=null) then
@ -164,7 +164,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/apricot/expansion.h,BUSES += APRICOT_EXPANSION
+--@src/emu/bus/apricot/expansion.h,BUSES["APRICOT_EXPANSION"] = true
 ---------------------------------------------------
 if (BUSES["APRICOT_EXPANSION"]~=null) then
@ -181,7 +181,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/arcadia/slot.h,BUSES += ARCADIA
+--@src/emu/bus/arcadia/slot.h,BUSES["ARCADIA"] = true
 ---------------------------------------------------
 if (BUSES["ARCADIA"]~=null) then
@ -196,7 +196,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/astrocde/slot.h,BUSES += ASTROCADE
+--@src/emu/bus/astrocde/slot.h,BUSES["ASTROCADE"] = true
 ---------------------------------------------------
 if (BUSES["ASTROCADE"]~=null) then
@ -215,7 +215,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/bw2/exp.h,BUSES += BW2
+--@src/emu/bus/bw2/exp.h,BUSES["BW2"] = true
 ---------------------------------------------------
 if (BUSES["BW2"]~=null) then
@ -230,8 +230,8 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/c64/exp.h,BUSES += C64
+--@src/emu/bus/c64/exp.h,BUSES["C64"] = true
--@src/emu/bus/c64/user.h,BUSES += C64
+--@src/emu/bus/c64/user.h,BUSES["C64"] = true
 ---------------------------------------------------
 if (BUSES["C64"]~=null) then
@ -384,8 +384,8 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/cbm2/exp.h,BUSES += CBM2
+--@src/emu/bus/cbm2/exp.h,BUSES["CBM2"] = true
--@src/emu/bus/cbm2/user.h,BUSES += CBM2
+--@src/emu/bus/cbm2/user.h,BUSES["CBM2"] = true
 ---------------------------------------------------
 if (BUSES["CBM2"]~=null) then
@ -406,7 +406,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/cbmiec/cbmiec.h,BUSES += CBMIEC
+--@src/emu/bus/cbmiec/cbmiec.h,BUSES["CBMIEC"] = true
 ---------------------------------------------------
 if (BUSES["CBMIEC"]~=null) then
@ -437,7 +437,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/chanf/slot.h,BUSES += CHANNELF
+--@src/emu/bus/chanf/slot.h,BUSES["CHANNELF"] = true
 ---------------------------------------------------
 if (BUSES["CHANNELF"]~=null) then
@ -452,7 +452,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/comx35/exp.h,BUSES += COMX35
+--@src/emu/bus/comx35/exp.h,BUSES["COMX35"] = true
 ---------------------------------------------------
 if (BUSES["COMX35"]~=null) then
@ -481,7 +481,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/coleco/ctrl.h,BUSES += COLECO
+--@src/emu/bus/coleco/ctrl.h,BUSES["COLECO"] = true
 ---------------------------------------------------
 if (BUSES["COLECO"]~=null) then
@ -502,7 +502,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/crvision/slot.h,BUSES += CRVISION
+--@src/emu/bus/crvision/slot.h,BUSES["CRVISION"] = true
 ---------------------------------------------------
 if (BUSES["CRVISION"]~=null) then
@ -517,7 +517,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/dmv/dmv.h,BUSES += DMV
+--@src/emu/bus/dmv/dmv.h,BUSES["DMV"] = true
 ---------------------------------------------------
 if (BUSES["DMV"]~=null) then
@ -546,7 +546,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/ecbbus/ecbbus.h,BUSES += ECBBUS
+--@src/emu/bus/ecbbus/ecbbus.h,BUSES["ECBBUS"] = true
 ---------------------------------------------------
 if (BUSES["ECBBUS"]~=null) then
@ -561,7 +561,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/econet/econet.h,BUSES += ECONET
+--@src/emu/bus/econet/econet.h,BUSES["ECONET"] = true
 ---------------------------------------------------
 if (BUSES["ECONET"]~=null) then
@ -576,7 +576,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/ep64/exp.h,BUSES += EP64
+--@src/emu/bus/ep64/exp.h,BUSES["EP64"] = true
 ---------------------------------------------------
 if (BUSES["EP64"]~=null) then
@ -591,7 +591,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/generic/slot.h,BUSES += GENERIC
+--@src/emu/bus/generic/slot.h,BUSES["GENERIC"] = true
 ---------------------------------------------------
 if (BUSES["GENERIC"]~=null) then
@ -610,7 +610,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/ieee488/ieee488.h,BUSES += IEEE488
+--@src/emu/bus/ieee488/ieee488.h,BUSES["IEEE488"] = true
 ---------------------------------------------------
 if (BUSES["IEEE488"]~=null) then
@ -643,7 +643,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/iq151/iq151.h,BUSES += IQ151
+--@src/emu/bus/iq151/iq151.h,BUSES["IQ151"] = true
 ---------------------------------------------------
 if (BUSES["IQ151"]~=null) then
@ -672,7 +672,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/isbx/isbx.h,BUSES += IMI7000
+--@src/emu/bus/isbx/isbx.h,BUSES["IMI7000"] = true
 ---------------------------------------------------
 if (BUSES["IMI7000"]~=null) then
@ -687,7 +687,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/intv/slot.h,BUSES += INTV
+--@src/emu/bus/intv/slot.h,BUSES["INTV"] = true
 ---------------------------------------------------
 if (BUSES["INTV"]~=null) then
@ -706,7 +706,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/isa/isa.h,BUSES += ISA
+--@src/emu/bus/isa/isa.h,BUSES["ISA"] = true
 ---------------------------------------------------
 if (BUSES["ISA"]~=null) then
@ -818,7 +818,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/isbx/isbx.h,BUSES += ISBX
+--@src/emu/bus/isbx/isbx.h,BUSES["ISBX"] = true
 ---------------------------------------------------
 if (BUSES["ISBX"]~=null) then
@ -835,7 +835,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/msx_slot/slot.h,BUSES += MSX_SLOT
+--@src/emu/bus/msx_slot/slot.h,BUSES["MSX_SLOT"] = true
 ---------------------------------------------------
 if (BUSES["MSX_SLOT"]~=null) then
@ -912,7 +912,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/kc/kc.h,BUSES += KC
+--@src/emu/bus/kc/kc.h,BUSES["KC"] = true
 ---------------------------------------------------
 if (BUSES["KC"]~=null) then
@ -932,7 +932,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/odyssey2/slot.h,BUSES += O2
+--@src/emu/bus/odyssey2/slot.h,BUSES["O2"] = true
 ---------------------------------------------------
 if (BUSES["O2"]~=null) then
@ -951,7 +951,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/pc_joy/pc_joy.h,BUSES += PC_JOY
+--@src/emu/bus/pc_joy/pc_joy.h,BUSES["PC_JOY"] = true
 ---------------------------------------------------
 if (BUSES["PC_JOY"]~=null) then
@ -966,7 +966,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/pc_kbd/pc_kbdc.h,BUSES += PC_KBD
+--@src/emu/bus/pc_kbd/pc_kbdc.h,BUSES["PC_KBD"] = true
 ---------------------------------------------------
 if (BUSES["PC_KBD"]~=null) then
@ -995,9 +995,9 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/pet/cass.h,BUSES += PET
+--@src/emu/bus/pet/cass.h,BUSES["PET"] = true
--@src/emu/bus/pet/exp.h,BUSES += PET
+--@src/emu/bus/pet/exp.h,BUSES["PET"] = true
--@src/emu/bus/pet/user.h,BUSES += PET
+--@src/emu/bus/pet/user.h,BUSES["PET"] = true
 ---------------------------------------------------
 if (BUSES["PET"]~=null) then
@ -1030,8 +1030,8 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/plus4/exp.h,BUSES += PLUS4
+--@src/emu/bus/plus4/exp.h,BUSES["PLUS4"] = true
--@src/emu/bus/plus4/user.h,BUSES += PLUS4
+--@src/emu/bus/plus4/user.h,BUSES["PLUS4"] = true
 ---------------------------------------------------
 if (BUSES["PLUS4"]~=null) then
@ -1054,7 +1054,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/s100/s100.h,BUSES += S100
+--@src/emu/bus/s100/s100.h,BUSES["S100"] = true
 ---------------------------------------------------
 if (BUSES["S100"]~=null) then
@ -1079,7 +1079,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/spc1000/exp.h,BUSES += SPC1000
+--@src/emu/bus/spc1000/exp.h,BUSES["SPC1000"] = true
 ---------------------------------------------------
 if (BUSES["SPC1000"]~=null) then
@ -1096,7 +1096,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/tvc/tvc.h,BUSES += TVC
+--@src/emu/bus/tvc/tvc.h,BUSES["TVC"] = true
 ---------------------------------------------------
 if (BUSES["TVC"]~=null) then
@ -1111,7 +1111,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/vc4000/slot.h,BUSES += VC4000
+--@src/emu/bus/vc4000/slot.h,BUSES["VC4000"] = true
 ---------------------------------------------------
 if (BUSES["VC4000"]~=null) then
@ -1126,7 +1126,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/vcs/vcs_slot.h,BUSES += VCS
+--@src/emu/bus/vcs/vcs_slot.h,BUSES["VCS"] = true
 ---------------------------------------------------
 if (BUSES["VCS"]~=null) then
@ -1147,7 +1147,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/vcs/ctrl.h,BUSES += VCS_CTRL
+--@src/emu/bus/vcs/ctrl.h,BUSES["VCS_CTRL"] = true
 ---------------------------------------------------
 if (BUSES["VCS_CTRL"]~=null) then
@ -1172,7 +1172,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/vectrex/slot.h,BUSES += VECTREX
+--@src/emu/bus/vectrex/slot.h,BUSES["VECTREX"] = true
 ---------------------------------------------------
 if (BUSES["VECTREX"]~=null) then
@ -1187,7 +1187,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/vic10/exp.h,BUSES += VIC10
+--@src/emu/bus/vic10/exp.h,BUSES["VIC10"] = true
 ---------------------------------------------------
 if (BUSES["VIC10"]~=null) then
@ -1202,8 +1202,8 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/vic20/exp.h,BUSES += VIC20
+--@src/emu/bus/vic20/exp.h,BUSES["VIC20"] = true
--@src/emu/bus/vic20/user.h,BUSES += VIC20
+--@src/emu/bus/vic20/user.h,BUSES["VIC20"] = true
 ---------------------------------------------------
 if (BUSES["VIC20"]~=null) then
@ -1238,7 +1238,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/vidbrain/exp.h,BUSES += VIDBRAIN
+--@src/emu/bus/vidbrain/exp.h,BUSES["VIDBRAIN"] = true
 ---------------------------------------------------
 if (BUSES["VIDBRAIN"]~=null) then
@ -1257,8 +1257,8 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/vip/byteio.h,BUSES += VIP
+--@src/emu/bus/vip/byteio.h,BUSES["VIP"] = true
--@src/emu/bus/vip/exp.h,BUSES += VIP
+--@src/emu/bus/vip/exp.h,BUSES["VIP"] = true
 ---------------------------------------------------
 if (BUSES["VIP"]~=null) then
@ -1289,7 +1289,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/wangpc/wangpc.h,BUSES += WANGPC
+--@src/emu/bus/wangpc/wangpc.h,BUSES["WANGPC"] = true
 ---------------------------------------------------
 if (BUSES["WANGPC"]~=null) then
@ -1318,7 +1318,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/z88/z88.h,BUSES += Z88
+--@src/emu/bus/z88/z88.h,BUSES["Z88"] = true
 ---------------------------------------------------
 if (BUSES["Z88"]~=null) then
@ -1336,7 +1336,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/a2bus/a2bus.h,BUSES += A2BUS
+--@src/emu/bus/a2bus/a2bus.h,BUSES["A2BUS"] = true
 ---------------------------------------------------
 if (BUSES["A2BUS"]~=null) then
@ -1426,7 +1426,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/nubus/nubus.h,BUSES += NUBUS
+--@src/emu/bus/nubus/nubus.h,BUSES["NUBUS"] = true
 ---------------------------------------------------
 if (BUSES["NUBUS"]~=null) then
@ -1470,7 +1470,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/centronics/ctronics.h,BUSES += CENTRONICS
+--@src/emu/bus/centronics/ctronics.h,BUSES["CENTRONICS"] = true
 ---------------------------------------------------
 if (BUSES["CENTRONICS"]~=null) then
@ -1509,7 +1509,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/rs232/rs232.h,BUSES += RS232
+--@src/emu/bus/rs232/rs232.h,BUSES["RS232"] = true
 ---------------------------------------------------
 if (BUSES["RS232"]~=null) then
@ -1535,7 +1535,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/midi/midi.h,BUSES += MIDI
+--@src/emu/bus/midi/midi.h,BUSES["MIDI"] = true
 ---------------------------------------------------
 if (BUSES["MIDI"]~=null) then
@ -1551,7 +1551,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/lpci/pci.h,BUSES += LPCI
+--@src/emu/bus/lpci/pci.h,BUSES["LPCI"] = true
 ---------------------------------------------------
 if (BUSES["LPCI"]~=null) then
@ -1577,7 +1577,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/nes/nes_slot.h,BUSES += NES
+--@src/emu/bus/nes/nes_slot.h,BUSES["NES"] = true
 ---------------------------------------------------
 if (BUSES["NES"]~=null) then
@ -1690,7 +1690,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/nes_ctrl/ctrl.h,BUSES += NES_CTRL
+--@src/emu/bus/nes_ctrl/ctrl.h,BUSES["NES_CTRL"] = true
 ---------------------------------------------------
 if (BUSES["NES_CTRL"]~=null) then
@ -1732,7 +1732,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/snes/snes_slot.h,BUSES += SNES
+--@src/emu/bus/snes/snes_slot.h,BUSES["SNES"] = true
 ---------------------------------------------------
 if (BUSES["SNES"]~=null) then
@ -1768,7 +1768,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/snes_ctrl/ctrl.h,BUSES += SNES_CTRL
+--@src/emu/bus/snes_ctrl/ctrl.h,BUSES["SNES_CTRL"] = true
 ---------------------------------------------------
 if (BUSES["SNES_CTRL"]~=null) then
@ -1796,7 +1796,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/vboy/slot.h,BUSES += VBOY
+--@src/emu/bus/vboy/slot.h,BUSES["VBOY"] = true
 ---------------------------------------------------
 if (BUSES["VBOY"]~=null) then
 	files {
@ -1809,7 +1809,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/megadrive/md_slot.h,BUSES += MEGADRIVE
+--@src/emu/bus/megadrive/md_slot.h,BUSES["MEGADRIVE"] = true
 ---------------------------------------------------
 if (BUSES["MEGADRIVE"]~=null) then
@ -1837,7 +1837,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/neogeo/neogeo_slot.h,BUSES += NEOGEO
+--@src/emu/bus/neogeo/neogeo_slot.h,BUSES["NEOGEO"] = true
 ---------------------------------------------------
 if (BUSES["NEOGEO"]~=null) then
@ -1902,7 +1902,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/saturn/sat_slot.h,BUSES += SATURN
+--@src/emu/bus/saturn/sat_slot.h,BUSES["SATURN"] = true
 ---------------------------------------------------
 if (BUSES["SATURN"]~=null) then
@ -1920,7 +1920,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/sega8/sega8_slot.h,BUSES += SEGA8
+--@src/emu/bus/sega8/sega8_slot.h,BUSES["SEGA8"] = true
 ---------------------------------------------------
 if (BUSES["SEGA8"]~=null) then
@ -1938,7 +1938,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/sms_ctrl/smsctrl.h,BUSES += SMS_CTRL
+--@src/emu/bus/sms_ctrl/smsctrl.h,BUSES["SMS_CTRL"] = true
 ---------------------------------------------------
 if (BUSES["SMS_CTRL"]~=null) then
@ -1966,7 +1966,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/sms_exp/smsexp.h,BUSES += SMS_EXP
+--@src/emu/bus/sms_exp/smsexp.h,BUSES["SMS_EXP"] = true
 ---------------------------------------------------
 if (BUSES["SMS_EXP"]~=null) then
@ -1980,7 +1980,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/ti99_peb/peribox.h,BUSES += TI99PEB
+--@src/emu/bus/ti99_peb/peribox.h,BUSES["TI99PEB"] = true
 ---------------------------------------------------
 if (BUSES["TI99PEB"]~=null) then
@ -2022,7 +2022,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/gameboy/gb_slot.h,BUSES += GAMEBOY
+--@src/emu/bus/gameboy/gb_slot.h,BUSES["GAMEBOY"] = true
 ---------------------------------------------------
 if (BUSES["GAMEBOY"]~=null) then
@ -2038,7 +2038,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/gamegear/ggext.h,BUSES += GAMEGEAR
+--@src/emu/bus/gamegear/ggext.h,BUSES["GAMEGEAR"] = true
 ---------------------------------------------------
 if (BUSES["GAMEGEAR"]~=null) then
@ -2052,7 +2052,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/gba/gba_slot.h,BUSES += GBA
+--@src/emu/bus/gba/gba_slot.h,BUSES["GBA"] = true
 ---------------------------------------------------
 if (BUSES["GBA"]~=null) then
@ -2066,7 +2066,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/bml3/bml3bus.h,BUSES += BML3
+--@src/emu/bus/bml3/bml3bus.h,BUSES["BML3"] = true
 ---------------------------------------------------
 if (BUSES["BML3"]~=null) then
 	files {
@ -2083,7 +2083,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/coco/cococart.h,BUSES += COCO
+--@src/emu/bus/coco/cococart.h,BUSES["COCO"] = true
 ---------------------------------------------------
 if (BUSES["COCO"]~=null) then
 	files {
@ -2106,7 +2106,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/cpc/cpcexp.h,BUSES += CPC
+--@src/emu/bus/cpc/cpcexp.h,BUSES["CPC"] = true
 ---------------------------------------------------
 if (BUSES["CPC"]~=null) then
 	files {
@ -2132,12 +2132,14 @@ if (BUSES["CPC"]~=null) then
 		MAME_DIR .. "src/emu/bus/cpc/smartwatch.h",
 		MAME_DIR .. "src/emu/bus/cpc/brunword4.c",
 		MAME_DIR .. "src/emu/bus/cpc/brunword4.h",
 		MAME_DIR .. "src/emu/bus/cpc/hd20.c",
 		MAME_DIR .. "src/emu/bus/cpc/hd20.h",
 	}
 end
 ---------------------------------------------------
 --
--@src/emu/bus/epson_sio/epson_sio.h,BUSES += EPSON_SIO
+--@src/emu/bus/epson_sio/epson_sio.h,BUSES["EPSON_SIO"] = true
 ---------------------------------------------------
 if (BUSES["EPSON_SIO"]~=null) then
 	files {
@ -2152,7 +2154,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/pce/pce_slot.h,BUSES += PCE
+--@src/emu/bus/pce/pce_slot.h,BUSES["PCE"] = true
 ---------------------------------------------------
 if (BUSES["PCE"]~=null) then
 	files {
@ -2165,7 +2167,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/scv/slot.h,BUSES += SCV
+--@src/emu/bus/scv/slot.h,BUSES["SCV"] = true
 ---------------------------------------------------
 if (BUSES["SCV"]~=null) then
 	files {
@ -2178,7 +2180,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/x68k/x68kexp.h,BUSES += X68K
+--@src/emu/bus/x68k/x68kexp.h,BUSES["X68K"] = true
 ---------------------------------------------------
 if (BUSES["X68K"]~=null) then
 	files {
@ -2193,7 +2195,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/abckb/abckb.h,BUSES += ABCKB
+--@src/emu/bus/abckb/abckb.h,BUSES["ABCKB"] = true
 ---------------------------------------------------
 if (BUSES["ABCKB"]~=null) then
 	files {
@ -2210,7 +2212,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/compucolor/compclr_flp.h,BUSES += COMPUCOLOR
+--@src/emu/bus/compucolor/compclr_flp.h,BUSES["COMPUCOLOR"] = true
 ---------------------------------------------------
 if (BUSES["COMPUCOLOR"]~=null) then
 	files {
@ -2221,7 +2223,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/scsi/scsi.h,BUSES += SCSI
+--@src/emu/bus/scsi/scsi.h,BUSES["SCSI"] = true
 ---------------------------------------------------
 if (BUSES["SCSI"]~=null) then
 	files {
@ -2252,7 +2254,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/macpds/macpds.h,BUSES += MACPDS
+--@src/emu/bus/macpds/macpds.h,BUSES["MACPDS"] = true
 ---------------------------------------------------
 if (BUSES["MACPDS"]~=null) then
 	files {
@ -2265,7 +2267,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/oricext/oricext.h,BUSES += ORICEXT
+--@src/emu/bus/oricext/oricext.h,BUSES["ORICEXT"] = true
 ---------------------------------------------------
 if (BUSES["ORICEXT"]~=null) then
 	files {
@ -2280,7 +2282,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/a1bus/a1bus.h,BUSES += A1BUS
+--@src/emu/bus/a1bus/a1bus.h,BUSES["A1BUS"] = true
 ---------------------------------------------------
 if (BUSES["A1BUS"]~=null) then
@ -2296,7 +2298,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/amiga/zorro/zorro.h,BUSES += ZORRO
+--@src/emu/bus/amiga/zorro/zorro.h,BUSES["ZORRO"] = true
 ---------------------------------------------------
 if (BUSES["ZORRO"]~=null) then
@ -2320,7 +2322,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/ql/exp.h,BUSES += QL
+--@src/emu/bus/ql/exp.h,BUSES["QL"] = true
 ---------------------------------------------------
 if (BUSES["QL"]~=null) then
@ -2362,7 +2364,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/vtech/memexp/memexp.h,BUSES += VTECH_MEMEXP
+--@src/emu/bus/vtech/memexp/memexp.h,BUSES["VTECH_MEMEXP"] = true
 ---------------------------------------------------
 if (BUSES["VTECH_MEMEXP"]~=null) then
@ -2384,7 +2386,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/vtech/ioexp/ioexp.h,BUSES += VTECH_IOEXP
+--@src/emu/bus/vtech/ioexp/ioexp.h,BUSES["VTECH_IOEXP"] = true
 ---------------------------------------------------
 if (BUSES["VTECH_IOEXP"]~=null) then
@ -2402,7 +2404,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/wswan/slot.h,BUSES += WSWAN
+--@src/emu/bus/wswan/slot.h,BUSES["WSWAN"] = true
 ---------------------------------------------------
 if (BUSES["WSWAN"]~=null) then
@ -2416,7 +2418,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/psx/ctlrport.h,BUSES += PSX_CONTROLLER
+--@src/emu/bus/psx/ctlrport.h,BUSES["PSX_CONTROLLER"] = true
 ---------------------------------------------------
 if (BUSES["PSX_CONTROLLER"]~=null) then
@ -2434,7 +2436,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/nasbus/nasbus.h,BUSES += NASBUS
+--@src/emu/bus/nasbus/nasbus.h,BUSES["NASBUS"] = true
 ---------------------------------------------------
 if (BUSES["NASBUS"]~=null) then
@ -2452,7 +2454,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/cgenie/expansion.h,BUSES += CGENIE_EXPANSION
+--@src/emu/bus/cgenie/expansion.h,BUSES["CGENIE_EXPANSION"] = true
 ---------------------------------------------------
 if (BUSES["CGENIE_EXPANSION"]~=null) then
@ -2468,7 +2470,7 @@ end
 ---------------------------------------------------
 --
--@src/emu/bus/cgenie/parallel.h,BUSES += CGENIE_PARALLEL
+--@src/emu/bus/cgenie/parallel.h,BUSES["CGENIE_PARALLEL"] = true
 ---------------------------------------------------
 if (BUSES["CGENIE_PARALLEL"]~=null) then
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@ -21,7 +21,7 @@ files {
 -- Dynamic recompiler objects
 --------------------------------------------------
-if (CPUS["SH2"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RSP"]~=null) then
+if (CPUS["SH2"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RSP"]~=null or CPUS["ARM7"]~=null) then
 	files {
 		MAME_DIR .. "src/emu/cpu/drcbec.c",
 		MAME_DIR .. "src/emu/cpu/drcbec.h",
@ -50,7 +50,7 @@ end
 --------------------------------------------------
 -- Signetics 8X300 / Scientific Micro Systems SMS300
--@src/emu/cpu/8x300/8x300.h,CPUS += 8X300
+--@src/emu/cpu/8x300/8x300.h,CPUS["8X300"] = true
 --------------------------------------------------
 if (CPUS["8X300"]~=null) then
@ -66,7 +66,7 @@ end
 --------------------------------------------------
 -- ARCangent A4
--@src/emu/cpu/arc/arc.h,CPUS += ARC
+--@src/emu/cpu/arc/arc.h,CPUS["ARC"] = true
 --------------------------------------------------
 if (CPUS["ARC"]~=null) then
@ -82,7 +82,7 @@ end
 --------------------------------------------------
 -- ARcompact (ARCtangent-A5, ARC 600, ARC 700)
--@src/emu/cpu/arc/arc.h,CPUS += ARCOMPACT
+--@src/emu/cpu/arc/arc.h,CPUS["ARCOMPACT"] = true
 --------------------------------------------------
 if (CPUS["ARCOMPACT"]~=null) then
@ -111,8 +111,8 @@ end
 --------------------------------------------------
 -- Acorn ARM series
 --
---@src/emu/cpu/arm/arm.h,CPUS += ARM
+--@src/emu/cpu/arm/arm.h,CPUS["ARM"] = true
---@src/emu/cpu/arm7/arm7.h,CPUS += ARM7
+--@src/emu/cpu/arm7/arm7.h,CPUS["ARM7"] = true
 --------------------------------------------------
 if (CPUS["ARM"]~=null) then
@ -141,7 +141,7 @@ end
 --------------------------------------------------
 -- Advanced Digital Chips SE3208
---@src/emu/cpu/se3208/se3208.h,CPUS += SE3208
+--@src/emu/cpu/se3208/se3208.h,CPUS["SE3208"] = true
 --------------------------------------------------
 if (CPUS["SE3208"]~=null) then
@ -157,7 +157,7 @@ end
 --------------------------------------------------
 -- American Microsystems, Inc.(AMI) S2000 series
---@src/emu/cpu/amis2000/amis2000.h,CPUS += AMIS2000
+--@src/emu/cpu/amis2000/amis2000.h,CPUS["AMIS2000"] = true
 --------------------------------------------------
 if (CPUS["AMIS2000"]~=null) then
@ -173,7 +173,7 @@ end
 --------------------------------------------------
 -- Alpha 8201
---@src/emu/cpu/alph8201/alph8201.h,CPUS += ALPHA8201
+--@src/emu/cpu/alph8201/alph8201.h,CPUS["ALPHA8201"] = true
 --------------------------------------------------
 if (CPUS["ALPHA8201"]~=null) then
@ -189,7 +189,7 @@ end
 --------------------------------------------------
 -- Analog Devices ADSP21xx series
---@src/emu/cpu/adsp2100/adsp2100.h,CPUS += ADSP21XX
+--@src/emu/cpu/adsp2100/adsp2100.h,CPUS["ADSP21XX"] = true
 --------------------------------------------------
 if (CPUS["ADSP21XX"]~=null) then
@ -205,7 +205,7 @@ end
 --------------------------------------------------
 -- Analog Devices "Sharc" ADSP21062
---@src/emu/cpu/sharc/sharc.h,CPUS += ADSP21062
+--@src/emu/cpu/sharc/sharc.h,CPUS["ADSP21062"] = true
 --------------------------------------------------
 if (CPUS["ADSP21062"]~=null) then
@ -221,7 +221,7 @@ end
 --------------------------------------------------
 -- APEXC
---@src/emu/cpu/apexc/apexc.h,CPUS += APEXC
+--@src/emu/cpu/apexc/apexc.h,CPUS["APEXC"] = true
 --------------------------------------------------
 if (CPUS["APEXC"]~=null) then
@ -237,7 +237,7 @@ end
 --------------------------------------------------
 -- AT&T DSP16A
---@src/emu/cpu/dsp16/dsp16.h,CPUS += DSP16A
+--@src/emu/cpu/dsp16/dsp16.h,CPUS["DSP16A"] = true
 --------------------------------------------------
 if (CPUS["DSP16A"]~=null) then
@ -253,7 +253,7 @@ end
 --------------------------------------------------
 -- AT&T DSP32C
---@src/emu/cpu/dsp32/dsp32.h,CPUS += DSP32C
+--@src/emu/cpu/dsp32/dsp32.h,CPUS["DSP32C"] = true
 --------------------------------------------------
 if (CPUS["DSP32C"]~=null) then
@ -269,7 +269,7 @@ end
 --------------------------------------------------
 -- Atari custom RISC processor
---@src/emu/cpu/asap/asap.h,CPUS += ASAP
+--@src/emu/cpu/asap/asap.h,CPUS["ASAP"] = true
 --------------------------------------------------
 if (CPUS["ASAP"]~=null) then
@ -285,7 +285,7 @@ end
 --------------------------------------------------
 -- AMD Am29000
---@src/emu/cpu/am29000/am29000.h,CPUS += AM29000
+--@src/emu/cpu/am29000/am29000.h,CPUS["AM29000"] = true
 --------------------------------------------------
 if (CPUS["AM29000"]~=null) then
@ -301,7 +301,7 @@ end
 --------------------------------------------------
 -- Atari Jaguar custom DSPs
---@src/emu/cpu/jaguar/jaguar.h,CPUS += JAGUAR
+--@src/emu/cpu/jaguar/jaguar.h,CPUS["JAGUAR"] = true
 --------------------------------------------------
 if (CPUS["JAGUAR"]~=null) then
@ -317,7 +317,7 @@ end
 --------------------------------------------------
 -- Simutrek Cube Quest bit-sliced CPUs
---@src/emu/cpu/cubeqcpu/cubeqcpu.h,CPUS += CUBEQCPU
+--@src/emu/cpu/cubeqcpu/cubeqcpu.h,CPUS["CUBEQCPU"] = true
 --------------------------------------------------
 if (CPUS["CUBEQCPU"]~=null) then
@ -333,7 +333,7 @@ end
 --------------------------------------------------
 -- Ensoniq ES5510 ('ESP') DSP
---@src/emu/cpu/es5510/es5510.h,CPUS += ES5510
+--@src/emu/cpu/es5510/es5510.h,CPUS["ES5510"] = true
 --------------------------------------------------
 if (CPUS["ES5510"]~=null) then
@ -345,7 +345,7 @@ end
 --------------------------------------------------
 -- Entertainment Sciences AM29116-based RIP
---@src/emu/cpu/esrip/esrip.h,CPUS += ESRIP
+--@src/emu/cpu/esrip/esrip.h,CPUS["ESRIP"] = true
 --------------------------------------------------
 if (CPUS["ESRIP"]~=null) then
@ -361,7 +361,7 @@ end
 --------------------------------------------------
 -- Seiko Epson E0C6200 series
---@src/emu/cpu/e0c6200/e0c6200.h,CPUS += E0C6200
+--@src/emu/cpu/e0c6200/e0c6200.h,CPUS["E0C6200"] = true
 --------------------------------------------------
 if (CPUS["E0C6200"]~=null) then
@ -379,7 +379,7 @@ end
 --------------------------------------------------
 -- RCA COSMAC
---@src/emu/cpu/cosmac/cosmac.h,CPUS += COSMAC
+--@src/emu/cpu/cosmac/cosmac.h,CPUS["COSMAC"] = true
 --------------------------------------------------
 if (CPUS["COSMAC"]~=null) then
@ -395,7 +395,7 @@ end
 --------------------------------------------------
 -- National Semiconductor COP400 family
---@src/emu/cpu/cop400/cop400.h,CPUS += COP400
+--@src/emu/cpu/cop400/cop400.h,CPUS["COP400"] = true
 --------------------------------------------------
 if (CPUS["COP400"]~=null) then
@ -413,7 +413,7 @@ end
 --------------------------------------------------
 -- CP1610
---@src/emu/cpu/cp1610/cp1610.h,CPUS += CP1610
+--@src/emu/cpu/cp1610/cp1610.h,CPUS["CP1610"] = true
 --------------------------------------------------
 if (CPUS["CP1610"]~=null) then
@ -429,7 +429,7 @@ end
 --------------------------------------------------
 -- Cinematronics vector "CPU"
---@src/emu/cpu/ccpu/ccpu.h,CPUS += CCPU
+--@src/emu/cpu/ccpu/ccpu.h,CPUS["CCPU"] = true
 --------------------------------------------------
 if (CPUS["CCPU"]~=null) then
@ -445,7 +445,7 @@ end
 --------------------------------------------------
 -- DEC T-11
---@src/emu/cpu/t11/t11.h,CPUS += T11
+--@src/emu/cpu/t11/t11.h,CPUS["T11"] = true
 --------------------------------------------------
 if (CPUS["T11"]~=null) then
@ -461,7 +461,7 @@ end
 --------------------------------------------------
 -- F8
---@src/emu/cpu/f8/f8.h,CPUS += F8
+--@src/emu/cpu/f8/f8.h,CPUS["F8"] = true
 --------------------------------------------------
 if (CPUS["F8"]~=null) then
@ -477,7 +477,7 @@ end
 --------------------------------------------------
 -- G65816
---@src/emu/cpu/g65816/g65816.h,CPUS += G65816
+--@src/emu/cpu/g65816/g65816.h,CPUS["G65816"] = true
 --------------------------------------------------
 if (CPUS["G65816"]~=null) then
@ -498,7 +498,7 @@ end
 --------------------------------------------------
 -- Hitachi H8 (16/32-bit H8/300, H8/300H, H8S2000 and H8S2600 series)
---@src/emu/cpu/h8/h8.h,CPUS += H8
+--@src/emu/cpu/h8/h8.h,CPUS["H8"] = true
 --------------------------------------------------
 if (CPUS["H8"]~=null) then
@ -560,7 +560,7 @@ end
 --------------------------------------------------
 -- Hitachi HCD62121
---@src/emu/cpu/hcd62121/hcd62121.h,CPUS += HCD62121
+--@src/emu/cpu/hcd62121/hcd62121.h,CPUS["HCD62121"] = true
 --------------------------------------------------
 if (CPUS["HCD62121"]~=null) then
@ -576,7 +576,7 @@ end
 --------------------------------------------------
 -- Hitachi HMCS40 series
---@src/emu/cpu/hmcs40/hmcs40.h,CPUS += HMCS40
+--@src/emu/cpu/hmcs40/hmcs40.h,CPUS["HMCS40"] = true
 --------------------------------------------------
 if (CPUS["HMCS40"]~=null) then
@ -592,7 +592,7 @@ end
 --------------------------------------------------
 -- Hitachi SH1/SH2
---@src/emu/cpu/sh2/sh2.h,CPUS += SH2
+--@src/emu/cpu/sh2/sh2.h,CPUS["SH2"] = true
 --------------------------------------------------
 if (CPUS["SH2"]~=null) then
@ -609,7 +609,7 @@ end
 --------------------------------------------------
 -- Hitachi SH4
---@src/emu/cpu/sh4/sh4.h,CPUS += SH4
+--@src/emu/cpu/sh4/sh4.h,CPUS["SH4"] = true
 --------------------------------------------------
 if (CPUS["SH4"]~=null) then
@ -633,7 +633,7 @@ end
 --------------------------------------------------
 -- HP Hybrid processor
---@src/emu/cpu/hphybrid/hphybrid.h,CPUS += HPHYBRID
+--@src/emu/cpu/hphybrid/hphybrid.h,CPUS["HPHYBRID"] = true
 --------------------------------------------------
 if (CPUS["HPHYBRID"]~=null) then
@ -649,7 +649,7 @@ end
 --------------------------------------------------
 -- Hudsonsoft 6280
---@src/emu/cpu/h6280/h6280.h,CPUS += H6280
+--@src/emu/cpu/h6280/h6280.h,CPUS["H6280"] = true
 --------------------------------------------------
 if (CPUS["H6280"]~=null) then
@ -665,7 +665,7 @@ end
 --------------------------------------------------
 -- Hyperstone E1 series
---@src/emu/cpu/e132xs/e132xs.h,CPUS += E1
+--@src/emu/cpu/e132xs/e132xs.h,CPUS["E1"] = true
 --------------------------------------------------
 if (CPUS["E1"]~=null) then
@ -681,7 +681,7 @@ end
 --------------------------------------------------
 -- 15IE-00-013 CPU ("Microprogrammed Control Device")
---@src/emu/cpu/ie15/ie15.h,CPUS += IE15
+--@src/emu/cpu/ie15/ie15.h,CPUS["IE15"] = true
 --------------------------------------------------
 if (CPUS["IE15"]~=null) then
@ -697,7 +697,7 @@ end
 --------------------------------------------------
 -- Intel 4004
---@src/emu/cpu/i4004/i4004.h,CPUS += I4004
+--@src/emu/cpu/i4004/i4004.h,CPUS["I4004"] = true
 --------------------------------------------------
 if (CPUS["I4004"]~=null) then
@ -713,7 +713,7 @@ end
 --------------------------------------------------
 -- Intel 8008
---@src/emu/cpu/i8008/i8008.h,CPUS += I8008
+--@src/emu/cpu/i8008/i8008.h,CPUS["I8008"] = true
 --------------------------------------------------
 if (CPUS["I8008"]~=null) then
@ -729,7 +729,7 @@ end
 --------------------------------------------------
 --  National Semiconductor SC/MP
---@src/emu/cpu/scmp/scmp.h,CPUS += SCMP
+--@src/emu/cpu/scmp/scmp.h,CPUS["SCMP"] = true
 --------------------------------------------------
 if (CPUS["SCMP"]~=null) then
@ -745,7 +745,7 @@ end
 --------------------------------------------------
 -- Intel 8080/8085A
---@src/emu/cpu/i8085/i8085.h,CPUS += I8085
+--@src/emu/cpu/i8085/i8085.h,CPUS["I8085"] = true
 --------------------------------------------------
 if (CPUS["I8085"]~=null) then
@ -761,7 +761,7 @@ end
 --------------------------------------------------
 -- Intel 8089
---@src/emu/cpu/i8085/i8089.h,CPUS += I8089
+--@src/emu/cpu/i8089/i8089.h,CPUS["I8089"] = true
 --------------------------------------------------
 if (CPUS["I8089"]~=null) then
@ -780,7 +780,7 @@ end
 --------------------------------------------------
 -- Intel MCS-48 (8039 and derivatives)
---@src/emu/cpu/mcs48/mcs48.h,CPUS += MCS48
+--@src/emu/cpu/mcs48/mcs48.h,CPUS["MCS48"] = true
 --------------------------------------------------
 if (CPUS["MCS48"]~=null) then
@ -796,7 +796,7 @@ end
 --------------------------------------------------
 -- Intel 8051 and derivatives
---@src/emu/cpu/mcs51/mcs51.h,CPUS += MCS51
+--@src/emu/cpu/mcs51/mcs51.h,CPUS["MCS51"] = true
 --------------------------------------------------
 if (CPUS["MCS51"]~=null) then
@ -812,7 +812,7 @@ end
 --------------------------------------------------
 -- Intel MCS-96
---@src/emu/cpu/mcs96/mcs96.h,CPUS += MCS96
+--@src/emu/cpu/mcs96/mcs96.h,CPUS["MCS96"] = true
 --------------------------------------------------
 if (CPUS["MCS96"]~=null) then
@ -839,9 +839,9 @@ end
 --------------------------------------------------
 -- Intel 80x86 series
---@src/emu/cpu/i86/i86.h,CPUS += I86
+--@src/emu/cpu/i86/i86.h,CPUS["I86"] = true
---@src/emu/cpu/i86/i286.h,CPUS += I86
+--@src/emu/cpu/i86/i286.h,CPUS["I86"] = true
---@src/emu/cpu/i386/i386.h,CPUS += I386
+--@src/emu/cpu/i386/i386.h,CPUS["I386"] = true
 --------------------------------------------------
 if (CPUS["I86"]~=null) then
@ -872,7 +872,7 @@ end
 --------------------------------------------------
 -- Intel i860
---@src/emu/cpu/i860/i860.h,CPUS += I860
+--@src/emu/cpu/i860/i860.h,CPUS["I860"] = true
 --------------------------------------------------
 if (CPUS["I860"]~=null) then
@ -888,7 +888,7 @@ end
 --------------------------------------------------
 -- Intel i960
---@src/emu/cpu/i960/i960.h,CPUS += I960
+--@src/emu/cpu/i960/i960.h,CPUS["I960"] = true
 --------------------------------------------------
 if (CPUS["I960"]~=null) then
@ -904,7 +904,7 @@ end
 --------------------------------------------------
 -- LH5801
---@src/emu/cpu/lh5801/lh5801.h,CPUS += LH5801
+--@src/emu/cpu/lh5801/lh5801.h,CPUS["LH5801"] = true
 --------------------------------------------------
 if (CPUS["LH5801"]~=null) then
@ -920,7 +920,7 @@ end
 --------
 ------------------------------------------
 -- Manchester Small-Scale Experimental Machine
---@src/emu/cpu/ssem/ssem.h,CPUS += SSEM
+--@src/emu/cpu/ssem/ssem.h,CPUS["SSEM"] = true
 --------------------------------------------------
 if (CPUS["SSEM"]~=null) then
@ -936,7 +936,7 @@ end
 --------------------------------------------------
 -- Fujitsu MB88xx
---@src/emu/cpu/mb88xx/mb88xx.h,CPUS += MB88XX
+--@src/emu/cpu/mb88xx/mb88xx.h,CPUS["MB88XX"] = true
 --------------------------------------------------
 if (CPUS["MB88XX"]~=null) then
@ -952,7 +952,7 @@ end
 --------------------------------------------------
 -- Fujitsu MB86233
---@src/emu/cpu/mb86233/mb86233.h,CPUS += MB86233
+--@src/emu/cpu/mb86233/mb86233.h,CPUS["MB86233"] = true
 --------------------------------------------------
 if (CPUS["MB86233"]~=null) then
@ -968,7 +968,7 @@ end
 --------------------------------------------------
 -- Fujitsu MB86235
---@src/emu/cpu/mb86233/mb86235.h,CPUS += MB86235
+--@src/emu/cpu/mb86233/mb86235.h,CPUS["MB86235"] = true
 --------------------------------------------------
 if (CPUS["MB86235"]~=null) then
@ -984,7 +984,7 @@ end
 --------------------------------------------------
 -- Microchip PIC16C5x
---@src/emu/cpu/pic16c5x/pic16c5x.h,CPUS += PIC16C5X
+--@src/emu/cpu/pic16c5x/pic16c5x.h,CPUS["PIC16C5X"] = true
 --------------------------------------------------
 if (CPUS["PIC16C5X"]~=null) then
@ -1000,7 +1000,7 @@ end
 --------------------------------------------------
 -- Microchip PIC16C62x
---@src/emu/cpu/pic16c62x/pic16c62x.h,CPUS += PIC16C62X
+--@src/emu/cpu/pic16c62x/pic16c62x.h,CPUS["PIC16C62X"] = true
 --------------------------------------------------
 if (CPUS["PIC16C62X"]~=null) then
@ -1017,7 +1017,7 @@ end
 --------------------------------------------------
 -- MIPS R3000 (MIPS I/II) series
 -- MIPS R4000 (MIPS III/IV) series
---@src/emu/cpu/mips/mips3.h,CPUS += MIPS
+--@src/emu/cpu/mips/mips3.h,CPUS["MIPS"] = true
 --------------------------------------------------
 if (CPUS["MIPS"]~=null) then
@ -1041,7 +1041,7 @@ end
 --------------------------------------------------
 -- Sony PlayStation CPU (R3000-based + GTE)
---@src/emu/cpu/psx/psx.h,CPUS += PSX
+--@src/emu/cpu/psx/psx.h,CPUS["PSX"] = true
 --------------------------------------------------
 if (CPUS["PSX"]~=null) then
@ -1069,7 +1069,7 @@ end
 --------------------------------------------------
 -- Mitsubishi MELPS 4 series
---@src/emu/cpu/melps4/melps4.h,CPUS += MELPS4
+--@src/emu/cpu/melps4/melps4.h,CPUS["MELPS4"] = true
 --------------------------------------------------
 if (CPUS["MELPS4"]~=null) then
@ -1087,7 +1087,7 @@ end
 --------------------------------------------------
 -- Mitsubishi M37702 and M37710 (based on 65C816)
---@src/emu/cpu/m37710/m37710.h,CPUS += M37710
+--@src/emu/cpu/m37710/m37710.h,CPUS["M37710"] = true
 --------------------------------------------------
 if (CPUS["M37710"]~=null) then
@ -1107,23 +1107,23 @@ end
 --------------------------------------------------
 -- Mostek 6502 and its many derivatives
---@src/emu/cpu/m6502/m6502.h,CPUS += M6502
+--@src/emu/cpu/m6502/m6502.h,CPUS["M6502"] = true
---@src/emu/cpu/m6502/deco16.h,CPUS += M6502
+--@src/emu/cpu/m6502/deco16.h,CPUS["M6502"] = true
---@src/emu/cpu/m6502/m4510.h,CPUS += M6502
+--@src/emu/cpu/m6502/m4510.h,CPUS["M6502"] = true
---@src/emu/cpu/m6502/m65ce02.h,CPUS += M6502
+--@src/emu/cpu/m6502/m65ce02.h,CPUS["M6502"] = true
---@src/emu/cpu/m6502/m65c02.h,CPUS += M6502
+--@src/emu/cpu/m6502/m65c02.h,CPUS["M6502"] = true
---@src/emu/cpu/m6502/r65c02.h,CPUS += M6502
+--@src/emu/cpu/m6502/r65c02.h,CPUS["M6502"] = true
---@src/emu/cpu/m6502/m65sc02.h,CPUS += M6502
+--@src/emu/cpu/m6502/m65sc02.h,CPUS["M6502"] = true
---@src/emu/cpu/m6502/m6504.h,CPUS += M6502
+--@src/emu/cpu/m6502/m6504.h,CPUS["M6502"] = true
---@src/emu/cpu/m6502/m6509.h,CPUS += M6502
+--@src/emu/cpu/m6502/m6509.h,CPUS["M6502"] = true
---@src/emu/cpu/m6502/m6510.h,CPUS += M6502
+--@src/emu/cpu/m6502/m6510.h,CPUS["M6502"] = true
---@src/emu/cpu/m6502/m6510t.h,CPUS += M6502
+--@src/emu/cpu/m6502/m6510t.h,CPUS["M6502"] = true
---@src/emu/cpu/m6502/m7501.h,CPUS += M6502
+--@src/emu/cpu/m6502/m7501.h,CPUS["M6502"] = true
---@src/emu/cpu/m6502/m8502.h,CPUS += M6502
+--@src/emu/cpu/m6502/m8502.h,CPUS["M6502"] = true
---@src/emu/cpu/m6502/n2a03.h,CPUS += M6502
+--@src/emu/cpu/m6502/n2a03.h,CPUS["M6502"] = true
---@src/emu/cpu/m6502/m740.h,CPUS += M6502
+--@src/emu/cpu/m6502/m740.h,CPUS["M6502"] = true
---@src/emu/cpu/m6502/m3745x.h,CPUS += M6502
+--@src/emu/cpu/m6502/m3745x.h,CPUS["M6502"] = true
---@src/emu/cpu/m6502/m5074x.h,CPUS += M6502
+--@src/emu/cpu/m6502/m5074x.h,CPUS["M6502"] = true
 --------------------------------------------------
@ -1195,7 +1195,7 @@ end
 --------------------------------------------------
 -- Motorola 680x
---@src/emu/cpu/m6800/m6800.h,CPUS += M6800
+--@src/emu/cpu/m6800/m6800.h,CPUS["M6800"] = true
 --------------------------------------------------
 if (CPUS["M6800"]~=null) then
@ -1211,7 +1211,7 @@ end
 --------------------------------------------------
 -- Motorola 6805
---@src/emu/cpu/m6805/m6805.h,CPUS += M6805
+--@src/emu/cpu/m6805/m6805.h,CPUS["M6805"] = true
 --------------------------------------------------
 if (CPUS["M6805"]~=null) then
@ -1227,9 +1227,9 @@ end
 --------------------------------------------------
 -- Motorola 6809
---@src/emu/cpu/m6809/m6809.h,CPUS += M6809
+--@src/emu/cpu/m6809/m6809.h,CPUS["M6809"] = true
---@src/emu/cpu/m6809/hd6309.h,CPUS += M6809
+--@src/emu/cpu/m6809/hd6309.h,CPUS["M6809"] = true
---@src/emu/cpu/m6809/konami.h,CPUS += M6809
+--@src/emu/cpu/m6809/konami.h,CPUS["M6809"] = true
 --------------------------------------------------
 if (CPUS["M6809"]~=null) then
@ -1263,7 +1263,7 @@ end
 --------------------------------------------------
 -- Motorola 68HC11
---@src/emu/cpu/mc68hc11/mc68hc11.h,CPUS += MC68HC11
+--@src/emu/cpu/mc68hc11/mc68hc11.h,CPUS["MC68HC11"] = true
 --------------------------------------------------
 if (CPUS["MC68HC11"]~=null) then
@ -1279,7 +1279,7 @@ end
 --------------------------------------------------
 -- Motorola 68000 series
---@src/emu/cpu/m68000/m68000.h,CPUS += M680X0
+--@src/emu/cpu/m68000/m68000.h,CPUS["M680X0"] = true
 --------------------------------------------------
 if (CPUS["M680X0"]~=null) then
@ -1297,7 +1297,7 @@ end
 --------------------------------------------------
 -- Motorola/Freescale dsp56k
---@src/emu/cpu/dsp56k/dsp56k.h,CPUS += DSP56156
+--@src/emu/cpu/dsp56k/dsp56k.h,CPUS["DSP56156"] = true
 --------------------------------------------------
 if (CPUS["DSP56156"]~=null) then
@ -1322,8 +1322,8 @@ end
 --------------------------------------------------
 -- PDP-1
 -- TX0
---@src/emu/cpu/pdp1/pdp1.h,CPUS += PDP1
+--@src/emu/cpu/pdp1/pdp1.h,CPUS["PDP1"] = true
---@src/emu/cpu/pdp1/tx0.h,CPUS += PDP1
+--@src/emu/cpu/pdp1/tx0.h,CPUS["PDP1"] = true
 --------------------------------------------------
 if (CPUS["PDP1"]~=null) then
@ -1342,7 +1342,7 @@ end
 --------------------------------------------------
 -- Motorola PowerPC series
---@src/emu/cpu/powerpc/ppc.h,CPUS += POWERPC
+--@src/emu/cpu/powerpc/ppc.h,CPUS["POWERPC"] = true
 --------------------------------------------------
 if (CPUS["POWERPC"]~=null) then
@ -1361,8 +1361,8 @@ end
 --------------------------------------------------
 -- NEC V-series Intel-compatible
---@src/emu/cpu/nec/nec.h,CPUS += NEC
+--@src/emu/cpu/nec/nec.h,CPUS["NEC"] = true
---@src/emu/cpu/v30mz/v30mz.h,CPUS += V30MZ
+--@src/emu/cpu/v30mz/v30mz.h,CPUS["V30MZ"] = true
 --------------------------------------------------
 if (CPUS["NEC"]~=null) then
@ -1394,7 +1394,7 @@ end
 --------------------------------------------------
 -- NEC V60/V70
---@src/emu/cpu/v60/v60.h,CPUS += V60
+--@src/emu/cpu/v60/v60.h,CPUS["V60"] = true
 --------------------------------------------------
 if (CPUS["V60"]~=null) then
@ -1410,7 +1410,7 @@ end
 --------------------------------------------------
 -- NEC V810 (uPD70732)
---@src/emu/cpu/v810/v810.h,CPUS += V810
+--@src/emu/cpu/v810/v810.h,CPUS["V810"] = true
 --------------------------------------------------
 if (CPUS["V810"]~=null) then
@ -1426,7 +1426,7 @@ end
 --------------------------------------------------
 -- NEC uPD7725
---@src/emu/cpu/upd7725/upd7725.h,CPUS += UPD7725
+--@src/emu/cpu/upd7725/upd7725.h,CPUS["UPD7725"] = true
 --------------------------------------------------
 if (CPUS["UPD7725"]~=null) then
@ -1442,7 +1442,7 @@ end
 --------------------------------------------------
 -- NEC uPD7810 series
---@src/emu/cpu/upd7810/upd7810.h,CPUS += UPD7810
+--@src/emu/cpu/upd7810/upd7810.h,CPUS["UPD7810"] = true
 --------------------------------------------------
 if (CPUS["UPD7810"]~=null) then
@ -1460,7 +1460,7 @@ end
 --------------------------------------------------
 -- NEC uCOM-4 series
---@src/emu/cpu/ucom4/ucom4.h,CPUS += UCOM4
+--@src/emu/cpu/ucom4/ucom4.h,CPUS["UCOM4"] = true
 --------------------------------------------------
 if (CPUS["UCOM4"]~=null) then
@ -1476,7 +1476,7 @@ end
 --------------------------------------------------
 -- Nintendo Minx
---@src/emu/cpu/minx/minx.h,CPUS += MINX
+--@src/emu/cpu/minx/minx.h,CPUS["MINX"] = true
 --------------------------------------------------
 if (CPUS["MINX"]~=null) then
@ -1492,7 +1492,7 @@ end
 --------------------------------------------------
 -- Nintendo/SGI RSP (R3000-based + vector processing)
---@src/emu/cpu/rsp/rsp.h,CPUS += RSP
+--@src/emu/cpu/rsp/rsp.h,CPUS["RSP"] = true
 --------------------------------------------------
 if (CPUS["RSP"]~=null) then
@ -1515,7 +1515,7 @@ end
 --------------------------------------------------
 -- Panasonic MN10200
---@src/emu/cpu/mn10200/mn10200.h,CPUS += MN10200
+--@src/emu/cpu/mn10200/mn10200.h,CPUS["MN10200"] = true
 --------------------------------------------------
 if (CPUS["MN10200"]~=null) then
@ -1531,7 +1531,7 @@ end
 --------------------------------------------------
 -- Saturn
---@src/emu/cpu/saturn/saturn.h,CPUS += SATURN
+--@src/emu/cpu/saturn/saturn.h,CPUS["SATURN"] = true
 --------------------------------------------------
 if (CPUS["SATURN"]~=null) then
@ -1547,7 +1547,7 @@ end
 --------------------------------------------------
 -- Signetics 2650
---@src/emu/cpu/s2650/s2650.h,CPUS += S2650
+--@src/emu/cpu/s2650/s2650.h,CPUS["S2650"] = true
 --------------------------------------------------
 if (CPUS["S2650"]~=null) then
@ -1563,7 +1563,7 @@ end
 --------------------------------------------------
 -- SC61860
---@src/emu/cpu/sc61860/sc61860.h,CPUS += SC61860
+--@src/emu/cpu/sc61860/sc61860.h,CPUS["SC61860"] = true
 --------------------------------------------------
 if (CPUS["SC61860"]~=null) then
@ -1579,7 +1579,7 @@ end
 --------------------------------------------------
 -- SM8500
---@src/emu/cpu/sm8500/sm8500.h,CPUS += SM8500
+--@src/emu/cpu/sm8500/sm8500.h,CPUS["SM8500"] = true
 --------------------------------------------------
 if (CPUS["SM8500"]~=null) then
@ -1595,7 +1595,7 @@ end
 --------------------------------------------------
 -- Sony/Nintendo SPC700
---@src/emu/cpu/spc700/spc700.h,CPUS += SPC700
+--@src/emu/cpu/spc700/spc700.h,CPUS["SPC700"] = true
 --------------------------------------------------
 if (CPUS["SPC700"]~=null) then
@ -1611,7 +1611,7 @@ end
 --------------------------------------------------
 -- SSP1601
---@src/emu/cpu/ssp1601/ssp1601.h,CPUS += SSP1601
+--@src/emu/cpu/ssp1601/ssp1601.h,CPUS["SSP1601"] = true
 --------------------------------------------------
 if (CPUS["SSP1601"]~=null) then
@ -1627,7 +1627,7 @@ end
 --------------------------------------------------
 -- SunPlus u'nSP
---@src/emu/cpu/unsp/unsp.h,CPUS += UNSP
+--@src/emu/cpu/unsp/unsp.h,CPUS["UNSP"] = true
 --------------------------------------------------
 if (CPUS["UNSP"]~=null) then
@ -1643,7 +1643,7 @@ end
 --------------------------------------------------
 -- Atmel 8-bit AVR
---@src/emu/cpu/avr8/avr8.h,CPUS += AVR8
+--@src/emu/cpu/avr8/avr8.h,CPUS["AVR8"] = true
 --------------------------------------------------
 if (CPUS["AVR8"]~=null) then
@ -1659,7 +1659,7 @@ end
 --------------------------------------------------
 -- Texas Instruments TMS0980
---@src/emu/cpu/tms0980/tms0980.h,CPUS += TMS0980
+--@src/emu/cpu/tms0980/tms0980.h,CPUS["TMS0980"] = true
 --------------------------------------------------
 if (CPUS["TMS0980"]~=null) then
@ -1675,7 +1675,7 @@ end
 --------------------------------------------------
 -- Texas Instruments TMS7000 series
---@src/emu/cpu/tms7000/tms7000.h,CPUS += TMS7000
+--@src/emu/cpu/tms7000/tms7000.h,CPUS["TMS7000"] = true
 --------------------------------------------------
 if (CPUS["TMS7000"]~=null) then
@ -1691,9 +1691,9 @@ end
 --------------------------------------------------
 -- Texas Instruments TMS99xx series
---@src/emu/cpu/tms9900/tms9900.h,CPUS += TMS9900
+--@src/emu/cpu/tms9900/tms9900.h,CPUS["TMS9900"] = true
---@src/emu/cpu/tms9900/tms9980a.h,CPUS += TMS9900
+--@src/emu/cpu/tms9900/tms9980a.h,CPUS["TMS9900"] = true
---@src/emu/cpu/tms9900/tms9995.h,CPUS += TMS9900
+--@src/emu/cpu/tms9900/tms9995.h,CPUS["TMS9900"] = true
 --------------------------------------------------
@ -1716,7 +1716,7 @@ end
 --------------------------------------------------
 -- Texas Instruments TMS340x0 graphics controllers
---@src/emu/cpu/tms34010/tms34010.h,CPUS += TMS340X0
+--@src/emu/cpu/tms34010/tms34010.h,CPUS["TMS340X0"] = true
 --------------------------------------------------
 if (CPUS["TMS340X0"]~=null) then
@ -1732,7 +1732,7 @@ end
 --------------------------------------------------
 -- Texas Instruments TMS3201x DSP
---@src/emu/cpu/tms32010/tms32010.h,CPUS += TMS32010
+--@src/emu/cpu/tms32010/tms32010.h,CPUS["TMS32010"] = true
 --------------------------------------------------
 if (CPUS["TMS32010"]~=null) then
@ -1748,7 +1748,7 @@ end
 --------------------------------------------------
 -- Texas Instruments TMS3202x DSP
---@src/emu/cpu/tms32025/tms32025.h,CPUS += TMS32025
+--@src/emu/cpu/tms32025/tms32025.h,CPUS["TMS32025"] = true
 --------------------------------------------------
 if (CPUS["TMS32025"]~=null) then
@ -1764,7 +1764,7 @@ end
 --------------------------------------------------
 -- Texas Instruments TMS3203x DSP
---@src/emu/cpu/tms32031/tms32031.h,CPUS += TMS32031
+--@src/emu/cpu/tms32031/tms32031.h,CPUS["TMS32031"] = true
 --------------------------------------------------
 if (CPUS["TMS32031"]~=null) then
@ -1780,7 +1780,7 @@ end
 --------------------------------------------------
 -- Texas Instruments TMS3205x DSP
---@src/emu/cpu/tms32051/tms32051.h,CPUS += TMS32051
+--@src/emu/cpu/tms32051/tms32051.h,CPUS["TMS32051"] = true
 --------------------------------------------------
 if (CPUS["TMS32051"]~=null) then
@ -1796,7 +1796,7 @@ end
 --------------------------------------------------
 -- Texas Instruments TMS3208x DSP
---@src/emu/cpu/tms32082/tms32082.h,CPUS += TMS32082_MP
+--@src/emu/cpu/tms32082/tms32082.h,CPUS["TMS32082"] = true
 --------------------------------------------------
 if (CPUS["TMS32082"]~=null) then
@ -1814,7 +1814,7 @@ end
 --------------------------------------------------
 -- Texas Instruments TMS57002 DSP
---@src/emu/cpu/tms57002/tms57002.h,CPUS += TMS57002
+--@src/emu/cpu/tms57002/tms57002.h,CPUS["TMS57002"] = true
 --------------------------------------------------
 if (CPUS["TMS57002"]~=null) then
@ -1840,7 +1840,7 @@ end
 --------------------------------------------------
 -- Toshiba TLCS-90 Series
---@src/emu/cpu/tlcs90/tlcs90.h,CPUS += TLCS90
+--@src/emu/cpu/tlcs90/tlcs90.h,CPUS["TLCS90"] = true
 --------------------------------------------------
 if (CPUS["TLCS90"]~=null) then
@ -1852,7 +1852,7 @@ end
 --------------------------------------------------
 -- Toshiba TLCS-900 Series
---@src/emu/cpu/tlcs900/tlcs900.h,CPUS += TLCS900
+--@src/emu/cpu/tlcs900/tlcs900.h,CPUS["TLCS900"] = true
 --------------------------------------------------
 if (CPUS["TLCS900"]~=null) then
@ -1868,7 +1868,8 @@ end
 --------------------------------------------------
 -- Zilog Z80
---@src/emu/cpu/z80/z80.h,CPUS += Z80
+--@src/emu/cpu/z80/z80.h,CPUS["Z80"] = true
 --@src/emu/cpu/z80/z80daisy.h,CPUS["Z80"] = true
 --------------------------------------------------
 if (CPUS["Z80"]~=null) then
@ -1892,7 +1893,7 @@ end
 --------------------------------------------------
 -- Sharp LR35902 (Game Boy CPU)
---@src/emu/cpu/lr35902/lr35902.h,CPUS += LR35902
+--@src/emu/cpu/lr35902/lr35902.h,CPUS["LR35902"] = true
 --------------------------------------------------
 if (CPUS["LR35902"]~=null) then
@ -1908,7 +1909,7 @@ end
 --------------------------------------------------
 -- Zilog Z180
---@src/emu/cpu/z180/z180.h,CPUS += Z180
+--@src/emu/cpu/z180/z180.h,CPUS["Z180"] = true
 --------------------------------------------------
 if (CPUS["Z180"]~=null) then
@ -1926,7 +1927,7 @@ end
 --------------------------------------------------
 -- Zilog Z8000
---@src/emu/cpu/z8000/z8000.h,CPUS += Z8000
+--@src/emu/cpu/z8000/z8000.h,CPUS["Z8000"] = true
 --------------------------------------------------
 if (CPUS["Z8000"]~=null) then
@ -1942,7 +1943,7 @@ end
 --------------------------------------------------
 -- Zilog Z8
---@src/emu/cpu/z8/z8.h,CPUS += Z8
+--@src/emu/cpu/z8/z8.h,CPUS["Z8"] = true
 --------------------------------------------------
 if (CPUS["Z8"]~=null) then
@ -1958,7 +1959,7 @@ end
 --------------------------------------------------
 -- Argonaut SuperFX
---@src/emu/cpu/superfx/superfx.h,CPUS += SUPERFX
+--@src/emu/cpu/superfx/superfx.h,CPUS["SUPERFX"] = true
 --------------------------------------------------
 if (CPUS["SUPERFX"]~=null) then
@ -1974,7 +1975,7 @@ end
 --------------------------------------------------
 -- Rockwell PPS-4
---@src/emu/cpu/pps4/pps4.h,CPUS += PPS4
+--@src/emu/cpu/pps4/pps4.h,CPUS["PPS4"] = true
 --------------------------------------------------
 if (CPUS["PPS4"]~=null) then
@ -1990,7 +1991,7 @@ end
 --------------------------------------------------
 -- Hitachi HD61700
---@src/emu/cpu/hd61700/hd61700.h,CPUS += HD61700
+--@src/emu/cpu/hd61700/hd61700.h,CPUS["HD61700"] = true
 --------------------------------------------------
 if (CPUS["HD61700"]~=null) then
@ -2006,7 +2007,7 @@ end
 --------------------------------------------------
 -- Sanyo LC8670
---@src/emu/cpu/lc8670/lc8670.h,CPUS += LC8670
+--@src/emu/cpu/lc8670/lc8670.h,CPUS["LC8670"] = true
 --------------------------------------------------
 if (CPUS["LC8670"]~=null) then
@ -2022,7 +2023,7 @@ end
 --------------------------------------------------
 -- Sega SCU DSP
---@src/emu/cpu/scudsp/scudsp.h,CPUS += SCUDSP
+--@src/emu/cpu/scudsp/scudsp.h,CPUS["SCUDSP"] = true
 --------------------------------------------------
 if (CPUS["SCUDSP"]~=null) then
@ -2038,7 +2039,7 @@ end
 --------------------------------------------------
 -- Sunplus Technology S+core
---@src/emu/cpu/score/score.h,CPUS += SCORE
+--@src/emu/cpu/score/score.h,CPUS["SCORE"] = true
 --------------------------------------------------
 if (CPUS["SCORE"]~=null) then
@ -2054,7 +2055,7 @@ end
 --------------------------------------------------
 -- Xerox Alto-II
---@src/emu/cpu/alto2/alto2cpu.h,CPUS += ALTO2
+--@src/emu/cpu/alto2/alto2cpu.h,CPUS["ALTO2"] = true
 --------------------------------------------------
 if (CPUS["ALTO2"]~=null) then
--- a/scripts/src/emu.lua
+++ b/scripts/src/emu.lua
@ -310,8 +310,11 @@ files {
 	MAME_DIR .. "src/emu/video/resnet.h",
 	MAME_DIR .. "src/emu/video/rgbutil.c",
 	MAME_DIR .. "src/emu/video/rgbutil.h",
 	MAME_DIR .. "src/emu/video/rgbgen.c",
 	MAME_DIR .. "src/emu/video/rgbgen.h",
 	MAME_DIR .. "src/emu/video/rgbsse.c",
 	MAME_DIR .. "src/emu/video/rgbsse.h",
 	MAME_DIR .. "src/emu/video/rgbvmx.c",
 	MAME_DIR .. "src/emu/video/rgbvmx.h",
 	MAME_DIR .. "src/emu/video/vector.c",
 	MAME_DIR .. "src/emu/video/vector.h",
@ -408,9 +411,7 @@ function emuProject(_target, _subtarget)
 	dofile(path.join("src", "machine.lua"))
-	--	netlist now defines a project
+if (_OPTIONS["DRIVERS"] == nil) then 
 	dofile(path.join("src", "netlist.lua"))
 	project ("bus")
 	uuid ("5d782c89-cf7e-4cfe-8f9f-0d4bfc16c91d")
 	kind (LIBTYPE)
@ -448,7 +449,13 @@ function emuProject(_target, _subtarget)
 	end
 	dofile(path.join("src", "bus.lua"))
 else
 	dofile(path.join("src", "bus.lua"))
 end
 	--	netlist now defines a project
 	dofile(path.join("src", "netlist.lua"))
 	project ("dasm")
 	uuid ("f2d28b0a-6da5-4f78-b629-d834aa00429d")
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@ -2,7 +2,6 @@
 -- copyright-holders:MAMEdev Team
 project "utils"
 	targetsubdir(_OPTIONS["target"] .."_" .. _OPTIONS["subtarget"])
 	uuid "22489ad0-4cb2-4d91-ad81-24b0d80ca30a"
 	kind (LIBTYPE)
@ -99,7 +98,6 @@ project "utils"
 project "formats"
 	targetsubdir(_OPTIONS["target"] .."_" .. _OPTIONS["subtarget"])
 	uuid "f69636b1-fcce-45ce-b09a-113e371a2d7a"
 	kind (LIBTYPE)
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@ -2,6 +2,7 @@
 -- copyright-holders:MAMEdev Team
 function mainProject(_target, _subtarget)
 if (_OPTIONS["DRIVERS"] == nil) then 
 	if (_target == _subtarget) then
 		project (_target)
 	else
@ -11,6 +12,9 @@ function mainProject(_target, _subtarget)
 			project (_target .. _subtarget)
 		end
 	end	
 else
 	project (_subtarget)
 end	
 	uuid (os.uuid(_target .."_" .. _subtarget))
 	kind "ConsoleApp"
@ -34,7 +38,7 @@ function mainProject(_target, _subtarget)
 	flags {
 		"Unicode",
 	}
-
+if (_OPTIONS["DRIVERS"] == nil) then 
 	configuration { "x64", "Release" }
 		targetsuffix "64"
 		if _OPTIONS["PROFILE"] then
@ -70,7 +74,7 @@ function mainProject(_target, _subtarget)
 		if _OPTIONS["PROFILE"] then
 			targetsuffix "dp"
 		end
-
+end
 	configuration { "mingw*" or "vs*" }
 		targetextension ".exe"
@ -86,17 +90,23 @@ function mainProject(_target, _subtarget)
 	findfunction("linkProjects_" .. _OPTIONS["target"] .. "_" .. _OPTIONS["subtarget"])(_OPTIONS["target"], _OPTIONS["subtarget"])
 	links {
 		"osd_" .. _OPTIONS["osd"],
-		"bus",
+	}
 	if (_OPTIONS["DRIVERS"] == nil) then 
 		links {
 			"bus",
 		}
 	end
 	links {
 		"netlist",
 		"optional",
 		"emu",
 		"formats",
 		"dasm",
 		"utils",
 		"expat",
 		"softfloat",
 		"jpeg",
 		"7z",
 		"formats",
 		"lua",
 		"lsqlite3",
 		"jsoncpp",
@ -214,6 +224,8 @@ function mainProject(_target, _subtarget)
 		MAME_DIR .. "src/version.c",
 		GEN_DIR  .. _target .. "/" .. _subtarget .."/drivlist.c",
 	}
 if (_OPTIONS["DRIVERS"] == nil) then 	
 	dependency {
 		{ "../../../../generated/mame/mame/drivlist.c",  MAME_DIR .. "src/mame/mess.lst", true },
 		{ "../../../../generated/mame/mame/drivlist.c" , MAME_DIR .. "src/mame/arcade.lst", true},
@ -221,7 +233,13 @@ function mainProject(_target, _subtarget)
 	custombuildtask {
 		{ MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" ,  GEN_DIR  .. _target .. "/" .. _subtarget .."/drivlist.c",    {  MAME_DIR .. "src/build/makelist.py" }, {"@echo Building driver list...",    PYTHON .. " $(1) $(<) > $(@)" }},
 	}
-	
+end	
 	configuration { "gmake" }
 		dependency {
 			{ ".PHONY", ".FORCE", true },
 			{ "$(OBJDIR)/src/version.o", ".FORCE", true },
 		}
 	configuration { "mingw*" }
 		custombuildtask {	
 			{ MAME_DIR .. "src/version.c" ,  GEN_DIR  .. "/resource/" .. rctarget .. "vers.rc",    {  MAME_DIR .. "src/build/verinfo.py" }, {"@echo Emitting " .. rctarget .. "vers.rc" .. "...",    PYTHON .. " $(1)  -r -b " .. rctarget .. " $(<) > $(@)" }},
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@ -2,7 +2,6 @@
 -- copyright-holders:MAMEdev Team
 project "netlist"
 	targetsubdir(_OPTIONS["target"] .."_" .. _OPTIONS["subtarget"])
 	uuid "665ef8ac-2a4c-4c3e-a05f-fd1e5db11de9"
 	kind (LIBTYPE)
@ -55,18 +54,20 @@ project "netlist"
 		MAME_DIR .. "src/emu/netlist/analog/nld_bjt.h",
 		MAME_DIR .. "src/emu/netlist/analog/nld_fourterm.c",
 		MAME_DIR .. "src/emu/netlist/analog/nld_fourterm.h",
 		MAME_DIR .. "src/emu/netlist/analog/nld_solver.c",
 		MAME_DIR .. "src/emu/netlist/analog/nld_solver.h",
 		MAME_DIR .. "src/emu/netlist/analog/nld_switches.c",
 		MAME_DIR .. "src/emu/netlist/analog/nld_switches.h",
 		MAME_DIR .. "src/emu/netlist/analog/nld_twoterm.c",
 		MAME_DIR .. "src/emu/netlist/analog/nld_twoterm.h",
 		MAME_DIR .. "src/emu/netlist/analog/nld_opamps.c",
 		MAME_DIR .. "src/emu/netlist/analog/nld_opamps.h",
-		MAME_DIR .. "src/emu/netlist/analog/nld_ms_direct.h",
+    MAME_DIR .. "src/emu/netlist/solver/nld_solver.c",
-		MAME_DIR .. "src/emu/netlist/analog/nld_ms_direct1.h",
+    MAME_DIR .. "src/emu/netlist/solver/nld_solver.h",
-		MAME_DIR .. "src/emu/netlist/analog/nld_ms_direct2.h",
+		MAME_DIR .. "src/emu/netlist/solver/nld_ms_direct.h",
-		MAME_DIR .. "src/emu/netlist/analog/nld_ms_gauss_seidel.h",
+		MAME_DIR .. "src/emu/netlist/solver/nld_ms_direct1.h",
 		MAME_DIR .. "src/emu/netlist/solver/nld_ms_direct2.h",
 		MAME_DIR .. "src/emu/netlist/solver/nld_ms_sor.h",
    MAME_DIR .. "src/emu/netlist/solver/nld_ms_sor_math.h",
    MAME_DIR .. "src/emu/netlist/solver/nld_ms_gmres.h",
 		MAME_DIR .. "src/emu/netlist/devices/nld_4020.c",
 		MAME_DIR .. "src/emu/netlist/devices/nld_4020.h",
 		MAME_DIR .. "src/emu/netlist/devices/nld_4066.c",
--- a/scripts/src/sound.lua
+++ b/scripts/src/sound.lua
@ -12,10 +12,10 @@
 ---------------------------------------------------
 -- DACs
--@src/emu/sound/dac.h,SOUNDS += DAC
+--@src/emu/sound/dac.h,SOUNDS["DAC"] = true
--@src/emu/sound/dmadac.h,SOUNDS += DMADAC
+--@src/emu/sound/dmadac.h,SOUNDS["DMADAC"] = true
--@src/emu/sound/speaker.h,SOUNDS += SPEAKER
+--@src/emu/sound/speaker.h,SOUNDS["SPEAKER"] = true
--@src/emu/sound/beep.h,SOUNDS += BEEP
+--@src/emu/sound/beep.h,SOUNDS["BEEP"] = true
 ---------------------------------------------------
 if (SOUNDS["DAC"]~=null) then
@ -50,7 +50,7 @@ end
 ---------------------------------------------------
 -- CD audio
--@src/emu/sound/cdda.h,SOUNDS += CDDA
+--@src/emu/sound/cdda.h,SOUNDS["CDDA"] = true
 ---------------------------------------------------
 if (SOUNDS["CDDA"]~=null) then
@ -64,7 +64,7 @@ end
 ---------------------------------------------------
 -- Discrete component audio
--@src/emu/sound/discrete.h,SOUNDS += DISCRETE
+--@src/emu/sound/discrete.h,SOUNDS["DISCRETE"] = true
 ---------------------------------------------------
 if (SOUNDS["DISCRETE"]~=null) then
@ -87,7 +87,7 @@ end
 ---------------------------------------------------
 -- AC97
--@src/emu/sound/pic-ac97.h,SOUNDS += AC97
+--@src/emu/sound/pic-ac97.h,SOUNDS["AC97"] = true
 ---------------------------------------------------
 if (SOUNDS["AC97"]~=null) then
@ -101,8 +101,8 @@ end
 ---------------------------------------------------
 -- Apple custom sound chips
--@src/emu/sound/asc.h,SOUNDS += ASC
+--@src/emu/sound/asc.h,SOUNDS["ASC"] = true
--@src/emu/sound/awacs.h,SOUNDS += AWACS
+--@src/emu/sound/awacs.h,SOUNDS["AWACS"] = true
 ---------------------------------------------------
 if (SOUNDS["ASC"]~=null) then
@ -122,8 +122,8 @@ end
 ---------------------------------------------------
 -- Atari custom sound chips
--@src/emu/sound/pokey.h,SOUNDS += POKEY
+--@src/emu/sound/pokey.h,SOUNDS["POKEY"] = true
--@src/emu/sound/tiaintf.h,SOUNDS += TIA
+--@src/emu/sound/tiaintf.h,SOUNDS["TIA"] = true
 ---------------------------------------------------
 if (SOUNDS["POKEY"]~=null) then
@ -146,7 +146,7 @@ end
 ---------------------------------------------------
 -- Amiga audio hardware
--@src/emu/sound/amiga.h,SOUNDS += AMIGA
+--@src/emu/sound/amiga.h,SOUNDS["AMIGA"] = true
 ---------------------------------------------------
 if (SOUNDS["AMIGA"]~=null) then
@ -160,7 +160,7 @@ end
 ---------------------------------------------------
 -- Bally Astrocade sound system
--@src/emu/sound/astrocde.h,SOUNDS += ASTROCADE
+--@src/emu/sound/astrocde.h,SOUNDS["ASTROCADE"] = true
 ---------------------------------------------------
 if (SOUNDS["ASTROCADE"]~=null) then
@ -175,7 +175,7 @@ end
 ---------------------------------------------------
 ---------------------------------------------------
 -- AC97
--@src/emu/sound/pic-ac97.h,SOUNDS += AC97
+--@src/emu/sound/pic-ac97.h,SOUNDS["AC97"] = true
 ---------------------------------------------------
 if (SOUNDS["AC97"]~=null) then
@ -185,7 +185,7 @@ if (SOUNDS["AC97"]~=null) then
 	}
 end
 -- CEM 3394 analog synthesizer chip
--@src/emu/sound/cem3394.h,SOUNDS += CEM3394
+--@src/emu/sound/cem3394.h,SOUNDS["CEM3394"] = true
 ---------------------------------------------------
 if (SOUNDS["CEM3394"]~=null) then
@ -199,7 +199,7 @@ end
 ---------------------------------------------------
 -- Creative Labs SB0400 Audigy2 Value
--@src/emu/sound/sb0400.h,SOUNDS += AC97
+--@src/emu/sound/sb0400.h,SOUNDS["SB0400"] = true
 ---------------------------------------------------
 if (SOUNDS["SB0400"]~=null) then
@ -212,7 +212,7 @@ end
 --------------------------------------------------
 -- Creative Labs Ensonic AudioPCI97 ES1373
--@src/emu/sound/es1373.h,SOUNDS += ES1373
+--@src/emu/sound/es1373.h,SOUNDS["ES1373"] = true
 --------------------------------------------------
 if (SOUNDS["ES1373"]~=null) then
@ -224,7 +224,7 @@ end
 ---------------------------------------------------
 -- Data East custom sound chips
--@src/emu/sound/bsmt2000.h,SOUNDS += BSMT2000
+--@src/emu/sound/bsmt2000.h,SOUNDS["BSMT2000"] = true
 ---------------------------------------------------
 if (SOUNDS["BSMT2000"]~=null) then
@ -238,7 +238,7 @@ end
 ---------------------------------------------------
 -- Ensoniq 5503 (Apple IIgs)
--@src/emu/sound/es5503.h,SOUNDS += ES5503
+--@src/emu/sound/es5503.h,SOUNDS["ES5503"] = true
 ---------------------------------------------------
 if (SOUNDS["ES5503"]~=null) then
@ -252,7 +252,7 @@ end
 ---------------------------------------------------
 -- Ensoniq 5505/5506
--@src/emu/sound/es5506.h,SOUNDS += ES5505
+--@src/emu/sound/es5506.h,SOUNDS["ES5505"] = true
 ---------------------------------------------------
 if (SOUNDS["ES5505"]~=null or SOUNDS["ES5506"]~=null) then
@ -265,7 +265,7 @@ end
 ---------------------------------------------------
 -- Ensoniq "pump" device, interfaces 5505/5506 with 5510
--@src/emu/sound/esqpump.h,SOUNDS += ESQPUMP
+--@src/emu/sound/esqpump.h,SOUNDS["ESQPUMP"] = true
 ---------------------------------------------------
 if (SOUNDS["ESQPUMP"]~=null) then
@ -278,7 +278,7 @@ end
 ---------------------------------------------------
 -- Excellent Systems ADPCM sound chip
--@src/emu/sound/es8712.h,SOUNDS += ES8712
+--@src/emu/sound/es8712.h,SOUNDS["ES8712"] = true
 ---------------------------------------------------
 if (SOUNDS["ES8712"]~=null) then
@ -292,7 +292,7 @@ end
 ---------------------------------------------------
 -- Gaelco custom sound chips
--@src/emu/sound/gaelco.h,SOUNDS += GAELCO_CG1V
+--@src/emu/sound/gaelco.h,SOUNDS["GAELCO_CG1V"] = true
 ---------------------------------------------------
 if (SOUNDS["GAELCO_CG1V"]~=null or SOUNDS["GAELCO_GAE1"]~=null) then
@ -305,7 +305,7 @@ end
 ---------------------------------------------------
 -- RCA CDP1863
--@src/emu/sound/cdp1863.h,SOUNDS += CDP1863
+--@src/emu/sound/cdp1863.h,SOUNDS["CDP1863"] = true
 ---------------------------------------------------
 if (SOUNDS["CDP1863"]~=null) then
@ -319,7 +319,7 @@ end
 ---------------------------------------------------
 -- RCA CDP1864
--@src/emu/sound/cdp1864.h,SOUNDS += CDP1864
+--@src/emu/sound/cdp1864.h,SOUNDS["CDP1864"] = true
 ---------------------------------------------------
 if (SOUNDS["CDP1864"]~=null) then
@ -333,7 +333,7 @@ end
 ---------------------------------------------------
 -- RCA CDP1869
--@src/emu/sound/cdp1869.h,SOUNDS += CDP1869
+--@src/emu/sound/cdp1869.h,SOUNDS["CDP1869"] = true
 ---------------------------------------------------
 if (SOUNDS["CDP1869"]~=null) then
@ -347,7 +347,7 @@ end
 ---------------------------------------------------
 -- GI AY-8910
--@src/emu/sound/ay8910.h,SOUNDS += AY8910
+--@src/emu/sound/ay8910.h,SOUNDS["AY8910"] = true
 ---------------------------------------------------
 if (SOUNDS["AY8910"]~=null) then
@ -361,7 +361,7 @@ end
 ---------------------------------------------------
 -- Harris HC55516 CVSD
--@src/emu/sound/hc55516.h,SOUNDS += HC55516
+--@src/emu/sound/hc55516.h,SOUNDS["HC55516"] = true
 ---------------------------------------------------
 if (SOUNDS["HC55516"]~=null) then
@ -375,7 +375,7 @@ end
 ---------------------------------------------------
 -- Hudsonsoft C6280 sound chip
--@src/emu/sound/c6280.h,SOUNDS += C6280
+--@src/emu/sound/c6280.h,SOUNDS["C6280"] = true
 ---------------------------------------------------
 if (SOUNDS["C6280"]~=null) then
@ -389,7 +389,7 @@ end
 ---------------------------------------------------
 -- ICS2115 sound chip
--@src/emu/sound/ics2115.h,SOUNDS += ICS2115
+--@src/emu/sound/ics2115.h,SOUNDS["ICS2115"] = true
 ---------------------------------------------------
 if (SOUNDS["ICS2115"]~=null) then
@ -403,7 +403,7 @@ end
 ---------------------------------------------------
 -- Imagetek I5000 sound
--@src/emu/sound/i5000.h,SOUNDS += I5000_SND
+--@src/emu/sound/i5000.h,SOUNDS["I5000_SND"] = true
 ---------------------------------------------------
 if (SOUNDS["I5000_SND"]~=null) then
@ -417,7 +417,7 @@ end
 ---------------------------------------------------
 -- Irem custom sound chips
--@src/emu/sound/iremga20.h,SOUNDS += IREMGA20
+--@src/emu/sound/iremga20.h,SOUNDS["IREMGA20"] = true
 ---------------------------------------------------
 if (SOUNDS["IREMGA20"]~=null) then
@ -431,12 +431,12 @@ end
 ---------------------------------------------------
 -- Konami custom sound chips
--@src/emu/sound/k005289.h,SOUNDS += K005289
+--@src/emu/sound/k005289.h,SOUNDS["K005289"] = true
--@src/emu/sound/k007232.h,SOUNDS += K007232
+--@src/emu/sound/k007232.h,SOUNDS["K007232"] = true
--@src/emu/sound/k051649.h,SOUNDS += K051649
+--@src/emu/sound/k051649.h,SOUNDS["K051649"] = true
--@src/emu/sound/k053260.h,SOUNDS += K053260
+--@src/emu/sound/k053260.h,SOUNDS["K053260"] = true
--@src/emu/sound/k054539.h,SOUNDS += K054539
+--@src/emu/sound/k054539.h,SOUNDS["K054539"] = true
--@src/emu/sound/k056800.h,SOUNDS += K056800
+--@src/emu/sound/k056800.h,SOUNDS["K056800"] = true
 ---------------------------------------------------
 if (SOUNDS["K005289"]~=null) then
@ -484,7 +484,7 @@ end
 ---------------------------------------------------
 -- L7A1045 L6028 DSP-A 
--@src/emu/sound/l7a1045_l6028_dsp_a.h,SOUNDS += L7A1045
+--@src/emu/sound/l7a1045_l6028_dsp_a.h,SOUNDS["L7A1045"] = true
 ---------------------------------------------------
 if (SOUNDS["L7A1045"]~=null) then
@ -497,7 +497,7 @@ end
 ---------------------------------------------------
 -- LMC1992 mixer chip
--@src/emu/sound/lmc1992.h,SOUNDS += LMC1992
+--@src/emu/sound/lmc1992.h,SOUNDS["LMC1992"] = true
 ---------------------------------------------------
 if (SOUNDS["LMC1992"]~=null) then
@ -511,7 +511,7 @@ end
 ---------------------------------------------------
 -- MAS 3507D MPEG 1/2 Layer 2/3 Audio Decoder
--@src/emu/sound/mas3507d.h,SOUNDS += MAS3507D
+--@src/emu/sound/mas3507d.h,SOUNDS["MAS3507D"] = true
 ---------------------------------------------------
 if (SOUNDS["MAS3507D"]~=null) then
@ -525,7 +525,7 @@ end
 ---------------------------------------------------
 -- MOS 6560VIC
--@src/emu/sound/mos6560.h,SOUNDS += MOS656X
+--@src/emu/sound/mos6560.h,SOUNDS["MOS656X"] = true
 ---------------------------------------------------
 if (SOUNDS["MOS656X"]~=null) then
@ -539,7 +539,7 @@ end
 ---------------------------------------------------
 -- MOS 7360 TED
--@src/emu/sound/mos7360.h,SOUNDS += MOS7360
+--@src/emu/sound/mos7360.h,SOUNDS["MOS7360"] = true
 ---------------------------------------------------
 if (SOUNDS["MOS7360"]~=null) then
@ -553,10 +553,10 @@ end
 ---------------------------------------------------
 -- Namco custom sound chips
--@src/emu/sound/namco.h,SOUNDS += NAMCO
+--@src/emu/sound/namco.h,SOUNDS["NAMCO"] = true
--@src/emu/sound/n63701x.h,SOUNDS += NAMCO_63701X
+--@src/emu/sound/n63701x.h,SOUNDS["NAMCO_63701X"] = true
--@src/emu/sound/c140.h,SOUNDS += C140
+--@src/emu/sound/c140.h,SOUNDS["C140"] = true
--@src/emu/sound/c352.h,SOUNDS += C352
+--@src/emu/sound/c352.h,SOUNDS["C352"] = true
 ---------------------------------------------------
 if (SOUNDS["NAMCO"]~=null or SOUNDS["NAMCO_15XX"]~=null or SOUNDS["NAMCO_CUS30"]~=null) then
@ -591,7 +591,7 @@ end
 ---------------------------------------------------
 -- National Semiconductor Digitalker
--@src/emu/sound/digitalk.h,SOUNDS += DIGITALKER
+--@src/emu/sound/digitalk.h,SOUNDS["DIGITALKER"] = true
 ---------------------------------------------------
 if (SOUNDS["DIGITALKER"]~=null) then
@ -605,7 +605,7 @@ end
 ---------------------------------------------------
 -- Nintendo custom sound chips
--@src/emu/sound/nes_apu.h,SOUNDS += NES_APU
+--@src/emu/sound/nes_apu.h,SOUNDS["NES_APU"] = true
 ---------------------------------------------------
 if (SOUNDS["NES_APU"]~=null) then
@ -620,7 +620,7 @@ end
 ---------------------------------------------------
 -- NEC uPD7759 ADPCM sample player
--@src/emu/sound/upd7759.h,SOUNDS += UPD7759
+--@src/emu/sound/upd7759.h,SOUNDS["UPD7759"] = true
 ---------------------------------------------------
 if (SOUNDS["UPD7759"]~=null) then
@ -634,12 +634,12 @@ end
 ---------------------------------------------------
 -- OKI ADPCM sample players
--@src/emu/sound/okim6258.h,SOUNDS += OKIM6258
+--@src/emu/sound/okim6258.h,SOUNDS["OKIM6258"] = true
--@src/emu/sound/msm5205.h,SOUNDS += MSM5205
+--@src/emu/sound/msm5205.h,SOUNDS["MSM5205"] = true
--@src/emu/sound/msm5232.h,SOUNDS += MSM5232
+--@src/emu/sound/msm5232.h,SOUNDS["MSM5232"] = true
--@src/emu/sound/okim6376.h,SOUNDS += OKIM6376
+--@src/emu/sound/okim6376.h,SOUNDS["OKIM6376"] = true
--@src/emu/sound/okim6295.h,SOUNDS += OKIM6295
+--@src/emu/sound/okim6295.h,SOUNDS["OKIM6295"] = true
--@src/emu/sound/okim9810.h,SOUNDS += OKIM9810
+--@src/emu/sound/okim9810.h,SOUNDS["OKIM9810"] = true
 ---------------------------------------------------
 if (SOUNDS["OKIM6258"]~=null or SOUNDS["OKIM6295"]~=null or SOUNDS["OKIM9810"]~=null or SOUNDS["I5000_SND"]~=null) then
@ -695,7 +695,7 @@ end
 ---------------------------------------------------
 -- Philips SAA1099
--@src/emu/sound/saa1099.h,SOUNDS += SAA1099
+--@src/emu/sound/saa1099.h,SOUNDS["SAA1099"] = true
 ---------------------------------------------------
 if (SOUNDS["SAA1099"]~=null) then
@ -709,7 +709,7 @@ end
 ---------------------------------------------------
 -- AdMOS QS1000
--@src/emu/sound/qs1000.h,SOUNDS += QS1000
+--@src/emu/sound/qs1000.h,SOUNDS["QS1000"] = true
 ---------------------------------------------------
 if (SOUNDS["QS1000"]~=null) then
@ -723,7 +723,7 @@ end
 ---------------------------------------------------
 -- QSound sample player
--@src/emu/sound/qsound.h,SOUNDS += QSOUND
+--@src/emu/sound/qsound.h,SOUNDS["QSOUND"] = true
 ---------------------------------------------------
 if (SOUNDS["QSOUND"]~=null) then
@ -740,8 +740,8 @@ end
 ---------------------------------------------------
 -- Ricoh sample players
--@src/emu/sound/rf5c68.h,SOUNDS += RF5C68
+--@src/emu/sound/rf5c68.h,SOUNDS["RF5C68"] = true
--@src/emu/sound/rf5c400.h,SOUNDS += RF5C400
+--@src/emu/sound/rf5c400.h,SOUNDS["RF5C400"] = true
 ---------------------------------------------------
 if (SOUNDS["RF5C68"]~=null) then
@ -762,10 +762,10 @@ end
 ---------------------------------------------------
 -- Sega custom sound chips
--@src/emu/sound/segapcm.h,SOUNDS += SEGAPCM
+--@src/emu/sound/segapcm.h,SOUNDS["SEGAPCM"] = true
--@src/emu/sound/multipcm.h,SOUNDS += MULTIPCM
+--@src/emu/sound/multipcm.h,SOUNDS["MULTIPCM"] = true
--@src/emu/sound/scsp.h,SOUNDS += SCSP
+--@src/emu/sound/scsp.h,SOUNDS["SCSP"] = true
--@src/emu/sound/aica.h,SOUNDS += AICA
+--@src/emu/sound/aica.h,SOUNDS["AICA"] = true
 ---------------------------------------------------
 if (SOUNDS["SEGAPCM"]~=null) then
@ -802,9 +802,9 @@ end
 ---------------------------------------------------
 -- Seta custom sound chips
--@src/emu/sound/st0016.h,SOUNDS += ST0016
+--@src/emu/sound/st0016.h,SOUNDS["ST0016"] = true
--@src/emu/sound/nile.h,SOUNDS += NILE
+--@src/emu/sound/nile.h,SOUNDS["NILE"] = true
--@src/emu/sound/x1_010.h,SOUNDS += X1_010
+--@src/emu/sound/x1_010.h,SOUNDS["X1_010"] = true
 ---------------------------------------------------
 if (SOUNDS["ST0016"]~=null) then
@ -832,7 +832,7 @@ end
 ---------------------------------------------------
 -- SID custom sound chips
--@src/emu/sound/mos6581.h,SOUNDS += SID6581
+--@src/emu/sound/mos6581.h,SOUNDS["SID6581"] = true
 ---------------------------------------------------
 if (SOUNDS["SID6581"]~=null or SOUNDS["SID8580"]~=null) then
@ -854,7 +854,7 @@ end
 ---------------------------------------------------
 -- SNK(?) custom stereo sn76489a clone
--@src/emu/sound/t6w28.h,SOUNDS += T6W28
+--@src/emu/sound/t6w28.h,SOUNDS["T6W28"] = true
 ---------------------------------------------------
 if (SOUNDS["T6W28"]~=null) then
@ -868,7 +868,7 @@ end
 ---------------------------------------------------
 -- SNK custom wave generator
--@src/emu/sound/snkwave.h,SOUNDS += SNKWAVE
+--@src/emu/sound/snkwave.h,SOUNDS["SNKWAVE"] = true
 ---------------------------------------------------
 if (SOUNDS["SNKWAVE"]~=null) then
@ -882,7 +882,7 @@ end
 ---------------------------------------------------
 -- Sony custom sound chips
--@src/emu/sound/spu.h,SOUNDS += SPU
+--@src/emu/sound/spu.h,SOUNDS["SPU"] = true
 ---------------------------------------------------
 if (SOUNDS["SPU"]~=null) then
@ -898,7 +898,7 @@ end
 ---------------------------------------------------
 -- SP0256 speech synthesizer
--@src/emu/sound/sp0256.h,SOUNDS += SP0256
+--@src/emu/sound/sp0256.h,SOUNDS["SP0256"] = true
 ---------------------------------------------------
 if (SOUNDS["SP0256"]~=null) then
@ -912,7 +912,7 @@ end
 ---------------------------------------------------
 -- SP0250 speech synthesizer
--@src/emu/sound/sp0250.h,SOUNDS += SP0250
+--@src/emu/sound/sp0250.h,SOUNDS["SP0250"] = true
 ---------------------------------------------------
 if (SOUNDS["SP0250"]~=null) then
@ -925,7 +925,7 @@ end
 ---------------------------------------------------
 -- S14001A speech synthesizer
--@src/emu/sound/s14001a.h,SOUNDS += S14001A
+--@src/emu/sound/s14001a.h,SOUNDS["S14001A"] = true
 ---------------------------------------------------
 if (SOUNDS["S14001A"]~=null) then
@ -939,7 +939,7 @@ end
 ---------------------------------------------------
 -- Texas Instruments SN76477 analog chip
--@src/emu/sound/sn76477.h,SOUNDS += SN76477
+--@src/emu/sound/sn76477.h,SOUNDS["SN76477"] = true
 ---------------------------------------------------
 if (SOUNDS["SN76477"]~=null) then
@ -953,7 +953,7 @@ end
 ---------------------------------------------------
 -- Texas Instruments SN76496
--@src/emu/sound/sn76496.h,SOUNDS += SN76496
+--@src/emu/sound/sn76496.h,SOUNDS["SN76496"] = true
 ---------------------------------------------------
 if (SOUNDS["SN76496"]~=null) then
@ -967,7 +967,7 @@ end
 ---------------------------------------------------
 -- Texas Instruments TMS36xx doorbell chime
--@src/emu/sound/tms36xx.h,SOUNDS += TMS36XX
+--@src/emu/sound/tms36xx.h,SOUNDS["TMS36XX"] = true
 ---------------------------------------------------
 if (SOUNDS["TMS36XX"]~=null) then
@ -981,7 +981,7 @@ end
 ---------------------------------------------------
 -- Texas Instruments TMS3615 Octave Multiple Tone Synthesizer
--@src/emu/sound/tms3615.h,SOUNDS += TMS3615
+--@src/emu/sound/tms3615.h,SOUNDS["TMS3615"] = true
 ---------------------------------------------------
 if (SOUNDS["TMS3615"]~=null) then
@ -995,7 +995,7 @@ end
 ---------------------------------------------------
 -- Texas Instruments TMS5100-series speech synthesizers
--@src/emu/sound/tms5110.h,SOUNDS += TMS5110
+--@src/emu/sound/tms5110.h,SOUNDS["TMS5110"] = true
 ---------------------------------------------------
 if (SOUNDS["TMS5110"]~=null) then
@ -1008,7 +1008,7 @@ end
 ---------------------------------------------------
 -- Texas Instruments TMS5200-series speech synthesizers
--@src/emu/sound/tms5220.h,SOUNDS += TMS5220
+--@src/emu/sound/tms5220.h,SOUNDS["TMS5220"] = true
 ---------------------------------------------------
 if (SOUNDS["TMS5220"]~=null) then
 	files {
@ -1023,7 +1023,7 @@ end
 ---------------------------------------------------
 -- Toshiba T6721A voice synthesizer
--@src/emu/sound/t6721a.h,SOUNDS += T6721A
+--@src/emu/sound/t6721a.h,SOUNDS["T6721A"] = true
 ---------------------------------------------------
 if (SOUNDS["T6721A"]~=null) then
@ -1037,7 +1037,7 @@ end
 ---------------------------------------------------
 -- Toshiba TC8830F sample player/recorder
--@src/emu/sound/tc8830f.h,SOUNDS += TC8830F
+--@src/emu/sound/tc8830f.h,SOUNDS["TC8830F"] = true
 ---------------------------------------------------
 if (SOUNDS["TC8830F"]~=null) then
@ -1050,7 +1050,7 @@ end
 ---------------------------------------------------
 -- NEC uPD7752
--@src/emu/sound/upd7752.h,SOUNDS += UPD7752
+--@src/emu/sound/upd7752.h,SOUNDS["UPD7752"] = true
 ---------------------------------------------------
 if (SOUNDS["UPD7752"]~=null) then
@ -1063,7 +1063,7 @@ end
 ---------------------------------------------------
 -- VLM5030 speech synthesizer
--@src/emu/sound/vlm5030.h,SOUNDS += VLM5030
+--@src/emu/sound/vlm5030.h,SOUNDS["VLM5030"] = true
 ---------------------------------------------------
 if (SOUNDS["VLM5030"]~=null) then
@ -1076,7 +1076,7 @@ end
 ---------------------------------------------------
 -- Votrax speech synthesizer
--@src/emu/sound/votrax.h,SOUNDS += VOTRAX
+--@src/emu/sound/votrax.h,SOUNDS["VOTRAX"] = true
 ---------------------------------------------------
 if (SOUNDS["VOTRAX"]~=null) then
@ -1090,7 +1090,7 @@ end
 ---------------------------------------------------
 -- VRender0 custom sound chip
--@src/emu/sound/vrender0.h,SOUNDS += VRENDER0
+--@src/emu/sound/vrender0.h,SOUNDS["VRENDER0"] = true
 ---------------------------------------------------
 if (SOUNDS["VRENDER0"]~=null) then
@ -1104,7 +1104,7 @@ end
 ---------------------------------------------------
 -- WAVE file (used for MESS cassette)
--@src/emu/sound/wave.h,SOUNDS += WAVE
+--@src/emu/sound/wave.h,SOUNDS["WAVE"] = true
 ---------------------------------------------------
 if (SOUNDS["WAVE"]~=null) then
@ -1118,18 +1118,19 @@ end
 ---------------------------------------------------
 -- Yamaha FM synthesizers
--@src/emu/sound/2151intf.h,SOUNDS += YM2151
+--@src/emu/sound/2151intf.h,SOUNDS["YM2151"] = true
--@src/emu/sound/2203intf.h,SOUNDS += YM2203
+--@src/emu/sound/2203intf.h,SOUNDS["YM2203"] = true
--@src/emu/sound/2413intf.h,SOUNDS += YM2413
+--@src/emu/sound/2413intf.h,SOUNDS["YM2413"] = true
--@src/emu/sound/2608intf.h,SOUNDS += YM2608
+--@src/emu/sound/2608intf.h,SOUNDS["YM2608"] = true
--@src/emu/sound/2610intf.h,SOUNDS += YM2610
+--@src/emu/sound/2610intf.h,SOUNDS["YM2610"] = true
--@src/emu/sound/2612intf.h,SOUNDS += YM2612
+--@src/emu/sound/2612intf.h,SOUNDS["YM2612"] = true
--@src/emu/sound/3812intf.h,SOUNDS += YM3812
+--@src/emu/sound/3812intf.h,SOUNDS["YM3812"] = true
--@src/emu/sound/3526intf.h,SOUNDS += YM3526
+--@src/emu/sound/3526intf.h,SOUNDS["YM3526"] = true
--@src/emu/sound/8950intf.h,SOUNDS += Y8950
+--@src/emu/sound/8950intf.h,SOUNDS["Y8950"] = true
--@src/emu/sound/ymf262.h,SOUNDS += YMF262
+--@src/emu/sound/ymf262.h,SOUNDS["YMF262"] = true
--@src/emu/sound/ymf271.h,SOUNDS += YMF271
+--@src/emu/sound/ymf271.h,SOUNDS["YMF271"] = true
--@src/emu/sound/ymf278b.h,SOUNDS += YMF278B
+--@src/emu/sound/ymf278b.h,SOUNDS["YMF278B"] = true
 --@src/emu/sound/262intf.h,SOUNDS["YMF262"] = true
 ---------------------------------------------------
 if (SOUNDS["YM2151"]~=null) then
@ -1141,17 +1142,6 @@ if (SOUNDS["YM2151"]~=null) then
 	}
 end
 if (SOUNDS["YM2203"]~=null) then
 	files {
 		MAME_DIR .. "src/emu/sound/2203intf.c",
 		MAME_DIR .. "src/emu/sound/2203intf.h",
 		MAME_DIR .. "src/emu/sound/ay8910.c",
 		MAME_DIR .. "src/emu/sound/ay8910.h",
 		MAME_DIR .. "src/emu/sound/fm.c",
 		MAME_DIR .. "src/emu/sound/fm.h",
 	}
 end
 if (SOUNDS["YM2413"]~=null) then
 	files {
 		MAME_DIR .. "src/emu/sound/2413intf.c",
@ -1161,7 +1151,20 @@ if (SOUNDS["YM2413"]~=null) then
 	}
 end
-if (SOUNDS["YM2608"]~=null) then
+if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null or SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then	
 --if (SOUNDS["YM2203"]~=null) then	
 	files {
 		MAME_DIR .. "src/emu/sound/2203intf.c",
 		MAME_DIR .. "src/emu/sound/2203intf.h",
 		MAME_DIR .. "src/emu/sound/ay8910.c",
 		MAME_DIR .. "src/emu/sound/ay8910.h",
 		MAME_DIR .. "src/emu/sound/fm.c",
 		MAME_DIR .. "src/emu/sound/fm.h",
 	}
 --end
 --if (SOUNDS["YM2608"]~=null) then
 	files {
 		MAME_DIR .. "src/emu/sound/2608intf.c", 
 		MAME_DIR .. "src/emu/sound/2608intf.h", 
@ -1172,9 +1175,9 @@ if (SOUNDS["YM2608"]~=null) then
 		MAME_DIR .. "src/emu/sound/ymdeltat.c",
 		MAME_DIR .. "src/emu/sound/ymdeltat.h",
 	}
-end
+--end
-if (SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null) then
+--if (SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null) then
 	files {
 		MAME_DIR .. "src/emu/sound/2610intf.c", 
 		MAME_DIR .. "src/emu/sound/2610intf.h", 
@ -1185,9 +1188,9 @@ if (SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null) then
 		MAME_DIR .. "src/emu/sound/ymdeltat.c",
 		MAME_DIR .. "src/emu/sound/ymdeltat.h",
 	}
-end
+--end
-if (SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then
+--if (SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then
 	files {
 		MAME_DIR .. "src/emu/sound/2612intf.c", 
 		MAME_DIR .. "src/emu/sound/2612intf.h", 
@ -1195,9 +1198,11 @@ if (SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then
 		MAME_DIR .. "src/emu/sound/ay8910.h", 
 		MAME_DIR .. "src/emu/sound/fm2612.c",
 	}
 --end
 end
-if (SOUNDS["YM3812"]~=null) then
+if (SOUNDS["YM3812"]~=null or SOUNDS["YM3526"]~=null or SOUNDS["Y8950"]~=null) then
 --if (SOUNDS["YM3812"]~=null) then
 	files {
 		MAME_DIR .. "src/emu/sound/3812intf.c", 
 		MAME_DIR .. "src/emu/sound/3812intf.h", 
@ -1206,9 +1211,9 @@ if (SOUNDS["YM3812"]~=null) then
 		MAME_DIR .. "src/emu/sound/ymdeltat.c",
 		MAME_DIR .. "src/emu/sound/ymdeltat.h",
 	}
-end
+--end
-if (SOUNDS["YM3526"]~=null) then
+--if (SOUNDS["YM3526"]~=null) then
 	files {
 		MAME_DIR .. "src/emu/sound/3526intf.c", 
 		MAME_DIR .. "src/emu/sound/3526intf.h", 
@ -1217,9 +1222,9 @@ if (SOUNDS["YM3526"]~=null) then
 		MAME_DIR .. "src/emu/sound/ymdeltat.c",
 		MAME_DIR .. "src/emu/sound/ymdeltat.h",
 	}
-end
+--end
-if (SOUNDS["Y8950"]~=null) then
+--if (SOUNDS["Y8950"]~=null) then
 	files {
 		MAME_DIR .. "src/emu/sound/8950intf.c", 
 		MAME_DIR .. "src/emu/sound/8950intf.h", 
@ -1228,6 +1233,7 @@ if (SOUNDS["Y8950"]~=null) then
 		MAME_DIR .. "src/emu/sound/ymdeltat.c",
 		MAME_DIR .. "src/emu/sound/ymdeltat.h",
 	}
 --end
 end
 if (SOUNDS["YMF262"]~=null) then
@ -1257,7 +1263,7 @@ end
 ---------------------------------------------------
 -- Yamaha YMZ280B ADPCM
--@src/emu/sound/ymz280b.h,SOUNDS += YMZ280B
+--@src/emu/sound/ymz280b.h,SOUNDS["YMZ280B"] = true
 ---------------------------------------------------
 if (SOUNDS["YMZ280B"]~=null) then
@ -1269,7 +1275,7 @@ end
 ---------------------------------------------------
 -- Yamaha YMZ770 AMM
--@src/emu/sound/ymz770.h,SOUNDS += YMZ770
+--@src/emu/sound/ymz770.h,SOUNDS["YMZ770"] = true
 ---------------------------------------------------
 if (SOUNDS["YMZ770"]~=null) then
@ -1283,7 +1289,7 @@ end
 ---------------------------------------------------
 -- ZOOM ZSG-2
--@src/emu/sound/zsg2.h,SOUNDS += ZSG2
+--@src/emu/sound/zsg2.h,SOUNDS["ZSG2"] = true
 ---------------------------------------------------
 if (SOUNDS["ZSG2"]~=null) then
@ -1295,7 +1301,7 @@ end
 ---------------------------------------------------
 -- VRC6
--@src/emu/sound/vrc6.h,SOUNDS += VRC6
+--@src/emu/sound/vrc6.h,SOUNDS["VRC6"] = true
 ---------------------------------------------------
 if (SOUNDS["VRC6"]~=null) then
--- a/scripts/src/video.lua
+++ b/scripts/src/video.lua
@ -11,7 +11,7 @@
 --------------------------------------------------
 --
--@src/emu/video/315_5124.h,VIDEOS += SEGA315_5124
+--@src/emu/video/315_5124.h,VIDEOS["SEGA315_5124"] = true
 --------------------------------------------------
 if (VIDEOS["SEGA315_5124"]~=null) then
@ -23,7 +23,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/315_5313.h,VIDEOS += SEGA315_5313
+--@src/emu/video/315_5313.h,VIDEOS["SEGA315_5313"] = true
 --------------------------------------------------
 if (VIDEOS["SEGA315_5313"]~=null) then
@ -35,7 +35,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/bufsprite.h,VIDEOS += BUFSPRITE
+--@src/emu/video/bufsprite.h,VIDEOS["BUFSPRITE"] = true
 --------------------------------------------------
 if (VIDEOS["BUFSPRITE"]~=null) then
@ -47,7 +47,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/cdp1861.h,VIDEOS += CDP1861
+--@src/emu/video/cdp1861.h,VIDEOS["CDP1861"] = true
 --------------------------------------------------
 if (VIDEOS["CDP1861"]~=null) then
@ -59,7 +59,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/cdp1862.h,VIDEOS += CDP1862
+--@src/emu/video/cdp1862.h,VIDEOS["CDP1862"] = true
 --------------------------------------------------
 if (VIDEOS["CDP1862"]~=null) then
@ -71,7 +71,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/crt9007.h,VIDEOS += CRT9007
+--@src/emu/video/crt9007.h,VIDEOS["CRT9007"] = true
 --------------------------------------------------
 if (VIDEOS["CRT9007"]~=null) then
@ -83,7 +83,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/crt9021.h,VIDEOS += CRT9021
+--@src/emu/video/crt9021.h,VIDEOS["CRT9021"] = true
 --------------------------------------------------
 if (VIDEOS["CRT9021"]~=null) then
@ -95,7 +95,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/crt9212.h,VIDEOS += CRT9212
+--@src/emu/video/crt9212.h,VIDEOS["CRT9212"] = true
 --------------------------------------------------
 if (VIDEOS["CRT9212"]~=null) then
@ -107,7 +107,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/dl1416.h,VIDEOS += DL1416
+--@src/emu/video/dl1416.h,VIDEOS["DL1416"] = true
 --------------------------------------------------
 if (VIDEOS["DL1416"]~=null) then
@ -119,7 +119,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/dm9368.h,VIDEOS += DM9368
+--@src/emu/video/dm9368.h,VIDEOS["DM9368"] = true
 --------------------------------------------------
 if (VIDEOS["DM9368"]~=null) then
@ -131,7 +131,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/ef9340_1.h,VIDEOS += EF9340_1
+--@src/emu/video/ef9340_1.h,VIDEOS["EF9340_1"] = true
 --------------------------------------------------
 if (VIDEOS["EF9340_1"]~=null) then
@ -144,7 +144,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/ef9345.h,VIDEOS += EF9345
+--@src/emu/video/ef9345.h,VIDEOS["EF9345"] = true
 --------------------------------------------------
 if (VIDEOS["EF9345"]~=null) then
@ -155,7 +155,7 @@ if (VIDEOS["EF9345"]~=null) then
 end
 --------------------------------------------------
--@src/emu/video/epic12.h,VIDEOS += EPIC12
+--@src/emu/video/epic12.h,VIDEOS["EPIC12"] = true
 --------------------------------------------------
 if (VIDEOS["EPIC12"]~=null) then
@ -178,7 +178,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/fixfreq.h,VIDEOS += FIXFREQ
+--@src/emu/video/fixfreq.h,VIDEOS["FIXFREQ"] = true
 --------------------------------------------------
 if (VIDEOS["FIXFREQ"]~=null) then
@ -190,7 +190,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/gf4500.h,VIDEOS += GF4500
+--@src/emu/video/gf4500.h,VIDEOS["GF4500"] = true
 --------------------------------------------------
 if (VIDEOS["GF4500"]~=null) then
@ -202,7 +202,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/gf7600gs.h,VIDEOS += GF7600GS
+--@src/emu/video/gf7600gs.h,VIDEOS["GF7600GS"] = true
 --------------------------------------------------
 if (VIDEOS["GF7600GS"]~=null) then
@ -214,7 +214,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/h63484.h,VIDEOS += H63484
+--@src/emu/video/h63484.h,VIDEOS["H63484"] = true
 --------------------------------------------------
 if (VIDEOS["H63484"]~=null) then
@ -226,7 +226,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/hd44102.h,VIDEOS += HD44102
+--@src/emu/video/hd44102.h,VIDEOS["HD44102"] = true
 --------------------------------------------------
 if (VIDEOS["HD44102"]~=null) then
@ -238,7 +238,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/hd44352.h,VIDEOS += HD44352
+--@src/emu/video/hd44352.h,VIDEOS["HD44352"] = true
 --------------------------------------------------
 if (VIDEOS["HD44352"]~=null) then
@ -250,7 +250,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/hd44780.h,VIDEOS += HD44780
+--@src/emu/video/hd44780.h,VIDEOS["HD44780"] = true
 --------------------------------------------------
 if (VIDEOS["HD44780"]~=null) then
@ -262,7 +262,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/hd61830.h,VIDEOS += HD61830
+--@src/emu/video/hd61830.h,VIDEOS["HD61830"] = true
 --------------------------------------------------
 if (VIDEOS["HD61830"]~=null) then
@ -274,7 +274,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/hd63484.h,VIDEOS += HD63484
+--@src/emu/video/hd63484.h,VIDEOS["HD63484"] = true
 --------------------------------------------------
 if (VIDEOS["HD63484"]~=null) then
@ -286,7 +286,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/hd66421.h,VIDEOS += HD66421
+--@src/emu/video/hd66421.h,VIDEOS["HD66421"] = true
 --------------------------------------------------
 if (VIDEOS["HD66421"]~=null) then
@ -298,7 +298,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/huc6202.h,VIDEOS += HUC6202
+--@src/emu/video/huc6202.h,VIDEOS["HUC6202"] = true
 --------------------------------------------------
 if (VIDEOS["HUC6202"]~=null) then
@ -310,7 +310,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/huc6260.h,VIDEOS += HUC6260
+--@src/emu/video/huc6260.h,VIDEOS["HUC6260"] = true
 --------------------------------------------------
 if (VIDEOS["HUC6260"]~=null) then
@ -322,7 +322,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/huc6261.h,VIDEOS += HUC6261
+--@src/emu/video/huc6261.h,VIDEOS["HUC6261"] = true
 --------------------------------------------------
 if (VIDEOS["HUC6261"]~=null) then
@ -334,7 +334,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/huc6270.h,VIDEOS += HUC6270
+--@src/emu/video/huc6270.h,VIDEOS["HUC6270"] = true
 --------------------------------------------------
 if (VIDEOS["HUC6270"]~=null) then
@ -346,7 +346,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/huc6272.h,VIDEOS += HUC6272
+--@src/emu/video/huc6272.h,VIDEOS["HUC6272"] = true
 --------------------------------------------------
 if (VIDEOS["HUC6272"]~=null) then
@ -358,7 +358,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/i8244.h,VIDEOS += I8244
+--@src/emu/video/i8244.h,VIDEOS["I8244"] = true
 --------------------------------------------------
 if (VIDEOS["I8244"]~=null) then
@ -370,7 +370,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/i8275.h,VIDEOS += I8275
+--@src/emu/video/i8275.h,VIDEOS["I8275"] = true
 --------------------------------------------------
 if (VIDEOS["I8275"]~=null) then
@ -382,7 +382,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/m50458.h,VIDEOS += M50458
+--@src/emu/video/m50458.h,VIDEOS["M50458"] = true
 --------------------------------------------------
 if (VIDEOS["M50458"]~=null) then
@ -394,7 +394,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/mb90082.h,VIDEOS += MB90082
+--@src/emu/video/mb90082.h,VIDEOS["MB90082"] = true
 --------------------------------------------------
 if (VIDEOS["MB90082"]~=null) then
@ -406,7 +406,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/mb_vcu.h,VIDEOS += MB_VCU
+--@src/emu/video/mb_vcu.h,VIDEOS["MB_VCU"] = true
 --------------------------------------------------
 if (VIDEOS["MB_VCU"]~=null) then
@ -418,7 +418,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/mc6845.h,VIDEOS += MC6845
+--@src/emu/video/mc6845.h,VIDEOS["MC6845"] = true
 --------------------------------------------------
 if (VIDEOS["MC6845"]~=null) then
@ -430,7 +430,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/mc6847.h,VIDEOS += MC6847
+--@src/emu/video/mc6847.h,VIDEOS["MC6847"] = true
 --------------------------------------------------
 if (VIDEOS["MC6847"]~=null) then
@ -442,7 +442,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/msm6222b.h,VIDEOS += MSM6222B
+--@src/emu/video/msm6222b.h,VIDEOS["MSM6222B"] = true
 --------------------------------------------------
 if (VIDEOS["MSM6222B"]~=null) then
@ -454,7 +454,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/msm6255.h,VIDEOS += MSM6255
+--@src/emu/video/msm6255.h,VIDEOS["MSM6255"] = true
 --------------------------------------------------
 if (VIDEOS["MSM6255"]~=null) then
@ -466,7 +466,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/mos6566.h,VIDEOS += MOS6566
+--@src/emu/video/mos6566.h,VIDEOS["MOS6566"] = true
 --------------------------------------------------
 if (VIDEOS["MOS6566"]~=null) then
@ -484,7 +484,7 @@ files {
 --------------------------------------------------
 --
--@src/emu/video/pc_vga.h,VIDEOS += PC_VGA
+--@src/emu/video/pc_vga.h,VIDEOS["PC_VGA"] = true
 --------------------------------------------------
 if (VIDEOS["PC_VGA"]~=null) then
@ -500,7 +500,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/polylgcy.h,VIDEOS += POLY
+--@src/emu/video/polylgcy.h,VIDEOS["POLY"] = true
 --------------------------------------------------
 if (VIDEOS["POLY"]~=null) then
@ -512,7 +512,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/psx.h,VIDEOS += PSX
+--@src/emu/video/psx.h,VIDEOS["PSX"] = true
 --------------------------------------------------
 if (VIDEOS["PSX"]~=null) then
@ -524,7 +524,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/ramdac.h,VIDEOS += RAMDAC
+--@src/emu/video/ramdac.h,VIDEOS["RAMDAC"] = true
 --------------------------------------------------
 if (VIDEOS["RAMDAC"]~=null) then
@ -536,7 +536,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/saa5050.h,VIDEOS += SAA5050
+--@src/emu/video/saa5050.h,VIDEOS["SAA5050"] = true
 --------------------------------------------------
 if (VIDEOS["SAA5050"]~=null) then
@ -548,7 +548,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/sed1200.h,VIDEOS += SED1200
+--@src/emu/video/sed1200.h,VIDEOS["SED1200"] = true
 --------------------------------------------------
 if (VIDEOS["SED1200"]~=null) then
 	files {
@ -559,7 +559,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/sed1330.h,VIDEOS += SED1330
+--@src/emu/video/sed1330.h,VIDEOS["SED1330"] = true
 --------------------------------------------------
 if (VIDEOS["SED1330"]~=null) then
 	files {
@ -570,7 +570,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/sed1520.h,VIDEOS += SED1520
+--@src/emu/video/sed1520.h,VIDEOS["SED1520"] = true
 --------------------------------------------------
 if (VIDEOS["SED1520"]~=null) then
 	files {
@ -581,7 +581,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/scn2674.h,VIDEOS += SCN2674
+--@src/emu/video/scn2674.h,VIDEOS["SCN2674"] = true
 --------------------------------------------------
 if (VIDEOS["SCN2674"]~=null) then
 	files {
@ -592,7 +592,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/snes_ppu.h,VIDEOS += SNES_PPU
+--@src/emu/video/snes_ppu.h,VIDEOS["SNES_PPU"] = true
 --------------------------------------------------
 if (VIDEOS["SNES_PPU"]~=null) then
 	files {
@ -603,8 +603,8 @@ end
 --------------------------------------------------
 --
--@src/emu/video/stvvdp1.h,VIDEOS += STVVDP
+--@src/emu/video/stvvdp1.h,VIDEOS["STVVDP"] = true
--@src/emu/video/stvvdp2.h,VIDEOS += STVVDP
+--@src/emu/video/stvvdp2.h,VIDEOS["STVVDP"] = true
 --------------------------------------------------
 if (VIDEOS["STVVDP"]~=null) then
@ -616,7 +616,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/t6a04.h,VIDEOS += T6A04
+--@src/emu/video/t6a04.h,VIDEOS["T6A04"] = true
 --------------------------------------------------
 if (VIDEOS["T6A04"]~=null) then
@ -628,7 +628,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/tea1002.h,VIDEOS += TEA1002
+--@src/emu/video/tea1002.h,VIDEOS["TEA1002"] = true
 --------------------------------------------------
 if (VIDEOS["TEA1002"]~=null) then
@ -640,7 +640,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/tlc34076.h,VIDEOS += TLC34076
+--@src/emu/video/tlc34076.h,VIDEOS["TLC34076"] = true
 --------------------------------------------------
 if (VIDEOS["TLC34076"]~=null) then
@ -652,7 +652,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/tms34061.h,VIDEOS += TMS34061
+--@src/emu/video/tms34061.h,VIDEOS["TMS34061"] = true
 --------------------------------------------------
 if (VIDEOS["TMS34061"]~=null) then
@ -664,7 +664,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/tms3556.h,VIDEOS += TMS3556
+--@src/emu/video/tms3556.h,VIDEOS["TMS3556"] = true
 --------------------------------------------------
 if (VIDEOS["TMS3556"]~=null) then
@ -676,7 +676,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/tms9927.h,VIDEOS += TMS9927
+--@src/emu/video/tms9927.h,VIDEOS["TMS9927"] = true
 --------------------------------------------------
 if (VIDEOS["TMS9927"]~=null) then
@ -688,7 +688,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/tms9928a.h,VIDEOS += TMS9928A
+--@src/emu/video/tms9928a.h,VIDEOS["TMS9928A"] = true
 --------------------------------------------------
 if (VIDEOS["TMS9928A"]~=null) then
@ -700,7 +700,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/upd3301.h,VIDEOS += UPD3301
+--@src/emu/video/upd3301.h,VIDEOS["UPD3301"] = true
 --------------------------------------------------
 if (VIDEOS["UPD3301"]~=null) then
@ -712,7 +712,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/upd7220.h,VIDEOS += UPD7220
+--@src/emu/video/upd7220.h,VIDEOS["UPD7220"] = true
 --------------------------------------------------
 if (VIDEOS["UPD7220"]~=null) then
@ -724,7 +724,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/upd7227.h,VIDEOS += UPD7227
+--@src/emu/video/upd7227.h,VIDEOS["UPD7227"] = true
 --------------------------------------------------
 if (VIDEOS["UPD7227"]~=null) then
@ -736,7 +736,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/vic4567.h,VIDEOS += VIC4567
+--@src/emu/video/vic4567.h,VIDEOS["VIC4567"] = true
 --------------------------------------------------
 if (VIDEOS["VIC4567"]~=null) then
@ -748,7 +748,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/v9938.h,VIDEOS += V9938
+--@src/emu/video/v9938.h,VIDEOS["V9938"] = true
 --------------------------------------------------
 if (VIDEOS["V9938"]~=null) then
@ -760,7 +760,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/voodoo.h,VIDEOS += VOODOO
+--@src/emu/video/voodoo.h,VIDEOS["VOODOO"] = true
 --------------------------------------------------
 if (VIDEOS["VOODOO"]~=null) then
@ -773,7 +773,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/voodoo_pci.h,VIDEOS += VOODOO_PCI
+--@src/emu/video/voodoo_pci.h,VIDEOS["VOODOO_PCI"] = true
 --------------------------------------------------
 if (VIDEOS["VOODOO_PCI"]~=null) then
@ -785,7 +785,7 @@ end
 --------------------------------------------------
 --
--@src/emu/video/crtc_ega.h,VIDEOS += CRTC_EGA
+--@src/emu/video/crtc_ega.h,VIDEOS["CRTC_EGA"] = true
 --------------------------------------------------
 if (VIDEOS["CRTC_EGA"]~=null) then
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@ -1243,7 +1243,6 @@ files {
 	MAME_DIR .. "src/mame/audio/astrof.c",
 	MAME_DIR .. "src/mame/drivers/backfire.c",
 	MAME_DIR .. "src/mame/drivers/battlera.c",
 	MAME_DIR .. "src/mame/video/battlera.c",
 	MAME_DIR .. "src/mame/drivers/boogwing.c",
 	MAME_DIR .. "src/mame/video/boogwing.c",
 	MAME_DIR .. "src/mame/drivers/brkthru.c",
@ -2481,6 +2480,7 @@ files {
 	MAME_DIR .. "src/mame/video/segas18.c",
 	MAME_DIR .. "src/mame/drivers/segas24.c",
 	MAME_DIR .. "src/mame/video/segas24.c",
 	MAME_DIR .. "src/mame/drivers/segam1.c",
 	MAME_DIR .. "src/mame/drivers/segas32.c",
 	MAME_DIR .. "src/mame/machine/segas32.c",
 	MAME_DIR .. "src/mame/video/segas32.c",
--- a/src/build/makedep.py
+++ b/src/build/makedep.py
@ -0,0 +1,313 @@
 #!/usr/bin/python
 ##
 ## license:BSD-3-Clause
 ## copyright-holders:Miodrag Milanovic
 from __future__ import with_statement
 import sys
 ## to ignore include of emu.h add it always to list
 files_included = ['src/emu/emu.h']
 include_dirs = ['src/emu/', 'src/mame/', 'src/mess/']
 mappings = dict()
 deps_files_included = [ ]
 deps_include_dirs = ['src/mame/', 'src/mess/']
 components = [ ]
 drivers = [ ]
 def file_exists(root, srcfile, folder, inc_dir):
    includes = [ folder ]
    includes.extend(inc_dir)
    for line in includes:
        try:
            fp = open(root + line + srcfile, 'rb')
            return line + srcfile
        except IOError:
            ignore=1
    return ''
 def add_c_if_exists(root, fullname):
    try:
        fp = open(root + fullname, 'rb')
        deps_files_included.append(fullname)
    except IOError:
        ignore=1
 def add_rest_if_exists(root, srcfile,folder):
    t = srcfile.rsplit('/', 2)
    if t[1]=='includes':
        t[2] = t[2].replace('.h','.c')
        t[1] = 'drivers'     
        add_c_if_exists(root,"/".join(t))
        parse_file_for_deps(root, "/".join(t), folder)
        t[1] = 'machine'     
        add_c_if_exists(root,"/".join(t))
        parse_file_for_deps(root, "/".join(t), folder)
        t[1] = 'video'     
        add_c_if_exists(root,"/".join(t))
        parse_file_for_deps(root, "/".join(t), folder)
        t[1] = 'audio'
        add_c_if_exists(root,"/".join(t))
        parse_file_for_deps(root, "/".join(t), folder)
 def parse_file_for_deps(root, srcfile, folder):
    try:
        fp = open(root + srcfile, 'rb')
    except IOError:
        return 1
    in_comment = 0
    linenum = 0
    for line in fp.readlines():
        content = ''
        linenum+=1
        srcptr = 0
        while srcptr < len(line):
            c = line[srcptr]
            srcptr+=1
            if c==13 or c==10:
                if c==13 and line[srcptr]==10:
                    srcptr+=1
                continue
            if c==' ' or c==9:
                continue
            if in_comment==1 and c=='*' and line[srcptr]=='/' :
                srcptr+=1
                in_comment = 0
                continue
            if in_comment:
                continue
            if c=='/' and line[srcptr]=='*' :
                srcptr+=1
                in_comment = 1
                continue
            if c=='/' and line[srcptr]=='/' :
                break
            content += c
        content = content.strip()
        if len(content)>0:
            if content.startswith('#include'):
               name = content[8:]
               name = name.replace('"','')
               fullname = file_exists(root, name, folder,deps_include_dirs)
               if fullname in deps_files_included:
                   continue
               if fullname!='':
                   deps_files_included.append(fullname)
                   add_c_if_exists(root, fullname.replace('.h','.c'))
                   add_rest_if_exists(root, fullname,folder)
                   newfolder = fullname.rsplit('/', 1)[0] + '/'
                   parse_file_for_deps(root, fullname, newfolder)
               continue
    return 0
 def parse_file(root, srcfile, folder):
    try:
        fp = open(root + srcfile, 'rb')
    except IOError:
        return 1
    in_comment = 0
    linenum = 0
    for line in fp.readlines():
        content = ''
        linenum+=1
        srcptr = 0
        while srcptr < len(line):
            c = line[srcptr]
            srcptr+=1
            if c==13 or c==10:
                if c==13 and line[srcptr]==10:
                    srcptr+=1
                continue
            if c==' ' or c==9:
                continue
            if in_comment==1 and c=='*' and line[srcptr]=='/' :
                srcptr+=1
                in_comment = 0
                continue
            if in_comment:
                continue
            if c=='/' and line[srcptr]=='*' :
                srcptr+=1
                in_comment = 1
                continue
            if c=='/' and line[srcptr]=='/' :
                break
            content += c
        content = content.strip()
        if len(content)>0:
            if content.startswith('#include'):
               name = content[8:]
               name = name.replace('"','')
               fullname = file_exists(root, name, folder,include_dirs)
               if fullname in files_included:
                   continue
               if "src/emu/netlist/" in fullname:
                   continue
               if fullname!='':
                   if fullname in mappings.keys():
                        if not(mappings[fullname] in components):
                            components.append(mappings[fullname])
                   files_included.append(fullname)
                   newfolder = fullname.rsplit('/', 1)[0] + '/'
                   parse_file(root, fullname, newfolder)
                   if (fullname.endswith('.h')):
                       parse_file(root, fullname.replace('.h','.c'), newfolder)
               continue
    return 0
 def parse_file_for_drivers(root, srcfile):
    try:
        fp = open(root + srcfile, 'rb')
    except IOError:
        sys.stderr.write("Unable to open source file '%s'\n" % srcfile)
        return 1
    in_comment = 0
    linenum = 0
    for line in fp.readlines():
        content = ''
        linenum+=1
        srcptr = 0
        while srcptr < len(line):
            c = line[srcptr]
            srcptr+=1
            if c==13 or c==10:
                if c==13 and line[srcptr]==10:
                    srcptr+=1
                continue
            if c==' ' or c==9:
                continue
            if in_comment==1 and c=='*' and line[srcptr]=='/' :
                srcptr+=1
                in_comment = 0
                continue
            if in_comment:
                continue
            if c=='/' and line[srcptr]=='*' :
                srcptr+=1
                in_comment = 1
                continue
            if c=='/' and line[srcptr]=='/' :
                break
            content += c
        content = content.strip()
        if len(content)>0:
            if content.startswith('COMP') or content.startswith('CONS') or content.startswith('GAME') or content.startswith('SYST')  or content.startswith('GAMEL'):
               name = content[4:]
               drivers.append(name.rsplit(',', 14)[1])
    return 0
 def parse_lua_file(srcfile):
    try:
        fp = open(srcfile, 'rb')
    except IOError:
        sys.stderr.write("Unable to open source file '%s'\n" % srcfile)
        return 1
    in_comment = 0
    linenum = 0
    for line in fp.readlines():
        content = line.strip()
        if len(content)>0:
            if content.startswith('--@'):
               name = content[3:]
               mappings[name.rsplit(',', 1)[0]] = name.rsplit(',', 1)[1]
    return 0
 if len(sys.argv) < 5:
    print('Usage:')
    print('  makedep <root> <source.c> <type> <target>')
    sys.exit(0)
 root = sys.argv[1] + '/'
 parse_lua_file(root +'scripts/src/bus.lua')
 parse_lua_file(root +'scripts/src/cpu.lua')
 parse_lua_file(root +'scripts/src/machine.lua')
 parse_lua_file(root +'scripts/src/sound.lua')
 parse_lua_file(root +'scripts/src/video.lua')
 for filename in sys.argv[2].rsplit(',') :
    deps_files_included.append(filename.replace('\\','/'))
    parse_file_for_deps(root,filename,'')
 for filename in deps_files_included:
    parse_file(root,filename,'')
 for filename in sys.argv[2].rsplit(',') :
    parse_file_for_drivers(root,filename)
 # display output
 if sys.argv[3]=='drivers':
 	# add a reference to the ___empty driver
 	drivers.append("___empty")
 	# start with a header
 	print('#include "emu.h"\n')
 	print('#include "drivenum.h"\n')
 	#output the list of externs first
 	for drv in sorted(drivers):
 		print("GAME_EXTERN(%s);" % drv)
 	print("")
 	# then output the array
 	print("const game_driver * const driver_list::s_drivers_sorted[%d] =" % len(drivers))
 	print("{")
 	for drv in sorted(drivers):
 		print("\t&GAME_NAME(%s)," % drv)
 	print("};")
 	print("")
 	# also output a global count
 	print("int driver_list::s_driver_count = %d;\n" % len(drivers))
 if sys.argv[3]=='target':
    for line in components:
        sys.stdout.write("%s\n" % line)	
    sys.stdout.write('\n');
    sys.stdout.write('function createProjects_mame_%s(_target, _subtarget)\n' % sys.argv[4]);
    sys.stdout.write('	project ("mame_%s")\n' % sys.argv[4]);
    sys.stdout.write('	targetsubdir(_target .."_" .. _subtarget)\n');
    sys.stdout.write('	kind (LIBTYPE)\n');
    sys.stdout.write('	uuid (os.uuid("drv-mame-%s"))\n' % sys.argv[4]);
    sys.stdout.write('	\n');
    sys.stdout.write('	options {\n');
    sys.stdout.write('		"ForceCPP",\n');
    sys.stdout.write('	}\n');
    sys.stdout.write('	\n');
    sys.stdout.write('	includedirs {\n');
    sys.stdout.write('		MAME_DIR .. "src/osd",\n');
    sys.stdout.write('		MAME_DIR .. "src/emu",\n');
    sys.stdout.write('		MAME_DIR .. "src/mame",\n');
    sys.stdout.write('		MAME_DIR .. "src/mess",\n');
    sys.stdout.write('		MAME_DIR .. "src/lib",\n');
    sys.stdout.write('		MAME_DIR .. "src/lib/util",\n');
    sys.stdout.write('		MAME_DIR .. "3rdparty",\n');
    sys.stdout.write('		GEN_DIR  .. "mame/layout",\n');
    sys.stdout.write('		GEN_DIR  .. "mess/layout",\n');
    sys.stdout.write('	}\n');
    sys.stdout.write('	if _OPTIONS["with-bundled-zlib"] then\n');
    sys.stdout.write('		includedirs {\n');
    sys.stdout.write('			MAME_DIR .. "3rdparty/zlib",\n');
    sys.stdout.write('		}\n');
    sys.stdout.write('	end\n');
    sys.stdout.write('\n');
    sys.stdout.write('	files{\n');
    for line in deps_files_included:
        sys.stdout.write('		MAME_DIR .. "%s",\n' % line);
    sys.stdout.write('	}\n');
    sys.stdout.write('end\n');
    sys.stdout.write('\n');
    sys.stdout.write('function linkProjects_mame_%s(_target, _subtarget)\n' % sys.argv[4]);
    sys.stdout.write('	links {\n');
    sys.stdout.write('		"mame_%s",\n' % sys.argv[4]);
    sys.stdout.write('	}\n');
    sys.stdout.write('end\n');
--- a/src/emu/bus/a2bus/corvfdc01.c
+++ b/src/emu/bus/a2bus/corvfdc01.c
@ -35,7 +35,7 @@ static SLOT_INTERFACE_START( corv_floppies )
 SLOT_INTERFACE_END
 MACHINE_CONFIG_FRAGMENT( fdc01 )
-	MCFG_FD1793x_ADD(FDC01_FDC_TAG, XTAL_16MHz / 8)
+	MCFG_FD1793_ADD(FDC01_FDC_TAG, XTAL_16MHz / 8)
 	MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(a2bus_corvfdc01_device, intrq_w))
 	MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(a2bus_corvfdc01_device, drq_w))
 	MCFG_FLOPPY_DRIVE_ADD(FDC01_FDC_TAG":0", corv_floppies, "8sssd", a2bus_corvfdc01_device::corv_floppy_formats)
--- a/src/emu/bus/abcbus/fd2.c
+++ b/src/emu/bus/abcbus/fd2.c
@ -246,7 +246,7 @@ static MACHINE_CONFIG_FRAGMENT( abc_fd2 )
 	MCFG_Z80PIO_IN_PB_CB(READ8(abc_fd2_t, pio_pb_r))
 	MCFG_Z80PIO_OUT_PB_CB(WRITE8(abc_fd2_t, pio_pb_w))
-	MCFG_FD1771x_ADD(FD1771_TAG, XTAL_4MHz/4)
+	MCFG_FD1771_ADD(FD1771_TAG, XTAL_4MHz/4)
 	MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(Z80PIO_TAG, z80pio_device, pb7_w))
 	MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(Z80PIO_TAG, z80pio_device, pb5_w))
 	MCFG_WD_FDC_HLD_CALLBACK(DEVWRITELINE(Z80PIO_TAG, z80pio_device, pb6_w))
--- a/src/emu/bus/abcbus/lux10828.c
+++ b/src/emu/bus/abcbus/lux10828.c
@ -338,7 +338,7 @@ static MACHINE_CONFIG_FRAGMENT( luxor_55_10828 )
 	MCFG_Z80PIO_IN_PB_CB(READ8(luxor_55_10828_device, pio_pb_r))
 	MCFG_Z80PIO_OUT_PB_CB(WRITE8(luxor_55_10828_device, pio_pb_w))
-	MCFG_MB8876x_ADD(MB8876_TAG, XTAL_4MHz/2)
+	MCFG_MB8876_ADD(MB8876_TAG, XTAL_4MHz/2)
 	MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(luxor_55_10828_device, fdc_intrq_w))
 	MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(luxor_55_10828_device, fdc_drq_w))
--- a/src/emu/bus/abcbus/lux21046.c
+++ b/src/emu/bus/abcbus/lux21046.c
@ -298,7 +298,7 @@ static MACHINE_CONFIG_FRAGMENT( luxor_55_21046 )
 	MCFG_Z80DMA_IN_IORQ_CB(READ8(luxor_55_21046_device, io_read_byte))
 	MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(luxor_55_21046_device, io_write_byte))
-	MCFG_FD1793x_ADD(SAB1793_TAG, XTAL_16MHz/16)
+	MCFG_FD1793_ADD(SAB1793_TAG, XTAL_16MHz/16)
 	MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(luxor_55_21046_device, fdc_intrq_w))
 	MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(Z80DMA_TAG, z80dma_device, rdy_w))
 MACHINE_CONFIG_END
--- a/src/emu/bus/adamnet/fdc.c
+++ b/src/emu/bus/adamnet/fdc.c
@ -128,7 +128,7 @@ static MACHINE_CONFIG_FRAGMENT( adam_fdc )
 	MCFG_CPU_PROGRAM_MAP(adam_fdc_mem)
 	MCFG_CPU_IO_MAP(adam_fdc_io)
-	MCFG_WD2793x_ADD(WD2793_TAG, XTAL_4MHz/4)
+	MCFG_WD2793_ADD(WD2793_TAG, XTAL_4MHz/4)
 	MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(M6801_TAG, INPUT_LINE_NMI))
 	MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", adam_fdc_floppies, "525ssdd", adam_fdc_device::floppy_formats)
--- a/src/emu/bus/apricot/expansion.h
+++ b/src/emu/bus/apricot/expansion.h
@ -2,42 +2,42 @@
 // copyright-holders:Dirk Best
 /***************************************************************************
-	ACT Apricot Expansion Slot
+    ACT Apricot Expansion Slot
       A          B
-	 -12V   32   +12V
+     -12V   32   +12V
-	  +5V   31   +5V
+      +5V   31   +5V
-	 DB0    30   DB1
+     DB0    30   DB1
-	 DB2    29   DB3
+     DB2    29   DB3
-	 DB4    28   DB5
+     DB4    28   DB5
-	 DB6    27   DB7
+     DB6    27   DB7
-	 AB10   26   AB9
+     AB10   26   AB9
-	 AB11   25   AB12
+     AB11   25   AB12
-	/AMWC   24   /MRDC
+    /AMWC   24   /MRDC
-	/DMA2   23   DT/R
+    /DMA2   23   DT/R
-	/DMA1   22   /IORC
+    /DMA1   22   /IORC
-	/MWTC   21   /RES
+    /MWTC   21   /RES
-	/IOWC   20   /AIOWC
+    /IOWC   20   /AIOWC
-	  GND   19   GND
+      GND   19   GND
-	/CLK5   18   DEN
+    /CLK5   18   DEN
-	/IRDY   17   /MRDY
+    /IRDY   17   /MRDY
-	/EXT1   16   /EXT2
+    /EXT1   16   /EXT2
-	/INT3   15   /ALE
+    /INT3   15   /ALE
-	  AB6   14   /INT2
+      AB6   14   /INT2
-	  AB8   13   AB7
+      AB8   13   AB7
-	  DB9   12   DB8
+      DB9   12   DB8
-	 DB11   11   DB10
+     DB11   11   DB10
-	 DB13   10   DB12
+     DB13   10   DB12
-	 DB15    9   DB14
+     DB15    9   DB14
-	  AB2    8   AB1
+      AB2    8   AB1
-	  AB4    7   AB3
+      AB4    7   AB3
-	  AB0    6   AB5
+      AB0    6   AB5
-	 AB14    5   AB13
+     AB14    5   AB13
-	 AB15    4   AB16
+     AB15    4   AB16
-	 AB17    3   AB18
+     AB17    3   AB18
-	 AB19    2   /BHE
+     AB19    2   /BHE
-	  NMI    1   CLK15
+      NMI    1   CLK15
 ***************************************************************************/
--- a/src/emu/bus/bml3/bml3mp1802.c
+++ b/src/emu/bus/bml3/bml3mp1802.c
@ -43,7 +43,7 @@ ROM_START( mp1802 )
 ROM_END
 MACHINE_CONFIG_FRAGMENT( mp1802 )
-	MCFG_MB8866x_ADD("fdc", XTAL_1MHz)
+	MCFG_MB8866_ADD("fdc", XTAL_1MHz)
 	MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bml3bus_mp1802_device, bml3_wd17xx_intrq_w))
 	MCFG_FLOPPY_DRIVE_ADD("fdc:0", mp1802_floppies, "dd", floppy_image_device::default_floppy_formats)
--- a/src/emu/bus/cbmiec/c1571.c
+++ b/src/emu/bus/cbmiec/c1571.c
@ -628,7 +628,7 @@ static MACHINE_CONFIG_FRAGMENT( c1570 )
 	MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_t, cia_pb_w))
 	MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_t, cia_pc_w))
-	MCFG_WD1770x_ADD(WD1770_TAG, XTAL_16MHz/2)
+	MCFG_WD1770_ADD(WD1770_TAG, XTAL_16MHz/2)
 	MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz)
 	MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_t, byte_w))
 	MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1571_floppies, "525qd", c1571_t::floppy_formats)
@ -679,7 +679,7 @@ static MACHINE_CONFIG_FRAGMENT( c1571 )
 	MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_t, cia_pb_w))
 	MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_t, cia_pc_w))
-	MCFG_WD1770x_ADD(WD1770_TAG, XTAL_16MHz/2)
+	MCFG_WD1770_ADD(WD1770_TAG, XTAL_16MHz/2)
 	MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz)
 	MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_t, byte_w))
 	MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1571_floppies, "525qd", c1571_t::floppy_formats)
@ -724,7 +724,7 @@ static MACHINE_CONFIG_FRAGMENT( c1571cr )
 	//MCFG_MOS5710_ADD(M5710_TAG, XTAL_16MHz/16, 0)
-	MCFG_WD1770x_ADD(WD1770_TAG, XTAL_16MHz/2)
+	MCFG_WD1770_ADD(WD1770_TAG, XTAL_16MHz/2)
 	MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz)
 	MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_t, byte_w))
 	MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1571_floppies, "525qd", c1571_t::floppy_formats)
@ -775,7 +775,7 @@ static MACHINE_CONFIG_FRAGMENT( mini_chief )
 	MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_t, cia_pb_w))
 	MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_t, cia_pc_w))
-	MCFG_WD1770x_ADD(WD1770_TAG, XTAL_16MHz/2)
+	MCFG_WD1770_ADD(WD1770_TAG, XTAL_16MHz/2)
 	MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz)
 	MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_t, byte_w))
 	MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1571_floppies, "525qd", c1571_t::floppy_formats)
--- a/src/emu/bus/cbmiec/c1581.c
+++ b/src/emu/bus/cbmiec/c1581.c
@ -277,7 +277,7 @@ static MACHINE_CONFIG_FRAGMENT( c1581 )
 	MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c1581_t, cia_pb_r))
 	MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1581_t, cia_pb_w))
-	MCFG_WD1772x_ADD(WD1772_TAG, XTAL_16MHz/2)
+	MCFG_WD1772_ADD(WD1772_TAG, XTAL_16MHz/2)
 	MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", c1581_floppies, "35dd", c1581_t::floppy_formats)
 MACHINE_CONFIG_END
--- a/src/emu/bus/cgenie/expansion/floppy.c
+++ b/src/emu/bus/cgenie/expansion/floppy.c
@ -72,7 +72,7 @@ const rom_entry *cgenie_fdc_device::device_rom_region() const
 static MACHINE_CONFIG_FRAGMENT( cgenie_fdc )
 	MCFG_TIMER_DRIVER_ADD_PERIODIC("timer", cgenie_fdc_device, timer_callback, attotime::from_msec(25))
-	MCFG_FD1793x_ADD("fd1793", XTAL_1MHz)
+	MCFG_FD1793_ADD("fd1793", XTAL_1MHz)
 	MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(cgenie_fdc_device, intrq_w))
 	MCFG_FLOPPY_DRIVE_ADD("fd1793:0", cgenie_floppies, "ssdd", cgenie_fdc_device::floppy_formats)
--- a/src/emu/bus/coco/coco_fdc.c
+++ b/src/emu/bus/coco/coco_fdc.c
@ -154,7 +154,7 @@ WRITE_LINE_MEMBER( coco_fdc_device::fdc_drq_w )
 //**************************************************************************
 static MACHINE_CONFIG_FRAGMENT(coco_fdc)
-	MCFG_WD1773x_ADD(WD_TAG, XTAL_8MHz)
+	MCFG_WD1773_ADD(WD_TAG, XTAL_8MHz)
 	MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(coco_fdc_device, fdc_intrq_w))
 	MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(coco_fdc_device, fdc_drq_w))
@ -425,7 +425,7 @@ WRITE8_MEMBER(coco_fdc_device::write)
 //**************************************************************************
 static MACHINE_CONFIG_FRAGMENT(dragon_fdc)
-	MCFG_WD2797x_ADD(WD2797_TAG, XTAL_1MHz)
+	MCFG_WD2797_ADD(WD2797_TAG, XTAL_1MHz)
 	MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":0", coco_fdc_floppies, "qd", coco_fdc_device::floppy_formats)
 	MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":1", coco_fdc_floppies, "qd", coco_fdc_device::floppy_formats)
--- a/src/emu/bus/comx35/fdc.c
+++ b/src/emu/bus/comx35/fdc.c
@ -95,7 +95,7 @@ SLOT_INTERFACE_END
 //-------------------------------------------------
 static MACHINE_CONFIG_FRAGMENT( comx_fd )
-	MCFG_WD1770x_ADD(WD1770_TAG, XTAL_8MHz)
+	MCFG_WD1770_ADD(WD1770_TAG, XTAL_8MHz)
 	MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":0", comx_fd_floppies, "525sd35t", comx_fd_device::floppy_formats)
 	MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":1", comx_fd_floppies, NULL,       comx_fd_device::floppy_formats)
--- a/src/emu/bus/cpc/hd20.c
+++ b/src/emu/bus/cpc/hd20.c
@ -0,0 +1,128 @@
 // license:BSD-3-Clause
 // copyright-holders:Barry Rodewald
 /*
    Dobbertin HD20 hard disk
 */
 #include "emu.h"
 #include "hd20.h"
 #include "includes/amstrad.h"
 //**************************************************************************
 //  DEVICE DEFINITIONS
 //**************************************************************************
 const device_type CPC_HD20 = &device_creator<cpc_hd20_device>;
 static MACHINE_CONFIG_FRAGMENT( cpc_hd20 )
 	MCFG_DEVICE_ADD("hdc",ST11M_HDC,0)
 	MCFG_XTHDC_IRQ_HANDLER(WRITELINE(cpc_hd20_device,irq_w))
 	MCFG_HARDDISK_ADD("hdc:primary")
 	// no pass-through (?)
 MACHINE_CONFIG_END
 machine_config_constructor cpc_hd20_device::device_mconfig_additions() const
 {
 	return MACHINE_CONFIG_NAME( cpc_hd20 );
 }
 ROM_START( cpc_hd20 )
 	ROM_REGION( 0x4000, "exp_rom", 0 )
 	ROM_DEFAULT_BIOS("xddos210")
 	ROM_SYSTEM_BIOS( 0, "xddos210", "X-DDOS 2.10" )
 	ROMX_LOAD( "xddos210.rom",   0x0000, 0x4000, CRC(5477fdb4) SHA1(2f1bd4d6e2d2e62818b01e6e7a26488362a7a8ee), ROM_BIOS(1) )
 	ROM_SYSTEM_BIOS( 1, "xddos200", "X-DDOS 2.00" )
 	ROMX_LOAD( "x-ddos20.rom",   0x0000, 0x4000, CRC(c2d9cc03) SHA1(8a20788be5f957e84e849c226aa97b55b2a3aab9), ROM_BIOS(2) )
 ROM_END
 const rom_entry *cpc_hd20_device::device_rom_region() const
 {
 	return ROM_NAME( cpc_hd20 );
 }
 //**************************************************************************
 //  LIVE DEVICE
 //**************************************************************************
 cpc_hd20_device::cpc_hd20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
 	device_t(mconfig, CPC_HD20, "Dobbertin HD20", tag, owner, clock, "cpc_hd20", __FILE__),
 	device_cpc_expansion_card_interface(mconfig, *this),
 	m_hdc(*this,"hdc")
 {
 }
 //-------------------------------------------------
 //  device_start - device-specific startup
 //-------------------------------------------------
 void cpc_hd20_device::device_start()
 {
 	device_t* cpu = machine().device("maincpu");
 	address_space& space = cpu->memory().space(AS_IO);
 	m_slot = dynamic_cast<cpc_expansion_slot_device *>(owner());
 	space.install_write_handler(0xfbe0,0xfbe4,0,0,write8_delegate(FUNC(cpc_hd20_device::hdc_w),this));
 	space.install_read_handler(0xfbe0,0xfbe4,0,0,read8_delegate(FUNC(cpc_hd20_device::hdc_r),this));
 }
 //-------------------------------------------------
 //  device_reset - device-specific reset
 //-------------------------------------------------
 void cpc_hd20_device::device_reset()
 {
 	// TODO
 }
 READ8_MEMBER(cpc_hd20_device::hdc_r)
 {
 	UINT8 ret = 0xff;
 	switch(offset)
 	{
 	case 0:
 		ret = m_hdc->data_r();
 		break;
 	case 1:
 		ret = m_hdc->status_r();
 		break;
 	case 2:
 		m_hdc->set_ready();
 		ret = 0x01;
 		break;
 	}
 	return ret;
 }
 WRITE8_MEMBER(cpc_hd20_device::hdc_w)
 {
 	switch(offset)
 	{
 	case 0:
 		m_hdc->data_w(data);
 		break;
 	case 1:
 		m_hdc->reset_w(data);
 		break;
 	case 2:
 		m_hdc->select_w(data);
 		break;
 	case 3:
 		m_hdc->control_w(data);
 		break;
 	case 4:
 		m_hdc->reset_w(data);
 		break;
 	}
 }
 WRITE_LINE_MEMBER(cpc_hd20_device::irq_w)
 {
 //  if(state)
 //      m_hdc->set_ready();
 }
--- a/src/emu/bus/cpc/hd20.h
+++ b/src/emu/bus/cpc/hd20.h
@ -0,0 +1,50 @@
 // license:BSD-3-Clause
 // copyright-holders:Barry Rodewald
 /*
    Dobbertin HD20 hard disk
    Fixed disk interface for the Amstrad CPC
    Controller: Seagate ST11M XT HD Controller
    Disk: 3.5" 20MB Seagate, Kyocera, NEC or Miniscribe (Geometry: 615 cylinders/4 heads/17 sectors)
 */
 #ifndef HD20_H_
 #define HD20_H_
 #include "emu.h"
 #include "cpcexp.h"
 #include "bus/isa/hdc.h"
 class cpc_hd20_device  : public device_t,
 							public device_cpc_expansion_card_interface
 {
 public:
 	// construction/destruction
 	cpc_hd20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 	// optional information overrides
 	virtual machine_config_constructor device_mconfig_additions() const;
 	virtual const rom_entry *device_rom_region() const;
 	DECLARE_READ8_MEMBER(hdc_r);
 	DECLARE_WRITE8_MEMBER(hdc_w);
 	DECLARE_WRITE_LINE_MEMBER(irq_w);
 protected:
 	// device-level overrides
 	virtual void device_start();
 	virtual void device_reset();
 private:
 	cpc_expansion_slot_device *m_slot;
 	required_device<xt_hdc_device> m_hdc;
 };
 // device type definition
 extern const device_type CPC_HD20;
 #endif /* HD20_H_ */
--- a/src/emu/bus/cpc/mface2.c
+++ b/src/emu/bus/cpc/mface2.c
@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Barry Rodewald
+// copyright-holders:Kevin Thacker, Barry Rodewald
 /*
 * mface2.c  --  Romantic Robot Multiface II expansion device for the Amstrad CPC/CPC+
 *
--- a/src/emu/bus/cpc/mface2.h
+++ b/src/emu/bus/cpc/mface2.h
@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Barry Rodewald
+// copyright-holders:Kevin Thacker, Barry Rodewald
 /*
 * mface2.h  --  Romantic Robot Multiface II expansion device for the Amstrad CPC/CPC+
 *
--- a/src/emu/bus/econet/e01.c
+++ b/src/emu/bus/econet/e01.c
@ -250,7 +250,7 @@ static MACHINE_CONFIG_FRAGMENT( e01 )
 	MCFG_DEVICE_ADD(MC6854_TAG, MC6854, 0)
 	MCFG_MC6854_OUT_IRQ_CB(WRITELINE(e01_device, adlc_irq_w))
 	MCFG_MC6854_OUT_TXD_CB(WRITELINE(e01_device, econet_data_w))
-	MCFG_WD2793x_ADD(WD2793_TAG, XTAL_8MHz/4)
+	MCFG_WD2793_ADD(WD2793_TAG, XTAL_8MHz/4)
 	MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(e01_device, fdc_irq_w))
 	MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(e01_device, fdc_drq_w))
 	MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", e01_floppies, "35dd", floppy_image_device::default_floppy_formats)
--- a/src/emu/bus/ep64/exdos.c
+++ b/src/emu/bus/ep64/exdos.c
@ -102,7 +102,7 @@ SLOT_INTERFACE_END
 //-------------------------------------------------
 static MACHINE_CONFIG_FRAGMENT( ep64_exdos )
-	MCFG_WD1770x_ADD(WD1770_TAG, XTAL_8MHz)
+	MCFG_WD1770_ADD(WD1770_TAG, XTAL_8MHz)
 	MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":0", ep64_exdos_floppies, "35dd", ep64_exdos_device::floppy_formats)
 	MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":1", ep64_exdos_floppies, NULL,  ep64_exdos_device::floppy_formats)
--- a/src/emu/bus/ieee488/c8280.c
+++ b/src/emu/bus/ieee488/c8280.c
@ -306,7 +306,7 @@ static MACHINE_CONFIG_FRAGMENT( c8280 )
 	MCFG_CPU_ADD(M6502_FDC_TAG, M6502, XTAL_12MHz/8)
 	MCFG_CPU_PROGRAM_MAP(c8280_fdc_mem)
-	MCFG_FD1797x_ADD(WD1797_TAG, XTAL_12MHz/6)
+	MCFG_FD1797_ADD(WD1797_TAG, XTAL_12MHz/6)
 	MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(M6502_FDC_TAG, M6502_IRQ_LINE))
 	MCFG_WD_FDC_DRQ_CALLBACK(INPUTLINE(M6502_FDC_TAG, M6502_SET_OVERFLOW))
 	MCFG_FLOPPY_DRIVE_ADD(WD1797_TAG ":0", c8280_floppies, "8dsdd", c8280_t::floppy_formats)
--- a/src/emu/bus/isa/hdc.c
+++ b/src/emu/bus/isa/hdc.c
@ -159,10 +159,11 @@ INPUT_PORTS_END
 const device_type XT_HDC = &device_creator<xt_hdc_device>;
 const device_type EC1841_HDC = &device_creator<ec1841_device>;
 const device_type ST11M_HDC = &device_creator<st11m_device>;
 xt_hdc_device::xt_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
 		device_t(mconfig, XT_HDC, "Generic PC-XT Fixed Disk Controller", tag, owner, clock, "xt_hdc", __FILE__),
-		m_irq_handler(*this),	
+		m_irq_handler(*this),
 		m_drq_handler(*this)
 {
 	m_type = STANDARD;
@ -170,22 +171,30 @@ xt_hdc_device::xt_hdc_device(const machine_config &mconfig, const char *tag, dev
 xt_hdc_device::xt_hdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
 		device_t(mconfig, type, name, tag, owner, clock, shortname, source),
-		m_irq_handler(*this),	
+		m_irq_handler(*this),
 		m_drq_handler(*this)
 {
 }
 ec1841_device::ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
 		xt_hdc_device(mconfig, EC1841_HDC, "EC1841 Fixed Disk Controller", tag, owner, clock, "ec1481", __FILE__),
-		m_irq_handler(*this),	
+		m_irq_handler(*this),
 		m_drq_handler(*this)
 {
 	m_type = EC1841;
 }
 st11m_device::st11m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
 		xt_hdc_device(mconfig, EC1841_HDC, "Seagate ST11M Fixed Disk Controller", tag, owner, clock, "st11m", __FILE__),
 		m_irq_handler(*this),
 		m_drq_handler(*this)
 {
 	m_type = ST11M;
 }
 void xt_hdc_device::device_start()
 {
-	buffer.resize(17*4*512);
+	buffer.resize(256*512);   // maximum possible transfer
 	timer = timer_alloc();
 	m_irq_handler.resolve_safe();
 	m_drq_handler.resolve_safe();
@ -241,7 +250,7 @@ hard_disk_file *xt_hdc_device::pc_hdc_file(int id)
 void xt_hdc_device::pc_hdc_result(int set_error_info)
 {
-	if ( ( hdc_control & 0x02 )) 
+	if ( ( hdc_control & 0x02 ))
 	{
 		// dip switch selected IRQ 5 or 2
 		m_irq_handler(1);
@ -425,24 +434,25 @@ void xt_hdc_device::execute_read()
 	int size = sector_cnt[drv] * 512;
 	int read_ = 0;
 	if(sector_cnt[drv] == 0)
 		size = 256 * 512;
 	disk = pc_hdc_file(drv);
 	if (!disk)
 		return;
 	status |= STA_READY;  // ready to recieve data
 	status &= ~STA_INPUT;
 	status &= ~STA_COMMAND;
 	hdcdma_src = hdcdma_data;
 	hdcdma_read = read_;
 	hdcdma_size = size;
-	if (no_dma())
+	if(!no_dma())
 	{
 		do
 		{
 			buffer[data_cnt++] = dack_r();
 		} while (hdcdma_read || hdcdma_size);
 	}
 	else
 	{
 		m_drq_handler(1);
 		if(!hdcdma_size) pc_hdc_result(0);
 	}
 }
@ -454,23 +464,22 @@ void xt_hdc_device::execute_write()
 	int size = sector_cnt[drv] * 512;
 	int write_ = 512;
 	if(sector_cnt[drv] == 0)
 		size = 256 * 512;
 	disk = pc_hdc_file(drv);
 	if (!disk)
 		return;
 	status |= STA_READY;  // ready to recieve data
 	status |= STA_INPUT;
 	status &= ~STA_COMMAND;
 	hdcdma_dst = hdcdma_data;
 	hdcdma_write = write_;
 	hdcdma_size = size;
-	if (no_dma())
+	if (!no_dma())
 	{
 		do
 		{
 			dack_w(buffer[data_cnt++]);
 		}
 		while (hdcdma_write || hdcdma_size);
 	}
 	else
 	{
 		m_drq_handler(1);
 	}
@ -484,15 +493,11 @@ void xt_hdc_device::execute_writesbuff()
 	hdcdma_write = 512;
 	hdcdma_size = 512;
-	if (no_dma())
+	status |= STA_READY;  // ready to recieve data
-	{
+	status |= STA_INPUT;
-		do
+	status &= ~STA_COMMAND;
-		{
+
-			dack_ws(buffer[data_cnt++]);
+	if (!no_dma())
 		}
 		while (hdcdma_write || hdcdma_size);
 	}
 	else
 	{
 		m_drq_handler(1);
 	}
@ -535,29 +540,29 @@ void xt_hdc_device::command()
 {
 	int set_error_info = 1;
 	int old_error = error;          /* Previous error data is needed for CMD_SENSE */
 	UINT8 cmd;
 	const char *command_name;
 	csb = 0x00;
 	error = 0;
 	buffer_ptr = &buffer[0];
 	cmd = buffer[0];
 	get_drive();
 	data_cnt = 0;
 	if (LOG_HDC_STATUS)
 	{
-		command_name = hdc_command_names[cmd] ? hdc_command_names[cmd] : "Unknown";
+		command_name = hdc_command_names[m_current_cmd] ? hdc_command_names[m_current_cmd] : "Unknown";
 		logerror("%s pc_hdc_command(): Executing command; cmd=0x%02x (%s) drv=%d\n",
-			machine().describe_context(), cmd, command_name, drv);
+			machine().describe_context(), m_current_cmd, command_name, drv);
 	}
-	switch (cmd)
+	switch (m_current_cmd)
 	{
 		case CMD_TESTREADY:
 			set_error_info = 0;
 			test_ready();
 			if(no_dma()) pc_hdc_result(set_error_info);
 			break;
 		case CMD_SENSE:
 			/* Perform error code translation. This may need to be expanded in the future. */
@ -566,9 +571,11 @@ void xt_hdc_device::command()
 			buffer[data_cnt++] = ((cylinder[drv] >> 2) & 0xc0) | sector[drv];
 			buffer[data_cnt++] = cylinder[drv] & 0xff;
 			set_error_info = 0;
 			if(no_dma()) pc_hdc_result(set_error_info);
 			break;
 		case CMD_RECALIBRATE:
 			get_chsn();
 			if(no_dma()) pc_hdc_result(set_error_info);
 			break;
 		case CMD_FORMATDRV:
@ -579,6 +586,7 @@ void xt_hdc_device::command()
 		case CMD_DRIVEDIAG:
 			get_chsn();
 			test_ready();
 			if(no_dma()) pc_hdc_result(set_error_info);
 			break;
 		case CMD_READ:
@ -593,6 +601,8 @@ void xt_hdc_device::command()
 			if (test_ready())
 				execute_read();
 			else
 				pc_hdc_result(1);
 			set_error_info = 0;
 			break;
@ -626,22 +636,22 @@ void xt_hdc_device::command()
 			rwc[drv] = ((buffer[9]&3)<<8) | buffer[10];
 			wp[drv] = ((buffer[11]&3)<<8) | buffer[12];
 			ecc[drv] = buffer[13];
 			if(no_dma()) pc_hdc_result(set_error_info);
 			break;
 		case CMD_GETECC:
 			buffer[data_cnt++] = ecc[drv];
 			if(no_dma()) pc_hdc_result(set_error_info);
 			break;
 		case CMD_READSBUFF:
 		case CMD_RAMDIAG:
 		case CMD_INTERNDIAG:
 			if(no_dma()) pc_hdc_result(set_error_info);
 			break;
 	}
 	if(no_dma()) pc_hdc_result(set_error_info);
 }
 void xt_hdc_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
 {
 	command();
@ -670,12 +680,34 @@ void xt_hdc_device::device_timer(emu_timer &timer, device_timer_id id, int param
 */
 void xt_hdc_device::data_w(int data)
 {
-	if( data_cnt == 0 )
+	if(!(status & STA_COMMAND) && m_current_cmd != CMD_SETPARAM)
 	{
 		if (LOG_HDC_DATA)
-			logerror("hdc_data_w $%02x: ", data);
+			logerror("hdc_data_w PIO $%02x (%i) (%s): \n", data,data_cnt,hdc_command_names[m_current_cmd] ? hdc_command_names[m_current_cmd] : "Unknown");
 		// PIO data transfer
 		buffer[data_cnt++] = data;
 		if(data_cnt >= hdcdma_size)
 		{
 			data_cnt = 0;
 			// write to disk
 			do
 			{
 				if(m_current_cmd == CMD_WRITESBUFF)
 					dack_ws(buffer[data_cnt++]);
 				else
 					dack_w(buffer[data_cnt++]);
 			}
 			while (hdcdma_size);
 			data_cnt = 0;
 			pc_hdc_result(1);
 		}
 		return;
 	}
 	if( data_cnt == 0 )
 	{
 		buffer_ptr = &buffer[0];
 		m_current_cmd = data;
 		data_cnt = 6;   /* expect 6 bytes including this one */
 		status &= ~STA_READY;
 		status &= ~STA_INPUT;
@ -719,14 +751,16 @@ void xt_hdc_device::data_w(int data)
 	if (data_cnt)
 	{
 		if (LOG_HDC_DATA)
-			logerror("hdc_data_w $%02x\n", data);
+			logerror("hdc_data_w $%02x (%i) (%s): \n", data,data_cnt,hdc_command_names[m_current_cmd] ? hdc_command_names[m_current_cmd] : "Unknown");
 		*buffer_ptr++ = data;
 		// XXX ec1841 wants this
-		if (buffer[0] == CMD_SETPARAM && data_cnt == 9 && (m_type == EC1841)) {
+		if (m_current_cmd == CMD_SETPARAM && data_cnt == 9 && (m_type == EC1841)) {
 			status &= ~STA_READY;
 		} else {
 			status |= STA_READY;
 			if(m_current_cmd == CMD_SETPARAM && data_cnt == 9)  // some controllers want geometry info as data, not as a command (true for the Seagate ST11M?)
 				status &= ~STA_COMMAND;
 		}
 		if (--data_cnt == 0)
 		{
@ -784,6 +818,29 @@ void xt_hdc_device::control_w(int data)
 UINT8 xt_hdc_device::data_r()
 {
 	UINT8 data = 0xff;
 	if(!(status & STA_COMMAND) && (m_current_cmd == CMD_READ || m_current_cmd == CMD_READLONG || m_current_cmd == CMD_READSBUFF))
 	{
 		// PIO data transfer
 		if(data_cnt == 0)
 		{
 			do
 			{
 				buffer[data_cnt++] = dack_r();
 			} while (hdcdma_read);
 			data_cnt = 0;
 		}
 		data = buffer[data_cnt++];
 		if(data_cnt >= ((sector_cnt[drv] * 512) ? (sector_cnt[drv] * 512) : (256 * 512)))
 		{
 			data_cnt = 0;
 			pc_hdc_result(1);
 		}
 		if (LOG_HDC_DATA)
 			logerror("hdc_data_r PIO $%02x (%i): \n", data,data_cnt);
 		return data;
 	}
 	if( data_cnt )
 	{
 		data = *buffer_ptr++;
@ -795,6 +852,8 @@ UINT8 xt_hdc_device::data_r()
 			status &= ~STA_SELECT;
 			status |= STA_COMMAND;
 		}
 		if (LOG_HDC_DATA)
 			logerror("hdc_data_r $%02x (%i): \n", data,data_cnt);
 	}
 	return data;
 }
--- a/src/emu/bus/isa/hdc.h
+++ b/src/emu/bus/isa/hdc.h
@ -41,7 +41,7 @@ public:
 	void dack_w(int data);
 	void dack_ws(int data);
-	void command();
+	virtual void command();
 	void data_w(int data);
 	void reset_w(int data);
 	void select_w(int data);
@ -67,11 +67,19 @@ protected:
 	void get_chsn();
 	int test_ready();
 	dynamic_buffer buffer;                  /* data buffer */
 	UINT8 *buffer_ptr;          /* data pointer */
 	int csb;                /* command status byte */
 	int status;         /* drive status */
 	int error;          /* error code */
 	enum {
 		STANDARD,
-		EC1841
+		EC1841,
 		ST11M
 	};
 	int m_type;
 	UINT8 m_current_cmd;
 	devcb_write_line m_irq_handler;
 	devcb_write_line m_drq_handler;
@ -90,14 +98,9 @@ private:
 	int sector_cnt[2];      /* sector count */
 	int control[2];         /* control */
 	int csb;                /* command status byte */
 	int status;         /* drive status */
 	int error;          /* error code */
 	emu_timer *timer;
 	int data_cnt;                /* data count */
 	dynamic_buffer buffer;                  /* data buffer */
 	UINT8 *buffer_ptr;          /* data pointer */
 	UINT8 hdc_control;
 	UINT8 hdcdma_data[512];
@ -117,8 +120,19 @@ protected:
 	devcb_write_line m_drq_handler;
 };
 class st11m_device : public xt_hdc_device
 {
 public:
 	st11m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 protected:
 	devcb_write_line m_irq_handler;
 	devcb_write_line m_drq_handler;
 };
 extern const device_type XT_HDC;
 extern const device_type EC1841_HDC;
 extern const device_type ST11M_HDC;
 // ======================> isa8_hdc_device
--- a/src/emu/bus/isa/mc1502_fdc.c
+++ b/src/emu/bus/isa/mc1502_fdc.c
@ -39,7 +39,7 @@ static SLOT_INTERFACE_START( mc1502_floppies )
 SLOT_INTERFACE_END
 static MACHINE_CONFIG_FRAGMENT( mc1502_fdc )
-	MCFG_FD1793x_ADD("fdc", XTAL_16MHz / 16)
+	MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16)
 	MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(mc1502_fdc_device, mc1502_fdc_irq_drq))
 	MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(mc1502_fdc_device, mc1502_fdc_irq_drq))
 	MCFG_FLOPPY_DRIVE_ADD("fdc:0", mc1502_floppies, "525qd", mc1502_fdc_device::floppy_formats)
--- a/src/emu/bus/isa/p1_fdc.c
+++ b/src/emu/bus/isa/p1_fdc.c
@ -39,7 +39,7 @@ static SLOT_INTERFACE_START( poisk1_floppies )
 SLOT_INTERFACE_END
 static MACHINE_CONFIG_FRAGMENT( fdc_b504 )
-	MCFG_FD1793x_ADD("fdc", XTAL_16MHz / 16)
+	MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16)
 	MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(p1_fdc_device, p1_fdc_irq_drq))
 	MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(p1_fdc_device, p1_fdc_irq_drq))
 	MCFG_FLOPPY_DRIVE_ADD("fdc:0", poisk1_floppies, "525qd", p1_fdc_device::floppy_formats)
--- a/src/emu/bus/isbx/isbx.h
+++ b/src/emu/bus/isbx/isbx.h
@ -83,7 +83,9 @@ public:
 	virtual void mcs1_w(address_space &space, offs_t offset, UINT8 data) { }
 	virtual UINT8 mdack_r(address_space &space, offs_t offset) { return 0xff; }
 	virtual void mdack_w(address_space &space, offs_t offset, UINT8 data) { }
 	virtual int opt0_r() { return 1; }
 	virtual void opt0_w(int state) { }
 	virtual int opt1_r() { return 1; }
 	virtual void opt1_w(int state) { }
 	virtual void tdma_w(int state) { }
 	virtual void mclk_w(int state) { }
@ -115,7 +117,9 @@ public:
 	DECLARE_READ8_MEMBER( mdack_r ) { return m_card ? m_card->mdack_r(space, offset) : 0xff; }
 	DECLARE_WRITE8_MEMBER( mdack_w ) { if (m_card) m_card->mdack_w(space, offset, data); }
 	DECLARE_READ_LINE_MEMBER( mpst_r ) { return m_card == NULL; }
 	DECLARE_READ_LINE_MEMBER( opt0_r ) { return m_card ? m_card->opt0_r() : 1; }
 	DECLARE_WRITE_LINE_MEMBER( opt0_w ) { if (m_card) m_card->opt0_w(state); }
 	DECLARE_READ_LINE_MEMBER( opt1_r ) { return m_card ? m_card->opt1_r() : 1; }
 	DECLARE_WRITE_LINE_MEMBER( opt1_w ) { if (m_card) m_card->opt1_w(state); }
 	DECLARE_WRITE_LINE_MEMBER( tdma_w ) { if (m_card) m_card->tdma_w(state); }
 	DECLARE_WRITE_LINE_MEMBER( mclk_w ) { if (m_card) m_card->mclk_w(state); }
--- a/src/emu/bus/megadrive/md_slot.c
+++ b/src/emu/bus/megadrive/md_slot.c
@ -995,7 +995,7 @@ void base_md_cart_slot_device::file_logging(UINT8 *ROM8, UINT32 rom_len, UINT32
 	logerror("FILE DETAILS\n");
 	logerror("============\n");
 	logerror("Name: %s\n", basename());
-	logerror("File Size: 0x%" I64FMT "x\n", (software_entry() == NULL) ? length() : get_software_region_length("rom"));
+	logerror("File Size: 0x%08x\n", (software_entry() == NULL) ? (int)length() : (int)get_software_region_length("rom"));
 	logerror("Detected type: %s\n", md_get_slot(m_type));
 	logerror("ROM (Allocated) Size: 0x%X\n", rom_len);
 	logerror("NVRAM: %s\n", nvram_len ? "Yes" : "No");
--- a/src/emu/bus/msx_cart/disk.c
+++ b/src/emu/bus/msx_cart/disk.c
@ -198,7 +198,7 @@ static MACHINE_CONFIG_FRAGMENT( vy0010 )
 	// HLT pulled high
 	// SSO/-ENMF + -DDEN + ENP + -5/8 - pulled low
 	// READY inverted in VY-0010 cartridge and pulled low on VY-0010/VY-0011 floppy drive
-	MCFG_WD2793x_ADD("fdc", XTAL_4MHz / 4)
+	MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4)
 	MCFG_WD_FDC_FORCE_READY
 	// Single sided 3.5" floppy drive
@ -220,7 +220,7 @@ machine_config_constructor msx_cart_vy0010::device_mconfig_additions() const
 static MACHINE_CONFIG_FRAGMENT( fsfd1 )
-	MCFG_WD2793x_ADD("fdc", XTAL_4MHz / 4)
+	MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4)
 	// Double sided 3.5" floppy drive
 	MCFG_FLOPPY_DRIVE_ADD("fdc:0", msx_floppies, "35dd", msx_cart_disk::floppy_formats)
@ -262,7 +262,7 @@ machine_config_constructor msx_cart_fsfd1a::device_mconfig_additions() const
 static MACHINE_CONFIG_FRAGMENT( fscf351 )
-	MCFG_MB8877x_ADD("fdc", XTAL_4MHz / 4)
+	MCFG_MB8877_ADD("fdc", XTAL_4MHz / 4)
 	MCFG_WD_FDC_FORCE_READY
 	// Double sided 3.5" floppy drive
--- a/src/emu/bus/nasbus/floppy.c
+++ b/src/emu/bus/nasbus/floppy.c
@ -39,7 +39,7 @@ SLOT_INTERFACE_END
 //-------------------------------------------------
 static MACHINE_CONFIG_FRAGMENT( nascom_fdc )
-	MCFG_FD1793x_ADD("fd1793", XTAL_16MHz / 4 / 4)
+	MCFG_FD1793_ADD("fd1793", XTAL_16MHz / 4 / 4)
 	MCFG_FLOPPY_DRIVE_ADD("fd1793:0", nascom_floppies, "55f", nascom_fdc_device::floppy_formats)
 	MCFG_FLOPPY_DRIVE_ADD("fd1793:1", nascom_floppies, "55f", nascom_fdc_device::floppy_formats)
--- a/src/emu/bus/oricext/jasmin.c
+++ b/src/emu/bus/oricext/jasmin.c
@ -19,7 +19,7 @@ static SLOT_INTERFACE_START( jasmin_floppies )
 SLOT_INTERFACE_END
 static MACHINE_CONFIG_FRAGMENT( jasmin )
-	MCFG_WD1770x_ADD("fdc", XTAL_8MHz)
+	MCFG_WD1770_ADD("fdc", XTAL_8MHz)
 	MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(oricext_device, irq_w))
 	MCFG_FLOPPY_DRIVE_ADD("fdc:0", jasmin_floppies, "3dsdd", jasmin_device::floppy_formats)
--- a/src/emu/bus/oricext/microdisc.c
+++ b/src/emu/bus/oricext/microdisc.c
@ -19,7 +19,7 @@ static SLOT_INTERFACE_START( microdisc_floppies )
 SLOT_INTERFACE_END
 static MACHINE_CONFIG_FRAGMENT( microdisc )
-	MCFG_FD1793x_ADD("fdc", XTAL_8MHz/8)
+	MCFG_FD1793_ADD("fdc", XTAL_8MHz/8)
 	MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(microdisc_device, fdc_irq_w))
 	MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(microdisc_device, fdc_drq_w))
 	MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(microdisc_device, fdc_hld_w))
--- a/src/emu/bus/ql/sandy_superdisk.c
+++ b/src/emu/bus/ql/sandy_superdisk.c
@ -81,7 +81,7 @@ WRITE_LINE_MEMBER( sandy_super_disk_t::busy_w )
 //-------------------------------------------------
 static MACHINE_CONFIG_FRAGMENT( sandy_super_disk )
-	MCFG_DEVICE_ADD(WD1772_TAG, WD1772x, 8000000)
+	MCFG_DEVICE_ADD(WD1772_TAG, WD1772, 8000000)
 	MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", sandy_super_disk_floppies, "35dd", sandy_super_disk_t::floppy_formats)
 	MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", sandy_super_disk_floppies, NULL, sandy_super_disk_t::floppy_formats)
--- a/src/emu/bus/ql/sandy_superqboard.c
+++ b/src/emu/bus/ql/sandy_superqboard.c
@ -102,7 +102,7 @@ WRITE_LINE_MEMBER( sandy_superqboard_t::busy_w )
 //-------------------------------------------------
 static MACHINE_CONFIG_FRAGMENT( sandy_superqboard )
-	MCFG_DEVICE_ADD(WD1772_TAG, WD1772x, XTAL_16MHz/2)
+	MCFG_DEVICE_ADD(WD1772_TAG, WD1772, XTAL_16MHz/2)
 	MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", sandy_superqboard_floppies, "35hd", sandy_superqboard_t::floppy_formats)
 	MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", sandy_superqboard_floppies, NULL, sandy_superqboard_t::floppy_formats)
--- a/src/emu/bus/ql/trumpcard.c
+++ b/src/emu/bus/ql/trumpcard.c
@ -85,7 +85,7 @@ FLOPPY_FORMATS_END
 //-------------------------------------------------
 static MACHINE_CONFIG_FRAGMENT( ql_trump_card )
-	MCFG_DEVICE_ADD(WD1772_TAG, WD1772x, 8000000)
+	MCFG_DEVICE_ADD(WD1772_TAG, WD1772, 8000000)
 	MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", ql_trump_card_floppies, "35dd", ql_trump_card_t::floppy_formats)
 	MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", ql_trump_card_floppies, NULL, ql_trump_card_t::floppy_formats)
 MACHINE_CONFIG_END
--- a/src/emu/bus/s100/dj2db.c
+++ b/src/emu/bus/s100/dj2db.c
@ -104,7 +104,7 @@ static MACHINE_CONFIG_FRAGMENT( s100_dj2db )
 	MCFG_DEVICE_ADD(BR1941_TAG, COM8116, XTAL_5_0688MHz)
 	MCFG_COM8116_FR_HANDLER(WRITELINE(s100_dj2db_device, fr_w))
-	MCFG_MB8866x_ADD(MB8866_TAG, XTAL_10MHz/5)
+	MCFG_MB8866_ADD(MB8866_TAG, XTAL_10MHz/5)
 	MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(s100_dj2db_device, fdc_intrq_w))
 	MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(s100_dj2db_device, fdc_drq_w))
--- a/src/emu/bus/sega8/sega8_slot.c
+++ b/src/emu/bus/sega8/sega8_slot.c
@ -731,7 +731,7 @@ void sega8_cart_slot_device::internal_header_logging(UINT8 *ROM, UINT32 len, UIN
 	logerror("FILE DETAILS\n" );
 	logerror("============\n" );
 	logerror("Name: %s\n", basename());
-	logerror("File Size: 0x%" I64FMT "x\n", (software_entry() == NULL) ? length() : get_software_region_length("rom"));
+	logerror("File Size: 0x%08x\n", (software_entry() == NULL) ? (int)length() : (int)get_software_region_length("rom"));
 	logerror("Detected type: %s\n", sega8_get_slot(m_type));
 	logerror("ROM (Allocated) Size: 0x%X\n", len);
 	logerror("RAM: %s\n", nvram_len ? "Yes" : "No");
--- a/src/emu/bus/ti99_peb/bwg.c
+++ b/src/emu/bus/ti99_peb/bwg.c
@ -661,7 +661,7 @@ static SLOT_INTERFACE_START( bwg_floppies )
 SLOT_INTERFACE_END
 MACHINE_CONFIG_FRAGMENT( bwg_fdc )
-	MCFG_WD1773x_ADD(FDC_TAG, XTAL_8MHz)
+	MCFG_WD1773_ADD(FDC_TAG, XTAL_8MHz)
 	MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(snug_bwg_device, fdc_irq_w))
 	MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(snug_bwg_device, fdc_drq_w))
--- a/src/emu/bus/ti99_peb/ti_fdc.c
+++ b/src/emu/bus/ti99_peb/ti_fdc.c
@ -403,7 +403,7 @@ static SLOT_INTERFACE_START( tifdc_floppies )
 SLOT_INTERFACE_END
 MACHINE_CONFIG_FRAGMENT( ti_fdc )
-	MCFG_FD1771x_ADD(FDC_TAG, XTAL_1MHz)
+	MCFG_FD1771_ADD(FDC_TAG, XTAL_1MHz)
 	MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(ti_fdc_device, fdc_irq_w))
 	MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(ti_fdc_device, fdc_drq_w))
 	MCFG_FLOPPY_DRIVE_ADD("0", tifdc_floppies, "525dd", ti_fdc_device::floppy_formats)
--- a/src/emu/bus/tvc/hbf.c
+++ b/src/emu/bus/tvc/hbf.c
@ -23,7 +23,7 @@ static SLOT_INTERFACE_START( tvc_hbf_floppies )
 SLOT_INTERFACE_END
 static MACHINE_CONFIG_FRAGMENT(tvc_hbf)
-	MCFG_FD1793x_ADD("fdc", XTAL_16MHz / 16)
+	MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16)
 	MCFG_FLOPPY_DRIVE_ADD("fdc:0", tvc_hbf_floppies, "525qd", tvc_hbf_device::floppy_formats)
 	MCFG_FLOPPY_DRIVE_ADD("fdc:1", tvc_hbf_floppies, "525qd", tvc_hbf_device::floppy_formats)
 MACHINE_CONFIG_END
--- a/src/emu/cheat.c
+++ b/src/emu/cheat.c
@ -1135,7 +1135,7 @@ void cheat_manager::reload()
 	m_disabled = false;
 	// load the cheat file, if it's a system that has a software list then try softlist_name/shortname.xml first,
-	// if it fails to load then try to load via crc32 - basename/crc32.xml ( eg. 01234567.xml ) 
+	// if it fails to load then try to load via crc32 - basename/crc32.xml ( eg. 01234567.xml )
 	image_interface_iterator iter(machine().root_device());
 	for (device_image_interface *image = iter.first(); image != NULL; image = iter.next())
 		if (image->exists())
@ -1150,7 +1150,7 @@ void cheat_manager::reload()
 				load_cheats(filename.c_str());
 				break;
 			}
-			// else we are loading outside the software list, try to load machine_basename/crc32.xml			
+			// else we are loading outside the software list, try to load machine_basename/crc32.xml
 			else
 			{
 				UINT32 crc = image->crc();
--- a/src/emu/cpu/8x300/8x300.c
+++ b/src/emu/cpu/8x300/8x300.c
@ -12,7 +12,7 @@
 #include "debugger.h"
 #include "8x300.h"
-#define FETCHOP(a)         (m_direct->read_decrypted_word(a))
+#define FETCHOP(a)         (m_direct->read_word(a))
 #define CYCLES(x)          do { m_icount -= (x); } while (0)
 #define READPORT(a)        (m_io->read_byte(a))
 #define WRITEPORT(a,v)     (m_io->write_byte((a), (v)))
--- a/src/emu/cpu/adsp2100/adsp2100.c
+++ b/src/emu/cpu/adsp2100/adsp2100.c
@ -811,7 +811,7 @@ inline void adsp21xx_device::program_write(UINT32 addr, UINT32 data)
 inline UINT32 adsp21xx_device::opcode_read()
 {
-	return m_direct->read_decrypted_dword(m_pc << 2);
+	return m_direct->read_dword(m_pc << 2);
 }
--- a/src/emu/cpu/alph8201/alph8201.h
+++ b/src/emu/cpu/alph8201/alph8201.h
@ -72,8 +72,8 @@ protected:
 	UINT8 M_RDMEM(UINT16 A) { return m_program->read_byte(A); }
 	void M_WRMEM(UINT16 A,UINT8 V) { m_program->write_byte(A, V); }
-	UINT8 M_RDOP(UINT16 A) { return m_direct->read_decrypted_byte(A); }
+	UINT8 M_RDOP(UINT16 A) { return m_direct->read_byte(A); }
-	UINT8 M_RDOP_ARG(UINT16 A) { return m_direct->read_raw_byte(A); }
+	UINT8 M_RDOP_ARG(UINT16 A) { return m_direct->read_byte(A); }
 	UINT8 RD_REG(UINT8 x) { return m_RAM[(m_regPtr<<3)+(x)]; }
 	void WR_REG(UINT8 x, UINT8 d) { m_RAM[(m_regPtr<<3)+(x)]=(d); }
--- a/src/emu/cpu/am29000/am29000.c
+++ b/src/emu/cpu/am29000/am29000.c
@ -479,7 +479,7 @@ UINT32 am29000_cpu_device::read_program_word(UINT32 address)
 {
 	/* TODO: ROM enable? */
 	if (m_cps & CPS_PI || m_cps & CPS_RE)
-		return m_direct->read_decrypted_dword(address);
+		return m_direct->read_dword(address);
 	else
 	{
 		fatalerror("Am29000 instruction MMU translation enabled!\n");
@ -626,7 +626,7 @@ void am29000_cpu_device::execute_run()
 			if (m_cfg & CFG_VF)
 			{
 				UINT32 vaddr = m_vab | m_exception_queue[0] * 4;
-				UINT32 vect = m_datadirect->read_decrypted_dword(vaddr);
+				UINT32 vect = m_datadirect->read_dword(vaddr);
 				m_pc = vect & ~3;
 				m_next_pc = m_pc;
--- a/src/emu/cpu/arm/arm.c
+++ b/src/emu/cpu/arm/arm.c
@ -345,7 +345,7 @@ void arm_cpu_device::execute_run()
 		/* load instruction */
 		pc = R15;
-		insn = m_direct->read_decrypted_dword( pc & ADDRESS_MASK );
+		insn = m_direct->read_dword( pc & ADDRESS_MASK );
 		switch (insn >> INSN_COND_SHIFT)
 		{
--- a/src/emu/cpu/arm7/arm7.c
+++ b/src/emu/cpu/arm7/arm7.c
@ -641,7 +641,7 @@ void arm7_cpu_device::execute_run()
 				}
 			}
-			insn = m_direct->read_decrypted_word(raddr);
+			insn = m_direct->read_word(raddr);
 			(this->*thumb_handler[(insn & 0xffc0) >> 6])(pc, insn);
 		}
@ -672,7 +672,7 @@ void arm7_cpu_device::execute_run()
 			}
 #endif
-			insn = m_direct->read_decrypted_dword(raddr);
+			insn = m_direct->read_dword(raddr);
 			/* process condition codes for this instruction */
 			switch (insn >> INSN_COND_SHIFT)
--- a/src/emu/cpu/arm7/arm7drc.inc
+++ b/src/emu/cpu/arm7/arm7drc.inc
@ -1203,12 +1203,12 @@ void arm7_cpu_device::generate_checksum_block(drcuml_block *block, compiler_stat
 		if (!(seqhead->flags & OPFLAG_VIRTUAL_NOOP))
 		{
 			UINT32 sum = seqhead->opptr.l[0];
-			void *base = m_direct->read_decrypted_ptr(seqhead->physpc);
+			void *base = m_direct->read_ptr(seqhead->physpc);
 			UML_LOAD(block, uml::I0, base, 0, uml::SIZE_DWORD, uml::SCALE_x4);             // load    i0,base,0,dword
 			if (seqhead->delay.first() != NULL && seqhead->physpc != seqhead->delay.first()->physpc)
 			{
-				base = m_direct->read_decrypted_ptr(seqhead->delay.first()->physpc);
+				base = m_direct->read_ptr(seqhead->delay.first()->physpc);
 				UML_LOAD(block, uml::I1, base, 0, uml::SIZE_DWORD, uml::SCALE_x4);         // load    i1,base,dword
 				UML_ADD(block, uml::I0, uml::I0, uml::I1);                                 // add     i0,i0,i1
@ -1224,20 +1224,20 @@ void arm7_cpu_device::generate_checksum_block(drcuml_block *block, compiler_stat
 	else
 	{
 		UINT32 sum = 0;
-		void *base = m_direct->read_decrypted_ptr(seqhead->physpc);
+		void *base = m_direct->read_ptr(seqhead->physpc);
 		UML_LOAD(block, uml::I0, base, 0, uml::SIZE_DWORD, uml::SCALE_x4);                 // load    i0,base,0,dword
 		sum += seqhead->opptr.l[0];
 		for (curdesc = seqhead->next(); curdesc != seqlast->next(); curdesc = curdesc->next())
 			if (!(curdesc->flags & OPFLAG_VIRTUAL_NOOP))
 			{
-				base = m_direct->read_decrypted_ptr(curdesc->physpc);
+				base = m_direct->read_ptr(curdesc->physpc);
 				UML_LOAD(block, uml::I1, base, 0, uml::SIZE_DWORD, uml::SCALE_x4);         // load    i1,base,dword
 				UML_ADD(block, uml::I0, uml::I0, uml::I1);                                 // add     i0,i0,i1
 				sum += curdesc->opptr.l[0];
 				if (curdesc->delay.first() != NULL && (curdesc == seqlast || (curdesc->next() != NULL && curdesc->next()->physpc != curdesc->delay.first()->physpc)))
 				{
-					base = m_direct->read_decrypted_ptr(curdesc->delay.first()->physpc);
+					base = m_direct->read_ptr(curdesc->delay.first()->physpc);
 					UML_LOAD(block, uml::I1, base, 0, uml::SIZE_DWORD, uml::SCALE_x4);     // load    i1,base,dword
 					UML_ADD(block, uml::I0, uml::I0, uml::I1);                             // add     i0,i0,i1
 					sum += curdesc->delay.first()->opptr.l[0];
--- a/src/emu/cpu/asap/asap.c
+++ b/src/emu/cpu/asap/asap.c
@ -343,7 +343,7 @@ offs_t asap_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *opr
 inline UINT32 asap_device::readop(offs_t pc)
 {
-	return m_direct->read_decrypted_dword(pc);
+	return m_direct->read_dword(pc);
 }
--- a/src/emu/cpu/avr8/avr8.c
+++ b/src/emu/cpu/avr8/avr8.c
@ -869,6 +869,7 @@ void avr8_device::device_reset()
 		m_timer_prescale_count[t] = 0;
 	}
 	m_ocr2_not_reached_yet = true;
 	m_interrupt_pending = false;
 	m_elapsed_cycles = 0;
 }
@ -1553,22 +1554,26 @@ void avr8_device::timer2_tick()
 		switch(wgm2)
 		{
 			case WGM02_FAST_PWM:
-				if(count == ocr2[reg])
+				if (reg==0)
 				{
-					if (reg == 0)
+					if (count >= m_r[AVR8_REGIDX_OCR2A])
 					{
-						m_r[AVR8_REGIDX_TIFR2] |= AVR8_TIFR2_TOV2_MASK;
+						if (count >= 0xFF)
-						count = 0;
+						{
-						increment = 0;
+							//Turn on
-					}
+							m_io->write_byte(AVR8_IO_PORTD, m_io->read_byte(AVR8_IO_PORTD) | (1 << 7));
-
+							m_r[AVR8_REGIDX_TCNT2] = 0;
-					m_r[AVR8_REGIDX_TIFR2] |= ocf2[reg];
+							m_ocr2_not_reached_yet = true;
-				}
+						}
-				else if(count == 0)
+						else
-				{
+						{
-					if (reg == 0)
+							if (m_ocr2_not_reached_yet)
-					{
+							{
-						m_r[AVR8_REGIDX_TIFR2] &= ~AVR8_TIFR2_TOV2_MASK;
+								//Turn off
 								m_io->write_byte(AVR8_IO_PORTD, m_io->read_byte(AVR8_IO_PORTD) & ~(1 << 7));
 								m_ocr2_not_reached_yet = false;
 							}
 						}
 					}
 				}
 				break;
@ -1585,7 +1590,7 @@ void avr8_device::timer2_tick()
 					m_r[AVR8_REGIDX_TIFR2] |= ocf2[reg];
 				}
-				else if(count == 0)
+				else if (count == 0)
 				{
 					if (reg == 0)
 					{
@ -1616,7 +1621,7 @@ void avr8_device::timer2_tick()
 		*/
 	}
-	m_r[AVR8_REGIDX_TCNT2] = count + increment;
+	m_r[AVR8_REGIDX_TCNT2] += increment;
 	update_interrupt(AVR8_INTIDX_OCF2A);
 	update_interrupt(AVR8_INTIDX_OCF2B);
--- a/src/emu/cpu/avr8/avr8.h
+++ b/src/emu/cpu/avr8/avr8.h
@ -162,6 +162,7 @@ protected:
 	UINT8 m_timer_increment[6];
 	UINT16 m_timer_prescale[6];
 	UINT16 m_timer_prescale_count[6];
 	bool m_ocr2_not_reached_yet;
 	// SPI
 	bool m_spi_active;
--- a/src/emu/cpu/ccpu/ccpu.c
+++ b/src/emu/cpu/ccpu/ccpu.c
@ -22,7 +22,7 @@ const device_type CCPU = &device_creator<ccpu_cpu_device>;
    MACROS
 ***************************************************************************/
-#define READOP(a)         (m_direct->read_decrypted_byte(a))
+#define READOP(a)         (m_direct->read_byte(a))
 #define RDMEM(a)          (m_data->read_word((a) * 2) & 0xfff)
 #define WRMEM(a,v)        (m_data->write_word((a) * 2, (v)))
--- a/src/emu/cpu/cop400/cop400.c
+++ b/src/emu/cpu/cop400/cop400.c
@ -97,7 +97,7 @@ const device_type COP445 = &device_creator<cop445_cpu_device>;
    MACROS
 ***************************************************************************/
-#define ROM(a)          m_direct->read_decrypted_byte(a)
+#define ROM(a)          m_direct->read_byte(a)
 #define RAM_R(a)        m_data->read_byte(a)
 #define RAM_W(a, v)     m_data->write_byte(a, v)
--- a/src/emu/cpu/cosmac/cosmac.c
+++ b/src/emu/cpu/cosmac/cosmac.c
@ -533,7 +533,7 @@ offs_t cdp1802_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *
 inline UINT8 cosmac_device::read_opcode(offs_t pc)
 {
-	return m_direct->read_decrypted_byte(pc);
+	return m_direct->read_byte(pc);
 }
--- a/src/emu/cpu/cp1610/cp1610.c
+++ b/src/emu/cpu/cp1610/cp1610.c
--- a/src/emu/cpu/cp1610/cp1610.h
+++ b/src/emu/cpu/cp1610/cp1610.h
@ -205,7 +205,6 @@ private:
 	void cp1610_jd(UINT16 addr);
 	void cp1610_do_sdbd();
 	void cp1610_do_jumps();
 };
--- a/src/emu/cpu/cubeqcpu/cubeqcpu.c
+++ b/src/emu/cpu/cubeqcpu/cubeqcpu.c
@ -520,7 +520,7 @@ void cquestsnd_cpu_device::execute_run()
 	do
 	{
 		/* Decode the instruction */
-		UINT64 inst = m_direct->read_decrypted_qword(SND_PC << 3);
+		UINT64 inst = m_direct->read_qword(SND_PC << 3);
 		UINT32 inslow = inst & 0xffffffff;
 		UINT32 inshig = inst >> 32;
@ -776,7 +776,7 @@ void cquestrot_cpu_device::execute_run()
 	do
 	{
 		/* Decode the instruction */
-		UINT64 inst = m_direct->read_decrypted_qword(ROT_PC << 3);
+		UINT64 inst = m_direct->read_qword(ROT_PC << 3);
 		UINT32 inslow = inst & 0xffffffff;
 		UINT32 inshig = inst >> 32;
@ -1196,7 +1196,7 @@ void cquestlin_cpu_device::execute_run()
 		int prog = (m_clkcnt & 3) ? BACKGROUND : FOREGROUND;
 		m_curpc = LINE_PC;
-		UINT64 inst = m_direct->read_decrypted_qword(LINE_PC << 3);
+		UINT64 inst = m_direct->read_qword(LINE_PC << 3);
 		UINT32 inslow = inst & 0xffffffff;
 		UINT32 inshig = inst >> 32;
--- a/src/emu/cpu/dsp16/dsp16.c
+++ b/src/emu/cpu/dsp16/dsp16.c
@ -373,7 +373,7 @@ inline void dsp16_device::data_write(const UINT16& addr, const UINT16& data)
 inline UINT32 dsp16_device::opcode_read(const UINT8 pcOffset)
 {
 	const UINT16 readPC = m_pc + pcOffset;
-	return m_direct->read_decrypted_dword(readPC << 1);
+	return m_direct->read_dword(readPC << 1);
 }
--- a/src/emu/cpu/dsp32/dsp32.c
+++ b/src/emu/cpu/dsp32/dsp32.c
@ -437,7 +437,7 @@ offs_t dsp32c_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *o
 inline UINT32 dsp32c_device::ROPCODE(offs_t pc)
 {
-	return m_direct->read_decrypted_dword(pc);
+	return m_direct->read_dword(pc);
 }
 inline UINT8 dsp32c_device::RBYTE(offs_t addr)
--- a/src/emu/cpu/dsp56k/dsp56k.c
+++ b/src/emu/cpu/dsp56k/dsp56k.c
@ -108,7 +108,7 @@ const device_type DSP56156 = &device_creator<dsp56k_device>;
 *  Internal Memory Maps
 ****************************************************************************/
 static ADDRESS_MAP_START( dsp56156_program_map, AS_PROGRAM, 16, dsp56k_device )
-	AM_RANGE(0x0000,0x07ff) AM_READWRITE(program_r, program_w)   /* 1-5 */
+	AM_RANGE(0x0000,0x07ff) AM_RAM AM_SHARE("dsk56k_program_ram")   /* 1-5 */
 //  AM_RANGE(0x2f00,0x2fff) AM_ROM                              /* 1-5 PROM reserved memory.  Is this the right spot for it? */
 ADDRESS_MAP_END
@ -122,29 +122,14 @@ dsp56k_device::dsp56k_device(const machine_config &mconfig, const char *tag, dev
 	: cpu_device(mconfig, DSP56156, "DSP56156", tag, owner, clock, "dsp56156", __FILE__)
 	, m_program_config("program", ENDIANNESS_LITTLE, 16, 16, -1, ADDRESS_MAP_NAME(dsp56156_program_map))
 	, m_data_config("data", ENDIANNESS_LITTLE, 16, 16, -1, ADDRESS_MAP_NAME(dsp56156_x_data_map))
 	, m_program_ram(*this, "dsk56k_program_ram")
 {
 }
 /***************************************************************************
    Direct Update Handler
 ***************************************************************************/
 DIRECT_UPDATE_MEMBER( dsp56k_device::dsp56k_direct_handler )
 {
 	if (address <= (0x07ff<<1))
 	{
 		direct.explicit_configure(0x0000<<1, 0x07ff<<1, (0x07ff<<1) | 1, m_dsp56k_core.program_ram);
 		return ~0;
 	}
 	return address;
 }
 /***************************************************************************
    MEMORY ACCESSORS
 ***************************************************************************/
-#define ROPCODE(pc)   cpustate->direct->read_decrypted_word(pc)
+#define ROPCODE(pc)   cpustate->direct->read_word(pc)
 /***************************************************************************
@ -255,6 +240,7 @@ void dsp56k_device::device_start()
 	memset(&m_dsp56k_core, 0, sizeof(m_dsp56k_core));
 	m_dsp56k_core.device = this;
 	m_dsp56k_core.program_ram = m_program_ram;
 	/* Call specific module inits */
 	pcu_init(&m_dsp56k_core, this);
@ -292,16 +278,11 @@ void dsp56k_device::device_start()
 	save_item(NAME(m_dsp56k_core.HI.bootstrap_offset));
 	save_item(NAME(m_dsp56k_core.peripheral_ram));
 	save_item(NAME(m_dsp56k_core.program_ram));
 	m_dsp56k_core.program = &space(AS_PROGRAM);
 	m_dsp56k_core.direct = &m_dsp56k_core.program->direct();
 	m_dsp56k_core.data = &space(AS_DATA);
 	/* Setup the direct memory handler for this CPU */
 	/* NOTE: Be sure to grab this guy and call him if you ever install another direct_update_hander in a driver! */
 	m_dsp56k_core.program->set_direct_update_handler(direct_update_delegate(FUNC(dsp56k_device::dsp56k_direct_handler), this));
 	state_add(DSP56K_PC,     "PC", m_dsp56k_core.PCU.pc).formatstr("%04X");
 	state_add(DSP56K_SR,     "SR", m_dsp56k_core.PCU.sr).formatstr("%04X");
 	state_add(DSP56K_LC,     "LC", m_dsp56k_core.PCU.lc).formatstr("%04X");
--- a/src/emu/cpu/dsp56k/dsp56k.h
+++ b/src/emu/cpu/dsp56k/dsp56k.h
@ -195,7 +195,7 @@ struct dsp56k_core
 	address_space *data;
 	UINT16 peripheral_ram[0x40];
-	UINT16 program_ram[0x800];
+	UINT16 *program_ram;
 };
@ -204,7 +204,6 @@ class dsp56k_device : public cpu_device
 public:
 	dsp56k_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
 	DECLARE_DIRECT_UPDATE_MEMBER(dsp56k_direct_handler);
 	DECLARE_READ16_MEMBER( program_r );
 	DECLARE_WRITE16_MEMBER( program_w );
 	DECLARE_READ16_MEMBER( peripheral_register_r );
@ -244,6 +243,7 @@ protected:
 private:
 	address_space_config m_program_config;
 	address_space_config m_data_config;
 	required_shared_ptr<UINT16> m_program_ram;
 	dsp56k_core m_dsp56k_core;
--- a/src/emu/cpu/dsp56k/dsp56mem.c
+++ b/src/emu/cpu/dsp56k/dsp56mem.c
@ -488,16 +488,6 @@ void dsp56k_io_reset(dsp56k_core* cpustate)
 } // namespace DSP56K
 READ16_MEMBER( dsp56k_device::program_r )
 {
 	return m_dsp56k_core.program_ram[offset];
 }
 WRITE16_MEMBER( dsp56k_device::program_w )
 {
 	m_dsp56k_core.program_ram[offset] = data;
 }
 /* Work */
 READ16_MEMBER( dsp56k_device::peripheral_register_r )
 {
--- a/src/emu/cpu/e132xs/e132xs.h
+++ b/src/emu/cpu/e132xs/e132xs.h
@ -199,7 +199,7 @@ extern unsigned dasm_hyperstone(char *buffer, unsigned pc, const UINT8 *oprom, u
 #define IO_WRITE_W(addr, data)  m_io->write_dword(((addr) >> 11) & 0x7ffc, data)
-#define READ_OP(addr)          m_direct->read_decrypted_word((addr), m_opcodexor)
+#define READ_OP(addr)          m_direct->read_word((addr), m_opcodexor)
 //**************************************************************************
 //  TYPE DEFINITIONS
--- a/src/emu/cpu/esrip/esrip.c
+++ b/src/emu/cpu/esrip/esrip.c
@ -1901,7 +1901,7 @@ void esrip_device::execute_run()
 		m_pl7 = m_l7;
 		/* Latch instruction */
-		inst = m_direct->read_decrypted_qword(RIP_PC << 3);
+		inst = m_direct->read_qword(RIP_PC << 3);
 		in_h = inst >> 32;
 		in_l = inst & 0xffffffff;
--- a/src/emu/cpu/f8/f8.c
+++ b/src/emu/cpu/f8/f8.c
@ -96,7 +96,7 @@ void f8_cpu_device::ROMC_00(int insttim) /* SKR - added parameter to tell if  */
 	 * of PC0.
 	 */
-	m_dbus = m_direct->read_decrypted_byte(m_pc0);
+	m_dbus = m_direct->read_byte(m_pc0);
 	m_pc0 += 1;
 	m_icount -= insttim;    /* SKR - ROMC00 is usually short, not short+long, */
 							/* but DS is long */
@ -110,7 +110,7 @@ void f8_cpu_device::ROMC_01()
 	 * location addressed by PC0; then all devices add the 8-bit value
 	 * on the data bus as signed binary number to PC0.
 	 */
-	m_dbus = m_direct->read_raw_byte(m_pc0);
+	m_dbus = m_direct->read_byte(m_pc0);
 	m_pc0 += (INT8)m_dbus;
 	m_icount -= cL;
 }
@ -134,7 +134,7 @@ void f8_cpu_device::ROMC_03(int insttim) /* SKR - added parameter to tell if  */
 	 * Similiar to 0x00, except that it is used for immediate operands
 	 * fetches (using PC0) instead of instruction fetches.
 	 */
-	m_dbus = m_io = m_direct->read_raw_byte(m_pc0);
+	m_dbus = m_io = m_direct->read_byte(m_pc0);
 	m_pc0 += 1;
 	m_icount -= insttim;
 }
@ -228,7 +228,7 @@ void f8_cpu_device::ROMC_0C()
 	 * by PC0 into the data bus; then all devices move the value that
 	 * has just been placed on the data bus into the low order byte of PC0.
 	 */
-	m_dbus = m_direct->read_raw_byte(m_pc0);
+	m_dbus = m_direct->read_byte(m_pc0);
 	m_pc0 = (m_pc0 & 0xff00) | m_dbus;
 	m_icount -= cL;
 }
@ -251,7 +251,7 @@ void f8_cpu_device::ROMC_0E()
 	 * The value on the data bus is then moved to the low order byte
 	 * of DC0 by all devices.
 	 */
-	m_dbus = m_direct->read_raw_byte(m_pc0);
+	m_dbus = m_direct->read_byte(m_pc0);
 	m_dc0 = (m_dc0 & 0xff00) | m_dbus;
 	m_icount -= cL;
 }
@ -289,7 +289,7 @@ void f8_cpu_device::ROMC_11()
 	 * data bus. All devices must then move the contents of the
 	 * data bus to the upper byte of DC0.
 	 */
-	m_dbus = m_direct->read_raw_byte(m_pc0);
+	m_dbus = m_direct->read_byte(m_pc0);
 	m_dc0 = (m_dc0 & 0x00ff) | (m_dbus << 8);
 	m_icount -= cL;
 }
--- a/src/emu/cpu/h6280/h6280.c
+++ b/src/emu/cpu/h6280/h6280.c
@ -2388,7 +2388,7 @@ void h6280_device::pull(UINT8 &value)
 ***************************************************************/
 UINT8 h6280_device::read_opcode()
 {
-	return m_direct->read_decrypted_byte(translated(PCW));
+	return m_direct->read_byte(translated(PCW));
 }
 /***************************************************************
@ -2396,7 +2396,7 @@ UINT8 h6280_device::read_opcode()
 ***************************************************************/
 UINT8 h6280_device::read_opcode_arg()
 {
-	return m_direct->read_raw_byte(translated(PCW));
+	return m_direct->read_byte(translated(PCW));
 }
--- a/src/emu/cpu/h8/h8.c
+++ b/src/emu/cpu/h8/h8.c
@ -511,7 +511,7 @@ offs_t h8_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom
 UINT16 h8_device::read16i(UINT32 adr)
 {
 	icount--;
-	return direct->read_decrypted_word(adr & ~1);
+	return direct->read_word(adr & ~1);
 }
 UINT16 h8_device::fetch()
--- a/src/emu/cpu/hmcs40/hmcs40.c
+++ b/src/emu/cpu/hmcs40/hmcs40.c
@ -493,11 +493,11 @@ void hmcs40_cpu_device::execute_set_input(int line, int state)
 		}
 		else
 			m_timer->adjust(m_timer_halted_remain);
-		
+
 		m_halt = state;
 		return;
 	}
-	
+
 	if (line != 0 && line != 1)
 		return;
@ -577,7 +577,7 @@ void hmcs40_cpu_device::execute_run()
 		m_icount = 0;
 		return;
 	}
-	
+
 	while (m_icount > 0)
 	{
 		// LPU is handled 1 cycle later
--- a/src/emu/cpu/hphybrid/hphybrid.c
+++ b/src/emu/cpu/hphybrid/hphybrid.c
--- a/src/emu/cpu/hphybrid/hphybrid.h
+++ b/src/emu/cpu/hphybrid/hphybrid.h
@ -24,7 +24,7 @@
 // Input lines
 #define HPHYBRID_IRH    0       // High-level interrupt
 #define HPHYBRID_IRL    1       // Low-level interrupt
-#define HPHYBRID_INT_LVLS	2	// Levels of interrupt
+#define HPHYBRID_INT_LVLS   2   // Levels of interrupt
 #define HPHYBRID_DMAR   2       // DMA request
 #define HPHYBRID_HALT   3       // "Halt" input
@ -66,76 +66,76 @@ class hp_hybrid_cpu_device : public cpu_device
 {
 public:
 protected:
-        hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
+		hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
        // device-level overrides
        virtual void device_start();
        virtual void device_reset();
-        // device_execute_interface overrides
+		// device-level overrides
-        virtual UINT32 execute_min_cycles() const { return 6; }
+		virtual void device_start();
-        virtual UINT32 execute_max_cycles() const { return 25; }
+		virtual void device_reset();
        virtual UINT32 execute_input_lines() const { return 2; }
        virtual UINT32 execute_default_irq_vector() const { return 0xffff; }
        virtual void execute_run();
        virtual void execute_set_input(int inputnum, int state);
-        UINT16 execute_one(UINT16 opcode);
+		// device_execute_interface overrides
-        UINT16 execute_one_sub(UINT16 opcode);
+		virtual UINT32 execute_min_cycles() const { return 6; }
 		virtual UINT32 execute_max_cycles() const { return 25; }
 		virtual UINT32 execute_input_lines() const { return 2; }
 		virtual UINT32 execute_default_irq_vector() const { return 0xffff; }
 		virtual void execute_run();
 		virtual void execute_set_input(int inputnum, int state);
-        // device_memory_interface overrides
+		UINT16 execute_one(UINT16 opcode);
-        virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ); }
+		UINT16 execute_one_sub(UINT16 opcode);
-        // device_state_interface overrides
+		// device_memory_interface overrides
-        void state_string_export(const device_state_entry &entry, std::string &str);
+		virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ); }
-    
+
-        // device_disasm_interface overrides
+		// device_state_interface overrides
-        virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
+		void state_string_export(const device_state_entry &entry, std::string &str);
-        virtual UINT32 disasm_max_opcode_bytes() const { return 2; }
+
-        virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
+		// device_disasm_interface overrides
 		virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
 		virtual UINT32 disasm_max_opcode_bytes() const { return 2; }
 		virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
 private:
-        address_space_config m_program_config;
+		address_space_config m_program_config;
-        address_space_config m_io_config;
+		address_space_config m_io_config;
        address_space *m_program;
        direct_read_data *m_direct;
        address_space *m_io;
        int m_icount;
        // State of processor
        UINT16 m_reg_A;     // Register A
        UINT16 m_reg_B;     // Register B
        UINT16 m_reg_P;     // Register P
        UINT16 m_reg_R;     // Register R
        UINT16 m_reg_C;     // Register C
        UINT16 m_reg_D;     // Register D
        UINT16 m_reg_IV;    // Register IV
        UINT8  m_reg_PA[ HPHYBRID_INT_LVLS + 1 ];   // Stack of register PA (4 bit-long)
        UINT16 m_flags;     // Flags (carry, overflow, cb, db, int en, dma en, dma dir)
        UINT8  m_dmapa;     // DMA peripheral address (4 bits)
        UINT16 m_dmama;     // DMA address
        UINT16 m_dmac;      // DMA counter
        UINT16 m_reg_I;     // Instruction register
-        UINT16 get_ea(UINT16 opcode);
+		address_space *m_program;
-        void do_add(UINT16& addend1 , UINT16 addend2);
+		direct_read_data *m_direct;
-        UINT16 get_skip_addr(UINT16 opcode , bool condition) const;
+		address_space *m_io;
-        UINT16 get_skip_addr_sc(UINT16 opcode , UINT16& v , unsigned n);
+		int m_icount;
-        void do_pw(UINT16 opcode);
+
-        void check_for_interrupts(void);
+		// State of processor
-    
+		UINT16 m_reg_A;     // Register A
-        UINT16 RM(UINT16 addr);
+		UINT16 m_reg_B;     // Register B
-        void   WM(UINT16 addr , UINT16 v);
+		UINT16 m_reg_P;     // Register P
-        void   WMB(UINT32 addr , UINT8 v);
+		UINT16 m_reg_R;     // Register R
-        UINT16 RIO(UINT8 pa , UINT8 ic);
+		UINT16 m_reg_C;     // Register C
-        void   WIO(UINT8 pa , UINT8 ic , UINT16 v);
+		UINT16 m_reg_D;     // Register D
 		UINT16 m_reg_IV;    // Register IV
 		UINT8  m_reg_PA[ HPHYBRID_INT_LVLS + 1 ];   // Stack of register PA (4 bit-long)
 		UINT16 m_flags;     // Flags (carry, overflow, cb, db, int en, dma en, dma dir)
 		UINT8  m_dmapa;     // DMA peripheral address (4 bits)
 		UINT16 m_dmama;     // DMA address
 		UINT16 m_dmac;      // DMA counter
 		UINT16 m_reg_I;     // Instruction register
 		UINT16 get_ea(UINT16 opcode);
 		void do_add(UINT16& addend1 , UINT16 addend2);
 		UINT16 get_skip_addr(UINT16 opcode , bool condition) const;
 		UINT16 get_skip_addr_sc(UINT16 opcode , UINT16& v , unsigned n);
 		void do_pw(UINT16 opcode);
 		void check_for_interrupts(void);
 		UINT16 RM(UINT16 addr);
 		void   WM(UINT16 addr , UINT16 v);
 		void   WMB(UINT32 addr , UINT8 v);
 		UINT16 RIO(UINT8 pa , UINT8 ic);
 		void   WIO(UINT8 pa , UINT8 ic , UINT16 v);
 };
 class hp_5061_3011_cpu_device : public hp_hybrid_cpu_device
 {
 public:
-        hp_5061_3011_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+		hp_5061_3011_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 };
 extern const device_type HP_5061_3011;
--- a/src/emu/cpu/hphybrid/hphybrid_dasm.c
+++ b/src/emu/cpu/hphybrid/hphybrid_dasm.c
@ -11,84 +11,84 @@
 typedef void (*fn_dis_param)(char *buffer , offs_t pc , UINT16 opcode);
 typedef struct {
-        UINT16 m_op_mask;
+		UINT16 m_op_mask;
-        UINT16 m_opcode;
+		UINT16 m_opcode;
-        const char *m_mnemonic;
+		const char *m_mnemonic;
-        fn_dis_param m_param_fn;
+		fn_dis_param m_param_fn;
-        UINT32 m_dasm_flags;
+		UINT32 m_dasm_flags;
 } dis_entry_t;
 static void addr_2_str(char *buffer , UINT16 addr , bool indirect)
 {
-        char *s = buffer + strlen(buffer);
+		char *s = buffer + strlen(buffer);
-        s += sprintf(s , "$%04x" , addr);
+		s += sprintf(s , "$%04x" , addr);
-        switch (addr) {
+		switch (addr) {
-        case HP_REG_A_ADDR:
+		case HP_REG_A_ADDR:
-                strcpy(s , "(A)");
+				strcpy(s , "(A)");
-                break;
+				break;
-        case HP_REG_B_ADDR:
+		case HP_REG_B_ADDR:
-                strcpy(s , "(B)");
+				strcpy(s , "(B)");
-                break;
+				break;
-        case HP_REG_P_ADDR:
+		case HP_REG_P_ADDR:
-                strcpy(s , "(P)");
+				strcpy(s , "(P)");
-                break;
+				break;
-        case HP_REG_R_ADDR:
+		case HP_REG_R_ADDR:
-                strcpy(s , "(R)");
+				strcpy(s , "(R)");
-                break;
+				break;
-        case HP_REG_R4_ADDR:
+		case HP_REG_R4_ADDR:
-                strcpy(s , "(R4)");
+				strcpy(s , "(R4)");
-                break;
+				break;
-        case HP_REG_R5_ADDR:
+		case HP_REG_R5_ADDR:
-                strcpy(s , "(R5)");
+				strcpy(s , "(R5)");
-                break;
+				break;
-        case HP_REG_R6_ADDR:
+		case HP_REG_R6_ADDR:
-                strcpy(s , "(R6)");
+				strcpy(s , "(R6)");
-                break;
+				break;
-        case HP_REG_R7_ADDR:
+		case HP_REG_R7_ADDR:
-                strcpy(s , "(R7)");
+				strcpy(s , "(R7)");
-                break;
+				break;
-        case HP_REG_IV_ADDR:
+		case HP_REG_IV_ADDR:
-                strcpy(s , "(IV)");
+				strcpy(s , "(IV)");
-                break;
+				break;
-        case HP_REG_PA_ADDR:
+		case HP_REG_PA_ADDR:
-                strcpy(s , "(PA)");
+				strcpy(s , "(PA)");
-                break;
+				break;
-        case HP_REG_DMAPA_ADDR:
+		case HP_REG_DMAPA_ADDR:
-                strcpy(s , "(DMAPA)");
+				strcpy(s , "(DMAPA)");
-                break;
+				break;
-        case HP_REG_DMAMA_ADDR:
+		case HP_REG_DMAMA_ADDR:
-                strcpy(s , "(DMAMA)");
+				strcpy(s , "(DMAMA)");
-                break;
+				break;
-        case HP_REG_DMAC_ADDR:
+		case HP_REG_DMAC_ADDR:
-                strcpy(s , "(DMAC)");
+				strcpy(s , "(DMAC)");
-                break;
+				break;
-        case HP_REG_C_ADDR:
+		case HP_REG_C_ADDR:
-                strcpy(s , "(C)");
+				strcpy(s , "(C)");
-                break;
+				break;
-        case HP_REG_D_ADDR:
+		case HP_REG_D_ADDR:
-                strcpy(s , "(D)");
+				strcpy(s , "(D)");
-                break;
+				break;
-        }
+		}
-        if (indirect) {
+		if (indirect) {
-                strcat(s , ",I");
+				strcat(s , ",I");
-        }
+		}
 }
 static void param_none(char *buffer , offs_t pc , UINT16 opcode)
@ -97,185 +97,185 @@ static void param_none(char *buffer , offs_t pc , UINT16 opcode)
 static void param_loc(char *buffer , offs_t pc , UINT16 opcode)
 {
-        UINT16 base;
+		UINT16 base;
-        UINT16 off;
+		UINT16 off;
-        if (opcode & 0x0400) {
+		if (opcode & 0x0400) {
-                // Current page
+				// Current page
-                base = pc;
+				base = pc;
-        } else {
+		} else {
-                // Base page
+				// Base page
-                base = 0;
+				base = 0;
-        }
+		}
-        off = opcode & 0x3ff;
+		off = opcode & 0x3ff;
-        if (off & 0x200) {
+		if (off & 0x200) {
-                off -= 0x400;
+				off -= 0x400;
-        }
+		}
-        addr_2_str(buffer , base + off , (opcode & 0x8000) != 0);
+		addr_2_str(buffer , base + off , (opcode & 0x8000) != 0);
 }
 static void param_addr32(char *buffer , offs_t pc , UINT16 opcode)
 {
-        addr_2_str(buffer , opcode & 0x1f , (opcode & 0x8000) != 0);
+		addr_2_str(buffer , opcode & 0x1f , (opcode & 0x8000) != 0);
 }
 static void param_skip(char *buffer , offs_t pc , UINT16 opcode)
 {
-        UINT16 off = opcode & 0x3f;
+		UINT16 off = opcode & 0x3f;
-        if (off & 0x20) {
+		if (off & 0x20) {
-                off -= 0x40;
+				off -= 0x40;
-        }
+		}
-        addr_2_str(buffer , pc + off , false);
+		addr_2_str(buffer , pc + off , false);
 }
 static void param_skip_sc(char *buffer , offs_t pc , UINT16 opcode)
 {
-        param_skip(buffer, pc, opcode);
+		param_skip(buffer, pc, opcode);
-        if (opcode & 0x80) {
+		if (opcode & 0x80) {
-                if (opcode & 0x40) {
+				if (opcode & 0x40) {
-                        strcat(buffer , ",S");
+						strcat(buffer , ",S");
-                } else {
+				} else {
-                        strcat(buffer , ",C");
+						strcat(buffer , ",C");
-                }
+				}
-        }
+		}
 }
 static void param_ret(char *buffer , offs_t pc , UINT16 opcode)
 {
-        char *s = buffer + strlen(buffer);
+		char *s = buffer + strlen(buffer);
-        int off = opcode & 0x3f;
+		int off = opcode & 0x3f;
-        if (off & 0x20) {
+		if (off & 0x20) {
-                off -= 0x40;
+				off -= 0x40;
-        }
+		}
-        s += sprintf(s , "%d" , off);
+		s += sprintf(s , "%d" , off);
-        if (opcode & 0x40) {
+		if (opcode & 0x40) {
-                strcpy(s , ",P");
+				strcpy(s , ",P");
-        }
+		}
 }
 static void param_n16(char *buffer , offs_t pc , UINT16 opcode)
 {
-        char *s = buffer + strlen(buffer);
+		char *s = buffer + strlen(buffer);
-        sprintf(s , "%u" , (opcode & 0xf) + 1);
+		sprintf(s , "%u" , (opcode & 0xf) + 1);
 }
 static void param_reg_id(char *buffer , offs_t pc , UINT16 opcode)
 {
-        addr_2_str(buffer, opcode & 7, false);
+		addr_2_str(buffer, opcode & 7, false);
-        if (opcode & 0x80) {
+		if (opcode & 0x80) {
-                strcat(buffer , ",D");
+				strcat(buffer , ",D");
-        } else {
+		} else {
-                strcat(buffer , ",I");
+				strcat(buffer , ",I");
-        }
+		}
 }
 static const dis_entry_t dis_table[] = {
-        // *** BPC Instructions ***
+		// *** BPC Instructions ***
-        {0xffff , 0x0000 , "NOP" , param_none , 0 },
+		{0xffff , 0x0000 , "NOP" , param_none , 0 },
-        {0x7800 , 0x0000 , "LDA" , param_loc , 0 },
+		{0x7800 , 0x0000 , "LDA" , param_loc , 0 },
-        {0x7800 , 0x0800 , "LDB" , param_loc , 0 },
+		{0x7800 , 0x0800 , "LDB" , param_loc , 0 },
-        {0x7800 , 0x1000 , "CPA" , param_loc , 0 },
+		{0x7800 , 0x1000 , "CPA" , param_loc , 0 },
-        {0x7800 , 0x1800 , "CPB" , param_loc , 0 },
+		{0x7800 , 0x1800 , "CPB" , param_loc , 0 },
-        {0x7800 , 0x2000 , "ADA" , param_loc , 0 },
+		{0x7800 , 0x2000 , "ADA" , param_loc , 0 },
-        {0x7800 , 0x2800 , "ADB" , param_loc , 0 },
+		{0x7800 , 0x2800 , "ADB" , param_loc , 0 },
-        {0x7800 , 0x3000 , "STA" , param_loc , 0 },
+		{0x7800 , 0x3000 , "STA" , param_loc , 0 },
-        {0x7800 , 0x3800 , "STB" , param_loc , 0 },
+		{0x7800 , 0x3800 , "STB" , param_loc , 0 },
-        {0x7800 , 0x4000 , "JSM" , param_loc , DASMFLAG_STEP_OVER },
+		{0x7800 , 0x4000 , "JSM" , param_loc , DASMFLAG_STEP_OVER },
-        {0x7800 , 0x4800 , "ISZ" , param_loc , 0 },
+		{0x7800 , 0x4800 , "ISZ" , param_loc , 0 },
-        {0x7800 , 0x5000 , "AND" , param_loc , 0 },
+		{0x7800 , 0x5000 , "AND" , param_loc , 0 },
-        {0x7800 , 0x5800 , "DSZ" , param_loc , 0 },
+		{0x7800 , 0x5800 , "DSZ" , param_loc , 0 },
-        {0x7800 , 0x6000 , "IOR" , param_loc , 0 },
+		{0x7800 , 0x6000 , "IOR" , param_loc , 0 },
-        {0x7800 , 0x6800 , "JMP" , param_loc , 0 },
+		{0x7800 , 0x6800 , "JMP" , param_loc , 0 },
-        {0x7fe0 , 0x7000 , "EXE" , param_addr32 , 0 },
+		{0x7fe0 , 0x7000 , "EXE" , param_addr32 , 0 },
-        {0xffc0 , 0x7400 , "RZA" , param_skip , 0 },
+		{0xffc0 , 0x7400 , "RZA" , param_skip , 0 },
-        {0xffc0 , 0x7C00 , "RZB" , param_skip , 0 },
+		{0xffc0 , 0x7C00 , "RZB" , param_skip , 0 },
-        {0xffc0 , 0x7440 , "RIA" , param_skip , 0 },
+		{0xffc0 , 0x7440 , "RIA" , param_skip , 0 },
-        {0xffc0 , 0x7C40 , "RIB" , param_skip , 0 },
+		{0xffc0 , 0x7C40 , "RIB" , param_skip , 0 },
-        {0xffc0 , 0x7500 , "SZA" , param_skip , 0 },
+		{0xffc0 , 0x7500 , "SZA" , param_skip , 0 },
-        {0xffc0 , 0x7D00 , "SZB" , param_skip , 0 },
+		{0xffc0 , 0x7D00 , "SZB" , param_skip , 0 },
-        {0xffc0 , 0x7540 , "SIA" , param_skip , 0 },
+		{0xffc0 , 0x7540 , "SIA" , param_skip , 0 },
-        {0xffc0 , 0x7D40 , "SIB" , param_skip , 0 },
+		{0xffc0 , 0x7D40 , "SIB" , param_skip , 0 },
-        {0xffc0 , 0x7480 , "SFS" , param_skip , 0 },
+		{0xffc0 , 0x7480 , "SFS" , param_skip , 0 },
-        {0xffc0 , 0x7580 , "SFC" , param_skip , 0 },
+		{0xffc0 , 0x7580 , "SFC" , param_skip , 0 },
-        {0xffc0 , 0x7c80 , "SSS" , param_skip , 0 },
+		{0xffc0 , 0x7c80 , "SSS" , param_skip , 0 },
-        {0xffc0 , 0x7d80 , "SSC" , param_skip , 0 },
+		{0xffc0 , 0x7d80 , "SSC" , param_skip , 0 },
-        {0xffc0 , 0x7cc0 , "SHS" , param_skip , 0 },
+		{0xffc0 , 0x7cc0 , "SHS" , param_skip , 0 },
-        {0xffc0 , 0x7dc0 , "SHC" , param_skip , 0 },
+		{0xffc0 , 0x7dc0 , "SHC" , param_skip , 0 },
-        {0xff00 , 0x7600 , "SLA" , param_skip_sc , 0 },
+		{0xff00 , 0x7600 , "SLA" , param_skip_sc , 0 },
-        {0xff00 , 0x7e00 , "SLB" , param_skip_sc , 0 },
+		{0xff00 , 0x7e00 , "SLB" , param_skip_sc , 0 },
-        {0xff00 , 0x7700 , "RLA" , param_skip_sc , 0 },
+		{0xff00 , 0x7700 , "RLA" , param_skip_sc , 0 },
-        {0xff00 , 0x7f00 , "RLB" , param_skip_sc , 0 },
+		{0xff00 , 0x7f00 , "RLB" , param_skip_sc , 0 },
-        {0xff00 , 0xf400 , "SAP" , param_skip_sc , 0 },
+		{0xff00 , 0xf400 , "SAP" , param_skip_sc , 0 },
-        {0xff00 , 0xfc00 , "SBP" , param_skip_sc , 0 },
+		{0xff00 , 0xfc00 , "SBP" , param_skip_sc , 0 },
-        {0xff00 , 0xf500 , "SAM" , param_skip_sc , 0 },
+		{0xff00 , 0xf500 , "SAM" , param_skip_sc , 0 },
-        {0xff00 , 0xfd00 , "SBM" , param_skip_sc , 0 },
+		{0xff00 , 0xfd00 , "SBM" , param_skip_sc , 0 },
-        {0xff00 , 0xf600 , "SOC" , param_skip_sc , 0 },
+		{0xff00 , 0xf600 , "SOC" , param_skip_sc , 0 },
-        {0xff00 , 0xf700 , "SOS" , param_skip_sc , 0 },
+		{0xff00 , 0xf700 , "SOS" , param_skip_sc , 0 },
-        {0xff00 , 0xfe00 , "SEC" , param_skip_sc , 0 },
+		{0xff00 , 0xfe00 , "SEC" , param_skip_sc , 0 },
-        {0xff00 , 0xff00 , "SES" , param_skip_sc , 0 },
+		{0xff00 , 0xff00 , "SES" , param_skip_sc , 0 },
-        {0xffff , 0xf020 , "TCA" , param_none , 0 },
+		{0xffff , 0xf020 , "TCA" , param_none , 0 },
-        {0xffff , 0xf820 , "TCB" , param_none , 0 },
+		{0xffff , 0xf820 , "TCB" , param_none , 0 },
-        {0xffff , 0xf060 , "CMA" , param_none , 0 },
+		{0xffff , 0xf060 , "CMA" , param_none , 0 },
-        {0xffff , 0xf860 , "CMB" , param_none , 0 },
+		{0xffff , 0xf860 , "CMB" , param_none , 0 },
-        {0xff80 , 0xf080 , "RET" , param_ret , DASMFLAG_STEP_OUT },
+		{0xff80 , 0xf080 , "RET" , param_ret , DASMFLAG_STEP_OUT },
-        {0xfff0 , 0xf100 , "AAR" , param_n16 , 0 },
+		{0xfff0 , 0xf100 , "AAR" , param_n16 , 0 },
-        {0xfff0 , 0xf900 , "ABR" , param_n16 , 0 },
+		{0xfff0 , 0xf900 , "ABR" , param_n16 , 0 },
-        {0xffff , 0xf14f , "CLA" , param_none , 0 },
+		{0xffff , 0xf14f , "CLA" , param_none , 0 },
-        {0xfff0 , 0xf140 , "SAR" , param_n16 , 0 },
+		{0xfff0 , 0xf140 , "SAR" , param_n16 , 0 },
-        {0xffff , 0xf94f , "CLB" , param_none , 0 },
+		{0xffff , 0xf94f , "CLB" , param_none , 0 },
-        {0xfff0 , 0xf940 , "SBR" , param_n16 , 0 },
+		{0xfff0 , 0xf940 , "SBR" , param_n16 , 0 },
-        {0xfff0 , 0xf180 , "SAL" , param_n16 , 0 },
+		{0xfff0 , 0xf180 , "SAL" , param_n16 , 0 },
-        {0xfff0 , 0xf980 , "SBL" , param_n16 , 0 },
+		{0xfff0 , 0xf980 , "SBL" , param_n16 , 0 },
-        {0xfff0 , 0xf1c0 , "RAR" , param_n16 , 0 },
+		{0xfff0 , 0xf1c0 , "RAR" , param_n16 , 0 },
-        {0xfff0 , 0xf9c0 , "RBR" , param_n16 , 0 },
+		{0xfff0 , 0xf9c0 , "RBR" , param_n16 , 0 },
-        // *** IOC Instructions ***
+		// *** IOC Instructions ***
-        {0xffff , 0x7100 , "SDO" , param_none , 0 },
+		{0xffff , 0x7100 , "SDO" , param_none , 0 },
-        {0xffff , 0x7108 , "SDI" , param_none , 0 },
+		{0xffff , 0x7108 , "SDI" , param_none , 0 },
-        {0xffff , 0x7110 , "EIR" , param_none , 0 },
+		{0xffff , 0x7110 , "EIR" , param_none , 0 },
-        {0xffff , 0x7118 , "DIR" , param_none , 0 },
+		{0xffff , 0x7118 , "DIR" , param_none , 0 },
-        {0xffff , 0x7120 , "DMA" , param_none , 0 },
+		{0xffff , 0x7120 , "DMA" , param_none , 0 },
-        {0xffff , 0x7128 , "PCM" , param_none , 0 },
+		{0xffff , 0x7128 , "PCM" , param_none , 0 },
-        {0xffff , 0x7138 , "DDR" , param_none , 0 },
+		{0xffff , 0x7138 , "DDR" , param_none , 0 },
-        {0xffff , 0x7140 , "DBL" , param_none , 0 },
+		{0xffff , 0x7140 , "DBL" , param_none , 0 },
-        {0xffff , 0x7148 , "CBL" , param_none , 0 },
+		{0xffff , 0x7148 , "CBL" , param_none , 0 },
-        {0xffff , 0x7150 , "DBU" , param_none , 0 },
+		{0xffff , 0x7150 , "DBU" , param_none , 0 },
-        {0xffff , 0x7158 , "CBU" , param_none , 0 },
+		{0xffff , 0x7158 , "CBU" , param_none , 0 },
-        {0xff78 , 0x7160 , "PWC" , param_reg_id , 0 },
+		{0xff78 , 0x7160 , "PWC" , param_reg_id , 0 },
-        {0xff78 , 0x7168 , "PWD" , param_reg_id , 0 },
+		{0xff78 , 0x7168 , "PWD" , param_reg_id , 0 },
-        {0xff78 , 0x7960 , "PBC" , param_reg_id , 0 },
+		{0xff78 , 0x7960 , "PBC" , param_reg_id , 0 },
-        {0xff78 , 0x7968 , "PBD" , param_reg_id , 0 },
+		{0xff78 , 0x7968 , "PBD" , param_reg_id , 0 },
-        {0xff78 , 0x7170 , "WWC" , param_reg_id , 0 },
+		{0xff78 , 0x7170 , "WWC" , param_reg_id , 0 },
-        {0xff78 , 0x7178 , "WWD" , param_reg_id , 0 },
+		{0xff78 , 0x7178 , "WWD" , param_reg_id , 0 },
-        {0xff78 , 0x7970 , "WBC" , param_reg_id , 0 },
+		{0xff78 , 0x7970 , "WBC" , param_reg_id , 0 },
-        {0xff78 , 0x7978 , "WBD" , param_reg_id , 0 },
+		{0xff78 , 0x7978 , "WBD" , param_reg_id , 0 },
-        // *** END ***
+		// *** END ***
-        {0 , 0 , NULL , NULL , 0 }
+		{0 , 0 , NULL , NULL , 0 }
 };
 CPU_DISASSEMBLE(hp_hybrid)
 {
-        UINT16 opcode = ((UINT16)oprom[ 0 ] << 8) | oprom[ 1 ];
+		UINT16 opcode = ((UINT16)oprom[ 0 ] << 8) | oprom[ 1 ];
-        const dis_entry_t *p;
+		const dis_entry_t *p;
-        for (p = dis_table; p->m_op_mask; p++) {
+		for (p = dis_table; p->m_op_mask; p++) {
-                if ((opcode & p->m_op_mask) == p->m_opcode) {
+				if ((opcode & p->m_op_mask) == p->m_opcode) {
-                        strcpy(buffer , p->m_mnemonic);
+						strcpy(buffer , p->m_mnemonic);
-                        strcat(buffer , " ");
+						strcat(buffer , " ");
-                        p->m_param_fn(buffer , pc , opcode);
+						p->m_param_fn(buffer , pc , opcode);
-                        return 1 | p->m_dasm_flags | DASMFLAG_SUPPORTED;
+						return 1 | p->m_dasm_flags | DASMFLAG_SUPPORTED;
-                }
+				}
-        }
+		}
-        // Unknown opcode
+		// Unknown opcode
-        strcpy(buffer , "???");
+		strcpy(buffer , "???");
-        return 1 | DASMFLAG_SUPPORTED;
+		return 1 | DASMFLAG_SUPPORTED;
 }
--- a/src/emu/cpu/i386/i386priv.h
+++ b/src/emu/cpu/i386/i386priv.h
@ -543,7 +543,7 @@ UINT8 i386_device::FETCH()
 	if(!translate_address(m_CPL,TRANSLATE_FETCH,&address,&error))
 		PF_THROW(error);
-	value = m_direct->read_decrypted_byte(address & m_a20_mask);
+	value = m_direct->read_byte(address & m_a20_mask);
 #ifdef DEBUG_MISSING_OPCODE
 	m_opcode_bytes[m_opcode_bytes_length] = value;
 	m_opcode_bytes_length = (m_opcode_bytes_length + 1) & 15;
@ -564,7 +564,7 @@ UINT16 i386_device::FETCH16()
 		if(!translate_address(m_CPL,TRANSLATE_FETCH,&address,&error))
 			PF_THROW(error);
 		address &= m_a20_mask;
-		value = m_direct->read_decrypted_word(address);
+		value = m_direct->read_word(address);
 		m_eip += 2;
 		m_pc += 2;
 	}
@ -585,7 +585,7 @@ UINT32 i386_device::FETCH32()
 			PF_THROW(error);
 		address &= m_a20_mask;
-		value = m_direct->read_decrypted_dword(address);
+		value = m_direct->read_dword(address);
 		m_eip += 4;
 		m_pc += 4;
 	}
--- a/src/emu/cpu/i4004/i4004.c
+++ b/src/emu/cpu/i4004/i4004.c
@ -36,7 +36,7 @@ i4004_cpu_device::i4004_cpu_device(const machine_config &mconfig, const char *ta
 UINT8 i4004_cpu_device::ROP()
 {
-	UINT8 retVal = m_direct->read_decrypted_byte(GET_PC.w.l);
+	UINT8 retVal = m_direct->read_byte(GET_PC.w.l);
 	GET_PC.w.l = (GET_PC.w.l + 1) & 0x0fff;
 	m_PC = GET_PC;
 	return retVal;
@ -44,7 +44,7 @@ UINT8 i4004_cpu_device::ROP()
 UINT8 i4004_cpu_device::READ_ROM()
 {
-	return m_direct->read_decrypted_byte((GET_PC.w.l & 0x0f00) | m_R[0]);
+	return m_direct->read_byte((GET_PC.w.l & 0x0f00) | m_R[0]);
 }
 void i4004_cpu_device::WPM()
@ -56,7 +56,7 @@ void i4004_cpu_device::WPM()
 UINT8 i4004_cpu_device::ARG()
 {
-	UINT8 retVal = m_direct->read_raw_byte(GET_PC.w.l);
+	UINT8 retVal = m_direct->read_byte(GET_PC.w.l);
 	GET_PC.w.l = (GET_PC.w.l + 1) & 0x0fff;
 	m_PC = GET_PC;
 	return retVal;
--- a/src/emu/cpu/i8008/i8008.c
+++ b/src/emu/cpu/i8008/i8008.c
@ -620,7 +620,7 @@ inline void i8008_device::pop_stack()
 inline UINT8 i8008_device::rop()
 {
-	UINT8 retVal = m_direct->read_decrypted_byte(GET_PC.w.l);
+	UINT8 retVal = m_direct->read_byte(GET_PC.w.l);
 	GET_PC.w.l = (GET_PC.w.l + 1) & 0x3fff;
 	m_PC = GET_PC;
 	return retVal;
@ -658,7 +658,7 @@ inline void i8008_device::set_reg(UINT8 reg, UINT8 val)
 inline UINT8 i8008_device::arg()
 {
-	UINT8 retVal = m_direct->read_raw_byte(GET_PC.w.l);
+	UINT8 retVal = m_direct->read_byte(GET_PC.w.l);
 	GET_PC.w.l = (GET_PC.w.l + 1) & 0x3fff;
 	m_PC = GET_PC;
 	return retVal;
--- a/src/emu/cpu/i8085/i8085.c
+++ b/src/emu/cpu/i8085/i8085.c
@ -293,20 +293,20 @@ void i8085a_cpu_device::break_halt_for_interrupt()
 UINT8 i8085a_cpu_device::ROP()
 {
 	set_status(0xa2); // instruction fetch
-	return m_direct->read_decrypted_byte(m_PC.w.l++);
+	return m_direct->read_byte(m_PC.w.l++);
 }
 UINT8 i8085a_cpu_device::ARG()
 {
-	return m_direct->read_raw_byte(m_PC.w.l++);
+	return m_direct->read_byte(m_PC.w.l++);
 }
 UINT16 i8085a_cpu_device::ARG16()
 {
 	UINT16 w;
-	w  = m_direct->read_raw_byte(m_PC.d);
+	w  = m_direct->read_byte(m_PC.d);
 	m_PC.w.l++;
-	w += m_direct->read_raw_byte(m_PC.d) << 8;
+	w += m_direct->read_byte(m_PC.d) << 8;
 	m_PC.w.l++;
 	return w;
 }
--- a/src/emu/cpu/i86/i186.c
+++ b/src/emu/cpu/i86/i186.c
@ -155,14 +155,14 @@ i80186_cpu_device::i80186_cpu_device(const machine_config &mconfig, device_type
 UINT8 i80186_cpu_device::fetch_op()
 {
-	UINT8 data = m_direct->read_decrypted_byte(pc(), m_fetch_xor);
+	UINT8 data = m_direct->read_byte(pc(), m_fetch_xor);
 	m_ip++;
 	return data;
 }
 UINT8 i80186_cpu_device::fetch()
 {
-	UINT8 data = m_direct->read_raw_byte(pc(), m_fetch_xor);
+	UINT8 data = m_direct->read_byte(pc(), m_fetch_xor);
 	m_ip++;
 	return data;
 }
--- a/src/emu/cpu/i86/i286.c
+++ b/src/emu/cpu/i86/i286.c
@ -965,7 +965,7 @@ UINT8 i80286_cpu_device::fetch_op()
 	if(m_ip > m_limit[CS])
 		throw TRAP(FAULT_GP, 0);
-	data = m_direct->read_decrypted_byte( pc() & m_amask, m_fetch_xor );
+	data = m_direct->read_byte( pc() & m_amask, m_fetch_xor );
 	m_ip++;
 	return data;
 }
@ -976,7 +976,7 @@ UINT8 i80286_cpu_device::fetch()
 	if(m_ip > m_limit[CS])
 		throw TRAP(FAULT_GP, 0);
-	data = m_direct->read_raw_byte( pc() & m_amask, m_fetch_xor );
+	data = m_direct->read_byte( pc() & m_amask, m_fetch_xor );
 	m_ip++;
 	return data;
 }
--- a/src/emu/cpu/i86/i86.c
+++ b/src/emu/cpu/i86/i86.c
@ -116,7 +116,7 @@ i8086_cpu_device::i8086_cpu_device(const machine_config &mconfig, device_type ty
 UINT8 i8086_cpu_device::fetch_op()
 {
 	UINT8 data;
-	data = m_direct->read_decrypted_byte(pc(), m_fetch_xor);
+	data = m_direct->read_byte(pc(), m_fetch_xor);
 	m_ip++;
 	return data;
 }
@ -124,7 +124,7 @@ UINT8 i8086_cpu_device::fetch_op()
 UINT8 i8086_cpu_device::fetch()
 {
 	UINT8 data;
-	data = m_direct->read_raw_byte(pc(), m_fetch_xor);
+	data = m_direct->read_byte(pc(), m_fetch_xor);
 	m_ip++;
 	return data;
 }
@ -1915,9 +1915,9 @@ bool i8086_common_cpu_device::common_op(UINT8 op)
 			break;
 		case 0xe4: // i_inal
-			if (m_lock)	m_lock_handler(1);
+			if (m_lock) m_lock_handler(1);
 			m_regs.b[AL] = read_port_byte( fetch() );
-			if (m_lock)	{ m_lock_handler(0); m_lock = false; }
+			if (m_lock) { m_lock_handler(0); m_lock = false; }
 			CLK(IN_IMM8);
 			break;
--- a/src/emu/cpu/i960/i960.c
+++ b/src/emu/cpu/i960/i960.c
@ -109,22 +109,22 @@ UINT32 i960_cpu_device::get_ea(UINT32 opcode)
 			return m_r[abase] + (m_r[index] << scale);
 		case 0xc:
-			ret = m_direct->read_decrypted_dword(m_IP);
+			ret = m_direct->read_dword(m_IP);
 			m_IP += 4;
 			return ret;
 		case 0xd:
-			ret = m_direct->read_decrypted_dword(m_IP) + m_r[abase];
+			ret = m_direct->read_dword(m_IP) + m_r[abase];
 			m_IP += 4;
 			return ret;
 		case 0xe:
-			ret = m_direct->read_decrypted_dword(m_IP) + (m_r[index] << scale);
+			ret = m_direct->read_dword(m_IP) + (m_r[index] << scale);
 			m_IP += 4;
 			return ret;
 		case 0xf:
-			ret = m_direct->read_decrypted_dword(m_IP) + m_r[abase] + (m_r[index] << scale);
+			ret = m_direct->read_dword(m_IP) + m_r[abase] + (m_r[index] << scale);
 			m_IP += 4;
 			return ret;
@ -1932,7 +1932,7 @@ void i960_cpu_device::execute_run()
 		m_bursting = 0;
-		opcode = m_direct->read_decrypted_dword(m_IP);
+		opcode = m_direct->read_dword(m_IP);
 		m_IP += 4;
 		execute_op(opcode);
--- a/src/emu/cpu/ie15/ie15.c
+++ b/src/emu/cpu/ie15/ie15.c
@ -414,14 +414,14 @@ inline void ie15_device::execute_one(int opcode)
 inline UINT8 ie15_device::rop()
 {
-	UINT8 retVal = m_direct->read_decrypted_byte(m_PC.w.l);
+	UINT8 retVal = m_direct->read_byte(m_PC.w.l);
 	m_PC.w.l = (m_PC.w.l + 1) & 0x0fff;
 	return retVal;
 }
 inline UINT8 ie15_device::arg()
 {
-	UINT8 retVal = m_direct->read_raw_byte(m_PC.w.l);
+	UINT8 retVal = m_direct->read_byte(m_PC.w.l);
 	return retVal;
 }
--- a/src/emu/cpu/jaguar/jaguar.c
+++ b/src/emu/cpu/jaguar/jaguar.c
@ -137,7 +137,7 @@ const jaguar_cpu_device::op_func jaguar_cpu_device::dsp_op_table[64] =
    MEMORY ACCESSORS
 ***************************************************************************/
-#define ROPCODE(pc)           (m_direct->read_decrypted_word(pc, WORD_XOR_BE(0)))
+#define ROPCODE(pc)           (m_direct->read_word(pc, WORD_XOR_BE(0)))
 const device_type JAGUARGPU = &device_creator<jaguargpu_cpu_device>;
--- a/src/emu/cpu/lc8670/lc8670.c
+++ b/src/emu/cpu/lc8670/lc8670.c
@ -1071,7 +1071,7 @@ WRITE8_MEMBER(lc8670_cpu_device::regs_w)
 inline UINT8 lc8670_cpu_device::fetch()
 {
-	UINT8 data = m_direct->read_decrypted_byte(m_pc);
+	UINT8 data = m_direct->read_byte(m_pc);
 	set_pc(m_pc + 1);
--- a/src/emu/cpu/lh5801/5801tbl.inc
+++ b/src/emu/cpu/lh5801/5801tbl.inc
@ -26,8 +26,8 @@ UINT8 lh5801_cpu_device::lh5801_add_generic(int left, int right, int carry)
 UINT16 lh5801_cpu_device::lh5801_readop_word()
 {
 	UINT16 r;
-	r=m_direct->read_decrypted_byte(P++)<<8;
+	r=m_direct->read_byte(P++)<<8;
-	r|=m_direct->read_decrypted_byte(P++);
+	r|=m_direct->read_byte(P++);
 	return r;
 }
@ -221,7 +221,7 @@ void lh5801_cpu_device::lh5801_jmp(UINT16 adr)
 void lh5801_cpu_device::lh5801_branch_plus(int doit)
 {
-	UINT8 t=m_direct->read_decrypted_byte(P++);
+	UINT8 t=m_direct->read_byte(P++);
 	if (doit) {
 		m_icount-=3;
 		P+=t;
@ -230,7 +230,7 @@ void lh5801_cpu_device::lh5801_branch_plus(int doit)
 void lh5801_cpu_device::lh5801_branch_minus(int doit)
 {
-	UINT8 t=m_direct->read_decrypted_byte(P++);
+	UINT8 t=m_direct->read_byte(P++);
 	if (doit) {
 		m_icount-=3;
 		P-=t;
@ -239,7 +239,7 @@ void lh5801_cpu_device::lh5801_branch_minus(int doit)
 void lh5801_cpu_device::lh5801_lop()
 {
-	UINT8 t=m_direct->read_decrypted_byte(P++);
+	UINT8 t=m_direct->read_byte(P++);
 	m_icount-=8;
 	if (UL--) {
 		m_icount-=3;
@ -355,7 +355,7 @@ void lh5801_cpu_device::lh5801_instruction_fd()
 	int oper;
 	int adr;
-	oper=m_direct->read_decrypted_byte(P++);
+	oper=m_direct->read_byte(P++);
 	switch (oper) {
 	case 0x01: lh5801_sbc(m_io->read_byte(X)); m_icount-=11;break;
 	case 0x03: lh5801_adc(m_io->read_byte(X)); m_icount-=11;break;
@ -396,29 +396,29 @@ void lh5801_cpu_device::lh5801_instruction_fd()
 	case 0x40: lh5801_inc(&XH);m_icount-=9;break;
 	case 0x42: lh5801_dec(&XH);m_icount-=9;break;
 	case 0x48: X=S;m_icount-=11;break;
-	case 0x49: lh5801_and_mem(*m_io, X, m_direct->read_decrypted_byte(P++)); m_icount-=17;break;
+	case 0x49: lh5801_and_mem(*m_io, X, m_direct->read_byte(P++)); m_icount-=17;break;
 	case 0x4a: X=X;m_icount-=11;break; //!!!
-	case 0x4b: lh5801_ora_mem(*m_io, X, m_direct->read_decrypted_byte(P++)); m_icount-=17;break;
+	case 0x4b: lh5801_ora_mem(*m_io, X, m_direct->read_byte(P++)); m_icount-=17;break;
 	case 0x4c: m_bf=0;/*off !*/ m_icount-=8;break;
-	case 0x4d: lh5801_bit(m_io->read_byte(X), m_direct->read_decrypted_byte(P++));m_icount-=14;break;
+	case 0x4d: lh5801_bit(m_io->read_byte(X), m_direct->read_byte(P++));m_icount-=14;break;
 	case 0x4e: S=X;m_icount-=11;break;
-	case 0x4f: lh5801_add_mem(*m_io, X, m_direct->read_decrypted_byte(P++)); m_icount-=17;break;
+	case 0x4f: lh5801_add_mem(*m_io, X, m_direct->read_byte(P++)); m_icount-=17;break;
 	case 0x50: lh5801_inc(&YH);m_icount-=9;break;
 	case 0x52: lh5801_dec(&YH);m_icount-=9;break;
 	case 0x58: X=P;m_icount-=11;break;
-	case 0x59: lh5801_and_mem(*m_io, Y, m_direct->read_decrypted_byte(P++)); m_icount-=17;break;
+	case 0x59: lh5801_and_mem(*m_io, Y, m_direct->read_byte(P++)); m_icount-=17;break;
 	case 0x5a: Y=X;m_icount-=11;break;
-	case 0x5b: lh5801_ora_mem(*m_io, Y, m_direct->read_decrypted_byte(P++)); m_icount-=17;break;
+	case 0x5b: lh5801_ora_mem(*m_io, Y, m_direct->read_byte(P++)); m_icount-=17;break;
-	case 0x5d: lh5801_bit(m_io->read_byte(Y), m_direct->read_decrypted_byte(P++));m_icount-=14;break;
+	case 0x5d: lh5801_bit(m_io->read_byte(Y), m_direct->read_byte(P++));m_icount-=14;break;
 	case 0x5e: lh5801_jmp(X);m_icount-=11;break; // P=X
-	case 0x5f: lh5801_add_mem(*m_io, Y, m_direct->read_decrypted_byte(P++)); m_icount-=17;break;
+	case 0x5f: lh5801_add_mem(*m_io, Y, m_direct->read_byte(P++)); m_icount-=17;break;
 	case 0x60: lh5801_inc(&UH);m_icount-=9;break;
 	case 0x62: lh5801_dec(&UH);m_icount-=9;break;
-	case 0x69: lh5801_and_mem(*m_io, U, m_direct->read_decrypted_byte(P++)); m_icount-=17;break;
+	case 0x69: lh5801_and_mem(*m_io, U, m_direct->read_byte(P++)); m_icount-=17;break;
 	case 0x6a: U=X;m_icount-=11;break;
-	case 0x6b: lh5801_ora_mem(*m_io, U, m_direct->read_decrypted_byte(P++)); m_icount-=17;break;
+	case 0x6b: lh5801_ora_mem(*m_io, U, m_direct->read_byte(P++)); m_icount-=17;break;
-	case 0x6d: lh5801_bit(m_io->read_byte(X), m_direct->read_decrypted_byte(P++));m_icount-=14;break;
+	case 0x6d: lh5801_bit(m_io->read_byte(X), m_direct->read_byte(P++));m_icount-=14;break;
-	case 0x6f: lh5801_add_mem(*m_io, U, m_direct->read_decrypted_byte(P++)); m_icount-=17;break;
+	case 0x6f: lh5801_add_mem(*m_io, U, m_direct->read_byte(P++)); m_icount-=17;break;
 	case 0x81: m_t|=IE; /*sie !*/m_icount-=8;break;
 	case 0x88: lh5801_push_word(X); m_icount-=14;break;
 	case 0x8a: lh5801_pop(); m_icount-=12; break;
@ -454,20 +454,20 @@ void lh5801_cpu_device::lh5801_instruction_fd()
 	case 0xea: lh5801_adr(&m_u);m_icount-=11;break;
 	case 0xe9:
 		adr=lh5801_readop_word();
-		lh5801_and_mem(*m_io, adr, m_direct->read_decrypted_byte(P++)); m_icount-=23;
+		lh5801_and_mem(*m_io, adr, m_direct->read_byte(P++)); m_icount-=23;
 		break;
 	case 0xeb:
 		adr=lh5801_readop_word();
-		lh5801_ora_mem(*m_io, adr, m_direct->read_decrypted_byte(P++)); m_icount-=23;
+		lh5801_ora_mem(*m_io, adr, m_direct->read_byte(P++)); m_icount-=23;
 		break;
 	case 0xec: m_t=m_a; m_icount-=9;break;
 	case 0xed:
 		adr=lh5801_readop_word();
-		lh5801_bit(m_io->read_byte(adr), m_direct->read_decrypted_byte(P++));
+		lh5801_bit(m_io->read_byte(adr), m_direct->read_byte(P++));
 		m_icount-=20;break;
 	case 0xef:
 		adr=lh5801_readop_word();
-		lh5801_add_mem(*m_io, adr, m_direct->read_decrypted_byte(P++)); m_icount-=23;
+		lh5801_add_mem(*m_io, adr, m_direct->read_byte(P++)); m_icount-=23;
 		break;
 	default:
@ -480,7 +480,7 @@ void lh5801_cpu_device::lh5801_instruction()
 	int oper;
 	int adr;
-	oper=m_direct->read_decrypted_byte(P++);
+	oper=m_direct->read_byte(P++);
 	switch (oper) {
 	case 0x00: lh5801_sbc(XL); m_icount-=6;break;
 	case 0x01: lh5801_sbc(m_program->read_byte(X)); m_icount-=7;break;
@ -539,14 +539,14 @@ void lh5801_cpu_device::lh5801_instruction()
 	case 0x45: lh5801_lin(&m_x);m_icount-=6;break;
 	case 0x46: X--;m_icount-=5;break;
 	case 0x47: lh5801_lde(&m_x);m_icount-=6;break;
-	case 0x48: XH=m_direct->read_decrypted_byte(P++);m_icount-=6;break;
+	case 0x48: XH=m_direct->read_byte(P++);m_icount-=6;break;
-	case 0x49: lh5801_and_mem(*m_program, X, m_direct->read_decrypted_byte(P++)); m_icount-=13;break;
+	case 0x49: lh5801_and_mem(*m_program, X, m_direct->read_byte(P++)); m_icount-=13;break;
-	case 0x4a: XL=m_direct->read_decrypted_byte(P++);m_icount-=6;break;
+	case 0x4a: XL=m_direct->read_byte(P++);m_icount-=6;break;
-	case 0x4b: lh5801_ora_mem(*m_program, X, m_direct->read_decrypted_byte(P++)); m_icount-=13;break;
+	case 0x4b: lh5801_ora_mem(*m_program, X, m_direct->read_byte(P++)); m_icount-=13;break;
-	case 0x4c: lh5801_cpa(XH, m_direct->read_decrypted_byte(P++)); m_icount-=7;break;
+	case 0x4c: lh5801_cpa(XH, m_direct->read_byte(P++)); m_icount-=7;break;
-	case 0x4d: lh5801_bit(m_program->read_byte(X), m_direct->read_decrypted_byte(P++));m_icount-=10;break;
+	case 0x4d: lh5801_bit(m_program->read_byte(X), m_direct->read_byte(P++));m_icount-=10;break;
-	case 0x4e: lh5801_cpa(XL, m_direct->read_decrypted_byte(P++)); m_icount-=7;break;
+	case 0x4e: lh5801_cpa(XL, m_direct->read_byte(P++)); m_icount-=7;break;
-	case 0x4f: lh5801_add_mem(*m_program, X, m_direct->read_decrypted_byte(P++)); m_icount-=13;break;
+	case 0x4f: lh5801_add_mem(*m_program, X, m_direct->read_byte(P++)); m_icount-=13;break;
 	case 0x50: lh5801_inc(&YL);m_icount-=5;break;
 	case 0x51: lh5801_sin(&m_y); m_icount-=6;break;
 	case 0x52: lh5801_dec(&YL);m_icount-=5;break;
@ -555,14 +555,14 @@ void lh5801_cpu_device::lh5801_instruction()
 	case 0x55: lh5801_lin(&m_y);m_icount-=6;break;
 	case 0x56: Y--;m_icount-=5;break;
 	case 0x57: lh5801_lde(&m_y);m_icount-=6;break;
-	case 0x58: YH=m_direct->read_decrypted_byte(P++);m_icount-=6;break;
+	case 0x58: YH=m_direct->read_byte(P++);m_icount-=6;break;
-	case 0x59: lh5801_and_mem(*m_program, Y, m_direct->read_decrypted_byte(P++)); m_icount-=13;break;
+	case 0x59: lh5801_and_mem(*m_program, Y, m_direct->read_byte(P++)); m_icount-=13;break;
-	case 0x5a: YL=m_direct->read_decrypted_byte(P++);m_icount-=6;break;
+	case 0x5a: YL=m_direct->read_byte(P++);m_icount-=6;break;
-	case 0x5b: lh5801_ora_mem(*m_program, Y, m_direct->read_decrypted_byte(P++)); m_icount-=13;break;
+	case 0x5b: lh5801_ora_mem(*m_program, Y, m_direct->read_byte(P++)); m_icount-=13;break;
-	case 0x5c: lh5801_cpa(YH, m_direct->read_decrypted_byte(P++)); m_icount-=7;break;
+	case 0x5c: lh5801_cpa(YH, m_direct->read_byte(P++)); m_icount-=7;break;
-	case 0x5d: lh5801_bit(m_program->read_byte(Y), m_direct->read_decrypted_byte(P++));m_icount-=10;break;
+	case 0x5d: lh5801_bit(m_program->read_byte(Y), m_direct->read_byte(P++));m_icount-=10;break;
-	case 0x5e: lh5801_cpa(YL, m_direct->read_decrypted_byte(P++)); m_icount-=7;break;
+	case 0x5e: lh5801_cpa(YL, m_direct->read_byte(P++)); m_icount-=7;break;
-	case 0x5f: lh5801_add_mem(*m_program, Y, m_direct->read_decrypted_byte(P++)); m_icount-=13;break;
+	case 0x5f: lh5801_add_mem(*m_program, Y, m_direct->read_byte(P++)); m_icount-=13;break;
 	case 0x60: lh5801_inc(&UL);m_icount-=5;break;
 	case 0x61: lh5801_sin(&m_u); m_icount-=6;break;
 	case 0x62: lh5801_dec(&UL);m_icount-=5;break;
@ -571,14 +571,14 @@ void lh5801_cpu_device::lh5801_instruction()
 	case 0x65: lh5801_lin(&m_u);m_icount-=6;break;
 	case 0x66: U--;m_icount-=5;break;
 	case 0x67: lh5801_lde(&m_u);m_icount-=6;break;
-	case 0x68: UH=m_direct->read_decrypted_byte(P++);m_icount-=6;break;
+	case 0x68: UH=m_direct->read_byte(P++);m_icount-=6;break;
-	case 0x69: lh5801_and_mem(*m_program, U, m_direct->read_decrypted_byte(P++)); m_icount-=13;break;
+	case 0x69: lh5801_and_mem(*m_program, U, m_direct->read_byte(P++)); m_icount-=13;break;
-	case 0x6a: UL=m_direct->read_decrypted_byte(P++);m_icount-=6;break;
+	case 0x6a: UL=m_direct->read_byte(P++);m_icount-=6;break;
-	case 0x6b: lh5801_ora_mem(*m_program, U, m_direct->read_decrypted_byte(P++)); m_icount-=13;break;
+	case 0x6b: lh5801_ora_mem(*m_program, U, m_direct->read_byte(P++)); m_icount-=13;break;
-	case 0x6c: lh5801_cpa(UH, m_direct->read_decrypted_byte(P++)); m_icount-=7;break;
+	case 0x6c: lh5801_cpa(UH, m_direct->read_byte(P++)); m_icount-=7;break;
-	case 0x6d: lh5801_bit(m_program->read_byte(U), m_direct->read_decrypted_byte(P++));m_icount-=10;break;
+	case 0x6d: lh5801_bit(m_program->read_byte(U), m_direct->read_byte(P++));m_icount-=10;break;
-	case 0x6e: lh5801_cpa(UL, m_direct->read_decrypted_byte(P++)); m_icount-=7;break;
+	case 0x6e: lh5801_cpa(UL, m_direct->read_byte(P++)); m_icount-=7;break;
-	case 0x6f: lh5801_add_mem(*m_program, U, m_direct->read_decrypted_byte(P++)); m_icount-=13;break;
+	case 0x6f: lh5801_add_mem(*m_program, U, m_direct->read_byte(P++)); m_icount-=13;break;
 	case 0x80: lh5801_sbc(XH); m_icount-=6;break;
 	case 0x81: lh5801_branch_plus(!(m_t&C)); m_icount-=8; break;
 	case 0x82: lh5801_adc(XH); m_icount-=6;break;
@ -626,25 +626,25 @@ void lh5801_cpu_device::lh5801_instruction()
 	case 0xad: lh5801_eor(m_program->read_byte(lh5801_readop_word())); m_icount-=13;break;
 	case 0xae: m_program->write_byte(lh5801_readop_word(),m_a); m_icount-=12;break;
 	case 0xaf: lh5801_bit(m_program->read_byte(lh5801_readop_word()),m_a); m_icount-=13;break;
-	case 0xb1: lh5801_sbc(m_direct->read_decrypted_byte(P++)); m_icount-=7;break;
+	case 0xb1: lh5801_sbc(m_direct->read_byte(P++)); m_icount-=7;break;
-	case 0xb3: lh5801_adc(m_direct->read_decrypted_byte(P++)); m_icount-=7;break;
+	case 0xb3: lh5801_adc(m_direct->read_byte(P++)); m_icount-=7;break;
-	case 0xb5: lh5801_lda(m_direct->read_decrypted_byte(P++)); m_icount-=6;break;
+	case 0xb5: lh5801_lda(m_direct->read_byte(P++)); m_icount-=6;break;
-	case 0xb7: lh5801_cpa(m_a, m_direct->read_decrypted_byte(P++)); m_icount-=7;break;
+	case 0xb7: lh5801_cpa(m_a, m_direct->read_byte(P++)); m_icount-=7;break;
 	case 0xb8: m_pv=0;/*rpv!*/ m_icount-=4; break;
-	case 0xb9: lh5801_and(m_direct->read_decrypted_byte(P++)); m_icount-=7;break;
+	case 0xb9: lh5801_and(m_direct->read_byte(P++)); m_icount-=7;break;
 	case 0xba: lh5801_jmp(lh5801_readop_word()); m_icount-=12;break;
-	case 0xbb: lh5801_ora(m_direct->read_decrypted_byte(P++)); m_icount-=7;break;
+	case 0xbb: lh5801_ora(m_direct->read_byte(P++)); m_icount-=7;break;
-	case 0xbd: lh5801_eor(m_direct->read_decrypted_byte(P++)); m_icount-=7;break;
+	case 0xbd: lh5801_eor(m_direct->read_byte(P++)); m_icount-=7;break;
 	case 0xbe: lh5801_sjp(); m_icount-=19; break;
-	case 0xbf: lh5801_bit(m_a, m_direct->read_decrypted_byte(P++));m_icount-=7;break;
+	case 0xbf: lh5801_bit(m_a, m_direct->read_byte(P++));m_icount-=7;break;
-	case 0xc1: lh5801_vector(!(m_t&C), m_direct->read_decrypted_byte(P++)); m_icount-=8;break;
+	case 0xc1: lh5801_vector(!(m_t&C), m_direct->read_byte(P++)); m_icount-=8;break;
-	case 0xc3: lh5801_vector(m_t&C, m_direct->read_decrypted_byte(P++)); m_icount-=8;break;
+	case 0xc3: lh5801_vector(m_t&C, m_direct->read_byte(P++)); m_icount-=8;break;
-	case 0xc5: lh5801_vector(!(m_t&H), m_direct->read_decrypted_byte(P++)); m_icount-=8;break;
+	case 0xc5: lh5801_vector(!(m_t&H), m_direct->read_byte(P++)); m_icount-=8;break;
-	case 0xc7: lh5801_vector(m_t&H, m_direct->read_decrypted_byte(P++)); m_icount-=8;break;
+	case 0xc7: lh5801_vector(m_t&H, m_direct->read_byte(P++)); m_icount-=8;break;
-	case 0xc9: lh5801_vector(!(m_t&Z), m_direct->read_decrypted_byte(P++)); m_icount-=8;break;
+	case 0xc9: lh5801_vector(!(m_t&Z), m_direct->read_byte(P++)); m_icount-=8;break;
-	case 0xcb: lh5801_vector(m_t&Z, m_direct->read_decrypted_byte(P++)); m_icount-=8;break;
+	case 0xcb: lh5801_vector(m_t&Z, m_direct->read_byte(P++)); m_icount-=8;break;
-	case 0xcd: lh5801_vector(1, m_direct->read_decrypted_byte(P++)); m_icount-=7;break;
+	case 0xcd: lh5801_vector(1, m_direct->read_byte(P++)); m_icount-=7;break;
-	case 0xcf: lh5801_vector(m_t&V, m_direct->read_decrypted_byte(P++)); m_icount-=8;break;
+	case 0xcf: lh5801_vector(m_t&V, m_direct->read_byte(P++)); m_icount-=8;break;
 	case 0xd1: lh5801_ror(); m_icount-=6; break;
 	case 0xd3: lh5801_drr(*m_program, X); m_icount-=12; break;
 	case 0xd5: lh5801_shr(); m_icount-=6; break;
@ -656,17 +656,17 @@ void lh5801_cpu_device::lh5801_instruction()
 	case 0xe1: m_pu=1;/*spu!*/ m_icount-=4; break;
 	case 0xe3: m_pu=0;/*rpu!*/ m_icount-=4; break;
 	case 0xe9:
-		adr=lh5801_readop_word();lh5801_and_mem(*m_program, adr, m_direct->read_decrypted_byte(P++));
+		adr=lh5801_readop_word();lh5801_and_mem(*m_program, adr, m_direct->read_byte(P++));
 		m_icount-=19;break;
 	case 0xeb:
-		adr=lh5801_readop_word();lh5801_ora_mem(*m_program, adr, m_direct->read_decrypted_byte(P++));
+		adr=lh5801_readop_word();lh5801_ora_mem(*m_program, adr, m_direct->read_byte(P++));
 		m_icount-=19;break;
 	case 0xed:
-		adr=lh5801_readop_word();lh5801_bit(m_program->read_byte(adr), m_direct->read_decrypted_byte(P++));
+		adr=lh5801_readop_word();lh5801_bit(m_program->read_byte(adr), m_direct->read_byte(P++));
 		m_icount-=16;break;
 	case 0xef:
 		adr=lh5801_readop_word();
-		lh5801_add_mem(*m_program, adr, m_direct->read_decrypted_byte(P++)); m_icount-=19;
+		lh5801_add_mem(*m_program, adr, m_direct->read_byte(P++)); m_icount-=19;
 		break;
 	case 0xf1: lh5801_aex(); m_icount-=6; break;
 	case 0xf5: m_program->write_byte(Y++, m_program->read_byte(X++)); m_icount-=7; break; //tin
--- a/Show More
+++ b/Show More