From 4398fa4f66529408ad4de29eb933cdc698149936 Mon Sep 17 00:00:00 2001
From: Michael Zapf <Michael.Zapf@mizapf.de>
Date: Fri, 21 Aug 2015 14:13:14 +0200
Subject: [PATCH] New AT29 flash EEPROM circuits

---
 scripts/src/machine.lua        |    8 +-
 scripts/target/mame/arcade.lua |   12 +-
 scripts/target/mame/mess.lua   | 1872 ++++++++++++++++----------------
 src/emu/bus/ti99_peb/hsgpl.c   |   18 +-
 src/emu/bus/ti99_peb/hsgpl.h   |   10 +-
 src/emu/machine/at29040a.c     |  446 --------
 src/emu/machine/at29040a.h     |   90 --
 src/emu/machine/at29x.c        |  529 +++++++++
 src/emu/machine/at29x.h        |  116 ++
 9 files changed, 1605 insertions(+), 1496 deletions(-)
 delete mode 100644 src/emu/machine/at29040a.c
 delete mode 100644 src/emu/machine/at29040a.h
 create mode 100644 src/emu/machine/at29x.c
 create mode 100644 src/emu/machine/at29x.h

diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index 6a3657129ef..792f252802f 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -453,13 +453,13 @@ end
 
 ---------------------------------------------------
 --
---@src/emu/machine/at29040a.h,MACHINES["AT29040"] = true
+--@src/emu/machine/at29x.h,MACHINES["AT29X"] = true
 ---------------------------------------------------
 
-if (MACHINES["AT29040"]~=null) then
+if (MACHINES["AT29X"]~=null) then
 	files {
-		MAME_DIR .. "src/emu/machine/at29040a.c",
-		MAME_DIR .. "src/emu/machine/at29040a.h",
+		MAME_DIR .. "src/emu/machine/at29x.c",
+		MAME_DIR .. "src/emu/machine/at29x.h",
 	}
 end
 
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 68c9f345deb..c9debd02b5b 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -364,7 +364,7 @@ MACHINES["AM9517A"] = true
 MACHINES["AMIGAFDC"] = true
 --MACHINES["AT_KEYBC"] = true
 MACHINES["AT28C16"] = true
-MACHINES["AT29040"] = true
+MACHINES["AT29X"] = true
 MACHINES["AT45DBXX"] = true
 MACHINES["ATAFLASH"] = true
 MACHINES["AY31015"] = true
@@ -764,18 +764,18 @@ function createMAMEProjects(_target, _subtarget, _name)
 	targetsubdir(_target .."_" .. _subtarget)
 	kind (LIBTYPE)
 	uuid (os.uuid("drv-" .. _target .."_" .. _subtarget .. "_" .._name))
-	
+
 	options {
 		"ForceCPP",
 	}
-	
+
 	includedirs {
 		MAME_DIR .. "src/osd",
 		MAME_DIR .. "src/emu",
 		MAME_DIR .. "src/mame",
 		MAME_DIR .. "src/lib",
 		MAME_DIR .. "src/lib/util",
-    MAME_DIR .. "src/emu/netlist",
+	MAME_DIR .. "src/emu/netlist",
 		MAME_DIR .. "3rdparty",
 		GEN_DIR  .. "mame/layout",
 	}
@@ -786,7 +786,7 @@ function createMAMEProjects(_target, _subtarget, _name)
 		}
 end
 end
-	
+
 function createProjects_mame_arcade(_target, _subtarget)
 --------------------------------------------------
 -- the following files are general components and
