Cleanup of the source files lists for src/mame:

- Every file in src/mame/{includes,drivers,audio,machine} with the
  exception of konamiic.txt has to appear in one and only one of the
  projects of arcade.lua or mess.lua (ignoring mameshared)

- Files in mameshared must exist in mame.lua

scripts/target/mame/arcade.lua

@@ -1050,6 +1050,10 @@ files {
 	MAME_DIR .. "src/mame/audio/rax.h",
 	MAME_DIR .. "src/mame/audio/segam1audio.cpp",
 	MAME_DIR .. "src/mame/audio/segam1audio.h",
+	MAME_DIR .. "src/mame/video/snk68_spr.cpp",
+	MAME_DIR .. "src/mame/video/snk68_spr.h",
+	MAME_DIR .. "src/mame/video/alpha68k_palette.cpp",
+	MAME_DIR .. "src/mame/video/alpha68k_palette.h",
 }
 
 --------------------------------------------------
@@ -1104,14 +1108,11 @@ files {
 	MAME_DIR .. "src/mame/audio/ad_sound.h",
 	MAME_DIR .. "src/mame/machine/alpha8201.cpp",
 	MAME_DIR .. "src/mame/machine/alpha8201.h",
-	MAME_DIR .. "src/mame/video/snk68_spr.cpp",
-	MAME_DIR .. "src/mame/video/snk68_spr.h",
-	MAME_DIR .. "src/mame/video/alpha68k_palette.cpp",
-	MAME_DIR .. "src/mame/video/alpha68k_palette.h",
 }
 
 createMAMEProjects(_target, _subtarget, "amiga")
 files {
+	MAME_DIR .. "src/mame/includes/amiga.h",
 	MAME_DIR .. "src/mame/drivers/alg.cpp",
 	MAME_DIR .. "src/mame/drivers/amiga.cpp",
 	MAME_DIR .. "src/mame/machine/amiga.cpp",
@@ -1901,6 +1902,10 @@ files {
 createMAMEProjects(_target, _subtarget, "efo")
 files {
 	MAME_DIR .. "src/mame/drivers/cedar_magnet.cpp",
+	MAME_DIR .. "src/mame/machine/cedar_magnet_plane.h",
+	MAME_DIR .. "src/mame/machine/cedar_magnet_sprite.h",
+	MAME_DIR .. "src/mame/machine/cedar_magnet_board.h",
+	MAME_DIR .. "src/mame/machine/cedar_magnet_flop.h",
 	MAME_DIR .. "src/mame/machine/cedar_magnet_plane.cpp",
 	MAME_DIR .. "src/mame/machine/cedar_magnet_sprite.cpp",
 	MAME_DIR .. "src/mame/machine/cedar_magnet_board.cpp",
@@ -2817,6 +2822,9 @@ files {
 	MAME_DIR .. "src/mame/includes/midtunit.h",
 	MAME_DIR .. "src/mame/machine/midtunit.cpp",
 	MAME_DIR .. "src/mame/video/midtunit.cpp",
+	MAME_DIR .. "src/mame/video/midtunit.ipp",
+	MAME_DIR .. "src/mame/video/midtunit.h",
+	MAME_DIR .. "src/mame/video/midtview.ipp",
 	MAME_DIR .. "src/mame/drivers/midvunit.cpp",
 	MAME_DIR .. "src/mame/includes/midvunit.h",
 	MAME_DIR .. "src/mame/video/midvunit.cpp",
@@ -3864,10 +3872,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/snk68.cpp",
 	MAME_DIR .. "src/mame/includes/snk68.h",
 	MAME_DIR .. "src/mame/video/snk68.cpp",
-	MAME_DIR .. "src/mame/video/snk68_spr.cpp",
-	MAME_DIR .. "src/mame/video/snk68_spr.h",
-	MAME_DIR .. "src/mame/video/alpha68k_palette.cpp",
-	MAME_DIR .. "src/mame/video/alpha68k_palette.h",
 }
 
 createMAMEProjects(_target, _subtarget, "sony")
@@ -4630,6 +4634,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/sam.cpp",
 	MAME_DIR .. "src/mame/drivers/sleic.cpp",
 	MAME_DIR .. "src/mame/drivers/spectra.cpp",
+	MAME_DIR .. "src/mame/drivers/spike.cpp",
 	MAME_DIR .. "src/mame/drivers/spinb.cpp",
 	MAME_DIR .. "src/mame/drivers/spirit76.cpp",
 	MAME_DIR .. "src/mame/drivers/st_mp100.cpp",
@@ -4652,6 +4657,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/audio/bally.h",
 	MAME_DIR .. "src/mame/audio/bally.cpp",
 	MAME_DIR .. "src/mame/audio/wpcsnd.cpp",
 	MAME_DIR .. "src/mame/audio/wpcsnd.h",
@@ -4827,6 +4833,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/fireball.cpp",
 	MAME_DIR .. "src/mame/drivers/flipjack.cpp",
 	MAME_DIR .. "src/mame/drivers/flower.cpp",
+	MAME_DIR .. "src/mame/audio/flower.h",
 	MAME_DIR .. "src/mame/audio/flower.cpp",
 	MAME_DIR .. "src/mame/drivers/fortecar.cpp",
 	MAME_DIR .. "src/mame/drivers/fresh.cpp",

scripts/target/mame/mame.lua

@@ -11,16 +11,13 @@
 
 dofile("arcade.lua")
 dofile("mess.lua")
-dofile("virtual.lua")
 
 function createProjects_mame_mame(_target, _subtarget)
 	createProjects_mame_arcade(_target, _subtarget)
 	createProjects_mame_mess(_target, _subtarget)
-	createProjects_mame_virtual(_target, _subtarget)
 end
 
 function linkProjects_mame_mame(_target, _subtarget)
 	linkProjects_mame_arcade(_target, _subtarget)
 	linkProjects_mame_mess(_target, _subtarget)
-	linkProjects_mame_virtual(_target, _subtarget)
 end

scripts/target/mame/mess.lua

@@ -172,6 +172,7 @@ CPUS["ROMP"] = true
 CPUS["COPS1"] = true
 CPUS["MK1"] = true
 CPUS["M68HC16"] = true
+CPUS["KS0164"] = true
 
 --------------------------------------------------
 -- specify available sound cores; some of these are
@@ -218,8 +219,8 @@ SOUNDS["ASTROCADE"] = true
 SOUNDS["NAMCO_163"] = true
 SOUNDS["T6W28"] = true
 --SOUNDS["SNKWAVE"] = true
---SOUNDS["C140"] = true
+SOUNDS["C140"] = true
---SOUNDS["C352"] = true
+SOUNDS["C352"] = true
 --SOUNDS["TMS36XX"] = true
 --SOUNDS["TMS3615"] = true
 SOUNDS["TMS5110"] = true
@@ -239,10 +240,10 @@ SOUNDS["HC55516"] = true
 --SOUNDS["K005289"] = true
 --SOUNDS["K007232"] = true
 SOUNDS["K051649"] = true
---SOUNDS["K053260"] = true
+SOUNDS["K053260"] = true
---SOUNDS["K054539"] = true
+SOUNDS["K054539"] = true
 --SOUNDS["K056800"] = true
---SOUNDS["SEGAPCM"] = true
+SOUNDS["SEGAPCM"] = true
 SOUNDS["MULTIPCM"] = true
 SOUNDS["SCSP"] = true
 SOUNDS["AICA"] = true
@@ -252,7 +253,7 @@ SOUNDS["RF5C68"] = true
 SOUNDS["QSOUND"] = true
 --SOUNDS["QS1000"] = true
 SOUNDS["SAA1099"] = true
---SOUNDS["IREMGA20"] = true
+SOUNDS["IREMGA20"] = true
 SOUNDS["ES5503"] = true
 SOUNDS["ES5505"] = true
 SOUNDS["ES5506"] = true
@@ -268,7 +269,7 @@ SOUNDS["CDDA"] = true
 --SOUNDS["I5000_SND"] = true
 --SOUNDS["ST0016"] = true
 --SOUNDS["SETAPCM"] = true
---SOUNDS["X1_010"] = true
+SOUNDS["X1_010"] = true
 --SOUNDS["VRENDER0"] = true
 SOUNDS["VOTRAX"] = true
 --SOUNDS["ES8712"] = true
@@ -327,6 +328,8 @@ SOUNDS["ROLANDPCM"] = true
 SOUNDS["RP2C33_SOUND"] = true
 SOUNDS["UDA1344"] = true
 SOUNDS["LYNX"] = true
+SOUNDS["VGMVIZ"] = true
+SOUNDS["KS0164"] = true
 
 --------------------------------------------------
 -- specify available video cores
@@ -1214,7 +1217,6 @@ function linkProjects_mame_mess(_target, _subtarget)
 		"alesis",
 		"altos",
 		"amirix",
-		"amiga",
 		"ampro",
 		"amstrad",
 		"apf",
@@ -1458,6 +1460,7 @@ function linkProjects_mame_mess(_target, _subtarget)
 		"vidbrain",
 		"videoton",
 		"visual",
+		"virtual",
 		"votrax",
 		"vtech",
 		"wang",
@@ -1653,6 +1656,19 @@ files {
 	MAME_DIR .. "src/mame/video/apple2.h",
 	MAME_DIR .. "src/mame/machine/apple2common.cpp",
 	MAME_DIR .. "src/mame/machine/apple2common.h",
+	MAME_DIR .. "src/mame/drivers/amiga.cpp",
+	MAME_DIR .. "src/mame/includes/amiga.h",
+	MAME_DIR .. "src/mame/machine/at.h",
+	MAME_DIR .. "src/mame/machine/at.cpp",
+	MAME_DIR .. "src/mame/drivers/sis630.cpp",
+	MAME_DIR .. "src/mame/machine/gdrom.cpp",
+	MAME_DIR .. "src/mame/machine/gdrom.h",
+	MAME_DIR .. "src/mame/includes/megadriv.h",
+	MAME_DIR .. "src/mame/drivers/sms.cpp",
+	MAME_DIR .. "src/mame/includes/sms.h",
+	MAME_DIR .. "src/mame/machine/sms.cpp",
+	MAME_DIR .. "src/mame/audio/special.cpp",
+	MAME_DIR .. "src/mame/audio/special.h",
 }
 end
 --------------------------------------------------
@@ -1767,6 +1783,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/altos5.cpp",
 	MAME_DIR .. "src/mame/drivers/altos486.cpp",
 	MAME_DIR .. "src/mame/drivers/altos8600.cpp",
+	MAME_DIR .. "src/mame/machine/acs8600_ics.h",
 	MAME_DIR .. "src/mame/machine/acs8600_ics.cpp",
 }
 
@@ -1775,12 +1792,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/wxstar4000.cpp",
 }
 
-createMESSProjects(_target, _subtarget, "amiga")
-files {
-	MAME_DIR .. "src/mame/drivers/amiga.cpp",
-	MAME_DIR .. "src/mame/includes/amiga.h",
-}
-
 createMESSProjects(_target, _subtarget, "ampro")
 files {
 	MAME_DIR .. "src/mame/drivers/ampro.cpp",
@@ -1825,6 +1836,8 @@ files {
 	MAME_DIR .. "src/mame/machine/apollo.cpp",
 	MAME_DIR .. "src/mame/machine/apollo_kbd.cpp",
 	MAME_DIR .. "src/mame/machine/apollo_kbd.h",
+	MAME_DIR .. "src/mame/machine/apollo_dbg.cpp",
+	MAME_DIR .. "src/mame/machine/apollo_dbg.h",
 	MAME_DIR .. "src/mame/video/apollo.cpp",
 }
 
@@ -1907,8 +1920,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/at.cpp",
 	MAME_DIR .. "src/mame/drivers/atpci.cpp",
 	MAME_DIR .. "src/mame/drivers/ps2.cpp",
-	MAME_DIR .. "src/mame/machine/at.h",
-	MAME_DIR .. "src/mame/machine/at.cpp",
 	MAME_DIR .. "src/mame/drivers/ct486.cpp",
 }
 
@@ -2678,6 +2689,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/hp16500.cpp",
 	MAME_DIR .. "src/mame/drivers/hp48.cpp",
 	MAME_DIR .. "src/mame/includes/hp48.h",
+	MAME_DIR .. "src/mame/includes/hp9845.h",
 	MAME_DIR .. "src/mame/machine/hp48.cpp",
 	MAME_DIR .. "src/mame/machine/hp48_port.cpp",
 	MAME_DIR .. "src/mame/machine/hp48_port.h",
@@ -3137,6 +3149,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/ncd88k.cpp",
 	MAME_DIR .. "src/mame/drivers/ncdmips.cpp",
 	MAME_DIR .. "src/mame/drivers/ncdppc.cpp",
+	MAME_DIR .. "src/mame/machine/bert.h",
 	MAME_DIR .. "src/mame/machine/bert.cpp",
 }
 
