summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2009-12-25 01:08:43 +0000
committer Aaron Giles <aaron@aarongiles.com>2009-12-25 01:08:43 +0000
commit43dda8844d875400b945877e78070aaf3f6b9311 (patch)
tree65aa6a6a427fe30c4691b8cb15fed4ea3c388197 /src
parentf548c1cce3d105c9304ce77ad49040ea9980908f (diff)
Removed _NODEFAULT_ forms of EEPROM driver macros. If you need to add
default data, follow the MDRV_EEPROM_ADD() with MDRV_EEPROM_DATA().
Diffstat (limited to 'src')
-rw-r--r--src/emu/machine/eepromdev.c58
-rw-r--r--src/emu/machine/eepromdev.h27
-rw-r--r--src/mame/drivers/20pacgal.c2
-rw-r--r--src/mame/drivers/albazg.c2
-rw-r--r--src/mame/drivers/asterix.c2
-rw-r--r--src/mame/drivers/astrocorp.c3
-rw-r--r--src/mame/drivers/ataxx.c2
-rw-r--r--src/mame/drivers/cbasebal.c2
-rw-r--r--src/mame/drivers/cps1.c6
-rw-r--r--src/mame/drivers/cps2.c2
-rw-r--r--src/mame/drivers/dcheese.c2
-rw-r--r--src/mame/drivers/deco156.c4
-rw-r--r--src/mame/drivers/eolith.c2
-rw-r--r--src/mame/drivers/eolith16.c2
-rw-r--r--src/mame/drivers/esd16.c2
-rw-r--r--src/mame/drivers/f-32.c2
-rw-r--r--src/mame/drivers/fromanc2.c6
-rw-r--r--src/mame/drivers/gaelco2.c6
-rw-r--r--src/mame/drivers/gaelco3d.c2
-rw-r--r--src/mame/drivers/gijoe.c2
-rw-r--r--src/mame/drivers/groundfx.c2
-rw-r--r--src/mame/drivers/hornet.c2
-rw-r--r--src/mame/drivers/inufuku.c2
-rw-r--r--src/mame/drivers/kaneko16.c10
-rw-r--r--src/mame/drivers/kickgoal.c6
-rw-r--r--src/mame/drivers/konamigq.c3
-rw-r--r--src/mame/drivers/konamigv.c2
-rw-r--r--src/mame/drivers/konamigx.c2
-rw-r--r--src/mame/drivers/leland.c2
-rw-r--r--src/mame/drivers/lethal.c3
-rw-r--r--src/mame/drivers/limenko.c4
-rw-r--r--src/mame/drivers/mitchell.c6
-rw-r--r--src/mame/drivers/moo.c4
-rw-r--r--src/mame/drivers/mystwarr.c4
-rw-r--r--src/mame/drivers/overdriv.c3
-rw-r--r--src/mame/drivers/plygonet.c2
-rw-r--r--src/mame/drivers/policetr.c2
-rw-r--r--src/mame/drivers/raiden2.c2
-rw-r--r--src/mame/drivers/rbmk.c2
-rw-r--r--src/mame/drivers/rungun.c2
-rw-r--r--src/mame/drivers/segas32.c4
-rw-r--r--src/mame/drivers/seibuspi.c8
-rw-r--r--src/mame/drivers/seta2.c2
-rw-r--r--src/mame/drivers/simpl156.c2
-rw-r--r--src/mame/drivers/simpsons.c2
-rw-r--r--src/mame/drivers/ssv.c2
-rw-r--r--src/mame/drivers/stlforce.c2
-rw-r--r--src/mame/drivers/stv.c2
-rw-r--r--src/mame/drivers/superchs.c2
-rw-r--r--src/mame/drivers/taito_b.c6
-rw-r--r--src/mame/drivers/taito_f3.c10
-rw-r--r--src/mame/drivers/taito_z.c3
-rw-r--r--src/mame/drivers/taitojc.c2
-rw-r--r--src/mame/drivers/tmaster.c10
-rw-r--r--src/mame/drivers/tmnt.c12
-rw-r--r--src/mame/drivers/toaplan2.c5
-rw-r--r--src/mame/drivers/ultrsprt.c2
-rw-r--r--src/mame/drivers/undrfire.c4
-rw-r--r--src/mame/drivers/unico.c2
-rw-r--r--src/mame/drivers/vamphalf.c4
-rw-r--r--src/mame/drivers/vendetta.c2
-rw-r--r--src/mame/drivers/xexex.c2
-rw-r--r--src/mame/drivers/xmen.c4
-rw-r--r--src/mame/drivers/xorworld.c2
-rw-r--r--src/mame/drivers/zr107.c4
65 files changed, 146 insertions, 155 deletions
diff --git a/src/emu/machine/eepromdev.c b/src/emu/machine/eepromdev.c
index e0996443617..648ac809339 100644
--- a/src/emu/machine/eepromdev.c
+++ b/src/emu/machine/eepromdev.c
@@ -12,9 +12,6 @@
#define SERIAL_BUFFER_LENGTH 40
#define MEMORY_SIZE 1024
-/* FIXME: many drivers do not need default_data / default_data_size and put them to 0 in the drivers seems a waste of code */
-UINT8 *eeprom_empty_default_data = NULL;
-
typedef struct _eeprom_state eeprom_state;
struct _eeprom_state
{
@@ -323,20 +320,6 @@ logerror("EEPROM read %04x from address %02x\n",eestate->data_bits,eestate->read
}
-static void eepromdev_load(const device_config *device, mame_file *f)
-{
- eeprom_state *eestate = get_safe_token(device);
-
- mame_fread(f, eestate->data, (1 << eestate->intf->address_bits) * eestate->intf->data_bits / 8);
-}
-
-static void eepromdev_save(const device_config *device, mame_file *f)
-{
- eeprom_state *eestate = get_safe_token(device);
-
- mame_fwrite(f, eestate->data, (1 << eestate->intf->address_bits) * eestate->intf->data_bits / 8);
-}
-
void eepromdev_set_data(const device_config *device, const UINT8 *data, int length)
{
eeprom_state *eestate = get_safe_token(device);
@@ -369,23 +352,21 @@ void *eepromdev_get_data_pointer(const device_config *device, UINT32 *length, UI
static DEVICE_NVRAM( eeprom )
{
- const eeprom_config *config = (const eeprom_config *)device->inline_config;
+ eeprom_state *eestate = get_safe_token(device);
if (read_or_write)
- eepromdev_save(device, file);
- else
- if (file)
- eepromdev_load(device, file);
- else
- if ((config->default_data != NULL) && (config->default_data_size != 0))
- eepromdev_set_data(device, config->default_data, config->default_data_size);
+ mame_fwrite(file, eestate->data, (1 << eestate->intf->address_bits) * eestate->intf->data_bits / 8);
+ else if (file != NULL)
+ mame_fread(file, eestate->data, (1 << eestate->intf->address_bits) * eestate->intf->data_bits / 8);
}
static DEVICE_START(eeprom)
{
eeprom_state *eestate = get_safe_token(device);
const eeprom_config *config;
+ UINT16 default_value;
UINT8 *region_base;
+ int offs;
/* validate some basic stuff */
assert(device != NULL);
@@ -398,14 +379,26 @@ static DEVICE_START(eeprom)
eestate->intf = config->pinterface;
if ((1 << eestate->intf->address_bits) * eestate->intf->data_bits / 8 > MEMORY_SIZE)
- {
fatalerror("EEPROM larger than eepromdev.c allows");
- }
+
+ /* initialize to the default value */
+ default_value = 0xffff;
+ if (config->default_value != 0)
+ default_value = config->default_value;
+ for (offs = 0; offs < (1 << eestate->intf->address_bits); offs++)
+ if (eestate->intf->data_bits == 8)
+ eestate->data[offs] = (UINT8)default_value;
+ else
+ {
+ eestate->data[offs * 2 + 0] = default_value >> 8;
+ eestate->data[offs * 2 + 1] = default_value & 0xff;
+ }
- memset(eestate->data, 0xff, (1 << eestate->intf->address_bits) * eestate->intf->data_bits / 8);
- if ((config->default_data != NULL) && (config->default_data_size != 0))
+ /* handle hard-coded data from the driver */
+ if (config->default_data != NULL)
eepromdev_set_data(device, config->default_data, config->default_data_size);
+ /* populate from a memory region if present */
region_base = memory_region(device->machine, device->tag);
if (region_base != NULL)
{
@@ -455,15 +448,10 @@ static DEVICE_START(eeprom)
state_save_register_device_item( device, 0, eestate->read_address);
}
-static DEVICE_RESET(eeprom)
-{
-}
-
-
static const char DEVTEMPLATE_SOURCE[] = __FILE__;
#define DEVTEMPLATE_ID(p,s) p##eeprom##s
-#define DEVTEMPLATE_FEATURES DT_HAS_START | DT_HAS_RESET | DT_HAS_NVRAM | DT_HAS_INLINE_CONFIG
+#define DEVTEMPLATE_FEATURES DT_HAS_START | DT_HAS_NVRAM | DT_HAS_INLINE_CONFIG
#define DEVTEMPLATE_NAME "EEPROM"
#define DEVTEMPLATE_FAMILY "EEPROM"
#include "devtempl.h"
diff --git a/src/emu/machine/eepromdev.h b/src/emu/machine/eepromdev.h
index ee391208602..5004a130c5b 100644
--- a/src/emu/machine/eepromdev.h
+++ b/src/emu/machine/eepromdev.h
@@ -27,6 +27,7 @@ struct _eeprom_config
eeprom_interface *pinterface;
UINT8 *default_data;
int default_data_size;
+ UINT32 default_value;
};
/* 93C46 */
@@ -38,32 +39,22 @@ extern const eeprom_interface eepromdev_interface_93C66B;
#define EEPROM DEVICE_GET_INFO_NAME(eeprom)
DEVICE_GET_INFO(eeprom);
-#define MDRV_EEPROM_ADD(_tag, _interface, _data_size, _data) \
+#define MDRV_EEPROM_ADD(_tag, _interface) \
MDRV_DEVICE_ADD(_tag, EEPROM, 0) \
- MDRV_DEVICE_CONFIG_DATAPTR(eeprom_config, pinterface, &_interface) \
- MDRV_EEPROM_DATA(_data, _data_size)
+ MDRV_DEVICE_CONFIG_DATAPTR(eeprom_config, pinterface, &_interface)
-#define MDRV_EEPROM_93C46_ADD(_tag, _data_size, _data) \
- MDRV_EEPROM_ADD(_tag, eepromdev_interface_93C46, _data_size, _data)
+#define MDRV_EEPROM_93C46_ADD(_tag) \
+ MDRV_EEPROM_ADD(_tag, eepromdev_interface_93C46)
-#define MDRV_EEPROM_93C66B_ADD(_tag, _data_size, _data) \
- MDRV_EEPROM_ADD(_tag, eepromdev_interface_93C66B, _data_size, _data)
+#define MDRV_EEPROM_93C66B_ADD(_tag) \
+ MDRV_EEPROM_ADD(_tag, eepromdev_interface_93C66B)
#define MDRV_EEPROM_DATA(_data, _size) \
MDRV_DEVICE_CONFIG_DATAPTR(eeprom_config, default_data, &_data) \
MDRV_DEVICE_CONFIG_DATA32(eeprom_config, default_data_size, _size)
-/* FIXME: many drivers do not need default_data / default_data_size and put them to 0 in the drivers seems a waste of code */
-extern UINT8 *eeprom_empty_default_data;
-
-#define MDRV_EEPROM_NODEFAULT_ADD(_tag, _interface) \
- MDRV_EEPROM_ADD(_tag, _interface, 0, eeprom_empty_default_data)
-
-#define MDRV_EEPROM_93C46_NODEFAULT_ADD(_tag) \
- MDRV_EEPROM_93C46_ADD(_tag, 0, eeprom_empty_default_data)
-
-#define MDRV_EEPROM_93C66B_NODEFAULT_ADD(_tag) \
- MDRV_EEPROM_93C66B_ADD(_tag, 0, eeprom_empty_default_data)
+#define MDRV_EEPROM_DEFAULT_VALUE(_value) \
+ MDRV_DEVICE_CONFIG_DATA32(eeprom_config, default_value, 0x10000 | ((_value) & 0xffff))
WRITE_LINE_DEVICE_HANDLER( eepromdev_write_bit );
READ_LINE_DEVICE_HANDLER( eepromdev_read_bit );
diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c
index 6a0449878b5..26a4ea5ae67 100644
--- a/src/mame/drivers/20pacgal.c
+++ b/src/mame/drivers/20pacgal.c
@@ -289,7 +289,7 @@ static MACHINE_DRIVER_START( 20pacgal )
MDRV_MACHINE_START(20pacgal)
MDRV_MACHINE_RESET(20pacgal)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", _20pacgal_eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", _20pacgal_eeprom_intf)
/* video hardware */
MDRV_IMPORT_FROM(20pacgal_video)
diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c
index 98cdf4e28b3..6e3709b4b0e 100644
--- a/src/mame/drivers/albazg.c
+++ b/src/mame/drivers/albazg.c
@@ -404,7 +404,7 @@ static MACHINE_DRIVER_START( yumefuda )
MDRV_MACHINE_START(yumefuda)
MDRV_MACHINE_RESET(yumefuda)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
MDRV_WATCHDOG_VBLANK_INIT(8) // timing is unknown
diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c
index 30f4ebfa392..752836828b0 100644
--- a/src/mame/drivers/asterix.c
+++ b/src/mame/drivers/asterix.c
@@ -224,7 +224,7 @@ static MACHINE_DRIVER_START( asterix )
MDRV_CPU_ADD("audiocpu", Z80, 8000000)
MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c
index 79446803938..d0e4913c19f 100644
--- a/src/mame/drivers/astrocorp.c
+++ b/src/mame/drivers/astrocorp.c
@@ -315,7 +315,8 @@ static MACHINE_DRIVER_START( showhand )
MDRV_MACHINE_START(showhand)
MDRV_MACHINE_RESET(showhand)
- MDRV_EEPROM_93C46_ADD("eeprom", sizeof(showhand_default_eeprom), showhand_default_eeprom)
+ MDRV_EEPROM_93C46_ADD("eeprom")
+ MDRV_EEPROM_DATA(showhand_default_eeprom, sizeof(showhand_default_eeprom))
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/ataxx.c b/src/mame/drivers/ataxx.c
index e4898a323bd..8407f8aacfe 100644
--- a/src/mame/drivers/ataxx.c
+++ b/src/mame/drivers/ataxx.c
@@ -328,7 +328,7 @@ static MACHINE_DRIVER_START( ataxx )
MDRV_MACHINE_START(ataxx)
MDRV_MACHINE_RESET(ataxx)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
MDRV_NVRAM_HANDLER(leland)
/* video hardware */
diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c
index b9314b7b724..f9630aa0409 100644
--- a/src/mame/drivers/cbasebal.c
+++ b/src/mame/drivers/cbasebal.c
@@ -292,7 +292,7 @@ static MACHINE_DRIVER_START( cbasebal )
MDRV_MACHINE_START(cbasebal)
MDRV_MACHINE_RESET(cbasebal)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", cbasebal_eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", cbasebal_eeprom_intf)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index e542323b2ea..83df69ed8a1 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -2837,7 +2837,7 @@ static MACHINE_DRIVER_START( pang3 )
/* basic machine hardware */
MDRV_IMPORT_FROM(cps1_12MHz)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", pang3_eeprom_interface)
+ MDRV_EEPROM_ADD("eeprom", pang3_eeprom_interface)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( qsound )
@@ -2855,7 +2855,7 @@ static MACHINE_DRIVER_START( qsound )
MDRV_MACHINE_START(qsound)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", qsound_eeprom_interface)
+ MDRV_EEPROM_ADD("eeprom", qsound_eeprom_interface)
/* sound hardware */
MDRV_DEVICE_REMOVE("mono")
@@ -2914,7 +2914,7 @@ static MACHINE_DRIVER_START( wofhfh )
/* basic machine hardware */
MDRV_IMPORT_FROM(cps1_12MHz)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", qsound_eeprom_interface)
+ MDRV_EEPROM_ADD("eeprom", qsound_eeprom_interface)
MACHINE_DRIVER_END
/* incomplete */
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index 32b6ed8bf53..f2110be473d 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -1213,7 +1213,7 @@ static MACHINE_DRIVER_START( cps2 )
MDRV_MACHINE_START(cps2)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", cps2_eeprom_interface)
+ MDRV_EEPROM_ADD("eeprom", cps2_eeprom_interface)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c
index 80e44d223a0..31996243ed6 100644
--- a/src/mame/drivers/dcheese.c
+++ b/src/mame/drivers/dcheese.c
@@ -421,7 +421,7 @@ static MACHINE_DRIVER_START( dcheese )
MDRV_MACHINE_START(dcheese)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
MDRV_TICKET_DISPENSER_ADD("ticket", 200, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW)
/* video hardware */
diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c
index 11696ea8a76..b67c0e1b340 100644
--- a/src/mame/drivers/deco156.c
+++ b/src/mame/drivers/deco156.c
@@ -373,7 +373,7 @@ static MACHINE_DRIVER_START( hvysmsh )
MDRV_CPU_PROGRAM_MAP(hvysmsh_map)
MDRV_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM )
@@ -412,7 +412,7 @@ static MACHINE_DRIVER_START( wcvol95 )
MDRV_CPU_PROGRAM_MAP(wcvol95_map)
MDRV_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM )
diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c
index ddc9d4d8186..3da64360a8b 100644
--- a/src/mame/drivers/eolith.c
+++ b/src/mame/drivers/eolith.c
@@ -330,7 +330,7 @@ static MACHINE_DRIVER_START( eolith45 )
/* sound cpu */
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_interface_93C66)
+ MDRV_EEPROM_ADD("eeprom", eeprom_interface_93C66)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c
index f512e016b2f..b29167d61ea 100644
--- a/src/mame/drivers/eolith16.c
+++ b/src/mame/drivers/eolith16.c
@@ -162,7 +162,7 @@ static MACHINE_DRIVER_START( eolith16 )
MDRV_CPU_PROGRAM_MAP(eolith16_map)
MDRV_CPU_VBLANK_INT_HACK(eolith_speedup,262)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_interface_93C66)
+ MDRV_EEPROM_ADD("eeprom", eeprom_interface_93C66)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c
index da3f67b0b6c..70a0e58c1fe 100644
--- a/src/mame/drivers/esd16.c
+++ b/src/mame/drivers/esd16.c
@@ -587,7 +587,7 @@ static MACHINE_DRIVER_START( hedpanic )
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(hedpanic_map)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
MDRV_PALETTE_LENGTH(0x1000/2)
diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c
index e4d7b2f3f87..9ef17f974f5 100644
--- a/src/mame/drivers/f-32.c
+++ b/src/mame/drivers/f-32.c
@@ -133,7 +133,7 @@ static MACHINE_DRIVER_START( mosaicf2 )
MDRV_CPU_IO_MAP(mosaicf2_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c
index 094247754bb..f0092e543eb 100644
--- a/src/mame/drivers/fromanc2.c
+++ b/src/mame/drivers/fromanc2.c
@@ -577,7 +577,7 @@ static MACHINE_DRIVER_START( fromanc2 )
MDRV_MACHINE_START(fromanc2)
MDRV_MACHINE_RESET(fromanc2)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_GFXDECODE(fromanc2)
@@ -632,7 +632,7 @@ static MACHINE_DRIVER_START( fromancr )
MDRV_MACHINE_START(fromanc2)
MDRV_MACHINE_RESET(fromanc2)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_GFXDECODE(fromancr)
@@ -683,7 +683,7 @@ static MACHINE_DRIVER_START( fromanc4 )
MDRV_MACHINE_START(fromanc4)
MDRV_MACHINE_RESET(fromanc2)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_GFXDECODE(fromancr)
diff --git a/src/mame/drivers/gaelco2.c b/src/mame/drivers/gaelco2.c
index 4de5ead6892..1cc4632ea5c 100644
--- a/src/mame/drivers/gaelco2.c
+++ b/src/mame/drivers/gaelco2.c
@@ -293,7 +293,7 @@ static MACHINE_DRIVER_START( bang )
MDRV_CPU_PROGRAM_MAP(bang_map)
MDRV_CPU_VBLANK_INT_HACK(bang_interrupt, 6)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", gaelco2_eeprom_interface)
+ MDRV_EEPROM_ADD("eeprom", gaelco2_eeprom_interface)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
@@ -973,7 +973,7 @@ static MACHINE_DRIVER_START( snowboar )
MDRV_CPU_PROGRAM_MAP(snowboar_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", gaelco2_eeprom_interface)
+ MDRV_EEPROM_ADD("eeprom", gaelco2_eeprom_interface)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
@@ -1215,7 +1215,7 @@ static MACHINE_DRIVER_START( wrally2 )
MDRV_CPU_PROGRAM_MAP(wrally2_map)
MDRV_CPU_VBLANK_INT("lscreen", irq6_line_hold)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", gaelco2_eeprom_interface)
+ MDRV_EEPROM_ADD("eeprom", gaelco2_eeprom_interface)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c
index 29ba52fa77e..9fc771e7334 100644
--- a/src/mame/drivers/gaelco3d.c
+++ b/src/mame/drivers/gaelco3d.c
@@ -970,7 +970,7 @@ static MACHINE_DRIVER_START( gaelco3d )
MDRV_MACHINE_START(gaelco3d)
MDRV_MACHINE_RESET(gaelco3d)
- MDRV_EEPROM_93C66B_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C66B_ADD("eeprom")
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c
index ddba19d3ad6..36d85ab1cd8 100644
--- a/src/mame/drivers/gijoe.c
+++ b/src/mame/drivers/gijoe.c
@@ -297,7 +297,7 @@ static MACHINE_DRIVER_START( gijoe )
MDRV_MACHINE_START(gijoe)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_UPDATE_BEFORE_VBLANK)
diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c
index 36a67f80a1e..fa6f9177bd2 100644
--- a/src/mame/drivers/groundfx.c
+++ b/src/mame/drivers/groundfx.c
@@ -354,7 +354,7 @@ static MACHINE_DRIVER_START( groundfx )
MDRV_CPU_PROGRAM_MAP(groundfx_map)
MDRV_CPU_VBLANK_INT("screen", groundfx_interrupt)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", groundfx_eeprom_interface)
+ MDRV_EEPROM_ADD("eeprom", groundfx_eeprom_interface)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c
index 9bfe4ec90e3..790f1172b80 100644
--- a/src/mame/drivers/hornet.c
+++ b/src/mame/drivers/hornet.c
@@ -1129,7 +1129,7 @@ static MACHINE_DRIVER_START( hornet )
MDRV_MACHINE_START( hornet )
MDRV_MACHINE_RESET( hornet )
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
MDRV_3DFX_VOODOO_1_ADD("voodoo0", STD_VOODOO_1_CLOCK, 2, "screen")
MDRV_3DFX_VOODOO_CPU("dsp")
diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c
index a41b185bcb9..50fb45c25da 100644
--- a/src/mame/drivers/inufuku.c
+++ b/src/mame/drivers/inufuku.c
@@ -366,7 +366,7 @@ static MACHINE_DRIVER_START( inufuku )
MDRV_MACHINE_START(inufuku)
MDRV_MACHINE_RESET(inufuku)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index bdbeeaa326a..42e02968cfc 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -1847,7 +1847,7 @@ static MACHINE_DRIVER_START( bakubrkr )
MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
MDRV_MACHINE_RESET(bakubrkr)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK) // mangled sprites otherwise
@@ -2048,7 +2048,7 @@ static MACHINE_DRIVER_START( mgcrystl )
MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
MDRV_MACHINE_RESET(mgcrystl)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
@@ -2167,7 +2167,8 @@ static MACHINE_DRIVER_START( shogwarr )
MDRV_CPU_VBLANK_INT_HACK(shogwarr_interrupt,SHOGWARR_INTERRUPTS_NUM)
MDRV_MACHINE_RESET(shogwarr)
- MDRV_EEPROM_93C46_ADD("eeprom", 128, shogwarr_default_eeprom)
+ MDRV_EEPROM_93C46_ADD("eeprom")
+ MDRV_EEPROM_DATA(shogwarr_default_eeprom, 128)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -2220,7 +2221,8 @@ static MACHINE_DRIVER_START( brapboys )
MDRV_DEVICE_ADDRESS_MAP(0, brapboys_oki2_map)
MDRV_DEVICE_REMOVE("eeprom")
- MDRV_EEPROM_93C46_ADD("eeprom", 128, brapboys_default_eeprom)
+ MDRV_EEPROM_93C46_ADD("eeprom")
+ MDRV_EEPROM_DATA(brapboys_default_eeprom, 128)
MACHINE_DRIVER_END
/***************************************************************************
diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c
index 29d4506dd10..4aa857f8dc6 100644
--- a/src/mame/drivers/kickgoal.c
+++ b/src/mame/drivers/kickgoal.c
@@ -692,7 +692,8 @@ static MACHINE_DRIVER_START( kickgoal )
MDRV_MACHINE_START(kickgoal)
MDRV_MACHINE_RESET(kickgoal)
- MDRV_EEPROM_93C46_ADD("eeprom", 128, kickgoal_default_eeprom_type1)
+ MDRV_EEPROM_93C46_ADD("eeprom")
+ MDRV_EEPROM_DATA(kickgoal_default_eeprom_type1, 128)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -733,7 +734,8 @@ static MACHINE_DRIVER_START( actionhw )
MDRV_MACHINE_START(kickgoal)
MDRV_MACHINE_RESET(kickgoal)
- MDRV_EEPROM_93C46_ADD("eeprom", 128, kickgoal_default_eeprom_type1)
+ MDRV_EEPROM_93C46_ADD("eeprom")
+ MDRV_EEPROM_DATA(kickgoal_default_eeprom_type1, 128)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c
index 2c763fb787a..a5054aa2d95 100644
--- a/src/mame/drivers/konamigq.c
+++ b/src/mame/drivers/konamigq.c
@@ -369,7 +369,8 @@ static MACHINE_DRIVER_START( konamigq )
MDRV_MACHINE_START( konamigq )
MDRV_MACHINE_RESET( konamigq )
- MDRV_EEPROM_93C46_ADD("eeprom", 128, konamigq_def_eeprom)
+ MDRV_EEPROM_93C46_ADD("eeprom")
+ MDRV_EEPROM_DATA(konamigq_def_eeprom, 128)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c
index cf4fdff0893..cced49ec25f 100644
--- a/src/mame/drivers/konamigv.c
+++ b/src/mame/drivers/konamigv.c
@@ -336,7 +336,7 @@ static MACHINE_DRIVER_START( konamigv )
MDRV_MACHINE_START( konamigv )
MDRV_MACHINE_RESET( konamigv )
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c
index 0f90e89954d..601c7bd1de6 100644
--- a/src/mame/drivers/konamigx.c
+++ b/src/mame/drivers/konamigx.c
@@ -1759,7 +1759,7 @@ static MACHINE_DRIVER_START( konamigx )
MDRV_MACHINE_START(konamigx)
MDRV_MACHINE_RESET(konamigx)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c
index 6802122ec23..7b37d3fddae 100644
--- a/src/mame/drivers/leland.c
+++ b/src/mame/drivers/leland.c
@@ -747,7 +747,7 @@ static MACHINE_DRIVER_START( leland )
MDRV_MACHINE_RESET(leland)
MDRV_NVRAM_HANDLER(leland)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
MDRV_IMPORT_FROM(leland_video)
diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c
index 8b0f2cebe4b..6d10838e0c4 100644
--- a/src/mame/drivers/lethal.c
+++ b/src/mame/drivers/lethal.c
@@ -641,7 +641,8 @@ static MACHINE_DRIVER_START( lethalen )
MDRV_MACHINE_START(lethalen)
MDRV_MACHINE_RESET(lethalen)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf, 48, lethalen_default_eeprom)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_DATA(lethalen_default_eeprom, 48)
MDRV_GFXDECODE(lethal)
diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c
index fe0387e0bf6..e266f6c14b2 100644
--- a/src/mame/drivers/limenko.c
+++ b/src/mame/drivers/limenko.c
@@ -646,7 +646,7 @@ static MACHINE_DRIVER_START( limenko )
MDRV_CPU_IO_MAP(limenko_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -674,7 +674,7 @@ static MACHINE_DRIVER_START( spotty )
MDRV_CPU_ADD("audiocpu", AT89C4051, 4000000) /* 4 MHz */
MDRV_CPU_IO_MAP(spotty_sound_io_map)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c
index eb98dd482b2..cd74fa61715 100644
--- a/src/mame/drivers/mitchell.c
+++ b/src/mame/drivers/mitchell.c
@@ -1112,7 +1112,7 @@ static MACHINE_DRIVER_START( mgakuen )
MDRV_MACHINE_START(mitchell)
MDRV_MACHINE_RESET(mitchell)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -1155,7 +1155,7 @@ static MACHINE_DRIVER_START( pang )
MDRV_MACHINE_RESET(mitchell)
MDRV_NVRAM_HANDLER(mitchell)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -1295,7 +1295,7 @@ static MACHINE_DRIVER_START( marukin )
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */
MDRV_NVRAM_HANDLER(mitchell)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c
index 02458a2fe5e..cc4bc250270 100644
--- a/src/mame/drivers/moo.c
+++ b/src/mame/drivers/moo.c
@@ -498,7 +498,7 @@ static MACHINE_DRIVER_START( moo )
MDRV_MACHINE_START(moo)
MDRV_MACHINE_RESET(moo)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
@@ -542,7 +542,7 @@ static MACHINE_DRIVER_START( moobl )
MDRV_MACHINE_START(moo)
MDRV_MACHINE_RESET(moo)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c
index de244cfeae5..c9a11626670 100644
--- a/src/mame/drivers/mystwarr.c
+++ b/src/mame/drivers/mystwarr.c
@@ -970,7 +970,7 @@ static MACHINE_DRIVER_START( mystwarr )
MDRV_QUANTUM_TIME(HZ(1920))
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
MDRV_MACHINE_START(mystwarr)
MDRV_MACHINE_RESET(mystwarr)
@@ -1080,7 +1080,7 @@ static MACHINE_DRIVER_START( gaiapols )
MDRV_GFXDECODE(gaiapols)
MDRV_DEVICE_REMOVE("eeprom")
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", gaia_eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", gaia_eeprom_intf)
/* video hardware */
MDRV_VIDEO_START(gaiapols)
diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c
index a2ff70b24b4..6726b730513 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -325,7 +325,8 @@ static MACHINE_DRIVER_START( overdriv )
MDRV_MACHINE_RESET(overdriv)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf, 128, overdriv_default_eeprom)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_DATA(overdriv_default_eeprom, 128)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index e1b1181dd65..b6ff156a8c2 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -652,7 +652,7 @@ static MACHINE_DRIVER_START( plygonet )
MDRV_GFXDECODE(plygonet)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* TODO: TEMPORARY! UNTIL A MORE LOCALIZED SYNC CAN BE MADE */
MDRV_QUANTUM_TIME(HZ(1200000))
diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c
index 845edb7da99..523e7c5844d 100644
--- a/src/mame/drivers/policetr.c
+++ b/src/mame/drivers/policetr.c
@@ -433,7 +433,7 @@ static MACHINE_DRIVER_START( policetr )
MDRV_CPU_PROGRAM_MAP(policetr_map)
MDRV_CPU_VBLANK_INT("screen", irq4_gen)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_interface_policetr)
+ MDRV_EEPROM_ADD("eeprom", eeprom_interface_policetr)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index 77ce7d364c2..97587619006 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -2248,7 +2248,7 @@ static MACHINE_DRIVER_START( rdx_v33 )
MDRV_MACHINE_RESET(rdx_v33)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c
index 8614e086fbb..ef1c7997f4c 100644
--- a/src/mame/drivers/rbmk.c
+++ b/src/mame/drivers/rbmk.c
@@ -481,7 +481,7 @@ static MACHINE_DRIVER_START( rbmk )
MDRV_VIDEO_START(rbmk)
MDRV_VIDEO_UPDATE(rbmk)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c
index 26013db0b32..1575f154fd5 100644
--- a/src/mame/drivers/rungun.c
+++ b/src/mame/drivers/rungun.c
@@ -369,7 +369,7 @@ static MACHINE_DRIVER_START( rng )
MDRV_MACHINE_RESET(rng)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_BEFORE_VBLANK)
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index 1ffd5dc127e..8bca9d0d11f 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -2166,7 +2166,7 @@ static MACHINE_DRIVER_START( system32 )
MDRV_MACHINE_RESET(system32)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
MDRV_TIMER_ADD("v60_irq0", signal_v60_irq_callback)
MDRV_TIMER_ADD("v60_irq1", signal_v60_irq_callback)
@@ -2224,7 +2224,7 @@ static MACHINE_DRIVER_START( multi32 )
MDRV_MACHINE_RESET(system32)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
MDRV_TIMER_ADD("v60_irq0", signal_v60_irq_callback)
MDRV_TIMER_ADD("v60_irq1", signal_v60_irq_callback)
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index 41fba2c689f..7f2ae04a88a 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -1934,7 +1934,7 @@ static MACHINE_DRIVER_START( sxx2f ) /* Intel i386DX @ 25MHz, YMF271 @ 16.9344MH
MDRV_MACHINE_RESET(sxx2f)
MDRV_NVRAM_HANDLER(0)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
MACHINE_DRIVER_END
@@ -1956,7 +1956,7 @@ static MACHINE_DRIVER_START( sxx2g ) /* single board version using measured cloc
MDRV_MACHINE_RESET(sxx2f)
MDRV_NVRAM_HANDLER(0)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
MACHINE_DRIVER_END
@@ -2205,7 +2205,7 @@ static MACHINE_DRIVER_START( seibu386 )
MDRV_MACHINE_RESET(seibu386)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -2263,7 +2263,7 @@ static MACHINE_DRIVER_START( sys386f2 )
MDRV_MACHINE_RESET(seibu386)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c
index 65e3f8be170..b4ce36089a6 100644
--- a/src/mame/drivers/seta2.c
+++ b/src/mame/drivers/seta2.c
@@ -2308,7 +2308,7 @@ static MACHINE_DRIVER_START( gundamex )
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(gundamex_map)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c
index a8f380fafb2..f4e634808bf 100644
--- a/src/mame/drivers/simpl156.c
+++ b/src/mame/drivers/simpl156.c
@@ -446,7 +446,7 @@ static MACHINE_DRIVER_START( chainrec )
MDRV_CPU_PROGRAM_MAP(chainrec_map)
MDRV_CPU_VBLANK_INT("screen", simpl156_vbl_interrupt)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom") // 93C45
+ MDRV_EEPROM_93C46_ADD("eeprom") // 93C45
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c
index a9150b8ed1b..2da1e690812 100644
--- a/src/mame/drivers/simpsons.c
+++ b/src/mame/drivers/simpsons.c
@@ -319,7 +319,7 @@ static MACHINE_DRIVER_START( simpsons )
MDRV_MACHINE_RESET(simpsons)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c
index 8898b7262ce..2b56bd90a5d 100644
--- a/src/mame/drivers/ssv.c
+++ b/src/mame/drivers/ssv.c
@@ -2745,7 +2745,7 @@ static MACHINE_DRIVER_START( gdfs )
MDRV_CPU_PROGRAM_MAP(gdfs_map)
MDRV_CPU_VBLANK_INT_HACK(gdfs_interrupt,1+4)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c
index 5455c34dfb9..b44ea4e46ce 100644
--- a/src/mame/drivers/stlforce.c
+++ b/src/mame/drivers/stlforce.c
@@ -199,7 +199,7 @@ static MACHINE_DRIVER_START( stlforce )
MDRV_CPU_PROGRAM_MAP(stlforce_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index c937b2cdecf..cadeae1660d 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -2744,7 +2744,7 @@ static MACHINE_DRIVER_START( stv )
MDRV_MACHINE_START(stv)
MDRV_MACHINE_RESET(stv)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom") /* Actually 93c45 */
+ MDRV_EEPROM_93C46_ADD("eeprom") /* Actually 93c45 */
MDRV_TIMER_ADD("scan_timer", hblank_in_irq)
MDRV_TIMER_ADD("t1_timer", timer1_irq)
diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c
index ec0cef51ff4..46b3b29cbc8 100644
--- a/src/mame/drivers/superchs.c
+++ b/src/mame/drivers/superchs.c
@@ -373,7 +373,7 @@ static MACHINE_DRIVER_START( superchs )
MDRV_QUANTUM_TIME(HZ(480)) /* CPU slices - Need to interleave Cpu's 1 & 3 */
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", superchs_eeprom_interface)
+ MDRV_EEPROM_ADD("eeprom", superchs_eeprom_interface)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c
index 2d6082bf30b..e7c4f96153d 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -2444,7 +2444,7 @@ static MACHINE_DRIVER_START( pbobble )
MDRV_QUANTUM_TIME(HZ(600))
MDRV_MACHINE_RESET(mb87078)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", taitob_eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", taitob_eeprom_intf)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -2485,7 +2485,7 @@ static MACHINE_DRIVER_START( spacedx )
MDRV_QUANTUM_TIME(HZ(600))
MDRV_MACHINE_RESET(mb87078)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", taitob_eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", taitob_eeprom_intf)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -2564,7 +2564,7 @@ static MACHINE_DRIVER_START( qzshowby )
MDRV_QUANTUM_TIME(HZ(600))
MDRV_MACHINE_RESET(mb87078)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", taitob_eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", taitob_eeprom_intf)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c
index ae5f6f03007..4b14dcaaf9b 100644
--- a/src/mame/drivers/taito_f3.c
+++ b/src/mame/drivers/taito_f3.c
@@ -399,7 +399,7 @@ static MACHINE_DRIVER_START( f3 )
MDRV_MACHINE_START(f3)
MDRV_MACHINE_RESET(f3)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -448,14 +448,16 @@ static MACHINE_DRIVER_START( f3_eeprom )
MDRV_IMPORT_FROM(f3)
MDRV_DEVICE_REMOVE("eeprom")
- MDRV_EEPROM_93C46_ADD("eeprom", 128, recalh_eeprom)
+ MDRV_EEPROM_93C46_ADD("eeprom")
+ MDRV_EEPROM_DATA(recalh_eeprom, 128)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( f3_224b_eeprom )
MDRV_IMPORT_FROM(f3)
MDRV_DEVICE_REMOVE("eeprom")
- MDRV_EEPROM_93C46_ADD("eeprom", 128, recalh_eeprom)
+ MDRV_EEPROM_93C46_ADD("eeprom")
+ MDRV_EEPROM_DATA(recalh_eeprom, 128)
MACHINE_DRIVER_END
static const gfx_layout bubsympb_sprite_layout =
@@ -497,7 +499,7 @@ static MACHINE_DRIVER_START( bubsympb )
MDRV_MACHINE_START(f3)
//MDRV_MACHINE_RESET(f3)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c
index 414ff86e7ff..89aa4db2435 100644
--- a/src/mame/drivers/taito_z.c
+++ b/src/mame/drivers/taito_z.c
@@ -3268,7 +3268,8 @@ static MACHINE_DRIVER_START( spacegun )
MDRV_MACHINE_START(taitoz)
- MDRV_EEPROM_ADD("eeprom", spacegun_eeprom_intf, 128, spacegun_default_eeprom)
+ MDRV_EEPROM_ADD("eeprom", spacegun_eeprom_intf)
+ MDRV_EEPROM_DATA(spacegun_default_eeprom, 128)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c
index 5486aac5a01..48e17431a97 100644
--- a/src/mame/drivers/taitojc.c
+++ b/src/mame/drivers/taitojc.c
@@ -1337,7 +1337,7 @@ static MACHINE_DRIVER_START( taitojc )
MDRV_QUANTUM_TIME(HZ(6000))
MDRV_MACHINE_RESET(taitojc)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
MDRV_SCREEN_ADD("screen", RASTER)
MDRV_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index 2074df10c2a..222f9e4219f 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -945,11 +945,11 @@ static MACHINE_DRIVER_START( galgames )
MDRV_CPU_VBLANK_INT_HACK(galgames_interrupt, 1+20) // ??
// 5 EEPROMs on the motherboard (for BIOS + 4 Carts)
- MDRV_EEPROM_NODEFAULT_ADD(GALGAMES_EEPROM_BIOS, galgames_eeprom_interface)
- MDRV_EEPROM_NODEFAULT_ADD(GALGAMES_EEPROM_CART1, galgames_eeprom_interface)
- MDRV_EEPROM_NODEFAULT_ADD(GALGAMES_EEPROM_CART2, galgames_eeprom_interface)
- MDRV_EEPROM_NODEFAULT_ADD(GALGAMES_EEPROM_CART3, galgames_eeprom_interface)
- MDRV_EEPROM_NODEFAULT_ADD(GALGAMES_EEPROM_CART4, galgames_eeprom_interface)
+ MDRV_EEPROM_ADD(GALGAMES_EEPROM_BIOS, galgames_eeprom_interface)
+ MDRV_EEPROM_ADD(GALGAMES_EEPROM_CART1, galgames_eeprom_interface)
+ MDRV_EEPROM_ADD(GALGAMES_EEPROM_CART2, galgames_eeprom_interface)
+ MDRV_EEPROM_ADD(GALGAMES_EEPROM_CART3, galgames_eeprom_interface)
+ MDRV_EEPROM_ADD(GALGAMES_EEPROM_CART4, galgames_eeprom_interface)
MDRV_MACHINE_RESET( galgames )
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index 428699ef3c7..e43584b7114 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -2460,7 +2460,7 @@ static MACHINE_DRIVER_START( blswhstl )
MDRV_CPU_PROGRAM_MAP(ssriders_audio_map)
/* NMIs are generated by the 053260 */
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
@@ -2576,7 +2576,7 @@ static MACHINE_DRIVER_START( prmrsocr )
MDRV_CPU_PROGRAM_MAP(prmrsocr_audio_map)
/* NMIs are generated by the 054539 */
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", thndrx2_eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", thndrx2_eeprom_intf)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
@@ -2624,7 +2624,7 @@ static MACHINE_DRIVER_START( tmnt2 )
MDRV_CPU_PROGRAM_MAP(ssriders_audio_map)
/* NMIs are generated by the 053260 */
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
@@ -2669,7 +2669,7 @@ static MACHINE_DRIVER_START( ssriders )
MDRV_CPU_PROGRAM_MAP(ssriders_audio_map)
/* NMIs are generated by the 053260 */
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
@@ -2710,7 +2710,7 @@ static MACHINE_DRIVER_START( sunsetbl )
MDRV_CPU_PROGRAM_MAP(sunsetbl_main_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
@@ -2750,7 +2750,7 @@ static MACHINE_DRIVER_START( thndrx2 )
MDRV_CPU_PROGRAM_MAP(thndrx2_audio_map)
/* NMIs are generated by the 053260 */
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", thndrx2_eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", thndrx2_eeprom_intf)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS)
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index 6ba062d7eb9..022b5a7e1a0 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -4310,7 +4310,7 @@ static MACHINE_DRIVER_START( bbakraid )
MDRV_QUANTUM_TIME(HZ(600))
MDRV_MACHINE_RESET(toaplan2)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", bbakraid_93C66_intf)
+ MDRV_EEPROM_ADD("eeprom", bbakraid_93C66_intf)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
@@ -4340,7 +4340,8 @@ static MACHINE_DRIVER_START( bbakradu )
MDRV_IMPORT_FROM(bbakraid)
MDRV_DEVICE_REMOVE("eeprom")
- MDRV_EEPROM_ADD("eeprom", bbakraid_93C66_intf, 512, bbakraid_unlim_default)
+ MDRV_EEPROM_ADD("eeprom", bbakraid_93C66_intf)
+ MDRV_EEPROM_DATA(bbakraid_unlim_default, 512)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c
index 68d937ea6c2..5470553cd18 100644
--- a/src/mame/drivers/ultrsprt.c
+++ b/src/mame/drivers/ultrsprt.c
@@ -213,7 +213,7 @@ static MACHINE_DRIVER_START( ultrsprt )
MDRV_QUANTUM_TIME(HZ(12000))
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
MDRV_MACHINE_START(ultrsprt)
/* video hardware */
diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c
index 4d6941c0265..16dc130c4cb 100644
--- a/src/mame/drivers/undrfire.c
+++ b/src/mame/drivers/undrfire.c
@@ -706,7 +706,7 @@ static MACHINE_DRIVER_START( undrfire )
MDRV_CPU_PROGRAM_MAP(undrfire_map)
MDRV_CPU_VBLANK_INT("screen", undrfire_interrupt)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", undrfire_eeprom_interface)
+ MDRV_EEPROM_ADD("eeprom", undrfire_eeprom_interface)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -740,7 +740,7 @@ static MACHINE_DRIVER_START( cbombers )
MDRV_QUANTUM_TIME(HZ(480)) /* CPU slices - Need to interleave Cpu's 1 & 3 */
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", undrfire_eeprom_interface)
+ MDRV_EEPROM_ADD("eeprom", undrfire_eeprom_interface)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c
index a11ab86a878..2bea9099467 100644
--- a/src/mame/drivers/unico.c
+++ b/src/mame/drivers/unico.c
@@ -699,7 +699,7 @@ static MACHINE_DRIVER_START( zeropnt2 )
MDRV_MACHINE_RESET(zeropt)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", zeropnt2_eeprom_interface)
+ MDRV_EEPROM_ADD("eeprom", zeropnt2_eeprom_interface)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index 163a73f962c..fa9fb866132 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -628,7 +628,7 @@ static MACHINE_DRIVER_START( common )
MDRV_CPU_PROGRAM_MAP(common_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -743,7 +743,7 @@ static MACHINE_DRIVER_START( aoh )
MDRV_CPU_IO_MAP(aoh_io)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c
index f6682c580a1..9670428c059 100644
--- a/src/mame/drivers/vendetta.c
+++ b/src/mame/drivers/vendetta.c
@@ -472,7 +472,7 @@ static MACHINE_DRIVER_START( vendetta )
MDRV_MACHINE_RESET(vendetta)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c
index c937716d525..5678a21398d 100644
--- a/src/mame/drivers/xexex.c
+++ b/src/mame/drivers/xexex.c
@@ -476,7 +476,7 @@ static MACHINE_DRIVER_START( xexex )
MDRV_MACHINE_START(xexex)
MDRV_MACHINE_RESET(xexex)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_BEFORE_VBLANK)
diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c
index a079bf393d5..571d5f8227e 100644
--- a/src/mame/drivers/xmen.c
+++ b/src/mame/drivers/xmen.c
@@ -354,7 +354,7 @@ static MACHINE_DRIVER_START( xmen )
MDRV_MACHINE_START(xmen)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
@@ -432,7 +432,7 @@ static MACHINE_DRIVER_START( xmen6p )
MDRV_MACHINE_RESET(xmen6p)
- MDRV_EEPROM_NODEFAULT_ADD("eeprom", eeprom_intf)
+ MDRV_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c
index cc070b46a29..8b0923a51ed 100644
--- a/src/mame/drivers/xorworld.c
+++ b/src/mame/drivers/xorworld.c
@@ -187,7 +187,7 @@ static MACHINE_DRIVER_START( xorworld )
MDRV_QUANTUM_TIME(HZ(60))
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
// video hardware
diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c
index ed1ecd4e2d4..7b390d28796 100644
--- a/src/mame/drivers/zr107.c
+++ b/src/mame/drivers/zr107.c
@@ -738,7 +738,7 @@ static MACHINE_DRIVER_START( zr107 )
MDRV_QUANTUM_TIME(HZ(30000))
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
MDRV_MACHINE_START(zr107)
MDRV_MACHINE_RESET(zr107)
@@ -791,7 +791,7 @@ static MACHINE_DRIVER_START( jetwave )
MDRV_QUANTUM_TIME(HZ(30000))
- MDRV_EEPROM_93C46_NODEFAULT_ADD("eeprom")
+ MDRV_EEPROM_93C46_ADD("eeprom")
MDRV_MACHINE_START(zr107)
MDRV_MACHINE_RESET(zr107)