@@ -2412,7 +2412,7 @@ files {
 	MAME_DIR .. "src/mame/video/blockade.c",
 	MAME_DIR .. "src/mame/drivers/calorie.c",
 	MAME_DIR .. "src/mame/drivers/chihiro.c",
-	MAME_DIR .. "src/mame/video/chihiro.c", 
+	MAME_DIR .. "src/mame/video/chihiro.c",
 	MAME_DIR .. "src/mame/drivers/coolridr.c",
 	MAME_DIR .. "src/mame/drivers/deniam.c",
 	MAME_DIR .. "src/mame/video/deniam.c",
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 136ce31275f..421c3f9549f 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -365,7 +365,7 @@ MACHINES["AM9517A"] = true
 MACHINES["AMIGAFDC"] = true
 MACHINES["AT_KEYBC"] = true
 MACHINES["AT28C16"] = true
-MACHINES["AT29040"] = true
+MACHINES["AT29X"] = true
 MACHINES["AT45DBXX"] = true
 MACHINES["ATAFLASH"] = true
 MACHINES["AY31015"] = true
@@ -872,11 +872,11 @@ function createMESSProjects(_target, _subtarget, _name)
 	targetsubdir(_target .."_" .. _subtarget)
 	kind (LIBTYPE)
 	uuid (os.uuid("drv-" .. _target .."_" .. _subtarget .. "_" .._name))
-	
+
 	options {
 		"ForceCPP",
 	}
-	
+
 	includedirs {
 		MAME_DIR .. "src/osd",
 		MAME_DIR .. "src/emu",
@@ -884,7 +884,7 @@ function createMESSProjects(_target, _subtarget, _name)
 		MAME_DIR .. "src/mame",
 		MAME_DIR .. "src/lib",
 		MAME_DIR .. "src/lib/util",
-    MAME_DIR .. "src/emu/netlist",
+	MAME_DIR .. "src/emu/netlist",
 		MAME_DIR .. "3rdparty",
 		GEN_DIR  .. "mess/layout",
 		GEN_DIR  .. "mame/layout",
@@ -896,7 +896,7 @@ function createMESSProjects(_target, _subtarget, _name)
 		}
 	end
 end
-	
+
 function createProjects_mame_mess(_target, _subtarget)
 --------------------------------------------------
 -- the following files are MAME components and
@@ -923,72 +923,72 @@ function createProjects_mame_mess(_target, _subtarget)
 --------------------------------------------------
 if (_subtarget=="mess") then
 createMESSProjects(_target, _subtarget, "mameshared")
-files { 
-	MAME_DIR .. "src/mame/machine/archimds.c",  
-	MAME_DIR .. "src/mame/video/archimds.c",    
-	MAME_DIR .. "src/mame/machine/amiga.c",     
-	MAME_DIR .. "src/mame/video/amiga.c",       
-	MAME_DIR .. "src/mame/video/amigaaga.c",    
-	MAME_DIR .. "src/mame/video/tia.c",         
-	MAME_DIR .. "src/mame/machine/atari.c",     
-	MAME_DIR .. "src/mame/video/atari.c",       
-	MAME_DIR .. "src/mame/video/antic.c",       
-	MAME_DIR .. "src/mame/video/gtia.c",        
-	MAME_DIR .. "src/mame/drivers/jaguar.c",    
-	MAME_DIR .. "src/mame/audio/jaguar.c",      
-	MAME_DIR .. "src/mame/video/jaguar.c",      
+files {
+	MAME_DIR .. "src/mame/machine/archimds.c",
+	MAME_DIR .. "src/mame/video/archimds.c",
+	MAME_DIR .. "src/mame/machine/amiga.c",
+	MAME_DIR .. "src/mame/video/amiga.c",
+	MAME_DIR .. "src/mame/video/amigaaga.c",
+	MAME_DIR .. "src/mame/video/tia.c",
+	MAME_DIR .. "src/mame/machine/atari.c",
+	MAME_DIR .. "src/mame/video/atari.c",
+	MAME_DIR .. "src/mame/video/antic.c",
+	MAME_DIR .. "src/mame/video/gtia.c",
+	MAME_DIR .. "src/mame/drivers/jaguar.c",
+	MAME_DIR .. "src/mame/audio/jaguar.c",
+	MAME_DIR .. "src/mame/video/jaguar.c",
 	MAME_DIR .. "src/mame/audio/gorf.c",
 	MAME_DIR .. "src/mame/audio/wow.c",
 	MAME_DIR .. "src/mame/drivers/astrocde.c",
-	MAME_DIR .. "src/mame/video/astrocde.c",    
-	MAME_DIR .. "src/mame/machine/kabuki.c",    
-	MAME_DIR .. "src/mame/video/pk8000.c",      
-	MAME_DIR .. "src/mame/video/ppu2c0x.c",     
-	MAME_DIR .. "src/mame/machine/snes.c",      
-	MAME_DIR .. "src/mame/audio/snes_snd.c",    
-	MAME_DIR .. "src/mame/machine/n64.c",       
-	MAME_DIR .. "src/mame/video/n64.c",         
-	MAME_DIR .. "src/mame/video/rdpblend.c",    
-	MAME_DIR .. "src/mame/video/rdptpipe.c",    
-	MAME_DIR .. "src/mame/machine/megadriv.c",  
-	MAME_DIR .. "src/mame/drivers/naomi.c",     
-	MAME_DIR .. "src/mame/machine/awboard.c",   
-	MAME_DIR .. "src/mame/machine/dc.c",        
-	MAME_DIR .. "src/mame/machine/dc-ctrl.c",   
-	MAME_DIR .. "src/mame/machine/gdrom.c",     
-	MAME_DIR .. "src/mame/machine/jvs13551.c",  
-	MAME_DIR .. "src/mame/machine/maple-dc.c",  
-	MAME_DIR .. "src/mame/machine/mapledev.c",  
-	MAME_DIR .. "src/mame/machine/mie.c",       
-	MAME_DIR .. "src/mame/machine/naomi.c",     
-	MAME_DIR .. "src/mame/machine/naomibd.c",   
-	MAME_DIR .. "src/mame/machine/naomig1.c",   
-	MAME_DIR .. "src/mame/machine/naomigd.c",   
-	MAME_DIR .. "src/mame/machine/naomim1.c",   
-	MAME_DIR .. "src/mame/machine/naomim2.c",   
-	MAME_DIR .. "src/mame/machine/naomim4.c",   
-	MAME_DIR .. "src/mame/machine/naomirom.c",  
-	MAME_DIR .. "src/mame/machine/315-5881_crypt.c",  
-	MAME_DIR .. "src/mame/video/powervr2.c",    
-	MAME_DIR .. "src/mame/drivers/neogeo.c",    
-	MAME_DIR .. "src/mame/machine/neocrypt.c",  
+	MAME_DIR .. "src/mame/video/astrocde.c",
+	MAME_DIR .. "src/mame/machine/kabuki.c",
+	MAME_DIR .. "src/mame/video/pk8000.c",
+	MAME_DIR .. "src/mame/video/ppu2c0x.c",
+	MAME_DIR .. "src/mame/machine/snes.c",
+	MAME_DIR .. "src/mame/audio/snes_snd.c",
+	MAME_DIR .. "src/mame/machine/n64.c",
+	MAME_DIR .. "src/mame/video/n64.c",
+	MAME_DIR .. "src/mame/video/rdpblend.c",
+	MAME_DIR .. "src/mame/video/rdptpipe.c",
+	MAME_DIR .. "src/mame/machine/megadriv.c",
+	MAME_DIR .. "src/mame/drivers/naomi.c",
+	MAME_DIR .. "src/mame/machine/awboard.c",
+	MAME_DIR .. "src/mame/machine/dc.c",
+	MAME_DIR .. "src/mame/machine/dc-ctrl.c",
+	MAME_DIR .. "src/mame/machine/gdrom.c",
+	MAME_DIR .. "src/mame/machine/jvs13551.c",
+	MAME_DIR .. "src/mame/machine/maple-dc.c",
+	MAME_DIR .. "src/mame/machine/mapledev.c",
+	MAME_DIR .. "src/mame/machine/mie.c",
+	MAME_DIR .. "src/mame/machine/naomi.c",
+	MAME_DIR .. "src/mame/machine/naomibd.c",
+	MAME_DIR .. "src/mame/machine/naomig1.c",
+	MAME_DIR .. "src/mame/machine/naomigd.c",
+	MAME_DIR .. "src/mame/machine/naomim1.c",
+	MAME_DIR .. "src/mame/machine/naomim2.c",
+	MAME_DIR .. "src/mame/machine/naomim4.c",
+	MAME_DIR .. "src/mame/machine/naomirom.c",
+	MAME_DIR .. "src/mame/machine/315-5881_crypt.c",
+	MAME_DIR .. "src/mame/video/powervr2.c",
+	MAME_DIR .. "src/mame/drivers/neogeo.c",
+	MAME_DIR .. "src/mame/machine/neocrypt.c",
 	MAME_DIR .. "src/mame/machine/ng_memcard.c",
-	MAME_DIR .. "src/mame/video/neogeo.c",      
-	MAME_DIR .. "src/mame/video/neogeo_spr.c",  
-	MAME_DIR .. "src/mame/drivers/cdi.c",       
-	MAME_DIR .. "src/mame/machine/cdi070.c",    
-	MAME_DIR .. "src/mame/machine/cdicdic.c",   
-	MAME_DIR .. "src/mame/machine/cdislave.c",  
-	MAME_DIR .. "src/mame/video/mcd212.c",      
-	MAME_DIR .. "src/mame/drivers/3do.c",       
-	MAME_DIR .. "src/mame/machine/3do.c",       
-	MAME_DIR .. "src/mame/drivers/konamim2.c",  
-	MAME_DIR .. "src/mame/drivers/vectrex.c",   
-	MAME_DIR .. "src/mame/machine/vectrex.c",   
-	MAME_DIR .. "src/mame/video/vectrex.c",     
-	MAME_DIR .. "src/mame/drivers/cps1.c",      
-	MAME_DIR .. "src/mame/video/cps1.c",        
-	MAME_DIR .. "src/mame/video/chihiro.c",        
+	MAME_DIR .. "src/mame/video/neogeo.c",
+	MAME_DIR .. "src/mame/video/neogeo_spr.c",
+	MAME_DIR .. "src/mame/drivers/cdi.c",
+	MAME_DIR .. "src/mame/machine/cdi070.c",
+	MAME_DIR .. "src/mame/machine/cdicdic.c",
+	MAME_DIR .. "src/mame/machine/cdislave.c",
+	MAME_DIR .. "src/mame/video/mcd212.c",
+	MAME_DIR .. "src/mame/drivers/3do.c",
+	MAME_DIR .. "src/mame/machine/3do.c",
+	MAME_DIR .. "src/mame/drivers/konamim2.c",
+	MAME_DIR .. "src/mame/drivers/vectrex.c",
+	MAME_DIR .. "src/mame/machine/vectrex.c",
+	MAME_DIR .. "src/mame/video/vectrex.c",
+	MAME_DIR .. "src/mame/drivers/cps1.c",
+	MAME_DIR .. "src/mame/video/cps1.c",
+	MAME_DIR .. "src/mame/video/chihiro.c",
 	MAME_DIR .. "src/mame/machine/xbox.c",
 }
 end
@@ -997,125 +997,125 @@ end
 -- shared across a number of drivers
 --------------------------------------------------
 createMESSProjects(_target, _subtarget, "messshared")
-files { 
-	MAME_DIR .. "src/mess/audio/mea8000.c",     
-	MAME_DIR .. "src/mess/machine/appldriv.c",  
-	MAME_DIR .. "src/mess/machine/applefdc.c",  
-	MAME_DIR .. "src/mess/machine/microdrv.c",  
-	MAME_DIR .. "src/mess/machine/smartmed.c",  
-	MAME_DIR .. "src/mess/machine/sonydriv.c",  
-	MAME_DIR .. "src/mess/machine/teleprinter.c", 
-	MAME_DIR .. "src/mess/machine/z80bin.c",    
+files {
+	MAME_DIR .. "src/mess/audio/mea8000.c",
+	MAME_DIR .. "src/mess/machine/appldriv.c",
+	MAME_DIR .. "src/mess/machine/applefdc.c",
+	MAME_DIR .. "src/mess/machine/microdrv.c",
+	MAME_DIR .. "src/mess/machine/smartmed.c",
+	MAME_DIR .. "src/mess/machine/sonydriv.c",
+	MAME_DIR .. "src/mess/machine/teleprinter.c",
+	MAME_DIR .. "src/mess/machine/z80bin.c",
 }
 --------------------------------------------------
 -- manufacturer-specific groupings for drivers
 --------------------------------------------------
 
 createMESSProjects(_target, _subtarget, "acorn")
-files {             
-	MAME_DIR .. "src/mess/drivers/a310.c",      
-	MAME_DIR .. "src/mess/drivers/a6809.c",     
-	MAME_DIR .. "src/mess/drivers/acrnsys1.c",  
-	MAME_DIR .. "src/mess/drivers/atom.c",      
+files {
+	MAME_DIR .. "src/mess/drivers/a310.c",
+	MAME_DIR .. "src/mess/drivers/a6809.c",
+	MAME_DIR .. "src/mess/drivers/acrnsys1.c",
+	MAME_DIR .. "src/mess/drivers/atom.c",
 	MAME_DIR .. "src/mess/drivers/bbc.c",
 	MAME_DIR .. "src/mess/machine/bbc.c",
-	MAME_DIR .. "src/mess/video/bbc.c", 
-	MAME_DIR .. "src/mess/drivers/bbcbc.c",     
+	MAME_DIR .. "src/mess/video/bbc.c",
+	MAME_DIR .. "src/mess/drivers/bbcbc.c",
 	MAME_DIR .. "src/mess/drivers/electron.c",
 	MAME_DIR .. "src/mess/machine/electron.c",
-	MAME_DIR .. "src/mess/video/electron.c", 
-	MAME_DIR .. "src/mess/drivers/riscpc.c",    
+	MAME_DIR .. "src/mess/video/electron.c",
+	MAME_DIR .. "src/mess/drivers/riscpc.c",
 	MAME_DIR .. "src/mess/drivers/z88.c",
 	MAME_DIR .. "src/mess/machine/upd65031.c",
-	MAME_DIR .. "src/mess/video/z88.c", 
+	MAME_DIR .. "src/mess/video/z88.c",
 }
 
 createMESSProjects(_target, _subtarget, "act")
-files {               
-	MAME_DIR .. "src/mess/drivers/apricot.c",   
-	MAME_DIR .. "src/mess/drivers/apricotf.c",  
-	MAME_DIR .. "src/mess/drivers/apricotp.c",  
-	MAME_DIR .. "src/mess/machine/apricotkb.c", 
-	MAME_DIR .. "src/mess/machine/apricotkb_hle.c", 
+files {
+	MAME_DIR .. "src/mess/drivers/apricot.c",
+	MAME_DIR .. "src/mess/drivers/apricotf.c",
+	MAME_DIR .. "src/mess/drivers/apricotp.c",
+	MAME_DIR .. "src/mess/machine/apricotkb.c",
+	MAME_DIR .. "src/mess/machine/apricotkb_hle.c",
 	MAME_DIR .. "src/mess/drivers/victor9k.c",
 	MAME_DIR .. "src/mess/machine/victor9kb.c",
-	MAME_DIR .. "src/mess/machine/victor9k_fdc.c", 
+	MAME_DIR .. "src/mess/machine/victor9k_fdc.c",
 }
 
 createMESSProjects(_target, _subtarget, "adc")
-files {               
-	MAME_DIR .. "src/mess/drivers/super6.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/super6.c",
 	MAME_DIR .. "src/mess/drivers/superslave.c",
 }
 
 createMESSProjects(_target, _subtarget, "alesis")
-files {            
+files {
 	MAME_DIR .. "src/mess/drivers/alesis.c",
 	MAME_DIR .. "src/mess/audio/alesis.c",
-	MAME_DIR .. "src/mess/video/alesis.c", 
+	MAME_DIR .. "src/mess/video/alesis.c",
 }
 
 createMESSProjects(_target, _subtarget, "altos")
-files {             
-	MAME_DIR .. "src/mess/drivers/altos5.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/altos5.c",
 }
 
 createMESSProjects(_target, _subtarget, "amiga")
-files {             
+files {
 	MAME_DIR .. "src/mess/drivers/amiga.c",
-	MAME_DIR .. "src/mess/machine/amigakbd.c", 
+	MAME_DIR .. "src/mess/machine/amigakbd.c",
 }
 
 createMESSProjects(_target, _subtarget, "amstrad")
-files {           
+files {
 	MAME_DIR .. "src/mess/drivers/amstrad.c",
-	MAME_DIR .. "src/mess/machine/amstrad.c", 
-	MAME_DIR .. "src/mess/drivers/amstr_pc.c",  
+	MAME_DIR .. "src/mess/machine/amstrad.c",
+	MAME_DIR .. "src/mess/drivers/amstr_pc.c",
 	MAME_DIR .. "src/mess/drivers/nc.c",
 	MAME_DIR .. "src/mess/machine/nc.c",
-	MAME_DIR .. "src/mess/video/nc.c", 
+	MAME_DIR .. "src/mess/video/nc.c",
 	MAME_DIR .. "src/mess/drivers/pc1512.c",
 	MAME_DIR .. "src/mess/machine/pc1512kb.c",
-	MAME_DIR .. "src/mess/video/pc1512.c", 
+	MAME_DIR .. "src/mess/video/pc1512.c",
 	MAME_DIR .. "src/mess/drivers/pcw.c",
-	MAME_DIR .. "src/mess/video/pcw.c", 
+	MAME_DIR .. "src/mess/video/pcw.c",
 	MAME_DIR .. "src/mess/drivers/pcw16.c",
-	MAME_DIR .. "src/mess/video/pcw16.c", 
-	MAME_DIR .. "src/mess/drivers/pda600.c",    
+	MAME_DIR .. "src/mess/video/pcw16.c",
+	MAME_DIR .. "src/mess/drivers/pda600.c",
 }
 
 createMESSProjects(_target, _subtarget, "apf")
-files {               
-	MAME_DIR .. "src/mess/drivers/apf.c",       
+files {
+	MAME_DIR .. "src/mess/drivers/apf.c",
 }
 
 createMESSProjects(_target, _subtarget, "apollo")
-files {            
+files {
 	MAME_DIR .. "src/mess/drivers/apollo.c",
 	MAME_DIR .. "src/mess/machine/apollo.c",
 	MAME_DIR .. "src/mess/machine/apollo_dbg.c",
 	MAME_DIR .. "src/mess/machine/apollo_kbd.c",
-	MAME_DIR .. "src/mess/video/apollo.c", 
+	MAME_DIR .. "src/mess/video/apollo.c",
 }
 
 createMESSProjects(_target, _subtarget, "apple")
-files {             
+files {
 	MAME_DIR .. "src/mess/drivers/apple1.c",
 	MAME_DIR .. "src/mess/machine/apple1.c",
-	MAME_DIR .. "src/mess/video/apple1.c", 
+	MAME_DIR .. "src/mess/video/apple1.c",
 	MAME_DIR .. "src/mess/drivers/apple2.c",
 	MAME_DIR .. "src/mess/drivers/apple2e.c",
 	MAME_DIR .. "src/mess/machine/apple2.c",
-	MAME_DIR .. "src/mess/video/apple2.c", 
-	MAME_DIR .. "src/mess/drivers/tk2000.c",    
+	MAME_DIR .. "src/mess/video/apple2.c",
+	MAME_DIR .. "src/mess/drivers/tk2000.c",
 	MAME_DIR .. "src/mess/drivers/apple2gs.c",
 	MAME_DIR .. "src/mess/machine/apple2gs.c",
-	MAME_DIR .. "src/mess/video/apple2gs.c", 
+	MAME_DIR .. "src/mess/video/apple2gs.c",
 	MAME_DIR .. "src/mess/drivers/apple3.c",
 	MAME_DIR .. "src/mess/machine/apple3.c",
-	MAME_DIR .. "src/mess/video/apple3.c", 
+	MAME_DIR .. "src/mess/video/apple3.c",
 	MAME_DIR .. "src/mess/drivers/lisa.c",
-	MAME_DIR .. "src/mess/machine/lisa.c", 
+	MAME_DIR .. "src/mess/machine/lisa.c",
 	MAME_DIR .. "src/mess/drivers/mac.c",
 	MAME_DIR .. "src/mess/audio/mac.c",
 	MAME_DIR .. "src/mess/machine/egret.c",
@@ -1124,796 +1124,796 @@ files {
 	MAME_DIR .. "src/mess/machine/macrtc.c",
 	MAME_DIR .. "src/mess/machine/mackbd.c",
 	MAME_DIR .. "src/mess/machine/swim.c",
-	MAME_DIR .. "src/mess/video/mac.c", 
+	MAME_DIR .. "src/mess/video/mac.c",
 	MAME_DIR .. "src/mess/drivers/macpci.c",
-	MAME_DIR .. "src/mess/machine/macpci.c", 
-	MAME_DIR .. "src/mess/machine/cuda.c",      
+	MAME_DIR .. "src/mess/machine/macpci.c",
+	MAME_DIR .. "src/mess/machine/cuda.c",
 }
 
 createMESSProjects(_target, _subtarget, "applied")
-files {           
+files {
 	MAME_DIR .. "src/mess/drivers/mbee.c",
 	MAME_DIR .. "src/mess/machine/mbee.c",
-	MAME_DIR .. "src/mess/video/mbee.c", 
+	MAME_DIR .. "src/mess/video/mbee.c",
 }
 
 createMESSProjects(_target, _subtarget, "arcadia")
-files {           
+files {
 	MAME_DIR .. "src/mess/drivers/arcadia.c",
 	MAME_DIR .. "src/mess/audio/arcadia.c",
-	MAME_DIR .. "src/mess/video/arcadia.c", 
+	MAME_DIR .. "src/mess/video/arcadia.c",
 }
 
 createMESSProjects(_target, _subtarget, "ascii")
-files {             
+files {
 	MAME_DIR .. "src/mess/drivers/msx.c",
 	MAME_DIR .. "src/mess/machine/msx.c",
 	MAME_DIR .. "src/mess/machine/msx_matsushita.c",
 	MAME_DIR .. "src/mess/machine/msx_s1985.c",
 	MAME_DIR .. "src/mess/machine/msx_switched.c",
-	MAME_DIR .. "src/mess/machine/msx_systemflags.c", 
+	MAME_DIR .. "src/mess/machine/msx_systemflags.c",
 }
 
 createMESSProjects(_target, _subtarget, "at")
-files {                
+files {
 	MAME_DIR .. "src/mess/drivers/at.c",
-	MAME_DIR .. "src/mess/machine/at.c", 
-	MAME_DIR .. "src/mess/drivers/ct486.c",     
+	MAME_DIR .. "src/mess/machine/at.c",
+	MAME_DIR .. "src/mess/drivers/ct486.c",
 }
 
 createMESSProjects(_target, _subtarget, "atari")
-files {             
-	MAME_DIR .. "src/mess/drivers/a2600.c",     
+files {
+	MAME_DIR .. "src/mess/drivers/a2600.c",
 	MAME_DIR .. "src/mess/drivers/a7800.c",
-	MAME_DIR .. "src/mess/video/maria.c", 
+	MAME_DIR .. "src/mess/video/maria.c",
 	MAME_DIR .. "src/mess/drivers/atari400.c",
-	MAME_DIR .. "src/mess/machine/atarifdc.c", 
+	MAME_DIR .. "src/mess/machine/atarifdc.c",
 	MAME_DIR .. "src/mess/drivers/atarist.c",
-	MAME_DIR .. "src/mess/video/atarist.c", 
+	MAME_DIR .. "src/mess/video/atarist.c",
 	MAME_DIR .. "src/mess/drivers/lynx.c",
 	MAME_DIR .. "src/mess/audio/lynx.c",
-	MAME_DIR .. "src/mess/machine/lynx.c", 
-	MAME_DIR .. "src/mess/drivers/portfoli.c",  
+	MAME_DIR .. "src/mess/machine/lynx.c",
+	MAME_DIR .. "src/mess/drivers/portfoli.c",
 }
 
 createMESSProjects(_target, _subtarget, "att")
-files {               
-	MAME_DIR .. "src/mess/drivers/unixpc.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/unixpc.c",
 }
 
 createMESSProjects(_target, _subtarget, "bally")
-files {             
-	MAME_DIR .. "src/mess/drivers/astrocde.c",  
+files {
+	MAME_DIR .. "src/mess/drivers/astrocde.c",
 }
 
 createMESSProjects(_target, _subtarget, "banctec")
-files {           
-	MAME_DIR .. "src/mess/drivers/banctec.c",   
+files {
+	MAME_DIR .. "src/mess/drivers/banctec.c",
 }
 
 createMESSProjects(_target, _subtarget, "bandai")
-files {            
-	MAME_DIR .. "src/mess/drivers/sv8000.c",    
-	MAME_DIR .. "src/mess/drivers/rx78.c",      
+files {
+	MAME_DIR .. "src/mess/drivers/sv8000.c",
+	MAME_DIR .. "src/mess/drivers/rx78.c",
 	MAME_DIR .. "src/mess/drivers/tamag1.c",
 	MAME_DIR .. "src/mess/drivers/wswan.c",
 	MAME_DIR .. "src/mess/audio/wswan_snd.c",
 	MAME_DIR .. "src/mess/machine/wswan.c",
-	MAME_DIR .. "src/mess/video/wswan_video.c", 
+	MAME_DIR .. "src/mess/video/wswan_video.c",
 }
 
 createMESSProjects(_target, _subtarget, "be")
-files {                
+files {
 	MAME_DIR .. "src/mess/drivers/bebox.c",
-	MAME_DIR .. "src/mess/machine/bebox.c", 
+	MAME_DIR .. "src/mess/machine/bebox.c",
 }
 
 createMESSProjects(_target, _subtarget, "bnpo")
-files {              
+files {
 	MAME_DIR .. "src/mess/drivers/b2m.c",
 	MAME_DIR .. "src/mess/machine/b2m.c",
-	MAME_DIR .. "src/mess/video/b2m.c", 
+	MAME_DIR .. "src/mess/video/b2m.c",
 }
 
 createMESSProjects(_target, _subtarget, "bondwell")
-files {          
-	MAME_DIR .. "src/mess/drivers/bw12.c",      
-	MAME_DIR .. "src/mess/drivers/bw2.c",       
+files {
+	MAME_DIR .. "src/mess/drivers/bw12.c",
+	MAME_DIR .. "src/mess/drivers/bw2.c",
 }
 
 createMESSProjects(_target, _subtarget, "booth")
-files {             
-	MAME_DIR .. "src/mess/drivers/apexc.c",     
+files {
+	MAME_DIR .. "src/mess/drivers/apexc.c",
 }
 
 createMESSProjects(_target, _subtarget, "camputers")
-files {         
-	MAME_DIR .. "src/mess/drivers/camplynx.c",  
+files {
+	MAME_DIR .. "src/mess/drivers/camplynx.c",
 }
 
 createMESSProjects(_target, _subtarget, "canon")
-files {             
-	MAME_DIR .. "src/mess/drivers/cat.c",       
-	MAME_DIR .. "src/mess/drivers/x07.c",       
+files {
+	MAME_DIR .. "src/mess/drivers/cat.c",
+	MAME_DIR .. "src/mess/drivers/x07.c",
 }
 
 createMESSProjects(_target, _subtarget, "cantab")
-files {            
-	MAME_DIR .. "src/mess/drivers/ace.c",       
+files {
+	MAME_DIR .. "src/mess/drivers/ace.c",
 }
 
 createMESSProjects(_target, _subtarget, "casio")
-files {             
-	MAME_DIR .. "src/mess/drivers/casloopy.c",  
-	MAME_DIR .. "src/mess/drivers/cfx9850.c",   
-	MAME_DIR .. "src/mess/drivers/fp200.c",     
-	MAME_DIR .. "src/mess/drivers/fp1100.c",    
-	MAME_DIR .. "src/mess/drivers/fp6000.c",    
-	MAME_DIR .. "src/mess/drivers/pb1000.c",    
-	MAME_DIR .. "src/mess/drivers/pv1000.c",    
-	MAME_DIR .. "src/mess/drivers/pv2000.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/casloopy.c",
+	MAME_DIR .. "src/mess/drivers/cfx9850.c",
+	MAME_DIR .. "src/mess/drivers/fp200.c",
+	MAME_DIR .. "src/mess/drivers/fp1100.c",
+	MAME_DIR .. "src/mess/drivers/fp6000.c",
+	MAME_DIR .. "src/mess/drivers/pb1000.c",
+	MAME_DIR .. "src/mess/drivers/pv1000.c",
+	MAME_DIR .. "src/mess/drivers/pv2000.c",
 }
 
 createMESSProjects(_target, _subtarget, "cbm")
-files {               
-	MAME_DIR .. "src/mess/drivers/c128.c",      
-	MAME_DIR .. "src/mess/drivers/c64.c",       
-	MAME_DIR .. "src/mess/drivers/c64dtv.c",    
-	MAME_DIR .. "src/mess/drivers/c65.c", 
-	MAME_DIR .. "src/mess/drivers/c900.c",      
-	MAME_DIR .. "src/mess/drivers/cbm2.c",      
-	MAME_DIR .. "src/mess/drivers/clcd.c",      
-	MAME_DIR .. "src/mess/drivers/pet.c",       
-	MAME_DIR .. "src/mess/drivers/plus4.c",     
-	MAME_DIR .. "src/mess/drivers/vic10.c",     
-	MAME_DIR .. "src/mess/drivers/vic20.c",     
-	MAME_DIR .. "src/mess/machine/cbm_snqk.c",  
+files {
+	MAME_DIR .. "src/mess/drivers/c128.c",
+	MAME_DIR .. "src/mess/drivers/c64.c",
+	MAME_DIR .. "src/mess/drivers/c64dtv.c",
+	MAME_DIR .. "src/mess/drivers/c65.c",
+	MAME_DIR .. "src/mess/drivers/c900.c",
+	MAME_DIR .. "src/mess/drivers/cbm2.c",
+	MAME_DIR .. "src/mess/drivers/clcd.c",
+	MAME_DIR .. "src/mess/drivers/pet.c",
+	MAME_DIR .. "src/mess/drivers/plus4.c",
+	MAME_DIR .. "src/mess/drivers/vic10.c",
+	MAME_DIR .. "src/mess/drivers/vic20.c",
+	MAME_DIR .. "src/mess/machine/cbm_snqk.c",
 }
 
 createMESSProjects(_target, _subtarget, "cccp")
-files {              
-	MAME_DIR .. "src/mess/drivers/argo.c",      
-	MAME_DIR .. "src/mess/drivers/cm1800.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/argo.c",
+	MAME_DIR .. "src/mess/drivers/cm1800.c",
 	MAME_DIR .. "src/mess/drivers/lviv.c",
 	MAME_DIR .. "src/mess/machine/lviv.c",
-	MAME_DIR .. "src/mess/video/lviv.c", 
+	MAME_DIR .. "src/mess/video/lviv.c",
 	MAME_DIR .. "src/mess/drivers/mikro80.c",
 	MAME_DIR .. "src/mess/machine/mikro80.c",
-	MAME_DIR .. "src/mess/video/mikro80.c", 
-	MAME_DIR .. "src/mess/drivers/pk8000.c",    
+	MAME_DIR .. "src/mess/video/mikro80.c",
+	MAME_DIR .. "src/mess/drivers/pk8000.c",
 	MAME_DIR .. "src/mess/drivers/pk8020.c",
 	MAME_DIR .. "src/mess/machine/pk8020.c",
-	MAME_DIR .. "src/mess/video/pk8020.c", 
-	MAME_DIR .. "src/mess/drivers/pyl601.c",    
-	MAME_DIR .. "src/mess/drivers/sm1800.c",    
-	MAME_DIR .. "src/mess/drivers/uknc.c",      
-	MAME_DIR .. "src/mess/drivers/unior.c",     
+	MAME_DIR .. "src/mess/video/pk8020.c",
+	MAME_DIR .. "src/mess/drivers/pyl601.c",
+	MAME_DIR .. "src/mess/drivers/sm1800.c",
+	MAME_DIR .. "src/mess/drivers/uknc.c",
+	MAME_DIR .. "src/mess/drivers/unior.c",
 	MAME_DIR .. "src/mess/drivers/ut88.c",
 	MAME_DIR .. "src/mess/machine/ut88.c",
-	MAME_DIR .. "src/mess/video/ut88.c", 
+	MAME_DIR .. "src/mess/video/ut88.c",
 	MAME_DIR .. "src/mess/drivers/vector06.c",
 	MAME_DIR .. "src/mess/machine/vector06.c",
-	MAME_DIR .. "src/mess/video/vector06.c", 
-	MAME_DIR .. "src/mess/drivers/vta2000.c",   
+	MAME_DIR .. "src/mess/video/vector06.c",
+	MAME_DIR .. "src/mess/drivers/vta2000.c",
 }
 
 createMESSProjects(_target, _subtarget, "cce")
-files {               
-	MAME_DIR .. "src/mess/drivers/mc1000.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/mc1000.c",
 }
 
 createMESSProjects(_target, _subtarget, "ccs")
-files {               
-	MAME_DIR .. "src/mess/drivers/ccs2810.c",   
-	MAME_DIR .. "src/mess/drivers/ccs300.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/ccs2810.c",
+	MAME_DIR .. "src/mess/drivers/ccs300.c",
 }
 
 createMESSProjects(_target, _subtarget, "chromatics")
-files {        
+files {
 	MAME_DIR .. "src/mess/drivers/cgc7900.c",
-	MAME_DIR .. "src/mess/video/cgc7900.c", 
+	MAME_DIR .. "src/mess/video/cgc7900.c",
 }
 
 createMESSProjects(_target, _subtarget, "coleco")
-files {            
-	MAME_DIR .. "src/mess/drivers/adam.c",      
-	MAME_DIR .. "src/mess/drivers/coleco.c",    
-	MAME_DIR .. "src/mess/machine/coleco.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/adam.c",
+	MAME_DIR .. "src/mess/drivers/coleco.c",
+	MAME_DIR .. "src/mess/machine/coleco.c",
 }
 
 createMESSProjects(_target, _subtarget, "cromemco")
-files {          
-	MAME_DIR .. "src/mess/drivers/c10.c",       
-	MAME_DIR .. "src/mess/drivers/mcb216.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/c10.c",
+	MAME_DIR .. "src/mess/drivers/mcb216.c",
 }
 
 createMESSProjects(_target, _subtarget, "comx")
-files {              
+files {
 	MAME_DIR .. "src/mess/drivers/comx35.c",
-	MAME_DIR .. "src/mess/video/comx35.c", 
+	MAME_DIR .. "src/mess/video/comx35.c",
 }
 
 createMESSProjects(_target, _subtarget, "concept")
-files {           
+files {
 	MAME_DIR .. "src/mess/drivers/concept.c",
-	MAME_DIR .. "src/mess/machine/concept.c", 
+	MAME_DIR .. "src/mess/machine/concept.c",
 }
 
 createMESSProjects(_target, _subtarget, "conitec")
-files {           
-	MAME_DIR .. "src/mess/drivers/prof180x.c",  
+files {
+	MAME_DIR .. "src/mess/drivers/prof180x.c",
 	MAME_DIR .. "src/mess/drivers/prof80.c",
-	MAME_DIR .. "src/mess/machine/prof80mmu.c", 
+	MAME_DIR .. "src/mess/machine/prof80mmu.c",
 }
 
 createMESSProjects(_target, _subtarget, "cybiko")
-files {            
+files {
 	MAME_DIR .. "src/mess/drivers/cybiko.c",
-	MAME_DIR .. "src/mess/machine/cybiko.c", 
+	MAME_DIR .. "src/mess/machine/cybiko.c",
 }
 
 createMESSProjects(_target, _subtarget, "dai")
-files {               
+files {
 	MAME_DIR .. "src/mess/drivers/dai.c",
 	MAME_DIR .. "src/mess/audio/dai_snd.c",
 	MAME_DIR .. "src/mess/machine/dai.c",
-	MAME_DIR .. "src/mess/video/dai.c", 
+	MAME_DIR .. "src/mess/video/dai.c",
 }
 
 createMESSProjects(_target, _subtarget, "ddr")
-files {               
+files {
 	MAME_DIR .. "src/mess/drivers/ac1.c",
 	MAME_DIR .. "src/mess/machine/ac1.c",
-	MAME_DIR .. "src/mess/video/ac1.c", 
-	MAME_DIR .. "src/mess/drivers/bcs3.c",      
-	MAME_DIR .. "src/mess/drivers/c80.c",       
-	MAME_DIR .. "src/mess/drivers/huebler.c",   
-	MAME_DIR .. "src/mess/drivers/jtc.c",       
+	MAME_DIR .. "src/mess/video/ac1.c",
+	MAME_DIR .. "src/mess/drivers/bcs3.c",
+	MAME_DIR .. "src/mess/drivers/c80.c",
+	MAME_DIR .. "src/mess/drivers/huebler.c",
+	MAME_DIR .. "src/mess/drivers/jtc.c",
 	MAME_DIR .. "src/mess/drivers/kramermc.c",
 	MAME_DIR .. "src/mess/machine/kramermc.c",
-	MAME_DIR .. "src/mess/video/kramermc.c", 
+	MAME_DIR .. "src/mess/video/kramermc.c",
 	MAME_DIR .. "src/mess/drivers/llc.c",
 	MAME_DIR .. "src/mess/machine/llc.c",
-	MAME_DIR .. "src/mess/video/llc.c", 
-	MAME_DIR .. "src/mess/drivers/nanos.c",     
-	MAME_DIR .. "src/mess/drivers/pcm.c",       
-	MAME_DIR .. "src/mess/drivers/vcs80.c",     
-	MAME_DIR .. "src/mess/machine/k7659kb.c",   
+	MAME_DIR .. "src/mess/video/llc.c",
+	MAME_DIR .. "src/mess/drivers/nanos.c",
+	MAME_DIR .. "src/mess/drivers/pcm.c",
+	MAME_DIR .. "src/mess/drivers/vcs80.c",
+	MAME_DIR .. "src/mess/machine/k7659kb.c",
 }
 
 createMESSProjects(_target, _subtarget, "dec")
-files {               
-	MAME_DIR .. "src/mess/drivers/dct11em.c",   
-	MAME_DIR .. "src/mess/drivers/dectalk.c",   
-	MAME_DIR .. "src/mess/drivers/pdp11.c",     
-	MAME_DIR .. "src/mess/drivers/vax11.c",     
-	MAME_DIR .. "src/mess/drivers/rainbow.c",   
-	MAME_DIR .. "src/mess/drivers/vk100.c",     
-	MAME_DIR .. "src/mess/drivers/vt100.c",     
-	MAME_DIR .. "src/mess/drivers/vt220.c",     
-	MAME_DIR .. "src/mess/drivers/vt240.c",     
-	MAME_DIR .. "src/mess/drivers/vt320.c",     
-	MAME_DIR .. "src/mess/drivers/vt520.c",     
-	MAME_DIR .. "src/mess/machine/dec_lk201.c", 
-	MAME_DIR .. "src/mess/machine/rx01.c",      
-	MAME_DIR .. "src/mess/video/vtvideo.c",     
+files {
+	MAME_DIR .. "src/mess/drivers/dct11em.c",
+	MAME_DIR .. "src/mess/drivers/dectalk.c",
+	MAME_DIR .. "src/mess/drivers/pdp11.c",
+	MAME_DIR .. "src/mess/drivers/vax11.c",
+	MAME_DIR .. "src/mess/drivers/rainbow.c",
+	MAME_DIR .. "src/mess/drivers/vk100.c",
+	MAME_DIR .. "src/mess/drivers/vt100.c",
+	MAME_DIR .. "src/mess/drivers/vt220.c",
+	MAME_DIR .. "src/mess/drivers/vt240.c",
+	MAME_DIR .. "src/mess/drivers/vt320.c",
+	MAME_DIR .. "src/mess/drivers/vt520.c",
+	MAME_DIR .. "src/mess/machine/dec_lk201.c",
+	MAME_DIR .. "src/mess/machine/rx01.c",
+	MAME_DIR .. "src/mess/video/vtvideo.c",
 }
 
 createMESSProjects(_target, _subtarget, "dicksmth")
-files {          
+files {
 	MAME_DIR .. "src/mess/drivers/super80.c",
 	MAME_DIR .. "src/mess/machine/super80.c",
-	MAME_DIR .. "src/mess/video/super80.c", 
+	MAME_DIR .. "src/mess/video/super80.c",
 }
 
 createMESSProjects(_target, _subtarget, "dms")
-files {               
-	MAME_DIR .. "src/mess/drivers/dms5000.c",   
-	MAME_DIR .. "src/mess/drivers/dms86.c",     
-	MAME_DIR .. "src/mess/drivers/zsbc3.c",     
+files {
+	MAME_DIR .. "src/mess/drivers/dms5000.c",
+	MAME_DIR .. "src/mess/drivers/dms86.c",
+	MAME_DIR .. "src/mess/drivers/zsbc3.c",
 }
 
 createMESSProjects(_target, _subtarget, "dragon")
-files {            
+files {
 	MAME_DIR .. "src/mess/drivers/dgn_beta.c",
 	MAME_DIR .. "src/mess/machine/dgn_beta.c",
-	MAME_DIR .. "src/mess/video/dgn_beta.c", 
+	MAME_DIR .. "src/mess/video/dgn_beta.c",
 }
 
 createMESSProjects(_target, _subtarget, "drc")
-files {               
-	MAME_DIR .. "src/mess/drivers/zrt80.c",     
+files {
+	MAME_DIR .. "src/mess/drivers/zrt80.c",
 }
 
 createMESSProjects(_target, _subtarget, "eaca")
-files {              
+files {
 	MAME_DIR .. "src/mess/drivers/cgenie.c",
 }
 
 createMESSProjects(_target, _subtarget, "einis")
-files {             
+files {
 	MAME_DIR .. "src/mess/drivers/pecom.c",
 	MAME_DIR .. "src/mess/machine/pecom.c",
-	MAME_DIR .. "src/mess/video/pecom.c", 
+	MAME_DIR .. "src/mess/video/pecom.c",
 }
 
 createMESSProjects(_target, _subtarget, "elektrka")
-files {          
+files {
 	MAME_DIR .. "src/mess/drivers/bk.c",
 	MAME_DIR .. "src/mess/machine/bk.c",
-	MAME_DIR .. "src/mess/video/bk.c", 
+	MAME_DIR .. "src/mess/video/bk.c",
 	MAME_DIR .. "src/mess/drivers/dvk_ksm.c",
-	MAME_DIR .. "src/mess/machine/ms7004.c", 
-	MAME_DIR .. "src/mess/drivers/mk85.c",      
-	MAME_DIR .. "src/mess/drivers/mk90.c",      
+	MAME_DIR .. "src/mess/machine/ms7004.c",
+	MAME_DIR .. "src/mess/drivers/mk85.c",
+	MAME_DIR .. "src/mess/drivers/mk90.c",
 }
 
 createMESSProjects(_target, _subtarget, "elektor")
-files {           
-	MAME_DIR .. "src/mess/drivers/ec65.c",      
-	MAME_DIR .. "src/mess/drivers/elekscmp.c",  
-	MAME_DIR .. "src/mess/drivers/junior.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/ec65.c",
+	MAME_DIR .. "src/mess/drivers/elekscmp.c",
+	MAME_DIR .. "src/mess/drivers/junior.c",
 }
 
 createMESSProjects(_target, _subtarget, "ensoniq")
-files {           
-	MAME_DIR .. "src/mess/drivers/esq1.c",      
-	MAME_DIR .. "src/mess/drivers/esq5505.c",   
-	MAME_DIR .. "src/mess/drivers/esqasr.c",    
-	MAME_DIR .. "src/mess/drivers/esqkt.c",     
-	MAME_DIR .. "src/mess/drivers/esqmr.c",     
-	MAME_DIR .. "src/mess/drivers/mirage.c",    
-	MAME_DIR .. "src/mess/machine/esqpanel.c",  
-	MAME_DIR .. "src/mess/machine/esqvfd.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/esq1.c",
+	MAME_DIR .. "src/mess/drivers/esq5505.c",
+	MAME_DIR .. "src/mess/drivers/esqasr.c",
+	MAME_DIR .. "src/mess/drivers/esqkt.c",
+	MAME_DIR .. "src/mess/drivers/esqmr.c",
+	MAME_DIR .. "src/mess/drivers/mirage.c",
+	MAME_DIR .. "src/mess/machine/esqpanel.c",
+	MAME_DIR .. "src/mess/machine/esqvfd.c",
 }
 
 createMESSProjects(_target, _subtarget, "enterprise")
-files {        
+files {
 	MAME_DIR .. "src/mess/drivers/ep64.c",
 	MAME_DIR .. "src/mess/audio/dave.c",
-	MAME_DIR .. "src/mess/video/nick.c", 
+	MAME_DIR .. "src/mess/video/nick.c",
 }
 
 createMESSProjects(_target, _subtarget, "entex")
-files {             
+files {
 	MAME_DIR .. "src/mess/drivers/advision.c",
 	MAME_DIR .. "src/mess/machine/advision.c",
-	MAME_DIR .. "src/mess/video/advision.c", 
+	MAME_DIR .. "src/mess/video/advision.c",
 }
 
 createMESSProjects(_target, _subtarget, "epoch")
-files {             
+files {
 	MAME_DIR .. "src/mess/drivers/gamepock.c",
-	MAME_DIR .. "src/mess/machine/gamepock.c", 
+	MAME_DIR .. "src/mess/machine/gamepock.c",
 	MAME_DIR .. "src/mess/drivers/scv.c",
-	MAME_DIR .. "src/mess/audio/upd1771.c", 
+	MAME_DIR .. "src/mess/audio/upd1771.c",
 }
 
 createMESSProjects(_target, _subtarget, "epson")
-files {             
-	MAME_DIR .. "src/mess/drivers/hx20.c",      
-	MAME_DIR .. "src/mess/drivers/px4.c",       
-	MAME_DIR .. "src/mess/drivers/px8.c",       
+files {
+	MAME_DIR .. "src/mess/drivers/hx20.c",
+	MAME_DIR .. "src/mess/drivers/px4.c",
+	MAME_DIR .. "src/mess/drivers/px8.c",
 	MAME_DIR .. "src/mess/drivers/qx10.c",
-	MAME_DIR .. "src/mess/machine/qx10kbd.c", 
+	MAME_DIR .. "src/mess/machine/qx10kbd.c",
 }
 
 createMESSProjects(_target, _subtarget, "exidy")
-files {             
+files {
 	MAME_DIR .. "src/mess/machine/sorcerer.c",
-	MAME_DIR .. "src/mess/drivers/sorcerer.c", 
+	MAME_DIR .. "src/mess/drivers/sorcerer.c",
 	MAME_DIR .. "src/mess/machine/micropolis.c",
 }
 
 createMESSProjects(_target, _subtarget, "fairch")
-files {            
+files {
 	MAME_DIR .. "src/mess/drivers/channelf.c",
 	MAME_DIR .. "src/mess/audio/channelf.c",
-	MAME_DIR .. "src/mess/video/channelf.c", 
+	MAME_DIR .. "src/mess/video/channelf.c",
 }
 
 createMESSProjects(_target, _subtarget, "fidelity")
-files {          
-	MAME_DIR .. "src/mess/drivers/csc.c",       
-	MAME_DIR .. "src/mess/drivers/fidelz80.c",  
+files {
+	MAME_DIR .. "src/mess/drivers/csc.c",
+	MAME_DIR .. "src/mess/drivers/fidelz80.c",
 }
 
 createMESSProjects(_target, _subtarget, "force")
-files {          
-	MAME_DIR .. "src/mess/drivers/force68k.c",  
+files {
+	MAME_DIR .. "src/mess/drivers/force68k.c",
 }
 
 createMESSProjects(_target, _subtarget, "fujitsu")
-files {           
+files {
 	MAME_DIR .. "src/mess/drivers/fmtowns.c",
 	MAME_DIR .. "src/mess/video/fmtowns.c",
-	MAME_DIR .. "src/mess/machine/fm_scsi.c", 
+	MAME_DIR .. "src/mess/machine/fm_scsi.c",
 	MAME_DIR .. "src/mess/drivers/fm7.c",
-	MAME_DIR .. "src/mess/video/fm7.c", 
+	MAME_DIR .. "src/mess/video/fm7.c",
 }
 
 createMESSProjects(_target, _subtarget, "funtech")
-files {           
-	MAME_DIR .. "src/mess/drivers/supracan.c",  
+files {
+	MAME_DIR .. "src/mess/drivers/supracan.c",
 }
 
 createMESSProjects(_target, _subtarget, "galaxy")
-files {            
+files {
 	MAME_DIR .. "src/mess/drivers/galaxy.c",
 	MAME_DIR .. "src/mess/machine/galaxy.c",
-	MAME_DIR .. "src/mess/video/galaxy.c", 
+	MAME_DIR .. "src/mess/video/galaxy.c",
 }
 
 createMESSProjects(_target, _subtarget, "gamepark")
-files {          
-	MAME_DIR .. "src/mess/drivers/gp2x.c",      
-	MAME_DIR .. "src/mess/drivers/gp32.c",      
+files {
+	MAME_DIR .. "src/mess/drivers/gp2x.c",
+	MAME_DIR .. "src/mess/drivers/gp32.c",
 }
 
 createMESSProjects(_target, _subtarget, "gi")
-files {                
-	MAME_DIR .. "src/mess/drivers/hh_pic16.c",  
+files {
+	MAME_DIR .. "src/mess/drivers/hh_pic16.c",
 }
 
 createMESSProjects(_target, _subtarget, "grundy")
-files {            
+files {
 	MAME_DIR .. "src/mess/drivers/newbrain.c",
-	MAME_DIR .. "src/mess/video/newbrain.c", 
+	MAME_DIR .. "src/mess/video/newbrain.c",
 }
 
 createMESSProjects(_target, _subtarget, "hartung")
-files {           
-	MAME_DIR .. "src/mess/drivers/gmaster.c",   
+files {
+	MAME_DIR .. "src/mess/drivers/gmaster.c",
 }
 
 createMESSProjects(_target, _subtarget, "heathkit")
-files {          
-	MAME_DIR .. "src/mess/drivers/et3400.c",    
-	MAME_DIR .. "src/mess/drivers/h8.c",        
-	MAME_DIR .. "src/mess/drivers/h19.c",       
-	MAME_DIR .. "src/mess/drivers/h89.c",       
+files {
+	MAME_DIR .. "src/mess/drivers/et3400.c",
+	MAME_DIR .. "src/mess/drivers/h8.c",
+	MAME_DIR .. "src/mess/drivers/h19.c",
+	MAME_DIR .. "src/mess/drivers/h89.c",
 }
 
 createMESSProjects(_target, _subtarget, "hegener")
-files {           
-	MAME_DIR .. "src/mess/drivers/glasgow.c",   
-	MAME_DIR .. "src/mess/drivers/mephisto.c",  
-	MAME_DIR .. "src/mess/drivers/mmodular.c",  
-	MAME_DIR .. "src/mess/drivers/stratos.c",   
-	MAME_DIR .. "src/mess/machine/mboard.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/glasgow.c",
+	MAME_DIR .. "src/mess/drivers/mephisto.c",
+	MAME_DIR .. "src/mess/drivers/mmodular.c",
+	MAME_DIR .. "src/mess/drivers/stratos.c",
+	MAME_DIR .. "src/mess/machine/mboard.c",
 }
 
 createMESSProjects(_target, _subtarget, "hitachi")
-files {           
-	MAME_DIR .. "src/mess/drivers/b16.c",       
-	MAME_DIR .. "src/mess/drivers/bmjr.c",      
-	MAME_DIR .. "src/mess/drivers/bml3.c",      
-	MAME_DIR .. "src/mess/drivers/hh_hmcs40.c", 
+files {
+	MAME_DIR .. "src/mess/drivers/b16.c",
+	MAME_DIR .. "src/mess/drivers/bmjr.c",
+	MAME_DIR .. "src/mess/drivers/bml3.c",
+	MAME_DIR .. "src/mess/drivers/hh_hmcs40.c",
 }
 
 createMESSProjects(_target, _subtarget, "homebrew")
-files {          
-	MAME_DIR .. "src/mess/drivers/4004clk.c",   
-	MAME_DIR .. "src/mess/drivers/68ksbc.c",    
-	MAME_DIR .. "src/mess/drivers/craft.c",     
-	MAME_DIR .. "src/mess/drivers/homez80.c",   
-	MAME_DIR .. "src/mess/drivers/p112.c",      
-	MAME_DIR .. "src/mess/drivers/phunsy.c",    
-	MAME_DIR .. "src/mess/drivers/pimps.c",     
-	MAME_DIR .. "src/mess/drivers/ravens.c",    
-	MAME_DIR .. "src/mess/drivers/sbc6510.c",   
-	MAME_DIR .. "src/mess/drivers/sitcom.c",    
-	MAME_DIR .. "src/mess/drivers/slc1.c",      
-	MAME_DIR .. "src/mess/drivers/uzebox.c",    
-	MAME_DIR .. "src/mess/drivers/z80dev.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/4004clk.c",
+	MAME_DIR .. "src/mess/drivers/68ksbc.c",
+	MAME_DIR .. "src/mess/drivers/craft.c",
+	MAME_DIR .. "src/mess/drivers/homez80.c",
+	MAME_DIR .. "src/mess/drivers/p112.c",
+	MAME_DIR .. "src/mess/drivers/phunsy.c",
+	MAME_DIR .. "src/mess/drivers/pimps.c",
+	MAME_DIR .. "src/mess/drivers/ravens.c",
+	MAME_DIR .. "src/mess/drivers/sbc6510.c",
+	MAME_DIR .. "src/mess/drivers/sitcom.c",
+	MAME_DIR .. "src/mess/drivers/slc1.c",
+	MAME_DIR .. "src/mess/drivers/uzebox.c",
+	MAME_DIR .. "src/mess/drivers/z80dev.c",
 }
 
 createMESSProjects(_target, _subtarget, "homelab")
-files {           
-	MAME_DIR .. "src/mess/drivers/homelab.c",   
+files {
+	MAME_DIR .. "src/mess/drivers/homelab.c",
 }
 
 createMESSProjects(_target, _subtarget, "hp")
-files {                
-	MAME_DIR .. "src/mess/drivers/hp16500.c",   
-	MAME_DIR .. "src/mess/drivers/hp48.c",      
-	MAME_DIR .. "src/mess/machine/hp48.c",      
-	MAME_DIR .. "src/mess/video/hp48.c",        
-	MAME_DIR .. "src/mess/drivers/hp49gp.c",    
-	MAME_DIR .. "src/mess/drivers/hp9845.c",    
-	MAME_DIR .. "src/mess/drivers/hp9k.c",      
-	MAME_DIR .. "src/mess/drivers/hp9k_3xx.c",  
+files {
+	MAME_DIR .. "src/mess/drivers/hp16500.c",
+	MAME_DIR .. "src/mess/drivers/hp48.c",
+	MAME_DIR .. "src/mess/machine/hp48.c",
+	MAME_DIR .. "src/mess/video/hp48.c",
+	MAME_DIR .. "src/mess/drivers/hp49gp.c",
+	MAME_DIR .. "src/mess/drivers/hp9845.c",
+	MAME_DIR .. "src/mess/drivers/hp9k.c",
+	MAME_DIR .. "src/mess/drivers/hp9k_3xx.c",
 	MAME_DIR .. "src/mess/drivers/hp64k.c",
 	MAME_DIR .. "src/mess/drivers/hp_ipc.c",
 }
 
 createMESSProjects(_target, _subtarget, "hec2hrp")
-files {           
-	MAME_DIR .. "src/mess/drivers/hec2hrp.c",   
-	MAME_DIR .. "src/mess/machine/hec2hrp.c",   
-	MAME_DIR .. "src/mess/machine/hecdisk2.c",  
-	MAME_DIR .. "src/mess/video/hec2video.c",   
-	MAME_DIR .. "src/mess/drivers/interact.c",  
+files {
+	MAME_DIR .. "src/mess/drivers/hec2hrp.c",
+	MAME_DIR .. "src/mess/machine/hec2hrp.c",
+	MAME_DIR .. "src/mess/machine/hecdisk2.c",
+	MAME_DIR .. "src/mess/video/hec2video.c",
+	MAME_DIR .. "src/mess/drivers/interact.c",
 }
 
 createMESSProjects(_target, _subtarget, "intel")
-files {             
-	MAME_DIR .. "src/mess/drivers/basic52.c",   
-	MAME_DIR .. "src/mess/drivers/imds.c",      
-	MAME_DIR .. "src/mess/drivers/ipc.c",       
-	MAME_DIR .. "src/mess/drivers/ipds.c",      
+files {
+	MAME_DIR .. "src/mess/drivers/basic52.c",
+	MAME_DIR .. "src/mess/drivers/imds.c",
+	MAME_DIR .. "src/mess/drivers/ipc.c",
+	MAME_DIR .. "src/mess/drivers/ipds.c",
 	MAME_DIR .. "src/mess/drivers/isbc.c",
-	MAME_DIR .. "src/mess/machine/isbc_215g.c", 
-	MAME_DIR .. "src/mess/drivers/rex6000.c",   
-	MAME_DIR .. "src/mess/drivers/sdk80.c",     
-	MAME_DIR .. "src/mess/drivers/sdk85.c",     
-	MAME_DIR .. "src/mess/drivers/sdk86.c",   
-	MAME_DIR .. "src/mess/drivers/imds2.c",  
+	MAME_DIR .. "src/mess/machine/isbc_215g.c",
+	MAME_DIR .. "src/mess/drivers/rex6000.c",
+	MAME_DIR .. "src/mess/drivers/sdk80.c",
+	MAME_DIR .. "src/mess/drivers/sdk85.c",
+	MAME_DIR .. "src/mess/drivers/sdk86.c",
+	MAME_DIR .. "src/mess/drivers/imds2.c",
 }
 
 createMESSProjects(_target, _subtarget, "imp")
-files {               
-	MAME_DIR .. "src/mess/drivers/tim011.c",    
-	MAME_DIR .. "src/mess/drivers/tim100.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/tim011.c",
+	MAME_DIR .. "src/mess/drivers/tim100.c",
 }
 
 createMESSProjects(_target, _subtarget, "interton")
-files {          
+files {
 	MAME_DIR .. "src/mess/drivers/vc4000.c",
 	MAME_DIR .. "src/mess/audio/vc4000snd.c",
-	MAME_DIR .. "src/mess/video/vc4000.c", 
+	MAME_DIR .. "src/mess/video/vc4000.c",
 }
 
 createMESSProjects(_target, _subtarget, "intv")
-files {              
+files {
 	MAME_DIR .. "src/mess/drivers/intv.c",
 	MAME_DIR .. "src/mess/machine/intv.c",
 	MAME_DIR .. "src/mess/video/intv.c",
-	MAME_DIR .. "src/mess/video/stic.c", 
+	MAME_DIR .. "src/mess/video/stic.c",
 }
 
 createMESSProjects(_target, _subtarget, "isc")
-files {               
+files {
 	MAME_DIR .. "src/mess/drivers/compucolor.c",
 }
 
 createMESSProjects(_target, _subtarget, "kaypro")
-files {            
+files {
 	MAME_DIR .. "src/mess/drivers/kaypro.c",
 	MAME_DIR .. "src/mess/machine/kaypro.c",
 	MAME_DIR .. "src/mess/machine/kay_kbd.c",
-	MAME_DIR .. "src/mess/video/kaypro.c", 
+	MAME_DIR .. "src/mess/video/kaypro.c",
 }
 
 createMESSProjects(_target, _subtarget, "koei")
-files {              
-	MAME_DIR .. "src/mess/drivers/pasogo.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/pasogo.c",
 }
 
 createMESSProjects(_target, _subtarget, "kyocera")
-files {           
+files {
 	MAME_DIR .. "src/mess/drivers/kyocera.c",
-	MAME_DIR .. "src/mess/video/kyocera.c", 
+	MAME_DIR .. "src/mess/video/kyocera.c",
 }
 
 createMESSProjects(_target, _subtarget, "luxor")
-files {             
+files {
 	MAME_DIR .. "src/mess/drivers/abc80.c",
 	MAME_DIR .. "src/mess/machine/abc80kb.c",
-	MAME_DIR .. "src/mess/video/abc80.c", 
+	MAME_DIR .. "src/mess/video/abc80.c",
 	MAME_DIR .. "src/mess/drivers/abc80x.c",
 	MAME_DIR .. "src/mess/video/abc800.c",
 	MAME_DIR .. "src/mess/video/abc802.c",
-	MAME_DIR .. "src/mess/video/abc806.c", 
+	MAME_DIR .. "src/mess/video/abc806.c",
 	MAME_DIR .. "src/mess/drivers/abc1600.c",
 	MAME_DIR .. "src/mess/machine/abc1600mac.c",
-	MAME_DIR .. "src/mess/video/abc1600.c", 
+	MAME_DIR .. "src/mess/video/abc1600.c",
 }
 
 createMESSProjects(_target, _subtarget, "magnavox")
-files {          
-	MAME_DIR .. "src/mess/drivers/odyssey2.c",  
+files {
+	MAME_DIR .. "src/mess/drivers/odyssey2.c",
 }
 
 createMESSProjects(_target, _subtarget, "makerbot")
-files {          
+files {
 	MAME_DIR .. "src/mess/drivers/replicator.c",
 }
 
 createMESSProjects(_target, _subtarget, "marx")
-files {              
-	MAME_DIR .. "src/mess/drivers/elecbowl.c",  
+files {
+	MAME_DIR .. "src/mess/drivers/elecbowl.c",
 }
 
 createMESSProjects(_target, _subtarget, "mattel")
-files {            
+files {
 	MAME_DIR .. "src/mess/drivers/aquarius.c",
-	MAME_DIR .. "src/mess/video/aquarius.c", 
-	MAME_DIR .. "src/mess/drivers/juicebox.c",  
-	MAME_DIR .. "src/mess/drivers/hyperscan.c", 
+	MAME_DIR .. "src/mess/video/aquarius.c",
+	MAME_DIR .. "src/mess/drivers/juicebox.c",
+	MAME_DIR .. "src/mess/drivers/hyperscan.c",
 }
 
 createMESSProjects(_target, _subtarget, "matsushi")
-files {          
-	MAME_DIR .. "src/mess/drivers/jr100.c",     
-	MAME_DIR .. "src/mess/drivers/jr200.c",     
-	MAME_DIR .. "src/mess/drivers/myb3k.c",     
+files {
+	MAME_DIR .. "src/mess/drivers/jr100.c",
+	MAME_DIR .. "src/mess/drivers/jr200.c",
+	MAME_DIR .. "src/mess/drivers/myb3k.c",
 }
 
 createMESSProjects(_target, _subtarget, "mb")
-files {                
+files {
 	MAME_DIR .. "src/mess/drivers/mbdtower.c",
-	MAME_DIR .. "src/mess/drivers/microvsn.c",  
+	MAME_DIR .. "src/mess/drivers/microvsn.c",
 }
 
 createMESSProjects(_target, _subtarget, "mchester")
-files {          
-	MAME_DIR .. "src/mess/drivers/ssem.c",      
+files {
+	MAME_DIR .. "src/mess/drivers/ssem.c",
 }
 
 createMESSProjects(_target, _subtarget, "memotech")
-files {          
+files {
 	MAME_DIR .. "src/mess/drivers/mtx.c",
-	MAME_DIR .. "src/mess/machine/mtx.c", 
+	MAME_DIR .. "src/mess/machine/mtx.c",
 }
 
 createMESSProjects(_target, _subtarget, "mgu")
-files {               
-	MAME_DIR .. "src/mess/drivers/irisha.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/irisha.c",
 }
 
 createMESSProjects(_target, _subtarget, "microkey")
-files {          
+files {
 	MAME_DIR .. "src/mess/drivers/primo.c",
 	MAME_DIR .. "src/mess/machine/primo.c",
-	MAME_DIR .. "src/mess/video/primo.c", 
+	MAME_DIR .. "src/mess/video/primo.c",
 }
 
 createMESSProjects(_target, _subtarget, "microsoft")
-files {               
-	MAME_DIR .. "src/mess/drivers/xbox.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/xbox.c",
 }
 
 createMESSProjects(_target, _subtarget, "mit")
-files {               
+files {
 	MAME_DIR .. "src/mess/drivers/tx0.c",
 	MAME_DIR .. "src/mess/video/crt.c",
-	MAME_DIR .. "src/mess/video/tx0.c", 
+	MAME_DIR .. "src/mess/video/tx0.c",
 }
 
 createMESSProjects(_target, _subtarget, "mits")
-files {              
-	MAME_DIR .. "src/mess/drivers/altair.c",    
-	MAME_DIR .. "src/mess/drivers/mits680b.c",  
+files {
+	MAME_DIR .. "src/mess/drivers/altair.c",
+	MAME_DIR .. "src/mess/drivers/mits680b.c",
 }
 
 createMESSProjects(_target, _subtarget, "mitsubishi")
-files {        
+files {
 	MAME_DIR .. "src/mess/drivers/hh_melps4.c",
-	MAME_DIR .. "src/mess/drivers/multi8.c",    
-	MAME_DIR .. "src/mess/drivers/multi16.c",   
+	MAME_DIR .. "src/mess/drivers/multi8.c",
+	MAME_DIR .. "src/mess/drivers/multi16.c",
 }
 
 createMESSProjects(_target, _subtarget, "morrow")
-files {            
-	MAME_DIR .. "src/mess/drivers/microdec.c",  
-	MAME_DIR .. "src/mess/drivers/mpz80.c",     
-	MAME_DIR .. "src/mess/drivers/tricep.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/microdec.c",
+	MAME_DIR .. "src/mess/drivers/mpz80.c",
+	MAME_DIR .. "src/mess/drivers/tricep.c",
 }
 
 createMESSProjects(_target, _subtarget, "mos")
-files {               
-	MAME_DIR .. "src/mess/drivers/kim1.c",      
+files {
+	MAME_DIR .. "src/mess/drivers/kim1.c",
 }
 
 createMESSProjects(_target, _subtarget, "motorola")
-files {          
-	MAME_DIR .. "src/mess/drivers/m6805evs.c",  
-	MAME_DIR .. "src/mess/drivers/mekd2.c",     
+files {
+	MAME_DIR .. "src/mess/drivers/m6805evs.c",
+	MAME_DIR .. "src/mess/drivers/mekd2.c",
 }
 
 createMESSProjects(_target, _subtarget, "multitch")
-files {          
-	MAME_DIR .. "src/mess/drivers/mkit09.c",    
-	MAME_DIR .. "src/mess/drivers/mpf1.c",      
+files {
+	MAME_DIR .. "src/mess/drivers/mkit09.c",
+	MAME_DIR .. "src/mess/drivers/mpf1.c",
 }
 
 createMESSProjects(_target, _subtarget, "nakajima")
-files {          
-	MAME_DIR .. "src/mess/drivers/nakajies.c",  
+files {
+	MAME_DIR .. "src/mess/drivers/nakajies.c",
 }
 
 createMESSProjects(_target, _subtarget, "nascom")
-files {            
+files {
 	MAME_DIR .. "src/mess/drivers/nascom1.c",
 }
 
 createMESSProjects(_target, _subtarget, "ne")
-files {                
+files {
 	MAME_DIR .. "src/mess/drivers/z80ne.c",
-	MAME_DIR .. "src/mess/machine/z80ne.c", 
+	MAME_DIR .. "src/mess/machine/z80ne.c",
 }
 
 createMESSProjects(_target, _subtarget, "nec")
-files {               
-	MAME_DIR .. "src/mess/drivers/apc.c",       
+files {
+	MAME_DIR .. "src/mess/drivers/apc.c",
 	MAME_DIR .. "src/mess/drivers/pce.c",
 	MAME_DIR .. "src/mess/machine/pce.c",
-	MAME_DIR .. "src/mess/machine/pce_cd.c", 
-	MAME_DIR .. "src/mess/drivers/pcfx.c",      
-	MAME_DIR .. "src/mess/drivers/pc6001.c",    
+	MAME_DIR .. "src/mess/machine/pce_cd.c",
+	MAME_DIR .. "src/mess/drivers/pcfx.c",
+	MAME_DIR .. "src/mess/drivers/pc6001.c",
 	MAME_DIR .. "src/mess/drivers/pc8401a.c",
 	MAME_DIR .. "src/mess/video/pc8401a.c",
-	MAME_DIR .. "src/mess/drivers/pc8001.c", 
-	MAME_DIR .. "src/mess/drivers/pc8801.c",    
-	MAME_DIR .. "src/mess/drivers/pc88va.c",    
-	MAME_DIR .. "src/mess/drivers/pc100.c",     
+	MAME_DIR .. "src/mess/drivers/pc8001.c",
+	MAME_DIR .. "src/mess/drivers/pc8801.c",
+	MAME_DIR .. "src/mess/drivers/pc88va.c",
+	MAME_DIR .. "src/mess/drivers/pc100.c",
 	MAME_DIR .. "src/mess/drivers/pc9801.c",
 	MAME_DIR .. "src/mess/machine/pc9801_26.c",
 	MAME_DIR .. "src/mess/machine/pc9801_86.c",
 	MAME_DIR .. "src/mess/machine/pc9801_118.c",
 	MAME_DIR .. "src/mess/machine/pc9801_cbus.c",
-	MAME_DIR .. "src/mess/machine/pc9801_kbd.c", 
-	MAME_DIR .. "src/mess/drivers/tk80bs.c",    
-	MAME_DIR .. "src/mess/drivers/hh_ucom4.c",  
+	MAME_DIR .. "src/mess/machine/pc9801_kbd.c",
+	MAME_DIR .. "src/mess/drivers/tk80bs.c",
+	MAME_DIR .. "src/mess/drivers/hh_ucom4.c",
 }
 
 createMESSProjects(_target, _subtarget, "netronic")
-files {          
-	MAME_DIR .. "src/mess/drivers/elf.c",       
-	MAME_DIR .. "src/mess/drivers/exp85.c",     
+files {
+	MAME_DIR .. "src/mess/drivers/elf.c",
+	MAME_DIR .. "src/mess/drivers/exp85.c",
 }
 
 createMESSProjects(_target, _subtarget, "next")
-files {              
+files {
 	MAME_DIR .. "src/mess/drivers/next.c",
 	MAME_DIR .. "src/mess/machine/nextkbd.c",
-	MAME_DIR .. "src/mess/machine/nextmo.c", 
+	MAME_DIR .. "src/mess/machine/nextmo.c",
 }
 
 createMESSProjects(_target, _subtarget, "nintendo")
-files {          
+files {
 	MAME_DIR .. "src/mess/drivers/gb.c",
 	MAME_DIR .. "src/mess/audio/gb.c",
 	MAME_DIR .. "src/mess/machine/gb.c",
-	MAME_DIR .. "src/mess/video/gb_lcd.c", 
+	MAME_DIR .. "src/mess/video/gb_lcd.c",
 	MAME_DIR .. "src/mess/drivers/gba.c",
-	MAME_DIR .. "src/mess/video/gba.c", 
-	MAME_DIR .. "src/mess/drivers/n64.c",       
+	MAME_DIR .. "src/mess/video/gba.c",
+	MAME_DIR .. "src/mess/drivers/n64.c",
 	MAME_DIR .. "src/mess/drivers/nes.c",
 	MAME_DIR .. "src/mess/machine/nes.c",
-	MAME_DIR .. "src/mess/video/nes.c", 
-	MAME_DIR .. "src/mess/drivers/pokemini.c",  
+	MAME_DIR .. "src/mess/video/nes.c",
+	MAME_DIR .. "src/mess/drivers/pokemini.c",
 	MAME_DIR .. "src/mess/drivers/snes.c",
-	MAME_DIR .. "src/mess/machine/snescx4.c", 
+	MAME_DIR .. "src/mess/machine/snescx4.c",
 	MAME_DIR .. "src/mess/drivers/vboy.c",
-	MAME_DIR .. "src/mess/audio/vboy.c", 
+	MAME_DIR .. "src/mess/audio/vboy.c",
 }
 
 createMESSProjects(_target, _subtarget, "nokia")
-files {             
+files {
 	MAME_DIR .. "src/mess/drivers/mikromik.c",
 	MAME_DIR .. "src/mess/machine/mm1kb.c",
-	MAME_DIR .. "src/mess/video/mikromik.c", 
+	MAME_DIR .. "src/mess/video/mikromik.c",
 }
 
 createMESSProjects(_target, _subtarget, "northstar")
-files {         
-	MAME_DIR .. "src/mess/drivers/horizon.c",   
+files {
+	MAME_DIR .. "src/mess/drivers/horizon.c",
 }
 
 createMESSProjects(_target, _subtarget, "novag")
-files {             
-	MAME_DIR .. "src/mess/drivers/mk1.c",       
-	MAME_DIR .. "src/mess/drivers/mk2.c",       
+files {
+	MAME_DIR .. "src/mess/drivers/mk1.c",
+	MAME_DIR .. "src/mess/drivers/mk2.c",
 	MAME_DIR .. "src/mess/drivers/ssystem3.c",
-	MAME_DIR .. "src/mess/video/ssystem3.c", 
-	MAME_DIR .. "src/mess/drivers/supercon.c",  
+	MAME_DIR .. "src/mess/video/ssystem3.c",
+	MAME_DIR .. "src/mess/drivers/supercon.c",
 }
 
 createMESSProjects(_target, _subtarget, "olivetti")
-files {          
-	MAME_DIR .. "src/mess/drivers/m20.c",       
+files {
+	MAME_DIR .. "src/mess/drivers/m20.c",
 	MAME_DIR .. "src/mess/machine/m20_kbd.c",
 	MAME_DIR .. "src/mess/machine/m20_8086.c",
 	MAME_DIR .. "src/mess/drivers/m24.c",
@@ -1922,536 +1922,536 @@ files {
 }
 
 createMESSProjects(_target, _subtarget, "olympia")
-files {          
+files {
 	MAME_DIR .. "src/mess/drivers/peoplepc.c"
 }
 
 createMESSProjects(_target, _subtarget, "ns")
-files {         
-	MAME_DIR .. "src/mess/drivers/hh_cop400.c", 
+files {
+	MAME_DIR .. "src/mess/drivers/hh_cop400.c",
 }
 
 createMESSProjects(_target, _subtarget, "omnibyte")
-files {          
-	MAME_DIR .. "src/mess/drivers/msbc1.c",     
-	MAME_DIR .. "src/mess/drivers/ob68k1a.c",   
+files {
+	MAME_DIR .. "src/mess/drivers/msbc1.c",
+	MAME_DIR .. "src/mess/drivers/ob68k1a.c",
 }
 
 createMESSProjects(_target, _subtarget, "orion")
-files {             
+files {
 	MAME_DIR .. "src/mess/drivers/orion.c",
 	MAME_DIR .. "src/mess/machine/orion.c",
-	MAME_DIR .. "src/mess/video/orion.c", 
+	MAME_DIR .. "src/mess/video/orion.c",
 }
 
 createMESSProjects(_target, _subtarget, "osborne")
-files {           
+files {
 	MAME_DIR .. "src/mess/drivers/osborne1.c",
-	MAME_DIR .. "src/mess/machine/osborne1.c", 
-	MAME_DIR .. "src/mess/drivers/osbexec.c",   
-	MAME_DIR .. "src/mess/drivers/vixen.c",     
+	MAME_DIR .. "src/mess/machine/osborne1.c",
+	MAME_DIR .. "src/mess/drivers/osbexec.c",
+	MAME_DIR .. "src/mess/drivers/vixen.c",
 }
 
 createMESSProjects(_target, _subtarget, "osi")
-files {               
+files {
 	MAME_DIR .. "src/mess/drivers/osi.c",
-	MAME_DIR .. "src/mess/video/osi.c", 
+	MAME_DIR .. "src/mess/video/osi.c",
 }
 
 createMESSProjects(_target, _subtarget, "palm")
-files {              
-	MAME_DIR .. "src/mess/drivers/palm.c",      
-	MAME_DIR .. "src/mess/drivers/palmz22.c",   
+files {
+	MAME_DIR .. "src/mess/drivers/palm.c",
+	MAME_DIR .. "src/mess/drivers/palmz22.c",
 }
 
 createMESSProjects(_target, _subtarget, "parker")
-files {            
-	MAME_DIR .. "src/mess/drivers/wildfire.c",  
+files {
+	MAME_DIR .. "src/mess/drivers/wildfire.c",
 }
 
 createMESSProjects(_target, _subtarget, "pitronic")
-files {          
-	MAME_DIR .. "src/mess/drivers/beta.c",      
+files {
+	MAME_DIR .. "src/mess/drivers/beta.c",
 }
 
 createMESSProjects(_target, _subtarget, "pc")
-files {                
-	MAME_DIR .. "src/mess/drivers/asst128.c",   
-	MAME_DIR .. "src/mess/drivers/europc.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/asst128.c",
+	MAME_DIR .. "src/mess/drivers/europc.c",
 	MAME_DIR .. "src/mess/drivers/genpc.c",
-	MAME_DIR .. "src/mess/machine/genpc.c", 
-	MAME_DIR .. "src/mess/drivers/ibmpc.c",     
-	MAME_DIR .. "src/mess/drivers/ibmpcjr.c",   
-	MAME_DIR .. "src/mess/drivers/pc.c",        
+	MAME_DIR .. "src/mess/machine/genpc.c",
+	MAME_DIR .. "src/mess/drivers/ibmpc.c",
+	MAME_DIR .. "src/mess/drivers/ibmpcjr.c",
+	MAME_DIR .. "src/mess/drivers/pc.c",
 	MAME_DIR .. "src/mess/drivers/tandy1t.c",
-	MAME_DIR .. "src/mess/video/pc_t1t.c", 
+	MAME_DIR .. "src/mess/video/pc_t1t.c",
 }
 
 createMESSProjects(_target, _subtarget, "pdp1")
-files {              
+files {
 	MAME_DIR .. "src/mess/drivers/pdp1.c",
-	MAME_DIR .. "src/mess/video/pdp1.c", 
+	MAME_DIR .. "src/mess/video/pdp1.c",
 }
 
 createMESSProjects(_target, _subtarget, "pel")
-files {               
+files {
 	MAME_DIR .. "src/mess/drivers/galeb.c",
-	MAME_DIR .. "src/mess/video/galeb.c", 
+	MAME_DIR .. "src/mess/video/galeb.c",
 		MAME_DIR .. "src/mess/drivers/orao.c",
 	MAME_DIR .. "src/mess/machine/orao.c",
-	MAME_DIR .. "src/mess/video/orao.c", 
+	MAME_DIR .. "src/mess/video/orao.c",
 }
 
 createMESSProjects(_target, _subtarget, "philips")
-files {           
+files {
 	MAME_DIR .. "src/mess/drivers/p2000t.c",
 	MAME_DIR .. "src/mess/machine/p2000t.c",
-	MAME_DIR .. "src/mess/video/p2000m.c", 
-	MAME_DIR .. "src/mess/drivers/vg5k.c",      
+	MAME_DIR .. "src/mess/video/p2000m.c",
+	MAME_DIR .. "src/mess/drivers/vg5k.c",
 }
 
 createMESSProjects(_target, _subtarget, "poly88")
-files {            
+files {
 	MAME_DIR .. "src/mess/drivers/poly88.c",
 	MAME_DIR .. "src/mess/machine/poly88.c",
-	MAME_DIR .. "src/mess/video/poly88.c", 
+	MAME_DIR .. "src/mess/video/poly88.c",
 }
 
 createMESSProjects(_target, _subtarget, "psion")
-files {             
+files {
 	MAME_DIR .. "src/mess/drivers/psion.c",
-	MAME_DIR .. "src/mess/machine/psion_pack.c", 
+	MAME_DIR .. "src/mess/machine/psion_pack.c",
 }
 
 createMESSProjects(_target, _subtarget, "radio")
-files {             
-	MAME_DIR .. "src/mess/drivers/apogee.c",    
-	MAME_DIR .. "src/mess/drivers/mikrosha.c",  
+files {
+	MAME_DIR .. "src/mess/drivers/apogee.c",
+	MAME_DIR .. "src/mess/drivers/mikrosha.c",
 	MAME_DIR .. "src/mess/drivers/partner.c",
-	MAME_DIR .. "src/mess/machine/partner.c", 
+	MAME_DIR .. "src/mess/machine/partner.c",
 	MAME_DIR .. "src/mess/drivers/radio86.c",
-	MAME_DIR .. "src/mess/machine/radio86.c", 
+	MAME_DIR .. "src/mess/machine/radio86.c",
 }
 
 createMESSProjects(_target, _subtarget, "rca")
-files {               
-	MAME_DIR .. "src/mess/drivers/microkit.c",  
-	MAME_DIR .. "src/mess/drivers/studio2.c",   
-	MAME_DIR .. "src/mess/drivers/vip.c",       
+files {
+	MAME_DIR .. "src/mess/drivers/microkit.c",
+	MAME_DIR .. "src/mess/drivers/studio2.c",
+	MAME_DIR .. "src/mess/drivers/vip.c",
 }
 
 createMESSProjects(_target, _subtarget, "regnecentralen")
-files {                
+files {
 	MAME_DIR .. "src/mess/drivers/rc759.c",
 }
 
 createMESSProjects(_target, _subtarget, "ritam")
-files {                
+files {
 	MAME_DIR .. "src/mess/drivers/monty.c",
 }
 
 createMESSProjects(_target, _subtarget, "rm")
-files {                
+files {
 	MAME_DIR .. "src/mess/drivers/rm380z.c",
 	MAME_DIR .. "src/mess/machine/rm380z.c",
-	MAME_DIR .. "src/mess/video/rm380z.c", 
+	MAME_DIR .. "src/mess/video/rm380z.c",
 	MAME_DIR .. "src/mess/drivers/rmnimbus.c",
 	MAME_DIR .. "src/mess/machine/rmnimbus.c",
 	MAME_DIR .. "src/mess/video/rmnimbus.c",
-	MAME_DIR .. "src/mess/machine/rmnkbd.c", 
+	MAME_DIR .. "src/mess/machine/rmnkbd.c",
 }
 
 createMESSProjects(_target, _subtarget, "robotron")
-files {          
-	MAME_DIR .. "src/mess/drivers/a5105.c",     
-	MAME_DIR .. "src/mess/drivers/a51xx.c",     
-	MAME_DIR .. "src/mess/drivers/a7150.c",     
-	MAME_DIR .. "src/mess/drivers/k1003.c",     
-	MAME_DIR .. "src/mess/drivers/k8915.c",     
-	MAME_DIR .. "src/mess/drivers/rt1715.c",    
-	MAME_DIR .. "src/mess/drivers/z1013.c",     
-	MAME_DIR .. "src/mess/drivers/z9001.c",     
+files {
+	MAME_DIR .. "src/mess/drivers/a5105.c",
+	MAME_DIR .. "src/mess/drivers/a51xx.c",
+	MAME_DIR .. "src/mess/drivers/a7150.c",
+	MAME_DIR .. "src/mess/drivers/k1003.c",
+	MAME_DIR .. "src/mess/drivers/k8915.c",
+	MAME_DIR .. "src/mess/drivers/rt1715.c",
+	MAME_DIR .. "src/mess/drivers/z1013.c",
+	MAME_DIR .. "src/mess/drivers/z9001.c",
 }
 
 createMESSProjects(_target, _subtarget, "roland")
-files {            
-	MAME_DIR .. "src/mess/drivers/rmt32.c",     
-	MAME_DIR .. "src/mess/drivers/rd110.c",     
-	MAME_DIR .. "src/mess/drivers/rsc55.c",     
-	MAME_DIR .. "src/mess/drivers/tb303.c",     
+files {
+	MAME_DIR .. "src/mess/drivers/rmt32.c",
+	MAME_DIR .. "src/mess/drivers/rd110.c",
+	MAME_DIR .. "src/mess/drivers/rsc55.c",
+	MAME_DIR .. "src/mess/drivers/tb303.c",
 }
 
 createMESSProjects(_target, _subtarget, "rockwell")
-files {          
+files {
 	MAME_DIR .. "src/mess/drivers/aim65.c",
-	MAME_DIR .. "src/mess/machine/aim65.c", 
-	MAME_DIR .. "src/mess/drivers/aim65_40.c",  
+	MAME_DIR .. "src/mess/machine/aim65.c",
+	MAME_DIR .. "src/mess/drivers/aim65_40.c",
 }
 
 createMESSProjects(_target, _subtarget, "sage")
-files {              
-	MAME_DIR .. "src/mess/drivers/sage2.c",     
+files {
+	MAME_DIR .. "src/mess/drivers/sage2.c",
 }
 
 createMESSProjects(_target, _subtarget, "samcoupe")
-files {          
+files {
 	MAME_DIR .. "src/mess/drivers/samcoupe.c",
 	MAME_DIR .. "src/mess/machine/samcoupe.c",
-	MAME_DIR .. "src/mess/video/samcoupe.c", 
+	MAME_DIR .. "src/mess/video/samcoupe.c",
 }
 
 createMESSProjects(_target, _subtarget, "samsung")
-files {           
-	MAME_DIR .. "src/mess/drivers/spc1000.c",   
+files {
+	MAME_DIR .. "src/mess/drivers/spc1000.c",
 }
 
 createMESSProjects(_target, _subtarget, "sanyo")
-files {             
-	MAME_DIR .. "src/mess/drivers/mbc200.c",    
-	MAME_DIR .. "src/mess/drivers/mbc55x.c",    
-	MAME_DIR .. "src/mess/machine/mbc55x.c",    
-	MAME_DIR .. "src/mess/video/mbc55x.c",      
-	MAME_DIR .. "src/mess/drivers/phc25.c",     
+files {
+	MAME_DIR .. "src/mess/drivers/mbc200.c",
+	MAME_DIR .. "src/mess/drivers/mbc55x.c",
+	MAME_DIR .. "src/mess/machine/mbc55x.c",
+	MAME_DIR .. "src/mess/video/mbc55x.c",
+	MAME_DIR .. "src/mess/drivers/phc25.c",
 }
 
 createMESSProjects(_target, _subtarget, "sega")
-files {              
+files {
 	MAME_DIR .. "src/mess/drivers/dccons.c",
-	MAME_DIR .. "src/mess/machine/dccons.c", 
-	MAME_DIR .. "src/mess/drivers/megadriv.c",  
-	MAME_DIR .. "src/mess/drivers/saturn.c",    
-	MAME_DIR .. "src/mess/drivers/segapico.c",  
-	MAME_DIR .. "src/mess/drivers/segapm.c",  
-	MAME_DIR .. "src/mess/drivers/sg1000.c",    
+	MAME_DIR .. "src/mess/machine/dccons.c",
+	MAME_DIR .. "src/mess/drivers/megadriv.c",
+	MAME_DIR .. "src/mess/drivers/saturn.c",
+	MAME_DIR .. "src/mess/drivers/segapico.c",
+	MAME_DIR .. "src/mess/drivers/segapm.c",
+	MAME_DIR .. "src/mess/drivers/sg1000.c",
 	MAME_DIR .. "src/mess/drivers/sms.c",
-	MAME_DIR .. "src/mess/machine/sms.c", 
-	MAME_DIR .. "src/mess/drivers/svmu.c",      
-	MAME_DIR .. "src/mess/machine/mega32x.c",   
-	MAME_DIR .. "src/mess/machine/megacd.c",    
-	MAME_DIR .. "src/mess/machine/megacdcd.c",  
+	MAME_DIR .. "src/mess/machine/sms.c",
+	MAME_DIR .. "src/mess/drivers/svmu.c",
+	MAME_DIR .. "src/mess/machine/mega32x.c",
+	MAME_DIR .. "src/mess/machine/megacd.c",
+	MAME_DIR .. "src/mess/machine/megacdcd.c",
 }
 
 createMESSProjects(_target, _subtarget, "sgi")
-files {               
-	MAME_DIR .. "src/mess/machine/sgi.c",       
-	MAME_DIR .. "src/mess/drivers/sgi_ip2.c",   
-	MAME_DIR .. "src/mess/drivers/sgi_ip6.c",   
-	MAME_DIR .. "src/mess/drivers/ip20.c",      
-	MAME_DIR .. "src/mess/drivers/ip22.c",      
-	MAME_DIR .. "src/mess/video/newport.c",     
+files {
+	MAME_DIR .. "src/mess/machine/sgi.c",
+	MAME_DIR .. "src/mess/drivers/sgi_ip2.c",
+	MAME_DIR .. "src/mess/drivers/sgi_ip6.c",
+	MAME_DIR .. "src/mess/drivers/ip20.c",
+	MAME_DIR .. "src/mess/drivers/ip22.c",
+	MAME_DIR .. "src/mess/video/newport.c",
 }
 
 createMESSProjects(_target, _subtarget, "sharp")
-files {             
+files {
 	MAME_DIR .. "src/mess/drivers/hh_sm510.c",
-	MAME_DIR .. "src/mess/video/mz700.c",       
-	MAME_DIR .. "src/mess/drivers/mz700.c",     
-	MAME_DIR .. "src/mess/drivers/pc1500.c",    
-	MAME_DIR .. "src/mess/drivers/pocketc.c",   
-	MAME_DIR .. "src/mess/video/pc1401.c",      
-	MAME_DIR .. "src/mess/machine/pc1401.c",    
-	MAME_DIR .. "src/mess/video/pc1403.c",      
-	MAME_DIR .. "src/mess/machine/pc1403.c",    
-	MAME_DIR .. "src/mess/video/pc1350.c",      
-	MAME_DIR .. "src/mess/machine/pc1350.c",    
-	MAME_DIR .. "src/mess/video/pc1251.c",      
-	MAME_DIR .. "src/mess/machine/pc1251.c",    
-	MAME_DIR .. "src/mess/video/pocketc.c",     
-	MAME_DIR .. "src/mess/machine/mz700.c",     
-	MAME_DIR .. "src/mess/drivers/x68k.c",      
-	MAME_DIR .. "src/mess/video/x68k.c",        
-	MAME_DIR .. "src/mess/machine/x68k_hdc.c",  
-	MAME_DIR .. "src/mess/machine/x68k_kbd.c",  
-	MAME_DIR .. "src/mess/drivers/mz80.c",      
-	MAME_DIR .. "src/mess/video/mz80.c",        
-	MAME_DIR .. "src/mess/machine/mz80.c",      
-	MAME_DIR .. "src/mess/drivers/mz2000.c",    
-	MAME_DIR .. "src/mess/drivers/x1.c",        
-	MAME_DIR .. "src/mess/machine/x1.c",        
-	MAME_DIR .. "src/mess/drivers/x1twin.c",    
-	MAME_DIR .. "src/mess/drivers/mz2500.c",    
-	MAME_DIR .. "src/mess/drivers/mz3500.c",    
-	MAME_DIR .. "src/mess/drivers/pce220.c",    
+	MAME_DIR .. "src/mess/video/mz700.c",
+	MAME_DIR .. "src/mess/drivers/mz700.c",
+	MAME_DIR .. "src/mess/drivers/pc1500.c",
+	MAME_DIR .. "src/mess/drivers/pocketc.c",
+	MAME_DIR .. "src/mess/video/pc1401.c",
+	MAME_DIR .. "src/mess/machine/pc1401.c",
+	MAME_DIR .. "src/mess/video/pc1403.c",
+	MAME_DIR .. "src/mess/machine/pc1403.c",
+	MAME_DIR .. "src/mess/video/pc1350.c",
+	MAME_DIR .. "src/mess/machine/pc1350.c",
+	MAME_DIR .. "src/mess/video/pc1251.c",
+	MAME_DIR .. "src/mess/machine/pc1251.c",
+	MAME_DIR .. "src/mess/video/pocketc.c",
+	MAME_DIR .. "src/mess/machine/mz700.c",
+	MAME_DIR .. "src/mess/drivers/x68k.c",
+	MAME_DIR .. "src/mess/video/x68k.c",
+	MAME_DIR .. "src/mess/machine/x68k_hdc.c",
+	MAME_DIR .. "src/mess/machine/x68k_kbd.c",
+	MAME_DIR .. "src/mess/drivers/mz80.c",
+	MAME_DIR .. "src/mess/video/mz80.c",
+	MAME_DIR .. "src/mess/machine/mz80.c",
+	MAME_DIR .. "src/mess/drivers/mz2000.c",
+	MAME_DIR .. "src/mess/drivers/x1.c",
+	MAME_DIR .. "src/mess/machine/x1.c",
+	MAME_DIR .. "src/mess/drivers/x1twin.c",
+	MAME_DIR .. "src/mess/drivers/mz2500.c",
+	MAME_DIR .. "src/mess/drivers/mz3500.c",
+	MAME_DIR .. "src/mess/drivers/pce220.c",
 	MAME_DIR .. "src/mess/machine/pce220_ser.c",
-	MAME_DIR .. "src/mess/drivers/mz6500.c",    
-	MAME_DIR .. "src/mess/drivers/zaurus.c",    
+	MAME_DIR .. "src/mess/drivers/mz6500.c",
+	MAME_DIR .. "src/mess/drivers/zaurus.c",
 }
 
 createMESSProjects(_target, _subtarget, "sinclair")
-files {          
-	MAME_DIR .. "src/mess/video/spectrum.c",    
-	MAME_DIR .. "src/mess/video/timex.c",       
-	MAME_DIR .. "src/mess/video/zx.c",          
-	MAME_DIR .. "src/mess/drivers/zx.c",        
-	MAME_DIR .. "src/mess/machine/zx.c",        
-	MAME_DIR .. "src/mess/drivers/spectrum.c",  
-	MAME_DIR .. "src/mess/drivers/spec128.c",   
-	MAME_DIR .. "src/mess/drivers/timex.c",     
-	MAME_DIR .. "src/mess/drivers/specpls3.c",  
-	MAME_DIR .. "src/mess/drivers/scorpion.c",  
-	MAME_DIR .. "src/mess/drivers/atm.c",       
-	MAME_DIR .. "src/mess/drivers/pentagon.c",  
-	MAME_DIR .. "src/mess/machine/beta.c",      
-	MAME_DIR .. "src/mess/machine/spec_snqk.c", 
-	MAME_DIR .. "src/mess/drivers/ql.c",        
-	MAME_DIR .. "src/mess/machine/qimi.c",      
-	MAME_DIR .. "src/mess/video/zx8301.c",      
-	MAME_DIR .. "src/mess/machine/zx8302.c",    
+files {
+	MAME_DIR .. "src/mess/video/spectrum.c",
+	MAME_DIR .. "src/mess/video/timex.c",
+	MAME_DIR .. "src/mess/video/zx.c",
+	MAME_DIR .. "src/mess/drivers/zx.c",
+	MAME_DIR .. "src/mess/machine/zx.c",
+	MAME_DIR .. "src/mess/drivers/spectrum.c",
+	MAME_DIR .. "src/mess/drivers/spec128.c",
+	MAME_DIR .. "src/mess/drivers/timex.c",
+	MAME_DIR .. "src/mess/drivers/specpls3.c",
+	MAME_DIR .. "src/mess/drivers/scorpion.c",
+	MAME_DIR .. "src/mess/drivers/atm.c",
+	MAME_DIR .. "src/mess/drivers/pentagon.c",
+	MAME_DIR .. "src/mess/machine/beta.c",
+	MAME_DIR .. "src/mess/machine/spec_snqk.c",
+	MAME_DIR .. "src/mess/drivers/ql.c",
+	MAME_DIR .. "src/mess/machine/qimi.c",
+	MAME_DIR .. "src/mess/video/zx8301.c",
+	MAME_DIR .. "src/mess/machine/zx8302.c",
 }
 
 createMESSProjects(_target, _subtarget, "siemens")
-files {           
-	MAME_DIR .. "src/mess/drivers/pcd.c",       
-	MAME_DIR .. "src/mess/machine/pcd_kbd.c",   
+files {
+	MAME_DIR .. "src/mess/drivers/pcd.c",
+	MAME_DIR .. "src/mess/machine/pcd_kbd.c",
 }
 
 createMESSProjects(_target, _subtarget, "slicer")
-files {            
-	MAME_DIR .. "src/mess/drivers/slicer.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/slicer.c",
 }
 
 createMESSProjects(_target, _subtarget, "snk")
-files {               
-	MAME_DIR .. "src/mess/drivers/ng_aes.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/ng_aes.c",
 	MAME_DIR .. "src/mess/drivers/ngp.c",
-	MAME_DIR .. "src/mess/video/k1ge.c", 
+	MAME_DIR .. "src/mess/video/k1ge.c",
 }
 
 createMESSProjects(_target, _subtarget, "sony")
-files {              
+files {
 	MAME_DIR .. "src/mess/drivers/pockstat.c",
 	MAME_DIR .. "src/mess/drivers/psx.c",
-	MAME_DIR .. "src/mess/machine/psxcd.c", 
-	MAME_DIR .. "src/mess/drivers/pve500.c",    
-	MAME_DIR .. "src/mess/drivers/smc777.c",    
+	MAME_DIR .. "src/mess/machine/psxcd.c",
+	MAME_DIR .. "src/mess/drivers/pve500.c",
+	MAME_DIR .. "src/mess/drivers/smc777.c",
 }
 
 createMESSProjects(_target, _subtarget, "sord")
-files {              
-	MAME_DIR .. "src/mess/drivers/m5.c",        
+files {
+	MAME_DIR .. "src/mess/drivers/m5.c",
 }
 
 createMESSProjects(_target, _subtarget, "special")
-files {           
+files {
 	MAME_DIR .. "src/mess/drivers/special.c",
 	MAME_DIR .. "src/mess/audio/specimx_snd.c",
 	MAME_DIR .. "src/mess/machine/special.c",
-	MAME_DIR .. "src/mess/video/special.c", 
+	MAME_DIR .. "src/mess/video/special.c",
 }
 
 createMESSProjects(_target, _subtarget, "sun")
-files {               
-	MAME_DIR .. "src/mess/drivers/sun1.c",      
-	MAME_DIR .. "src/mess/drivers/sun2.c",      
-	MAME_DIR .. "src/mess/drivers/sun3.c",      
-	MAME_DIR .. "src/mess/drivers/sun4.c",      
+files {
+	MAME_DIR .. "src/mess/drivers/sun1.c",
+	MAME_DIR .. "src/mess/drivers/sun2.c",
+	MAME_DIR .. "src/mess/drivers/sun3.c",
+	MAME_DIR .. "src/mess/drivers/sun4.c",
 }
 
 createMESSProjects(_target, _subtarget, "svi")
-files {               
+files {
 	MAME_DIR .. "src/mess/drivers/svi318.c",
-	MAME_DIR .. "src/mess/machine/svi318.c", 
+	MAME_DIR .. "src/mess/machine/svi318.c",
 }
 
 createMESSProjects(_target, _subtarget, "svision")
-files {           
+files {
 	MAME_DIR .. "src/mess/drivers/svision.c",
-	MAME_DIR .. "src/mess/audio/svis_snd.c", 
+	MAME_DIR .. "src/mess/audio/svis_snd.c",
 }
 
 createMESSProjects(_target, _subtarget, "swtpc09")
-files {           
+files {
 	MAME_DIR .. "src/mess/drivers/swtpc09.c",
-	MAME_DIR .. "src/mess/machine/swtpc09.c", 
+	MAME_DIR .. "src/mess/machine/swtpc09.c",
 }
 
 createMESSProjects(_target, _subtarget, "synertec")
-files {          
-	MAME_DIR .. "src/mess/drivers/sym1.c",      
+files {
+	MAME_DIR .. "src/mess/drivers/sym1.c",
 }
 
 createMESSProjects(_target, _subtarget, "ta")
-files {                
-	MAME_DIR .. "src/mess/drivers/alphatro.c",  
+files {
+	MAME_DIR .. "src/mess/drivers/alphatro.c",
 }
 
 createMESSProjects(_target, _subtarget, "tandberg")
-files {          
-	MAME_DIR .. "src/mess/drivers/tdv2324.c",   
+files {
+	MAME_DIR .. "src/mess/drivers/tdv2324.c",
 }
 
 createMESSProjects(_target, _subtarget, "tangerin")
-files {          
+files {
 	MAME_DIR .. "src/mess/drivers/microtan.c",
 	MAME_DIR .. "src/mess/machine/microtan.c",
-	MAME_DIR .. "src/mess/video/microtan.c", 
+	MAME_DIR .. "src/mess/video/microtan.c",
 	MAME_DIR .. "src/mess/drivers/oric.c",
 }
 
 createMESSProjects(_target, _subtarget, "tatung")
-files {            
+files {
 	MAME_DIR .. "src/mess/drivers/einstein.c",
-	MAME_DIR .. "src/mess/machine/einstein.c", 
+	MAME_DIR .. "src/mess/machine/einstein.c",
 }
 
 createMESSProjects(_target, _subtarget, "teamconc")
-files {          
+files {
 	MAME_DIR .. "src/mess/drivers/comquest.c",
-	MAME_DIR .. "src/mess/video/comquest.c", 
+	MAME_DIR .. "src/mess/video/comquest.c",
 }
 
 createMESSProjects(_target, _subtarget, "tektroni")
-files {          
-	MAME_DIR .. "src/mess/drivers/tek405x.c",   
-	MAME_DIR .. "src/mess/drivers/tek410x.c",   
+files {
+	MAME_DIR .. "src/mess/drivers/tek405x.c",
+	MAME_DIR .. "src/mess/drivers/tek410x.c",
 }
 
 createMESSProjects(_target, _subtarget, "telenova")
-files {          
+files {
 	MAME_DIR .. "src/mess/drivers/compis.c",
-	MAME_DIR .. "src/mess/machine/compiskb.c", 
+	MAME_DIR .. "src/mess/machine/compiskb.c",
 }
 
 createMESSProjects(_target, _subtarget, "telercas")
-files {          
+files {
 	MAME_DIR .. "src/mess/drivers/tmc1800.c",
-	MAME_DIR .. "src/mess/video/tmc1800.c", 
+	MAME_DIR .. "src/mess/video/tmc1800.c",
 	MAME_DIR .. "src/mess/drivers/tmc600.c",
-	MAME_DIR .. "src/mess/video/tmc600.c", 
-	MAME_DIR .. "src/mess/drivers/tmc2000e.c",  
+	MAME_DIR .. "src/mess/video/tmc600.c",
+	MAME_DIR .. "src/mess/drivers/tmc2000e.c",
 }
 
 createMESSProjects(_target, _subtarget, "televideo")
-files {         
-	MAME_DIR .. "src/mess/drivers/ts802.c",     
-	MAME_DIR .. "src/mess/drivers/ts803.c",     
-	MAME_DIR .. "src/mess/drivers/ts816.c",     
-	MAME_DIR .. "src/mess/drivers/tv950.c",     
+files {
+	MAME_DIR .. "src/mess/drivers/ts802.c",
+	MAME_DIR .. "src/mess/drivers/ts803.c",
+	MAME_DIR .. "src/mess/drivers/ts816.c",
+	MAME_DIR .. "src/mess/drivers/tv950.c",
 }
 
 createMESSProjects(_target, _subtarget, "tem")
-files {               
-	MAME_DIR .. "src/mess/drivers/tec1.c",      
+files {
+	MAME_DIR .. "src/mess/drivers/tec1.c",
 }
 
 createMESSProjects(_target, _subtarget, "tesla")
-files {             
+files {
 	MAME_DIR .. "src/mess/drivers/ondra.c",
 	MAME_DIR .. "src/mess/machine/ondra.c",
-	MAME_DIR .. "src/mess/video/ondra.c", 
+	MAME_DIR .. "src/mess/video/ondra.c",
 	MAME_DIR .. "src/mess/drivers/pmd85.c",
 	MAME_DIR .. "src/mess/machine/pmd85.c",
-	MAME_DIR .. "src/mess/drivers/pmi80.c",     
-	MAME_DIR .. "src/mess/drivers/sapi1.c",     
+	MAME_DIR .. "src/mess/drivers/pmi80.c",
+	MAME_DIR .. "src/mess/drivers/sapi1.c",
 }
 
 createMESSProjects(_target, _subtarget, "test")
-files {              
-	MAME_DIR .. "src/mess/drivers/test_t400.c", 
-	MAME_DIR .. "src/mess/drivers/zexall.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/test_t400.c",
+	MAME_DIR .. "src/mess/drivers/zexall.c",
 }
 
 createMESSProjects(_target, _subtarget, "thomson")
-files {           
+files {
 	MAME_DIR .. "src/mess/drivers/thomson.c",
 	MAME_DIR .. "src/mess/machine/thomson.c",
 	MAME_DIR .. "src/mess/machine/thomflop.c",
-	MAME_DIR .. "src/mess/video/thomson.c", 
+	MAME_DIR .. "src/mess/video/thomson.c",
 }
 
 createMESSProjects(_target, _subtarget, "ti")
-files {                
+files {
 	MAME_DIR .. "src/mess/drivers/avigo.c",
-	MAME_DIR .. "src/mess/video/avigo.c", 
-	MAME_DIR .. "src/mess/drivers/cc40.c",      
-	MAME_DIR .. "src/mess/drivers/evmbug.c",    
-	MAME_DIR .. "src/mess/drivers/exelv.c",     
-	MAME_DIR .. "src/mess/drivers/geneve.c",    
-	MAME_DIR .. "src/mess/drivers/ticalc1x.c",  
-	MAME_DIR .. "src/mess/drivers/tispeak.c",   
-	MAME_DIR .. "src/mess/drivers/ti74.c",      
+	MAME_DIR .. "src/mess/video/avigo.c",
+	MAME_DIR .. "src/mess/drivers/cc40.c",
+	MAME_DIR .. "src/mess/drivers/evmbug.c",
+	MAME_DIR .. "src/mess/drivers/exelv.c",
+	MAME_DIR .. "src/mess/drivers/geneve.c",
+	MAME_DIR .. "src/mess/drivers/ticalc1x.c",
+	MAME_DIR .. "src/mess/drivers/tispeak.c",
+	MAME_DIR .. "src/mess/drivers/ti74.c",
 	MAME_DIR .. "src/mess/drivers/ti85.c",
 	MAME_DIR .. "src/mess/machine/ti85.c",
-	MAME_DIR .. "src/mess/video/ti85.c", 
-	MAME_DIR .. "src/mess/drivers/ti89.c",      
-	MAME_DIR .. "src/mess/drivers/ti99_2.c",    
-	MAME_DIR .. "src/mess/drivers/ti99_4x.c",   
-	MAME_DIR .. "src/mess/drivers/ti99_4p.c",   
-	MAME_DIR .. "src/mess/drivers/ti99_8.c",    
-	MAME_DIR .. "src/mess/drivers/ti990_4.c",   
-	MAME_DIR .. "src/mess/drivers/ti990_10.c",  
-	MAME_DIR .. "src/mess/drivers/tm990189.c",  
-	MAME_DIR .. "src/mess/video/733_asr.c",     
-	MAME_DIR .. "src/mess/video/911_vdt.c",     
-	MAME_DIR .. "src/mess/drivers/hh_tms1k.c",  
+	MAME_DIR .. "src/mess/video/ti85.c",
+	MAME_DIR .. "src/mess/drivers/ti89.c",
+	MAME_DIR .. "src/mess/drivers/ti99_2.c",
+	MAME_DIR .. "src/mess/drivers/ti99_4x.c",
+	MAME_DIR .. "src/mess/drivers/ti99_4p.c",
+	MAME_DIR .. "src/mess/drivers/ti99_8.c",
+	MAME_DIR .. "src/mess/drivers/ti990_4.c",
+	MAME_DIR .. "src/mess/drivers/ti990_10.c",
+	MAME_DIR .. "src/mess/drivers/tm990189.c",
+	MAME_DIR .. "src/mess/video/733_asr.c",
+	MAME_DIR .. "src/mess/video/911_vdt.c",
+	MAME_DIR .. "src/mess/drivers/hh_tms1k.c",
 }
 
 createMESSProjects(_target, _subtarget, "tiger")
-files {             
+files {
 	MAME_DIR .. "src/mess/drivers/gamecom.c",
 	MAME_DIR .. "src/mess/machine/gamecom.c",
-	MAME_DIR .. "src/mess/video/gamecom.c", 
+	MAME_DIR .. "src/mess/video/gamecom.c",
 }
 
 createMESSProjects(_target, _subtarget, "tigertel")
-files {          
+files {
 	MAME_DIR .. "src/mess/drivers/gizmondo.c",
-	MAME_DIR .. "src/mess/machine/docg3.c", 
+	MAME_DIR .. "src/mess/machine/docg3.c",
 }
 
 createMESSProjects(_target, _subtarget, "tiki")
-files {              
-	MAME_DIR .. "src/mess/drivers/tiki100.c",   
+files {
+	MAME_DIR .. "src/mess/drivers/tiki100.c",
 }
 
 createMESSProjects(_target, _subtarget, "tomy")
-files {              
-	MAME_DIR .. "src/mess/drivers/tutor.c",     
+files {
+	MAME_DIR .. "src/mess/drivers/tutor.c",
 }
 
 createMESSProjects(_target, _subtarget, "toshiba")
-files {           
-	MAME_DIR .. "src/mess/drivers/pasopia.c",   
-	MAME_DIR .. "src/mess/drivers/pasopia7.c",  
-	MAME_DIR .. "src/mess/drivers/paso1600.c",  
+files {
+	MAME_DIR .. "src/mess/drivers/pasopia.c",
+	MAME_DIR .. "src/mess/drivers/pasopia7.c",
+	MAME_DIR .. "src/mess/drivers/paso1600.c",
 }
 
 createMESSProjects(_target, _subtarget, "trainer")
-files {           
-	MAME_DIR .. "src/mess/drivers/amico2k.c",   
-	MAME_DIR .. "src/mess/drivers/babbage.c",   
-	MAME_DIR .. "src/mess/drivers/bob85.c",     
-	MAME_DIR .. "src/mess/drivers/cvicny.c",    
-	MAME_DIR .. "src/mess/drivers/dolphunk.c",  
-	MAME_DIR .. "src/mess/drivers/instruct.c",  
-	MAME_DIR .. "src/mess/drivers/mk14.c",      
-	MAME_DIR .. "src/mess/drivers/pro80.c",     
-	MAME_DIR .. "src/mess/drivers/savia84.c",   
-	MAME_DIR .. "src/mess/drivers/selz80.c",    
-	MAME_DIR .. "src/mess/drivers/tk80.c",      
+files {
+	MAME_DIR .. "src/mess/drivers/amico2k.c",
+	MAME_DIR .. "src/mess/drivers/babbage.c",
+	MAME_DIR .. "src/mess/drivers/bob85.c",
+	MAME_DIR .. "src/mess/drivers/cvicny.c",
+	MAME_DIR .. "src/mess/drivers/dolphunk.c",
+	MAME_DIR .. "src/mess/drivers/instruct.c",
+	MAME_DIR .. "src/mess/drivers/mk14.c",
+	MAME_DIR .. "src/mess/drivers/pro80.c",
+	MAME_DIR .. "src/mess/drivers/savia84.c",
+	MAME_DIR .. "src/mess/drivers/selz80.c",
+	MAME_DIR .. "src/mess/drivers/tk80.c",
 }
 
 createMESSProjects(_target, _subtarget, "trs")
-files {               
-	MAME_DIR .. "src/mess/drivers/coco12.c",    
-	MAME_DIR .. "src/mess/drivers/coco3.c",     
-	MAME_DIR .. "src/mess/drivers/dragon.c",    
-	MAME_DIR .. "src/mess/drivers/mc10.c",      
-	MAME_DIR .. "src/mess/machine/6883sam.c",   
-	MAME_DIR .. "src/mess/machine/coco.c",      
-	MAME_DIR .. "src/mess/machine/coco12.c",    
-	MAME_DIR .. "src/mess/machine/coco3.c",     
-	MAME_DIR .. "src/mess/machine/coco_vhd.c",  
-	MAME_DIR .. "src/mess/machine/dragon.c",    
-	MAME_DIR .. "src/mess/machine/dgnalpha.c",  
-	MAME_DIR .. "src/mess/video/gime.c",        
+files {
+	MAME_DIR .. "src/mess/drivers/coco12.c",
+	MAME_DIR .. "src/mess/drivers/coco3.c",
+	MAME_DIR .. "src/mess/drivers/dragon.c",
+	MAME_DIR .. "src/mess/drivers/mc10.c",
+	MAME_DIR .. "src/mess/machine/6883sam.c",
+	MAME_DIR .. "src/mess/machine/coco.c",
+	MAME_DIR .. "src/mess/machine/coco12.c",
+	MAME_DIR .. "src/mess/machine/coco3.c",
+	MAME_DIR .. "src/mess/machine/coco_vhd.c",
+	MAME_DIR .. "src/mess/machine/dragon.c",
+	MAME_DIR .. "src/mess/machine/dgnalpha.c",
+	MAME_DIR .. "src/mess/video/gime.c",
 	MAME_DIR .. "src/mess/drivers/trs80.c",
 	MAME_DIR .. "src/mess/machine/trs80.c",
-	MAME_DIR .. "src/mess/video/trs80.c", 
+	MAME_DIR .. "src/mess/video/trs80.c",
 	MAME_DIR .. "src/mess/drivers/trs80m2.c",
-	MAME_DIR .. "src/mess/machine/trs80m2kb.c", 
+	MAME_DIR .. "src/mess/machine/trs80m2kb.c",
 	MAME_DIR .. "src/mess/drivers/tandy2k.c",
-	MAME_DIR .. "src/mess/machine/tandy2kb.c", 
+	MAME_DIR .. "src/mess/machine/tandy2kb.c",
 }
 
 createMESSProjects(_target, _subtarget, "ultimachine")
@@ -2460,108 +2460,108 @@ files {
 }
 
 createMESSProjects(_target, _subtarget, "ultratec")
-files {          
-	MAME_DIR .. "src/mess/drivers/minicom.c",   
+files {
+	MAME_DIR .. "src/mess/drivers/minicom.c",
 }
 
 createMESSProjects(_target, _subtarget, "unisys")
-files {            
-	MAME_DIR .. "src/mess/drivers/univac.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/univac.c",
 }
 
 createMESSProjects(_target, _subtarget, "veb")
-files {               
-	MAME_DIR .. "src/mess/drivers/chessmst.c",  
+files {
+	MAME_DIR .. "src/mess/drivers/chessmst.c",
 	MAME_DIR .. "src/mess/drivers/kc.c",
 	MAME_DIR .. "src/mess/machine/kc.c",
 	MAME_DIR .. "src/mess/machine/kc_keyb.c",
-	MAME_DIR .. "src/mess/video/kc.c", 
-	MAME_DIR .. "src/mess/drivers/lc80.c",      
+	MAME_DIR .. "src/mess/video/kc.c",
+	MAME_DIR .. "src/mess/drivers/lc80.c",
 	MAME_DIR .. "src/mess/drivers/mc80.c",
 	MAME_DIR .. "src/mess/machine/mc80.c",
-	MAME_DIR .. "src/mess/video/mc80.c", 
-	MAME_DIR .. "src/mess/drivers/poly880.c",   
-	MAME_DIR .. "src/mess/drivers/sc1.c",       
-	MAME_DIR .. "src/mess/drivers/sc2.c",       
+	MAME_DIR .. "src/mess/video/mc80.c",
+	MAME_DIR .. "src/mess/drivers/poly880.c",
+	MAME_DIR .. "src/mess/drivers/sc1.c",
+	MAME_DIR .. "src/mess/drivers/sc2.c",
 }
 
 createMESSProjects(_target, _subtarget, "vidbrain")
-files {          
+files {
 	MAME_DIR .. "src/mess/drivers/vidbrain.c",
-	MAME_DIR .. "src/mess/video/uv201.c", 
+	MAME_DIR .. "src/mess/video/uv201.c",
 }
 
 createMESSProjects(_target, _subtarget, "videoton")
-files {          
+files {
 	MAME_DIR .. "src/mess/drivers/tvc.c",
-	MAME_DIR .. "src/mess/audio/tvc_snd.c", 
+	MAME_DIR .. "src/mess/audio/tvc_snd.c",
 }
 
 createMESSProjects(_target, _subtarget, "visual")
-files {            
+files {
 	MAME_DIR .. "src/mess/drivers/v1050.c",
 	MAME_DIR .. "src/mess/machine/v1050kb.c",
-	MAME_DIR .. "src/mess/video/v1050.c", 
+	MAME_DIR .. "src/mess/video/v1050.c",
 }
 
 createMESSProjects(_target, _subtarget, "votrax")
-files {            
-	MAME_DIR .. "src/mess/drivers/votrpss.c",   
-	MAME_DIR .. "src/mess/drivers/votrtnt.c",   
+files {
+	MAME_DIR .. "src/mess/drivers/votrpss.c",
+	MAME_DIR .. "src/mess/drivers/votrtnt.c",
 }
 
 createMESSProjects(_target, _subtarget, "vtech")
-files {             
-	MAME_DIR .. "src/mess/drivers/crvision.c",  
-	MAME_DIR .. "src/mess/drivers/geniusiq.c",  
-	MAME_DIR .. "src/mess/drivers/laser3k.c",   
-	MAME_DIR .. "src/mess/drivers/lcmate2.c",   
+files {
+	MAME_DIR .. "src/mess/drivers/crvision.c",
+	MAME_DIR .. "src/mess/drivers/geniusiq.c",
+	MAME_DIR .. "src/mess/drivers/laser3k.c",
+	MAME_DIR .. "src/mess/drivers/lcmate2.c",
 	MAME_DIR .. "src/mess/drivers/pc4.c",
-	MAME_DIR .. "src/mess/video/pc4.c", 
-	MAME_DIR .. "src/mess/drivers/pc2000.c",    
-	MAME_DIR .. "src/mess/drivers/pitagjr.c",   
-	MAME_DIR .. "src/mess/drivers/prestige.c",  
-	MAME_DIR .. "src/mess/drivers/vtech1.c",    
+	MAME_DIR .. "src/mess/video/pc4.c",
+	MAME_DIR .. "src/mess/drivers/pc2000.c",
+	MAME_DIR .. "src/mess/drivers/pitagjr.c",
+	MAME_DIR .. "src/mess/drivers/prestige.c",
+	MAME_DIR .. "src/mess/drivers/vtech1.c",
 	MAME_DIR .. "src/mess/drivers/vtech2.c",
 	MAME_DIR .. "src/mess/machine/vtech2.c",
-	MAME_DIR .. "src/mess/video/vtech2.c", 
+	MAME_DIR .. "src/mess/video/vtech2.c",
 	MAME_DIR .. "src/mess/drivers/socrates.c",
-	MAME_DIR .. "src/mess/audio/socrates.c", 
+	MAME_DIR .. "src/mess/audio/socrates.c",
 }
 
 createMESSProjects(_target, _subtarget, "wang")
-files {              
+files {
 	MAME_DIR .. "src/mess/drivers/wangpc.c",
-	MAME_DIR .. "src/mess/machine/wangpckb.c", 
+	MAME_DIR .. "src/mess/machine/wangpckb.c",
 }
 
 createMESSProjects(_target, _subtarget, "wavemate")
-files {          
-	MAME_DIR .. "src/mess/drivers/bullet.c",    
-	MAME_DIR .. "src/mess/drivers/jupiter.c",   
+files {
+	MAME_DIR .. "src/mess/drivers/bullet.c",
+	MAME_DIR .. "src/mess/drivers/jupiter.c",
 }
 
 createMESSProjects(_target, _subtarget, "xerox")
-files {             
+files {
 	MAME_DIR .. "src/mess/drivers/xerox820.c",
-	MAME_DIR .. "src/mess/machine/x820kb.c", 
-	MAME_DIR .. "src/mess/drivers/bigbord2.c",  
-	MAME_DIR .. "src/mess/drivers/alto2.c",     
+	MAME_DIR .. "src/mess/machine/x820kb.c",
+	MAME_DIR .. "src/mess/drivers/bigbord2.c",
+	MAME_DIR .. "src/mess/drivers/alto2.c",
 }
 
 createMESSProjects(_target, _subtarget, "xussrpc")
-files {           
-	MAME_DIR .. "src/mess/drivers/ec184x.c",    
-	MAME_DIR .. "src/mess/drivers/iskr103x.c",  
-	MAME_DIR .. "src/mess/drivers/mc1502.c",    
+files {
+	MAME_DIR .. "src/mess/drivers/ec184x.c",
+	MAME_DIR .. "src/mess/drivers/iskr103x.c",
+	MAME_DIR .. "src/mess/drivers/mc1502.c",
 	MAME_DIR .. "src/mess/drivers/poisk1.c",
-	MAME_DIR .. "src/mess/video/poisk1.c", 
+	MAME_DIR .. "src/mess/video/poisk1.c",
 }
 
 createMESSProjects(_target, _subtarget, "yamaha")
-files {            
-	MAME_DIR .. "src/mess/drivers/ymmu100.c",   
-	MAME_DIR .. "src/mess/drivers/fb01.c",      
+files {
+	MAME_DIR .. "src/mess/drivers/ymmu100.c",
+	MAME_DIR .. "src/mess/drivers/fb01.c",
 }
 dependency {
 	{ MAME_DIR .. "src/mess/drivers/ymmu100.c",    GEN_DIR .. "mess/drivers/ymmu100.inc" },
@@ -2571,153 +2571,153 @@ custombuildtask {
 }
 
 createMESSProjects(_target, _subtarget, "zenith")
-files {            
-	MAME_DIR .. "src/mess/drivers/z100.c",      
+files {
+	MAME_DIR .. "src/mess/drivers/z100.c",
 }
 
 createMESSProjects(_target, _subtarget, "zpa")
-files {               
-	MAME_DIR .. "src/mess/drivers/iq151.c",     
+files {
+	MAME_DIR .. "src/mess/drivers/iq151.c",
 }
 
 createMESSProjects(_target, _subtarget, "zvt")
-files {               
+files {
 	MAME_DIR .. "src/mess/drivers/pp01.c",
 	MAME_DIR .. "src/mess/machine/pp01.c",
-	MAME_DIR .. "src/mess/video/pp01.c", 
+	MAME_DIR .. "src/mess/video/pp01.c",
 }
 
 createMESSProjects(_target, _subtarget, "skeleton")
-files {          
-	MAME_DIR .. "src/mess/drivers/alphasma.c",  
-	MAME_DIR .. "src/mess/drivers/ampro.c",     
-	MAME_DIR .. "src/mess/drivers/amust.c",     
-	MAME_DIR .. "src/mess/drivers/applix.c",    
-	MAME_DIR .. "src/mess/drivers/attache.c",   
+files {
+	MAME_DIR .. "src/mess/drivers/alphasma.c",
+	MAME_DIR .. "src/mess/drivers/ampro.c",
+	MAME_DIR .. "src/mess/drivers/amust.c",
+	MAME_DIR .. "src/mess/drivers/applix.c",
+	MAME_DIR .. "src/mess/drivers/attache.c",
 	MAME_DIR .. "src/mess/drivers/aussiebyte.c",
 	MAME_DIR .. "src/mess/video/aussiebyte.c",
-	MAME_DIR .. "src/mess/drivers/ax20.c",      
-	MAME_DIR .. "src/mess/drivers/beehive.c",   
-	MAME_DIR .. "src/mess/drivers/binbug.c",    
-	MAME_DIR .. "src/mess/drivers/besta.c",     
-	MAME_DIR .. "src/mess/drivers/bitgraph.c",  
-	MAME_DIR .. "src/mess/drivers/br8641.c",    
+	MAME_DIR .. "src/mess/drivers/ax20.c",
+	MAME_DIR .. "src/mess/drivers/beehive.c",
+	MAME_DIR .. "src/mess/drivers/binbug.c",
+	MAME_DIR .. "src/mess/drivers/besta.c",
+	MAME_DIR .. "src/mess/drivers/bitgraph.c",
+	MAME_DIR .. "src/mess/drivers/br8641.c",
 	MAME_DIR .. "src/mess/drivers/busicom.c",
-	MAME_DIR .. "src/mess/video/busicom.c", 
-	MAME_DIR .. "src/mess/drivers/chaos.c",     
-	MAME_DIR .. "src/mess/drivers/chesstrv.c",  
-	MAME_DIR .. "src/mess/drivers/cd2650.c",    
-	MAME_DIR .. "src/mess/drivers/cdc721.c",    
-	MAME_DIR .. "src/mess/drivers/codata.c",    
-	MAME_DIR .. "src/mess/drivers/cortex.c",    
-	MAME_DIR .. "src/mess/drivers/cosmicos.c",  
-	MAME_DIR .. "src/mess/drivers/cp1.c",       
-	MAME_DIR .. "src/mess/drivers/cxhumax.c",   
-	MAME_DIR .. "src/mess/drivers/czk80.c",     
-	MAME_DIR .. "src/mess/drivers/d6800.c",     
+	MAME_DIR .. "src/mess/video/busicom.c",
+	MAME_DIR .. "src/mess/drivers/chaos.c",
+	MAME_DIR .. "src/mess/drivers/chesstrv.c",
+	MAME_DIR .. "src/mess/drivers/cd2650.c",
+	MAME_DIR .. "src/mess/drivers/cdc721.c",
+	MAME_DIR .. "src/mess/drivers/codata.c",
+	MAME_DIR .. "src/mess/drivers/cortex.c",
+	MAME_DIR .. "src/mess/drivers/cosmicos.c",
+	MAME_DIR .. "src/mess/drivers/cp1.c",
+	MAME_DIR .. "src/mess/drivers/cxhumax.c",
+	MAME_DIR .. "src/mess/drivers/czk80.c",
+	MAME_DIR .. "src/mess/drivers/d6800.c",
 	MAME_DIR .. "src/mess/drivers/d6809.c",
-	MAME_DIR .. "src/mess/drivers/daruma.c",     
-	MAME_DIR .. "src/mess/drivers/digel804.c",  
-	MAME_DIR .. "src/mess/drivers/dim68k.c",    
-	MAME_DIR .. "src/mess/drivers/dm7000.c",    
+	MAME_DIR .. "src/mess/drivers/daruma.c",
+	MAME_DIR .. "src/mess/drivers/digel804.c",
+	MAME_DIR .. "src/mess/drivers/dim68k.c",
+	MAME_DIR .. "src/mess/drivers/dm7000.c",
 	MAME_DIR .. "src/mess/drivers/dmv.c",
-	MAME_DIR .. "src/mess/machine/dmv_keyb.c", 
-	MAME_DIR .. "src/mess/drivers/dps1.c",      
-	MAME_DIR .. "src/mess/drivers/dsb46.c",     
-	MAME_DIR .. "src/mess/drivers/dual68.c",    
-	MAME_DIR .. "src/mess/drivers/eacc.c",      
-	MAME_DIR .. "src/mess/drivers/elwro800.c",  
-	MAME_DIR .. "src/mess/drivers/eti660.c",    
-	MAME_DIR .. "src/mess/drivers/excali64.c",  
-	MAME_DIR .. "src/mess/drivers/fanucs15.c",  
-	MAME_DIR .. "src/mess/drivers/fanucspmg.c", 
-	MAME_DIR .. "src/mess/drivers/fc100.c",     
-	MAME_DIR .. "src/mess/drivers/fk1.c",       
-	MAME_DIR .. "src/mess/drivers/ft68m.c",     
+	MAME_DIR .. "src/mess/machine/dmv_keyb.c",
+	MAME_DIR .. "src/mess/drivers/dps1.c",
+	MAME_DIR .. "src/mess/drivers/dsb46.c",
+	MAME_DIR .. "src/mess/drivers/dual68.c",
+	MAME_DIR .. "src/mess/drivers/eacc.c",
+	MAME_DIR .. "src/mess/drivers/elwro800.c",
+	MAME_DIR .. "src/mess/drivers/eti660.c",
+	MAME_DIR .. "src/mess/drivers/excali64.c",
+	MAME_DIR .. "src/mess/drivers/fanucs15.c",
+	MAME_DIR .. "src/mess/drivers/fanucspmg.c",
+	MAME_DIR .. "src/mess/drivers/fc100.c",
+	MAME_DIR .. "src/mess/drivers/fk1.c",
+	MAME_DIR .. "src/mess/drivers/ft68m.c",
 	MAME_DIR .. "src/mess/drivers/gamate.c",
-	MAME_DIR .. "src/mess/audio/gamate.c", 
-	MAME_DIR .. "src/mess/drivers/gameking.c",  
-	MAME_DIR .. "src/mess/drivers/gimix.c",     
-	MAME_DIR .. "src/mess/drivers/grfd2301.c",  
-	MAME_DIR .. "src/mess/drivers/harriet.c",   
-	MAME_DIR .. "src/mess/drivers/hprot1.c",    
-	MAME_DIR .. "src/mess/drivers/hpz80unk.c",  
-	MAME_DIR .. "src/mess/drivers/ht68k.c",     
-	MAME_DIR .. "src/mess/drivers/hunter2.c", 
-	MAME_DIR .. "src/emu/machine/nsc810.c", 
-	MAME_DIR .. "src/emu/machine/nsc810.h", 
+	MAME_DIR .. "src/mess/audio/gamate.c",
+	MAME_DIR .. "src/mess/drivers/gameking.c",
+	MAME_DIR .. "src/mess/drivers/gimix.c",
+	MAME_DIR .. "src/mess/drivers/grfd2301.c",
+	MAME_DIR .. "src/mess/drivers/harriet.c",
+	MAME_DIR .. "src/mess/drivers/hprot1.c",
+	MAME_DIR .. "src/mess/drivers/hpz80unk.c",
+	MAME_DIR .. "src/mess/drivers/ht68k.c",
+	MAME_DIR .. "src/mess/drivers/hunter2.c",
+	MAME_DIR .. "src/emu/machine/nsc810.c",
+	MAME_DIR .. "src/emu/machine/nsc810.h",
 	MAME_DIR .. "src/mess/drivers/i7000.c",
-	MAME_DIR .. "src/mess/drivers/ibm6580.c",   
+	MAME_DIR .. "src/mess/drivers/ibm6580.c",
 	MAME_DIR .. "src/mess/drivers/icatel.c",
 	MAME_DIR .. "src/mess/drivers/ie15.c",
-	MAME_DIR .. "src/mess/machine/ie15_kbd.c", 
-	MAME_DIR .. "src/mess/drivers/if800.c",     
-	MAME_DIR .. "src/mess/drivers/imsai.c",     
-	MAME_DIR .. "src/mess/drivers/indiana.c",   
-	MAME_DIR .. "src/mess/drivers/itt3030.c",   
-	MAME_DIR .. "src/mess/drivers/jade.c",      
-	MAME_DIR .. "src/mess/drivers/jonos.c",     
-	MAME_DIR .. "src/mess/drivers/konin.c",     
-	MAME_DIR .. "src/mess/drivers/leapster.c",  
-	MAME_DIR .. "src/mess/drivers/lft.c",       
-	MAME_DIR .. "src/mess/drivers/lola8a.c",    
-	MAME_DIR .. "src/mess/drivers/m79152pc.c",  
-	MAME_DIR .. "src/mess/drivers/mccpm.c",     
-	MAME_DIR .. "src/mess/drivers/mes.c",       
-	MAME_DIR .. "src/mess/drivers/mice.c",      
-	MAME_DIR .. "src/mess/drivers/micronic.c",  
-	MAME_DIR .. "src/mess/drivers/mini2440.c",  
-	MAME_DIR .. "src/mess/drivers/mmd1.c",      
-	MAME_DIR .. "src/mess/drivers/mod8.c",      
-	MAME_DIR .. "src/mess/drivers/modellot.c",  
-	MAME_DIR .. "src/mess/drivers/molecular.c", 
-	MAME_DIR .. "src/mess/drivers/ms0515.c",    
-	MAME_DIR .. "src/mess/drivers/ms9540.c",    
-	MAME_DIR .. "src/mess/drivers/mstation.c",  
-	MAME_DIR .. "src/mess/drivers/mx2178.c",    
-	MAME_DIR .. "src/mess/drivers/mycom.c",     
-	MAME_DIR .. "src/mess/drivers/myvision.c",  
+	MAME_DIR .. "src/mess/machine/ie15_kbd.c",
+	MAME_DIR .. "src/mess/drivers/if800.c",
+	MAME_DIR .. "src/mess/drivers/imsai.c",
+	MAME_DIR .. "src/mess/drivers/indiana.c",
+	MAME_DIR .. "src/mess/drivers/itt3030.c",
+	MAME_DIR .. "src/mess/drivers/jade.c",
+	MAME_DIR .. "src/mess/drivers/jonos.c",
+	MAME_DIR .. "src/mess/drivers/konin.c",
+	MAME_DIR .. "src/mess/drivers/leapster.c",
+	MAME_DIR .. "src/mess/drivers/lft.c",
+	MAME_DIR .. "src/mess/drivers/lola8a.c",
+	MAME_DIR .. "src/mess/drivers/m79152pc.c",
+	MAME_DIR .. "src/mess/drivers/mccpm.c",
+	MAME_DIR .. "src/mess/drivers/mes.c",
+	MAME_DIR .. "src/mess/drivers/mice.c",
+	MAME_DIR .. "src/mess/drivers/micronic.c",
+	MAME_DIR .. "src/mess/drivers/mini2440.c",
+	MAME_DIR .. "src/mess/drivers/mmd1.c",
+	MAME_DIR .. "src/mess/drivers/mod8.c",
+	MAME_DIR .. "src/mess/drivers/modellot.c",
+	MAME_DIR .. "src/mess/drivers/molecular.c",
+	MAME_DIR .. "src/mess/drivers/ms0515.c",
+	MAME_DIR .. "src/mess/drivers/ms9540.c",
+	MAME_DIR .. "src/mess/drivers/mstation.c",
+	MAME_DIR .. "src/mess/drivers/mx2178.c",
+	MAME_DIR .. "src/mess/drivers/mycom.c",
+	MAME_DIR .. "src/mess/drivers/myvision.c",
 	MAME_DIR .. "src/mess/drivers/ngen.c",
-	MAME_DIR .. "src/mess/machine/ngen_kb.c", 
-	MAME_DIR .. "src/mess/drivers/octopus.c",   
-	MAME_DIR .. "src/mess/drivers/onyx.c",      
-	MAME_DIR .. "src/mess/drivers/okean240.c",  
-	MAME_DIR .. "src/mess/drivers/p8k.c",       
-	MAME_DIR .. "src/mess/drivers/pegasus.c",   
-	MAME_DIR .. "src/mess/drivers/pencil2.c",   
-	MAME_DIR .. "src/mess/drivers/pes.c",       
-	MAME_DIR .. "src/mess/drivers/pipbug.c",    
-	MAME_DIR .. "src/mess/drivers/plan80.c",    
-	MAME_DIR .. "src/mess/drivers/pm68k.c",     
-	MAME_DIR .. "src/mess/drivers/poly.c",      
-	MAME_DIR .. "src/mess/drivers/pt68k4.c",    
-	MAME_DIR .. "src/mess/drivers/ptcsol.c",    
-	MAME_DIR .. "src/mess/drivers/pulsar.c",    
-	MAME_DIR .. "src/mess/drivers/pv9234.c",    
-	MAME_DIR .. "src/mess/drivers/qtsbc.c",     
-	MAME_DIR .. "src/mess/drivers/rvoice.c",    
-	MAME_DIR .. "src/mess/drivers/sacstate.c",  
-	MAME_DIR .. "src/mess/drivers/sbrain.c",    
-	MAME_DIR .. "src/mess/drivers/seattle.c",   
-	MAME_DIR .. "src/mess/drivers/sh4robot.c",  
-	MAME_DIR .. "src/mess/drivers/softbox.c",   
-	MAME_DIR .. "src/mess/drivers/swtpc.c",     
-	MAME_DIR .. "src/mess/drivers/sys2900.c",   
-	MAME_DIR .. "src/mess/drivers/systec.c",    
-	MAME_DIR .. "src/mess/drivers/tavernie.c",  
-	MAME_DIR .. "src/mess/drivers/tecnbras.c",  
-	MAME_DIR .. "src/mess/drivers/terak.c",     
-	MAME_DIR .. "src/mess/drivers/ti630.c",     
-	MAME_DIR .. "src/mess/drivers/tsispch.c",   
+	MAME_DIR .. "src/mess/machine/ngen_kb.c",
+	MAME_DIR .. "src/mess/drivers/octopus.c",
+	MAME_DIR .. "src/mess/drivers/onyx.c",
+	MAME_DIR .. "src/mess/drivers/okean240.c",
+	MAME_DIR .. "src/mess/drivers/p8k.c",
+	MAME_DIR .. "src/mess/drivers/pegasus.c",
+	MAME_DIR .. "src/mess/drivers/pencil2.c",
+	MAME_DIR .. "src/mess/drivers/pes.c",
+	MAME_DIR .. "src/mess/drivers/pipbug.c",
+	MAME_DIR .. "src/mess/drivers/plan80.c",
+	MAME_DIR .. "src/mess/drivers/pm68k.c",
+	MAME_DIR .. "src/mess/drivers/poly.c",
+	MAME_DIR .. "src/mess/drivers/pt68k4.c",
+	MAME_DIR .. "src/mess/drivers/ptcsol.c",
+	MAME_DIR .. "src/mess/drivers/pulsar.c",
+	MAME_DIR .. "src/mess/drivers/pv9234.c",
+	MAME_DIR .. "src/mess/drivers/qtsbc.c",
+	MAME_DIR .. "src/mess/drivers/rvoice.c",
+	MAME_DIR .. "src/mess/drivers/sacstate.c",
+	MAME_DIR .. "src/mess/drivers/sbrain.c",
+	MAME_DIR .. "src/mess/drivers/seattle.c",
+	MAME_DIR .. "src/mess/drivers/sh4robot.c",
+	MAME_DIR .. "src/mess/drivers/softbox.c",
+	MAME_DIR .. "src/mess/drivers/swtpc.c",
+	MAME_DIR .. "src/mess/drivers/sys2900.c",
+	MAME_DIR .. "src/mess/drivers/systec.c",
+	MAME_DIR .. "src/mess/drivers/tavernie.c",
+	MAME_DIR .. "src/mess/drivers/tecnbras.c",
+	MAME_DIR .. "src/mess/drivers/terak.c",
+	MAME_DIR .. "src/mess/drivers/ti630.c",
+	MAME_DIR .. "src/mess/drivers/tsispch.c",
 	MAME_DIR .. "src/mess/drivers/tvgame.c",
-	MAME_DIR .. "src/mess/drivers/unistar.c",   
-	MAME_DIR .. "src/mess/drivers/v6809.c",     
-	MAME_DIR .. "src/mess/drivers/vector4.c",   
-	MAME_DIR .. "src/mess/drivers/vii.c",       
-	MAME_DIR .. "src/mess/drivers/wicat.c",     
-	MAME_DIR .. "src/mess/drivers/xor100.c",    
-	MAME_DIR .. "src/mess/drivers/xavix.c",     
-	MAME_DIR .. "src/mess/drivers/zorba.c",     
+	MAME_DIR .. "src/mess/drivers/unistar.c",
+	MAME_DIR .. "src/mess/drivers/v6809.c",
+	MAME_DIR .. "src/mess/drivers/vector4.c",
+	MAME_DIR .. "src/mess/drivers/vii.c",
+	MAME_DIR .. "src/mess/drivers/wicat.c",
+	MAME_DIR .. "src/mess/drivers/xor100.c",
+	MAME_DIR .. "src/mess/drivers/xavix.c",
+	MAME_DIR .. "src/mess/drivers/zorba.c",
 }
 
 end
diff --git a/src/emu/bus/ti99_peb/hsgpl.c b/src/emu/bus/ti99_peb/hsgpl.c
index 7a7f09d5311..8cfe1c9ede7 100644
--- a/src/emu/bus/ti99_peb/hsgpl.c
+++ b/src/emu/bus/ti99_peb/hsgpl.c
@@ -476,7 +476,7 @@ void snug_high_speed_gpl_device::cartspace_write(address_space& space, offs_t of
 			{
 				logerror("%s: invalid write %04x <- %02x\n", tag(), offset, data);
 			// feeprom is normally written to using GPL ports, and I don't know
-			// writing through >6000 page is enabled
+			// whether writing through >6000 page is enabled
 /*
             at29c040a_w(feeprom_rom6, 1 + 2*offset + 0x2000*hsgpl.cur_bank + 0x8000*port, data);
             at29c040a_w(feeprom_rom6, 2*offset + 0x2000*hsgpl.cur_bank + 0x8000*port, data >> 8);
@@ -640,10 +640,10 @@ void snug_high_speed_gpl_device::device_reset()
 
 void snug_high_speed_gpl_device::device_config_complete(void)
 {
-	m_dsr_eeprom = subdevice<at29040a_device>(DSR_EEPROM);
-	m_rom6_eeprom = subdevice<at29040a_device>(ROM6_EEPROM);
-	m_grom_a_eeprom = subdevice<at29040a_device>(GROM_A_EEPROM);
-	m_grom_b_eeprom = subdevice<at29040a_device>(GROM_B_EEPROM);
+	m_dsr_eeprom = subdevice<at29c040a_device>(DSR_EEPROM);
+	m_rom6_eeprom = subdevice<at29c040a_device>(ROM6_EEPROM);
+	m_grom_a_eeprom = subdevice<at29c040a_device>(GROM_A_EEPROM);
+	m_grom_b_eeprom = subdevice<at29c040a_device>(GROM_B_EEPROM);
 }
 
 void snug_high_speed_gpl_device::device_stop()
@@ -661,10 +661,10 @@ INPUT_PORTS_START( ti99_hsgpl)
 INPUT_PORTS_END
 
 MACHINE_CONFIG_FRAGMENT( ti99_hsgpl )
-	MCFG_AT29040A_ADD( DSR_EEPROM )
-	MCFG_AT29040A_ADD( GROM_B_EEPROM )
-	MCFG_AT29040A_ADD( GROM_A_EEPROM )
-	MCFG_AT29040A_ADD( ROM6_EEPROM )
+	MCFG_AT29C040A_ADD( DSR_EEPROM )
+	MCFG_AT29C040A_ADD( GROM_B_EEPROM )
+	MCFG_AT29C040A_ADD( GROM_A_EEPROM )
+	MCFG_AT29C040A_ADD( ROM6_EEPROM )
 MACHINE_CONFIG_END
 
 machine_config_constructor snug_high_speed_gpl_device::device_mconfig_additions() const
diff --git a/src/emu/bus/ti99_peb/hsgpl.h b/src/emu/bus/ti99_peb/hsgpl.h
index a662b69c8e2..bb87cc77a38 100644
--- a/src/emu/bus/ti99_peb/hsgpl.h
+++ b/src/emu/bus/ti99_peb/hsgpl.h
@@ -18,7 +18,7 @@
 
 #include "emu.h"
 #include "peribox.h"
-#include "machine/at29040a.h"
+#include "machine/at29x.h"
 
 extern const device_type TI99_HSGPL;
 
@@ -42,10 +42,10 @@ protected:
 	virtual machine_config_constructor device_mconfig_additions() const;
 
 private:
-	at29040a_device* m_dsr_eeprom;
-	at29040a_device* m_rom6_eeprom;
-	at29040a_device* m_grom_a_eeprom;
-	at29040a_device* m_grom_b_eeprom;
+	at29c040a_device* m_dsr_eeprom;
+	at29c040a_device* m_rom6_eeprom;
+	at29c040a_device* m_grom_a_eeprom;
+	at29c040a_device* m_grom_b_eeprom;
 
 	UINT8*          m_ram6_memory;
 	UINT8*          m_gram_memory;
diff --git a/src/emu/machine/at29040a.c b/src/emu/machine/at29040a.c
deleted file mode 100644
index 3285b265792..00000000000
--- a/src/emu/machine/at29040a.c
+++ /dev/null
@@ -1,446 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Raphael Nabet, Michael Zapf
-/*
-    Atmel at29c040a flash EEPROM
-
-    512k*8 FEEPROM, organized in pages of 256 bytes.
-
-    References:
-    Datasheets were found on Atmel's site (www.atmel.com)
-
-    Raphael Nabet 2003
-
-    September 2010: Rewritten as device
-    February 2012: Rewritten as class
-*/
-
-#include "at29040a.h"
-
-#define VERBOSE 2
-#define LOG logerror
-
-#define FEEPROM_SIZE        0x80000
-#define SECTOR_SIZE         0x00100
-#define BOOT_BLOCK_SIZE     0x04000
-
-#define ADDRESS_MASK        0x7ffff
-#define SECTOR_ADDRESS_MASK 0x7ff00
-#define BYTE_ADDRESS_MASK   0x000ff
-
-#define PRG_TIMER 1
-
-#define VERSION 0
-
-/*
-    Constructor.
-*/
-at29040a_device::at29040a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: device_t(mconfig, AT29040A, "ATMEL 29040A 512K*8 FEEPROM", tag, owner, clock, "at29040a", __FILE__),
-	device_nvram_interface(mconfig, *this)
-{
-}
-
-//-------------------------------------------------
-//  nvram_default - called to initialize NVRAM to
-//  its default state
-//-------------------------------------------------
-
-void at29040a_device::nvram_default()
-{
-	memset(m_eememory, 0, FEEPROM_SIZE+2);
-}
-
-//-------------------------------------------------
-//  nvram_read - called to read NVRAM from the
-//  .nv file
-//-------------------------------------------------
-
-void at29040a_device::nvram_read(emu_file &file)
-{
-	file.read(m_eememory, FEEPROM_SIZE+2);
-}
-
-//-------------------------------------------------
-//  nvram_write - called to write NVRAM to the
-//  .nv file
-//-------------------------------------------------
-
-void at29040a_device::nvram_write(emu_file &file)
-{
-	m_eememory[0] = VERSION;
-	file.write(m_eememory, FEEPROM_SIZE+2);
-}
-
-/*
-    programming timer callback
-*/
-void at29040a_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
-{
-	switch (m_pgm)
-	{
-	case PGM_1:
-		/* programming cycle timeout */
-		if (VERBOSE>7) LOG("at29040a: Programming cycle timeout\n");
-		m_pgm = PGM_0;
-		break;
-
-	case PGM_2:
-		/* programming cycle start */
-		if (VERBOSE>7) LOG("at29040a: Sector write start\n");
-		m_pgm = PGM_3;
-		/* max delay 10ms, typical delay 5 to 7 ms */
-		m_programming_timer->adjust(attotime::from_msec(5));
-		break;
-
-	case PGM_3:
-		/* programming cycle end */
-		memcpy(m_eememory + 2 + (m_programming_last_offset & ~0xff), m_programming_buffer, SECTOR_SIZE);
-		if (VERBOSE>7) LOG("at29040a: Sector write completed at location %04x + 2\n", (m_programming_last_offset & ~0xff));
-		if (m_enabling_sdb)
-		{
-			m_sdp = true;
-		}
-		if (m_disabling_sdb)
-		{
-			m_sdp = false;
-		}
-		if (VERBOSE>7) LOG("at29040a: Software data protection = %d\n", m_sdp);
-
-		m_pgm = PGM_0;
-		m_enabling_sdb = false;
-		m_disabling_sdb = false;
-
-		break;
-
-	default:
-		if (VERBOSE>1) LOG("internal error in %s %d\n", __FILE__, __LINE__);
-		break;
-	}
-}
-
-void at29040a_device::sync_flags()
-{
-	if (m_lower_bbl) m_eememory[1] |= 0x04;
-	else m_eememory[1] &= ~0x04;
-
-	if (m_higher_bbl) m_eememory[1] |= 0x02;
-	else m_eememory[1] &= ~0x02;
-
-	if (m_sdp) m_eememory[1] |= 0x01;
-	else m_eememory[1] &= ~0x01;
-}
-
-/*
-    read a byte from FEEPROM
-*/
-READ8_MEMBER( at29040a_device::read )
-{
-	int reply;
-
-	offset &= ADDRESS_MASK;
-
-	/* reading in the midst of any command sequence cancels it (right???) */
-	m_cmd = CMD_0;
-	m_long_sequence = false;
-	// m_higher_bbl = true;         // who says that?
-
-	sync_flags();
-
-	/* reading before the start of a programming cycle cancels it (right???) */
-	if (m_pgm == PGM_1)
-	{
-		// attempt to access a locked out boot block: cancel programming
-		// command if necessary
-		m_pgm = PGM_0;
-		m_enabling_sdb = false;
-		m_disabling_sdb = false;
-		m_programming_timer->adjust(attotime::never);
-	}
-
-	if (m_id_mode)
-	{
-		switch (offset)
-		{
-		case 0x00000:
-			reply = 0x1f;       // Manufacturer code
-			break;
-
-		case 0x00001:
-			reply = 0xa4;       // Device code
-			break;
-
-		case 0x00002:
-			reply = m_lower_bbl? 0xff : 0xfe;
-			break;
-
-		case 0x7fff2:
-			reply = m_higher_bbl? 0xff : 0xfe;
-			break;
-
-		default:
-			reply = 0;
-			break;
-		}
-	}
-	else if ((m_pgm == PGM_2) || (m_pgm == PGM_3))
-	{
-		if (m_pgm == PGM_2)
-		{   // DATA* polling starts the programming cycle (right???)
-			m_pgm = PGM_3;
-			/* max delay 10ms, typical delay 5 to 7 ms */
-			m_programming_timer->adjust(attotime::from_msec(5));
-		}
-
-		reply = m_toggle_bit? 0x02 : 0x00;
-		m_toggle_bit = !m_toggle_bit;
-
-		if ((offset == m_programming_last_offset) && (! (m_programming_buffer[m_programming_last_offset & 0xff] & 0x01)))
-			reply |= 0x01;
-	}
-	else
-		reply = m_eememory[offset+2];
-
-	if (VERBOSE>7) LOG("at29040a: %05x -> %02x\n", offset, reply);
-
-	return reply;
-}
-
-/*
-    Write a byte to FEEPROM
-*/
-WRITE8_MEMBER( at29040a_device::write )
-{
-	offset &= ADDRESS_MASK;
-	if (VERBOSE>7) LOG("at29040a: %05x <- %02x\n", offset, data);
-
-	/* The special CFI commands assume a smaller address space according */
-	/* to the specification ("address format A14-A0") */
-	offs_t cfi_offset = offset & 0x7fff;
-
-	if (m_enabling_bbl)
-	{
-		if (VERBOSE>7) LOG("at29040a: Enabling boot block lockout\n");
-		m_enabling_bbl = false;
-
-		if ((offset == 0x00000) && (data == 0x00))
-		{
-			if (VERBOSE>7) LOG("at29040a: Enabling lower boot block lockout\n");
-			m_lower_bbl = true;
-			sync_flags();
-			return;
-		}
-		else
-		{
-			if ((offset == 0x7ffff) && (data == 0xff))
-			{
-				if (VERBOSE>7) LOG("at29040a: Enabling higher boot block lockout\n");
-				m_higher_bbl = true;
-				sync_flags();
-				return;
-			}
-			else
-			{
-				if (VERBOSE>1) LOG("at29040a: Invalid boot block specification: %05x/%02x\n", offset, data);
-			}
-		}
-	}
-
-	switch (m_cmd)
-	{
-	case CMD_0:
-		if ((cfi_offset == 0x5555) && (data == 0xaa))
-		{
-			if (VERBOSE>7) LOG("at29040a: Command sequence started\n");
-			m_cmd = CMD_1;
-		}
-		else
-		{
-			m_cmd = CMD_0;
-			m_long_sequence = false;
-		}
-		break;
-
-	case CMD_1:
-		if ((cfi_offset == 0x2aaa) && (data == 0x55))
-		{
-			m_cmd = CMD_2;
-		}
-		else
-		{
-			m_cmd = CMD_0;
-			m_long_sequence = false;
-			if (VERBOSE>7) LOG("at29040a: Command sequence aborted\n");
-		}
-		break;
-
-	case CMD_2:
-		if (cfi_offset == 0x5555)
-		{
-			if (!m_long_sequence)
-				if (VERBOSE>7) LOG("at29040a: Command sequence completed\n");
-
-			m_pgm = PGM_0;
-			m_enabling_sdb = false;
-			m_disabling_sdb = false;
-			m_programming_timer->adjust(attotime::never);
-
-			/* process command */
-			switch (data)
-			{
-			case 0x10:
-				/*  Software chip erase */
-				if (m_long_sequence)
-				{
-					if (m_lower_bbl || m_higher_bbl)
-					{
-						if (VERBOSE>1) LOG("at29040a: Chip erase sequence deactivated due to previous boot block lockout.\n");
-					}
-					else
-					{
-						if (VERBOSE>7) LOG("at29040a: Erase chip\n");
-						memset(m_eememory+2, 0xff, FEEPROM_SIZE);
-					}
-				}
-				break;
-
-			case 0x20:
-				/* Software data protection disable */
-				if (VERBOSE>7) LOG("at29040a: Software data protection disable\n");
-				// The complete sequence is aa-55-80-aa-55-20
-				// so we need a 80 before, else the sequence is invalid
-				if (m_long_sequence)
-				{
-					m_pgm = PGM_1;
-					m_disabling_sdb = true;
-					/* set command timeout (right???) */
-					//m_programming_timer->adjust(attotime::from_usec(150), id, 0.);
-				}
-				break;
-
-			case 0x40:
-				/* Boot block lockout enable */
-				// Complete sequence is aa-55-80-aa-55-40
-				if (VERBOSE>7) LOG("at29040a: Boot block lockout enable\n");
-				if (m_long_sequence) m_enabling_bbl = true;
-				break;
-
-			case 0x80:
-				m_long_sequence = true;
-				break;
-
-			case 0x90:
-				/* Software product identification entry */
-				if (VERBOSE>7) LOG("at29040a: Identification mode (start)\n");
-				m_id_mode = true;
-				break;
-
-			case 0xa0:
-				/* Software data protection enable */
-				if (VERBOSE>7) LOG("at29040a: Software data protection enable\n");
-				m_pgm = PGM_1;
-				m_enabling_sdb = true;
-				/* set command timeout (right???) */
-				//m_programming_timer->adjust(attotime::from_usec(150), id, 0.);
-				break;
-
-			case 0xf0:
-				/* Software product identification exit */
-				if (VERBOSE>7) LOG("at29040a: Identification mode (end)\n");
-				m_id_mode = false;
-				break;
-			}
-			m_cmd = CMD_0;
-			if (data != 0x80) m_long_sequence = false;
-
-			/* return, because we don't want to write the EEPROM with the command byte */
-			return;
-		}
-		else
-		{
-			m_cmd = CMD_0;
-			m_long_sequence = false;
-		}
-	}
-	if ((m_pgm == PGM_2)
-			&& ((offset & ~0xff) != (m_programming_last_offset & ~0xff)))
-	{
-		/* cancel current programming cycle */
-		if (VERBOSE>7) LOG("at29040a: invalid sector change (from %05x to %05x); cancel programming cycle\n",(offset & ~0xff), (m_programming_last_offset & ~0xff));
-		m_pgm = PGM_0;
-		m_enabling_sdb = false;
-		m_disabling_sdb = false;
-		m_programming_timer->adjust(attotime::never);
-	}
-
-	if (((m_pgm == PGM_0) && !m_sdp)  // write directly
-		|| (m_pgm == PGM_1))          // write after unlocking
-	{
-		if (((offset < BOOT_BLOCK_SIZE) && m_lower_bbl)
-			|| ((offset >= FEEPROM_SIZE-BOOT_BLOCK_SIZE) && m_higher_bbl))
-		{
-			// attempt to access a locked out boot block: cancel programming
-			// command if necessary
-			if (VERBOSE>7) LOG("at29040a: attempt to access a locked out boot block: offset = %05x, lowblock=%d, highblock=%d\n", offset, m_lower_bbl, m_higher_bbl);
-
-			m_pgm = PGM_0;
-			m_enabling_sdb = false;
-			m_disabling_sdb = false;
-		}
-		else
-		{   /* enter programming mode */
-			if (VERBOSE>7) LOG("at29040a: enter programming mode (m_pgm=%d)\n", m_pgm);
-			memset(m_programming_buffer, 0xff, SECTOR_SIZE);
-			m_pgm = PGM_2;
-		}
-	}
-	if (m_pgm == PGM_2)
-	{
-		/* write data to programming buffer */
-		if (VERBOSE>7) LOG("at29040a: Write data to programming buffer\n");
-		m_programming_buffer[offset & 0xff] = data;
-		m_programming_last_offset = offset;
-		m_programming_timer->adjust(attotime::from_usec(150));  // next byte must be written before the timer expires
-	}
-}
-
-void at29040a_device::device_start(void)
-{
-	m_programming_buffer = global_alloc_array(UINT8, SECTOR_SIZE);
-	m_programming_timer = timer_alloc(PRG_TIMER);
-
-	m_eememory = global_alloc_array(UINT8, FEEPROM_SIZE+2);
-}
-
-void at29040a_device::device_stop(void)
-{
-	global_free_array(m_programming_buffer);
-	global_free_array(m_eememory);
-}
-
-void at29040a_device::device_reset(void)
-{
-	if (m_eememory[0] != VERSION)
-	{
-		if (VERBOSE>1) LOG("AT29040A: Warning: Version mismatch; expected %d but found %d for %s. Resetting.\n", VERSION, m_eememory[0], tag());
-		m_eememory[0] = 0;
-		m_eememory[1] = 0;
-	}
-
-	m_lower_bbl =   ((m_eememory[1] & 0x04)!=0);
-	m_higher_bbl =  ((m_eememory[1] & 0x02)!=0);
-	m_sdp =         ((m_eememory[1] & 0x01)!=0);
-
-	if (VERBOSE>7) LOG("at29040a (%s): LowerBBL = %d, HigherBBL = %d, SoftDataProt = %d\n", tag(), m_lower_bbl, m_higher_bbl, m_sdp);
-
-	m_id_mode = false;
-	m_cmd = CMD_0;
-	m_enabling_bbl = false;
-	m_long_sequence = false;
-	m_pgm = PGM_0;
-	m_enabling_sdb = false;
-	m_disabling_sdb = false;
-	m_toggle_bit = false;
-	m_programming_last_offset = 0;
-}
-
-const device_type AT29040A = &device_creator<at29040a_device>;
diff --git a/src/emu/machine/at29040a.h b/src/emu/machine/at29040a.h
deleted file mode 100644
index 1af258fb719..00000000000
--- a/src/emu/machine/at29040a.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Raphael Nabet, Michael Zapf
-/*
-    ATMEL 29040a
-
-    Michael Zapf
-    September 2010: Rewritten as device
-    February 2012: Rewritten as class
-*/
-
-#ifndef __AT29040__
-#define __AT29040__
-
-#include "emu.h"
-
-extern const device_type AT29040A;
-
-/*
-    at29c40a state
-
-    Command states (CMD_0 is the initial state):
-    CMD_0: default state
-    CMD_1: state after writing aa to 5555
-    CMD_2: state after writing 55 to 2aaa
-
-    Programming states (s_programming_0 is the initial state):
-    PGM_0: default state
-    PGM_1: a program and enable/disable lock command has been executed, but programming has not actually started.
-    PGM_2: the programming buffer is being written to
-    PGM_3: the programming buffer is being burnt to flash ROM
-*/
-enum  s_cmd_t
-{
-	CMD_0 = 0x0,
-	CMD_1 = 0x1,
-	CMD_2 = 0x2
-};
-
-enum  s_pgm_t
-{
-	PGM_0 = 0x0,
-	PGM_1 = 0x1,
-	PGM_2 = 0x2,
-	PGM_3 = 0x3
-};
-
-class at29040a_device : public device_t, public device_nvram_interface
-{
-public:
-	at29040a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	DECLARE_READ8_MEMBER( read );
-	DECLARE_WRITE8_MEMBER( write );
-
-protected:
-	virtual void device_start(void);
-	virtual void device_reset(void);
-	virtual void device_stop(void);
-	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
-
-	void nvram_default();
-	void nvram_read(emu_file &file);
-	void nvram_write(emu_file &file);
-
-private:
-	void        sync_flags(void);
-
-	UINT8*      m_eememory;
-
-	bool        m_lower_bbl;        /* set when lower boot block lockout is enabled */
-	bool        m_higher_bbl;       /* set when upper boot block lockout is enabled */
-	bool        m_sdp;              /* set when in software data protect mode */
-
-	bool        m_id_mode;          /* set when in chip id mode */
-	s_cmd_t     m_cmd;              /* command state */
-	bool        m_enabling_bbl;     /* set when a boot block lockout command is expecting its parameter */
-	bool        m_long_sequence;    /* set if 0x80 command has just been executed (some command require this prefix) */
-	s_pgm_t     m_pgm;              /* programming state */
-	bool        m_enabling_sdb;     /* set when a sdp enable command is in progress */
-	bool        m_disabling_sdb;    /* set when a sdp disable command is in progress */
-	//bool        m_dirty;            /* set when the memory contents should be set */
-	bool        m_toggle_bit;       // indicates flashing in progress (toggles for each query)
-	UINT8*      m_programming_buffer;
-	int         m_programming_last_offset;
-	emu_timer*  m_programming_timer;
-};
-
-#define MCFG_AT29040A_ADD(_tag )    \
-	MCFG_DEVICE_ADD(_tag, AT29040A, 0)
-
-#endif
diff --git a/src/emu/machine/at29x.c b/src/emu/machine/at29x.c
new file mode 100644
index 00000000000..20d4a141f9d
--- /dev/null
+++ b/src/emu/machine/at29x.c
@@ -0,0 +1,529 @@
+// license:BSD-3-Clause
+// copyright-holders:Michael Zapf
+/*
+    ATMEL AT29 family of Flash EEPROM
+
+    References:
+    [1] ATMEL: 4-megabit (512K x 8) 5-volt Only 256-byte sector Flash Memory
+    [2] ATMEL: Programming Atmel's AT29 Flash Family
+
+
+    AT29 family
+
+    Device          Memory      ID      Sectors     Sector Size     Write Cycle Time    Comments
+    ------------------------------------------------------------------------------------------
+    AT29C256       32K x 8     DC        512        64 bytes            10 ms
+    AT29LV256      32K x 8     BC        512        64 bytes            20 ms
+    AT29C257       32K x 8     DC        512        64 bytes            10 ms
+    AT29C512       64K x 8     5D        512       128 bytes            10 ms
+    AT29LV512      64K x 8     3D        512       128 bytes            20 ms
+    AT29C010A     128K x 8     D5       1024       128 bytes            10 ms
+    AT29LV010A    128K x 8     35       1024       128 bytes            20 ms
+    AT29BV010A    128K x 8     35       1024       128 bytes            20 ms
+    AT29C1024      64K x 16    25        512       128 words            10 ms
+    AT29LV1024     64K x 16    26        512       128 words            20 ms
+    AT29C020      256K x 8     DA       1024       256 bytes            10 ms
+    AT29LV020     256K x 8     BA       1024       256 bytes            20 ms
+    AT29BV020     256K x 8     BA       1024       256 bytes            20 ms
+    AT29C040      512K x 8     5B       1024       512 bytes            10 ms        Use AT29C040A for new designs
+    AT29LV040     512K x 8     3B       1024       512 bytes            20 ms        Use AT29LV040A for new designs
+    AT29BV040     512K x 8     3B       1024       512 bytes            20 ms        Use AT29BV040A for new designs
+    AT29C040A     512K x 8     A4       2048       256 bytes            10 ms
+    AT29LV040A    512K x 8     C4       2048       256 bytes            20 ms
+    AT29BV040A    512K x 8     C4       2048       256 bytes            20 ms
+
+    TODO: Implement remaining variants
+
+    MZ, Aug 2015
+*/
+
+#include "at29x.h"
+
+#define TRACE_PRG 1
+#define TRACE_READ 0
+#define TRACE_WRITE 1
+#define TRACE_CONFIG 1
+#define TRACE_STATE 1
+
+enum
+{
+	PRGTIMER = 1
+};
+
+/*
+    Constructor for all variants
+*/
+
+at29x_device::at29x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+	device_nvram_interface(mconfig, *this),
+	m_memory_size(0),   // bytes
+	m_word_width(8),
+	m_device_id(0),
+	m_sector_size(0),
+	m_cycle_time(10),    // ms
+	m_boot_block_size(16*1024),
+	m_version(0)
+{
+}
+
+/*
+    Constructor for AT29C020
+*/
+at29c020_device::at29c020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+	: at29x_device(mconfig, AT29C020, "ATMEL 29C020 256K x 8 FEEPROM", tag, owner, clock, "at29c020", __FILE__)
+{
+	m_memory_size = 256*1024;
+	m_device_id = 0xda;
+	m_sector_size = 256;
+}
+
+/*
+    Constructor for AT29C040
+*/
+at29c040_device::at29c040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+	: at29x_device(mconfig, AT29C040, "ATMEL 29C040 512K x 8 FEEPROM", tag, owner, clock, "at29c040", __FILE__)
+{
+	m_memory_size = 512*1024;
+	m_device_id = 0x5b;
+	m_sector_size = 512;
+}
+
+/*
+    Constructor for AT29C040A
+*/
+at29c040a_device::at29c040a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+	: at29x_device(mconfig, AT29C040A, "ATMEL 29C040A 512K x 8 FEEPROM", tag, owner, clock, "at29c040a", __FILE__)
+{
+	m_memory_size = 512*1024;
+	m_device_id = 0xa4;
+	m_sector_size = 256;
+}
+
+
+//-------------------------------------------------
+//  nvram_default - called to initialize NVRAM to
+//  its default state
+//-------------------------------------------------
+
+void at29x_device::nvram_default()
+{
+	memset(m_eememory, 0, m_memory_size+2);
+}
+
+//-------------------------------------------------
+//  nvram_read - called to read NVRAM from the
+//  .nv file
+//-------------------------------------------------
+
+void at29x_device::nvram_read(emu_file &file)
+{
+	file.read(m_eememory, m_memory_size+2);
+}
+
+//-------------------------------------------------
+//  nvram_write - called to write NVRAM to the
+//  .nv file
+//-------------------------------------------------
+
+void at29x_device::nvram_write(emu_file &file)
+{
+	// If we don't write (because there were no changes), the file will be wiped
+	if (TRACE_PRG) logerror("%s: Write to NVRAM file\n", tag());
+	m_eememory[0] = m_version;
+	file.write(m_eememory, m_memory_size+2);
+}
+
+/*
+    Programming timer callback
+*/
+void at29x_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+{
+	switch (m_pgm)
+	{
+	case PGM_1:
+		// Programming cycle timeout
+		logerror("%s: Programming cycle timeout\n", tag());
+		m_pgm = PGM_0;
+		break;
+
+	case PGM_2:
+		// Programming cycle start
+		if (TRACE_PRG) logerror("%s: Sector write start\n", tag());
+		m_pgm = PGM_3;
+		// We assume a typical delay of 70% of the max value
+		m_programming_timer->adjust(attotime::from_msec(m_cycle_time*7/10));
+		break;
+
+	case PGM_3:
+		// Programming cycle end; now burn the buffer into the flash EEPROM
+		memcpy(m_eememory + 2 + get_sector_number(m_programming_last_offset) * m_sector_size, m_programming_buffer, m_sector_size);
+
+		if (TRACE_PRG) logerror("%s: Sector write completed at location %04x\n", tag(), m_programming_last_offset);
+
+		// Data protect state will be activated at the end of the program cycle [1]
+		if (m_enabling_sdb)  m_sdp = true;
+
+		// Data protect state will be deactivated at the end of the program period [1]
+		if (m_disabling_sdb) m_sdp = false;
+
+		if (TRACE_PRG) logerror("%s: Software data protection = %d\n", tag(), m_sdp);
+
+		m_pgm = PGM_0;
+		m_enabling_sdb = false;
+		m_disabling_sdb = false;
+		sync_flags();
+		break;
+
+	default:
+		logerror("%s: Invalid state %d during programming\n", tag(), m_pgm);
+		m_pgm = PGM_0;
+		break;
+	}
+}
+
+void at29x_device::sync_flags()
+{
+	if (m_lower_bbl) m_eememory[1] |= 0x04;
+	else m_eememory[1] &= ~0x04;
+
+	if (m_higher_bbl) m_eememory[1] |= 0x02;
+	else m_eememory[1] &= ~0x02;
+
+	if (m_sdp) m_eememory[1] |= 0x01;
+	else m_eememory[1] &= ~0x01;
+}
+
+/*
+    read a byte from FEEPROM
+*/
+READ8_MEMBER( at29x_device::read )
+{
+	int reply;
+
+	offset &= m_address_mask;
+
+	// Reading in the midst of any command sequence cancels it (not verified)
+	m_cmd = CMD_0;
+	m_long_sequence = false;
+
+	sync_flags();
+
+	// Reading before the start of a programming cycle cancels it (not verified)
+	if (m_pgm == PGM_1)
+	{
+		// Attempt to access a locked out boot block: cancel programming command if necessary
+		m_pgm = PGM_0;
+		m_enabling_sdb = false;
+		m_disabling_sdb = false;
+		m_programming_timer->adjust(attotime::never);
+	}
+
+	if (m_id_mode)
+	{
+		switch (offset)
+		{
+		case 0x00000:
+			reply = 0x1f;       // Manufacturer code
+			break;
+
+		case 0x00001:
+			reply = 0xa4;       // Device code
+			break;
+
+		// Boot block lockout detection [1]
+		case 0x00002:
+			reply = m_lower_bbl? 0xff : 0xfe;
+			break;
+
+		case 0x7fff2:
+			reply = m_higher_bbl? 0xff : 0xfe;
+			break;
+
+		default:
+			reply = 0;
+			break;
+		}
+	}
+	else if ((m_pgm == PGM_2) || (m_pgm == PGM_3))
+	{
+		if (m_pgm == PGM_2)
+		{
+			// DATA* polling starts the programming cycle (not verified)
+			m_pgm = PGM_3;
+
+			// We assume a typical delay of 70% of the max value
+			m_programming_timer->adjust(attotime::from_msec(m_cycle_time*7/10));
+		}
+
+		reply = m_toggle_bit? 0x02 : 0x00;
+		m_toggle_bit = !m_toggle_bit;
+
+		// When we read the byte on the last position, we get the inverse of the last bit [1]
+		if (offset == m_programming_last_offset)
+		{
+			reply |= ((~m_programming_buffer[m_programming_last_offset & m_sector_mask]) & 0x01);
+		}
+	}
+	else
+		// Simple case: just read the memory contents
+		reply = m_eememory[offset+2];
+
+	if (TRACE_READ) logerror("%s: %05x -> %02x\n", tag(), offset, reply);
+
+	return reply;
+}
+
+/*
+    Write a byte to FEEPROM
+*/
+WRITE8_MEMBER( at29x_device::write )
+{
+	offset &= m_address_mask;
+	if (TRACE_WRITE) logerror("%s: %05x <- %02x\n", tag(), offset, data);
+
+	// The special CFI commands assume a smaller address space according
+	// to the specification ("address format A14-A0")
+	offs_t cfi_offset = offset & 0x7fff;
+
+	if (m_enabling_bbl)
+	{
+		// Determine whether we lock the upper or lower boot block
+		if (TRACE_STATE) logerror("%s: Enabling boot block lockout\n", tag());
+		m_enabling_bbl = false;
+
+		if ((offset == 0x00000) && (data == 0x00))
+		{
+			if (TRACE_STATE) logerror("%s: Enabling lower boot block lockout\n", tag());
+			m_lower_bbl = true;
+			sync_flags();
+			return;
+		}
+		else
+		{
+			if ((offset == 0x7ffff) && (data == 0xff))
+			{
+				if (TRACE_STATE) logerror("%s: Enabling higher boot block lockout\n", tag());
+				m_higher_bbl = true;
+				sync_flags();
+				return;
+			}
+			else
+			{
+				logerror("%s: Invalid boot block specification: %05x/%02x\n", tag(), offset, data);
+			}
+		}
+	}
+
+	switch (m_cmd)
+	{
+	case CMD_0:
+		//  CMD_0: start state
+		if ((cfi_offset == 0x5555) && (data == 0xaa))
+		{
+			if (TRACE_STATE) logerror("%s: Command sequence started (aa)\n", tag());
+			m_cmd = CMD_1;
+			return;
+		}
+		else
+		{
+			m_cmd = CMD_0;
+			m_long_sequence = false;
+		}
+		break;
+
+	case CMD_1:
+		//  CMD_1: state after writing aa to 5555
+		if ((cfi_offset == 0x2aaa) && (data == 0x55))
+		{
+			if (TRACE_STATE) logerror("%s: Command sequence continued (55)\n", tag());
+			m_cmd = CMD_2;
+			return;
+		}
+		else
+		{
+			m_cmd = CMD_0;
+			m_long_sequence = false;
+			if (TRACE_STATE) logerror("%s: Command sequence aborted\n", tag());
+		}
+		break;
+
+	case CMD_2:
+		//  CMD_2: state after writing 55 to 2aaa
+		if (cfi_offset == 0x5555)
+		{
+			m_pgm = PGM_0;
+			m_enabling_sdb = false;
+			m_disabling_sdb = false;
+			m_programming_timer->adjust(attotime::never);
+
+			// Process command
+			if (TRACE_STATE) logerror("%s: Command sequence continued (%2x)\n", tag(), data);
+			switch (data)
+			{
+			case 0x10:
+				//  Software chip erase (optional feature, see [1])
+				if (m_long_sequence)
+				{
+					if (m_lower_bbl || m_higher_bbl)
+						logerror("%s: Boot block lockout active; chip cannot be erased.\n", tag());
+					else
+					{
+						if (TRACE_STATE) logerror("%s: Erase chip\n", tag());
+						memset(m_eememory+2, 0xff, m_memory_size);
+					}
+				}
+				break;
+
+			case 0x20:
+				// Software data protection disable
+				// The complete sequence is aa-55-80-aa-55-20
+				// so we need a 80 before, else the sequence is invalid
+				if (m_long_sequence)
+				{
+					if (TRACE_STATE) logerror("%s: Software data protection disable\n", tag());
+					m_pgm = PGM_1;
+					m_disabling_sdb = true;
+					// It is not clear from the specification whether the byte cycle timer
+					// is already started here or when the first data byte is written
+				}
+				break;
+
+			case 0x40:
+				// Boot block lockout enable
+				// Complete sequence is aa-55-80-aa-55-40
+				if (TRACE_STATE) logerror("%s: Boot block lockout enable\n", tag());
+				if (m_long_sequence) m_enabling_bbl = true;
+				// We'll know which boot block is affected on the next write
+				break;
+
+			case 0x80:
+				// Long sequences are those that contain aa55 twice
+				m_long_sequence = true;
+				break;
+
+			case 0x90:
+				// Software product identification entry
+				if (TRACE_STATE) logerror("%s: Entering Identification mode\n", tag());
+				m_id_mode = true;
+				break;
+
+			case 0xa0:
+				// Software data protection enable
+				if (TRACE_STATE) logerror("%s: Software data protection enable\n", tag());
+				m_pgm = PGM_1;
+				m_enabling_sdb = true;
+				// It is not clear from the specification whether the byte cycle timer
+				// is already started here or when the first data byte is written
+				break;
+
+			case 0xf0:
+				// Software product identification exit
+				if (TRACE_STATE) logerror("%s: Exiting Identification mode\n", tag());
+				m_id_mode = false;
+				break;
+			}
+			m_cmd = CMD_0;
+			if (data != 0x80) m_long_sequence = false;
+
+			// Return, because we don't want to write the EEPROM with the command byte
+			return;
+		}
+		else
+		{
+			m_cmd = CMD_0;
+			m_long_sequence = false;
+		}
+	}
+
+	if ((m_pgm == PGM_2) && (get_sector_number(offset) != get_sector_number(m_programming_last_offset)))
+	{
+		// cancel current programming cycle
+		if (TRACE_WRITE) logerror("%s: Invalid sector change (from sector 0x%04x to 0x%04x); cancel programming cycle\n", tag(), get_sector_number(m_programming_last_offset), get_sector_number(offset));
+		m_pgm = PGM_0;
+		m_enabling_sdb = false;
+		m_disabling_sdb = false;
+		m_programming_timer->adjust(attotime::never);
+	}
+
+	if (((m_pgm == PGM_0) && !m_sdp)  // write directly
+		|| (m_pgm == PGM_1))          // write after unlocking
+	{
+		if (((offset < m_boot_block_size) && m_lower_bbl)
+			|| ((offset >= m_memory_size-m_boot_block_size) && m_higher_bbl))
+		{
+			// attempt to access a locked out boot block: cancel programming
+			// command if necessary
+			if (TRACE_WRITE) logerror("%s: Attempt to access a locked out boot block: offset = %05x, lowblock=%d, highblock=%d\n", tag(), offset, m_lower_bbl, m_higher_bbl);
+
+			m_pgm = PGM_0;
+			m_enabling_sdb = false;
+			m_disabling_sdb = false;
+		}
+		else
+		{   // enter programming mode
+			if (TRACE_STATE) logerror("%s: Enter programming mode (m_pgm=%d, m_sdp=%d)\n", tag(), m_pgm, m_sdp);
+			// Clear the programming buffer
+			memset(m_programming_buffer, 0xff, m_sector_size);
+			m_pgm = PGM_2;
+		}
+	}
+	// TODO: If data protection is active and bytes are written, the device
+	// enters a dummy write mode
+
+	if (m_pgm == PGM_2)
+	{
+		// write data to programming buffer
+		if (TRACE_PRG) logerror("%s: Write data to programming buffer: buf[%x] = %02x\n", tag(), offset & m_sector_mask, data);
+		m_programming_buffer[offset & m_sector_mask] = data;
+		m_programming_last_offset = offset;
+		m_programming_timer->adjust(attotime::from_usec(150));  // next byte must be written before the timer expires
+	}
+}
+
+void at29x_device::device_start(void)
+{
+	m_programming_buffer = global_alloc_array(UINT8, m_sector_size);
+	m_eememory = global_alloc_array(UINT8, m_memory_size+2);
+	m_programming_timer = timer_alloc(PRGTIMER);
+
+	// TODO: Complete 16-bit handling
+	m_address_mask = m_memory_size/(m_word_width/8) - 1;
+	m_sector_mask = m_sector_size - 1;
+}
+
+void at29x_device::device_stop(void)
+{
+	global_free_array(m_programming_buffer);
+	global_free_array(m_eememory);
+}
+
+void at29x_device::device_reset(void)
+{
+	if (m_eememory[0] != m_version)
+	{
+		logerror("%s: Warning: Version mismatch; expected %d but found %d in file. Resetting.\n", tag(), m_version, m_eememory[0]);
+		m_eememory[0] = 0;
+		m_eememory[1] = 0;
+	}
+
+	m_lower_bbl  =  ((m_eememory[1] & 0x04)!=0);
+	m_higher_bbl =  ((m_eememory[1] & 0x02)!=0);
+	m_sdp        =  ((m_eememory[1] & 0x01)!=0);
+
+	if (TRACE_CONFIG) logerror("%s: LowerBBL = %d, HigherBBL = %d, SoftDataProt = %d\n", tag(), m_lower_bbl, m_higher_bbl, m_sdp);
+
+	m_id_mode = false;
+	m_cmd = CMD_0;
+	m_enabling_bbl = false;
+	m_long_sequence = false;
+	m_pgm = PGM_0;
+	m_enabling_sdb = false;
+	m_disabling_sdb = false;
+	m_toggle_bit = false;
+	m_programming_last_offset = 0;
+}
+
+const device_type AT29C020 = &device_creator<at29c020_device>;
+const device_type AT29C040 = &device_creator<at29c040_device>;
+const device_type AT29C040A = &device_creator<at29c040a_device>;
diff --git a/src/emu/machine/at29x.h b/src/emu/machine/at29x.h
new file mode 100644
index 00000000000..91c81c585cf
--- /dev/null
+++ b/src/emu/machine/at29x.h
@@ -0,0 +1,116 @@
+// license:BSD-3-Clause
+// copyright-holders:Raphael Nabet, Michael Zapf
+/*
+    ATMEL AT29 family
+
+    Michael Zapf
+    August 2015
+*/
+
+#ifndef __AT29X__
+#define __AT29X__
+
+#include "emu.h"
+
+extern const device_type AT29C020;
+extern const device_type AT29C040;
+extern const device_type AT29C040A;
+
+enum  s_cmd_t
+{
+	CMD_0 = 0,
+	CMD_1,
+	CMD_2
+};
+
+enum  s_pgm_t
+{
+	PGM_0 = 0,
+	PGM_1,
+	PGM_2,
+	PGM_3
+};
+
+class at29x_device : public device_t, public device_nvram_interface
+{
+public:
+	at29x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+	DECLARE_READ8_MEMBER( read );
+	DECLARE_WRITE8_MEMBER( write );
+
+protected:
+	virtual void device_start(void);
+	virtual void device_reset(void);
+	virtual void device_stop(void);
+	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
+
+	void       nvram_default();
+	void       nvram_read(emu_file &file);
+	void       nvram_write(emu_file &file);
+
+	int        get_sector_number(offs_t address) { return address / m_sector_size; }
+
+	int        m_memory_size;   // bytes
+	int        m_word_width;
+	int        m_device_id;
+	int        m_sector_size;
+	int        m_cycle_time;        // ms
+	int        m_boot_block_size;
+	int        m_version;
+	int        m_address_mask;
+	int        m_sector_mask;
+
+private:
+	void        sync_flags(void);
+
+	UINT8*      m_eememory;
+
+	bool        m_lower_bbl;              // set when lower boot block lockout is enabled
+	bool        m_higher_bbl;             // set when upper boot block lockout is enabled
+	bool        m_sdp;                    // set when in software data protect mode
+
+	bool        m_id_mode;                // set when in chip id mode
+	s_cmd_t     m_cmd;                    // command state
+	bool        m_enabling_bbl;           // set when a boot block lockout command is expecting its parameter
+	bool        m_long_sequence;          // set if 0x80 command has just been executed (some command require this prefix)
+	s_pgm_t     m_pgm;                    // programming state
+	bool        m_enabling_sdb;           // set when a sdp enable command is in progress
+	bool        m_disabling_sdb;          // set when a sdp disable command is in progress
+	bool        m_toggle_bit;             // indicates flashing in progress (toggles for each query)
+
+	UINT8*      m_programming_buffer;
+	int         m_programming_last_offset;
+	emu_timer*  m_programming_timer;
+};
+
+/*
+    Variants
+*/
+class at29c020_device : public at29x_device
+{
+public:
+	at29c020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+};
+
+class at29c040_device : public at29x_device
+{
+public:
+	at29c040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+};
+
+class at29c040a_device : public at29x_device
+{
+public:
+	at29c040a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+};
+
+#define MCFG_AT29C020_ADD(_tag )    \
+	MCFG_DEVICE_ADD(_tag, AT29C020, 0)
+
+#define MCFG_AT29C040_ADD(_tag )    \
+	MCFG_DEVICE_ADD(_tag, AT29C040, 0)
+
+#define MCFG_AT29C040A_ADD(_tag )    \
+	MCFG_DEVICE_ADD(_tag, AT29C040A, 0)
+
+#endif