@@ -3396,9 +3409,9 @@ files {
 	MAME_DIR .. "src/mame/drivers/ibmpc.cpp",
 	MAME_DIR .. "src/mame/drivers/ibmpcjr.cpp",
 	MAME_DIR .. "src/mame/drivers/nforcepc.cpp",
+	MAME_DIR .. "src/mame/includes/nforcepc.h",
 	MAME_DIR .. "src/mame/drivers/pc.cpp",
 	MAME_DIR .. "src/mame/drivers/pcipc.cpp",
-	MAME_DIR .. "src/mame/drivers/sis630.cpp",
 	MAME_DIR .. "src/mame/drivers/tandy1t.cpp",
 	MAME_DIR .. "src/mame/drivers/tosh1000.cpp",
 	MAME_DIR .. "src/mame/machine/tosh1000_bram.cpp",
@@ -3426,6 +3439,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/p2000t.cpp",
 	MAME_DIR .. "src/mame/includes/p2000t.h",
 	MAME_DIR .. "src/mame/machine/p2000t.cpp",
+	MAME_DIR .. "src/mame/machine/p2000t_mdcr.h",
 	MAME_DIR .. "src/mame/machine/p2000t_mdcr.cpp",
 	MAME_DIR .. "src/mame/video/p2000t.cpp",
 	MAME_DIR .. "src/mame/drivers/vg5k.cpp",
@@ -3677,10 +3691,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/dccons.cpp",
 	MAME_DIR .. "src/mame/includes/dccons.h",
 	MAME_DIR .. "src/mame/machine/dccons.cpp",
-	MAME_DIR .. "src/mame/machine/gdrom.cpp",
-	MAME_DIR .. "src/mame/machine/gdrom.h",
 	MAME_DIR .. "src/mame/drivers/megadriv.cpp",
-	MAME_DIR .. "src/mame/includes/megadriv.h",
 	MAME_DIR .. "src/mame/drivers/megadriv_rad.cpp",
 	MAME_DIR .. "src/mame/includes/megadriv_rad.h",
 	MAME_DIR .. "src/mame/drivers/megadriv_vt_hybrid.cpp",
@@ -3691,9 +3702,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/segapm.cpp",
 	MAME_DIR .. "src/mame/drivers/sg1000.cpp",
 	MAME_DIR .. "src/mame/includes/sg1000.h",
-	MAME_DIR .. "src/mame/drivers/sms.cpp",
-	MAME_DIR .. "src/mame/includes/sms.h",
-	MAME_DIR .. "src/mame/machine/sms.cpp",
 	MAME_DIR .. "src/mame/drivers/svmu.cpp",
 	MAME_DIR .. "src/mame/machine/mega32x.cpp",
 	MAME_DIR .. "src/mame/machine/mega32x.h",
@@ -3908,8 +3916,6 @@ createMESSProjects(_target, _subtarget, "special")
 files {
 	MAME_DIR .. "src/mame/drivers/special.cpp",
 	MAME_DIR .. "src/mame/includes/special.h",
-	MAME_DIR .. "src/mame/audio/special.cpp",
-	MAME_DIR .. "src/mame/audio/special.h",
 	MAME_DIR .. "src/mame/machine/special.cpp",
 	MAME_DIR .. "src/mame/video/special.cpp",
 }
@@ -4145,6 +4151,7 @@ files {
 
 createMESSProjects(_target, _subtarget, "toshiba")
 files {
+	MAME_DIR .. "src/mame/includes/pasopia.h",
 	MAME_DIR .. "src/mame/drivers/pasopia.cpp",
 	MAME_DIR .. "src/mame/drivers/pasopia7.cpp",
 	MAME_DIR .. "src/mame/drivers/paso1600.cpp",
@@ -4506,6 +4513,7 @@ files {
 
 createMESSProjects(_target, _subtarget, "yamaha")
 files {
+	MAME_DIR .. "src/mame/machine/mulcd.h",
 	MAME_DIR .. "src/mame/machine/mulcd.cpp",
 	MAME_DIR .. "src/mame/drivers/yman1x.cpp",
 	MAME_DIR .. "src/mame/drivers/ymdx100.cpp",
@@ -4548,6 +4556,13 @@ files {
 	MAME_DIR .. "src/mame/video/pp01.cpp",
 }
 
+createMESSProjects(_target, _subtarget, "virtual")
+files {
+	MAME_DIR .. "src/mame/drivers/vgmplay.cpp",
+	MAME_DIR .. "src/mame/drivers/wavesynth.cpp",
+	MAME_DIR .. "src/mame/drivers/ldplayer.cpp",
+}
+
 createMESSProjects(_target, _subtarget, "skeleton")
 files {
 	MAME_DIR .. "src/mame/drivers/aaa.cpp",
@@ -4560,6 +4575,8 @@ files {
 	MAME_DIR .. "src/mame/drivers/alcat7100.cpp",
 	MAME_DIR .. "src/mame/drivers/alesis_qs.cpp",
 	MAME_DIR .. "src/mame/drivers/alfaskop41xx.cpp",
+	MAME_DIR .. "src/mame/machine/alfaskop_s41_kb.h",
+	MAME_DIR .. "src/mame/machine/alfaskop_s41_kb.cpp",
 	MAME_DIR .. "src/mame/drivers/alphasma.cpp",
 	MAME_DIR .. "src/mame/drivers/alphasma3k.cpp",
 	MAME_DIR .. "src/mame/drivers/am1000.cpp",
@@ -4822,10 +4839,13 @@ files {
 	MAME_DIR .. "src/mame/machine/zorbakbd.h",
 	MAME_DIR .. "src/mame/drivers/zt8802.cpp",
 	MAME_DIR .. "src/mame/drivers/testpat.cpp",
+	MAME_DIR .. "src/mame/machine/nl_tp1983.h",
 	MAME_DIR .. "src/mame/machine/nl_tp1983.cpp",
+	MAME_DIR .. "src/mame/machine/nl_tp1985.h",
 	MAME_DIR .. "src/mame/machine/nl_tp1985.cpp",
 	MAME_DIR .. "src/mame/drivers/palestra.cpp",
 	MAME_DIR .. "src/mame/machine/nl_palestra.cpp",
+	MAME_DIR .. "src/mame/machine/nl_palestra.h",
 	MAME_DIR .. "src/mame/drivers/philipsbo.cpp",
 	MAME_DIR .. "src/mame/drivers/mindset.cpp",
 	MAME_DIR .. "src/mame/drivers/gs6502.cpp",

src/mame/machine/alfaskop_s41_kb.cpp

@@ -336,7 +336,7 @@ void alfaskop_s41_keyboard_device::alfaskop_s41_kb_mem(address_map &map)
 	 * c3 <- 0x01 <- 0-00 1 == 0800-0fff, 4800-4fff // 1100 0011
 	 * c3 <- 0x00 <- 0-00 0 == 0000-07ff, 4000-47ff // 1100 0011
 	 */
-	map(0x0080, 0xffff).lrw8(NAME([this](address_space &space, offs_t offset) -> uint8_t
+	map(0x0080, 0xffff).lrw8(NAME([this](offs_t offset) -> uint8_t
 				{
 					uint16_t addr = offset + 0x80;
 					uint8_t index = 0x10 | ((((addr & 0x8000) | ((addr & 0x3800) << 1)) >> 12) & 0x000f); // 0x10 | (((A15 | A13 | A12 | A11) >> 12)
@@ -350,7 +350,7 @@ void alfaskop_s41_keyboard_device::alfaskop_s41_kb_mem(address_map &map)
 						break;
 					case 0xd3:
 						LOGIO(" - I/O read mc6846 %04x", addr & 0x07);
-						ret = m_mc6846->read(space, (offs_t)(addr & 0x07));
+						ret = m_mc6846->read((offs_t)(addr & 0x07));
 						LOGIO(": %02x\n", ret);
 						break;
 					case 0xc3:
@@ -360,7 +360,7 @@ void alfaskop_s41_keyboard_device::alfaskop_s41_kb_mem(address_map &map)
 					}
 					return ret;
 				}),
-				NAME( [this](address_space &space, offs_t offset, uint8_t data)
+				NAME( [this](offs_t offset, uint8_t data)
 				{
 					uint16_t addr = offset + 0x80;
 					uint8_t index = 0x10 | ((((addr & 0x8000) | ((addr & 0x3800) << 1)) >> 12) & 0x000f); // 0x10 | (((A15 | A13 | A12 | A11) >> 12)
@@ -369,7 +369,7 @@ void alfaskop_s41_keyboard_device::alfaskop_s41_kb_mem(address_map &map)
 					{
 					case 0xd3:
 						LOGIO(" - I/O write mc6846 %04x, %02x\n", addr & 0x07, data);
-						m_mc6846->write(space, (offs_t)(addr & 0x07), data);
+						m_mc6846->write((offs_t)(addr & 0x07), data);
 						break;
 					case 0xcb: // Leds
 						if (m_leds != data)

src/mame/mess.flt

@@ -64,8 +64,8 @@ ampex.cpp
 ampex210.cpp
 ampro.cpp
 ampscarp.cpp
-amstrad.cpp
 amstr_pc.cpp
+amstrad.cpp
 amust.cpp
 anzterm.cpp
 apc.cpp
@@ -242,9 +242,9 @@ dgn_beta.cpp
 diablo1300.cpp
 didact.cpp
 digel804.cpp
+digijet.cpp
 digilog320.cpp
 digilog400.cpp
-digijet.cpp
 dim68k.cpp
 dm7000.cpp
 dmax8000.cpp
@@ -363,15 +363,15 @@ gamepock.cpp
 gb.cpp
 gba.cpp
 gem_rp.cpp
-generalplus_gpl_unknown.cpp
-generalplus_gpl162xx_lcdtype.cpp
 generalplus_gpl16250_mobigo.cpp
 generalplus_gpl16250_nand.cpp
 generalplus_gpl16250_rom.cpp
 generalplus_gpl16250_romram.cpp
 generalplus_gpl16250_spi.cpp
 generalplus_gpl16250_spi_direct.cpp
+generalplus_gpl162xx_lcdtype.cpp
 generalplus_gpl32612.cpp
+generalplus_gpl_unknown.cpp
 geneve.cpp
 geniusiq.cpp
 geniusjr.cpp
@@ -404,7 +404,6 @@ hazl1420.cpp
 hds200.cpp
 hec2hrp.cpp
 hektor.cpp
-hhtiger.cpp
 hh_cop400.cpp
 hh_cops1.cpp
 hh_hmcs40.cpp
@@ -415,6 +414,7 @@ hh_rw5000.cpp
 hh_sm510.cpp
 hh_tms1k.cpp
 hh_ucom4.cpp
+hhtiger.cpp
 hk68v10.cpp
 hohnadam.cpp
 homelab.cpp
@@ -435,9 +435,9 @@ hp9825.cpp
 hp9845.cpp
 hp9k.cpp
 hp9k_3xx.cpp
+hp_ipc.cpp
 hprot1.cpp
 hpz80unk.cpp
-hp_ipc.cpp
 ht6000.cpp
 ht68k.cpp
 huebler.cpp
@@ -479,8 +479,8 @@ iphone2g.cpp
 iq151.cpp
 iqunlim.cpp
 iris3130.cpp
-irisha.cpp
 iris_power.cpp
+irisha.cpp
 is48x.cpp
 isbc.cpp
 isbc660.cpp
@@ -542,6 +542,7 @@ lbpc.cpp
 lc80.cpp
 lcmate2.cpp
 ld50.cpp
+ldplayer.cpp
 leapfrog_iquest.cpp
 leapfrog_leappad.cpp
 leapfrog_leapster_explorer.cpp
@@ -655,8 +656,8 @@ minitel_2_rpic.cpp
 mips.cpp
 mits680b.cpp
 miuchiz.cpp
-mk1forth.cpp
 mk14.cpp
+mk1forth.cpp
 mk85.cpp
 mk90.cpp
 mk98.cpp
@@ -741,8 +742,8 @@ novag_micro2.cpp
 novag_savant.cpp
 novag_sexpert.cpp
 novag_snova.cpp
-ns5652.cpp
 ns32kdb.cpp
+ns5652.cpp
 o2.cpp
 ob68k1a.cpp
 octane.cpp
@@ -960,10 +961,10 @@ sdk80.cpp
 sdk85.cpp
 sdk86.cpp
 seattlecmp.cpp
-segapico.cpp
-segapm.cpp
 sega_beena.cpp
 sega_sawatte.cpp
+segapico.cpp
+segapm.cpp
 selz80.cpp
 sg1000.cpp
 sh4robot.cpp
@@ -1074,9 +1075,9 @@ telex277d.cpp
 terak.cpp
 terco.cpp
 terminal.cpp
+test_t400.cpp
 testconsole.cpp
 testpat.cpp
-test_t400.cpp
 textelcomp.cpp
 tg100.cpp
 thomson.cpp
@@ -1163,6 +1164,7 @@ vector4.cpp
 vectrex.cpp
 vectrix.cpp
 vg5k.cpp
+vgmplay.cpp
 vic10.cpp
 vic20.cpp
 victor9k.cpp
@@ -1179,7 +1181,6 @@ vp60.cpp
 vsmile.cpp
 vsmileb.cpp
 vsmilepro.cpp
-vt_unknown.cpp
 vt100.cpp
 vt1682.cpp
 vt220.cpp
@@ -1188,12 +1189,14 @@ vt320.cpp
 vt52.cpp
 vt520.cpp
 vt62.cpp
+vt_unknown.cpp
 vta2000.cpp
 vtech1.cpp
 vtech2.cpp
 vtech_eu3a12.cpp
 vtech_innotab.cpp
 wangpc.cpp
+wavesynth.cpp
 wicat.cpp
 wildfire.cpp
 wizard.cpp
@@ -1212,9 +1215,9 @@ x1.cpp
 x1twin.cpp
 x68k.cpp
 xavix.cpp
+xavix2.cpp
 xavix_2000.cpp
 xavix_2002.cpp
-xavix2.cpp
 xbase09.cpp
 xbox.cpp
 xerox820.cpp
@@ -1228,9 +1231,9 @@ ymmu5.cpp
 ymmu50.cpp
 ymmu80.cpp
 ympsr16.cpp
+ympsr340.cpp
 ympsr40.cpp
 ympsr60.cpp
-ympsr340.cpp
 ymqy70.cpp
 ymrx15.cpp
 ymsy35.cpp

src/mame/nl.lst

@@ -286,20 +286,29 @@ hazl1500                        // Hazeltine 1500 (c) 1977
 j_ewn                           // Each Way Nudger (JPM)
 j_ewna                          //
 j_ewnb                          //
+j_ewnc                          //
 j_ndu                           // Nudge Double Up (JPM)
 j_ndua                          //
+j_ndub                          //
 j_dud                           // Nudge Double Up Deluxe (JPM)
 j_duda                          //
+j_dudb                          //
 j_dt                            //
 j_lan                           // Lite A Nudge (JPM)
 j_lana                          //
-j_ews                           // Each Way Shifter
+j_lanb                          //
-j_ews8a                         //
-j_luck2                         // Lucky Twos
-j_luckac                        // Lucky Aces
-j_plus2                         // Plus 2
 j_super2                        // Super 2
-j_unk                           //
+j_ews                           // Each Way Shuffle (JPM)
+j_ewsa                          //
+j_ewsb                          //
+j_ewsdlx                        // Each Way Shuffle Deluxe (CTL)
+j_ssh                           // Silver Shuffle (CTL)
+j_lt                            // Lucky 2's (JPM)
+j_ts                            //
+j_plus2                         // Plus 2 (CTL)
+j_goldn2                        // Golden 2's (CTL)
+j_sup2p                         // Super 2p Shuffle (MDM)
+j_la                            // Lucky Aces
 
 @source:m62.cpp                 // m62.cpp
 battroad                        // (c) 1984