diff --git a/makefile b/makefile
index e29e8a556fe..b78ece4d18c 100644
--- a/makefile
+++ b/makefile
@@ -674,6 +674,11 @@ SCRIPTS = scripts/genie.lua \
 	$(wildcard src/osd/$(OSD)/$(OSD).mak) \
 	$(wildcard src/$(TARGET)/$(SUBTARGET).mak)
 
+ifeq ($(SUBTARGET),mame)
+SCRIPTS += scripts/target/$(TARGET)/arcade.lua
+SCRIPTS += scripts/target/$(TARGET)/mess.lua
+endif
+
 ifndef SOURCES
 SCRIPTS += scripts/target/$(TARGET)/$(SUBTARGET).lua
 endif
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 1090b63bbc2..1642b6d23b7 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -90,6 +90,9 @@ if (CPUS["ARCOMPACT"]~=null) then
 		MAME_DIR .. "src/devices/cpu/arcompact/arcompact.cpp",
 		MAME_DIR .. "src/devices/cpu/arcompact/arcompact.h",
 		MAME_DIR .. "src/devices/cpu/arcompact/arcompact_execute.cpp",
+		MAME_DIR .. "src/devices/cpu/arcompact/arcompactdasm_dispatch.h",
+		MAME_DIR .. "src/devices/cpu/arcompact/arcompactdasm_ops.h",
+		MAME_DIR .. "src/devices/cpu/arcompact/arcompact_common.h",
 	}
 	dependency {
 		{ MAME_DIR .. "src/devices/cpu/arcompact/arcompact.cpp",  	   GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" },
@@ -134,6 +137,11 @@ if (CPUS["ARM7"]~=null) then
 		MAME_DIR .. "src/devices/cpu/arm7/arm7ops.cpp",
 		MAME_DIR .. "src/devices/cpu/arm7/lpc210x.cpp",
 		MAME_DIR .. "src/devices/cpu/arm7/lpc210x.h",
+		MAME_DIR .. "src/devices/cpu/arm7/arm7core.h",
+		MAME_DIR .. "src/devices/cpu/arm7/arm7core.inc",
+		MAME_DIR .. "src/devices/cpu/arm7/arm7drc.inc",
+		MAME_DIR .. "src/devices/cpu/arm7/arm7help.h",
+		MAME_DIR .. "src/devices/cpu/arm7/arm7tdrc.inc",
 	}
 end
 
@@ -199,6 +207,7 @@ if (CPUS["ADSP21XX"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/adsp2100/adsp2100.cpp",
 		MAME_DIR .. "src/devices/cpu/adsp2100/adsp2100.h",
+		MAME_DIR .. "src/devices/cpu/adsp2100/2100ops.inc",
 	}
 end
 
@@ -215,6 +224,12 @@ if (CPUS["ADSP21062"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/sharc/sharc.cpp",
 		MAME_DIR .. "src/devices/cpu/sharc/sharc.h",
+		MAME_DIR .. "src/devices/cpu/sharc/compute.inc",
+		MAME_DIR .. "src/devices/cpu/sharc/sharcdma.inc",
+		MAME_DIR .. "src/devices/cpu/sharc/sharcdsm.h",
+		MAME_DIR .. "src/devices/cpu/sharc/sharcmem.inc",
+		MAME_DIR .. "src/devices/cpu/sharc/sharcops.h",
+		MAME_DIR .. "src/devices/cpu/sharc/sharcops.inc",
 	}
 end
 
@@ -247,6 +262,7 @@ if (CPUS["DSP16A"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/dsp16/dsp16.cpp",
 		MAME_DIR .. "src/devices/cpu/dsp16/dsp16.h",
+		MAME_DIR .. "src/devices/cpu/dsp16/dsp16ops.inc",
 	}
 end
 
@@ -263,6 +279,7 @@ if (CPUS["DSP32C"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/dsp32/dsp32.cpp",
 		MAME_DIR .. "src/devices/cpu/dsp32/dsp32.h",
+		MAME_DIR .. "src/devices/cpu/dsp32/dsp32ops.inc",
 	}
 end
 
@@ -295,6 +312,7 @@ if (CPUS["AM29000"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/am29000/am29000.cpp",
 		MAME_DIR .. "src/devices/cpu/am29000/am29000.h",
+		MAME_DIR .. "src/devices/cpu/am29000/am29ops.h",
 	}
 end
 
@@ -373,6 +391,7 @@ if (CPUS["E0C6200"]~=null) then
 		MAME_DIR .. "src/devices/cpu/e0c6200/e0c6200.h",
 		MAME_DIR .. "src/devices/cpu/e0c6200/e0c6s46.cpp",
 		MAME_DIR .. "src/devices/cpu/e0c6200/e0c6s46.h",
+		MAME_DIR .. "src/devices/cpu/e0c6200/e0c6200op.inc",
 	}
 end
 
@@ -405,6 +424,7 @@ if (CPUS["COP400"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/cop400/cop400.cpp",
 		MAME_DIR .. "src/devices/cpu/cop400/cop400.h",
+		MAME_DIR .. "src/devices/cpu/cop400/cop400op.inc",
 	}
 end
 
@@ -455,6 +475,8 @@ if (CPUS["T11"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/t11/t11.cpp",
 		MAME_DIR .. "src/devices/cpu/t11/t11.h",
+		MAME_DIR .. "src/devices/cpu/t11/t11ops.inc",
+		MAME_DIR .. "src/devices/cpu/t11/t11table.inc",
 	}
 end
 
@@ -508,6 +530,9 @@ if (CPUS["G65816"]~=null) then
 		MAME_DIR .. "src/devices/cpu/g65816/g65816o2.cpp",
 		MAME_DIR .. "src/devices/cpu/g65816/g65816o3.cpp",
 		MAME_DIR .. "src/devices/cpu/g65816/g65816o4.cpp",
+		MAME_DIR .. "src/devices/cpu/g65816/g65816cm.h",
+		MAME_DIR .. "src/devices/cpu/g65816/g65816ds.h",
+		MAME_DIR .. "src/devices/cpu/g65816/g65816op.h",
 	}
 end
 
@@ -586,6 +611,7 @@ if (CPUS["HCD62121"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/hcd62121/hcd62121.cpp",
 		MAME_DIR .. "src/devices/cpu/hcd62121/hcd62121.h",
+		MAME_DIR .. "src/devices/cpu/hcd62121/hcd62121_ops.h",
 	}
 end
 
@@ -620,6 +646,9 @@ if (CPUS["SH2"]~=null) then
 		MAME_DIR .. "src/devices/cpu/sh2/sh2.cpp",
 		MAME_DIR .. "src/devices/cpu/sh2/sh2.h",
 		MAME_DIR .. "src/devices/cpu/sh2/sh2fe.cpp",
+		--MAME_DIR .. "src/devices/cpu/sh2/sh2comn.cpp",
+		--MAME_DIR .. "src/devices/cpu/sh2/sh2comn.h",
+		--MAME_DIR .. "src/devices/cpu/sh2/sh2drc.cpp",
 	}
 end
 
@@ -644,6 +673,7 @@ if (CPUS["SH4"]~=null) then
 		MAME_DIR .. "src/devices/cpu/sh4/sh4tmu.h",
 		MAME_DIR .. "src/devices/cpu/sh4/sh4dmac.cpp",
 		MAME_DIR .. "src/devices/cpu/sh4/sh4dmac.h",
+		MAME_DIR .. "src/devices/cpu/sh4/sh4regs.h",
 	}
 end
 
@@ -692,6 +722,7 @@ if (CPUS["E1"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/e132xs/e132xs.cpp",
 		MAME_DIR .. "src/devices/cpu/e132xs/e132xs.h",
+		MAME_DIR .. "src/devices/cpu/e132xs/e132xsop.inc",
 	}
 end
 
@@ -772,6 +803,7 @@ if (CPUS["I8085"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/i8085/i8085.cpp",
 		MAME_DIR .. "src/devices/cpu/i8085/i8085.h",
+		MAME_DIR .. "src/devices/cpu/i8085/i8085cpu.h",
 	}
 end
 
@@ -823,6 +855,7 @@ if (CPUS["MCS51"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/mcs51/mcs51.cpp",
 		MAME_DIR .. "src/devices/cpu/mcs51/mcs51.h",
+		MAME_DIR .. "src/devices/cpu/mcs51/mcs51ops.inc",
 	}
 end
 
@@ -872,6 +905,7 @@ if (CPUS["I86"]~=null) then
 		MAME_DIR .. "src/devices/cpu/i86/i186.h",
 		MAME_DIR .. "src/devices/cpu/i86/i286.cpp",
 		MAME_DIR .. "src/devices/cpu/i86/i286.h",
+		MAME_DIR .. "src/devices/cpu/i86/i86inline.h",
 	}
 end
 
@@ -883,6 +917,15 @@ if (CPUS["I386"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/i386/i386.cpp",
 		MAME_DIR .. "src/devices/cpu/i386/i386.h",
+		MAME_DIR .. "src/devices/cpu/i386/cycles.h",
+		MAME_DIR .. "src/devices/cpu/i386/i386op16.inc",
+		MAME_DIR .. "src/devices/cpu/i386/i386op32.inc",
+		MAME_DIR .. "src/devices/cpu/i386/i386ops.h",
+		MAME_DIR .. "src/devices/cpu/i386/i386ops.inc",
+		MAME_DIR .. "src/devices/cpu/i386/i386priv.h",
+		MAME_DIR .. "src/devices/cpu/i386/i486ops.inc",
+		MAME_DIR .. "src/devices/cpu/i386/pentops.inc",
+		MAME_DIR .. "src/devices/cpu/i386/x87ops.inc",
 	}
 end
 
@@ -899,6 +942,8 @@ if (CPUS["I860"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/i860/i860.cpp",
 		MAME_DIR .. "src/devices/cpu/i860/i860.h",
+		--MAME_DIR .. "src/devices/cpu/i860/i860dasm.cpp",
+		MAME_DIR .. "src/devices/cpu/i860/i860dec.inc",
 	}
 end
 
@@ -914,12 +959,13 @@ end
 if (CPUS["I960"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/i960/i960.cpp",
-		MAME_DIR .. "src/devices/cpu/i960/i960.h",
+		MAME_DIR .. "src/devices/cpu/i960/i960.h",		
 	}
 end
 
 if (CPUS["I960"]~=null or _OPTIONS["with-tools"]) then
 	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i960/i960dis.cpp")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i960/i960dis.h")
 end
 
 --------------------------------------------------
@@ -931,6 +977,7 @@ if (CPUS["LH5801"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/lh5801/lh5801.cpp",
 		MAME_DIR .. "src/devices/cpu/lh5801/lh5801.h",
+		MAME_DIR .. "src/devices/cpu/lh5801/5801tbl.inc",
 	}
 end
 
@@ -1011,6 +1058,7 @@ if (CPUS["PIC16C5X"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/pic16c5x/pic16c5x.cpp",
 		MAME_DIR .. "src/devices/cpu/pic16c5x/pic16c5x.h",
+		--MAME_DIR .. "src/devices/cpu/pic16c5x/dis16c5x.cpp",
 	}
 end
 
@@ -1027,6 +1075,7 @@ if (CPUS["PIC16C62X"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/pic16c62x/pic16c62x.cpp",
 		MAME_DIR .. "src/devices/cpu/pic16c62x/pic16c62x.h",
+		--MAME_DIR .. "src/devices/cpu/pic16c62x/dis16c62x.cpp",
 	}
 end
 
@@ -1080,6 +1129,7 @@ if (CPUS["PSX"]~=null) then
 		MAME_DIR .. "src/devices/cpu/psx/rcnt.h",
 		MAME_DIR .. "src/devices/cpu/psx/sio.cpp",
 		MAME_DIR .. "src/devices/cpu/psx/sio.h",
+		--MAME_DIR .. "src/devices/cpu/psx/dismips.cpp",
 	}
 end
 
@@ -1119,6 +1169,10 @@ if (CPUS["M37710"]~=null) then
 		MAME_DIR .. "src/devices/cpu/m37710/m37710o1.cpp",
 		MAME_DIR .. "src/devices/cpu/m37710/m37710o2.cpp",
 		MAME_DIR .. "src/devices/cpu/m37710/m37710o3.cpp",
+		MAME_DIR .. "src/devices/cpu/m37710/m37710cm.h",
+		MAME_DIR .. "src/devices/cpu/m37710/m37710il.h",
+		MAME_DIR .. "src/devices/cpu/m37710/m37710op.h",
+		MAME_DIR .. "src/devices/cpu/m37710/m7700ds.h",	
 	}
 end
 
@@ -1226,6 +1280,8 @@ if (CPUS["M6800"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/m6800/m6800.cpp",
 		MAME_DIR .. "src/devices/cpu/m6800/m6800.h",
+		MAME_DIR .. "src/devices/cpu/m6800/6800ops.inc",
+		MAME_DIR .. "src/devices/cpu/m6800/6800tbl.inc",
 	}
 end
 
@@ -1242,6 +1298,7 @@ if (CPUS["M6805"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/m6805/m6805.cpp",
 		MAME_DIR .. "src/devices/cpu/m6805/m6805.h",
+		MAME_DIR .. "src/devices/cpu/m6805/6805ops.inc",
 	}
 end
 
@@ -1264,6 +1321,7 @@ if (CPUS["M6809"]~=null) then
 		MAME_DIR .. "src/devices/cpu/m6809/hd6309.h",
 		MAME_DIR .. "src/devices/cpu/m6809/konami.cpp",
 		MAME_DIR .. "src/devices/cpu/m6809/konami.h",
+		MAME_DIR .. "src/devices/cpu/m6809/m6809inl.h",
 	}
 
 	dependency {
@@ -1294,6 +1352,8 @@ if (CPUS["MC68HC11"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/mc68hc11/mc68hc11.cpp",
 		MAME_DIR .. "src/devices/cpu/mc68hc11/mc68hc11.h",
+		MAME_DIR .. "src/devices/cpu/mc68hc11/hc11ops.h",
+		MAME_DIR .. "src/devices/cpu/mc68hc11/hc11ops.inc",
 	}
 end
 
@@ -1312,6 +1372,11 @@ if (CPUS["M680X0"]~=null) then
 		MAME_DIR .. "src/devices/cpu/m68000/m68kcpu.h",
 		MAME_DIR .. "src/devices/cpu/m68000/m68kops.cpp",
 		MAME_DIR .. "src/devices/cpu/m68000/m68kops.h",
+		MAME_DIR .. "src/devices/cpu/m68000/m68000.h",
+		MAME_DIR .. "src/devices/cpu/m68000/m68kfpu.inc",
+		--MAME_DIR .. "src/devices/cpu/m68000/m68kmake.cpp",
+		MAME_DIR .. "src/devices/cpu/m68000/m68kmmu.h",
+		--MAME_DIR .. "src/devices/cpu/m68000/m68k_in.cpp",
 	}
 end
 
@@ -1332,6 +1397,12 @@ if (CPUS["DSP56156"]~=null) then
 		MAME_DIR .. "src/devices/cpu/dsp56k/dsp56mem.h",
 		MAME_DIR .. "src/devices/cpu/dsp56k/dsp56pcu.cpp",
 		MAME_DIR .. "src/devices/cpu/dsp56k/dsp56pcu.h",
+		MAME_DIR .. "src/devices/cpu/dsp56k/dsp56def.h",
+		MAME_DIR .. "src/devices/cpu/dsp56k/dsp56ops.inc",
+		MAME_DIR .. "src/devices/cpu/dsp56k/inst.h",
+		MAME_DIR .. "src/devices/cpu/dsp56k/opcode.h",
+		MAME_DIR .. "src/devices/cpu/dsp56k/pmove.h",
+		MAME_DIR .. "src/devices/cpu/dsp56k/tables.h",
 	}
 end
 
@@ -1376,6 +1447,17 @@ if (CPUS["POWERPC"]~=null) then
 		MAME_DIR .. "src/devices/cpu/powerpc/ppcfe.cpp",
 		MAME_DIR .. "src/devices/cpu/powerpc/ppcfe.h",
 		MAME_DIR .. "src/devices/cpu/powerpc/ppcdrc.cpp",
+		
+		--MAME_DIR .. "src/devices/cpu/powerpc/drc_ops.cpp",
+		MAME_DIR .. "src/devices/cpu/powerpc/drc_ops.h",
+		--MAME_DIR .. "src/devices/cpu/powerpc/ppc.cpp",
+		MAME_DIR .. "src/devices/cpu/powerpc/ppc.h",
+		MAME_DIR .. "src/devices/cpu/powerpc/ppc403.inc",
+		MAME_DIR .. "src/devices/cpu/powerpc/ppc602.inc",
+		MAME_DIR .. "src/devices/cpu/powerpc/ppc603.inc",
+		MAME_DIR .. "src/devices/cpu/powerpc/ppc_mem.inc",
+		MAME_DIR .. "src/devices/cpu/powerpc/ppc_ops.h",
+		MAME_DIR .. "src/devices/cpu/powerpc/ppc_ops.inc",
 	}
 end
 
@@ -1393,6 +1475,15 @@ if (CPUS["NEC"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/nec/nec.cpp",
 		MAME_DIR .. "src/devices/cpu/nec/nec.h",
+		MAME_DIR .. "src/devices/cpu/nec/necea.h",
+		MAME_DIR .. "src/devices/cpu/nec/necinstr.h",
+		MAME_DIR .. "src/devices/cpu/nec/necinstr.inc",
+		MAME_DIR .. "src/devices/cpu/nec/necmacro.h",
+		MAME_DIR .. "src/devices/cpu/nec/necmodrm.h",
+		MAME_DIR .. "src/devices/cpu/nec/necpriv.h",
+		MAME_DIR .. "src/devices/cpu/nec/v25instr.h",
+		MAME_DIR .. "src/devices/cpu/nec/v25instr.inc",
+		MAME_DIR .. "src/devices/cpu/nec/v25priv.h",
 		MAME_DIR .. "src/devices/cpu/nec/v25.cpp",
 		MAME_DIR .. "src/devices/cpu/nec/v25.h",
 		MAME_DIR .. "src/devices/cpu/nec/v25sfr.cpp",
@@ -1425,6 +1516,18 @@ if (CPUS["V60"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/v60/v60.cpp",
 		MAME_DIR .. "src/devices/cpu/v60/v60.h",
+		MAME_DIR .. "src/devices/cpu/v60/am.inc",
+		MAME_DIR .. "src/devices/cpu/v60/am1.inc",
+		MAME_DIR .. "src/devices/cpu/v60/am2.inc",
+		MAME_DIR .. "src/devices/cpu/v60/am3.inc",
+		MAME_DIR .. "src/devices/cpu/v60/op12.inc",
+		MAME_DIR .. "src/devices/cpu/v60/op2.inc",
+		MAME_DIR .. "src/devices/cpu/v60/op3.inc",
+		MAME_DIR .. "src/devices/cpu/v60/op4.inc",
+		MAME_DIR .. "src/devices/cpu/v60/op5.inc",
+		MAME_DIR .. "src/devices/cpu/v60/op6.inc",
+		MAME_DIR .. "src/devices/cpu/v60/op7a.inc",
+		MAME_DIR .. "src/devices/cpu/v60/optable.inc",
 	}
 end
 
@@ -1475,6 +1578,7 @@ if (CPUS["UPD7810"]~=null) then
 		MAME_DIR .. "src/devices/cpu/upd7810/upd7810.h",
 		MAME_DIR .. "src/devices/cpu/upd7810/upd7810_opcodes.cpp",
 		MAME_DIR .. "src/devices/cpu/upd7810/upd7810_table.cpp",
+		MAME_DIR .. "src/devices/cpu/upd7810/upd7810_macros.h",
 	}
 end
 
@@ -1508,6 +1612,10 @@ if (CPUS["MINX"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/minx/minx.cpp",
 		MAME_DIR .. "src/devices/cpu/minx/minx.h",
+		MAME_DIR .. "src/devices/cpu/minx/minxfunc.h",
+		MAME_DIR .. "src/devices/cpu/minx/minxopce.h",
+		MAME_DIR .. "src/devices/cpu/minx/minxopcf.h",
+		MAME_DIR .. "src/devices/cpu/minx/minxops.h",	
 	}
 end
 
@@ -1557,6 +1665,7 @@ if (CPUS["RSP"]~=null) then
 		MAME_DIR .. "src/devices/cpu/rsp/vsub.h",
 		MAME_DIR .. "src/devices/cpu/rsp/vsubc.h",
 		MAME_DIR .. "src/devices/cpu/rsp/vxor.h",
+		MAME_DIR .. "src/devices/cpu/rsp/rspdiv.h",
 	}
 end
 
@@ -1589,6 +1698,8 @@ if (CPUS["SATURN"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/saturn/saturn.cpp",
 		MAME_DIR .. "src/devices/cpu/saturn/saturn.h",
+		MAME_DIR .. "src/devices/cpu/saturn/satops.inc",
+		MAME_DIR .. "src/devices/cpu/saturn/sattable.inc",		
 	}
 end
 
@@ -1624,6 +1735,7 @@ if (CPUS["SM8500"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/sm8500/sm8500.cpp",
 		MAME_DIR .. "src/devices/cpu/sm8500/sm8500.h",
+		MAME_DIR .. "src/devices/cpu/sm8500/sm85ops.h",
 	}
 end
 
@@ -1640,6 +1752,7 @@ if (CPUS["S2650"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/s2650/s2650.cpp",
 		MAME_DIR .. "src/devices/cpu/s2650/s2650.h",
+		MAME_DIR .. "src/devices/cpu/s2650/s2650cpu.h",
 	}
 end
 
@@ -1656,6 +1769,9 @@ if (CPUS["SC61860"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/sc61860/sc61860.cpp",
 		MAME_DIR .. "src/devices/cpu/sc61860/sc61860.h",
+		--MAME_DIR .. "src/devices/cpu/sc61860/readpc.cpp",
+		MAME_DIR .. "src/devices/cpu/sc61860/scops.inc",
+		MAME_DIR .. "src/devices/cpu/sc61860/sctable.inc",
 	}
 end
 
@@ -1672,6 +1788,7 @@ if (CPUS["SPC700"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/spc700/spc700.cpp",
 		MAME_DIR .. "src/devices/cpu/spc700/spc700.h",
+		MAME_DIR .. "src/devices/cpu/spc700/spc700ds.h",
 	}
 end
 
@@ -1752,6 +1869,7 @@ if (CPUS["TMS7000"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/tms7000/tms7000.cpp",
 		MAME_DIR .. "src/devices/cpu/tms7000/tms7000.h",
+		MAME_DIR .. "src/devices/cpu/tms7000/tms70op.inc",
 	}
 end
 
@@ -1777,6 +1895,8 @@ if (CPUS["TMS9900"]~=null) then
 		MAME_DIR .. "src/devices/cpu/tms9900/tms9995.h",
 		MAME_DIR .. "src/devices/cpu/tms9900/ti990_10.cpp",
 		MAME_DIR .. "src/devices/cpu/tms9900/ti990_10.h",
+		MAME_DIR .. "src/devices/cpu/tms9900/99xxcore.h",
+		MAME_DIR .. "src/devices/cpu/tms9900/tms99com.h",
 	}
 end
 
@@ -1793,6 +1913,12 @@ if (CPUS["TMS340X0"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/tms34010/tms34010.cpp",
 		MAME_DIR .. "src/devices/cpu/tms34010/tms34010.h",
+		MAME_DIR .. "src/devices/cpu/tms34010/34010fld.inc",
+		MAME_DIR .. "src/devices/cpu/tms34010/34010gfx.inc",
+		MAME_DIR .. "src/devices/cpu/tms34010/34010ops.h",
+		MAME_DIR .. "src/devices/cpu/tms34010/34010ops.inc",
+		MAME_DIR .. "src/devices/cpu/tms34010/34010tbl.inc",
+		--MAME_DIR .. "src/devices/cpu/tms34010/dis34010.cpp",
 	}
 end
 
@@ -1809,6 +1935,7 @@ if (CPUS["TMS32010"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/tms32010/tms32010.cpp",
 		MAME_DIR .. "src/devices/cpu/tms32010/tms32010.h",
+		--MAME_DIR .. "src/devices/cpu/tms32010/dis32010.cpp",
 	}
 end
 
@@ -1825,6 +1952,7 @@ if (CPUS["TMS32025"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/tms32025/tms32025.cpp",
 		MAME_DIR .. "src/devices/cpu/tms32025/tms32025.h",
+		--MAME_DIR .. "src/devices/cpu/tms32025/dis32025.cpp",
 	}
 end
 
@@ -1841,6 +1969,7 @@ if (CPUS["TMS32031"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/tms32031/tms32031.cpp",
 		MAME_DIR .. "src/devices/cpu/tms32031/tms32031.h",
+		MAME_DIR .. "src/devices/cpu/tms32031/32031ops.inc",
 	}
 end
 
@@ -1857,6 +1986,8 @@ if (CPUS["TMS32051"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/tms32051/tms32051.cpp",
 		MAME_DIR .. "src/devices/cpu/tms32051/tms32051.h",
+		MAME_DIR .. "src/devices/cpu/tms32051/32051ops.h",
+		MAME_DIR .. "src/devices/cpu/tms32051/32051ops.inc",
 	}
 end
 
@@ -1929,6 +2060,7 @@ if (CPUS["TLCS900"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/tlcs900/tlcs900.cpp",
 		MAME_DIR .. "src/devices/cpu/tlcs900/tlcs900.h",
+		MAME_DIR .. "src/devices/cpu/tlcs900/900tbl.inc",
 	}
 end
 
@@ -1970,6 +2102,8 @@ if (CPUS["LR35902"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/lr35902/lr35902.cpp",
 		MAME_DIR .. "src/devices/cpu/lr35902/lr35902.h",
+		MAME_DIR .. "src/devices/cpu/lr35902/opc_cb.inc",
+		MAME_DIR .. "src/devices/cpu/lr35902/opc_main.inc",
 	}
 end
 
@@ -1986,6 +2120,14 @@ if (CPUS["Z180"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/z180/z180.cpp",
 		MAME_DIR .. "src/devices/cpu/z180/z180.h",
+		MAME_DIR .. "src/devices/cpu/z180/z180cb.inc",
+		MAME_DIR .. "src/devices/cpu/z180/z180dd.inc",
+		MAME_DIR .. "src/devices/cpu/z180/z180ed.inc",
+		MAME_DIR .. "src/devices/cpu/z180/z180fd.inc",
+		MAME_DIR .. "src/devices/cpu/z180/z180op.inc",
+		MAME_DIR .. "src/devices/cpu/z180/z180ops.h",
+		MAME_DIR .. "src/devices/cpu/z180/z180tbl.h",
+		MAME_DIR .. "src/devices/cpu/z180/z180xy.inc",
 		MAME_DIR .. "src/devices/cpu/z80/z80daisy.cpp",
 		MAME_DIR .. "src/devices/cpu/z80/z80daisy.h",
 	}
@@ -2004,6 +2146,11 @@ if (CPUS["Z8000"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/z8000/z8000.cpp",
 		MAME_DIR .. "src/devices/cpu/z8000/z8000.h",
+		--MAME_DIR .. "src/devices/cpu/z8000/makedab.cpp",
+		MAME_DIR .. "src/devices/cpu/z8000/z8000cpu.h",
+		MAME_DIR .. "src/devices/cpu/z8000/z8000dab.h",
+		MAME_DIR .. "src/devices/cpu/z8000/z8000ops.inc",
+		MAME_DIR .. "src/devices/cpu/z8000/z8000tbl.inc",
 	}
 end
 
@@ -2020,6 +2167,7 @@ if (CPUS["Z8"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/z8/z8.cpp",
 		MAME_DIR .. "src/devices/cpu/z8/z8.h",
+		MAME_DIR .. "src/devices/cpu/z8/z8ops.inc",
 	}
 end
 
@@ -2116,6 +2264,7 @@ if (CPUS["SCORE"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/score/score.cpp",
 		MAME_DIR .. "src/devices/cpu/score/score.h",
+		MAME_DIR .. "src/devices/cpu/score/scorem.h",
 	}
 end
 
@@ -2168,6 +2317,7 @@ if (CPUS["ALTO2"]~=null) then
 		MAME_DIR .. "src/devices/cpu/alto2/a2ram.h",
 		MAME_DIR .. "src/devices/cpu/alto2/a2roms.cpp",
 		MAME_DIR .. "src/devices/cpu/alto2/a2roms.h",
+		MAME_DIR .. "src/devices/cpu/alto2/a2jkff.h",
 	}
 end
 
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index 85e71249938..c3b468bc1be 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -178,6 +178,8 @@ project "formats"
 		MAME_DIR .. "src/lib/formats/c8280_dsk.h",
 		MAME_DIR .. "src/lib/formats/camplynx_cas.cpp",
 		MAME_DIR .. "src/lib/formats/camplynx_cas.h",
+		MAME_DIR .. "src/lib/formats/camplynx_dsk.cpp",
+		MAME_DIR .. "src/lib/formats/camplynx_dsk.h",
 		MAME_DIR .. "src/lib/formats/cbm_crt.cpp",
 		MAME_DIR .. "src/lib/formats/cbm_crt.h",
 		MAME_DIR .. "src/lib/formats/cbm_tap.cpp",
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index 4634338e96d..98acd5d94e7 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -34,8 +34,8 @@ project "netlist"
 		MAME_DIR .. "src/lib/netlist/plib/pconfig.h",
 		MAME_DIR .. "src/lib/netlist/plib/palloc.cpp",
 		MAME_DIR .. "src/lib/netlist/plib/palloc.h",
-    MAME_DIR .. "src/lib/netlist/plib/pfmtlog.cpp",
-    MAME_DIR .. "src/lib/netlist/plib/pfmtlog.h",
+		MAME_DIR .. "src/lib/netlist/plib/pfmtlog.cpp",
+		MAME_DIR .. "src/lib/netlist/plib/pfmtlog.h",
 		MAME_DIR .. "src/lib/netlist/plib/plists.h",
 		MAME_DIR .. "src/lib/netlist/plib/poptions.h",
 		MAME_DIR .. "src/lib/netlist/plib/pparser.cpp",
@@ -48,7 +48,7 @@ project "netlist"
 		MAME_DIR .. "src/lib/netlist/plib/pstring.h",
 		MAME_DIR .. "src/lib/netlist/plib/pstream.cpp",
 		MAME_DIR .. "src/lib/netlist/plib/pstream.h",
-    MAME_DIR .. "src/lib/netlist/plib/ptypes.h",
+		MAME_DIR .. "src/lib/netlist/plib/ptypes.h",
 		MAME_DIR .. "src/lib/netlist/tools/nl_convert.cpp",
 		MAME_DIR .. "src/lib/netlist/tools/nl_convert.h",
 		MAME_DIR .. "src/lib/netlist/analog/nld_bjt.cpp",
@@ -69,6 +69,9 @@ project "netlist"
 		MAME_DIR .. "src/lib/netlist/solver/nld_ms_sor.h",
 		MAME_DIR .. "src/lib/netlist/solver/nld_ms_sor_mat.h",
 		MAME_DIR .. "src/lib/netlist/solver/nld_ms_gmres.h",
+		MAME_DIR .. "src/lib/netlist/solver/mat_cr.h",
+		MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct_lu.h",
+		MAME_DIR .. "src/lib/netlist/solver/vector_base.h",		
 		MAME_DIR .. "src/lib/netlist/devices/nld_4020.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_4020.h",
 		MAME_DIR .. "src/lib/netlist/devices/nld_4066.cpp",
@@ -160,5 +163,5 @@ project "netlist"
 		MAME_DIR .. "src/lib/netlist/macro/nlm_opamp.cpp",
 		MAME_DIR .. "src/lib/netlist/macro/nlm_opamp.h",
 		MAME_DIR .. "src/lib/netlist/macro/nlm_other.cpp",
-		MAME_DIR .. "src/lib/netlist/macro/nlm_other.h",
+		MAME_DIR .. "src/lib/netlist/macro/nlm_other.h",		
 }
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index f7911a05047..25d4454e503 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -35,7 +35,14 @@ function osdmodulesbuild()
 
 	files {
 		MAME_DIR .. "src/osd/osdnet.cpp",
+		MAME_DIR .. "src/osd/osdnet.h",
+		MAME_DIR .. "src/osd/modules/debugger/debug_module.h",
+		MAME_DIR .. "src/osd/modules/font/font_module.h",
+		MAME_DIR .. "src/osd/modules/midi/midi_module.h",
+		MAME_DIR .. "src/osd/modules/netdev/netdev_module.h",
+		MAME_DIR .. "src/osd/modules/sound/sound_module.h",
 		MAME_DIR .. "src/osd/modules/lib/osdobj_common.cpp",
+		MAME_DIR .. "src/osd/modules/lib/osdobj_common.h",
 		MAME_DIR .. "src/osd/modules/debugger/none.cpp",
 		MAME_DIR .. "src/osd/modules/debugger/debugint.cpp",
 		MAME_DIR .. "src/osd/modules/debugger/debugwin.cpp",
@@ -71,6 +78,10 @@ function osdmodulesbuild()
 			MAME_DIR .. "src/osd/modules/render/drawogl.cpp",
 			MAME_DIR .. "src/osd/modules/opengl/gl_shader_tool.cpp",
 			MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.cpp",
+			MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.h",
+			MAME_DIR .. "src/osd/modules/opengl/gl_shader_tool.h",
+			MAME_DIR .. "src/osd/modules/opengl/osd_opengl.h",
+			MAME_DIR .. "src/osd/modules/opengl/SDL1211_opengl.h",
 		}
 		defines {
 			"USE_OPENGL=1",
@@ -104,14 +115,23 @@ function osdmodulesbuild()
 	if _OPTIONS["USE_QTDEBUG"]=="1" then
 		files {
 			MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.cpp",
+			MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.h",
 			MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.cpp",
+			MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.h",
 			MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.cpp",
+			MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.h",
 			MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.cpp",
+			MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.h",
 			MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.cpp",
+			MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.h",
 			MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.cpp",
+			MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.h",
 			MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.cpp",
+			MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.h",
 			MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.cpp",
 			MAME_DIR .. "src/osd/modules/debugger/qt/deviceinformationwindow.cpp",
+			MAME_DIR .. "src/osd/modules/debugger/qt/deviceinformationwindow.h",
+			MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.h",
 			GEN_DIR .. "osd/modules/debugger/qt/debuggerview.moc.cpp",
 			GEN_DIR .. "osd/modules/debugger/qt/windowqt.moc.cpp",
 			GEN_DIR .. "osd/modules/debugger/qt/logwindow.moc.cpp",
diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua
index 6ec296090e1..984be5c6bff 100644
--- a/scripts/src/osd/osdmini.lua
+++ b/scripts/src/osd/osdmini.lua
@@ -30,8 +30,12 @@ project ("osd_" .. _OPTIONS["osd"])
 
 	files {
 		MAME_DIR .. "src/osd/osdnet.cpp",
+		MAME_DIR .. "src/osd/osdnet.h",
 		MAME_DIR .. "src/osd/osdmini/minimain.cpp",
+		MAME_DIR .. "src/osd/osdmini/osdmini.h",
+		MAME_DIR .. "src/osd/osdepend.h",
 		MAME_DIR .. "src/osd/modules/lib/osdobj_common.cpp",
+		MAME_DIR .. "src/osd/modules/lib/osdobj_common.h",
 		MAME_DIR .. "src/osd/modules/font/font_sdl.cpp",
 		MAME_DIR .. "src/osd/modules/font/font_windows.cpp",
 		MAME_DIR .. "src/osd/modules/font/font_osx.cpp",
@@ -85,7 +89,9 @@ project ("ocore_" .. _OPTIONS["osd"])
 
 	files {
 		MAME_DIR .. "src/osd/osdcore.cpp",
+		MAME_DIR .. "src/osd/osdcore.h",
 		MAME_DIR .. "src/osd/modules/osdmodule.cpp",
+		MAME_DIR .. "src/osd/modules/osdmodule.h",		
 		MAME_DIR .. "src/osd/osdmini/minidir.cpp",
 		MAME_DIR .. "src/osd/osdmini/minifile.cpp",
 		MAME_DIR .. "src/osd/osdmini/minimisc.cpp",
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index e1a002c02b8..12b80c1a979 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -329,43 +329,72 @@ project ("osd_" .. _OPTIONS["osd"])
 		files {
 			MAME_DIR .. "src/osd/modules/debugger/debugosx.mm",
 			MAME_DIR .. "src/osd/modules/debugger/osx/breakpointsview.mm",
+			MAME_DIR .. "src/osd/modules/debugger/osx/breakpointsview.h",
 			MAME_DIR .. "src/osd/modules/debugger/osx/consoleview.mm",
+			MAME_DIR .. "src/osd/modules/debugger/osx/consoleview.h",
 			MAME_DIR .. "src/osd/modules/debugger/osx/debugcommandhistory.mm",
+			MAME_DIR .. "src/osd/modules/debugger/osx/debugcommandhistory.h",
 			MAME_DIR .. "src/osd/modules/debugger/osx/debugconsole.mm",
+			MAME_DIR .. "src/osd/modules/debugger/osx/debugconsole.h",
 			MAME_DIR .. "src/osd/modules/debugger/osx/debugview.mm",
+			MAME_DIR .. "src/osd/modules/debugger/osx/debugview.h",
 			MAME_DIR .. "src/osd/modules/debugger/osx/debugwindowhandler.mm",
+			MAME_DIR .. "src/osd/modules/debugger/osx/debugwindowhandler.h",
 			MAME_DIR .. "src/osd/modules/debugger/osx/deviceinfoviewer.mm",
+			MAME_DIR .. "src/osd/modules/debugger/osx/deviceinfoviewer.h",
 			MAME_DIR .. "src/osd/modules/debugger/osx/devicesviewer.mm",
+			MAME_DIR .. "src/osd/modules/debugger/osx/devicesviewer.h",
 			MAME_DIR .. "src/osd/modules/debugger/osx/disassemblyview.mm",
 			MAME_DIR .. "src/osd/modules/debugger/osx/disassemblyviewer.mm",
+			MAME_DIR .. "src/osd/modules/debugger/osx/disassemblyviewer.h",
 			MAME_DIR .. "src/osd/modules/debugger/osx/errorlogview.mm",
+			MAME_DIR .. "src/osd/modules/debugger/osx/errorlogview.h",
+			MAME_DIR .. "src/osd/modules/debugger/osx/disassemblyview.h",
 			MAME_DIR .. "src/osd/modules/debugger/osx/errorlogviewer.mm",
+			MAME_DIR .. "src/osd/modules/debugger/osx/errorlogviewer.h",
 			MAME_DIR .. "src/osd/modules/debugger/osx/memoryview.mm",
+			MAME_DIR .. "src/osd/modules/debugger/osx/memoryview.h",
 			MAME_DIR .. "src/osd/modules/debugger/osx/memoryviewer.mm",
+			MAME_DIR .. "src/osd/modules/debugger/osx/memoryviewer.h",
 			MAME_DIR .. "src/osd/modules/debugger/osx/pointsviewer.mm",
+			MAME_DIR .. "src/osd/modules/debugger/osx/pointsviewer.h",
 			MAME_DIR .. "src/osd/modules/debugger/osx/registersview.mm",
+			MAME_DIR .. "src/osd/modules/debugger/osx/registersview.h",
 			MAME_DIR .. "src/osd/modules/debugger/osx/watchpointsview.mm",
+			MAME_DIR .. "src/osd/modules/debugger/osx/watchpointsview.h",		
+			MAME_DIR .. "src/osd/modules/debugger/osx/debugosx.h",
 		}
 		if _OPTIONS["SDL_LIBVER"]=="sdl" then
 			-- SDLMain_tmpl isn't necessary for SDL2
 			files {
 				MAME_DIR .. "src/osd/sdl/SDLMain_tmpl.mm",
+				MAME_DIR .. "src/osd/sdl/SDLMain_tmpl.h",
 			}
 		end
 	end
 
 	files {
+		MAME_DIR .. "src/osd/sdl/osdsdl.h",
+		MAME_DIR .. "src/osd/sdl/sdlinc.h",
+		MAME_DIR .. "src/osd/sdl/sdlprefix.h",
 		MAME_DIR .. "src/osd/sdl/sdlmain.cpp",
+		MAME_DIR .. "src/osd/osdepend.h",
 		MAME_DIR .. "src/osd/sdl/input.cpp",
+		MAME_DIR .. "src/osd/sdl/input.h",
 		MAME_DIR .. "src/osd/sdl/video.cpp",
+		MAME_DIR .. "src/osd/sdl/video.h",
 		MAME_DIR .. "src/osd/sdl/window.cpp",
+		MAME_DIR .. "src/osd/sdl/window.h",
+		MAME_DIR .. "src/osd/modules/osdwindow.h",
 		MAME_DIR .. "src/osd/sdl/output.cpp",
 		MAME_DIR .. "src/osd/sdl/watchdog.cpp",
+		MAME_DIR .. "src/osd/sdl/watchdog.h",
 		MAME_DIR .. "src/osd/modules/render/drawsdl.cpp",
 	}
 	if _OPTIONS["SDL_LIBVER"]=="sdl2" then
 		files {
 			MAME_DIR .. "src/osd/modules/render/draw13.cpp",
+			MAME_DIR .. "src/osd/modules/render/blit13.h",
 		}
 	end
 
@@ -391,15 +420,21 @@ project ("ocore_" .. _OPTIONS["osd"])
 
 	files {
 		MAME_DIR .. "src/osd/osdcore.cpp",
+		MAME_DIR .. "src/osd/osdcore.h",
 		MAME_DIR .. "src/osd/strconv.cpp",
+		MAME_DIR .. "src/osd/strconv.h",
 		MAME_DIR .. "src/osd/sdl/sdldir.cpp",
 		MAME_DIR .. "src/osd/sdl/sdlfile.cpp",
+		MAME_DIR .. "src/osd/sdl/sdlfile.h",
 		MAME_DIR .. "src/osd/sdl/sdlptty_" .. BASE_TARGETOS ..".cpp",
 		MAME_DIR .. "src/osd/sdl/sdlsocket.cpp",
 		MAME_DIR .. "src/osd/sdl/sdlos_" .. SDLOS_TARGETOS .. ".cpp",
 		MAME_DIR .. "src/osd/modules/osdmodule.cpp",
+		MAME_DIR .. "src/osd/modules/osdmodule.h",		
 		MAME_DIR .. "src/osd/modules/lib/osdlib_" .. SDLOS_TARGETOS .. ".cpp",
+		MAME_DIR .. "src/osd/modules/lib/osdlib.h",
 		MAME_DIR .. "src/osd/modules/sync/sync_" .. SYNC_IMPLEMENTATION .. ".cpp",
+		MAME_DIR .. "src/osd/modules/sync/osdsync.h",
 	}
 
 	if _OPTIONS["NOASM"]=="1" then
@@ -414,6 +449,7 @@ project ("ocore_" .. _OPTIONS["osd"])
 
 	if _OPTIONS["targetos"]=="macosx" then
 		files {
+			MAME_DIR .. "src/osd/sdl/osxutils.h",
 			MAME_DIR .. "src/osd/sdl/osxutils.mm",
 		}
 	end
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index 69e3e6d173a..26110d16d3e 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -129,30 +129,55 @@ project ("osd_" .. _OPTIONS["osd"])
 
 	files {
 		MAME_DIR .. "src/osd/modules/render/drawd3d.cpp",
+		MAME_DIR .. "src/osd/modules/render/drawd3d.h",
 		MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp",
 		MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp",
+		MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h",
+		MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.h",
+		MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h",
 		MAME_DIR .. "src/osd/modules/render/drawdd.cpp",
 		MAME_DIR .. "src/osd/modules/render/drawgdi.cpp",
 		MAME_DIR .. "src/osd/modules/render/drawnone.cpp",
 		MAME_DIR .. "src/osd/windows/input.cpp",
+		MAME_DIR .. "src/osd/windows/input.h",
 		MAME_DIR .. "src/osd/windows/output.cpp",
+		MAME_DIR .. "src/osd/windows/output.h",
 		MAME_DIR .. "src/osd/windows/video.cpp",
+		MAME_DIR .. "src/osd/windows/video.h",
 		MAME_DIR .. "src/osd/windows/window.cpp",
+		MAME_DIR .. "src/osd/windows/window.h",
+		MAME_DIR .. "src/osd/modules/osdwindow.h",
 		MAME_DIR .. "src/osd/windows/winmenu.cpp",
 		MAME_DIR .. "src/osd/windows/winmain.cpp",
+		MAME_DIR .. "src/osd/windows/winmain.h",
+		MAME_DIR .. "src/osd/osdepend.h",
 		MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.h",
 		MAME_DIR .. "src/osd/modules/debugger/win/debugbaseinfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/debugbaseinfo.h",
 		MAME_DIR .. "src/osd/modules/debugger/win/debugviewinfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/debugviewinfo.h",
 		MAME_DIR .. "src/osd/modules/debugger/win/debugwininfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/debugwininfo.h",
 		MAME_DIR .. "src/osd/modules/debugger/win/disasmbasewininfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/disasmbasewininfo.h",
 		MAME_DIR .. "src/osd/modules/debugger/win/disasmviewinfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/disasmviewinfo.h",
 		MAME_DIR .. "src/osd/modules/debugger/win/disasmwininfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/disasmwininfo.h",
 		MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.h",
 		MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.h",
 		MAME_DIR .. "src/osd/modules/debugger/win/memoryviewinfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/memoryviewinfo.h",
 		MAME_DIR .. "src/osd/modules/debugger/win/memorywininfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/memorywininfo.h",
 		MAME_DIR .. "src/osd/modules/debugger/win/pointswininfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/pointswininfo.h",
 		MAME_DIR .. "src/osd/modules/debugger/win/uimetrics.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/uimetrics.h",
+		MAME_DIR .. "src/osd/modules/debugger/win/debugwin.h",
 	}
 
 
@@ -183,18 +208,31 @@ project ("ocore_" .. _OPTIONS["osd"])
 	}
 
 	files {
+		MAME_DIR .. "src/osd/eigccppc.h",
+		MAME_DIR .. "src/osd/eigccx86.h",
+		MAME_DIR .. "src/osd/eivc.h",
+		MAME_DIR .. "src/osd/eivcx86.h",
+		MAME_DIR .. "src/osd/eminline.h",
+		MAME_DIR .. "src/osd/osdcomm.h",
 		MAME_DIR .. "src/osd/osdcore.cpp",
+		MAME_DIR .. "src/osd/osdcore.h",
 		MAME_DIR .. "src/osd/strconv.cpp",
+		MAME_DIR .. "src/osd/strconv.h",
 		MAME_DIR .. "src/osd/windows/main.cpp",
 		MAME_DIR .. "src/osd/windows/windir.cpp",
 		MAME_DIR .. "src/osd/windows/winfile.cpp",
 		MAME_DIR .. "src/osd/modules/sync/sync_windows.cpp",
+		MAME_DIR .. "src/osd/modules/sync/osdsync.h",
 		MAME_DIR .. "src/osd/windows/winutf8.cpp",
+		MAME_DIR .. "src/osd/windows/winutf8.h",
 		MAME_DIR .. "src/osd/windows/winutil.cpp",
+		MAME_DIR .. "src/osd/windows/winutil.h",
+		MAME_DIR .. "src/osd/windows/winfile.h",
 		MAME_DIR .. "src/osd/windows/winclip.cpp",
 		MAME_DIR .. "src/osd/windows/winsocket.cpp",
 		MAME_DIR .. "src/osd/windows/winptty.cpp",
 		MAME_DIR .. "src/osd/modules/osdmodule.cpp",
+		MAME_DIR .. "src/osd/modules/osdmodule.h",
 		MAME_DIR .. "src/osd/modules/lib/osdlib_win32.cpp",
 	}
 
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index de0b72a04d0..de39fa7901f 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -766,17 +766,27 @@ includedirs {
 
 files {
 	MAME_DIR .. "src/tools/imgtool/main.cpp",
+	MAME_DIR .. "src/tools/imgtool/main.h",
 	MAME_DIR .. "src/tools/imgtool/stream.cpp",
+	MAME_DIR .. "src/tools/imgtool/stream.h",
 	MAME_DIR .. "src/tools/imgtool/library.cpp",
+	MAME_DIR .. "src/tools/imgtool/library.h",
 	MAME_DIR .. "src/tools/imgtool/modules.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules.h",
 	MAME_DIR .. "src/tools/imgtool/iflopimg.cpp",
+	MAME_DIR .. "src/tools/imgtool/iflopimg.h",
 	MAME_DIR .. "src/tools/imgtool/filter.cpp",
+	MAME_DIR .. "src/tools/imgtool/filter.h",
 	MAME_DIR .. "src/tools/imgtool/filteoln.cpp",
 	MAME_DIR .. "src/tools/imgtool/filtbas.cpp",
 	MAME_DIR .. "src/tools/imgtool/imgtool.cpp",
+	MAME_DIR .. "src/tools/imgtool/imgtool.h",
 	MAME_DIR .. "src/tools/imgtool/imgterrs.cpp",
+	MAME_DIR .. "src/tools/imgtool/imgterrs.h",	
 	MAME_DIR .. "src/tools/imgtool/imghd.cpp", 
+	MAME_DIR .. "src/tools/imgtool/imghd.h",
 	MAME_DIR .. "src/tools/imgtool/charconv.cpp",
+	MAME_DIR .. "src/tools/imgtool/charconv.h",
 	MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.cpp",
 	MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.h",
 	MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.cpp",
@@ -790,12 +800,14 @@ files {
 	MAME_DIR .. "src/tools/imgtool/modules/ti990hd.cpp",
 	MAME_DIR .. "src/tools/imgtool/modules/concept.cpp",
 	MAME_DIR .. "src/tools/imgtool/modules/fat.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules/fat.h",
 	MAME_DIR .. "src/tools/imgtool/modules/pc_flop.cpp",
 	MAME_DIR .. "src/tools/imgtool/modules/pc_hard.cpp",
 	MAME_DIR .. "src/tools/imgtool/modules/prodos.cpp",
 	MAME_DIR .. "src/tools/imgtool/modules/vzdos.cpp",
 	MAME_DIR .. "src/tools/imgtool/modules/thomson.cpp",
 	MAME_DIR .. "src/tools/imgtool/modules/macutil.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules/macutil.h",
 	MAME_DIR .. "src/tools/imgtool/modules/cybiko.cpp",
 	MAME_DIR .. "src/tools/imgtool/modules/cybikoxt.cpp",
 	MAME_DIR .. "src/tools/imgtool/modules/psion.cpp",
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index f0589525a7c..478c26ca447 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -816,6 +816,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/ssfindo.cpp",
 	MAME_DIR .. "src/mame/drivers/aristmk5.cpp",
 	MAME_DIR .. "src/mame/machine/archimds.cpp",
+	MAME_DIR .. "src/mame/includes/archimds.h",
 	MAME_DIR .. "src/mame/video/archimds.cpp",
 }
 
@@ -896,6 +897,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/atarig1.cpp",
 	MAME_DIR .. "src/mame/includes/atarig1.h",
 	MAME_DIR .. "src/mame/video/atarig1.cpp",
+	MAME_DIR .. "src/mame/includes/slapstic.h",
 	MAME_DIR .. "src/mame/drivers/atarig42.cpp",
 	MAME_DIR .. "src/mame/includes/atarig42.h",
 	MAME_DIR .. "src/mame/video/atarig42.cpp",
@@ -1004,6 +1006,9 @@ files {
 	MAME_DIR .. "src/mame/includes/jaguar.h",
 	MAME_DIR .. "src/mame/audio/jaguar.cpp",
 	MAME_DIR .. "src/mame/video/jaguar.cpp",
+	MAME_DIR .. "src/mame/video/jagblit.h",
+	MAME_DIR .. "src/mame/video/jagblit.inc",
+	MAME_DIR .. "src/mame/video/jagobj.inc",
 	MAME_DIR .. "src/mame/drivers/jedi.cpp",
 	MAME_DIR .. "src/mame/includes/jedi.h",
 	MAME_DIR .. "src/mame/audio/jedi.cpp",
@@ -1214,6 +1219,8 @@ files {
 	MAME_DIR .. "src/mame/includes/bfm_ad5.h",
 	MAME_DIR .. "src/mame/drivers/bfm_ad5sw.cpp",
 	MAME_DIR .. "src/mame/drivers/bfm_sc45_helper.cpp",
+	MAME_DIR .. "src/mame/drivers/bfm_sc45_helper.h",
+	MAME_DIR .. "src/mame/includes/bfm_sc45.h",
 	MAME_DIR .. "src/mame/drivers/bfm_swp.cpp",
 	MAME_DIR .. "src/mame/drivers/bfmsys83.cpp",
 	MAME_DIR .. "src/mame/drivers/bfmsys85.cpp",
@@ -1266,6 +1273,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/kenseim.cpp",
 	MAME_DIR .. "src/mame/drivers/cps2.cpp",
 	MAME_DIR .. "src/mame/machine/cps2crpt.cpp",
+	MAME_DIR .. "src/mame/machine/cps2crypt.h",
 	MAME_DIR .. "src/mame/drivers/cps3.cpp",
 	MAME_DIR .. "src/mame/includes/cps3.h",
 	MAME_DIR .. "src/mame/audio/cps3.cpp",
@@ -1522,6 +1530,7 @@ files {
 	MAME_DIR .. "src/mame/video/vaportra.cpp",
 	MAME_DIR .. "src/mame/machine/deco102.cpp",
 	MAME_DIR .. "src/mame/machine/decocrpt.cpp",
+	MAME_DIR .. "src/mame/includes/decocrpt.h",
 	MAME_DIR .. "src/mame/machine/deco104.cpp",
 	MAME_DIR .. "src/mame/machine/deco104.h",
 	MAME_DIR .. "src/mame/machine/deco146.cpp",
@@ -1641,6 +1650,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/exidyttl.cpp",
 	MAME_DIR .. "src/mame/drivers/maxaflex.cpp",
 	MAME_DIR .. "src/mame/machine/atari.cpp",
+	MAME_DIR .. "src/mame/includes/atari.h",
 	MAME_DIR .. "src/mame/video/atari.cpp",
 	MAME_DIR .. "src/mame/video/antic.cpp",
 	MAME_DIR .. "src/mame/video/antic.h",
@@ -1697,6 +1707,7 @@ files {
 	MAME_DIR .. "src/mame/includes/gaelco.h",
 	MAME_DIR .. "src/mame/video/gaelco.cpp",
 	MAME_DIR .. "src/mame/machine/gaelcrpt.cpp",
+	MAME_DIR .. "src/mame/includes/gaelcrpt.h",
 	MAME_DIR .. "src/mame/drivers/gaelco2.cpp",
 	MAME_DIR .. "src/mame/includes/gaelco2.h",
 	MAME_DIR .. "src/mame/machine/gaelco2.cpp",
@@ -1859,6 +1870,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/m107.cpp",
 	MAME_DIR .. "src/mame/includes/m107.h",
 	MAME_DIR .. "src/mame/video/m107.cpp",
+	MAME_DIR .. "src/mame/includes/iremipt.h",
 	MAME_DIR .. "src/mame/drivers/olibochu.cpp",
 	MAME_DIR .. "src/mame/drivers/redalert.cpp",
 	MAME_DIR .. "src/mame/includes/redalert.h",
@@ -1987,6 +1999,7 @@ files {
 	MAME_DIR .. "src/mame/video/djboy.cpp",
 	MAME_DIR .. "src/mame/drivers/expro02.cpp",
 	MAME_DIR .. "src/mame/drivers/galpanic.cpp",
+	MAME_DIR .. "src/mame/includes/galpnipt.h",
 	MAME_DIR .. "src/mame/includes/galpanic.h",
 	MAME_DIR .. "src/mame/video/galpanic.cpp",
 	MAME_DIR .. "src/mame/drivers/galpani2.cpp",
@@ -2280,6 +2293,7 @@ files {
 	MAME_DIR .. "src/mame/includes/yiear.h",
 	MAME_DIR .. "src/mame/video/yiear.cpp",
 	MAME_DIR .. "src/mame/drivers/zr107.cpp",
+	MAME_DIR .. "src/mame/includes/konamipt.h",
 	MAME_DIR .. "src/mame/video/konami_helper.cpp",
 	MAME_DIR .. "src/mame/video/konami_helper.h",
 	MAME_DIR .. "src/mame/video/k007121.cpp",
@@ -2700,7 +2714,9 @@ files {
 	MAME_DIR .. "src/mame/audio/wiping.h",
 	MAME_DIR .. "src/mame/video/wiping.cpp",
 	MAME_DIR .. "src/mame/machine/nb1413m3.cpp",
+	MAME_DIR .. "src/mame/includes/nb1413m3.h",
 	MAME_DIR .. "src/mame/machine/nb1414m4.cpp",
+	MAME_DIR .. "src/mame/includes/nb1414m4.h",
 }
 
 createMAMEProjects(_target, _subtarget, "nintendo")
@@ -2975,6 +2991,7 @@ files {
 	MAME_DIR .. "src/mame/machine/segabb.cpp",
 	MAME_DIR .. "src/mame/machine/segabb.h",
 	MAME_DIR .. "src/mame/machine/megadriv.cpp",
+	MAME_DIR .. "src/mame/includes/md_cons.h",
 	MAME_DIR .. "src/mame/drivers/megadrvb.cpp",
 	MAME_DIR .. "src/mame/drivers/megaplay.cpp",
 	MAME_DIR .. "src/mame/drivers/megatech.cpp",
@@ -2990,6 +3007,7 @@ files {
 	MAME_DIR .. "src/mame/audio/dsbz80.h",
 	MAME_DIR .. "src/mame/drivers/model2.cpp",
 	MAME_DIR .. "src/mame/includes/model2.h",
+	MAME_DIR .. "src/mame/video/model2rd.inc",
 	MAME_DIR .. "src/mame/video/model2.cpp",
 	MAME_DIR .. "src/mame/drivers/model3.cpp",
 	MAME_DIR .. "src/mame/includes/model3.h",
@@ -2998,6 +3016,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/monacogp.cpp",
 	MAME_DIR .. "src/mame/drivers/naomi.cpp",
 	MAME_DIR .. "src/mame/includes/naomi.h",
+	MAME_DIR .. "src/mame/includes/dc.h",
 	MAME_DIR .. "src/mame/drivers/segasp.cpp",
 	MAME_DIR .. "src/mame/includes/segasp.h",
 	MAME_DIR .. "src/mame/machine/dc.cpp",
@@ -3080,6 +3099,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/segaybd.cpp",
 	MAME_DIR .. "src/mame/includes/segaybd.h",
 	MAME_DIR .. "src/mame/video/segaybd.cpp",
+	MAME_DIR .. "src/mame/includes/segaipt.h",
 	MAME_DIR .. "src/mame/drivers/sg1000a.cpp",
 	MAME_DIR .. "src/mame/drivers/stactics.cpp",
 	MAME_DIR .. "src/mame/includes/stactics.h",
@@ -3214,6 +3234,8 @@ files {
 	MAME_DIR .. "src/mame/drivers/aleck64.cpp",
 	MAME_DIR .. "src/mame/machine/n64.cpp",
 	MAME_DIR .. "src/mame/video/n64.cpp",
+	MAME_DIR .. "src/mame/video/n64types.h",
+	MAME_DIR .. "src/mame/video/rdpfiltr.inc",		
 	MAME_DIR .. "src/mame/video/n64.h",
 	MAME_DIR .. "src/mame/video/rdpblend.cpp",
 	MAME_DIR .. "src/mame/video/rdpblend.h",
@@ -3544,6 +3566,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/taito_b.cpp",
 	MAME_DIR .. "src/mame/includes/taito_b.h",
 	MAME_DIR .. "src/mame/video/taito_b.cpp",
+	MAME_DIR .. "src/mame/includes/taitoipt.h",
 	MAME_DIR .. "src/mame/drivers/taito_f2.cpp",
 	MAME_DIR .. "src/mame/includes/taito_f2.h",
 	MAME_DIR .. "src/mame/video/taito_f2.cpp",
@@ -3819,6 +3842,7 @@ files {
 	MAME_DIR .. "src/mame/includes/toaplan1.h",
 	MAME_DIR .. "src/mame/machine/toaplan1.cpp",
 	MAME_DIR .. "src/mame/video/toaplan1.cpp",
+	MAME_DIR .. "src/mame/includes/toaplipt.h",
 	MAME_DIR .. "src/mame/drivers/toaplan2.cpp",
 	MAME_DIR .. "src/mame/includes/toaplan2.h",
 	MAME_DIR .. "src/mame/video/toaplan2.cpp",
@@ -4096,6 +4120,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/wpc_s.cpp",
 	MAME_DIR .. "src/mame/machine/wpc.cpp",
 	MAME_DIR .. "src/mame/machine/wpc.h",
+	MAME_DIR .. "src/mame/includes/wpc_pin.h",
 	MAME_DIR .. "src/mame/audio/wpcsnd.cpp",
 	MAME_DIR .. "src/mame/audio/wpcsnd.h",
 	MAME_DIR .. "src/mame/video/wpc_dmd.cpp",
@@ -4121,6 +4146,7 @@ createMAMEProjects(_target, _subtarget, "misc")
 files {
 	MAME_DIR .. "src/mame/drivers/1945kiii.cpp",
 	MAME_DIR .. "src/mame/drivers/39in1.cpp",
+	MAME_DIR .. "src/mame/machine/pxa255.h",
 	MAME_DIR .. "src/mame/drivers/3do.cpp",
 	MAME_DIR .. "src/mame/includes/3do.h",
 	MAME_DIR .. "src/mame/machine/3do.cpp",
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 5e85c733567..bb014507554 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -930,6 +930,7 @@ files {
 	MAME_DIR .. "src/mame/video/tia.h",
 	MAME_DIR .. "src/mame/machine/atari.cpp",
 	MAME_DIR .. "src/mame/video/atari.cpp",
+	MAME_DIR .. "src/mame/includes/atari.h",
 	MAME_DIR .. "src/mame/video/antic.cpp",
 	MAME_DIR .. "src/mame/video/antic.h",
 	MAME_DIR .. "src/mame/video/gtia.cpp",
@@ -938,6 +939,9 @@ files {
 	MAME_DIR .. "src/mame/includes/jaguar.h",
 	MAME_DIR .. "src/mame/audio/jaguar.cpp",
 	MAME_DIR .. "src/mame/video/jaguar.cpp",
+	MAME_DIR .. "src/mame/video/jagblit.h",
+	MAME_DIR .. "src/mame/video/jagblit.inc",
+	MAME_DIR .. "src/mame/video/jagobj.inc",	
 	MAME_DIR .. "src/mame/audio/gorf.cpp",
 	MAME_DIR .. "src/mame/audio/wow.cpp",
 	MAME_DIR .. "src/mame/drivers/astrocde.cpp",
@@ -953,6 +957,8 @@ files {
 	MAME_DIR .. "src/mame/audio/snes_snd.h",
 	MAME_DIR .. "src/mame/machine/n64.cpp",
 	MAME_DIR .. "src/mame/video/n64.cpp",
+	MAME_DIR .. "src/mame/video/n64types.h",
+	MAME_DIR .. "src/mame/video/rdpfiltr.inc",	
 	MAME_DIR .. "src/mame/video/n64.h",
 	MAME_DIR .. "src/mame/video/rdpblend.cpp",
 	MAME_DIR .. "src/mame/video/rdpblend.h",
@@ -961,6 +967,7 @@ files {
 	MAME_DIR .. "src/mame/machine/megadriv.cpp",
 	MAME_DIR .. "src/mame/drivers/naomi.cpp",
 	MAME_DIR .. "src/mame/includes/naomi.h",
+	MAME_DIR .. "src/mame/includes/dc.h",
 	MAME_DIR .. "src/mame/machine/awboard.cpp",
 	MAME_DIR .. "src/mame/machine/awboard.h",
 	MAME_DIR .. "src/mame/machine/dc.cpp",
@@ -1333,7 +1340,6 @@ files {
 createMESSProjects(_target, _subtarget, "camputers")
 files {
 	MAME_DIR .. "src/mame/drivers/camplynx.cpp",
-	MAME_DIR .. "src/lib/formats/camplynx_dsk.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "canon")
@@ -1756,6 +1762,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/mmodular.cpp",
 	MAME_DIR .. "src/mame/drivers/stratos.cpp",
 	MAME_DIR .. "src/mame/machine/mboard.cpp",
+	MAME_DIR .. "src/mame/includes/mboard.h",
 }
 
 createMESSProjects(_target, _subtarget, "hitachi")
@@ -2119,6 +2126,10 @@ files {
 	MAME_DIR .. "src/mame/includes/snes.h",
 	MAME_DIR .. "src/mame/machine/snescx4.cpp",
 	MAME_DIR .. "src/mame/machine/snescx4.h",
+	MAME_DIR .. "src/mame/machine/cx4data.inc",
+	MAME_DIR .. "src/mame/machine/cx4fn.inc",
+	MAME_DIR .. "src/mame/machine/cx4oam.inc",
+	MAME_DIR .. "src/mame/machine/cx4ops.inc",
 	MAME_DIR .. "src/mame/drivers/vboy.cpp",
 	MAME_DIR .. "src/mame/audio/vboy.cpp",
 	MAME_DIR .. "src/mame/audio/vboy.h",
@@ -2158,7 +2169,8 @@ files {
 	MAME_DIR .. "src/mame/drivers/m24.cpp",
 	MAME_DIR .. "src/mame/machine/m24_kbd.cpp",
 	MAME_DIR .. "src/mame/machine/m24_kbd.h",
-	MAME_DIR .. "src/mame/machine/m24_z8000.cpp"
+	MAME_DIR .. "src/mame/machine/m24_z8000.cpp",
+	MAME_DIR .. "src/mame/machine/m24_z8000.h",
 }
 
 createMESSProjects(_target, _subtarget, "olympia")
@@ -2207,6 +2219,7 @@ files {
 createMESSProjects(_target, _subtarget, "palm")
 files {
 	MAME_DIR .. "src/mame/drivers/palm.cpp",
+	MAME_DIR .. "src/mame/drivers/palm_dbg.inc",
 	MAME_DIR .. "src/mame/drivers/palmz22.cpp",
 }
 
@@ -2387,6 +2400,7 @@ files {
 	MAME_DIR .. "src/mame/machine/dccons.cpp",
 	MAME_DIR .. "src/mame/drivers/megadriv.cpp",
 	MAME_DIR .. "src/mame/includes/megadriv.h",
+	MAME_DIR .. "src/mame/includes/md_cons.h",
 	MAME_DIR .. "src/mame/drivers/saturn.cpp",
 	MAME_DIR .. "src/mame/drivers/segapico.cpp",
 	MAME_DIR .. "src/mame/drivers/sega_sawatte.cpp",
@@ -2428,12 +2442,16 @@ files {
 	MAME_DIR .. "src/mame/includes/pocketc.h",
 	MAME_DIR .. "src/mame/video/pc1401.cpp",
 	MAME_DIR .. "src/mame/machine/pc1401.cpp",
+	MAME_DIR .. "src/mame/includes/pc1401.h",
 	MAME_DIR .. "src/mame/video/pc1403.cpp",
 	MAME_DIR .. "src/mame/machine/pc1403.cpp",
+	MAME_DIR .. "src/mame/includes/pc1403.h",
 	MAME_DIR .. "src/mame/video/pc1350.cpp",
 	MAME_DIR .. "src/mame/machine/pc1350.cpp",
+	MAME_DIR .. "src/mame/includes/pc1350.h",
 	MAME_DIR .. "src/mame/video/pc1251.cpp",
 	MAME_DIR .. "src/mame/machine/pc1251.cpp",
+	MAME_DIR .. "src/mame/includes/pc1251.h",
 	MAME_DIR .. "src/mame/video/pocketc.cpp",
 	MAME_DIR .. "src/mame/machine/mz700.cpp",
 	MAME_DIR .. "src/mame/drivers/x68k.cpp",
@@ -2459,6 +2477,7 @@ files {
 	MAME_DIR .. "src/mame/machine/pce220_ser.h",
 	MAME_DIR .. "src/mame/drivers/mz6500.cpp",
 	MAME_DIR .. "src/mame/drivers/zaurus.cpp",
+	MAME_DIR .. "src/mame/machine/pxa255.h",
 }
 
 createMESSProjects(_target, _subtarget, "sinclair")
@@ -2706,6 +2725,8 @@ files {
 	MAME_DIR .. "src/mame/video/733_asr.h",
 	MAME_DIR .. "src/mame/video/911_vdt.cpp",
 	MAME_DIR .. "src/mame/video/911_vdt.h",
+	MAME_DIR .. "src/mame/video/911_chr.h",
+	MAME_DIR .. "src/mame/video/911_key.h",
 	MAME_DIR .. "src/mame/drivers/hh_tms1k.cpp",
 	MAME_DIR .. "src/mame/includes/hh_tms1k.h",
 }
@@ -2772,12 +2793,14 @@ files {
 	MAME_DIR .. "src/mame/machine/6883sam.cpp",
 	MAME_DIR .. "src/mame/machine/6883sam.h",
 	MAME_DIR .. "src/mame/machine/coco.cpp",
+	MAME_DIR .. "src/mame/includes/coco.h",
 	MAME_DIR .. "src/mame/machine/coco12.cpp",
 	MAME_DIR .. "src/mame/machine/coco3.cpp",
 	MAME_DIR .. "src/mame/machine/coco_vhd.cpp",
 	MAME_DIR .. "src/mame/machine/coco_vhd.h",
 	MAME_DIR .. "src/mame/machine/dragon.cpp",
 	MAME_DIR .. "src/mame/machine/dgnalpha.cpp",
+	MAME_DIR .. "src/mame/includes/dgnalpha.h",
 	MAME_DIR .. "src/mame/video/gime.cpp",
 	MAME_DIR .. "src/mame/video/gime.h",
 	MAME_DIR .. "src/mame/drivers/trs80.cpp",
@@ -2925,8 +2948,10 @@ files {
 	MAME_DIR .. "src/mame/includes/ec184x.h",
 	MAME_DIR .. "src/mame/drivers/iskr103x.cpp",
 	MAME_DIR .. "src/mame/drivers/mc1502.cpp",
+	MAME_DIR .. "src/mame/machine/kb_7007_3.h",
 	MAME_DIR .. "src/mame/includes/mc1502.h",
 	MAME_DIR .. "src/mame/drivers/poisk1.cpp",
+	MAME_DIR .. "src/mame/machine/kb_poisk1.h",
 	MAME_DIR .. "src/mame/includes/poisk1.h",
 	MAME_DIR .. "src/mame/video/poisk1.cpp",
 	MAME_DIR .. "src/mame/video/poisk1.h",
diff --git a/src/devices/cpu/tms32031/32031ops.cpp b/src/devices/cpu/tms32031/32031ops.inc
similarity index 100%
rename from src/devices/cpu/tms32031/32031ops.cpp
rename to src/devices/cpu/tms32031/32031ops.inc
diff --git a/src/devices/cpu/tms32031/tms32031.cpp b/src/devices/cpu/tms32031/tms32031.cpp
index e8217446d29..9bfe152b1e0 100644
--- a/src/devices/cpu/tms32031/tms32031.cpp
+++ b/src/devices/cpu/tms32031/tms32031.cpp
@@ -846,4 +846,4 @@ void tms3203x_device::execute_run()
 //  CORE OPCODES
 //**************************************************************************
 
-#include "32031ops.cpp"
+#include "32031ops.inc"
diff --git a/src/devices/cpu/tms32051/32051ops.cpp b/src/devices/cpu/tms32051/32051ops.inc
similarity index 100%
rename from src/devices/cpu/tms32051/32051ops.cpp
rename to src/devices/cpu/tms32051/32051ops.inc
diff --git a/src/devices/cpu/tms32051/tms32051.cpp b/src/devices/cpu/tms32051/tms32051.cpp
index d7c5334be54..c8b40255272 100644
--- a/src/devices/cpu/tms32051/tms32051.cpp
+++ b/src/devices/cpu/tms32051/tms32051.cpp
@@ -105,7 +105,7 @@ void tms32051_device::DM_WRITE16(UINT16 address, UINT16 data)
 	m_data->write_word(address << 1, data);
 }
 
-#include "32051ops.cpp"
+#include "32051ops.inc"
 #include "32051ops.h"
 
 void tms32051_device::op_group_be()
diff --git a/src/devices/cpu/tms34010/34010fld.cpp b/src/devices/cpu/tms34010/34010fld.inc
similarity index 100%
rename from src/devices/cpu/tms34010/34010fld.cpp
rename to src/devices/cpu/tms34010/34010fld.inc
diff --git a/src/devices/cpu/tms34010/34010gfx.cpp b/src/devices/cpu/tms34010/34010gfx.inc
similarity index 99%
rename from src/devices/cpu/tms34010/34010gfx.cpp
rename to src/devices/cpu/tms34010/34010gfx.inc
index 23c9b72cc97..ce29ba91ab0 100644
--- a/src/devices/cpu/tms34010/34010gfx.cpp
+++ b/src/devices/cpu/tms34010/34010gfx.inc
@@ -641,35 +641,35 @@ const tms340x0_device::pixblt_b_op_func tms340x0_device::s_fill_op_table[] =
 	/* 1bpp cases */
 	#define BITS_PER_PIXEL                  1
 	#define FUNCTION_NAME(base)             base##_1_op0
-	#include "34010gfx.cpp"
+	#include "34010gfx.inc"
 	#undef FUNCTION_NAME
 	#undef BITS_PER_PIXEL
 
 	/* 2bpp cases */
 	#define BITS_PER_PIXEL                  2
 	#define FUNCTION_NAME(base)             base##_2_op0
-	#include "34010gfx.cpp"
+	#include "34010gfx.inc"
 	#undef FUNCTION_NAME
 	#undef BITS_PER_PIXEL
 
 	/* 4bpp cases */
 	#define BITS_PER_PIXEL                  4
 	#define FUNCTION_NAME(base)             base##_4_op0
-	#include "34010gfx.cpp"
+	#include "34010gfx.inc"
 	#undef FUNCTION_NAME
 	#undef BITS_PER_PIXEL
 
 	/* 8bpp cases */
 	#define BITS_PER_PIXEL                  8
 	#define FUNCTION_NAME(base)             base##_8_op0
-	#include "34010gfx.cpp"
+	#include "34010gfx.inc"
 	#undef FUNCTION_NAME
 	#undef BITS_PER_PIXEL
 
 	/* 16bpp cases */
 	#define BITS_PER_PIXEL                  16
 	#define FUNCTION_NAME(base)             base##_16_op0
-	#include "34010gfx.cpp"
+	#include "34010gfx.inc"
 	#undef FUNCTION_NAME
 	#undef BITS_PER_PIXEL
 
@@ -687,35 +687,35 @@ const tms340x0_device::pixblt_b_op_func tms340x0_device::s_fill_op_table[] =
 	/* 1bpp cases */
 	#define BITS_PER_PIXEL                  1
 	#define FUNCTION_NAME(base)             base##_1_opx
-	#include "34010gfx.cpp"
+	#include "34010gfx.inc"
 	#undef FUNCTION_NAME
 	#undef BITS_PER_PIXEL
 
 	/* 2bpp cases */
 	#define BITS_PER_PIXEL                  2
 	#define FUNCTION_NAME(base)             base##_2_opx
-	#include "34010gfx.cpp"
+	#include "34010gfx.inc"
 	#undef FUNCTION_NAME
 	#undef BITS_PER_PIXEL
 
 	/* 4bpp cases */
 	#define BITS_PER_PIXEL                  4
 	#define FUNCTION_NAME(base)             base##_4_opx
-	#include "34010gfx.cpp"
+	#include "34010gfx.inc"
 	#undef FUNCTION_NAME
 	#undef BITS_PER_PIXEL
 
 	/* 8bpp cases */
 	#define BITS_PER_PIXEL                  8
 	#define FUNCTION_NAME(base)             base##_8_opx
-	#include "34010gfx.cpp"
+	#include "34010gfx.inc"
 	#undef FUNCTION_NAME
 	#undef BITS_PER_PIXEL
 
 	/* 16bpp cases */
 	#define BITS_PER_PIXEL                  16
 	#define FUNCTION_NAME(base)             base##_16_opx
-	#include "34010gfx.cpp"
+	#include "34010gfx.inc"
 	#undef FUNCTION_NAME
 	#undef BITS_PER_PIXEL
 
@@ -734,35 +734,35 @@ const tms340x0_device::pixblt_b_op_func tms340x0_device::s_fill_op_table[] =
 	/* 1bpp cases */
 	#define BITS_PER_PIXEL                  1
 	#define FUNCTION_NAME(base)             base##_1_op0_trans
-	#include "34010gfx.cpp"
+	#include "34010gfx.inc"
 	#undef FUNCTION_NAME
 	#undef BITS_PER_PIXEL
 
 	/* 2bpp cases */
 	#define BITS_PER_PIXEL                  2
 	#define FUNCTION_NAME(base)             base##_2_op0_trans
-	#include "34010gfx.cpp"
+	#include "34010gfx.inc"
 	#undef FUNCTION_NAME
 	#undef BITS_PER_PIXEL
 
 	/* 4bpp cases */
 	#define BITS_PER_PIXEL                  4
 	#define FUNCTION_NAME(base)             base##_4_op0_trans
-	#include "34010gfx.cpp"
+	#include "34010gfx.inc"
 	#undef FUNCTION_NAME
 	#undef BITS_PER_PIXEL
 
 	/* 8bpp cases */
 	#define BITS_PER_PIXEL                  8
 	#define FUNCTION_NAME(base)             base##_8_op0_trans
-	#include "34010gfx.cpp"
+	#include "34010gfx.inc"
 	#undef FUNCTION_NAME
 	#undef BITS_PER_PIXEL
 
 	/* 16bpp cases */
 	#define BITS_PER_PIXEL                  16
 	#define FUNCTION_NAME(base)             base##_16_op0_trans
-	#include "34010gfx.cpp"
+	#include "34010gfx.inc"
 	#undef FUNCTION_NAME
 	#undef BITS_PER_PIXEL
 
@@ -780,35 +780,35 @@ const tms340x0_device::pixblt_b_op_func tms340x0_device::s_fill_op_table[] =
 	/* 1bpp cases */
 	#define BITS_PER_PIXEL                  1
 	#define FUNCTION_NAME(base)             base##_1_opx_trans
-	#include "34010gfx.cpp"
+	#include "34010gfx.inc"
 	#undef FUNCTION_NAME
 	#undef BITS_PER_PIXEL
 
 	/* 2bpp cases */
 	#define BITS_PER_PIXEL                  2
 	#define FUNCTION_NAME(base)             base##_2_opx_trans
-	#include "34010gfx.cpp"
+	#include "34010gfx.inc"
 	#undef FUNCTION_NAME
 	#undef BITS_PER_PIXEL
 
 	/* 4bpp cases */
 	#define BITS_PER_PIXEL                  4
 	#define FUNCTION_NAME(base)             base##_4_opx_trans
-	#include "34010gfx.cpp"
+	#include "34010gfx.inc"
 	#undef FUNCTION_NAME
 	#undef BITS_PER_PIXEL
 
 	/* 8bpp cases */
 	#define BITS_PER_PIXEL                  8
 	#define FUNCTION_NAME(base)             base##_8_opx_trans
-	#include "34010gfx.cpp"
+	#include "34010gfx.inc"
 	#undef FUNCTION_NAME
 	#undef BITS_PER_PIXEL
 
 	/* 16bpp cases */
 	#define BITS_PER_PIXEL                  16
 	#define FUNCTION_NAME(base)             base##_16_opx_trans
-	#include "34010gfx.cpp"
+	#include "34010gfx.inc"
 	#undef FUNCTION_NAME
 	#undef BITS_PER_PIXEL
 
diff --git a/src/devices/cpu/tms34010/34010ops.cpp b/src/devices/cpu/tms34010/34010ops.inc
similarity index 100%
rename from src/devices/cpu/tms34010/34010ops.cpp
rename to src/devices/cpu/tms34010/34010ops.inc
diff --git a/src/devices/cpu/tms34010/34010tbl.cpp b/src/devices/cpu/tms34010/34010tbl.inc
similarity index 100%
rename from src/devices/cpu/tms34010/34010tbl.cpp
rename to src/devices/cpu/tms34010/34010tbl.inc
diff --git a/src/devices/cpu/tms34010/tms34010.cpp b/src/devices/cpu/tms34010/tms34010.cpp
index e09351301a4..9258a2b1836 100644
--- a/src/devices/cpu/tms34010/tms34010.cpp
+++ b/src/devices/cpu/tms34010/tms34010.cpp
@@ -458,14 +458,14 @@ UINT32 tms340x0_device::raster_op_21(UINT32 newpix, UINT32 oldpix) { return (old
     OPCODE TABLE & IMPLEMENTATIONS
 ***************************************************************************/
 
-#include "34010fld.cpp"
+#include "34010fld.inc"
 
 /* includes the static function prototypes and the master opcode table */
-#include "34010tbl.cpp"
+#include "34010tbl.inc"
 
 /* includes the actual opcode implementations */
-#include "34010ops.cpp"
-#include "34010gfx.cpp"
+#include "34010ops.inc"
+#include "34010gfx.inc"
 
 
 
diff --git a/src/devices/sound/tms5110.cpp b/src/devices/sound/tms5110.cpp
index 3ab0b67f52d..1ab14ca6b3d 100644
--- a/src/devices/sound/tms5110.cpp
+++ b/src/devices/sound/tms5110.cpp
@@ -726,6 +726,9 @@ INT32 tms5110_device::lattice_filter()
 		m_u[2] = m_u[3] - matrix_multiply(m_current_k[2], m_x[2]);
 		m_u[1] = m_u[2] - matrix_multiply(m_current_k[1], m_x[1]);
 		m_u[0] = m_u[1] - matrix_multiply(m_current_k[0], m_x[0]);
+#ifdef DEBUG_LATTICE
+		INT32 err = m_x[9] + matrix_multiply(m_current_k[9], m_u[9]); //x_10, real chip doesn't use or calculate this
+#endif
 		m_x[9] = m_x[8] + matrix_multiply(m_current_k[8], m_u[8]);
 		m_x[8] = m_x[7] + matrix_multiply(m_current_k[7], m_u[7]);
 		m_x[7] = m_x[6] + matrix_multiply(m_current_k[6], m_u[6]);
@@ -743,9 +746,14 @@ INT32 tms5110_device::lattice_filter()
 		for (i = 9; i >= 0; i--)
 		{
 			fprintf(stderr,"Y%d:%04d ", i+1, m_u[i]);
-			fprintf(stderr,"b%d:%04d ", i+1, m_x[i]);
-			if ((i % 5) == 0) fprintf(stderr,"\n");
 		}
+		fprintf(stderr,"\n");
+		fprintf(stderr,"E:%04d ", err);
+		for (i = 9; i >= 0; i--)
+		{
+			fprintf(stderr,"b%d:%04d ", i+1, m_x[i]);
+		}
+		fprintf(stderr,"\n");
 #endif
 		return m_u[0];
 }
diff --git a/src/devices/sound/tms5220.cpp b/src/devices/sound/tms5220.cpp
index d04069e50b9..033bd4551df 100644
--- a/src/devices/sound/tms5220.cpp
+++ b/src/devices/sound/tms5220.cpp
@@ -1129,6 +1129,9 @@ INT32 tms5220_device::lattice_filter()
 		m_u[2] = m_u[3] - matrix_multiply(m_current_k[2], m_x[2]);
 		m_u[1] = m_u[2] - matrix_multiply(m_current_k[1], m_x[1]);
 		m_u[0] = m_u[1] - matrix_multiply(m_current_k[0], m_x[0]);
+#ifdef DEBUG_LATTICE
+		INT32 err = m_x[9] + matrix_multiply(m_current_k[9], m_u[9]); //x_10, real chip doesn't use or calculate this
+#endif
 		m_x[9] = m_x[8] + matrix_multiply(m_current_k[8], m_u[8]);
 		m_x[8] = m_x[7] + matrix_multiply(m_current_k[7], m_u[7]);
 		m_x[7] = m_x[6] + matrix_multiply(m_current_k[6], m_u[6]);
@@ -1146,9 +1149,14 @@ INT32 tms5220_device::lattice_filter()
 		for (i = 9; i >= 0; i--)
 		{
 			fprintf(stderr,"Y%d:%04d ", i+1, m_u[i]);
-			fprintf(stderr,"b%d:%04d ", i+1, m_x[i]);
-			if ((i % 5) == 0) fprintf(stderr,"\n");
 		}
+		fprintf(stderr,"\n");
+		fprintf(stderr,"E:%04d ", err);
+		for (i = 9; i >= 0; i--)
+		{
+			fprintf(stderr,"b%d:%04d ", i+1, m_x[i]);
+		}
+		fprintf(stderr,"\n");
 #endif
 		return m_u[0];
 }
diff --git a/src/mame/arcade.lst b/src/mame/arcade.lst
index aef52ba4e37..bf4cebb8925 100644
--- a/src/mame/arcade.lst
+++ b/src/mame/arcade.lst
@@ -11232,6 +11232,7 @@ potnpkrd        // Bootleg
 potnpkre        // Bootleg
 potnpkrf        // Bootleg
 potnpkrg        // Bootleg
+potnpkrh        // Bootleg
 ngold           // 198? Unknown
 ngolda          // 198? Unknown
 ngoldb          // 198? Unknown
@@ -13313,8 +13314,10 @@ attckexd2     // (c) 1977 Exidy
 deathrac      // (c) 1976 Exidy
 biplane4      // (c) 1976 Fun Games
 take5         // (c) 1975 Fun Games
-dpatrol       // (c) 1977 PSE
 //knightar    // (c) 1976 PSE
+bazooka       // (c) 1976 PSE
+bazookabr     // (c) 1977 Taito do Brasil
+dpatrol       // (c) 1977 PSE
 //gametree    // (c) 1978 PSE
 vollyrmt      // (c) 1973 Ramtek
 hockyrmt      // (c) 1973 Ramtek
@@ -13326,8 +13329,6 @@ trivia        // (c) 1976 Ramtek
 monacogp      // (c) 1980 Sega
 monacogpa     // (c) 1980 Sega
 gunman        // (c) 1977 Taito
-bazooka       // (c) 1977 PSE
-bazookabr     // (c) 1977 Taito do Brasil
 missilex      // (c) 1977 Taito
 ttblock       // (c) 1977 Taito
 zzblock       // (c) 1979 Taito
diff --git a/src/mame/audio/irem.cpp b/src/mame/audio/irem.cpp
index 20303cb17c3..43cbf08b594 100644
--- a/src/mame/audio/irem.cpp
+++ b/src/mame/audio/irem.cpp
@@ -409,7 +409,7 @@ ADDRESS_MAP_END
 #define USE_FRONTIERS 1
 #define USE_FIXED_STV 1
 
-#include "nl_kidniki.cpp"
+#include "nl_kidniki.inc"
 
 NETLIST_START(kidniki_interface)
 
diff --git a/src/mame/audio/nl_kidniki.cpp b/src/mame/audio/nl_kidniki.inc
similarity index 100%
rename from src/mame/audio/nl_kidniki.cpp
rename to src/mame/audio/nl_kidniki.inc
diff --git a/src/mame/drivers/a7800.cpp b/src/mame/drivers/a7800.cpp
index 8ee63ba7d6a..468cf24518a 100644
--- a/src/mame/drivers/a7800.cpp
+++ b/src/mame/drivers/a7800.cpp
@@ -284,7 +284,7 @@ static ADDRESS_MAP_START( a7800_mem, AS_PROGRAM, 8, a7800_state )
 	AM_RANGE(0x0020, 0x003f) AM_MIRROR(0x300) AM_DEVREADWRITE("maria", atari_maria_device, read, write)
 	AM_RANGE(0x0040, 0x00ff) AM_RAMBANK("zpmirror") // mirror of 0x2040-0x20ff, for zero page
 	AM_RANGE(0x0140, 0x01ff) AM_RAMBANK("spmirror") // mirror of 0x2140-0x21ff, for stack page
-	AM_RANGE(0x0280, 0x02ff) AM_DEVICE("riot", mos6532_t, io_map)
+	AM_RANGE(0x0280, 0x029f) AM_MIRROR(0x60) AM_DEVICE("riot", mos6532_t, io_map)
 	AM_RANGE(0x0480, 0x04ff) AM_MIRROR(0x100) AM_DEVICE("riot", mos6532_t, ram_map)
 	AM_RANGE(0x1800, 0x1fff) AM_RAM AM_SHARE("6116_1")
 	AM_RANGE(0x2000, 0x27ff) AM_RAM AM_SHARE("6116_2")
diff --git a/src/mame/drivers/c65_old.cpp b/src/mame/drivers/c65_old.cpp
deleted file mode 100644
index 97d934ff1db..00000000000
--- a/src/mame/drivers/c65_old.cpp
+++ /dev/null
@@ -1,648 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Peter Trauner
-/***************************************************************************
-
-    Commodore C65 home computer
-    PeT mess@utanet.at
-
-    documention
-     www.funet.fi
-
-***************************************************************************/
-
-/*
-
-2008 - Driver Updates
----------------------
-
-(most of the informations are taken from http://www.zimmers.net/cbmpics/ )
-
-
-[CBM systems which belong to this driver]
-
-* Commodore 65 (1989)
-
-Also known as C64 DX at early stages of the project. It was cancelled
-around 1990-1991. Only few units survive (they were sold after Commodore
-liquidation in 1994).
-
-CPU: CSG 4510 (3.54 MHz)
-RAM: 128 kilobytes, expandable to 8 megabytes
-ROM: 128 kilobytes
-Video: CSG 4569 "VIC-III" (6 Video modes; Resolutions from 320x200 to
-    1280x400; 80 columns text; Palette of 4096 colors)
-Sound: CSG 8580 "SID" x2 (6 voice stereo synthesizer/digital sound
-    capabilities)
-Ports: CSG 4510 (2 Joystick/Mouse ports; CBM Serial port; CBM 'USER'
-    port; CBM Monitor port; Power and reset switches; C65 bus drive
-    port; RGBI video port; 2 RCA audio ports; RAM expansion port; C65
-    expansion port)
-Keyboard: Full-sized 77 key QWERTY (12 programmable function keys;
-    4 direction cursor-pad)
-Additional Hardware: Built in 3.5" DD disk drive (1581 compatible)
-Miscellaneous: Partially implemented Commodore 64 emulation
-
-[Notes]
-
-The datasette port was removed here. C65 supports an additional "dumb"
-drive externally. It also features, in addition to the standard CBM
-bus serial (available in all modes), a Fast and a Burst serial bus
-(both available in C65 mode only)
-
-*/
-
-
-#include "emu.h"
-#include "cpu/m6502/m4510.h"
-#include "machine/mos6526.h"
-#include "machine/cbm_snqk.h"
-#include "includes/c65.h"
-#include "bus/cbmiec/cbmiec.h"
-#include "machine/ram.h"
-
-static void cbm_c65_quick_sethiaddress( address_space &space, UINT16 hiaddress )
-{
-	space.write_byte(0x82, hiaddress & 0xff);
-	space.write_byte(0x83, hiaddress >> 8);
-}
-
-QUICKLOAD_LOAD_MEMBER( c65_state, cbm_c65 )
-{
-	return general_cbm_loadsnap(image, file_type, quickload_size, m_maincpu->space(AS_PROGRAM), 0, cbm_c65_quick_sethiaddress);
-}
-
-/*************************************
- *
- *  Main CPU memory handlers
- *
- *************************************/
-
-static ADDRESS_MAP_START( c65_mem , AS_PROGRAM, 8, c65_state )
-	AM_RANGE(0x00000, 0x07fff) AM_RAMBANK("bank11")
-	AM_RANGE(0x08000, 0x09fff) AM_READ_BANK("bank1") AM_WRITE_BANK("bank12")
-	AM_RANGE(0x0a000, 0x0bfff) AM_READ_BANK("bank2") AM_WRITE_BANK("bank13")
-	AM_RANGE(0x0c000, 0x0cfff) AM_READ_BANK("bank3") AM_WRITE_BANK("bank14")
-	AM_RANGE(0x0d000, 0x0d7ff) AM_READ_BANK("bank4") AM_WRITE_BANK("bank5")
-	AM_RANGE(0x0d800, 0x0dbff) AM_READ_BANK("bank6") AM_WRITE_BANK("bank7")
-	AM_RANGE(0x0dc00, 0x0dfff) AM_READ_BANK("bank8") AM_WRITE_BANK("bank9")
-	AM_RANGE(0x0e000, 0x0ffff) AM_READ_BANK("bank10") AM_WRITE_BANK("bank15")
-	AM_RANGE(0x10000, 0x1f7ff) AM_RAM
-	AM_RANGE(0x1f800, 0x1ffff) AM_RAM AM_SHARE("colorram")
-
-	AM_RANGE(0x20000, 0x23fff) AM_ROM /* &c65_dos,     maps to 0x8000    */
-	AM_RANGE(0x24000, 0x28fff) AM_ROM /* reserved */
-	AM_RANGE(0x29000, 0x29fff) AM_ROM AM_SHARE("c65_chargen")
-	AM_RANGE(0x2a000, 0x2bfff) AM_ROM AM_SHARE("basic")
-	AM_RANGE(0x2c000, 0x2cfff) AM_ROM AM_SHARE("interface")
-	AM_RANGE(0x2d000, 0x2dfff) AM_ROM AM_SHARE("chargen")
-	AM_RANGE(0x2e000, 0x2ffff) AM_ROM AM_SHARE("kernal")
-
-	AM_RANGE(0x30000, 0x31fff) AM_ROM /*&c65_monitor,     monitor maps to 0x6000    */
-	AM_RANGE(0x32000, 0x37fff) AM_ROM /*&c65_basic, */
-	AM_RANGE(0x38000, 0x3bfff) AM_ROM /*&c65_graphics, */
-	AM_RANGE(0x3c000, 0x3dfff) AM_ROM /* reserved */
-	AM_RANGE(0x3e000, 0x3ffff) AM_ROM /* &c65_kernal, */
-
-	AM_RANGE(0x40000, 0x7ffff) AM_NOP
-	/* 8 megabyte full address space! */
-ADDRESS_MAP_END
-
-
-/*************************************
- *
- *  Input Ports
- *
- *************************************/
-
-static INPUT_PORTS_START( c65 )
-	PORT_START( "ROW0" )
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Crsr Down Up") PORT_CODE(KEYCODE_RALT)        PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_CHAR(UCHAR_MAMEKEY(UP))
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F3)                                    PORT_CHAR(UCHAR_MAMEKEY(F5))
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F2)                                    PORT_CHAR(UCHAR_MAMEKEY(F3))
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F1)                                    PORT_CHAR(UCHAR_MAMEKEY(F1))
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F4)                                    PORT_CHAR(UCHAR_MAMEKEY(F7))
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Crsr Right Left") PORT_CODE(KEYCODE_RCONTROL) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_CHAR(UCHAR_MAMEKEY(LEFT))
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Return") PORT_CODE(KEYCODE_ENTER)             PORT_CHAR(13)
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("INST DEL") PORT_CODE(KEYCODE_BACKSPACE)       PORT_CHAR(8) PORT_CHAR(UCHAR_MAMEKEY(INSERT))
-
-	PORT_START( "ROW1" )
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Shift (Left)") PORT_CODE(KEYCODE_LSHIFT)      PORT_CHAR(UCHAR_SHIFT_1)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_E)         PORT_CHAR('E')
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_S)         PORT_CHAR('S')
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Z)         PORT_CHAR('Z')
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4)         PORT_CHAR('4') PORT_CHAR('$')
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_A)         PORT_CHAR('A')
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_W)         PORT_CHAR('W')
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3)         PORT_CHAR('3') PORT_CHAR('#')
-
-	PORT_START( "ROW2" )
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_X)         PORT_CHAR('X')
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_T)         PORT_CHAR('T')
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F)         PORT_CHAR('F')
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_C)         PORT_CHAR('C')
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6)         PORT_CHAR('6') PORT_CHAR('&')
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_D)         PORT_CHAR('D')
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_R)         PORT_CHAR('R')
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5)         PORT_CHAR('5') PORT_CHAR('%')
-
-	PORT_START( "ROW3" )
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_V)         PORT_CHAR('V')
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_U)         PORT_CHAR('U')
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_H)         PORT_CHAR('H')
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_B)         PORT_CHAR('B')
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8)         PORT_CHAR('8') PORT_CHAR('(')
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_G)         PORT_CHAR('G')
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Y)         PORT_CHAR('Y')
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7)         PORT_CHAR('7') PORT_CHAR('\'')
-
-	PORT_START( "ROW4" )
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_N)         PORT_CHAR('N')
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_O)         PORT_CHAR('O')
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_K)         PORT_CHAR('K')
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_M)         PORT_CHAR('M')
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0)         PORT_CHAR('0')
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_J)         PORT_CHAR('J')
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_I)         PORT_CHAR('I')
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9)         PORT_CHAR('9') PORT_CHAR(')')
-
-	PORT_START( "ROW5" )
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COMMA)     PORT_CHAR(',') PORT_CHAR('<')
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('@')
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON)     PORT_CHAR(':') PORT_CHAR('[')
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_STOP)      PORT_CHAR('.') PORT_CHAR('>')
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_EQUALS)    PORT_CHAR('-')
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_L)         PORT_CHAR('L')
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_P)         PORT_CHAR('P')
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS)     PORT_CHAR('+')
-
-	PORT_START( "ROW6" )
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH)                             PORT_CHAR('/') PORT_CHAR('?')
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("\xE2\x86\x91  Pi") PORT_CODE(KEYCODE_DEL) PORT_CHAR(0x2191) PORT_CHAR(0x03C0)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH)                         PORT_CHAR('=')
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Shift (Right)") PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("CLR HOME") PORT_CODE(KEYCODE_INSERT)      PORT_CHAR(UCHAR_MAMEKEY(HOME))
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_QUOTE)                             PORT_CHAR(';') PORT_CHAR(']')
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CLOSEBRACE)                        PORT_CHAR('*')
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH2)                        PORT_CHAR('\xA3')
-
-	PORT_START( "ROW7" )
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("RUN STOP") PORT_CODE(KEYCODE_HOME)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Q)                                 PORT_CHAR('Q')
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("CBM") PORT_CODE(KEYCODE_LALT)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE)                             PORT_CHAR(' ')
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2)                                 PORT_CHAR('2') PORT_CHAR('"')
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_TAB)                               PORT_CHAR(UCHAR_SHIFT_2)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("\xE2\x86\x90") PORT_CODE(KEYCODE_TILDE)   PORT_CHAR(0x2190)
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1)                                 PORT_CHAR('1') PORT_CHAR('!')
-	PORT_START("FUNCT")
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("ESC") PORT_CODE(KEYCODE_F1)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("F13 F14") PORT_CODE(KEYCODE_F11)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("F11 F12") PORT_CODE(KEYCODE_F10)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("F9 F10") PORT_CODE(KEYCODE_F9)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("HELP") PORT_CODE(KEYCODE_F12)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("ALT") PORT_CODE(KEYCODE_F2)       /* non blocking */
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("TAB") PORT_CODE(KEYCODE_TAB)
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("NO SCRL") PORT_CODE(KEYCODE_F4)
-
-	PORT_START( "SPECIAL" )  /* special keys */
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Restore") PORT_CODE(KEYCODE_PRTSCR)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Shift Lock (switch)") PORT_CODE(KEYCODE_CAPSLOCK) PORT_TOGGLE PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK))
-	PORT_CONFNAME( 0x20, 0x00, "(C65) Caps Lock (switch)") PORT_CODE(KEYCODE_F3)
-	PORT_CONFSETTING(   0x00, DEF_STR( Off ) )
-	PORT_CONFSETTING(   0x20, DEF_STR( On ) )
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED )
-
-	PORT_START("CTRLSEL")   /* Controller selection */
-	PORT_CONFNAME( 0x07, 0x00, "Gameport A" )
-	PORT_CONFSETTING( 0x00, DEF_STR( Joystick ) )
-	PORT_CONFSETTING( 0x01, "Paddles 1 & 2" )
-	PORT_CONFSETTING( 0x02, "Mouse 1351" )
-	PORT_CONFSETTING( 0x03, "Mouse (Non Proportional) 1350" )
-	PORT_CONFSETTING( 0x04, "Lightpen" )
-//  PORT_CONFSETTING( 0x05, "Koala Pad" )
-	PORT_CONFSETTING( 0x06, "Lightgun" )
-	PORT_CONFSETTING( 0x07, "No Device Connected" )
-	PORT_CONFNAME( 0x70, 0x00, "Gameport B" )
-	PORT_CONFSETTING( 0x00, DEF_STR( Joystick ) )
-	PORT_CONFSETTING( 0x10, "Paddles 3 & 4" )
-//  PORT_CONFSETTING( 0x20, "Mouse 1351" )
-//  PORT_CONFSETTING( 0x30, "Mouse (Non Proportional) 1350" )
-	PORT_CONFSETTING( 0x70, "No Device Connected" )
-	PORT_CONFNAME( 0x80, 0x00, "Swap Gameport A and B") PORT_CODE(KEYCODE_F1) PORT_TOGGLE
-	PORT_CONFSETTING(   0x00, DEF_STR( No ) )
-	PORT_CONFSETTING(   0x80, DEF_STR( Yes ) )
-
-	PORT_START("JOY1_1B")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00)
-	PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
-	PORT_START("JOY2_1B")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_HOME) PORT_CODE(JOYCODE_Y_UP_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_END) PORT_CODE(JOYCODE_Y_DOWN_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_DEL) PORT_CODE(JOYCODE_X_LEFT_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_PGDN) PORT_CODE(JOYCODE_X_RIGHT_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_CODE(KEYCODE_INSERT) PORT_CODE(JOYCODE_BUTTON1) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00)
-	PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
-	/* Mouse Commodore 1350 was basically working as a Joystick */
-	PORT_START("JOY1_2B")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_NAME("Mouse 1350 Up") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x03)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_NAME("Mouse 1350 Down") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x03)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_NAME("Mouse 1350 Left") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x03)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_NAME("Mouse 1350 Right") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x03)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("Mouse 1350 Button 1") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x03)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("Mouse 1350 Button 2") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x03)
-	PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
-	/* Still to verify how many mice you were able to plug into a C64 */
-	/* Only one, for now */
-	PORT_START("JOY2_2B")
-	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
-/*  PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_HOME) PORT_CODE(JOYCODE_Y_UP_SWITCH)
-    PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_END) PORT_CODE(JOYCODE_Y_DOWN_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x30)
-    PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_DEL) PORT_CODE(JOYCODE_X_LEFT_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x30)
-    PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_PGDN) PORT_CODE(JOYCODE_X_RIGHT_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x30)
-    PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_CODE(KEYCODE_INSERT) PORT_CODE(JOYCODE_BUTTON1) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x30)
-    PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_CODE(KEYCODE_PGUP) PORT_CODE(JOYCODE_BUTTON2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x30)
-    PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
-*/
-	PORT_START("PADDLE1")
-	PORT_BIT( 0xff, 128, IPT_PADDLE) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_MINMAX(0,255) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_LEFT) PORT_CODE_INC(KEYCODE_RIGHT) PORT_CODE_DEC(JOYCODE_X_LEFT_SWITCH) PORT_CODE_INC(JOYCODE_X_RIGHT_SWITCH) PORT_PLAYER(1) PORT_REVERSE PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01)
-
-	PORT_START("PADDLE2")
-	PORT_BIT( 0xff, 128, IPT_PADDLE) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_MINMAX(0,255) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_DOWN) PORT_CODE_INC(KEYCODE_UP) PORT_CODE_DEC(JOYCODE_Y_UP_SWITCH) PORT_CODE_INC(JOYCODE_Y_DOWN_SWITCH) PORT_PLAYER(2) PORT_REVERSE PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01)
-
-	PORT_START("PADDLE3")
-	PORT_BIT( 0xff, 128, IPT_PADDLE) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_MINMAX(0,255) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_HOME) PORT_CODE_INC(KEYCODE_PGUP) PORT_PLAYER(3) PORT_REVERSE PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10)
-
-	PORT_START("PADDLE4")
-	PORT_BIT( 0xff, 128, IPT_PADDLE) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_MINMAX(0,255) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_END) PORT_CODE_INC(KEYCODE_PGDN) PORT_PLAYER(4) PORT_REVERSE PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10)
-
-	PORT_START("TRACKX")
-	PORT_BIT( 0x7e, 0x00, IPT_TRACKBALL_X) PORT_SENSITIVITY(100) PORT_KEYDELTA(0) PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x02)
-
-	PORT_START("TRACKY")
-	PORT_BIT( 0x7e, 0x00, IPT_TRACKBALL_Y) PORT_SENSITIVITY(100) PORT_KEYDELTA(0) PORT_PLAYER(1) PORT_REVERSE PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x02)
-
-	PORT_START("LIGHTX")
-	PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X) PORT_NAME("Lightpen X Axis") PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x04)
-
-	PORT_START("LIGHTY")
-	PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y) PORT_NAME("Lightpen Y Axis") PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x04)
-
-	PORT_START("OTHER")
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Paddle 1 Button") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(JOYCODE_BUTTON1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("Paddle 2 Button") PORT_CODE(KEYCODE_LALT) PORT_CODE(JOYCODE_BUTTON2) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("Paddle 3 Button") PORT_CODE(KEYCODE_INSERT) PORT_CODE(JOYCODE_BUTTON1) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("Paddle 4 Button") PORT_CODE(KEYCODE_DEL) PORT_CODE(JOYCODE_BUTTON2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Lightpen Signal") PORT_CODE(KEYCODE_LCONTROL) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x04)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Mouse Button Left") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(JOYCODE_BUTTON1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x02)
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("Mouse Button Right") PORT_CODE(KEYCODE_LALT) PORT_CODE(JOYCODE_BUTTON2) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x02)INPUT_PORTS_END
-
-
-static INPUT_PORTS_START( c65ger )
-	PORT_INCLUDE( c65 )
-
-	PORT_MODIFY( "ROW1" )
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Z  { Y }") PORT_CODE(KEYCODE_Z)                   PORT_CHAR('Z')
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("3  #  { 3  Paragraph }") PORT_CODE(KEYCODE_3)     PORT_CHAR('3') PORT_CHAR('#')
-
-	PORT_MODIFY( "ROW3" )
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Y  { Z }") PORT_CODE(KEYCODE_Y)                   PORT_CHAR('Y')
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("7 ' { 7  / }") PORT_CODE(KEYCODE_7)               PORT_CHAR('7') PORT_CHAR('\'')
-
-	PORT_MODIFY( "ROW4" )
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("0  { = }") PORT_CODE(KEYCODE_0)                   PORT_CHAR('0')
-
-	PORT_MODIFY( "ROW5" )
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME(",  <  { ; }") PORT_CODE(KEYCODE_COMMA)            PORT_CHAR(',') PORT_CHAR('<')
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Paragraph  \xE2\x86\x91  { \xc3\xbc }") PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR(0x00A7) PORT_CHAR(0x2191)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME(":  [  { \xc3\xa4 }") PORT_CODE(KEYCODE_COLON)     PORT_CHAR(':') PORT_CHAR('[')
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME(".  >  { : }") PORT_CODE(KEYCODE_STOP)             PORT_CHAR('.') PORT_CHAR('>')
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("-  { '  ` }") PORT_CODE(KEYCODE_EQUALS)           PORT_CHAR('-')
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("+  { \xc3\x9f ? }") PORT_CODE(KEYCODE_MINUS)      PORT_CHAR('+')
-
-	PORT_MODIFY( "ROW6" )
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("/  ?  { -  _ }") PORT_CODE(KEYCODE_SLASH)         PORT_CHAR('/') PORT_CHAR('?')
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Sum Pi  { ]  \\ }") PORT_CODE(KEYCODE_DEL)        PORT_CHAR(0x03A3) PORT_CHAR(0x03C0)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("=  { #  ' }") PORT_CODE(KEYCODE_BACKSLASH)        PORT_CHAR('=')
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME(";  ]  { \xc3\xb6 }") PORT_CODE(KEYCODE_QUOTE)     PORT_CHAR(';') PORT_CHAR(']')
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("*  `  { +  * }") PORT_CODE(KEYCODE_CLOSEBRACE)    PORT_CHAR('*') PORT_CHAR('`')
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("\\  { [ \xE2\x86\x91 }") PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR('\xa3')
-
-	PORT_MODIFY( "ROW7" )
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("_  { <  > }") PORT_CODE(KEYCODE_TILDE)            PORT_CHAR('_')
-
-	PORT_MODIFY("SPECIAL") /* special keys */
-	PORT_DIPNAME( 0x20, 0x00, "(C65) DIN ASC (switch)") PORT_CODE(KEYCODE_F3)
-	PORT_DIPSETTING(    0x00, "ASC" )
-	PORT_DIPSETTING(    0x20, "DIN" )
-INPUT_PORTS_END
-
-
-
-/*************************************
- *
- *  Sound definitions
- *
- *************************************/
-
-int c65_state::c64_paddle_read( device_t *device, address_space &space, int which )
-{
-	int pot1 = 0xff, pot2 = 0xff, pot3 = 0xff, pot4 = 0xff, temp;
-	UINT8 cia0porta = machine().device<mos6526_device>("cia_0")->pa_r(space, 0);
-	int controller1 = ioport("CTRLSEL")->read() & 0x07;
-	int controller2 = ioport("CTRLSEL")->read() & 0x70;
-	/* Notice that only a single input is defined for Mouse & Lightpen in both ports */
-	switch (controller1)
-	{
-		case 0x01:
-			if (which)
-				pot2 = ioport("PADDLE2")->read();
-			else
-				pot1 = ioport("PADDLE1")->read();
-			break;
-
-		case 0x02:
-			if (which)
-				pot2 = ioport("TRACKY")->read();
-			else
-				pot1 = ioport("TRACKX")->read();
-			break;
-
-		case 0x03:
-			if (which && (ioport("JOY1_2B")->read() & 0x20))  /* Joy1 Button 2 */
-				pot1 = 0x00;
-			break;
-
-		case 0x04:
-			if (which)
-				pot2 = ioport("LIGHTY")->read();
-			else
-				pot1 = ioport("LIGHTX")->read();
-			break;
-
-		case 0x06:
-			if (which && (ioport("OTHER")->read() & 0x04))    /* Lightpen Signal */
-				pot2 = 0x00;
-			break;
-
-		case 0x00:
-		case 0x07:
-			break;
-
-		default:
-			logerror("Invalid Controller Setting %d\n", controller1);
-			break;
-	}
-
-	switch (controller2)
-	{
-		case 0x10:
-			if (which)
-				pot4 = ioport("PADDLE4")->read();
-			else
-				pot3 = ioport("PADDLE3")->read();
-			break;
-
-		case 0x20:
-			if (which)
-				pot4 = ioport("TRACKY")->read();
-			else
-				pot3 = ioport("TRACKX")->read();
-			break;
-
-		case 0x30:
-			if (which && (ioport("JOY2_2B")->read() & 0x20))  /* Joy2 Button 2 */
-				pot4 = 0x00;
-			break;
-
-		case 0x40:
-			if (which)
-				pot4 = ioport("LIGHTY")->read();
-			else
-				pot3 = ioport("LIGHTX")->read();
-			break;
-
-		case 0x60:
-			if (which && (ioport("OTHER")->read() & 0x04))    /* Lightpen Signal */
-				pot4 = 0x00;
-			break;
-
-		case 0x00:
-		case 0x70:
-			break;
-
-		default:
-			logerror("Invalid Controller Setting %d\n", controller1);
-			break;
-	}
-
-	if (ioport("CTRLSEL")->read() & 0x80)     /* Swap */
-	{
-		temp = pot1; pot1 = pot3; pot3 = temp;
-		temp = pot2; pot2 = pot4; pot4 = temp;
-	}
-
-	switch (cia0porta & 0xc0)
-	{
-		case 0x40:
-			return which ? pot2 : pot1;
-
-		case 0x80:
-			return which ? pot4 : pot3;
-
-		case 0xc0:
-			return which ? pot2 : pot1;
-
-		default:
-			return 0;
-	}
-}
-
-READ8_MEMBER( c65_state::sid_potx_r )
-{
-	return c64_paddle_read(m_sid_r, space, 0);
-}
-
-READ8_MEMBER( c65_state::sid_poty_r )
-{
-	return c64_paddle_read(m_sid_r, space, 1);
-}
-
-
-/*************************************
- *
- *  VIC III interfaces
- *
- *************************************/
-
-UINT32 c65_state::screen_update_c65(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
-	m_vic->video_update(bitmap, cliprect);
-	return 0;
-}
-
-READ8_MEMBER(c65_state::c65_lightpen_x_cb)
-{
-	return ioport("LIGHTX")->read() & ~0x01;
-}
-
-READ8_MEMBER(c65_state::c65_lightpen_y_cb)
-{
-	return ioport("LIGHTY")->read() & ~0x01;
-}
-
-READ8_MEMBER(c65_state::c65_lightpen_button_cb)
-{
-	return ioport("OTHER")->read() & 0x04;
-}
-
-READ8_MEMBER(c65_state::c65_c64_mem_r)
-{
-	return m_memory[offset];
-}
-
-INTERRUPT_GEN_MEMBER(c65_state::vic3_raster_irq)
-{
-	m_vic->raster_interrupt_gen();
-}
-
-/*************************************
- *
- *  Machine driver
- *
- *************************************/
-
-static MACHINE_CONFIG_START( c65, c65_state )
-	/* basic machine hardware */
-	MCFG_CPU_ADD("maincpu", M4510, 3500000)  /* or VIC6567_CLOCK, */
-	MCFG_CPU_PROGRAM_MAP(c65_mem)
-	MCFG_CPU_VBLANK_INT_DRIVER("screen", c65_state,  c65_frame_interrupt)
-	MCFG_CPU_PERIODIC_INT_DRIVER(c65_state, vic3_raster_irq,  VIC6567_HRETRACERATE)
-
-	MCFG_MACHINE_START_OVERRIDE(c65_state, c65 )
-
-	/* video hardware */
-	MCFG_SCREEN_ADD("screen", RASTER)
-	MCFG_SCREEN_REFRESH_RATE(VIC6567_VRETRACERATE)
-	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
-	MCFG_SCREEN_SIZE(525 * 2, 520 * 2)
-	MCFG_SCREEN_VISIBLE_AREA(VIC6567_STARTVISIBLECOLUMNS ,(VIC6567_STARTVISIBLECOLUMNS + VIC6567_VISIBLECOLUMNS - 1) * 2, VIC6567_STARTVISIBLELINES, VIC6567_STARTVISIBLELINES + VIC6567_VISIBLELINES - 1)
-	MCFG_SCREEN_UPDATE_DRIVER(c65_state, screen_update_c65)
-	MCFG_SCREEN_PALETTE("vic3:palette")
-
-	MCFG_DEVICE_ADD("vic3", VIC3, 0)
-	MCFG_VIC3_CPU("maincpu")
-	MCFG_VIC3_TYPE(VIC4567_NTSC)
-	MCFG_VIC3_LIGHTPEN_X_CB(READ8(c65_state, c65_lightpen_x_cb))
-	MCFG_VIC3_LIGHTPEN_Y_CB(READ8(c65_state, c65_lightpen_y_cb))
-	MCFG_VIC3_LIGHTPEN_BUTTON_CB(READ8(c65_state, c65_lightpen_button_cb))
-	MCFG_VIC3_DMA_READ_CB(READ8(c65_state, c65_dma_read))
-	MCFG_VIC3_DMA_READ_COLOR_CB(READ8(c65_state, c65_dma_read_color))
-	MCFG_VIC3_INTERRUPT_CB(WRITELINE(c65_state, c65_vic_interrupt))
-	MCFG_VIC3_PORT_CHANGED_CB(WRITE8(c65_state, c65_bankswitch_interface))
-	MCFG_VIC3_C64_MEM_R_CB(READ8(c65_state, c65_c64_mem_r))
-
-	/* sound hardware */
-	MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-	MCFG_SOUND_ADD("sid_r", MOS8580, 985248)
-	MCFG_MOS6581_POTX_CALLBACK(READ8(c65_state, sid_potx_r))
-	MCFG_MOS6581_POTY_CALLBACK(READ8(c65_state, sid_poty_r))
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
-	MCFG_SOUND_ADD("sid_l", MOS8580, 985248)
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
-
-	/* quickload */
-	MCFG_QUICKLOAD_ADD("quickload", c65_state, cbm_c65, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS)
-
-	/* cia */
-	MCFG_DEVICE_ADD("cia_0", MOS6526, 3500000)
-	MCFG_MOS6526_TOD(60)
-	MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c65_state, c65_cia0_interrupt))
-	MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c65_state, c65_cia0_port_a_r))
-	MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c65_state, c65_cia0_port_b_r))
-	MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c65_state, c65_cia0_port_b_w))
-
-	MCFG_DEVICE_ADD("cia_1", MOS6526, 3500000)
-	MCFG_MOS6526_TOD(60)
-	MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c65_state, c65_cia1_interrupt))
-	MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c65_state, c65_cia1_port_a_r))
-	MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c65_state, c65_cia1_port_a_w))
-
-	/* floppy from serial bus */
-	MCFG_CBM_IEC_ADD(NULL)
-
-	/* internal ram */
-	MCFG_RAM_ADD(RAM_TAG)
-	MCFG_RAM_DEFAULT_SIZE("128K")
-	MCFG_RAM_EXTRA_OPTIONS("640K,4224K")
-MACHINE_CONFIG_END
-
-static MACHINE_CONFIG_DERIVED( c65pal, c65 )
-	MCFG_SCREEN_MODIFY("screen")
-	MCFG_SCREEN_REFRESH_RATE(VIC6569_VRETRACERATE)
-	MCFG_SCREEN_SIZE(625 * 2, 520 * 2)
-	MCFG_SCREEN_VISIBLE_AREA(VIC6569_STARTVISIBLECOLUMNS, (VIC6569_STARTVISIBLECOLUMNS + VIC6569_VISIBLECOLUMNS - 1) * 2, VIC6569_STARTVISIBLELINES, VIC6569_STARTVISIBLELINES + VIC6569_VISIBLELINES - 1)
-	MCFG_SCREEN_PALETTE("vic3:palette")
-
-	MCFG_DEVICE_MODIFY("vic3")
-	MCFG_VIC3_TYPE(VIC4567_PAL)
-
-	/* sound hardware */
-	MCFG_SOUND_REPLACE("sid_r", MOS8580, 1022727)
-	MCFG_MOS6581_POTX_CALLBACK(READ8(c65_state, sid_potx_r))
-	MCFG_MOS6581_POTY_CALLBACK(READ8(c65_state, sid_poty_r))
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
-	MCFG_SOUND_REPLACE("sid_l", MOS8580, 1022727)
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
-
-	/* cia */
-	MCFG_DEVICE_MODIFY("cia_0")
-	MCFG_MOS6526_TOD(50)
-
-	MCFG_DEVICE_MODIFY("cia_1")
-	MCFG_MOS6526_TOD(50)
-MACHINE_CONFIG_END
-
-
-/*************************************
- *
- *  ROM definition(s)
- *
- *************************************/
-
-
-ROM_START( c65 )
-	ROM_REGION( 0x400000, "maincpu", 0 )
-	ROM_SYSTEM_BIOS( 0, "910111", "V0.9.910111" )
-	ROMX_LOAD( "910111.bin", 0x20000, 0x20000, CRC(c5d8d32e) SHA1(71c05f098eff29d306b0170e2c1cdeadb1a5f206), ROM_BIOS(1) )
-	ROM_SYSTEM_BIOS( 1, "910523", "V0.9.910523" )
-	ROMX_LOAD( "910523.bin", 0x20000, 0x20000, CRC(e8235dd4) SHA1(e453a8e7e5b95de65a70952e9d48012191e1b3e7), ROM_BIOS(2) )
-	ROM_SYSTEM_BIOS( 2, "910626", "V0.9.910626" )
-	ROMX_LOAD( "910626.bin", 0x20000, 0x20000, CRC(12527742) SHA1(07c185b3bc58410183422f7ac13a37ddd330881b), ROM_BIOS(3) )
-	ROM_SYSTEM_BIOS( 3, "910828", "V0.9.910828" )
-	ROMX_LOAD( "910828.bin", 0x20000, 0x20000, CRC(3ee40b06) SHA1(b63d970727a2b8da72a0a8e234f3c30a20cbcb26), ROM_BIOS(4) )
-	ROM_SYSTEM_BIOS( 4, "911001", "V0.9.911001" )
-	ROMX_LOAD( "911001.bin", 0x20000, 0x20000, CRC(0888b50f) SHA1(129b9a2611edaebaa028ac3e3f444927c8b1fc5d), ROM_BIOS(5) )
-ROM_END
-
-ROM_START( c64dx )
-	ROM_REGION( 0x400000, "maincpu", 0 )
-	ROM_LOAD( "910429.bin", 0x20000, 0x20000, CRC(b025805c) SHA1(c3b05665684f74adbe33052a2d10170a1063ee7d) )
-ROM_END
-
-/***************************************************************************
-
-  Game driver(s)
-
-***************************************************************************/
-
-/*    YEAR  NAME    PARENT  COMPAT  MACHINE INPUT   INIT    COMPANY                         FULLNAME                                              FLAGS */
-
-COMP( 1991, c65,    0,      0,      c65,    c65, c65_state,    c65,    "Commodore Business Machines",  "Commodore 65 Development System (Prototype, NTSC)", MACHINE_NOT_WORKING )
-COMP( 1991, c64dx,  c65,    0,      c65pal, c65ger, c65_state, c65pal, "Commodore Business Machines",  "Commodore 64DX Development System (Prototype, PAL, German)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/exidyttl.cpp b/src/mame/drivers/exidyttl.cpp
index e5b6beba535..6eac0dd2b84 100644
--- a/src/mame/drivers/exidyttl.cpp
+++ b/src/mame/drivers/exidyttl.cpp
@@ -4,18 +4,18 @@
 
 Exidy discrete hardware games
 
- Alley Rally (1975) (AR-1A)
- Attack (1977)
- Death Race (1976)
- Destruction Derby (1975)
- Hockey / Tennis (Thumper Bumper?) (1974)
- Score (1977)
+ Alley Rally (1976/10) (AR-1A)
+ Attack (1977/02)
+ Death Race (1976/04)
+ Destruction Derby (1976/01)
+ Hockey / Tennis (Thumper Bumper?) (1974/03)
+ Score (1977/07)
  Spiders From Space (1976)
- Sting (1974)
- Super Death Chase (1977)
- Table Foosballer / Table Football (1975)
- Table Pinball (1974)
- TV Pinball (1974) (PB-4)
+ Sting (1974/03)
+ Super Death Chase (1977/10)
+ Table Foosballer / Table Football (1975/11)
+ Table Pinball (1974/11)
+ TV Pinball (1974/11) (PB-4)
 
 ***************************************************************************/
 
@@ -211,8 +211,6 @@ ROM_START( deathrac )
 	ROM_LOAD( "6331-36.t7",     0x0000, 0x0020, CRC(15e00a2a) SHA1(cd43d227a34e5444ed9d8a4acf5497df9c789c73) )
 ROM_END
 
-
-
 GAME( 1977, attckexd,  0,        attack,   0, driver_device,  0, ROT0, "Exidy", "Attack (Set 1) [TTL]", MACHINE_IS_SKELETON )
 GAME( 1977, attckexd2, attckexd, attack,   0, driver_device,  0, ROT0, "Exidy", "Attack (Set 2) [TTL]", MACHINE_IS_SKELETON )
 GAME( 1976, deathrac,  0,        deathrac, 0, driver_device,  0, ROT0, "Exidy", "Death Race [TTL]", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp
index 9047d49f2bd..6c365401a77 100644
--- a/src/mame/drivers/fidelz80.cpp
+++ b/src/mame/drivers/fidelz80.cpp
@@ -10,7 +10,8 @@
 *  TODO:
 *  * Figure out why it says the first speech line twice; it shouldn't?
 *    It sometimes does this on Voice Sensory Chess Challenger real hardware.
-*    It can also be heard on Advanced Talking Chess Challenger real hardware, cold boot.
+*    It can also be heard on Advanced Talking Chess Challenger real hardware, but not the whole line:
+*    "I I am Fidelity's chess challenger", instead.
 *  * Get rom locations from pcb (done for UVC, VCC is probably similar)
 *  * correctly hook up 7002/VBRC and 7014/bridgec3 speech so that the z80 is halted while words are being spoken
 *
@@ -51,7 +52,7 @@ Memory map (UVC):
 
 I/O map:
 --------
-00-FF: 8255 port chip [LN edit: 00-03, mirrored over the 00-FF range; program accesses F4-F7]
+00-03: 8255 port chip, mirrored over the 00-FF range; program accesses F4-F7
 
 
 8255 connections:
@@ -607,19 +608,19 @@ expect that the software reads these once on startup only.
 void fidelz80_state::update_display()
 {
 	// data for the 4x 7seg leds, bits are 0bxABCDEFG
-	UINT8 out_digit = BITSWAP8( m_digit_data,7,0,1,2,3,4,5,6 ) & 0x7f;
+	UINT8 out_digit = BITSWAP8(m_digit_data,7,0,1,2,3,4,5,6) & 0x7f;
 
 	if (m_led_selected&0x04)
 	{
 		output_set_digit_value(0, out_digit);
 
-		output_set_led_value(1, m_led_data & 0x01);
+		output_set_led_value(1, m_led_data);
 	}
 	if (m_led_selected&0x08)
 	{
 		output_set_digit_value(1, out_digit);
 
-		output_set_led_value(0, m_led_data & 0x01);
+		output_set_led_value(0, m_led_data);
 	}
 	if (m_led_selected&0x10)
 	{
@@ -631,7 +632,7 @@ void fidelz80_state::update_display()
 	}
 }
 
-READ8_MEMBER( fidelz80_state::fidelz80_portc_r )
+READ8_MEMBER(fidelz80_state::fidelz80_portc_r)
 {
 	UINT8 data = 0xff;
 
@@ -655,11 +656,11 @@ READ8_MEMBER( fidelz80_state::fidelz80_portc_r )
 	return data;
 }
 
-WRITE8_MEMBER( fidelz80_state::fidelz80_portb_w )
+WRITE8_MEMBER(fidelz80_state::fidelz80_portb_w)
 {
 	if (!(data & 0x80))
 	{
-		m_led_data = (data&0x01);   // common for two leds
+		m_led_data = data & 1; // common for two leds
 
 		m_led_selected = data;
 
@@ -669,12 +670,12 @@ WRITE8_MEMBER( fidelz80_state::fidelz80_portb_w )
 	// ignoring the language switch enable for now, is bit 0x40
 }
 
-WRITE8_MEMBER( fidelz80_state::fidelz80_portc_w )
+WRITE8_MEMBER(fidelz80_state::fidelz80_portc_w)
 {
 	m_kp_matrix = data;
 }
 
-WRITE8_MEMBER( fidelz80_state::cc10_porta_w )
+WRITE8_MEMBER(fidelz80_state::cc10_porta_w)
 {
 	m_beep->set_state((data & 0x80) ? 0 : 1);
 
@@ -683,12 +684,12 @@ WRITE8_MEMBER( fidelz80_state::cc10_porta_w )
 	update_display();
 }
 
-READ8_MEMBER( fidelz80_state::vcc_portb_r )
+READ8_MEMBER(fidelz80_state::vcc_portb_r)
 {
 	return (m_speech->bsy_r() != 0) ? 0x80 : 0x00;
 }
 
-WRITE8_MEMBER( fidelz80_state::vcc_porta_w )
+WRITE8_MEMBER(fidelz80_state::vcc_porta_w)
 {
 	m_speech->set_volume(15); // hack, s14001a core should assume a volume of 15 unless otherwise stated...
 	m_speech->reg_w(data & 0x3f);
@@ -703,9 +704,9 @@ WRITE8_MEMBER( fidelz80_state::vcc_porta_w )
     I8255 Device, for VSC
 ******************************************************************************/
 
-WRITE8_MEMBER( fidelz80_state::vsc_porta_w )
+WRITE8_MEMBER(fidelz80_state::vsc_porta_w)
 {
-	UINT8 out_digit = BITSWAP8( data,7,6,2,1,0,5,4,3 );
+	UINT8 out_digit = BITSWAP8(data,7,6,2,1,0,5,4,3);
 
 	if (m_kp_matrix & 0x01)
 	{
@@ -730,9 +731,9 @@ WRITE8_MEMBER( fidelz80_state::vsc_porta_w )
 	m_speech->reg_w(data & 0x3f);
 }
 
-WRITE8_MEMBER( fidelz80_state::vsc_portb_w )
+WRITE8_MEMBER(fidelz80_state::vsc_portb_w)
 {
-	for (int row=1; row<=8; row++)
+	for (int row = 1; row <= 8; row++)
 	{
 		if (m_kp_matrix & 0x01)
 			output_set_indexed_value("led_a", row, BIT(data, 8-row));
@@ -753,7 +754,7 @@ WRITE8_MEMBER( fidelz80_state::vsc_portb_w )
 	}
 }
 
-WRITE8_MEMBER( fidelz80_state::vsc_portc_w )
+WRITE8_MEMBER(fidelz80_state::vsc_portc_w)
 {
 	m_kp_matrix = (m_kp_matrix & 0x300) | data;
 }
@@ -762,7 +763,7 @@ WRITE8_MEMBER( fidelz80_state::vsc_portc_w )
     PIO Device, for VSC
 ******************************************************************************/
 
-READ8_MEMBER( fidelz80_state::vsc_pio_porta_r )
+READ8_MEMBER(fidelz80_state::vsc_pio_porta_r)
 {
 	UINT8 data = 0;
 
@@ -790,7 +791,7 @@ READ8_MEMBER( fidelz80_state::vsc_pio_porta_r )
 	return data & 0xff;
 }
 
-READ8_MEMBER( fidelz80_state::vsc_pio_portb_r )
+READ8_MEMBER(fidelz80_state::vsc_pio_portb_r)
 {
 	UINT8 data = 0x00;
 
@@ -800,7 +801,7 @@ READ8_MEMBER( fidelz80_state::vsc_pio_portb_r )
 	return data;
 }
 
-WRITE8_MEMBER( fidelz80_state::vsc_pio_portb_w )
+WRITE8_MEMBER(fidelz80_state::vsc_pio_portb_w)
 {
 	m_kp_matrix = (m_kp_matrix & 0xff) | ((data & 0x03)<<8);
 
@@ -957,7 +958,7 @@ READ8_MEMBER(fidelz80_state::mcu_status_r)
 	return m_i8041->upi41_master_r(space, 1);
 }
 
-WRITE8_MEMBER( fidelz80_state::bridgec_speech_w )
+WRITE8_MEMBER(fidelz80_state::bridgec_speech_w)
 {
 	// todo: HALT THE z80 here, and set up a callback to poll the s14001a DONE line to resume z80
 	m_speech->set_volume(15); // hack, s14001a core should assume a volume of 15 unless otherwise stated...
@@ -965,13 +966,21 @@ WRITE8_MEMBER( fidelz80_state::bridgec_speech_w )
 	m_speech->rst_w(BIT(data, 7));
 }
 
-void fidelz80_state::machine_reset()
+void fidelz80_state::machine_start()
 {
+	// zerofill
 	m_led_selected = 0;
 	m_kp_matrix = 0;
 	m_digit_data = 0;
 	m_led_data = 0;
 	memset(m_digit_line_status, 0, sizeof(m_digit_line_status));
+	
+	// register for savestates
+	save_item(NAME(m_led_selected));
+	save_item(NAME(m_kp_matrix));
+	save_item(NAME(m_digit_data));
+	save_item(NAME(m_led_data));
+	save_item(NAME(m_digit_line_status));
 }
 
 TIMER_DEVICE_CALLBACK_MEMBER(fidelz80_state::nmi_timer)
@@ -1011,7 +1020,7 @@ static ADDRESS_MAP_START(bridgec_z80_mem, AS_PROGRAM, 8, fidelz80_state)
 	AM_RANGE(0x2000, 0x3fff) AM_ROM // 8k rom
 	AM_RANGE(0x4000, 0x5fff) AM_ROM // 8k rom
 	AM_RANGE(0x6000, 0x63ff) AM_RAM AM_MIRROR(0x1c00) // 1k ram (2114*2) mirrored 8 times
-	AM_RANGE(0xE000, 0xE000) AM_WRITE(bridgec_speech_w) AM_MIRROR(0x1FFF) // write to speech chip, halts cpu
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(bridgec_speech_w) AM_MIRROR(0x1fff) // write to speech chip, halts cpu
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START(fidel_z80_io, AS_IO, 8, fidelz80_state)
@@ -1061,7 +1070,7 @@ INPUT_CHANGED_MEMBER(fidelz80_state::bridgec_trigger_reset)
 }
 
 static INPUT_PORTS_START( fidelz80 )
-	PORT_START("LEVEL")     // cc10 only
+	PORT_START("LEVEL") // cc10 only
 		PORT_CONFNAME( 0x80, 0x00, "Number of levels" )
 		PORT_CONFSETTING( 0x00, "10" )
 		PORT_CONFSETTING( 0x80, "3" )
@@ -1250,6 +1259,7 @@ INPUT_PORTS_END
 ******************************************************************************/
 
 static MACHINE_CONFIG_START( cc10, fidelz80_state )
+
 	/* basic machine hardware */
 	MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
 	MCFG_CPU_PROGRAM_MAP(cc10_z80_mem)
@@ -1268,12 +1278,13 @@ static MACHINE_CONFIG_START( cc10, fidelz80_state )
 	MCFG_I8255_OUT_PORTC_CB(WRITE8(fidelz80_state, fidelz80_portc_w))
 
 	/* sound hardware */
-	MCFG_SPEAKER_STANDARD_MONO( "mono" )
-	MCFG_SOUND_ADD( "beeper", BEEP, 0 )
-	MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
+	MCFG_SPEAKER_STANDARD_MONO("mono")
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
+	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 MACHINE_CONFIG_END
 
 static MACHINE_CONFIG_START( vcc, fidelz80_state )
+
 	/* basic machine hardware */
 	MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
 	MCFG_CPU_PROGRAM_MAP(vcc_z80_mem)
@@ -1299,6 +1310,7 @@ static MACHINE_CONFIG_START( vcc, fidelz80_state )
 MACHINE_CONFIG_END
 
 static MACHINE_CONFIG_START( vsc, fidelz80_state )
+
 	/* basic machine hardware */
 	MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
 	MCFG_CPU_PROGRAM_MAP(vsc_mem)
@@ -1327,6 +1339,7 @@ static MACHINE_CONFIG_START( vsc, fidelz80_state )
 MACHINE_CONFIG_END
 
 static MACHINE_CONFIG_START( bridgec, fidelz80_state )
+
 	/* basic machine hardware */
 	MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz/2) // 2.5MHz
 	MCFG_CPU_PROGRAM_MAP(bridgec_z80_mem)
@@ -1343,9 +1356,9 @@ static MACHINE_CONFIG_START( bridgec, fidelz80_state )
 	MCFG_I8243_ADD("i8243", NOOP, WRITE8(fidelz80_state,digit_w))
 
 	/* sound hardware */
-	MCFG_SPEAKER_STANDARD_MONO( "mono" )
+	MCFG_SPEAKER_STANDARD_MONO("mono")
 	MCFG_SOUND_ADD("speech", S14001A, 25000) // around 25khz
-	MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
+	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 MACHINE_CONFIG_END
 
 
@@ -1419,10 +1432,10 @@ ROM_END
  Drivers
 ******************************************************************************/
 
-/*    YEAR  NAME        PARENT      COMPAT  MACHINE     INPUT   INIT      COMPANY                     FULLNAME                                                    FLAGS */
-COMP( 1978, cc10,       0,          0,      cc10,  fidelz80, driver_device, 0,      "Fidelity Electronics",   "Chess Challenger 10 (Model CC10/BCC)", MACHINE_NOT_WORKING )
-COMP( 1979, vcc,        0,          0,      vcc,   fidelz80, driver_device, 0,      "Fidelity Electronics",   "Talking Chess Challenger (model VCC)", MACHINE_NOT_WORKING )
-COMP( 1979, vbrc,       0,          0,      bridgec,   bridgec, driver_device,      0,      "Fidelity Electronics",   "Bridge Challenger (model VBRC/7002)",  MACHINE_NOT_WORKING )
-COMP( 1980, uvc,        vcc,        0,      vcc,   fidelz80, driver_device, 0,      "Fidelity Electronics",   "Advanced Talking Chess Challenger (model UVC)", MACHINE_NOT_WORKING )
-COMP( 1980, bridgec3,   vbrc,       0,      bridgec,   bridgec, driver_device,      0,      "Fidelity Electronics",   "Bridge Challenger 3 (model 7014)", MACHINE_NOT_WORKING )
-COMP( 1980, vsc,        0,          0,      vsc,   vsc, driver_device,      0,      "Fidelity Electronics",   "Voice Sensory Chess Challenger (model VSC)", MACHINE_NOT_WORKING | MACHINE_CLICKABLE_ARTWORK )
+/*    YEAR  NAME      PARENT  COMPAT  MACHINE  INPUT     INIT              COMPANY, FULLNAME, FLAGS */
+COMP( 1978, cc10,     0,      0,      cc10,    fidelz80, driver_device, 0, "Fidelity Electronics", "Chess Challenger 10 (Model CC10/BCC)", MACHINE_NOT_WORKING )
+COMP( 1979, vcc,      0,      0,      vcc,     fidelz80, driver_device, 0, "Fidelity Electronics", "Talking Chess Challenger (model VCC)", MACHINE_NOT_WORKING )
+COMP( 1979, vbrc,     0,      0,      bridgec, bridgec,  driver_device, 0, "Fidelity Electronics", "Bridge Challenger (model VBRC/7002)",  MACHINE_NOT_WORKING )
+COMP( 1980, uvc,      vcc,    0,      vcc,     fidelz80, driver_device, 0, "Fidelity Electronics", "Advanced Talking Chess Challenger (model UVC)", MACHINE_NOT_WORKING )
+COMP( 1980, bridgec3, vbrc,   0,      bridgec, bridgec,  driver_device, 0, "Fidelity Electronics", "Bridge Challenger 3 (model 7014)", MACHINE_NOT_WORKING )
+COMP( 1980, vsc,      0,      0,      vsc,     vsc,      driver_device, 0, "Fidelity Electronics", "Voice Sensory Chess Challenger (model VSC)", MACHINE_NOT_WORKING | MACHINE_CLICKABLE_ARTWORK )
diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp
index 94a76c01023..d4c60df3d00 100644
--- a/src/mame/drivers/goldnpkr.cpp
+++ b/src/mame/drivers/goldnpkr.cpp
@@ -4499,16 +4499,16 @@ ROM_START( potnpkrf )
 	ROM_LOAD( "prg.bin",    0x4000, 0x4000, CRC(d7a932a2) SHA1(c940ea90378a631c217a09c4a9e73c382acaa48d) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(                   0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */
+	ROM_FILL(           0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */
 	ROM_LOAD( "3.bin",  0x2000, 0x0800, CRC(23e83e89) SHA1(0c6352d46e3dfe176b0e970dd163e2bc01246890) )    /* text layer */
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "0.bin",    0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "1.bin",    0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "2.bin",    0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "0.bin",  0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) )    /* cards deck gfx, bitplane1 */
+	ROM_LOAD( "1.bin",  0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
+	ROM_LOAD( "2.bin",  0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",  0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
 ROM_END
 
 /* Unknown australian hard to dump set
@@ -4532,6 +4532,31 @@ ROM_START( potnpkrg )
 	ROM_LOAD( "bprom.bin",    0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
 ROM_END
 
+/* Unknown australian set
+   String "just 4 fun" replaces the "insert coins" one.
+*/
+ROM_START( potnpkrh )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "unk_2732.15a", 0x2000, 0x1000, CRC(441ad1b2) SHA1(248b8e03723989c7766b50858c9a5d0abbb5e055) )
+	ROM_LOAD( "unk_2732.17a", 0x3000, 0x1000, CRC(9d72e145) SHA1(526d88c70e03bcff18072436ca3d498a0bb39913) )
+
+	/* Backcard logo is different, showing 'FR'. The rest matches the common char gfx */
+	ROM_REGION( 0x1800, "gfx1", 0 )
+	ROM_FILL(                  0x0000, 0x1000, 0 ) /* filling the R-G bitplanes */
+	ROM_LOAD( "unk_2716.8a",   0x1000, 0x0800, CRC(a138afa6) SHA1(80c6d11086f78e36dfc01c15b23e70667fcf17fc) )    /* char ROM */
+
+	/* Backplane at 5a has two bits different against the common cards gfx
+       Offsets 0x380 and 0x400, bit0 is set to 0 */
+	ROM_REGION( 0x1800, "gfx2", 0 )
+	ROM_LOAD( "unk_2716.4a",  0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    /* cards deck gfx, bitplane1 */
+	ROM_LOAD( "unk_2716.5a",  0x0800, 0x0800, CRC(daf38d03) SHA1(6b518494688756ad7b753fdec46b6392c4a9ebbe) )    /* cards deck gfx, bitplane2 */
+	ROM_LOAD( "unk_2716.7a",  0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
+
+	ROM_REGION( 0x0100, "proms", 0 )
+	ROM_LOAD( "bprom.bin",    0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+ROM_END
+
+
 ROM_START( goodluck )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "goodluck_glh6b.bin", 0x0000, 0x8000, CRC(2cfa4a2c) SHA1(720e2900f3a0ef2632aa201a63b5eba0570e6aa3) )
@@ -4546,7 +4571,7 @@ ROM_START( goodluck )
 	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",  0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
 ROM_END
 
 
@@ -10516,6 +10541,7 @@ GAMEL( 198?, potnpkrd,  pottnpkr, pottnpkr, potnpkrc, driver_device,  0,
 GAMEL( 198?, potnpkre,  pottnpkr, pottnpkr, pottnpkr, driver_device,  0,        ROT0,   "bootleg",                  "Jack Potten's Poker (set 6)",             0,                layout_goldnpkr )
 GAMEL( 198?, potnpkrf,  pottnpkr, goldnpkr, goldnpkr, driver_device,  0,        ROT0,   "bootleg",                  "Jack Potten's Poker (set 7, Royale GFX)", 0,                layout_goldnpkr )
 GAMEL( 198?, potnpkrg,  pottnpkr, pottnpkr, potnpkra, driver_device,  0,        ROT0,   "bootleg",                  "Jack Potten's Poker (set 8, Australian)", 0,                layout_goldnpkr )
+GAMEL( 198?, potnpkrh,  pottnpkr, pottnpkr, goldnpkr, driver_device,  0,        ROT0,   "bootleg",                  "Jack Potten's Poker (set 9, 'just 4 fun')", 0,              layout_goldnpkr )
 GAMEL( 198?, ngold,     pottnpkr, pottnpkr, ngold,    driver_device,  0,        ROT0,   "<unknown>",                "Jack Potten's Poker (NGold, set 1)",      0,                layout_goldnpkr )
 GAMEL( 198?, ngolda,    pottnpkr, pottnpkr, ngold,    driver_device,  0,        ROT0,   "<unknown>",                "Jack Potten's Poker (NGold, set 2)",      0,                layout_goldnpkr )
 GAMEL( 198?, ngoldb,    pottnpkr, pottnpkr, ngoldb,   driver_device,  0,        ROT0,   "<unknown>",                "Jack Potten's Poker (NGold, set 3)",      0,                layout_goldnpkr )
@@ -10565,29 +10591,29 @@ GAMEL( 1997, witchcdk,  witchgme, witchcrd, witchcrd, driver_device,  0,
 
 GAMEL( 1994, witchjol,  0,        wcrdxtnd, witchjol, goldnpkr_state, vkdlsa,   ROT0,   "Video Klein",              "Jolli Witch (Export, 6T/12T ver 1.57D)",  0,                layout_goldnpkr )
 
-GAMEL( 2001, wldwitch,  0,        wcrdxtnd, wldwitch, goldnpkr_state, vkdlsww,  ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.84A)",       0,                layout_goldnpkr )  /* Ver 184A, 2001-09-12 */
-GAMEL( 1992, wldwitcha, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwa, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.57-SP)",     0,                layout_goldnpkr )  /* Ver 157-SP, 1992-12-25 */
-GAMEL( 1992, wldwitchb, wldwitch, wcrdxtnd, wldwitch, driver_device,  0,        ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.57-TE)",     MACHINE_NOT_WORKING, layout_goldnpkr )   /* Ver 157-TE, 1992-12-25 */
-GAMEL( 1994, wldwitchc, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwc, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.62A)",       0,                layout_goldnpkr )  /* Ver 162A, 1994-04-26 */
-GAMEL( 1994, wldwitchd, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwd, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.62B)",       0,                layout_goldnpkr )  /* Ver 162B, 1994-04-26 */
-GAMEL( 1994, wldwitche, wldwitch, wcrdxtnd, wldwitch, driver_device,  0,        ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.62A-F)",     MACHINE_NOT_WORKING, layout_goldnpkr )   /* Ver 162A-F, 1994-04-26 */
-GAMEL( 1994, wldwitchf, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwc, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.62A alt)",   0,                layout_goldnpkr )  /* Ver 162A alt, 1994-11-03 */
-GAMEL( 1994, wldwitchg, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwd, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.62B alt)",   0,                layout_goldnpkr )  /* Ver 162B alt, 1994-11-03 */
-GAMEL( 1995, wldwitchh, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwh, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.65A)",       0,                layout_goldnpkr )  /* Ver 165A, 1995-11-16 */
-GAMEL( 1996, wldwitchi, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwh, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.65A-S)",     0,                layout_goldnpkr )  /* Ver 165A-S (Fast Deal), 1996-03-26 */
-GAMEL( 1996, wldwitchj, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwh, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.65A-S alt)", 0,                layout_goldnpkr )  /* Ver 165A-S alt (Fast Deal), 1996-05-26 */
-GAMEL( 1996, wldwitchk, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwh, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.65A-N)",     0,                layout_goldnpkr )  /* Ver 165A-N, 1996-05-29 */
-GAMEL( 1996, wldwitchl, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwl, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.70A beta)",  0,                layout_goldnpkr )  /* Ver 170A-beta, 1996-06-25 */
-GAMEL( 1996, wldwitchm, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwl, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.70A)",       0,                layout_goldnpkr )  /* Ver 170A, 1996-09-30 */
-GAMEL( 1997, wldwitchn, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwl, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.70A alt)",   0,                layout_goldnpkr )  /* Ver 170A alt, 1997-06-11 */
-GAMEL( 1998, wldwitcho, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwo, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.74A-SP-BELG)", 0,              layout_goldnpkr )  /* Ver 174A-SP-BELG (no D-UP, no payout), 1998-05-11 */
-GAMEL( 1998, wldwitchp, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwp, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.74A)",       0,                layout_goldnpkr )  /* Ver 174A (no D-UP, no payout), 1998-09-20 */
-GAMEL( 1998, wldwitchq, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlsb,   ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.74A alt)",   0,                layout_goldnpkr )  /* Ver 174A alt, box, 1998-09-25 */
-GAMEL( 1999, wldwitchr, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwr, ROT0,   "Video Klein",              "Wild Witch (Export, 6B/12B ver 1.75A-E English)", 0,            layout_goldnpkr )  /* Ver 175A-E (English), 1999-01-11 */
-GAMEL( 1999, wldwitchs, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswws, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.76A)",       0,                layout_goldnpkr )  /* Ver 176A, 1999-??-?? */
-GAMEL( 1999, wldwitcht, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwt, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.77A)",       0,                layout_goldnpkr )  /* Ver 177A, 1999-??-?? */
-GAMEL( 2000, wldwitchu, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwu, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.79A)",       0,                layout_goldnpkr )  /* Ver 179A, 2000-05-10 */
-GAMEL( 2001, wldwitchv, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwv, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.83A)",       0,                layout_goldnpkr )  /* Ver 183A, 2001-06-13 */
+GAMEL( 2001, wldwitch,  0,        wcrdxtnd, wldwitch, goldnpkr_state, vkdlsww,  ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.84A)",       0,                   layout_goldnpkr )  /* Ver 184A, 2001-09-12 */
+GAMEL( 1992, wldwitcha, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwa, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.57-SP)",     0,                   layout_goldnpkr )  /* Ver 157-SP, 1992-12-25 */
+GAMEL( 1992, wldwitchb, wldwitch, wcrdxtnd, wldwitch, driver_device,  0,        ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.57-TE)",     MACHINE_NOT_WORKING, layout_goldnpkr )  /* Ver 157-TE, 1992-12-25 */
+GAMEL( 1994, wldwitchc, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwc, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.62A)",       0,                   layout_goldnpkr )  /* Ver 162A, 1994-04-26 */
+GAMEL( 1994, wldwitchd, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwd, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.62B)",       0,                   layout_goldnpkr )  /* Ver 162B, 1994-04-26 */
+GAMEL( 1994, wldwitche, wldwitch, wcrdxtnd, wldwitch, driver_device,  0,        ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.62A-F)",     MACHINE_NOT_WORKING, layout_goldnpkr )  /* Ver 162A-F, 1994-04-26 */
+GAMEL( 1994, wldwitchf, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwc, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.62A alt)",   0,                   layout_goldnpkr )  /* Ver 162A alt, 1994-11-03 */
+GAMEL( 1994, wldwitchg, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwd, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.62B alt)",   0,                   layout_goldnpkr )  /* Ver 162B alt, 1994-11-03 */
+GAMEL( 1995, wldwitchh, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwh, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.65A)",       0,                   layout_goldnpkr )  /* Ver 165A, 1995-11-16 */
+GAMEL( 1996, wldwitchi, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwh, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.65A-S)",     0,                   layout_goldnpkr )  /* Ver 165A-S (Fast Deal), 1996-03-26 */
+GAMEL( 1996, wldwitchj, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwh, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.65A-S alt)", 0,                   layout_goldnpkr )  /* Ver 165A-S alt (Fast Deal), 1996-05-26 */
+GAMEL( 1996, wldwitchk, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwh, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.65A-N)",     0,                   layout_goldnpkr )  /* Ver 165A-N, 1996-05-29 */
+GAMEL( 1996, wldwitchl, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwl, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.70A beta)",  0,                   layout_goldnpkr )  /* Ver 170A-beta, 1996-06-25 */
+GAMEL( 1996, wldwitchm, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwl, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.70A)",       0,                   layout_goldnpkr )  /* Ver 170A, 1996-09-30 */
+GAMEL( 1997, wldwitchn, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwl, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.70A alt)",   0,                   layout_goldnpkr )  /* Ver 170A alt, 1997-06-11 */
+GAMEL( 1998, wldwitcho, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwo, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.74A-SP-BELG)", 0,                 layout_goldnpkr )  /* Ver 174A-SP-BELG (no D-UP, no payout), 1998-05-11 */
+GAMEL( 1998, wldwitchp, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwp, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.74A)",       0,                   layout_goldnpkr )  /* Ver 174A (no D-UP, no payout), 1998-09-20 */
+GAMEL( 1998, wldwitchq, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlsb,   ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.74A alt)",   0,                   layout_goldnpkr )  /* Ver 174A alt, box, 1998-09-25 */
+GAMEL( 1999, wldwitchr, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwr, ROT0,   "Video Klein",              "Wild Witch (Export, 6B/12B ver 1.75A-E English)", 0,               layout_goldnpkr )  /* Ver 175A-E (English), 1999-01-11 */
+GAMEL( 1999, wldwitchs, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswws, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.76A)",       0,                   layout_goldnpkr )  /* Ver 176A, 1999-??-?? */
+GAMEL( 1999, wldwitcht, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwt, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.77A)",       0,                   layout_goldnpkr )  /* Ver 177A, 1999-??-?? */
+GAMEL( 2000, wldwitchu, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwu, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.79A)",       0,                   layout_goldnpkr )  /* Ver 179A, 2000-05-10 */
+GAMEL( 2001, wldwitchv, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwv, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.83A)",       0,                   layout_goldnpkr )  /* Ver 183A, 2001-06-13 */
 
 GAMEL( 1998, wupndown,  0,        wcrdxtnd, wupndown, driver_device,  0,        ROT0,   "Video Klein",              "Witch Up & Down (Export, 6T/12T ver 1.02)",        0,           layout_upndown )    /* Ver 1.02, 1998-10-26 */
 GAMEL( 1998, wupndowna, wupndown, wcrdxtnd, wupndown, driver_device,  0,        ROT0,   "Video Klein",              "Witch Up & Down (Export, 6T/12T ver 0.99, set 1)", 0,           layout_upndown )    /* Ver 0.99, 1998-04-09 */
diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp
index d3f739a36bc..db0a65e5dd1 100644
--- a/src/mame/drivers/goldstar.cpp
+++ b/src/mame/drivers/goldstar.cpp
@@ -6236,32 +6236,32 @@ static INPUT_PORTS_START( cmpacman )
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL )   /* Tied to GND and to the hidden switch that change games. (PC0+GND) -+-> PB0 */
 
 	PORT_START("DSW1")
-	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )  PORT_DIPLOCATION("DSW1:!1")  /* OK */
+	PORT_DIPNAME( 0x01, 0x01, "Unknown" )                   PORT_DIPLOCATION("DSW1:!1")     /* not checked */
 	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x02, "Hopper Out Switch" ) PORT_DIPLOCATION("DSW1:!2")  /* OK */
+	PORT_DIPNAME( 0x02, 0x02, "Hopper Out Switch" )         PORT_DIPLOCATION("DSW1:!2")     /* not checked */
 	PORT_DIPSETTING(    0x02, "Active Low" )
 	PORT_DIPSETTING(    0x00, "Active High" )
-	PORT_DIPNAME( 0x04, 0x04, "Payout Mode" )       PORT_DIPLOCATION("DSW1:!3")  /* OK */
+	PORT_DIPNAME( 0x04, 0x04, "Payout Mode" )               PORT_DIPLOCATION("DSW1:!3")     /* not checked */
 	PORT_DIPSETTING(    0x04, "Payout Switch" )
 	PORT_DIPSETTING(    0x00, "Automatic" )
-	PORT_DIPNAME( 0x08, 0x00, "W-UP '7'" )          PORT_DIPLOCATION("DSW1:!4")  /* not checked */
-	PORT_DIPSETTING(    0x08, "Loss" )
-	PORT_DIPSETTING(    0x00, "Even" )
-	PORT_DIPNAME( 0x10, 0x00, "W-UP Pay Rate" )     PORT_DIPLOCATION("DSW1:!5")  /* OK */
+	PORT_DIPNAME( 0x08, 0x00, "'7' In Double Up Game" )     PORT_DIPLOCATION("DSW1:!4")     /* OK */
+	PORT_DIPSETTING(    0x00, "Lose" )
+	PORT_DIPSETTING(    0x08, "Even" )
+	PORT_DIPNAME( 0x10, 0x00, "Double Up Game Pay Rate" )   PORT_DIPLOCATION("DSW1:!5")     /* OK */
 	PORT_DIPSETTING(    0x00, "80%" )
 	PORT_DIPSETTING(    0x10, "90%" )
-	PORT_DIPNAME( 0x20, 0x00, "W-UP Game" )         PORT_DIPLOCATION("DSW1:!6")  /* OK */
+	PORT_DIPNAME( 0x20, 0x00, "Double Up Game" )            PORT_DIPLOCATION("DSW1:!6")     /* OK */
 	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0xc0, 0xc0, "Bet Max" )           PORT_DIPLOCATION("DSW1:!7,!8")    /* OK */
+	PORT_DIPNAME( 0xc0, 0xc0, "Bet Max" )                   PORT_DIPLOCATION("DSW1:!7,!8")  /* OK */
 	PORT_DIPSETTING(    0x00, "16" )
 	PORT_DIPSETTING(    0x40, "32" )
 	PORT_DIPSETTING(    0x80, "64" )
 	PORT_DIPSETTING(    0xc0, "96" )
 
 	PORT_START("DSW2")
-	PORT_DIPNAME( 0x07, 0x00, "Main Game Pay Rate" )    PORT_DIPLOCATION("DSW2:!1,!2,!3")  /* OK */
+	PORT_DIPNAME( 0x07, 0x00, "Main Game Pay Rate" )    PORT_DIPLOCATION("DSW2:!1,!2,!3")   /* OK */
 	PORT_DIPSETTING(    0x07, "55%" )
 	PORT_DIPSETTING(    0x06, "60%" )
 	PORT_DIPSETTING(    0x05, "65%" )
@@ -6270,18 +6270,18 @@ static INPUT_PORTS_START( cmpacman )
 	PORT_DIPSETTING(    0x02, "80%" )
 	PORT_DIPSETTING(    0x01, "85%" )
 	PORT_DIPSETTING(    0x00, "90%" )
-	PORT_DIPNAME( 0x18, 0x00, "Hopper Limit" )          PORT_DIPLOCATION("DSW2:!4,!5")    /* OK */
+	PORT_DIPNAME( 0x18, 0x00, "Hopper Limit" )          PORT_DIPLOCATION("DSW2:!4,!5")      /* not checked */
 	PORT_DIPSETTING(    0x18, "300" )
 	PORT_DIPSETTING(    0x10, "500" )
 	PORT_DIPSETTING(    0x08, "1000" )
 	PORT_DIPSETTING(    0x00, "Unlimited" )
-	PORT_DIPNAME( 0x20, 0x00, "100 Odds Sound" )        PORT_DIPLOCATION("DSW2:!6")  /* not checked */
+	PORT_DIPNAME( 0x20, 0x00, "100 Odds Sound" )        PORT_DIPLOCATION("DSW2:!6")         /* not checked */
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x20, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x40, "Key-In Type" )           PORT_DIPLOCATION("DSW2:!7")  /* OK */
+	PORT_DIPNAME( 0x40, 0x40, "Key-In Type" )           PORT_DIPLOCATION("DSW2:!7")         /* OK */
 	PORT_DIPSETTING(    0x40, "A-Type" )
 	PORT_DIPSETTING(    0x00, "B-Type" )
-	PORT_DIPNAME( 0x80, 0x00, "Center Super 7 Bet Limit" )  PORT_DIPLOCATION("DSW2:!8")  /* related with DSW 4-6 */
+	PORT_DIPNAME( 0x80, 0x00, "Center Super 7 Bet Limit" )  PORT_DIPLOCATION("DSW2:!8")     /* related with DSW 4-6 */
 	PORT_DIPSETTING(    0x80, "Unlimited" )
 	PORT_DIPSETTING(    0x00, "Limited" )
 
@@ -6318,11 +6318,14 @@ static INPUT_PORTS_START( cmpacman )
 	PORT_INCLUDE( cmv4_dsw4 )   /* Display Of Payout Limit not working; all others OK */
 
 	PORT_INCLUDE( cmv4_dsw5 )
+	PORT_MODIFY("DSW5")
 	/* Display of Doll On Demo only affects payout table screen */
 	/* Coin In Limit OK */
-	/* Condition For 3 Kind Of Bonus not checked */
+	/* Condition For 3 Kind Of Bonus OK */
 	/* Display Of Doll At All Fr. Bonus not checked */
-	/* DSW5-7 listed as unused */
+	PORT_DIPNAME( 0x40, 0x40, "Card Shuffle Animation" )    PORT_DIPLOCATION("DSW5:7")  /* OK */
+	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	/* Test Mode For Disp. Of Doll not working */
 INPUT_PORTS_END
 
diff --git a/src/mame/drivers/pse.cpp b/src/mame/drivers/pse.cpp
index 16375d94db5..4334c82cc0d 100644
--- a/src/mame/drivers/pse.cpp
+++ b/src/mame/drivers/pse.cpp
@@ -7,18 +7,18 @@
  Game Name                       DATA
  -------------------------------------
  1-2-4 Cocktail Table (197?)     UNKNOWN
- Bazooka (1977)                  YES
- Desert Patrol (1977)            YES
- Espana (cabinet) (197?)         NO
- Frenzy (1975)                   UNKNOWN
- Game Tree (1978)                YES
- Hodge Podge (197?)              UNKNOWN
- Knights in Armor (1976)         YES
- Maneater (1975)                 YES
+ Bazooka (1976/11)               YES
+ Desert Patrol (1977/11)         YES
+ Espana (cabinet) (1975/10)      NO
+ Frenzy (1975/08)                UNKNOWN
+ Game Tree (1978/02)             YES
+ Hodge Podge (1975?)             NO
+ Knights in Armor (1976/06)      YES
+ Maneater (1975/11)              YES
  Play Five (1975?)               UNKNOWN
- Scandia (cabinet) (1975)        NO
+ Scandia (cabinet) (1975/08)     NO
  Two Game (1974)                 UNKNOWN
- U.N. Command (1977)             UNKNOWN
+ U.N. Command (1977)             YES?
 
  ***************************************************************************/
 
@@ -79,8 +79,8 @@ static NETLIST_START(pse)
 	// schematics
 	//...
 
-//  NETDEV_ANALOG_CALLBACK(sound_cb, sound, psettl_state, sound_cb, "")
-//  NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq")
+        //  NETDEV_ANALOG_CALLBACK(sound_cb, sound, psettl_state, sound_cb, "")
+        //  NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq")
 NETLIST_END()
 
 
@@ -120,6 +120,29 @@ MACHINE_CONFIG_END
 
  ***************************************************************************/
 
+ROM_START( bazooka )
+	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
+
+	ROM_REGION( 0x0840, "roms", ROMREGION_ERASE00 )
+	ROM_LOAD( "bd2.k1",      0x0000, 0x0200, CRC(c9e9ed15) SHA1(624bbc10942a386040aef161b96d64021a842c9f) ) // 6341-1 - gfx: tank, truck, jeep motorcycle
+	ROM_LOAD( "bd2.k4",      0x0200, 0x0200, CRC(c5a74df9) SHA1(2846a039e9bf372f3aa0b88ed89f9029eb7f797c) ) // 6341-1 - gfx: ambulance, stretcher, explosion
+	ROM_LOAD( "bd1.d2",      0x0400, 0x0200, CRC(4fc10886) SHA1(b1c6f890994ba2182a4e7fc17582d6797dbd6ce9) ) // 6341-1 or 82s115
+	ROM_LOAD( "bd1.e2",      0x0600, 0x0200, CRC(00179936) SHA1(e5417b8d3814dafe1278179b307a1b563a378cbe) ) // 6341-1 or 82s115
+	ROM_LOAD( "bd2.e6",      0x0800, 0x0020, CRC(14b84564) SHA1(69cdd14e23094678c4b280f60cec963609181b00) ) // 82123
+	ROM_LOAD( "bd2.e7",      0x0820, 0x0020, CRC(1bfb073f) SHA1(f6b26dcece71b2cf2ed4a537434edbe31cb10399) ) // 82123
+ROM_END
+
+ROM_START( bazookabr )
+	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
+
+	ROM_REGION( 0x0840, "roms", ROMREGION_ERASE00 )
+	ROM_LOAD( "1",           0x0000, 0x0200, CRC(edc34cb0) SHA1(f76a81833b015784e55b33189e9058cd24922f9b) )
+	ROM_LOAD( "2",           0x0200, 0x0200, CRC(3e78e4c2) SHA1(814509eb773bfa87f1df933214f079e7dd2a8fa2) )
+	ROM_LOAD( "3",           0x0400, 0x0200, CRC(4fc10886) SHA1(b1c6f890994ba2182a4e7fc17582d6797dbd6ce9) )
+	ROM_LOAD( "4",           0x0600, 0x0200, CRC(00179936) SHA1(e5417b8d3814dafe1278179b307a1b563a378cbe) )
+	ROM_LOAD( "bd2.e6",      0x0800, 0x0020, BAD_DUMP CRC(14b84564) SHA1(69cdd14e23094678c4b280f60cec963609181b00) ) // not dumped, taken from PSE set
+	ROM_LOAD( "bd2.e7",      0x0820, 0x0020, BAD_DUMP CRC(1bfb073f) SHA1(f6b26dcece71b2cf2ed4a537434edbe31cb10399) ) // not dumped, taken from PSE set
+ROM_END
 
 ROM_START( dpatrol )
 	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
@@ -168,7 +191,8 @@ ROM_START( gametree )
 ROM_END
 */
 
-
-GAME( 1977, dpatrol, 0, pse, 0, driver_device, 0, ROT0, "Project Support Engineering", "Desert Patrol [TTL]", MACHINE_IS_SKELETON )
-//GAME( 1976, knightar, 0, pse, 0, driver_device, 0, ROT0, "Project Support Engineering", "Knights in Armor [TTL]", MACHINE_IS_SKELETON )
-//GAME( 1978, gametree, 0, pse, 0, driver_device, 0, ROT0, "Project Support Engineering", "Game Tree [TTL]", MACHINE_IS_SKELETON )
+GAME( 1976, bazooka,    0,       pse, 0, driver_device,  0, ROT0, "Project Support Engineering", "Bazooka [TTL]", MACHINE_IS_SKELETON )
+GAME( 1977, bazookabr,  bazooka, pse, 0, driver_device,  0, ROT0, "Taito do Brasil", "Bazooka (Brazil) [TTL]", MACHINE_IS_SKELETON )
+GAME( 1977, dpatrol,    0,       pse, 0, driver_device,  0, ROT0, "Project Support Engineering", "Desert Patrol [TTL]", MACHINE_IS_SKELETON )
+//GAME( 1976, knightar, 0,       pse, 0, driver_device,  0, ROT0, "Project Support Engineering", "Knights in Armor [TTL]", MACHINE_IS_SKELETON )
+//GAME( 1978, gametree, 0,       pse, 0, driver_device,  0, ROT0, "Project Support Engineering", "Game Tree [TTL]", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/taitottl.cpp b/src/mame/drivers/taitottl.cpp
index c7622bf62c5..609c24ea32f 100644
--- a/src/mame/drivers/taitottl.cpp
+++ b/src/mame/drivers/taitottl.cpp
@@ -195,33 +195,6 @@ ROM_START( gunman )
 	ROM_LOAD( "gn01.b9",     0x0000, 0x0800, CRC(69474a3a) SHA1(7396f1be991a0e6207eaa79e0206a5286a8d615d) )
 ROM_END
 
-
-ROM_START( bazooka )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
-
-	ROM_REGION( 0x0840, "roms", ROMREGION_ERASE00 )
-	ROM_LOAD( "bd2.k1",      0x0000, 0x0200, CRC(c9e9ed15) SHA1(624bbc10942a386040aef161b96d64021a842c9f) ) // 6341-1 - gfx: tank, truck, jeep motorcycle
-	ROM_LOAD( "bd2.k4",      0x0200, 0x0200, CRC(c5a74df9) SHA1(2846a039e9bf372f3aa0b88ed89f9029eb7f797c) ) // 6341-1 - gfx: ambulance, stretcher, explosion
-	ROM_LOAD( "bd1.d2",      0x0400, 0x0200, CRC(4fc10886) SHA1(b1c6f890994ba2182a4e7fc17582d6797dbd6ce9) ) // 6341-1 or 82s115
-	ROM_LOAD( "bd1.e2",      0x0600, 0x0200, CRC(00179936) SHA1(e5417b8d3814dafe1278179b307a1b563a378cbe) ) // 6341-1 or 82s115
-	ROM_LOAD( "bd2.e6",      0x0800, 0x0020, CRC(14b84564) SHA1(69cdd14e23094678c4b280f60cec963609181b00) ) // 82123
-	ROM_LOAD( "bd2.e7",      0x0820, 0x0020, CRC(1bfb073f) SHA1(f6b26dcece71b2cf2ed4a537434edbe31cb10399) ) // 82123
-ROM_END
-
-
-ROM_START( bazookabr )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
-
-	ROM_REGION( 0x0840, "roms", ROMREGION_ERASE00 )
-	ROM_LOAD( "1",           0x0000, 0x0200, CRC(edc34cb0) SHA1(f76a81833b015784e55b33189e9058cd24922f9b) )
-	ROM_LOAD( "2",           0x0200, 0x0200, CRC(3e78e4c2) SHA1(814509eb773bfa87f1df933214f079e7dd2a8fa2) )
-	ROM_LOAD( "3",           0x0400, 0x0200, CRC(4fc10886) SHA1(b1c6f890994ba2182a4e7fc17582d6797dbd6ce9) )
-	ROM_LOAD( "4",           0x0600, 0x0200, CRC(00179936) SHA1(e5417b8d3814dafe1278179b307a1b563a378cbe) )
-	ROM_LOAD( "bd2.e6",      0x0800, 0x0020, BAD_DUMP CRC(14b84564) SHA1(69cdd14e23094678c4b280f60cec963609181b00) ) // not dumped, taken from PSE set
-	ROM_LOAD( "bd2.e7",      0x0820, 0x0020, BAD_DUMP CRC(1bfb073f) SHA1(f6b26dcece71b2cf2ed4a537434edbe31cb10399) ) // not dumped, taken from PSE set
-ROM_END
-
-
 /*
 
  Missile-X
@@ -279,8 +252,6 @@ ROM_END
 
 
 GAME( 1977, gunman,    0,       taitottl, 0, driver_device,  0, ROT0, "Taito", "Gunman [TTL]", MACHINE_IS_SKELETON )
-GAME( 1977, bazooka,   0,       taitottl, 0, driver_device,  0, ROT0, "Project Support Engineering", "Bazooka [TTL]", MACHINE_IS_SKELETON ) // clone of Taito Cross Fire - or is Cross Fire a clone of PSE Bazooka?
-GAME( 1977, bazookabr, bazooka, taitottl, 0, driver_device,  0, ROT0, "Taito do Brasil", "Bazooka (Brazil) [TTL]", MACHINE_IS_SKELETON )
 GAME( 1977, missilex,  0,       taitottl, 0, driver_device,  0, ROT0, "Taito", "Missile-X [TTL]", MACHINE_IS_SKELETON )
 GAME( 1977, ttblock,   0,       taitottl, 0, driver_device,  0, ROT0, "Taito", "T.T. Block [TTL]", MACHINE_IS_SKELETON )
 GAME( 1979, zzblock,   0,       taitottl, 0, driver_device,  0, ROT0, "Taito", "Zun Zun Block [TTL]", MACHINE_IS_SKELETON )
diff --git a/src/mame/includes/fidelz80.h b/src/mame/includes/fidelz80.h
index 64f47809e4c..7af877b275c 100644
--- a/src/mame/includes/fidelz80.h
+++ b/src/mame/includes/fidelz80.h
@@ -2,7 +2,7 @@
 // copyright-holders:Kevin Horton,Jonathan Gevaryahu,Sandro Ronco
 /***************************************************************************
 
-        fidelz80.h
+    Fidelity Electronics Z80 based board driver
 
 ****************************************************************************/
 
@@ -19,12 +19,12 @@ class fidelz80_state : public driver_device
 public:
 	fidelz80_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-			m_maincpu(*this, "maincpu"),
-			m_speech(*this, "speech"),
-			m_beep(*this, "beeper"),
-			m_i8041(*this, "mcu"),
-			m_i8243(*this, "i8243")
-		{ }
+		m_maincpu(*this, "maincpu"),
+		m_speech(*this, "speech"),
+		m_beep(*this, "beeper"),
+		m_i8041(*this, "mcu"),
+		m_i8243(*this, "i8243")
+	{ }
 
 	required_device<cpu_device> m_maincpu;
 	optional_device<s14001a_device> m_speech;
@@ -32,25 +32,23 @@ public:
 	optional_device<i8041_device> m_i8041;
 	optional_device<i8243_device> m_i8243;
 
-	UINT16 m_kp_matrix;         // keypad/leds matrix
-	UINT8 m_led_data;           // data for the two individual leds, in 0bxxxx12xx format
-	UINT8 m_led_selected;       // 5 bit selects for 7 seg leds and for common other leds, bits are (7seg leds are 0 1 2 3, common other leds are C) 0bxx3210xc
-	UINT16 m_digit_data;        // data for seg leds
+	UINT16 m_kp_matrix;             // keypad/leds matrix
+	UINT8 m_led_data;               // data for the two individual leds, in 0bxxxx12xx format
+	UINT8 m_led_selected;           // 5 bit selects for 7 seg leds and for common other leds, bits are (7seg leds are 0 1 2 3, common other leds are C) 0bxx3210xc
+	UINT16 m_digit_data;            // data for seg leds
 	UINT8 m_digit_line_status[4];   // prevent overwrite of m_digit_data
 
-	virtual void machine_reset();
-
 	//model VCC/UVC
 	void update_display();
-	DECLARE_READ8_MEMBER( fidelz80_portc_r );
-	DECLARE_WRITE8_MEMBER( fidelz80_portb_w );
-	DECLARE_WRITE8_MEMBER( fidelz80_portc_w );
-	DECLARE_WRITE8_MEMBER( cc10_porta_w );
-	DECLARE_READ8_MEMBER( vcc_portb_r );
-	DECLARE_WRITE8_MEMBER( vcc_porta_w );
+	DECLARE_READ8_MEMBER(fidelz80_portc_r);
+	DECLARE_WRITE8_MEMBER(fidelz80_portb_w);
+	DECLARE_WRITE8_MEMBER(fidelz80_portc_w);
+	DECLARE_WRITE8_MEMBER(cc10_porta_w);
+	DECLARE_READ8_MEMBER(vcc_portb_r);
+	DECLARE_WRITE8_MEMBER(vcc_porta_w);
 
 	//model 7014 and VBC
-	DECLARE_WRITE8_MEMBER(bridgec_speech_w );
+	DECLARE_WRITE8_MEMBER(bridgec_speech_w);
 	DECLARE_WRITE8_MEMBER(kp_matrix_w);
 	DECLARE_READ8_MEMBER(unknown_r);
 	DECLARE_READ8_MEMBER(unknown2_r);
@@ -73,6 +71,8 @@ public:
 	TIMER_DEVICE_CALLBACK_MEMBER(nmi_timer);
 
 	DECLARE_WRITE8_MEMBER(digit_w);
+
+	virtual void machine_start();
 };
 
 
diff --git a/src/mame/layout/cmpacman.lay b/src/mame/layout/cmpacman.lay
index 7f7513bbc7c..01b1e240b0d 100644
--- a/src/mame/layout/cmpacman.lay
+++ b/src/mame/layout/cmpacman.lay
@@ -47,7 +47,7 @@
 			<color red="1.0" green="0.5" blue="0.0" />
 		</rect>
 		<rect state="0">
-			<color red="0.15" green="0.075" blue="0.0" />
+			<color red="0.5" green="0.25" blue="0.0" />
 		</rect>
 		<text string="TAKE">
 			<color red="0.0" green="0.0" blue="0.0" />
@@ -134,7 +134,7 @@
 			<color red="0.7" green="0.35" blue="0.0" />
 		</rect>
 		<rect state="0">
-			<color red="0.1" green="0.05" blue="0.0" />
+			<color red="0.4" green="0.2" blue="0.0" />
 		</rect>
 	</element>
 
diff --git a/src/mame/machine/c65_old.cpp b/src/mame/machine/c65_old.cpp
deleted file mode 100644
index 3a582cfb0ae..00000000000
--- a/src/mame/machine/c65_old.cpp
+++ /dev/null
@@ -1,1339 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Peter Trauner
-/***************************************************************************
-    commodore c65 home computer
-    peter.trauner@jk.uni-linz.ac.at
-    documention
-     www.funet.fi
- ***************************************************************************/
-
-#include "emu.h"
-
-#include "includes/c65.h"
-#include "cpu/m6502/m4510.h"
-#include "sound/mos6581.h"
-#include "machine/mos6526.h"
-#include "bus/cbmiec/cbmiec.h"
-#include "machine/ram.h"
-#include "video/vic4567.h"
-#include "imagedev/cassette.h"
-#include "crsshair.h"
-#include "formats/cbm_tap.h"
-
-#define VERBOSE_LEVEL 0
-#define DBG_LOG( MACHINE, N, M, A ) \
-	do { \
-		if(VERBOSE_LEVEL >= N) \
-		{ \
-			if( M ) \
-				logerror("%11.6f: %-24s", MACHINE.time().as_double(), (char*) M ); \
-			logerror A; \
-		} \
-	} while (0)
-
-
-
-/***********************************************
-
-    Input Reading - Common Components
-
-***********************************************/
-
-/* These are needed by c64, c65 and c128, each machine has also additional specific
-components in its INTERRUPT_GEN */
-
-/* keyboard lines */
-UINT8 c64_keyline[10];
-
-void cbm_common_init(void)
-{
-	int i;
-
-	for (i = 0; i < ARRAY_LENGTH(c64_keyline); i++)
-		c64_keyline[i] = 0xff;
-}
-
-static TIMER_CALLBACK( lightpen_tick )
-{
-	if (((machine.root_device().ioport("CTRLSEL")->read() & 0x07) == 0x04) || ((machine.root_device().ioport("CTRLSEL")->read() & 0x07) == 0x06))
-	{
-		/* enable lightpen crosshair */
-		crosshair_set_screen(machine, 0, CROSSHAIR_SCREEN_ALL);
-	}
-	else
-	{
-		/* disable lightpen crosshair */
-		crosshair_set_screen(machine, 0, CROSSHAIR_SCREEN_NONE);
-	}
-}
-
-void cbm_common_interrupt( device_t *device )
-{
-	int value, i;
-	int controller1 = device->machine().root_device().ioport("CTRLSEL")->read() & 0x07;
-	int controller2 = device->machine().root_device().ioport("CTRLSEL")->read() & 0x70;
-	static const char *const c64ports[] = { "ROW0", "ROW1", "ROW2", "ROW3", "ROW4", "ROW5", "ROW6", "ROW7" };
-
-	/* Lines 0-7 : common keyboard */
-	for (i = 0; i < 8; i++)
-	{
-		value = 0xff;
-		value &= ~device->machine().root_device().ioport(c64ports[i])->read();
-
-		/* Shift Lock is mapped on Left Shift */
-		if ((i == 1) && (device->machine().root_device().ioport("SPECIAL")->read() & 0x40))
-			value &= ~0x80;
-
-		c64_keyline[i] = value;
-	}
-
-
-	value = 0xff;
-	switch(controller1)
-	{
-		case 0x00:
-			value &= ~device->machine().root_device().ioport("JOY1_1B")->read();            /* Joy1 Directions + Button 1 */
-			break;
-
-		case 0x01:
-			if (device->machine().root_device().ioport("OTHER")->read() & 0x40)         /* Paddle2 Button */
-				value &= ~0x08;
-			if (device->machine().root_device().ioport("OTHER")->read() & 0x80)         /* Paddle1 Button */
-				value &= ~0x04;
-			break;
-
-		case 0x02:
-			if (device->machine().root_device().ioport("OTHER")->read() & 0x02)         /* Mouse Button Left */
-				value &= ~0x10;
-			if (device->machine().root_device().ioport("OTHER")->read() & 0x01)         /* Mouse Button Right */
-				value &= ~0x01;
-			break;
-
-		case 0x03:
-			value &= ~(device->machine().root_device().ioport("JOY1_2B")->read() & 0x1f);   /* Joy1 Directions + Button 1 */
-			break;
-
-		case 0x04:
-/* was there any input on the lightpen? where is it mapped? */
-//          if (device->machine().root_device().ioport("OTHER")->read() & 0x04)           /* Lightpen Signal */
-//              value &= ?? ;
-			break;
-
-		case 0x07:
-			break;
-
-		default:
-			logerror("Invalid Controller 1 Setting %d\n", controller1);
-			break;
-	}
-
-	c64_keyline[8] = value;
-
-
-	value = 0xff;
-	switch(controller2)
-	{
-		case 0x00:
-			value &= ~device->machine().root_device().ioport("JOY2_1B")->read();            /* Joy2 Directions + Button 1 */
-			break;
-
-		case 0x10:
-			if (device->machine().root_device().ioport("OTHER")->read() & 0x10)         /* Paddle4 Button */
-				value &= ~0x08;
-			if (device->machine().root_device().ioport("OTHER")->read() & 0x20)         /* Paddle3 Button */
-				value &= ~0x04;
-			break;
-
-		case 0x20:
-			if (device->machine().root_device().ioport("OTHER")->read() & 0x02)         /* Mouse Button Left */
-				value &= ~0x10;
-			if (device->machine().root_device().ioport("OTHER")->read() & 0x01)         /* Mouse Button Right */
-				value &= ~0x01;
-			break;
-
-		case 0x30:
-			value &= ~(device->machine().root_device().ioport("JOY2_2B")->read() & 0x1f);   /* Joy2 Directions + Button 1 */
-			break;
-
-		case 0x40:
-/* was there any input on the lightpen? where is it mapped? */
-//          if (device->machine().root_device().ioport("OTHER")->read() & 0x04)           /* Lightpen Signal */
-//              value &= ?? ;
-			break;
-
-		case 0x70:
-			break;
-
-		default:
-			logerror("Invalid Controller 2 Setting %d\n", controller2);
-			break;
-	}
-
-	c64_keyline[9] = value;
-
-//  vic2_frame_interrupt does nothing so this is not necessary
-//  vic2_frame_interrupt (device);
-
-	/* check if lightpen has been chosen as input: if so, enable crosshair */
-	device->machine().scheduler().timer_set(attotime::zero, FUNC(lightpen_tick));
-
-	set_led_status (device->machine(), 1, device->machine().root_device().ioport("SPECIAL")->read() & 0x40 ? 1 : 0);        /* Shift Lock */
-	set_led_status (device->machine(), 0, device->machine().root_device().ioport("CTRLSEL")->read() & 0x80 ? 1 : 0);        /* Joystick Swap */
-}
-
-
-/***********************************************
-
-    CIA Common Handlers
-
-***********************************************/
-
-/* These are shared by c64, c65 and c128. c65 and c128 also have additional specific
-components (to select/read additional keyboard lines) */
-
-/*
- *  CIA 0 - Port A
- * bits 7-0 keyboard line select
- * bits 7,6: paddle select( 01 port a, 10 port b)
- * bit 4: joystick a fire button
- * bits 3,2: Paddles port a fire button
- * bits 3-0: joystick a direction
- *
- *  CIA 0 - Port B
- * bits 7-0: keyboard raw values
- * bit 4: joystick b fire button, lightpen select
- * bits 3,2: paddle b fire buttons (left,right)
- * bits 3-0: joystick b direction
- *
- * flag cassette read input, serial request in
- * irq to irq connected
- */
-
-UINT8 cbm_common_cia0_port_a_r( device_t *device, UINT8 output_b )
-{
-	UINT8 value = 0xff;
-
-	if (!(output_b & 0x80))
-	{
-		UINT8 t = 0xff;
-		if (!(c64_keyline[7] & 0x80)) t &= ~0x80;
-		if (!(c64_keyline[6] & 0x80)) t &= ~0x40;
-		if (!(c64_keyline[5] & 0x80)) t &= ~0x20;
-		if (!(c64_keyline[4] & 0x80)) t &= ~0x10;
-		if (!(c64_keyline[3] & 0x80)) t &= ~0x08;
-		if (!(c64_keyline[2] & 0x80)) t &= ~0x04;
-		if (!(c64_keyline[1] & 0x80)) t &= ~0x02;
-		if (!(c64_keyline[0] & 0x80)) t &= ~0x01;
-		value &= t;
-	}
-
-	if (!(output_b & 0x40))
-	{
-		UINT8 t = 0xff;
-		if (!(c64_keyline[7] & 0x40)) t &= ~0x80;
-		if (!(c64_keyline[6] & 0x40)) t &= ~0x40;
-		if (!(c64_keyline[5] & 0x40)) t &= ~0x20;
-		if (!(c64_keyline[4] & 0x40)) t &= ~0x10;
-		if (!(c64_keyline[3] & 0x40)) t &= ~0x08;
-		if (!(c64_keyline[2] & 0x40)) t &= ~0x04;
-		if (!(c64_keyline[1] & 0x40)) t &= ~0x02;
-		if (!(c64_keyline[0] & 0x40)) t &= ~0x01;
-		value &= t;
-	}
-
-	if (!(output_b & 0x20))
-	{
-		UINT8 t = 0xff;
-		if (!(c64_keyline[7] & 0x20)) t &= ~0x80;
-		if (!(c64_keyline[6] & 0x20)) t &= ~0x40;
-		if (!(c64_keyline[5] & 0x20)) t &= ~0x20;
-		if (!(c64_keyline[4] & 0x20)) t &= ~0x10;
-		if (!(c64_keyline[3] & 0x20)) t &= ~0x08;
-		if (!(c64_keyline[2] & 0x20)) t &= ~0x04;
-		if (!(c64_keyline[1] & 0x20)) t &= ~0x02;
-		if (!(c64_keyline[0] & 0x20)) t &= ~0x01;
-		value &= t;
-	}
-
-	if (!(output_b & 0x10))
-	{
-		UINT8 t = 0xff;
-		if (!(c64_keyline[7] & 0x10)) t &= ~0x80;
-		if (!(c64_keyline[6] & 0x10)) t &= ~0x40;
-		if (!(c64_keyline[5] & 0x10)) t &= ~0x20;
-		if (!(c64_keyline[4] & 0x10)) t &= ~0x10;
-		if (!(c64_keyline[3] & 0x10)) t &= ~0x08;
-		if (!(c64_keyline[2] & 0x10)) t &= ~0x04;
-		if (!(c64_keyline[1] & 0x10)) t &= ~0x02;
-		if (!(c64_keyline[0] & 0x10)) t &= ~0x01;
-		value &= t;
-	}
-
-	if (!(output_b & 0x08))
-	{
-		UINT8 t = 0xff;
-		if (!(c64_keyline[7] & 0x08)) t &= ~0x80;
-		if (!(c64_keyline[6] & 0x08)) t &= ~0x40;
-		if (!(c64_keyline[5] & 0x08)) t &= ~0x20;
-		if (!(c64_keyline[4] & 0x08)) t &= ~0x10;
-		if (!(c64_keyline[3] & 0x08)) t &= ~0x08;
-		if (!(c64_keyline[2] & 0x08)) t &= ~0x04;
-		if (!(c64_keyline[1] & 0x08)) t &= ~0x02;
-		if (!(c64_keyline[0] & 0x08)) t &= ~0x01;
-		value &= t;
-	}
-
-	if (!(output_b & 0x04))
-	{
-		UINT8 t = 0xff;
-		if (!(c64_keyline[7] & 0x04)) t &= ~0x80;
-		if (!(c64_keyline[6] & 0x04)) t &= ~0x40;
-		if (!(c64_keyline[5] & 0x04)) t &= ~0x20;
-		if (!(c64_keyline[4] & 0x04)) t &= ~0x10;
-		if (!(c64_keyline[3] & 0x04)) t &= ~0x08;
-		if (!(c64_keyline[2] & 0x04)) t &= ~0x04;
-		if (!(c64_keyline[1] & 0x04)) t &= ~0x02;
-		if (!(c64_keyline[0] & 0x04)) t &= ~0x01;
-		value &= t;
-	}
-
-	if (!(output_b & 0x02))
-	{
-		UINT8 t = 0xff;
-		if (!(c64_keyline[7] & 0x02)) t &= ~0x80;
-		if (!(c64_keyline[6] & 0x02)) t &= ~0x40;
-		if (!(c64_keyline[5] & 0x02)) t &= ~0x20;
-		if (!(c64_keyline[4] & 0x02)) t &= ~0x10;
-		if (!(c64_keyline[3] & 0x02)) t &= ~0x08;
-		if (!(c64_keyline[2] & 0x02)) t &= ~0x04;
-		if (!(c64_keyline[1] & 0x02)) t &= ~0x02;
-		if (!(c64_keyline[0] & 0x02)) t &= ~0x01;
-		value &= t;
-	}
-
-	if (!(output_b & 0x01))
-	{
-		UINT8 t = 0xff;
-		if (!(c64_keyline[7] & 0x01)) t &= ~0x80;
-		if (!(c64_keyline[6] & 0x01)) t &= ~0x40;
-		if (!(c64_keyline[5] & 0x01)) t &= ~0x20;
-		if (!(c64_keyline[4] & 0x01)) t &= ~0x10;
-		if (!(c64_keyline[3] & 0x01)) t &= ~0x08;
-		if (!(c64_keyline[2] & 0x01)) t &= ~0x04;
-		if (!(c64_keyline[1] & 0x01)) t &= ~0x02;
-		if (!(c64_keyline[0] & 0x01)) t &= ~0x01;
-		value &= t;
-	}
-
-	if ( device->machine().root_device().ioport("CTRLSEL")->read() & 0x80 )
-		value &= c64_keyline[8];
-	else
-		value &= c64_keyline[9];
-
-	return value;
-}
-
-UINT8 cbm_common_cia0_port_b_r( device_t *device, UINT8 output_a )
-{
-	UINT8 value = 0xff;
-
-	if (!(output_a & 0x80)) value &= c64_keyline[7];
-	if (!(output_a & 0x40)) value &= c64_keyline[6];
-	if (!(output_a & 0x20)) value &= c64_keyline[5];
-	if (!(output_a & 0x10)) value &= c64_keyline[4];
-	if (!(output_a & 0x08)) value &= c64_keyline[3];
-	if (!(output_a & 0x04)) value &= c64_keyline[2];
-	if (!(output_a & 0x02)) value &= c64_keyline[1];
-	if (!(output_a & 0x01)) value &= c64_keyline[0];
-
-	if ( device->machine().root_device().ioport("CTRLSEL")->read() & 0x80 )
-		value &= c64_keyline[9];
-	else
-		value &= c64_keyline[8];
-
-	return value;
-}
-
-
-/***********************************************
-
-    CBM Cartridges
-
-***********************************************/
-
-
-/*  All the cartridge specific code has been moved
-    to machine/ drivers. Once more informations
-    surface about the cart expansions for systems
-    in c65.c, c128.c, cbmb.c and pet.c, the shared
-    code could be refactored to have here the
-    common functions                                */
-
-
-
-/***********************************************
-
-    CBM Datasette Tapes
-
-***********************************************/
-
-#if 0
-const cassette_interface cbm_cassette_interface =
-{
-	cbm_cassette_formats,
-	NULL,
-	(cassette_state) (CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED),
-	NULL
-};
-#endif
-
-
-/*UINT8 *c65_basic; */
-/*UINT8 *c65_kernal; */
-/*UINT8 *c65_dos; */
-/*UINT8 *c65_monitor; */
-/*UINT8 *c65_graphics; */
-
-
-void c65_state::c65_nmi(  )
-{
-	if (m_nmilevel != (ioport("SPECIAL")->read() & 0x80) || m_cia1_irq)   /* KEY_RESTORE */
-	{
-		m_maincpu->set_input_line(INPUT_LINE_NMI, (ioport("SPECIAL")->read() & 0x80) || m_cia1_irq);
-
-		m_nmilevel = (ioport("SPECIAL")->read() & 0x80) || m_cia1_irq;
-	}
-}
-
-
-/***********************************************
-
-    CIA Interfaces
-
-***********************************************/
-
-/*
- *  CIA 0 - Port A keyboard line select
- *  CIA 0 - Port B keyboard line read
- *
- *  flag cassette read input, serial request in
- *  irq to irq connected
- *
- *  see machine/cbm.c
- */
-
-READ8_MEMBER(c65_state::c65_cia0_port_a_r)
-{
-	UINT8 cia0portb = m_cia0->pb_r(space, 0);
-
-	return cbm_common_cia0_port_a_r(m_cia0, cia0portb);
-}
-
-READ8_MEMBER(c65_state::c65_cia0_port_b_r)
-{
-	UINT8 value = 0xff;
-	UINT8 cia0porta = m_cia0->pa_r(space, 0);
-
-	value &= cbm_common_cia0_port_b_r(m_cia0, cia0porta);
-
-	if (!(m_6511_port & 0x02))
-		value &= m_keyline;
-
-	return value;
-}
-
-WRITE8_MEMBER(c65_state::c65_cia0_port_b_w)
-{
-//  was there lightpen support in c65 video chip?
-//  vic3_device *vic3 = machine().device<vic3_device>("vic3");
-//  vic3->lightpen_write(data & 0x10);
-}
-
-void c65_state::c65_irq( int level )
-{
-	if (level != m_old_level)
-	{
-		DBG_LOG(machine(), 3, "mos4510", ("irq %s\n", level ? "start" : "end"));
-		m_maincpu->set_input_line(M4510_IRQ_LINE, level);
-		m_old_level = level;
-	}
-}
-
-/* is this correct for c65 as well as c64? */
-WRITE_LINE_MEMBER(c65_state::c65_cia0_interrupt)
-{
-	m_cia0_irq = state;
-	c65_irq(state || m_vicirq);
-}
-
-/* is this correct for c65 as well as c64? */
-WRITE_LINE_MEMBER(c65_state::c65_vic_interrupt)
-{
-#if 1
-	if (state != m_vicirq)
-	{
-		c65_irq (state || m_cia0_irq);
-		m_vicirq = state;
-	}
-#endif
-}
-
-/*
- * CIA 1 - Port A
- * bit 7 serial bus data input
- * bit 6 serial bus clock input
- * bit 5 serial bus data output
- * bit 4 serial bus clock output
- * bit 3 serial bus atn output
- * bit 2 rs232 data output
- * bits 1-0 vic-chip system memory bank select
- *
- * CIA 1 - Port B
- * bit 7 user rs232 data set ready
- * bit 6 user rs232 clear to send
- * bit 5 user
- * bit 4 user rs232 carrier detect
- * bit 3 user rs232 ring indicator
- * bit 2 user rs232 data terminal ready
- * bit 1 user rs232 request to send
- * bit 0 user rs232 received data
- *
- * flag restore key or rs232 received data input
- * irq to nmi connected ?
- */
-READ8_MEMBER(c65_state::c65_cia1_port_a_r)
-{
-	UINT8 value = 0xff;
-
-	if (!m_iec->clk_r())
-		value &= ~0x40;
-
-	if (!m_iec->data_r())
-		value &= ~0x80;
-
-	return value;
-}
-
-WRITE8_MEMBER(c65_state::c65_cia1_port_a_w)
-{
-	static const int helper[4] = {0xc000, 0x8000, 0x4000, 0x0000};
-
-	m_iec->atn_w(!BIT(data, 3));
-	m_iec->clk_w(!BIT(data, 4));
-	m_iec->data_w(!BIT(data, 5));
-
-	m_vicaddr = m_memory + helper[data & 0x03];
-}
-
-WRITE_LINE_MEMBER(c65_state::c65_cia1_interrupt)
-{
-	m_cia1_irq = state;
-	c65_nmi();
-}
-
-/***********************************************
-
-    Memory Handlers
-
-***********************************************/
-
-/* processor has only 1 mega address space !? */
-/* and system 8 megabyte */
-/* dma controller and bankswitch hardware ?*/
-READ8_MEMBER( c65_state::c65_read_mem )
-{
-	UINT8 result;
-	if (offset <= 0x0ffff)
-		result = m_memory[offset];
-	else
-		result = space.read_byte(offset);
-	return result;
-}
-
-WRITE8_MEMBER( c65_state::c65_write_mem )
-{
-	if (offset <= 0x0ffff)
-		m_memory[offset] = data;
-	else
-		space.write_byte(offset, data);
-}
-
-/* dma chip at 0xd700
-  used:
-   writing banknumber to offset 2
-   writing hibyte to offset 1
-   writing lobyte to offset 0
-    cpu holded, dma transfer(data at address) executed, cpu activated
-
-  command data:
-   0 command (0 copy, 3 fill)
-   1,2 length
-   3,4,5 source
-   6,7,8 dest
-   9 subcommand
-   10 mod
-
-   version 1:
-   seldom copy (overlapping) from 0x402002 to 0x402008
-   (making place for new line in basic area)
-   for whats this bit 0x400000, or is this really the address?
-   maybe means add counter to address for access,
-   so allowing up or down copies, and reordering copies
-
-   version 2:
-   cmd 0x30 used for this
-*/
-void c65_state::c65_dma_port_w( int offset, int value )
-{
-	PAIR pair, src, dst, len;
-	UINT8 cmd, fill;
-	int i;
-	address_space &space = m_maincpu->space(AS_PROGRAM);
-
-	switch (offset & 3)
-	{
-	case 2:
-	case 1:
-		m_dma.data[offset & 3] = value;
-		break;
-	case 0:
-		pair.b.h3 = 0;
-		pair.b.h2 = m_dma.data[2];
-		pair.b.h = m_dma.data[1];
-		pair.b.l = m_dma.data[0]=value;
-		cmd = c65_read_mem(space, pair.d++);
-		len.w.h = 0;
-		len.b.l = c65_read_mem(space, pair.d++);
-		len.b.h = c65_read_mem(space, pair.d++);
-		src.b.h3 = 0;
-		fill = src.b.l = c65_read_mem(space, pair.d++);
-		src.b.h = c65_read_mem(space, pair.d++);
-		src.b.h2 = c65_read_mem(space, pair.d++);
-		dst.b.h3 = 0;
-		dst.b.l = c65_read_mem(space, pair.d++);
-		dst.b.h = c65_read_mem(space, pair.d++);
-		dst.b.h2 = c65_read_mem(space, pair.d++);
-
-		switch (cmd)
-		{
-		case 0:
-			if (src.d == 0x3ffff) m_dump_dma = 1;
-			if (m_dump_dma)
-				DBG_LOG(space.machine(), 1,"dma copy job",
-						("len:%.4x src:%.6x dst:%.6x sub:%.2x modrm:%.2x\n",
-							len.w.l, src.d, dst.d, c65_read_mem(space, pair.d),
-							c65_read_mem(space, pair.d + 1) ) );
-			if ((m_dma.version == 1)
-					&& ( (src.d&0x400000) || (dst.d & 0x400000)))
-			{
-				if (!(src.d & 0x400000))
-				{
-					dst.d &= ~0x400000;
-					for (i = 0; i < len.w.l; i++)
-						c65_write_mem(space, dst.d--, c65_read_mem(space, src.d++));
-				}
-				else if (!(dst.d & 0x400000))
-				{
-					src.d &= ~0x400000;
-					for (i = 0; i < len.w.l; i++)
-						c65_write_mem(space, dst.d++, c65_read_mem(space, src.d--));
-				}
-				else
-				{
-					src.d &= ~0x400000;
-					dst.d &= ~0x400000;
-					for (i = 0; i < len.w.l; i++)
-						c65_write_mem(space, --dst.d, c65_read_mem(space, --src.d));
-				}
-			}
-			else
-			{
-				for (i = 0; i < len.w.l; i++)
-					c65_write_mem(space, dst.d++, c65_read_mem(space, src.d++));
-			}
-			break;
-		case 3:
-			DBG_LOG(space.machine(), 3,"dma fill job",
-					("len:%.4x value:%.2x dst:%.6x sub:%.2x modrm:%.2x\n",
-						len.w.l, fill, dst.d, c65_read_mem(space, pair.d),
-						c65_read_mem(space, pair.d + 1)));
-				for (i = 0; i < len.w.l; i++)
-					c65_write_mem(space, dst.d++, fill);
-				break;
-		case 0x30:
-			DBG_LOG(space.machine(), 1,"dma copy down",
-					("len:%.4x src:%.6x dst:%.6x sub:%.2x modrm:%.2x\n",
-						len.w.l, src.d, dst.d, c65_read_mem(space, pair.d),
-						c65_read_mem(space, pair.d + 1) ) );
-			for (i = 0; i < len.w.l; i++)
-				c65_write_mem(space, dst.d--,c65_read_mem(space, src.d--));
-			break;
-		default:
-			DBG_LOG(space.machine(), 1,"dma job",
-					("cmd:%.2x len:%.4x src:%.6x dst:%.6x sub:%.2x modrm:%.2x\n",
-						cmd,len.w.l, src.d, dst.d, c65_read_mem(space, pair.d),
-						c65_read_mem(space, pair.d + 1)));
-		}
-		break;
-	default:
-		DBG_LOG(space.machine(), 1, "dma chip write", ("%.3x %.2x\n", offset, value));
-		break;
-	}
-}
-
-int c65_state::c65_dma_port_r( int offset )
-{
-	/* offset 3 bit 7 in progress ? */
-	DBG_LOG(machine(), 2, "dma chip read", ("%.3x\n", offset));
-	return 0x7f;
-}
-
-void c65_state::c65_6511_port_w( int offset, int value )
-{
-	if (offset == 7)
-	{
-		m_6511_port = value;
-	}
-	DBG_LOG(machine(), 2, "r6511 write", ("%.2x %.2x\n", offset, value));
-}
-
-int c65_state::c65_6511_port_r( int offset )
-{
-	int data = 0xff;
-
-	if (offset == 7)
-	{
-		if (ioport("SPECIAL")->read() & 0x20)
-			data &= ~1;
-	}
-	DBG_LOG(machine(), 2, "r6511 read", ("%.2x\n", offset));
-
-	return data;
-}
-
-/* one docu states custom 4191 disk controller
- (for 2 1MB MFM disk drives, 1 internal, the other extern (optional) 1565
- with integrated 512 byte buffer
-
- 0->0 reset ?
-
- 0->1, 0->0, wait until 2 positiv, 1->0 ???
-
- 0->0, 0 not 0 means no drive ???, other system entries
-
-
- reg 0 write/read
-  0,1 written
-  bit 1 set
-  bit 2 set
-  bit 3 set
-  bit 4 set
-
-
- reg 0 read
-  bit 0
-  bit 1
-  bit 2
-  0..2 ->$1d4
-
- reg 1 write
-  $01 written
-  $18 written
-  $46 written
-  $80 written
-  $a1 written
-  $01 written, dec
-  $10 written
-
- reg 2 read/write?(lsr)
-  bit 2
-  bit 4
-  bit 5 busy waiting until zero, then reading reg 7
-  bit 6 operation not activ flag!? or set overflow pin used
-  bit 7 busy flag?
-
- reg 3 read/write?(rcr)
-  bit 1
-  bit 3
-  bit 7 busy flag?
-
- reg 4
-  track??
-  0 written
-  read -> $1d2
-  cmp #$50
-  bcs
-
-
- reg 5
-  sector ??
-  1 written
-  read -> $1d3
-  cmp #$b bcc
-
-
- reg 6
-  head ??
-  0 written
-  read -> $1d1
-  cmp #2 bcc
-
- reg 7 read
-  #4e written
-  12 times 0, a1 a1 a1 fe  written
-
- reg 8 read
-  #ff written
-  16 times #ff written
-
- reg 9
-  #60 written
-
-might use the set overflow input
-
-$21a6c 9a6c format
-$21c97 9c97 write operation
-$21ca0 9ca0 get byte?
-$21cab 9cab read reg 7
-$21caf 9caf write reg 7
-$21cb3
-*/
-
-#define FDC_LOST 4
-#define FDC_CRC 8
-#define FDC_RNF 0x10
-#define FDC_BUSY 0x80
-#define FDC_IRQ 0x200
-
-#define FDC_CMD_MOTOR_SPIN_UP 0x10
-
-#if 0
-void c65_state::c65_fdc_state(void)
-{
-	switch (m_fdc.state)
-	{
-	case FDC_CMD_MOTOR_SPIN_UP:
-		if (machine().time() - m_fdc.time)
-		{
-			m_fdc.state = 0;
-			m_fdc.status &= ~FDC_BUSY;
-		}
-		break;
-	}
-}
-#endif
-
-void c65_state::c65_fdc_w( int offset, int data )
-{
-	DBG_LOG(machine(), 1, "fdc write", ("%.5x %.2x %.2x\n", machine().device("maincpu")->safe_pc(), offset, data));
-	switch (offset & 0xf)
-	{
-	case 0:
-		m_fdc.reg[0] = data;
-		break;
-	case 1:
-		m_fdc.reg[1] = data;
-		switch (data & 0xf9)
-		{
-		case 0x20: // wait for motor spin up
-			m_fdc.status &= ~(FDC_IRQ|FDC_LOST|FDC_CRC|FDC_RNF);
-			m_fdc.status |= FDC_BUSY;
-			m_fdc.time = machine().time();
-			m_fdc.state = FDC_CMD_MOTOR_SPIN_UP;
-			break;
-		case 0: // cancel
-			m_fdc.status &= ~(FDC_BUSY);
-			m_fdc.state = 0;
-			break;
-		case 0x80: // buffered write
-		case 0x40: // buffered read
-		case 0x81: // unbuffered write
-		case 0x41: // unbuffered read
-		case 0x30:case 0x31: // step
-			break;
-		}
-		break;
-	case 2: case 3: // read only
-		break;
-	case 4:
-		m_fdc.reg[offset & 0xf] = data;
-		m_fdc.track = data;
-		break;
-	case 5:
-		m_fdc.reg[offset & 0xf] = data;
-		m_fdc.sector = data;
-		break;
-	case 6:
-		m_fdc.reg[offset & 0xf] = data;
-		m_fdc.head = data;
-		break;
-	case 7:
-		m_fdc.buffer[m_fdc.cpu_pos++] = data;
-		break;
-	default:
-		m_fdc.reg[offset & 0xf] = data;
-		break;
-	}
-}
-
-int c65_state::c65_fdc_r( int offset )
-{
-	UINT8 data = 0;
-	switch (offset & 0xf)
-	{
-	case 0:
-		data = m_fdc.reg[0];
-		break;
-	case 1:
-		data = m_fdc.reg[1];
-		break;
-	case 2:
-		data = m_fdc.status;
-		break;
-	case 3:
-		data = m_fdc.status >> 8;
-		break;
-	case 4:
-		data = m_fdc.track;
-		break;
-	case 5:
-		data = m_fdc.sector;
-		break;
-	case 6:
-		data = m_fdc.head;
-		break;
-	case 7:
-		data = m_fdc.buffer[m_fdc.cpu_pos++];
-		break;
-	default:
-		data = m_fdc.reg[offset & 0xf];
-		break;
-	}
-	DBG_LOG(machine(), 1, "fdc read", ("%.5x %.2x %.2x\n", machine().device("maincpu")->safe_pc(), offset, data));
-	return data;
-}
-
-/* version 1 ramcheck
-   write 0:0
-   read write read write 80000,90000,f0000
-   write 0:8
-   read write read write 80000,90000,f0000
-
-   version 2 ramcheck???
-   read 0:
-   write 0:0
-   read 0:
-   first read and second read bit 0x80 set --> nothing
-   write 0:0
-   read 0
-   write 0:ff
-*/
-
-READ8_MEMBER( c65_state::c65_ram_expansion_r )
-{
-	UINT8 data = 0xff;
-	if (m_ram->size() > (128 * 1024))
-		data = m_expansion_ram.reg;
-	return data;
-}
-
-WRITE8_MEMBER( c65_state::c65_ram_expansion_w )
-{
-	offs_t expansion_ram_begin;
-	offs_t expansion_ram_end;
-
-	if (m_ram->size() > (128 * 1024))
-	{
-		m_expansion_ram.reg = data;
-
-		expansion_ram_begin = 0x80000;
-		expansion_ram_end = 0x80000 + (m_ram->size() - 128*1024) - 1;
-
-		if (data == 0x00) {
-			space.install_readwrite_bank(expansion_ram_begin, expansion_ram_end,"bank16");
-			membank("bank16")->set_base(m_ram->pointer() + 128*1024);
-		} else {
-			space.nop_readwrite(expansion_ram_begin, expansion_ram_end);
-		}
-	}
-}
-
-WRITE8_MEMBER( c65_state::c65_write_io )
-{
-	mos6581_device *sid_0 = machine().device<mos6581_device>("sid_r");
-	mos6581_device *sid_1 = machine().device<mos6581_device>("sid_l");
-	vic3_device *vic3 = machine().device<vic3_device>("vic3");
-
-	switch (offset & 0xf00)
-	{
-	case 0x000:
-		if (offset < 0x80)
-			vic3->port_w(space, offset & 0x7f, data);
-		else if (offset < 0xa0)
-			c65_fdc_w(offset & 0x1f, data);
-		else
-		{
-			c65_ram_expansion_w(space, offset & 0x1f, data, mem_mask);
-			/*ram expansion crtl optional */
-		}
-		break;
-	case 0x100:
-	case 0x200:
-	case 0x300:
-		vic3->palette_w(space, offset - 0x100, data);
-		break;
-	case 0x400:
-		if (offset<0x420) /* maybe 0x20 */
-			sid_0->write(space, offset & 0x3f, data);
-		else if (offset<0x440)
-			sid_1->write(space, offset & 0x3f, data);
-		else
-			DBG_LOG(machine(), 1, "io write", ("%.3x %.2x\n", offset, data));
-		break;
-	case 0x500:
-		DBG_LOG(machine(), 1, "io write", ("%.3x %.2x\n", offset, data));
-		break;
-	case 0x600:
-		c65_6511_port_w(offset & 0xff,data);
-		break;
-	case 0x700:
-		c65_dma_port_w(offset & 0xff, data);
-		break;
-	}
-}
-
-WRITE8_MEMBER( c65_state::c65_write_io_dc00 )
-{
-	switch (offset & 0xf00)
-	{
-	case 0x000:
-		m_cia0->write(space, offset, data);
-		break;
-	case 0x100:
-		m_cia1->write(space, offset, data);
-		break;
-	case 0x200:
-	case 0x300:
-		DBG_LOG(machine(), 1, "io write", ("%.3x %.2x\n", offset+0xc00, data));
-		break;
-	}
-}
-
-READ8_MEMBER( c65_state::c65_read_io )
-{
-	mos6581_device *sid_0 = machine().device<mos6581_device>("sid_r");
-	mos6581_device *sid_1 = machine().device<mos6581_device>("sid_l");
-	vic3_device *vic3 = machine().device<vic3_device>("vic3");
-
-	switch (offset & 0xf00)
-	{
-	case 0x000:
-		if (offset < 0x80)
-			return vic3->port_r(space, offset & 0x7f);
-		if (offset < 0xa0)
-			return c65_fdc_r(offset & 0x1f);
-		else
-		{
-			return c65_ram_expansion_r(space, offset & 0x1f, mem_mask);
-			/*return; ram expansion crtl optional */
-		}
-	case 0x100:
-	case 0x200:
-	case 0x300:
-	/* read only !? */
-		DBG_LOG(machine(), 1, "io read", ("%.3x\n", offset));
-		break;
-	case 0x400:
-		if (offset < 0x420)
-			return sid_0->read(space, offset & 0x3f);
-		if (offset < 0x440)
-			return sid_1->read(space, offset & 0x3f);
-		DBG_LOG(machine(), 1, "io read", ("%.3x\n", offset));
-		break;
-	case 0x500:
-		DBG_LOG(machine(), 1, "io read", ("%.3x\n", offset));
-		break;
-	case 0x600:
-		return c65_6511_port_r(offset&0xff);
-	case 0x700:
-		return c65_dma_port_r(offset&0xff);
-	}
-	return 0xff;
-}
-
-READ8_MEMBER( c65_state::c65_read_io_dc00 )
-{
-	switch (offset & 0x300)
-	{
-	case 0x000:
-		return m_cia0->read(space, offset);
-	case 0x100:
-		return m_cia1->read(space, offset);
-	case 0x200:
-	case 0x300:
-		DBG_LOG(machine(), 1, "io read", ("%.3x\n", offset+0xc00));
-		break;
-	}
-	return 0xff;
-}
-
-
-/*
-d02f:
- init a5 96 written (seems to be switch to c65 or vic3 mode)
- go64 0 written
-*/
-
-/* bit 1 external sync enable (genlock)
-   bit 2 palette enable
-   bit 6 vic3 c65 character set */
-WRITE8_MEMBER(c65_state::c65_bankswitch_interface)
-{
-	DBG_LOG(machine(), 2, "c65 bankswitch", ("%.2x\n",data));
-
-	if (m_io_on)
-	{
-		if (data & 1)
-		{
-			membank("bank8")->set_base(m_colorram + 0x400);
-			membank("bank9")->set_base(m_colorram + 0x400);
-			m_maincpu->space(AS_PROGRAM).install_read_bank(0x0dc00, 0x0dfff, "bank8");
-			m_maincpu->space(AS_PROGRAM).install_write_bank(0x0dc00, 0x0dfff, "bank9");
-		}
-		else
-		{
-			m_maincpu->space(AS_PROGRAM).install_read_handler(0x0dc00, 0x0dfff, read8_delegate(FUNC(c65_state::c65_read_io_dc00),this));
-			m_maincpu->space(AS_PROGRAM).install_write_handler(0x0dc00, 0x0dfff, write8_delegate(FUNC(c65_state::c65_write_io_dc00),this));
-		}
-	}
-
-	m_io_dc00_on = !(data & 1);
-#if 0
-	/* cartridge roms !?*/
-	if (data & 0x08)
-		membank("bank1")->set_base(m_roml);
-	else
-		membank("bank1")->set_base(m_memory + 0x8000);
-
-	if (data & 0x10)
-		membank("bank2")->set_base(m_basic);
-	else
-		membank("bank2")->set_base(m_memory + 0xa000);
-#endif
-	if ((m_old_value^data) & 0x20)
-	{
-	/* bankswitching faulty when doing actual page */
-		if (data & 0x20)
-			membank("bank3")->set_base(m_basic);
-		else
-			membank("bank3")->set_base(m_memory + 0xc000);
-	}
-	m_charset_select = data & 0x40;
-#if 0
-	/* cartridge roms !?*/
-	if (data & 0x80)
-		membank("bank8")->set_base(m_kernal);
-	else
-		membank("bank6")->set_base(m_memory + 0xe000);
-#endif
-	m_old_value = data;
-}
-
-void c65_state::c65_bankswitch(  )
-{
-	int data, loram, hiram, charen;
-
-	data = 0x00; // machine().device<m4510_device>("maincpu")->get_port();
-	if (data == m_old_data)
-		return;
-
-	DBG_LOG(machine(), 1, "bankswitch", ("%d\n", data & 7));
-	loram = (data & 1) ? 1 : 0;
-	hiram = (data & 2) ? 1 : 0;
-	charen = (data & 4) ? 1 : 0;
-
-	if ((!m_game && m_exrom) || (loram && hiram && !m_exrom))
-		membank("bank1")->set_base(m_roml);
-	else
-		membank("bank1")->set_base(m_memory + 0x8000);
-
-	if ((!m_game && m_exrom && hiram) || (!m_exrom))
-		membank("bank2")->set_base(m_romh);
-	else if (loram && hiram)
-		membank("bank2")->set_base(m_basic);
-	else
-		membank("bank2")->set_base(m_memory + 0xa000);
-
-	if ((!m_game && m_exrom) || (charen && (loram || hiram)))
-	{
-		m_io_on = 1;
-		membank("bank6")->set_base(m_colorram);
-		membank("bank7")->set_base(m_colorram);
-
-		if (m_io_dc00_on)
-		{
-			m_maincpu->space(AS_PROGRAM).install_read_handler(0x0dc00, 0x0dfff, read8_delegate(FUNC(c65_state::c65_read_io_dc00),this));
-			m_maincpu->space(AS_PROGRAM).install_write_handler(0x0dc00, 0x0dfff, write8_delegate(FUNC(c65_state::c65_write_io_dc00),this));
-		}
-		else
-		{
-			m_maincpu->space(AS_PROGRAM).install_read_bank(0x0dc00, 0x0dfff, "bank8");
-			m_maincpu->space(AS_PROGRAM).install_write_bank(0x0dc00, 0x0dfff, "bank9");
-			membank("bank8")->set_base(m_colorram + 0x400);
-			membank("bank9")->set_base(m_colorram + 0x400);
-		}
-		m_maincpu->space(AS_PROGRAM).install_read_handler(0x0d000, 0x0d7ff, read8_delegate(FUNC(c65_state::c65_read_io),this));
-		m_maincpu->space(AS_PROGRAM).install_write_handler(0x0d000, 0x0d7ff, write8_delegate(FUNC(c65_state::c65_write_io),this));
-	}
-	else
-	{
-		m_io_on = 0;
-		membank("bank5")->set_base(m_memory + 0xd000);
-		membank("bank7")->set_base(m_memory + 0xd800);
-		membank("bank9")->set_base(m_memory + 0xdc00);
-		if (!charen && (loram || hiram))
-		{
-			membank("bank4")->set_base(m_chargen);
-			membank("bank6")->set_base(m_chargen + 0x800);
-			membank("bank8")->set_base(m_chargen + 0xc00);
-		}
-		else
-		{
-			membank("bank4")->set_base(m_memory + 0xd000);
-			membank("bank6")->set_base(m_memory + 0xd800);
-			membank("bank8")->set_base(m_memory + 0xdc00);
-		}
-		m_maincpu->space(AS_PROGRAM).install_read_bank(0x0d000, 0x0d7ff, "bank4");
-		m_maincpu->space(AS_PROGRAM).install_write_bank(0x0d000, 0x0d7ff, "bank5");
-	}
-
-	if (!m_game && m_exrom)
-	{
-		membank("bank10")->set_base(m_romh);
-	}
-	else
-	{
-		if (hiram)
-		{
-			membank("bank10")->set_base(m_kernal);
-		}
-		else
-		{
-			membank("bank10")->set_base(m_memory + 0xe000);
-		}
-	}
-	m_old_data = data;
-}
-
-#ifdef UNUSED_FUNCTION
-void c65_state::c65_colorram_write( int offset, int value )
-{
-	m_colorram[offset & 0x7ff] = value | 0xf0;
-}
-#endif
-
-/*
- * only 14 address lines
- * a15 and a14 portlines
- * 0x1000-0x1fff, 0x9000-0x9fff char rom
- */
-READ8_MEMBER(c65_state::c65_dma_read)
-{
-	if (!m_game && m_exrom)
-	{
-		if (offset < 0x3000)
-			return m_memory[offset];
-		return m_romh[offset & 0x1fff];
-	}
-	if ((m_vicaddr == m_memory) || (m_vicaddr == m_memory + 0x8000))
-	{
-		if (offset < 0x1000)
-			return m_vicaddr[offset & 0x3fff];
-		if (offset < 0x2000) {
-			if (m_charset_select)
-				return m_chargen[offset & 0xfff];
-			else
-				return m_chargen[offset & 0xfff];
-		}
-		return m_vicaddr[offset & 0x3fff];
-	}
-	return m_vicaddr[offset & 0x3fff];
-}
-
-READ8_MEMBER(c65_state::c65_dma_read_color)
-{
-	if (m_c64mode)
-		return m_colorram[offset & 0x3ff] & 0xf;
-	return m_colorram[offset & 0x7ff];
-}
-
-void c65_state::c65_common_driver_init(  )
-{
-	m_memory = auto_alloc_array_clear(machine(), UINT8, 0x10000);
-	membank("bank11")->set_base(m_memory + 0x00000);
-	membank("bank12")->set_base(m_memory + 0x08000);
-	membank("bank13")->set_base(m_memory + 0x0a000);
-	membank("bank14")->set_base(m_memory + 0x0c000);
-	membank("bank15")->set_base(m_memory + 0x0e000);
-
-	cbm_common_init();
-	m_keyline = 0xff;
-
-	m_pal = 0;
-	m_charset_select = 0;
-	m_6511_port = 0xff;
-	m_vicirq = 0;
-	m_old_data = -1;
-
-	/* C65 had no datasette port */
-	m_tape_on = 0;
-	m_game = 1;
-	m_exrom = 1;
-
-	/*memset(m_memory + 0x40000, 0, 0x800000 - 0x40000); */
-}
-
-DRIVER_INIT_MEMBER(c65_state,c65)
-{
-	m_dma.version = 2;
-	c65_common_driver_init();
-}
-
-DRIVER_INIT_MEMBER(c65_state,c65pal)
-{
-	m_dma.version = 1;
-	c65_common_driver_init();
-	m_pal = 1;
-}
-
-MACHINE_START_MEMBER(c65_state,c65)
-{
-	/* clear upper memory */
-	memset(m_ram->pointer() + 128*1024, 0xff, m_ram->size() -  128*1024);
-
-//removed   cbm_drive_0_config (SERIAL, 10);
-//removed   cbm_drive_1_config (SERIAL, 11);
-	m_vicaddr = m_memory;
-
-	m_c64mode = 0;
-
-	c65_bankswitch_interface(m_maincpu->space(AS_PROGRAM),0,0xff);
-	c65_bankswitch();
-}
-
-
-INTERRUPT_GEN_MEMBER(c65_state::c65_frame_interrupt)
-{
-	int value;
-
-	c65_nmi();
-
-	/* common keys input ports */
-	cbm_common_interrupt(&device);
-
-	/* c65 specific: function keys input ports */
-	value = 0xff;
-
-	value &= ~ioport("FUNCT")->read();
-	m_keyline = value;
-}