diff options
Diffstat (limited to 'src/emu')
103 files changed, 704 insertions, 704 deletions
diff --git a/src/emu/cpu/adsp2100/adsp2100.h b/src/emu/cpu/adsp2100/adsp2100.h index 360d866006c..f3f4ac813b1 100644 --- a/src/emu/cpu/adsp2100/adsp2100.h +++ b/src/emu/cpu/adsp2100/adsp2100.h @@ -55,7 +55,7 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_ADSP21XX_CONFIG(_config) \ +#define MCFG_ADSP21XX_CONFIG(_config) \ adsp21xx_device_config::static_set_config(device, _config); \ diff --git a/src/emu/deprecat.h b/src/emu/deprecat.h index 70a34b02b7f..aae7624b722 100644 --- a/src/emu/deprecat.h +++ b/src/emu/deprecat.h @@ -30,7 +30,7 @@ * *************************************/ -#define MDRV_CPU_VBLANK_INT_HACK(_func, _rate) \ +#define MCFG_CPU_VBLANK_INT_HACK(_func, _rate) \ device_config_execute_interface::static_set_vblank_int(device, _func, NULL, _rate); \ diff --git a/src/emu/devcb.h b/src/emu/devcb.h index 6c9f540fa17..77b7dd3dc65 100644 --- a/src/emu/devcb.h +++ b/src/emu/devcb.h @@ -135,18 +135,18 @@ void devcb_stub(device_t *device, offs_t offset, UINT8 data) /* macros for inline device handler initialization */ -#define MDRV_DEVICE_CONFIG_DEVCB_GENERIC(_access, _struct, _entry, _tag, _type, _linefunc, _devfunc, _spacefunc) \ - MDRV_DEVICE_CONFIG_DATA32(_struct, _entry .type, DEVCB_TYPE_DEVICE) \ - MDRV_DEVICE_CONFIG_DATAPTR(_struct, _entry .tag, _tag) \ - MDRV_DEVICE_CONFIG_DATAPTR(_struct, _entry . _access ## line, _linefunc) \ - MDRV_DEVICE_CONFIG_DATAPTR(_struct, _entry . _access ## device, _devfunc) \ - MDRV_DEVICE_CONFIG_DATAPTR(_struct, _entry . _access ## space, _spacefunc) - -#define MDRV_DEVICE_CONFIG_READ_LINE(_struct, _entry, _tag, _func) MDRV_DEVICE_CONFIG_DEVCB_GENERIC(read, _struct, _entry, _tag, DEVCB_TYPE_DEVICE, _func, NULL, NULL) -#define MDRV_DEVICE_CONFIG_WRITE_LINE(_struct, _entry, _tag, _func) MDRV_DEVICE_CONFIG_DEVCB_GENERIC(write, _struct, _entry, _tag, DEVCB_TYPE_DEVICE, _func, NULL, NULL) - -#define MDRV_DEVICE_CONFIG_READ_HANDLER(_struct, _entry, _tag, _func) MDRV_DEVICE_CONFIG_DEVCB_GENERIC(read, _struct, _entry, _tag, DEVCB_TYPE_DEVICE, NULL, _func, NULL) -#define MDRV_DEVICE_CONFIG_WRITE_HANDLER(_struct, _entry, _tag, _func) MDRV_DEVICE_CONFIG_DEVCB_GENERIC(write, _struct, _entry, _tag, DEVCB_TYPE_DEVICE, NULL, _func, NULL) +#define MCFG_DEVICE_CONFIG_DEVCB_GENERIC(_access, _struct, _entry, _tag, _type, _linefunc, _devfunc, _spacefunc) \ + MCFG_DEVICE_CONFIG_DATA32(_struct, _entry .type, DEVCB_TYPE_DEVICE) \ + MCFG_DEVICE_CONFIG_DATAPTR(_struct, _entry .tag, _tag) \ + MCFG_DEVICE_CONFIG_DATAPTR(_struct, _entry . _access ## line, _linefunc) \ + MCFG_DEVICE_CONFIG_DATAPTR(_struct, _entry . _access ## device, _devfunc) \ + MCFG_DEVICE_CONFIG_DATAPTR(_struct, _entry . _access ## space, _spacefunc) + +#define MCFG_DEVICE_CONFIG_READ_LINE(_struct, _entry, _tag, _func) MCFG_DEVICE_CONFIG_DEVCB_GENERIC(read, _struct, _entry, _tag, DEVCB_TYPE_DEVICE, _func, NULL, NULL) +#define MCFG_DEVICE_CONFIG_WRITE_LINE(_struct, _entry, _tag, _func) MCFG_DEVICE_CONFIG_DEVCB_GENERIC(write, _struct, _entry, _tag, DEVCB_TYPE_DEVICE, _func, NULL, NULL) + +#define MCFG_DEVICE_CONFIG_READ_HANDLER(_struct, _entry, _tag, _func) MCFG_DEVICE_CONFIG_DEVCB_GENERIC(read, _struct, _entry, _tag, DEVCB_TYPE_DEVICE, NULL, _func, NULL) +#define MCFG_DEVICE_CONFIG_WRITE_HANDLER(_struct, _entry, _tag, _func) MCFG_DEVICE_CONFIG_DEVCB_GENERIC(write, _struct, _entry, _tag, DEVCB_TYPE_DEVICE, NULL, _func, NULL) diff --git a/src/emu/devcpu.h b/src/emu/devcpu.h index 2d9f5bc398d..b3e8412b65b 100644 --- a/src/emu/devcpu.h +++ b/src/emu/devcpu.h @@ -147,19 +147,19 @@ enum // CPU DEVICE CONFIGURATION MACROS //************************************************************************** -#define MDRV_CPU_ADD MDRV_DEVICE_ADD -#define MDRV_CPU_MODIFY MDRV_DEVICE_MODIFY -#define MDRV_CPU_REPLACE MDRV_DEVICE_REPLACE +#define MCFG_CPU_ADD MCFG_DEVICE_ADD +#define MCFG_CPU_MODIFY MCFG_DEVICE_MODIFY +#define MCFG_CPU_REPLACE MCFG_DEVICE_REPLACE -#define MDRV_CPU_CLOCK MDRV_DEVICE_CLOCK -#define MDRV_CPU_CONFIG MDRV_DEVICE_CONFIG +#define MCFG_CPU_CLOCK MCFG_DEVICE_CLOCK +#define MCFG_CPU_CONFIG MCFG_DEVICE_CONFIG -#define MDRV_CPU_PROGRAM_MAP MDRV_DEVICE_PROGRAM_MAP -#define MDRV_CPU_DATA_MAP MDRV_DEVICE_DATA_MAP -#define MDRV_CPU_IO_MAP MDRV_DEVICE_IO_MAP +#define MCFG_CPU_PROGRAM_MAP MCFG_DEVICE_PROGRAM_MAP +#define MCFG_CPU_DATA_MAP MCFG_DEVICE_DATA_MAP +#define MCFG_CPU_IO_MAP MCFG_DEVICE_IO_MAP -#define MDRV_CPU_VBLANK_INT MDRV_DEVICE_VBLANK_INT -#define MDRV_CPU_PERIODIC_INT MDRV_DEVICE_PERIODIC_INT +#define MCFG_CPU_VBLANK_INT MCFG_DEVICE_VBLANK_INT +#define MCFG_CPU_PERIODIC_INT MCFG_DEVICE_PERIODIC_INT diff --git a/src/emu/devintrf.h b/src/emu/devintrf.h index ed7c058d0c3..6ed7bba226a 100644 --- a/src/emu/devintrf.h +++ b/src/emu/devintrf.h @@ -99,13 +99,13 @@ device_t *_ConfigClass::alloc_device(running_machine &machine) const \ //************************************************************************** // configure devices -#define MDRV_DEVICE_CONFIG(_config) \ +#define MCFG_DEVICE_CONFIG(_config) \ device_config::static_set_static_config(device, &(_config)); \ -#define MDRV_DEVICE_CONFIG_CLEAR() \ +#define MCFG_DEVICE_CONFIG_CLEAR() \ device_config::static_set_static_config(device, NULL); \ -#define MDRV_DEVICE_CLOCK(_clock) \ +#define MCFG_DEVICE_CLOCK(_clock) \ device_config::static_set_clock(device, _clock); \ diff --git a/src/emu/devlegcy.h b/src/emu/devlegcy.h index d49bc594bf0..a70fae5fb2e 100644 --- a/src/emu/devlegcy.h +++ b/src/emu/devlegcy.h @@ -278,91 +278,91 @@ const device_type name = configclass::static_alloc_device_config #define structsizeof(_struct, _field) sizeof(((_struct *)NULL)->_field) // inline device configurations that require 32 bits of storage in the token -#define MDRV_DEVICE_CONFIG_DATA32_EXPLICIT(_size, _offset, _val) \ +#define MCFG_DEVICE_CONFIG_DATA32_EXPLICIT(_size, _offset, _val) \ legacy_device_config_base::static_set_inline32(device, _offset, _size, (UINT32)(_val)); -#define MDRV_DEVICE_CONFIG_DATA32(_struct, _field, _val) \ - MDRV_DEVICE_CONFIG_DATA32_EXPLICIT(structsizeof(_struct, _field), offsetof(_struct, _field), _val) +#define MCFG_DEVICE_CONFIG_DATA32(_struct, _field, _val) \ + MCFG_DEVICE_CONFIG_DATA32_EXPLICIT(structsizeof(_struct, _field), offsetof(_struct, _field), _val) -#define MDRV_DEVICE_CONFIG_DATA32_ARRAY(_struct, _field, _index, _val) \ - MDRV_DEVICE_CONFIG_DATA32_EXPLICIT(structsizeof(_struct, _field[0]), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]), _val) +#define MCFG_DEVICE_CONFIG_DATA32_ARRAY(_struct, _field, _index, _val) \ + MCFG_DEVICE_CONFIG_DATA32_EXPLICIT(structsizeof(_struct, _field[0]), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]), _val) -#define MDRV_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) \ - MDRV_DEVICE_CONFIG_DATA32_EXPLICIT(structsizeof(_memstruct, _member), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]) + offsetof(_memstruct, _member), _val) +#define MCFG_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) \ + MCFG_DEVICE_CONFIG_DATA32_EXPLICIT(structsizeof(_memstruct, _member), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]) + offsetof(_memstruct, _member), _val) -#define MDRV_NEW_DEVICE_CONFIG_DATA32(_struct, _field, _val) \ - MDRV_DEVICE_CONFIG_DATA32_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field), DEVCONFIG_OFFSETOF(_struct, _field), _val) +#define MCFG_NEW_DEVICE_CONFIG_DATA32(_struct, _field, _val) \ + MCFG_DEVICE_CONFIG_DATA32_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field), DEVCONFIG_OFFSETOF(_struct, _field), _val) -#define MDRV_NEW_DEVICE_CONFIG_DATA32_ARRAY(_struct, _field, _index, _val) \ - MDRV_DEVICE_CONFIG_DATA32_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field[0]), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]), _val) +#define MCFG_NEW_DEVICE_CONFIG_DATA32_ARRAY(_struct, _field, _index, _val) \ + MCFG_DEVICE_CONFIG_DATA32_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field[0]), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]), _val) -#define MDRV_NEW_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) \ - MDRV_DEVICE_CONFIG_DATA32_EXPLICIT(DEVCONFIG_SIZEOF(_memstruct, _member), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]) + DEVCONFIG_OFFSETOF(_memstruct, _member), _val) +#define MCFG_NEW_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) \ + MCFG_DEVICE_CONFIG_DATA32_EXPLICIT(DEVCONFIG_SIZEOF(_memstruct, _member), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]) + DEVCONFIG_OFFSETOF(_memstruct, _member), _val) // inline device configurations that require 32 bits of fixed-point storage in the token -#define MDRV_DEVICE_CONFIG_DATAFP32_EXPLICIT(_size, _offset, _val, _fixbits) \ +#define MCFG_DEVICE_CONFIG_DATAFP32_EXPLICIT(_size, _offset, _val, _fixbits) \ legacy_device_config_base::static_set_inline_float(device, _offset, _size, (float)(_val)); -#define MDRV_DEVICE_CONFIG_DATAFP32(_struct, _field, _val, _fixbits) \ - MDRV_DEVICE_CONFIG_DATAFP32_EXPLICIT(structsizeof(_struct, _field), offsetof(_struct, _field), _val, _fixbits) +#define MCFG_DEVICE_CONFIG_DATAFP32(_struct, _field, _val, _fixbits) \ + MCFG_DEVICE_CONFIG_DATAFP32_EXPLICIT(structsizeof(_struct, _field), offsetof(_struct, _field), _val, _fixbits) -#define MDRV_DEVICE_CONFIG_DATAFP32_ARRAY(_struct, _field, _index, _val, _fixbits) \ - MDRV_DEVICE_CONFIG_DATAFP32_EXPLICIT(structsizeof(_struct, _field[0]), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]), _val, _fixbits) +#define MCFG_DEVICE_CONFIG_DATAFP32_ARRAY(_struct, _field, _index, _val, _fixbits) \ + MCFG_DEVICE_CONFIG_DATAFP32_EXPLICIT(structsizeof(_struct, _field[0]), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]), _val, _fixbits) -#define MDRV_DEVICE_CONFIG_DATAFP32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val, _fixbits) \ - MDRV_DEVICE_CONFIG_DATAFP32_EXPLICIT(structsizeof(_memstruct, _member), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]) + offsetof(_memstruct, _member), _val, _fixbits) +#define MCFG_DEVICE_CONFIG_DATAFP32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val, _fixbits) \ + MCFG_DEVICE_CONFIG_DATAFP32_EXPLICIT(structsizeof(_memstruct, _member), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]) + offsetof(_memstruct, _member), _val, _fixbits) -#define MDRV_DEVICE_NEW_CONFIG_DATAFP32(_struct, _field, _val, _fixbits) \ - MDRV_DEVICE_CONFIG_DATAFP32_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field), DEVCONFIG_OFFSETOF(_struct, _field), _val, _fixbits) +#define MCFG_DEVICE_NEW_CONFIG_DATAFP32(_struct, _field, _val, _fixbits) \ + MCFG_DEVICE_CONFIG_DATAFP32_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field), DEVCONFIG_OFFSETOF(_struct, _field), _val, _fixbits) -#define MDRV_DEVICE_NEW_CONFIG_DATAFP32_ARRAY(_struct, _field, _index, _val, _fixbits) \ - MDRV_DEVICE_CONFIG_DATAFP32_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field[0]), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]), _val, _fixbits) +#define MCFG_DEVICE_NEW_CONFIG_DATAFP32_ARRAY(_struct, _field, _index, _val, _fixbits) \ + MCFG_DEVICE_CONFIG_DATAFP32_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field[0]), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]), _val, _fixbits) -#define MDRV_DEVICE_NEW_CONFIG_DATAFP32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val, _fixbits) \ - MDRV_DEVICE_CONFIG_DATAFP32_EXPLICIT(DEVCONFIG_SIZEOF(_memstruct, _member), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]) + DEVCONFIG_OFFSETOF(_memstruct, _member), _val, _fixbits) +#define MCFG_DEVICE_NEW_CONFIG_DATAFP32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val, _fixbits) \ + MCFG_DEVICE_CONFIG_DATAFP32_EXPLICIT(DEVCONFIG_SIZEOF(_memstruct, _member), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]) + DEVCONFIG_OFFSETOF(_memstruct, _member), _val, _fixbits) // inline device configurations that require 64 bits of storage in the token -#define MDRV_DEVICE_CONFIG_DATA64_EXPLICIT(_size, _offset, _val) \ +#define MCFG_DEVICE_CONFIG_DATA64_EXPLICIT(_size, _offset, _val) \ legacy_device_config_base::static_set_inline64(device, _offset, _size, (UINT64)(_val)); -#define MDRV_DEVICE_CONFIG_DATA64(_struct, _field, _val) \ - MDRV_DEVICE_CONFIG_DATA64_EXPLICIT(structsizeof(_struct, _field), offsetof(_struct, _field), _val) +#define MCFG_DEVICE_CONFIG_DATA64(_struct, _field, _val) \ + MCFG_DEVICE_CONFIG_DATA64_EXPLICIT(structsizeof(_struct, _field), offsetof(_struct, _field), _val) -#define MDRV_DEVICE_CONFIG_DATA64_ARRAY(_struct, _field, _index, _val) \ - MDRV_DEVICE_CONFIG_DATA64_EXPLICIT(structsizeof(_struct, _field[0]), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]), _val) +#define MCFG_DEVICE_CONFIG_DATA64_ARRAY(_struct, _field, _index, _val) \ + MCFG_DEVICE_CONFIG_DATA64_EXPLICIT(structsizeof(_struct, _field[0]), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]), _val) -#define MDRV_DEVICE_CONFIG_DATA64_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) \ - MDRV_DEVICE_CONFIG_DATA64_EXPLICIT(structsizeof(_memstruct, _member), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]) + offsetof(_memstruct, _member), _val) +#define MCFG_DEVICE_CONFIG_DATA64_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) \ + MCFG_DEVICE_CONFIG_DATA64_EXPLICIT(structsizeof(_memstruct, _member), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]) + offsetof(_memstruct, _member), _val) -#define MDRV_DEVICE_NEW_CONFIG_DATA64(_struct, _field, _val) \ - MDRV_DEVICE_CONFIG_DATA64_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field), DEVCONFIG_OFFSETOF(_struct, _field), _val) +#define MCFG_DEVICE_NEW_CONFIG_DATA64(_struct, _field, _val) \ + MCFG_DEVICE_CONFIG_DATA64_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field), DEVCONFIG_OFFSETOF(_struct, _field), _val) -#define MDRV_DEVICE_NEW_CONFIG_DATA64_ARRAY(_struct, _field, _index, _val) \ - MDRV_DEVICE_CONFIG_DATA64_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field[0]), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]), _val) +#define MCFG_DEVICE_NEW_CONFIG_DATA64_ARRAY(_struct, _field, _index, _val) \ + MCFG_DEVICE_CONFIG_DATA64_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field[0]), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]), _val) -#define MDRV_DEVICE_NEW_CONFIG_DATA64_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) \ - MDRV_DEVICE_CONFIG_DATA64_EXPLICIT(DEVCONFIG_SIZEOF(_memstruct, _member), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]) + DEVCONFIG_OFFSETOF(_memstruct, _member), _val) +#define MCFG_DEVICE_NEW_CONFIG_DATA64_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) \ + MCFG_DEVICE_CONFIG_DATA64_EXPLICIT(DEVCONFIG_SIZEOF(_memstruct, _member), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]) + DEVCONFIG_OFFSETOF(_memstruct, _member), _val) // inline device configurations that require a pointer-sized amount of storage in the token #ifdef PTR64 -#define MDRV_DEVICE_CONFIG_DATAPTR_EXPLICIT(_struct, _size, _offset) MDRV_DEVICE_CONFIG_DATA64_EXPLICIT(_struct, _size, _offset) -#define MDRV_DEVICE_CONFIG_DATAPTR(_struct, _field, _val) MDRV_DEVICE_CONFIG_DATA64(_struct, _field, _val) -#define MDRV_DEVICE_CONFIG_DATAPTR_ARRAY(_struct, _field, _index, _val) MDRV_DEVICE_CONFIG_DATA64_ARRAY(_struct, _field, _index, _val) -#define MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) MDRV_DEVICE_CONFIG_DATA64_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) -#define MDRV_DEVICE_NEW_CONFIG_DATAPTR(_struct, _field, _val) MDRV_DEVICE_NEW_CONFIG_DATA64(_struct, _field, _val) -#define MDRV_DEVICE_NEW_CONFIG_DATAPTR_ARRAY(_struct, _field, _index, _val) MDRV_DEVICE_NEW_CONFIG_DATA64_ARRAY(_struct, _field, _index, _val) -#define MDRV_DEVICE_NEW_CONFIG_DATAPTR_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) MDRV_DEVICE_NEW_CONFIG_DATA64_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) +#define MCFG_DEVICE_CONFIG_DATAPTR_EXPLICIT(_struct, _size, _offset) MCFG_DEVICE_CONFIG_DATA64_EXPLICIT(_struct, _size, _offset) +#define MCFG_DEVICE_CONFIG_DATAPTR(_struct, _field, _val) MCFG_DEVICE_CONFIG_DATA64(_struct, _field, _val) +#define MCFG_DEVICE_CONFIG_DATAPTR_ARRAY(_struct, _field, _index, _val) MCFG_DEVICE_CONFIG_DATA64_ARRAY(_struct, _field, _index, _val) +#define MCFG_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) MCFG_DEVICE_CONFIG_DATA64_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) +#define MCFG_DEVICE_NEW_CONFIG_DATAPTR(_struct, _field, _val) MCFG_DEVICE_NEW_CONFIG_DATA64(_struct, _field, _val) +#define MCFG_DEVICE_NEW_CONFIG_DATAPTR_ARRAY(_struct, _field, _index, _val) MCFG_DEVICE_NEW_CONFIG_DATA64_ARRAY(_struct, _field, _index, _val) +#define MCFG_DEVICE_NEW_CONFIG_DATAPTR_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) MCFG_DEVICE_NEW_CONFIG_DATA64_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) #else -#define MDRV_DEVICE_CONFIG_DATAPTR_EXPLICIT(_struct, _size, _offset) MDRV_DEVICE_CONFIG_DATA32_EXPLICIT(_struct, _size, _offset) -#define MDRV_DEVICE_CONFIG_DATAPTR(_struct, _field, _val) MDRV_DEVICE_CONFIG_DATA32(_struct, _field, _val) -#define MDRV_DEVICE_CONFIG_DATAPTR_ARRAY(_struct, _field, _index, _val) MDRV_DEVICE_CONFIG_DATA32_ARRAY(_struct, _field, _index, _val) -#define MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) MDRV_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) -#define MDRV_DEVICE_CONFIG_NEW_DATAPTR(_struct, _field, _val) MDRV_DEVICE_NEW_CONFIG_DATA32(_struct, _field, _val) -#define MDRV_DEVICE_CONFIG_NEW_DATAPTR_ARRAY(_struct, _field, _index, _val) MDRV_DEVICE_NEW_CONFIG_DATA32_ARRAY(_struct, _field, _index, _val) -#define MDRV_DEVICE_CONFIG_NEW_DATAPTR_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) MDRV_DEVICE_NEW_CONFIG_DATA32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) +#define MCFG_DEVICE_CONFIG_DATAPTR_EXPLICIT(_struct, _size, _offset) MCFG_DEVICE_CONFIG_DATA32_EXPLICIT(_struct, _size, _offset) +#define MCFG_DEVICE_CONFIG_DATAPTR(_struct, _field, _val) MCFG_DEVICE_CONFIG_DATA32(_struct, _field, _val) +#define MCFG_DEVICE_CONFIG_DATAPTR_ARRAY(_struct, _field, _index, _val) MCFG_DEVICE_CONFIG_DATA32_ARRAY(_struct, _field, _index, _val) +#define MCFG_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) MCFG_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) +#define MCFG_DEVICE_CONFIG_NEW_DATAPTR(_struct, _field, _val) MCFG_DEVICE_NEW_CONFIG_DATA32(_struct, _field, _val) +#define MCFG_DEVICE_CONFIG_NEW_DATAPTR_ARRAY(_struct, _field, _index, _val) MCFG_DEVICE_NEW_CONFIG_DATA32_ARRAY(_struct, _field, _index, _val) +#define MCFG_DEVICE_CONFIG_NEW_DATAPTR_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) MCFG_DEVICE_NEW_CONFIG_DATA32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) #endif diff --git a/src/emu/diexec.c b/src/emu/diexec.c index d3a32d62493..b404baba375 100644 --- a/src/emu/diexec.c +++ b/src/emu/diexec.c @@ -101,7 +101,7 @@ void device_config_execute_interface::static_set_disable(device_config *device) { device_config_execute_interface *exec = dynamic_cast<device_config_execute_interface *>(device); if (exec == NULL) - throw emu_fatalerror("MDRV_DEVICE_DISABLE called on device '%s' with no execute interface", device->tag()); + throw emu_fatalerror("MCFG_DEVICE_DISABLE called on device '%s' with no execute interface", device->tag()); exec->m_disabled = true; } @@ -115,7 +115,7 @@ void device_config_execute_interface::static_set_vblank_int(device_config *devic { device_config_execute_interface *exec = dynamic_cast<device_config_execute_interface *>(device); if (exec == NULL) - throw emu_fatalerror("MDRV_DEVICE_VBLANK_INT called on device '%s' with no execute interface", device->tag()); + throw emu_fatalerror("MCFG_DEVICE_VBLANK_INT called on device '%s' with no execute interface", device->tag()); exec->m_vblank_interrupt = function; exec->m_vblank_interrupts_per_frame = rate; exec->m_vblank_interrupt_screen = tag; @@ -131,7 +131,7 @@ void device_config_execute_interface::static_set_periodic_int(device_config *dev { device_config_execute_interface *exec = dynamic_cast<device_config_execute_interface *>(device); if (exec == NULL) - throw emu_fatalerror("MDRV_DEVICE_PERIODIC_INT called on device '%s' with no execute interface", device->tag()); + throw emu_fatalerror("MCFG_DEVICE_PERIODIC_INT called on device '%s' with no execute interface", device->tag()); exec->m_timed_interrupt = function; exec->m_timed_interrupt_period = rate; } diff --git a/src/emu/diexec.h b/src/emu/diexec.h index e19f4d1f997..cb9b6ae35ef 100644 --- a/src/emu/diexec.h +++ b/src/emu/diexec.h @@ -108,13 +108,13 @@ enum // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_DEVICE_DISABLE() \ +#define MCFG_DEVICE_DISABLE() \ device_config_execute_interface::static_set_disable(device); \ -#define MDRV_DEVICE_VBLANK_INT(_tag, _func) \ +#define MCFG_DEVICE_VBLANK_INT(_tag, _func) \ device_config_execute_interface::static_set_vblank_int(device, _func, _tag); \ -#define MDRV_DEVICE_PERIODIC_INT(_func, _rate) \ +#define MCFG_DEVICE_PERIODIC_INT(_func, _rate) \ device_config_execute_interface::static_set_periodic_int(device, _func, ATTOTIME_IN_HZ(_rate)); \ diff --git a/src/emu/dimemory.c b/src/emu/dimemory.c index 4e36a84fc7c..f120f64aa00 100644 --- a/src/emu/dimemory.c +++ b/src/emu/dimemory.c @@ -152,9 +152,9 @@ void device_config_memory_interface::static_set_addrmap(device_config *device, i { device_config_memory_interface *memory = dynamic_cast<device_config_memory_interface *>(device); if (memory == NULL) - throw emu_fatalerror("MDRV_DEVICE_ADDRESS_MAP called on device '%s' with no memory interface", device->tag()); + throw emu_fatalerror("MCFG_DEVICE_ADDRESS_MAP called on device '%s' with no memory interface", device->tag()); if (spacenum >= ARRAY_LENGTH(memory->m_address_map)) - throw emu_fatalerror("MDRV_DEVICE_ADDRESS_MAP called with out-of-range space number %d", device->tag(), spacenum); + throw emu_fatalerror("MCFG_DEVICE_ADDRESS_MAP called with out-of-range space number %d", device->tag(), spacenum); memory->m_address_map[spacenum] = map; } diff --git a/src/emu/dimemory.h b/src/emu/dimemory.h index 362c86c1497..9ee9b0847dd 100644 --- a/src/emu/dimemory.h +++ b/src/emu/dimemory.h @@ -81,17 +81,17 @@ const int TRANSLATE_FETCH_DEBUG = (TRANSLATE_FETCH | TRANSLATE_DEBUG_MASK); // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_DEVICE_ADDRESS_MAP(_space, _map) \ +#define MCFG_DEVICE_ADDRESS_MAP(_space, _map) \ device_config_memory_interface::static_set_addrmap(device, _space, ADDRESS_MAP_NAME(_map)); -#define MDRV_DEVICE_PROGRAM_MAP(_map) \ - MDRV_DEVICE_ADDRESS_MAP(AS_PROGRAM, _map) +#define MCFG_DEVICE_PROGRAM_MAP(_map) \ + MCFG_DEVICE_ADDRESS_MAP(AS_PROGRAM, _map) -#define MDRV_DEVICE_DATA_MAP(_map) \ - MDRV_DEVICE_ADDRESS_MAP(AS_DATA, _map) +#define MCFG_DEVICE_DATA_MAP(_map) \ + MCFG_DEVICE_ADDRESS_MAP(AS_DATA, _map) -#define MDRV_DEVICE_IO_MAP(_map) \ - MDRV_DEVICE_ADDRESS_MAP(AS_IO, _map) +#define MCFG_DEVICE_IO_MAP(_map) \ + MCFG_DEVICE_ADDRESS_MAP(AS_IO, _map) diff --git a/src/emu/disound.c b/src/emu/disound.c index 7e1151fcc1f..4bba628bb68 100644 --- a/src/emu/disound.c +++ b/src/emu/disound.c @@ -76,7 +76,7 @@ void device_config_sound_interface::static_add_route(device_config *device, UINT { device_config_sound_interface *sound = dynamic_cast<device_config_sound_interface *>(device); if (sound == NULL) - throw emu_fatalerror("MDRV_SOUND_ROUTE called on device '%s' with no sound interface", device->tag()); + throw emu_fatalerror("MCFG_SOUND_ROUTE called on device '%s' with no sound interface", device->tag()); sound_route **routeptr; for (routeptr = &sound->m_route_list; *routeptr != NULL; routeptr = &(*routeptr)->m_next) ; @@ -93,7 +93,7 @@ void device_config_sound_interface::static_reset_routes(device_config *device) { device_config_sound_interface *sound = dynamic_cast<device_config_sound_interface *>(device); if (sound == NULL) - throw emu_fatalerror("MDRV_SOUND_ROUTES_RESET called on device '%s' with no sound interface", device->tag()); + throw emu_fatalerror("MCFG_SOUND_ROUTES_RESET called on device '%s' with no sound interface", device->tag()); sound->reset_routes(); } diff --git a/src/emu/disound.h b/src/emu/disound.h index 47bcc16ea92..8fbb6414c4e 100644 --- a/src/emu/disound.h +++ b/src/emu/disound.h @@ -60,28 +60,28 @@ const int ALL_OUTPUTS = MAX_OUTPUTS; // special value indicating all outputs fo // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_SOUND_ADD(_tag, _type, _clock) \ - MDRV_DEVICE_ADD(_tag, _type, _clock) \ +#define MCFG_SOUND_ADD(_tag, _type, _clock) \ + MCFG_DEVICE_ADD(_tag, _type, _clock) \ -#define MDRV_SOUND_MODIFY(_tag) \ - MDRV_DEVICE_MODIFY(_tag) +#define MCFG_SOUND_MODIFY(_tag) \ + MCFG_DEVICE_MODIFY(_tag) -#define MDRV_SOUND_CLOCK(_clock) \ - MDRV_DEVICE_CLOCK(_clock) +#define MCFG_SOUND_CLOCK(_clock) \ + MCFG_DEVICE_CLOCK(_clock) -#define MDRV_SOUND_REPLACE(_tag, _type, _clock) \ - MDRV_DEVICE_REPLACE(_tag, _type, _clock) +#define MCFG_SOUND_REPLACE(_tag, _type, _clock) \ + MCFG_DEVICE_REPLACE(_tag, _type, _clock) -#define MDRV_SOUND_CONFIG(_config) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_SOUND_CONFIG(_config) \ + MCFG_DEVICE_CONFIG(_config) -#define MDRV_SOUND_ROUTE_EX(_output, _target, _gain, _input) \ +#define MCFG_SOUND_ROUTE_EX(_output, _target, _gain, _input) \ device_config_sound_interface::static_add_route(device, _output, _target, _gain, _input); \ -#define MDRV_SOUND_ROUTE(_output, _target, _gain) \ - MDRV_SOUND_ROUTE_EX(_output, _target, _gain, 0) +#define MCFG_SOUND_ROUTE(_output, _target, _gain) \ + MCFG_SOUND_ROUTE_EX(_output, _target, _gain, 0) -#define MDRV_SOUND_ROUTES_RESET() \ +#define MCFG_SOUND_ROUTES_RESET() \ device_config_sound_interface::static_reset_routes(device); \ diff --git a/src/emu/drivers/empty.c b/src/emu/drivers/empty.c index d057e34e5b7..ad4511b44f3 100644 --- a/src/emu/drivers/empty.c +++ b/src/emu/drivers/empty.c @@ -36,14 +36,14 @@ static MACHINE_START( empty ) static MACHINE_CONFIG_START( empty, driver_device ) - MDRV_MACHINE_START(empty) + MCFG_MACHINE_START(empty) /* video hardware */ - MDRV_SCREEN_ADD("screen", RASTER) - MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) - MDRV_SCREEN_SIZE(640,480) - MDRV_SCREEN_VISIBLE_AREA(0,639, 0,479) - MDRV_SCREEN_REFRESH_RATE(30) + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) + MCFG_SCREEN_SIZE(640,480) + MCFG_SCREEN_VISIBLE_AREA(0,639, 0,479) + MCFG_SCREEN_REFRESH_RATE(30) MACHINE_CONFIG_END diff --git a/src/emu/drivers/emudummy.c b/src/emu/drivers/emudummy.c index a52e106e71e..af5f26f9743 100644 --- a/src/emu/drivers/emudummy.c +++ b/src/emu/drivers/emudummy.c @@ -49,9 +49,9 @@ MACHINE_CONFIG_START( __dummy, driver_device ) - MDRV_CPU_ADD("dummy1", I8049, 1000000) - MDRV_CPU_ADD("dummy2", I8748, 1000000) - MDRV_CPU_ADD("dummy3", Z80, 1000000) + MCFG_CPU_ADD("dummy1", I8049, 1000000) + MCFG_CPU_ADD("dummy2", I8748, 1000000) + MCFG_CPU_ADD("dummy3", Z80, 1000000) MACHINE_CONFIG_END diff --git a/src/emu/emupal.h b/src/emu/emupal.h index 47f8a5ef67f..9b590de8c46 100644 --- a/src/emu/emupal.h +++ b/src/emu/emupal.h @@ -72,7 +72,7 @@ Shadows(Highlights) Quick Reference ----------------------------------- - 1) declare MDRV_VIDEO_ATTRIBUTES( ... VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS ... ) + 1) declare MCFG_VIDEO_ATTRIBUTES( ... VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS ... ) 2) make a pen table fill with DRAWMODE_NONE, DRAWMODE_SOURCE or DRAWMODE_SHADOW diff --git a/src/emu/machine/6522via.h b/src/emu/machine/6522via.h index a446df91cfe..deb02af94f1 100644 --- a/src/emu/machine/6522via.h +++ b/src/emu/machine/6522via.h @@ -24,9 +24,9 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_VIA6522_ADD(_tag, _clock, _intrf) \ - MDRV_DEVICE_ADD(_tag, VIA6522, _clock) \ - MDRV_DEVICE_CONFIG(_intrf) +#define MCFG_VIA6522_ADD(_tag, _clock, _intrf) \ + MCFG_DEVICE_ADD(_tag, VIA6522, _clock) \ + MCFG_DEVICE_CONFIG(_intrf) diff --git a/src/emu/machine/6526cia.h b/src/emu/machine/6526cia.h index 7868a67e8d8..e79387d4917 100644 --- a/src/emu/machine/6526cia.h +++ b/src/emu/machine/6526cia.h @@ -43,17 +43,17 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_MOS6526R1_ADD(_tag, _clock, _config) \ - MDRV_DEVICE_ADD(_tag, MOS6526R1, _clock) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_MOS6526R1_ADD(_tag, _clock, _config) \ + MCFG_DEVICE_ADD(_tag, MOS6526R1, _clock) \ + MCFG_DEVICE_CONFIG(_config) -#define MDRV_MOS6526R2_ADD(_tag, _clock, _config) \ - MDRV_DEVICE_ADD(_tag, MOS6526R2, _clock) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_MOS6526R2_ADD(_tag, _clock, _config) \ + MCFG_DEVICE_ADD(_tag, MOS6526R2, _clock) \ + MCFG_DEVICE_CONFIG(_config) -#define MDRV_MOS8520_ADD(_tag, _clock, _config) \ - MDRV_DEVICE_ADD(_tag, MOS8520, _clock) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_MOS8520_ADD(_tag, _clock, _config) \ + MCFG_DEVICE_ADD(_tag, MOS8520, _clock) \ + MCFG_DEVICE_CONFIG(_config) #define MOS6526_INTERFACE(name) \ const mos6526_interface (name)= diff --git a/src/emu/machine/6532riot.h b/src/emu/machine/6532riot.h index cbdfb5a158d..a97f0a6d3fa 100644 --- a/src/emu/machine/6532riot.h +++ b/src/emu/machine/6532riot.h @@ -17,9 +17,9 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_RIOT6532_ADD(_tag, _clock, _intrf) \ - MDRV_DEVICE_ADD(_tag, RIOT6532, _clock) \ - MDRV_DEVICE_CONFIG(_intrf) +#define MCFG_RIOT6532_ADD(_tag, _clock, _intrf) \ + MCFG_DEVICE_ADD(_tag, RIOT6532, _clock) \ + MCFG_DEVICE_CONFIG(_intrf) diff --git a/src/emu/machine/6821pia.h b/src/emu/machine/6821pia.h index 0f05acd72ed..7934a5d5f98 100644 --- a/src/emu/machine/6821pia.h +++ b/src/emu/machine/6821pia.h @@ -30,21 +30,21 @@ DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_PIA6821_ADD(_tag, _intrf) \ - MDRV_DEVICE_ADD(_tag, PIA6821, 0) \ - MDRV_DEVICE_CONFIG(_intrf) +#define MCFG_PIA6821_ADD(_tag, _intrf) \ + MCFG_DEVICE_ADD(_tag, PIA6821, 0) \ + MCFG_DEVICE_CONFIG(_intrf) -#define MDRV_PIA6821_MODIFY(_tag, _intrf) \ - MDRV_DEVICE_MODIFY(_tag) \ - MDRV_DEVICE_CONFIG(_intrf) +#define MCFG_PIA6821_MODIFY(_tag, _intrf) \ + MCFG_DEVICE_MODIFY(_tag) \ + MCFG_DEVICE_CONFIG(_intrf) -#define MDRV_PIA6822_ADD(_tag, _intrf) \ - MDRV_DEVICE_ADD(_tag, PIA6822, 0) \ - MDRV_DEVICE_CONFIG(_intrf) +#define MCFG_PIA6822_ADD(_tag, _intrf) \ + MCFG_DEVICE_ADD(_tag, PIA6822, 0) \ + MCFG_DEVICE_CONFIG(_intrf) -#define MDRV_PIA6822_MODIFY(_tag, _intrf) \ - MDRV_DEVICE_MODIFY(_tag) \ - MDRV_DEVICE_CONFIG(_intrf) +#define MCFG_PIA6822_MODIFY(_tag, _intrf) \ + MCFG_DEVICE_MODIFY(_tag) \ + MCFG_DEVICE_CONFIG(_intrf) diff --git a/src/emu/machine/6840ptm.h b/src/emu/machine/6840ptm.h index 85677adc800..df77dc4bb4c 100644 --- a/src/emu/machine/6840ptm.h +++ b/src/emu/machine/6840ptm.h @@ -19,9 +19,9 @@ DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_PTM6840_ADD(_tag, _config) \ - MDRV_DEVICE_ADD(_tag, PTM6840, 0) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_PTM6840_ADD(_tag, _config) \ + MCFG_DEVICE_ADD(_tag, PTM6840, 0) \ + MCFG_DEVICE_CONFIG(_config) /*************************************************************************** diff --git a/src/emu/machine/6850acia.h b/src/emu/machine/6850acia.h index c3f7a238928..8bc38b96941 100644 --- a/src/emu/machine/6850acia.h +++ b/src/emu/machine/6850acia.h @@ -34,9 +34,9 @@ DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_ACIA6850_ADD(_tag, _config) \ - MDRV_DEVICE_ADD(_tag, ACIA6850, 0) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_ACIA6850_ADD(_tag, _config) \ + MCFG_DEVICE_ADD(_tag, ACIA6850, 0) \ + MCFG_DEVICE_CONFIG(_config) #define ACIA6850_INTERFACE(_name) \ const acia6850_interface(_name) = diff --git a/src/emu/machine/68681.h b/src/emu/machine/68681.h index 34e5a7ccb96..581930a6776 100644 --- a/src/emu/machine/68681.h +++ b/src/emu/machine/68681.h @@ -17,9 +17,9 @@ struct _duart68681_config DECLARE_LEGACY_DEVICE(DUART68681, duart68681); -#define MDRV_DUART68681_ADD(_tag, _clock, _config) \ - MDRV_DEVICE_ADD(_tag, DUART68681, _clock) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_DUART68681_ADD(_tag, _clock, _config) \ + MCFG_DEVICE_ADD(_tag, DUART68681, _clock) \ + MCFG_DEVICE_CONFIG(_config) READ8_DEVICE_HANDLER(duart68681_r); diff --git a/src/emu/machine/74123.h b/src/emu/machine/74123.h index 7e6c5c95639..005231a646d 100644 --- a/src/emu/machine/74123.h +++ b/src/emu/machine/74123.h @@ -56,9 +56,9 @@ DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_TTL74123_ADD(_tag, _config) \ - MDRV_DEVICE_ADD(_tag, TTL74123, 0) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_TTL74123_ADD(_tag, _config) \ + MCFG_DEVICE_ADD(_tag, TTL74123, 0) \ + MCFG_DEVICE_CONFIG(_config) /* constants for the different ways the cap/res can be connected. This determines the formula for calculating the pulse width */ diff --git a/src/emu/machine/74148.h b/src/emu/machine/74148.h index a3948b5b410..252a8d6205f 100644 --- a/src/emu/machine/74148.h +++ b/src/emu/machine/74148.h @@ -51,9 +51,9 @@ struct _ttl74148_config }; -#define MDRV_74148_ADD(_tag, _output_cb) \ - MDRV_DEVICE_ADD(_tag, TTL74148, 0) \ - MDRV_DEVICE_CONFIG_DATAPTR(ttl74148_config, output_cb, _output_cb) +#define MCFG_74148_ADD(_tag, _output_cb) \ + MCFG_DEVICE_ADD(_tag, TTL74148, 0) \ + MCFG_DEVICE_CONFIG_DATAPTR(ttl74148_config, output_cb, _output_cb) /* must call ttl74148_update() after setting the inputs */ diff --git a/src/emu/machine/74153.h b/src/emu/machine/74153.h index d4e73fb01a5..d6e75a5b8bd 100644 --- a/src/emu/machine/74153.h +++ b/src/emu/machine/74153.h @@ -46,9 +46,9 @@ struct _ttl74153_config }; -#define MDRV_74153_ADD(_tag, _output_cb) \ - MDRV_DEVICE_ADD(_tag, TTL74153, 0) \ - MDRV_DEVICE_CONFIG_DATAPTR(ttl74153_config, output_cb, _output_cb) +#define MCFG_74153_ADD(_tag, _output_cb) \ + MCFG_DEVICE_ADD(_tag, TTL74153, 0) \ + MCFG_DEVICE_CONFIG_DATAPTR(ttl74153_config, output_cb, _output_cb) diff --git a/src/emu/machine/7474.h b/src/emu/machine/7474.h index a4ed2b270ab..0f04969b9ce 100644 --- a/src/emu/machine/7474.h +++ b/src/emu/machine/7474.h @@ -50,25 +50,25 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_7474_ADD(_tag, _target_tag, _output_cb, _comp_output_cb) \ - MDRV_DEVICE_ADD(_tag, MACHINE_TTL7474, 0) \ - MDRV_7474_TARGET_TAG(_target_tag) \ - MDRV_7474_OUTPUT_CB(_output_cb) \ - MDRV_7474_COMP_OUTPUT_CB(_comp_output_cb) - -#define MDRV_7474_REPLACE(_tag, _target_tag, _output_cb, _comp_output_cb) \ - MDRV_DEVICE_REPLACE(_tag, TTL7474, 0) \ - MDRV_7474_TARGET_TAG(_target_tag) \ - MDRV_7474_OUTPUT_CB(_output_cb) \ - MDRV_7474_COMP_OUTPUT_CB(_comp_output_cb) - -#define MDRV_7474_TARGET_TAG(_target_tag) \ +#define MCFG_7474_ADD(_tag, _target_tag, _output_cb, _comp_output_cb) \ + MCFG_DEVICE_ADD(_tag, MACHINE_TTL7474, 0) \ + MCFG_7474_TARGET_TAG(_target_tag) \ + MCFG_7474_OUTPUT_CB(_output_cb) \ + MCFG_7474_COMP_OUTPUT_CB(_comp_output_cb) + +#define MCFG_7474_REPLACE(_tag, _target_tag, _output_cb, _comp_output_cb) \ + MCFG_DEVICE_REPLACE(_tag, TTL7474, 0) \ + MCFG_7474_TARGET_TAG(_target_tag) \ + MCFG_7474_OUTPUT_CB(_output_cb) \ + MCFG_7474_COMP_OUTPUT_CB(_comp_output_cb) + +#define MCFG_7474_TARGET_TAG(_target_tag) \ ttl7474_device_config::static_set_target_tag(device, _target_tag); \ -#define MDRV_7474_OUTPUT_CB(_cb) \ +#define MCFG_7474_OUTPUT_CB(_cb) \ ttl7474_device_config::static_set_output_cb(device, _cb); \ -#define MDRV_7474_COMP_OUTPUT_CB(_cb) \ +#define MCFG_7474_COMP_OUTPUT_CB(_cb) \ ttl7474_device_config::static_set_comp_output_cb(device, _cb); \ diff --git a/src/emu/machine/8237dma.h b/src/emu/machine/8237dma.h index c7d76b81f2a..3a0ccc9ac3a 100644 --- a/src/emu/machine/8237dma.h +++ b/src/emu/machine/8237dma.h @@ -43,9 +43,9 @@ DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_I8237_ADD(_tag, _clock, _config) \ - MDRV_DEVICE_ADD(_tag, I8237, _clock) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_I8237_ADD(_tag, _clock, _config) \ + MCFG_DEVICE_ADD(_tag, I8237, _clock) \ + MCFG_DEVICE_CONFIG(_config) #define I8237_INTERFACE(_name) \ const i8237_interface (_name) = diff --git a/src/emu/machine/8255ppi.h b/src/emu/machine/8255ppi.h index c946b3d0b5b..c255460a826 100644 --- a/src/emu/machine/8255ppi.h +++ b/src/emu/machine/8255ppi.h @@ -19,13 +19,13 @@ DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_PPI8255_ADD(_tag, _intrf) \ - MDRV_DEVICE_ADD(_tag, PPI8255, 0) \ - MDRV_DEVICE_CONFIG(_intrf) +#define MCFG_PPI8255_ADD(_tag, _intrf) \ + MCFG_DEVICE_ADD(_tag, PPI8255, 0) \ + MCFG_DEVICE_CONFIG(_intrf) -#define MDRV_PPI8255_RECONFIG(_tag, _intrf) \ - MDRV_DEVICE_MODIFY(_tag) \ - MDRV_DEVICE_CONFIG(_intrf) +#define MCFG_PPI8255_RECONFIG(_tag, _intrf) \ + MCFG_DEVICE_MODIFY(_tag) \ + MCFG_DEVICE_CONFIG(_intrf) /*************************************************************************** diff --git a/src/emu/machine/8257dma.h b/src/emu/machine/8257dma.h index 3f25a79d2dc..9e912dcdda6 100644 --- a/src/emu/machine/8257dma.h +++ b/src/emu/machine/8257dma.h @@ -43,9 +43,9 @@ DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_I8257_ADD(_tag, _clock, _config) \ - MDRV_DEVICE_ADD(_tag, I8257, _clock) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_I8257_ADD(_tag, _clock, _config) \ + MCFG_DEVICE_ADD(_tag, I8257, _clock) \ + MCFG_DEVICE_CONFIG(_config) #define I8257_INTERFACE(_name) \ const i8257_interface (_name) = diff --git a/src/emu/machine/adc083x.h b/src/emu/machine/adc083x.h index f21affaa6ea..7d1f8cdc983 100644 --- a/src/emu/machine/adc083x.h +++ b/src/emu/machine/adc083x.h @@ -37,21 +37,21 @@ DECLARE_LEGACY_DEVICE(ADC0832, adc0832); DECLARE_LEGACY_DEVICE(ADC0834, adc0834); DECLARE_LEGACY_DEVICE(ADC0838, adc0838); -#define MDRV_ADC0831_ADD(_tag, _config) \ - MDRV_DEVICE_ADD(_tag, ADC0831, 0) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_ADC0831_ADD(_tag, _config) \ + MCFG_DEVICE_ADD(_tag, ADC0831, 0) \ + MCFG_DEVICE_CONFIG(_config) -#define MDRV_ADC0832_ADD(_tag, _config) \ - MDRV_DEVICE_ADD(_tag, ADC0832, 0) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_ADC0832_ADD(_tag, _config) \ + MCFG_DEVICE_ADD(_tag, ADC0832, 0) \ + MCFG_DEVICE_CONFIG(_config) -#define MDRV_ADC0834_ADD(_tag, _config) \ - MDRV_DEVICE_ADD(_tag, ADC0834, 0) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_ADC0834_ADD(_tag, _config) \ + MCFG_DEVICE_ADD(_tag, ADC0834, 0) \ + MCFG_DEVICE_CONFIG(_config) -#define MDRV_ADC0838_ADD(_tag, _config) \ - MDRV_DEVICE_ADD(_tag, ADC0838, 0) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_ADC0838_ADD(_tag, _config) \ + MCFG_DEVICE_ADD(_tag, ADC0838, 0) \ + MCFG_DEVICE_CONFIG(_config) /*************************************************************************** diff --git a/src/emu/machine/adc1038.h b/src/emu/machine/adc1038.h index 855b603379f..7745b2adb13 100644 --- a/src/emu/machine/adc1038.h +++ b/src/emu/machine/adc1038.h @@ -33,9 +33,9 @@ struct _adc1038_interface DECLARE_LEGACY_DEVICE(ADC1038, adc1038); -#define MDRV_ADC1038_ADD(_tag, _config) \ - MDRV_DEVICE_ADD(_tag, ADC1038, 0) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_ADC1038_ADD(_tag, _config) \ + MCFG_DEVICE_ADD(_tag, ADC1038, 0) \ + MCFG_DEVICE_CONFIG(_config) /*************************************************************************** diff --git a/src/emu/machine/adc1213x.h b/src/emu/machine/adc1213x.h index 6846c3bc912..b915b83a375 100644 --- a/src/emu/machine/adc1213x.h +++ b/src/emu/machine/adc1213x.h @@ -21,17 +21,17 @@ DECLARE_LEGACY_DEVICE(ADC12130, adc12130); DECLARE_LEGACY_DEVICE(ADC12132, adc12132); DECLARE_LEGACY_DEVICE(ADC12138, adc12138); -#define MDRV_ADC12130_ADD(_tag, _config) \ - MDRV_DEVICE_ADD(_tag, ADC12130, 0) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_ADC12130_ADD(_tag, _config) \ + MCFG_DEVICE_ADD(_tag, ADC12130, 0) \ + MCFG_DEVICE_CONFIG(_config) -#define MDRV_ADC12132_ADD(_tag, _config) \ - MDRV_DEVICE_ADD(_tag, ADC12132, 0) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_ADC12132_ADD(_tag, _config) \ + MCFG_DEVICE_ADD(_tag, ADC12132, 0) \ + MCFG_DEVICE_CONFIG(_config) -#define MDRV_ADC12138_ADD(_tag, _config) \ - MDRV_DEVICE_ADD(_tag, ADC12138, 0) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_ADC12138_ADD(_tag, _config) \ + MCFG_DEVICE_ADD(_tag, ADC12138, 0) \ + MCFG_DEVICE_CONFIG(_config) /*************************************************************************** diff --git a/src/emu/machine/at28c16.h b/src/emu/machine/at28c16.h index b210296d459..6fb4765313e 100644 --- a/src/emu/machine/at28c16.h +++ b/src/emu/machine/at28c16.h @@ -16,8 +16,8 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_AT28C16_ADD( _tag, _interface ) \ - MDRV_DEVICE_ADD( _tag, AT28C16, 0 ) +#define MCFG_AT28C16_ADD( _tag, _interface ) \ + MCFG_DEVICE_ADD( _tag, AT28C16, 0 ) //************************************************************************** diff --git a/src/emu/machine/cdp1852.h b/src/emu/machine/cdp1852.h index 7073ee77b3f..7805d41fa0b 100644 --- a/src/emu/machine/cdp1852.h +++ b/src/emu/machine/cdp1852.h @@ -36,9 +36,9 @@ DECLARE_LEGACY_DEVICE(CDP1852, cdp1852); -#define MDRV_CDP1852_ADD(_tag, _clock, _config) \ - MDRV_DEVICE_ADD(_tag, CDP1852, _clock) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_CDP1852_ADD(_tag, _clock, _config) \ + MCFG_DEVICE_ADD(_tag, CDP1852, _clock) \ + MCFG_DEVICE_CONFIG(_config) #define CDP1852_INTERFACE(_name) \ const cdp1852_interface (_name)= diff --git a/src/emu/machine/ds1302.h b/src/emu/machine/ds1302.h index 98673e425a8..7b97d58be65 100644 --- a/src/emu/machine/ds1302.h +++ b/src/emu/machine/ds1302.h @@ -19,8 +19,8 @@ DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_DS1302_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, DS1302, 0) +#define MCFG_DS1302_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, DS1302, 0) /*************************************************************************** diff --git a/src/emu/machine/ds2404.h b/src/emu/machine/ds2404.h index d46b2e29eb1..06c8c6b90f1 100644 --- a/src/emu/machine/ds2404.h +++ b/src/emu/machine/ds2404.h @@ -17,19 +17,19 @@ DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_DS2404_ADD(_tag, _ref_year, _ref_month, _ref_day) \ - MDRV_DEVICE_ADD(_tag, DS2404, 0) \ - MDRV_DS2404_REF_YEAR(_ref_year) \ - MDRV_DS2404_REF_MONTH(_ref_month) \ - MDRV_DS2404_REF_DAY(_ref_day) +#define MCFG_DS2404_ADD(_tag, _ref_year, _ref_month, _ref_day) \ + MCFG_DEVICE_ADD(_tag, DS2404, 0) \ + MCFG_DS2404_REF_YEAR(_ref_year) \ + MCFG_DS2404_REF_MONTH(_ref_month) \ + MCFG_DS2404_REF_DAY(_ref_day) -#define MDRV_DS2404_REF_YEAR(_ref_year) \ +#define MCFG_DS2404_REF_YEAR(_ref_year) \ ds2404_device_config::static_set_ref_year(device, _ref_year); -#define MDRV_DS2404_REF_MONTH(_ref_month) \ +#define MCFG_DS2404_REF_MONTH(_ref_month) \ ds2404_device_config::static_set_ref_month(device, _ref_month); -#define MDRV_DS2404_REF_DAY(_ref_day) \ +#define MCFG_DS2404_REF_DAY(_ref_day) \ ds2404_device_config::static_set_ref_day(device, _ref_day); diff --git a/src/emu/machine/eeprom.h b/src/emu/machine/eeprom.h index 912074319e3..97463bbe025 100644 --- a/src/emu/machine/eeprom.h +++ b/src/emu/machine/eeprom.h @@ -17,20 +17,20 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_EEPROM_ADD(_tag, _interface) \ - MDRV_DEVICE_ADD(_tag, EEPROM, 0) \ +#define MCFG_EEPROM_ADD(_tag, _interface) \ + MCFG_DEVICE_ADD(_tag, EEPROM, 0) \ eeprom_device_config::static_set_interface(device, _interface); \ -#define MDRV_EEPROM_93C46_ADD(_tag) \ - MDRV_EEPROM_ADD(_tag, eeprom_interface_93C46) +#define MCFG_EEPROM_93C46_ADD(_tag) \ + MCFG_EEPROM_ADD(_tag, eeprom_interface_93C46) -#define MDRV_EEPROM_93C66B_ADD(_tag) \ - MDRV_EEPROM_ADD(_tag, eeprom_interface_93C66B) +#define MCFG_EEPROM_93C66B_ADD(_tag) \ + MCFG_EEPROM_ADD(_tag, eeprom_interface_93C66B) -#define MDRV_EEPROM_DATA(_data, _size) \ +#define MCFG_EEPROM_DATA(_data, _size) \ eeprom_device_config::static_set_default_data(device, _data, _size); \ -#define MDRV_EEPROM_DEFAULT_VALUE(_value) \ +#define MCFG_EEPROM_DEFAULT_VALUE(_value) \ eeprom_device_config::static_set_default_value(device, _value); \ diff --git a/src/emu/machine/er2055.h b/src/emu/machine/er2055.h index f274f14acbc..656cfc08df2 100644 --- a/src/emu/machine/er2055.h +++ b/src/emu/machine/er2055.h @@ -48,8 +48,8 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_ER2055_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, ER2055, 0) \ +#define MCFG_ER2055_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, ER2055, 0) \ diff --git a/src/emu/machine/f3853.h b/src/emu/machine/f3853.h index 997915178e3..92741cc3ffd 100644 --- a/src/emu/machine/f3853.h +++ b/src/emu/machine/f3853.h @@ -45,9 +45,9 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_F3853_ADD(_tag, _clock, _intrf) \ - MDRV_DEVICE_ADD(_tag, F3853, _clock) \ - MDRV_DEVICE_CONFIG(_intrf) +#define MCFG_F3853_ADD(_tag, _clock, _intrf) \ + MCFG_DEVICE_ADD(_tag, F3853, _clock) \ + MCFG_DEVICE_CONFIG(_intrf) diff --git a/src/emu/machine/i2cmem.h b/src/emu/machine/i2cmem.h index d73a54f24b7..db564625347 100644 --- a/src/emu/machine/i2cmem.h +++ b/src/emu/machine/i2cmem.h @@ -24,8 +24,8 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_I2CMEM_ADD( _tag, _interface ) \ - MDRV_DEVICE_ADD( _tag, I2CMEM, 0 ) \ +#define MCFG_I2CMEM_ADD( _tag, _interface ) \ + MCFG_DEVICE_ADD( _tag, I2CMEM, 0 ) \ i2cmem_device_config::static_set_interface(device, _interface); diff --git a/src/emu/machine/i8243.h b/src/emu/machine/i8243.h index 1a3cb11dd30..00b170ebe0c 100644 --- a/src/emu/machine/i8243.h +++ b/src/emu/machine/i8243.h @@ -22,15 +22,15 @@ DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_I8243_ADD(_tag, _read, _write) \ - MDRV_DEVICE_ADD(_tag, I8243, 0) \ - MDRV_I8243_READHANDLER(_read) \ - MDRV_I8243_WRITEHANDLER(_write) \ +#define MCFG_I8243_ADD(_tag, _read, _write) \ + MCFG_DEVICE_ADD(_tag, I8243, 0) \ + MCFG_I8243_READHANDLER(_read) \ + MCFG_I8243_WRITEHANDLER(_write) \ -#define MDRV_I8243_READHANDLER(_read) \ +#define MCFG_I8243_READHANDLER(_read) \ i8243_device_config::static_set_read_handler(device, _read); \ -#define MDRV_I8243_WRITEHANDLER(_write) \ +#define MCFG_I8243_WRITEHANDLER(_write) \ i8243_device_config::static_set_write_handler(device, _write); \ /*************************************************************************** diff --git a/src/emu/machine/i8255a.h b/src/emu/machine/i8255a.h index f74cd509b72..fcdcb54f012 100644 --- a/src/emu/machine/i8255a.h +++ b/src/emu/machine/i8255a.h @@ -41,9 +41,9 @@ DECLARE_LEGACY_DEVICE(I8255A, i8255a); -#define MDRV_I8255A_ADD(_tag, _intrf) \ - MDRV_DEVICE_ADD(_tag, I8255A, 0) \ - MDRV_DEVICE_CONFIG(_intrf) +#define MCFG_I8255A_ADD(_tag, _intrf) \ + MCFG_DEVICE_ADD(_tag, I8255A, 0) \ + MCFG_DEVICE_CONFIG(_intrf) #define I8255A_INTERFACE(name) \ const i8255a_interface (name)= diff --git a/src/emu/machine/idectrl.h b/src/emu/machine/idectrl.h index af287b6aae0..4a0fa37acd2 100644 --- a/src/emu/machine/idectrl.h +++ b/src/emu/machine/idectrl.h @@ -39,17 +39,17 @@ struct _ide_config DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_IDE_CONTROLLER_ADD(_tag, _callback) \ - MDRV_DEVICE_ADD(_tag, IDE_CONTROLLER, 0) \ - MDRV_DEVICE_CONFIG_DATAPTR(ide_config, interrupt, _callback) +#define MCFG_IDE_CONTROLLER_ADD(_tag, _callback) \ + MCFG_DEVICE_ADD(_tag, IDE_CONTROLLER, 0) \ + MCFG_DEVICE_CONFIG_DATAPTR(ide_config, interrupt, _callback) -#define MDRV_IDE_CONTROLLER_REGIONS(_master, _slave) \ - MDRV_DEVICE_CONFIG_DATAPTR(ide_config, master, _master) \ - MDRV_DEVICE_CONFIG_DATAPTR(ide_config, master, _slave) +#define MCFG_IDE_CONTROLLER_REGIONS(_master, _slave) \ + MCFG_DEVICE_CONFIG_DATAPTR(ide_config, master, _master) \ + MCFG_DEVICE_CONFIG_DATAPTR(ide_config, master, _slave) -#define MDRV_IDE_BUS_MASTER_SPACE(_cpu, _space) \ - MDRV_DEVICE_CONFIG_DATAPTR(ide_config, bmcpu, _cpu) \ - MDRV_DEVICE_CONFIG_DATA32(ide_config, bmspace, ADDRESS_SPACE_##_space) +#define MCFG_IDE_BUS_MASTER_SPACE(_cpu, _space) \ + MCFG_DEVICE_CONFIG_DATAPTR(ide_config, bmcpu, _cpu) \ + MCFG_DEVICE_CONFIG_DATA32(ide_config, bmspace, ADDRESS_SPACE_##_space) diff --git a/src/emu/machine/ins8154.h b/src/emu/machine/ins8154.h index df3fc8d4842..13acfc521b2 100644 --- a/src/emu/machine/ins8154.h +++ b/src/emu/machine/ins8154.h @@ -41,9 +41,9 @@ DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_INS8154_ADD(_tag, _intrf) \ - MDRV_DEVICE_ADD(_tag, INS8154, 0) \ - MDRV_DEVICE_CONFIG(_intrf) +#define MCFG_INS8154_ADD(_tag, _intrf) \ + MCFG_DEVICE_ADD(_tag, INS8154, 0) \ + MCFG_DEVICE_CONFIG(_intrf) /*************************************************************************** diff --git a/src/emu/machine/ins8250.h b/src/emu/machine/ins8250.h index f440a78c821..93eaa4e446b 100644 --- a/src/emu/machine/ins8250.h +++ b/src/emu/machine/ins8250.h @@ -56,19 +56,19 @@ typedef struct DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_INS8250_ADD(_tag, _intrf) \ - MDRV_DEVICE_ADD(_tag, INS8250, 0) \ - MDRV_DEVICE_CONFIG(_intrf) +#define MCFG_INS8250_ADD(_tag, _intrf) \ + MCFG_DEVICE_ADD(_tag, INS8250, 0) \ + MCFG_DEVICE_CONFIG(_intrf) -#define MDRV_NS16450_ADD(_tag, _intrf) \ - MDRV_DEVICE_ADD(_tag, NS16450, 0) \ - MDRV_DEVICE_CONFIG(_intrf) +#define MCFG_NS16450_ADD(_tag, _intrf) \ + MCFG_DEVICE_ADD(_tag, NS16450, 0) \ + MCFG_DEVICE_CONFIG(_intrf) -#define MDRV_NS16550_ADD(_tag, _intrf) \ - MDRV_DEVICE_ADD(_tag, NS16550, 0) \ - MDRV_DEVICE_CONFIG(_intrf) +#define MCFG_NS16550_ADD(_tag, _intrf) \ + MCFG_DEVICE_ADD(_tag, NS16550, 0) \ + MCFG_DEVICE_CONFIG(_intrf) /*************************************************************************** diff --git a/src/emu/machine/intelfsh.h b/src/emu/machine/intelfsh.h index 863b0444c91..871cf206433 100644 --- a/src/emu/machine/intelfsh.h +++ b/src/emu/machine/intelfsh.h @@ -10,38 +10,38 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_INTEL_28F016S5_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, INTEL_28F016S5, 0) +#define MCFG_INTEL_28F016S5_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, INTEL_28F016S5, 0) -#define MDRV_SHARP_LH28F016S_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, SHARP_LH28F016S, 0) +#define MCFG_SHARP_LH28F016S_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, SHARP_LH28F016S, 0) -#define MDRV_FUJITSU_29F016A_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, FUJITSU_29F016A, 0) +#define MCFG_FUJITSU_29F016A_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, FUJITSU_29F016A, 0) -#define MDRV_INTEL_E28F400_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, INTEL_E28F400, 0) +#define MCFG_INTEL_E28F400_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, INTEL_E28F400, 0) -#define MDRV_MACRONIX_29L001MC_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, MACRONIX_29L001MC, 0) +#define MCFG_MACRONIX_29L001MC_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, MACRONIX_29L001MC, 0) -#define MDRV_PANASONIC_MN63F805MNP_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, PANASONIC_MN63F805MNP, 0) +#define MCFG_PANASONIC_MN63F805MNP_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, PANASONIC_MN63F805MNP, 0) -#define MDRV_SANYO_LE26FV10N1TS_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, SANYO_LE26FV10N1TS, 0) +#define MCFG_SANYO_LE26FV10N1TS_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, SANYO_LE26FV10N1TS, 0) -#define MDRV_SHARP_LH28F400_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, SHARP_LH28F400, 0) +#define MCFG_SHARP_LH28F400_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, SHARP_LH28F400, 0) -#define MDRV_INTEL_E28F008SA_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, INTEL_E28F008SA, 0) +#define MCFG_INTEL_E28F008SA_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, INTEL_E28F008SA, 0) -#define MDRV_INTEL_TE28F160_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, INTEL_TE28F160, 0) +#define MCFG_INTEL_TE28F160_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, INTEL_TE28F160, 0) -#define MDRV_SHARP_UNK128MBIT_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, SHARP_UNK128MBIT, 0) +#define MCFG_SHARP_UNK128MBIT_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, SHARP_UNK128MBIT, 0) diff --git a/src/emu/machine/k033906.h b/src/emu/machine/k033906.h index 2f0a6183341..166804a8e85 100644 --- a/src/emu/machine/k033906.h +++ b/src/emu/machine/k033906.h @@ -17,9 +17,9 @@ DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_K033906_ADD(_tag, _config) \ - MDRV_DEVICE_ADD(_tag, K033906, 0) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_K033906_ADD(_tag, _config) \ + MCFG_DEVICE_ADD(_tag, K033906, 0) \ + MCFG_DEVICE_CONFIG(_config) /*************************************************************************** diff --git a/src/emu/machine/k056230.h b/src/emu/machine/k056230.h index 19dd41e8604..94b27dc5563 100644 --- a/src/emu/machine/k056230.h +++ b/src/emu/machine/k056230.h @@ -17,9 +17,9 @@ DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_K056230_ADD(_tag, _config) \ - MDRV_DEVICE_ADD(_tag, K0506230, 0) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_K056230_ADD(_tag, _config) \ + MCFG_DEVICE_ADD(_tag, K0506230, 0) \ + MCFG_DEVICE_CONFIG(_config) /*************************************************************************** diff --git a/src/emu/machine/laserdsc.h b/src/emu/machine/laserdsc.h index a2ca38a0b8c..2abc19c4366 100644 --- a/src/emu/machine/laserdsc.h +++ b/src/emu/machine/laserdsc.h @@ -90,56 +90,56 @@ struct _laserdisc_config DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_LASERDISC_ADD(_tag, _type, _screen, _sound) \ - MDRV_DEVICE_ADD(_tag, LASERDISC, 0) \ - MDRV_DEVICE_CONFIG_DATA32(laserdisc_config, type, LASERDISC_TYPE_##_type) \ - MDRV_DEVICE_CONFIG_DATAPTR(laserdisc_config, screen, _screen) \ - MDRV_DEVICE_CONFIG_DATAPTR(laserdisc_config, sound, _sound) \ +#define MCFG_LASERDISC_ADD(_tag, _type, _screen, _sound) \ + MCFG_DEVICE_ADD(_tag, LASERDISC, 0) \ + MCFG_DEVICE_CONFIG_DATA32(laserdisc_config, type, LASERDISC_TYPE_##_type) \ + MCFG_DEVICE_CONFIG_DATAPTR(laserdisc_config, screen, _screen) \ + MCFG_DEVICE_CONFIG_DATAPTR(laserdisc_config, sound, _sound) \ -#define MDRV_LASERDISC_GET_DISC(_func) \ - MDRV_DEVICE_CONFIG_DATAPTR(laserdisc_config, getdisc, _func) +#define MCFG_LASERDISC_GET_DISC(_func) \ + MCFG_DEVICE_CONFIG_DATAPTR(laserdisc_config, getdisc, _func) -#define MDRV_LASERDISC_AUDIO(_func) \ - MDRV_DEVICE_CONFIG_DATAPTR(laserdisc_config, audio, _func) +#define MCFG_LASERDISC_AUDIO(_func) \ + MCFG_DEVICE_CONFIG_DATAPTR(laserdisc_config, audio, _func) -#define MDRV_LASERDISC_OVERLAY(_update, _width, _height, _format) \ - MDRV_DEVICE_CONFIG_DATAPTR(laserdisc_config, overupdate, VIDEO_UPDATE_NAME(_update)) \ - MDRV_DEVICE_CONFIG_DATA32(laserdisc_config, overwidth, _width) \ - MDRV_DEVICE_CONFIG_DATA32(laserdisc_config, overheight, _height) \ - MDRV_DEVICE_CONFIG_DATA32(laserdisc_config, overformat, _format) +#define MCFG_LASERDISC_OVERLAY(_update, _width, _height, _format) \ + MCFG_DEVICE_CONFIG_DATAPTR(laserdisc_config, overupdate, VIDEO_UPDATE_NAME(_update)) \ + MCFG_DEVICE_CONFIG_DATA32(laserdisc_config, overwidth, _width) \ + MCFG_DEVICE_CONFIG_DATA32(laserdisc_config, overheight, _height) \ + MCFG_DEVICE_CONFIG_DATA32(laserdisc_config, overformat, _format) -#define MDRV_LASERDISC_OVERLAY_CLIP(_minx, _maxx, _miny, _maxy) \ - MDRV_DEVICE_CONFIG_DATA32(laserdisc_config, overclip.min_x, _minx) \ - MDRV_DEVICE_CONFIG_DATA32(laserdisc_config, overclip.max_x, _maxx) \ - MDRV_DEVICE_CONFIG_DATA32(laserdisc_config, overclip.min_y, _miny) \ - MDRV_DEVICE_CONFIG_DATA32(laserdisc_config, overclip.max_y, _maxy) +#define MCFG_LASERDISC_OVERLAY_CLIP(_minx, _maxx, _miny, _maxy) \ + MCFG_DEVICE_CONFIG_DATA32(laserdisc_config, overclip.min_x, _minx) \ + MCFG_DEVICE_CONFIG_DATA32(laserdisc_config, overclip.max_x, _maxx) \ + MCFG_DEVICE_CONFIG_DATA32(laserdisc_config, overclip.min_y, _miny) \ + MCFG_DEVICE_CONFIG_DATA32(laserdisc_config, overclip.max_y, _maxy) -#define MDRV_LASERDISC_OVERLAY_POSITION(_posx, _posy) \ - MDRV_DEVICE_CONFIG_DATAFP32(laserdisc_config, overposx, _posx, 24) \ - MDRV_DEVICE_CONFIG_DATAFP32(laserdisc_config, overposy, _posy, 24) +#define MCFG_LASERDISC_OVERLAY_POSITION(_posx, _posy) \ + MCFG_DEVICE_CONFIG_DATAFP32(laserdisc_config, overposx, _posx, 24) \ + MCFG_DEVICE_CONFIG_DATAFP32(laserdisc_config, overposy, _posy, 24) -#define MDRV_LASERDISC_OVERLAY_SCALE(_scalex, _scaley) \ - MDRV_DEVICE_CONFIG_DATAFP32(laserdisc_config, overscalex, _scalex, 24) \ - MDRV_DEVICE_CONFIG_DATAFP32(laserdisc_config, overscaley, _scaley, 24) +#define MCFG_LASERDISC_OVERLAY_SCALE(_scalex, _scaley) \ + MCFG_DEVICE_CONFIG_DATAFP32(laserdisc_config, overscalex, _scalex, 24) \ + MCFG_DEVICE_CONFIG_DATAFP32(laserdisc_config, overscaley, _scaley, 24) /* use these to add laserdisc screens with proper video update parameters */ -#define MDRV_LASERDISC_SCREEN_ADD_NTSC(_tag, _overlayformat) \ - MDRV_VIDEO_ATTRIBUTES(VIDEO_SELF_RENDER) \ - MDRV_VIDEO_UPDATE(laserdisc) \ +#define MCFG_LASERDISC_SCREEN_ADD_NTSC(_tag, _overlayformat) \ + MCFG_VIDEO_ATTRIBUTES(VIDEO_SELF_RENDER) \ + MCFG_VIDEO_UPDATE(laserdisc) \ \ - MDRV_SCREEN_ADD(_tag, RASTER) \ - MDRV_SCREEN_FORMAT(_overlayformat) \ - MDRV_SCREEN_RAW_PARAMS(XTAL_14_31818MHz*2, 910, 0, 704, 525, 44, 524) \ + MCFG_SCREEN_ADD(_tag, RASTER) \ + MCFG_SCREEN_FORMAT(_overlayformat) \ + MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz*2, 910, 0, 704, 525, 44, 524) \ /* not correct yet; fix me... */ -#define MDRV_LASERDISC_SCREEN_ADD_PAL(_tag, _format) \ - MDRV_VIDEO_ATTRIBUTES(VIDEO_SELF_RENDER) \ - MDRV_VIDEO_UPDATE(laserdisc) \ +#define MCFG_LASERDISC_SCREEN_ADD_PAL(_tag, _format) \ + MCFG_VIDEO_ATTRIBUTES(VIDEO_SELF_RENDER) \ + MCFG_VIDEO_UPDATE(laserdisc) \ \ - MDRV_SCREEN_ADD(_tag, RASTER) \ - MDRV_SCREEN_FORMAT(_format) \ - MDRV_SCREEN_RAW_PARAMS(XTAL_14_31818MHz, 910, 0, 704, 525.0/2, 0, 480/2) \ + MCFG_SCREEN_ADD(_tag, RASTER) \ + MCFG_SCREEN_FORMAT(_format) \ + MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz, 910, 0, 704, 525.0/2, 0, 480/2) \ diff --git a/src/emu/machine/latch8.h b/src/emu/machine/latch8.h index b4a376b1016..23bea91faef 100644 --- a/src/emu/machine/latch8.h +++ b/src/emu/machine/latch8.h @@ -50,36 +50,36 @@ struct _latch8_config ***************************************************************************/ /* add device */ -#define MDRV_LATCH8_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, LATCH8, 0) +#define MCFG_LATCH8_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, LATCH8, 0) /* Bit mask specifying bits to be masked *out* */ -#define MDRV_LATCH8_MASKOUT(_maskout) \ - MDRV_DEVICE_CONFIG_DATA32(latch8_config, maskout, _maskout) +#define MCFG_LATCH8_MASKOUT(_maskout) \ + MCFG_DEVICE_CONFIG_DATA32(latch8_config, maskout, _maskout) /* Bit mask specifying bits to be inverted */ -#define MDRV_LATCH8_INVERT(_xor) \ - MDRV_DEVICE_CONFIG_DATA32(latch8_config, xorvalue, _xor) +#define MCFG_LATCH8_INVERT(_xor) \ + MCFG_DEVICE_CONFIG_DATA32(latch8_config, xorvalue, _xor) /* Bit mask specifying bits not needing cpu synchronization. */ -#define MDRV_LATCH8_NOSYNC(_nosync) \ - MDRV_DEVICE_CONFIG_DATA32(latch8_config, nosync, _nosync) +#define MCFG_LATCH8_NOSYNC(_nosync) \ + MCFG_DEVICE_CONFIG_DATA32(latch8_config, nosync, _nosync) /* Write bit to discrete node */ -#define MDRV_LATCH8_DISCRETE_NODE(_device, _bit, _node) \ - MDRV_DEVICE_CONFIG_DATAPTR_ARRAY(latch8_config, node_device, _bit, _device) \ - MDRV_DEVICE_CONFIG_DATA32_ARRAY(latch8_config, node_map, _bit, _node) +#define MCFG_LATCH8_DISCRETE_NODE(_device, _bit, _node) \ + MCFG_DEVICE_CONFIG_DATAPTR_ARRAY(latch8_config, node_device, _bit, _device) \ + MCFG_DEVICE_CONFIG_DATA32_ARRAY(latch8_config, node_map, _bit, _node) /* Upon read, replace bits by reading from another device handler */ -#define MDRV_LATCH8_DEVREAD(_bit, _tag, _handler, _from_bit) \ - MDRV_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, from_bit, _from_bit) \ - MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, tag, _tag) \ - MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, devread_handler, _handler) \ +#define MCFG_LATCH8_DEVREAD(_bit, _tag, _handler, _from_bit) \ + MCFG_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, from_bit, _from_bit) \ + MCFG_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, tag, _tag) \ + MCFG_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, devread_handler, _handler) \ /* Upon read, replace bits by reading from another machine handler */ -#define MDRV_LATCH8_READ(_bit, _handler, _from_bit) \ - MDRV_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, from_bit, _from_bit) \ - MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, read_handler, _handler) \ +#define MCFG_LATCH8_READ(_bit, _handler, _from_bit) \ + MCFG_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, from_bit, _from_bit) \ + MCFG_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, read_handler, _handler) \ /* Accessor macros */ diff --git a/src/emu/machine/ldpr8210.c b/src/emu/machine/ldpr8210.c index af3948a335c..8ba3e7eb9c7 100644 --- a/src/emu/machine/ldpr8210.c +++ b/src/emu/machine/ldpr8210.c @@ -286,8 +286,8 @@ ADDRESS_MAP_END static MACHINE_CONFIG_FRAGMENT( pr8210 ) - MDRV_CPU_ADD("pr8210", I8049, XTAL_4_41MHz) - MDRV_CPU_IO_MAP(pr8210_portmap) + MCFG_CPU_ADD("pr8210", I8049, XTAL_4_41MHz) + MCFG_CPU_IO_MAP(pr8210_portmap) MACHINE_CONFIG_END @@ -997,10 +997,10 @@ ADDRESS_MAP_END static MACHINE_CONFIG_FRAGMENT( simutrek ) - MDRV_CPU_ADD("simutrek", I8748, XTAL_6MHz) - MDRV_CPU_IO_MAP(simutrek_portmap) + MCFG_CPU_ADD("simutrek", I8748, XTAL_6MHz) + MCFG_CPU_IO_MAP(simutrek_portmap) - MDRV_FRAGMENT_ADD(pr8210) + MCFG_FRAGMENT_ADD(pr8210) MACHINE_CONFIG_END diff --git a/src/emu/machine/ldv1000.c b/src/emu/machine/ldv1000.c index 24703ade1f2..15e07632a87 100644 --- a/src/emu/machine/ldv1000.c +++ b/src/emu/machine/ldv1000.c @@ -167,15 +167,15 @@ static const z80_daisy_config daisy_chain[] = static MACHINE_CONFIG_FRAGMENT( ldv1000 ) - MDRV_CPU_ADD("ldv1000", Z80, XTAL_5MHz/2) - MDRV_CPU_CONFIG(daisy_chain) - MDRV_CPU_PROGRAM_MAP(ldv1000_map) - MDRV_CPU_IO_MAP(ldv1000_portmap) - - MDRV_Z80CTC_ADD("ldvctc", XTAL_5MHz/2 /* same as "ldv1000" */, ctcintf) - MDRV_PPI8255_ADD("ldvppi0", ppi0intf) - MDRV_PPI8255_ADD("ldvppi1", ppi1intf) - MDRV_TIMER_ADD("multitimer", multijump_timer) + MCFG_CPU_ADD("ldv1000", Z80, XTAL_5MHz/2) + MCFG_CPU_CONFIG(daisy_chain) + MCFG_CPU_PROGRAM_MAP(ldv1000_map) + MCFG_CPU_IO_MAP(ldv1000_portmap) + + MCFG_Z80CTC_ADD("ldvctc", XTAL_5MHz/2 /* same as "ldv1000" */, ctcintf) + MCFG_PPI8255_ADD("ldvppi0", ppi0intf) + MCFG_PPI8255_ADD("ldvppi1", ppi1intf) + MCFG_TIMER_ADD("multitimer", multijump_timer) MACHINE_CONFIG_END diff --git a/src/emu/machine/ldvp931.c b/src/emu/machine/ldvp931.c index 5ad5a0b123a..e64554c04ae 100644 --- a/src/emu/machine/ldvp931.c +++ b/src/emu/machine/ldvp931.c @@ -134,9 +134,9 @@ ADDRESS_MAP_END static MACHINE_CONFIG_FRAGMENT( vp931 ) - MDRV_CPU_ADD("vp931", I8049, XTAL_11MHz) - MDRV_CPU_IO_MAP(vp931_portmap) - MDRV_TIMER_ADD("tracktimer", track_timer) + MCFG_CPU_ADD("vp931", I8049, XTAL_11MHz) + MCFG_CPU_IO_MAP(vp931_portmap) + MCFG_TIMER_ADD("tracktimer", track_timer) MACHINE_CONFIG_END diff --git a/src/emu/machine/mb14241.h b/src/emu/machine/mb14241.h index 89d5b1da530..120054591a8 100644 --- a/src/emu/machine/mb14241.h +++ b/src/emu/machine/mb14241.h @@ -16,8 +16,8 @@ DECLARE_LEGACY_DEVICE(MB14241, mb14241); DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_MB14241_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, MB14241, 0) +#define MCFG_MB14241_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, MB14241, 0) /*************************************************************************** diff --git a/src/emu/machine/mb3773.h b/src/emu/machine/mb3773.h index c1617aa4eae..c3be2d91086 100644 --- a/src/emu/machine/mb3773.h +++ b/src/emu/machine/mb3773.h @@ -16,8 +16,8 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_MB3773_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, MB3773, 0) +#define MCFG_MB3773_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, MB3773, 0) // ======================> mb3773_device_config diff --git a/src/emu/machine/mb87078.h b/src/emu/machine/mb87078.h index a5e378bb814..8d7ffee6783 100644 --- a/src/emu/machine/mb87078.h +++ b/src/emu/machine/mb87078.h @@ -30,9 +30,9 @@ DECLARE_LEGACY_DEVICE(MB87078, mb87078); DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_MB87078_ADD(_tag, _interface) \ - MDRV_DEVICE_ADD(_tag, MB87078, 0) \ - MDRV_DEVICE_CONFIG(_interface) +#define MCFG_MB87078_ADD(_tag, _interface) \ + MCFG_DEVICE_ADD(_tag, MB87078, 0) \ + MCFG_DEVICE_CONFIG(_interface) /*************************************************************************** diff --git a/src/emu/machine/mc146818.h b/src/emu/machine/mc146818.h index e42b532e88b..7d4ce43134e 100644 --- a/src/emu/machine/mc146818.h +++ b/src/emu/machine/mc146818.h @@ -19,8 +19,8 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_MC146818_ADD(_tag, _type) \ - MDRV_DEVICE_ADD(_tag, MC146818, 0) \ +#define MCFG_MC146818_ADD(_tag, _type) \ + MCFG_DEVICE_ADD(_tag, MC146818, 0) \ mc146818_device_config::static_set_type(device, mc146818_device_config::_type); \ diff --git a/src/emu/machine/msm6242.h b/src/emu/machine/msm6242.h index cffe8dc7167..9bf403701e9 100644 --- a/src/emu/machine/msm6242.h +++ b/src/emu/machine/msm6242.h @@ -17,8 +17,8 @@ DECLARE_LEGACY_DEVICE(MSM6242, msm6242); -#define MDRV_MSM6242_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, MSM6242, 0) +#define MCFG_MSM6242_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, MSM6242, 0) READ8_DEVICE_HANDLER( msm6242_r ); diff --git a/src/emu/machine/nvram.h b/src/emu/machine/nvram.h index 71783f0d39f..b652ca427cd 100644 --- a/src/emu/machine/nvram.h +++ b/src/emu/machine/nvram.h @@ -48,37 +48,37 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_NVRAM_ADD_0FILL(_tag) \ - MDRV_DEVICE_ADD(_tag, NVRAM, 0) \ +#define MCFG_NVRAM_ADD_0FILL(_tag) \ + MCFG_DEVICE_ADD(_tag, NVRAM, 0) \ nvram_device_config::static_set_default_value(device, nvram_device_config::DEFAULT_ALL_0); \ -#define MDRV_NVRAM_ADD_1FILL(_tag) \ - MDRV_DEVICE_ADD(_tag, NVRAM, 0) \ +#define MCFG_NVRAM_ADD_1FILL(_tag) \ + MCFG_DEVICE_ADD(_tag, NVRAM, 0) \ nvram_device_config::static_set_default_value(device, nvram_device_config::DEFAULT_ALL_1); \ -#define MDRV_NVRAM_ADD_RANDOM_FILL(_tag) \ - MDRV_DEVICE_ADD(_tag, NVRAM, 0) \ +#define MCFG_NVRAM_ADD_RANDOM_FILL(_tag) \ + MCFG_DEVICE_ADD(_tag, NVRAM, 0) \ nvram_device_config::static_set_default_value(device, nvram_device_config::DEFAULT_RANDOM); \ -#define MDRV_NVRAM_ADD_CUSTOM(_tag, _class, _method) \ - MDRV_DEVICE_ADD(_tag, NVRAM, 0) \ +#define MCFG_NVRAM_ADD_CUSTOM(_tag, _class, _method) \ + MCFG_DEVICE_ADD(_tag, NVRAM, 0) \ nvram_device_config::static_set_custom_handler(device, nvram_init_proto_delegate::_create_member<_class, &_class::_method>(#_class "::" #_method)); \ -#define MDRV_NVRAM_REPLACE_0FILL(_tag) \ - MDRV_DEVICE_REPLACE(_tag, NVRAM, 0) \ +#define MCFG_NVRAM_REPLACE_0FILL(_tag) \ + MCFG_DEVICE_REPLACE(_tag, NVRAM, 0) \ nvram_device_config::static_set_default_value(device, nvram_device_config::DEFAULT_ALL_0); \ -#define MDRV_NVRAM_REPLACE_1FILL(_tag) \ - MDRV_DEVICE_REPLACE(_tag, NVRAM, 0) \ +#define MCFG_NVRAM_REPLACE_1FILL(_tag) \ + MCFG_DEVICE_REPLACE(_tag, NVRAM, 0) \ nvram_device_config::static_set_default_value(device, nvram_device_config::DEFAULT_ALL_1); \ -#define MDRV_NVRAM_REPLACE_RANDOM_FILL(_tag) \ - MDRV_DEVICE_REPLACE(_tag, NVRAM, 0) \ +#define MCFG_NVRAM_REPLACE_RANDOM_FILL(_tag) \ + MCFG_DEVICE_REPLACE(_tag, NVRAM, 0) \ nvram_device_config::static_set_default_value(device, nvram_device_config::DEFAULT_RANDOM); \ -#define MDRV_NVRAM_REPLACE_CUSTOM(_tag, _class, _method) \ - MDRV_DEVICE_REPLACE(_tag, NVRAM, 0) \ +#define MCFG_NVRAM_REPLACE_CUSTOM(_tag, _class, _method) \ + MCFG_DEVICE_REPLACE(_tag, NVRAM, 0) \ nvram_device_config::static_set_custom_handler(device, nvram_init_proto_delegate::_create_member<_class, &_class::_method>(#_class "::" #_method)); \ diff --git a/src/emu/machine/pci.h b/src/emu/machine/pci.h index 705a07ced35..6ca63042024 100644 --- a/src/emu/machine/pci.h +++ b/src/emu/machine/pci.h @@ -41,17 +41,17 @@ struct _pci_bus_config DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_PCI_BUS_ADD(_tag, _busnum) \ - MDRV_DEVICE_ADD(_tag, PCI_BUS, 0) \ - MDRV_DEVICE_CONFIG_DATA32(pci_bus_config, busnum, _busnum) +#define MCFG_PCI_BUS_ADD(_tag, _busnum) \ + MCFG_DEVICE_ADD(_tag, PCI_BUS, 0) \ + MCFG_DEVICE_CONFIG_DATA32(pci_bus_config, busnum, _busnum) -#define MDRV_PCI_BUS_DEVICE(_devnum, _devtag, _configread, _configwrite) \ - MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(pci_bus_config, device, _devnum, pci_device_entry, devtag, _devtag) \ - MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(pci_bus_config, device, _devnum, pci_device_entry, read_callback, _configread) \ - MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(pci_bus_config, device, _devnum, pci_device_entry, write_callback, _configwrite) +#define MCFG_PCI_BUS_DEVICE(_devnum, _devtag, _configread, _configwrite) \ + MCFG_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(pci_bus_config, device, _devnum, pci_device_entry, devtag, _devtag) \ + MCFG_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(pci_bus_config, device, _devnum, pci_device_entry, read_callback, _configread) \ + MCFG_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(pci_bus_config, device, _devnum, pci_device_entry, write_callback, _configwrite) -#define MDRV_PCI_BUS_SIBLING(_father_tag) \ - MDRV_DEVICE_CONFIG_DATAPTR(pci_bus_config, father, _father_tag) +#define MCFG_PCI_BUS_SIBLING(_father_tag) \ + MCFG_DEVICE_CONFIG_DATAPTR(pci_bus_config, father, _father_tag) /*************************************************************************** diff --git a/src/emu/machine/pd4990a.h b/src/emu/machine/pd4990a.h index 21ea810e028..a7d0815521b 100644 --- a/src/emu/machine/pd4990a.h +++ b/src/emu/machine/pd4990a.h @@ -18,8 +18,8 @@ DECLARE_LEGACY_DEVICE(UPD4990A, upd4990a); -#define MDRV_UPD4990A_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, UPD4990A, 0) +#define MCFG_UPD4990A_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, UPD4990A, 0) /*************************************************************************** diff --git a/src/emu/machine/pic8259.h b/src/emu/machine/pic8259.h index 43a7627297c..5a14622652f 100644 --- a/src/emu/machine/pic8259.h +++ b/src/emu/machine/pic8259.h @@ -45,9 +45,9 @@ struct pic8259_interface DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_PIC8259_ADD(_tag, _intrf) \ - MDRV_DEVICE_ADD(_tag, PIC8259, 0) \ - MDRV_DEVICE_CONFIG(_intrf) +#define MCFG_PIC8259_ADD(_tag, _intrf) \ + MCFG_DEVICE_ADD(_tag, PIC8259, 0) \ + MCFG_DEVICE_CONFIG(_intrf) /* device interface */ diff --git a/src/emu/machine/pit8253.h b/src/emu/machine/pit8253.h index 26ab9ad7096..41445f1429d 100644 --- a/src/emu/machine/pit8253.h +++ b/src/emu/machine/pit8253.h @@ -45,14 +45,14 @@ DECLARE_LEGACY_DEVICE(PIT8254, pit8254); DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_PIT8253_ADD(_tag, _intrf) \ - MDRV_DEVICE_ADD(_tag, PIT8253, 0) \ - MDRV_DEVICE_CONFIG(_intrf) +#define MCFG_PIT8253_ADD(_tag, _intrf) \ + MCFG_DEVICE_ADD(_tag, PIT8253, 0) \ + MCFG_DEVICE_CONFIG(_intrf) -#define MDRV_PIT8254_ADD(_tag, _intrf) \ - MDRV_DEVICE_ADD(_tag, PIT8254, 0) \ - MDRV_DEVICE_CONFIG(_intrf) +#define MCFG_PIT8254_ADD(_tag, _intrf) \ + MCFG_DEVICE_ADD(_tag, PIT8254, 0) \ + MCFG_DEVICE_CONFIG(_intrf) READ8_DEVICE_HANDLER( pit8253_r ); diff --git a/src/emu/machine/rp5h01.h b/src/emu/machine/rp5h01.h index 9b201269d34..6bca1a2250c 100644 --- a/src/emu/machine/rp5h01.h +++ b/src/emu/machine/rp5h01.h @@ -16,8 +16,8 @@ DECLARE_LEGACY_DEVICE(RP5H01, rp5h01); -#define MDRV_RP5H01_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, RP5H01, 0) +#define MCFG_RP5H01_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, RP5H01, 0) /* * Device uses memory region diff --git a/src/emu/machine/rtc65271.h b/src/emu/machine/rtc65271.h index f2095acdefa..5572d91f785 100644 --- a/src/emu/machine/rtc65271.h +++ b/src/emu/machine/rtc65271.h @@ -14,9 +14,9 @@ struct _rtc65271_config }; -#define MDRV_RTC65271_ADD(_tag, _callback) \ - MDRV_DEVICE_ADD(_tag, RTC65271, 0) \ - MDRV_DEVICE_CONFIG_DATAPTR(rtc65271_config, interrupt_callback, _callback) +#define MCFG_RTC65271_ADD(_tag, _callback) \ + MCFG_DEVICE_ADD(_tag, RTC65271, 0) \ + MCFG_DEVICE_CONFIG_DATAPTR(rtc65271_config, interrupt_callback, _callback) UINT8 rtc65271_r(running_device *device, int xramsel, offs_t offset); diff --git a/src/emu/machine/s3c2400.h b/src/emu/machine/s3c2400.h index 1f2080964f8..e1d7ef93d5b 100644 --- a/src/emu/machine/s3c2400.h +++ b/src/emu/machine/s3c2400.h @@ -15,9 +15,9 @@ #define S3C2400_TAG "s3c2400" -#define MDRV_S3C2400_ADD(_tag, _clock, _config) \ - MDRV_DEVICE_ADD(_tag, S3C2400, _clock) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_S3C2400_ADD(_tag, _clock, _config) \ + MCFG_DEVICE_ADD(_tag, S3C2400, _clock) \ + MCFG_DEVICE_CONFIG(_config) #define S3C2400_INTERFACE(name) \ const s3c2400_interface(name) = diff --git a/src/emu/machine/s3c2410.h b/src/emu/machine/s3c2410.h index 622d4de5e91..4fcb0923a67 100644 --- a/src/emu/machine/s3c2410.h +++ b/src/emu/machine/s3c2410.h @@ -15,9 +15,9 @@ #define S3C2410_TAG "s3c2410" -#define MDRV_S3C2410_ADD(_tag, _clock, _config) \ - MDRV_DEVICE_ADD(_tag, S3C2410, _clock) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_S3C2410_ADD(_tag, _clock, _config) \ + MCFG_DEVICE_ADD(_tag, S3C2410, _clock) \ + MCFG_DEVICE_CONFIG(_config) #define S3C2410_INTERFACE(name) \ const s3c2410_interface(name) = diff --git a/src/emu/machine/s3c2440.h b/src/emu/machine/s3c2440.h index 236883023b5..ede452120c2 100644 --- a/src/emu/machine/s3c2440.h +++ b/src/emu/machine/s3c2440.h @@ -13,9 +13,9 @@ #define S3C2440_TAG "s3c2440" -#define MDRV_S3C2440_ADD(_tag, _clock, _config) \ - MDRV_DEVICE_ADD(_tag, S3C2440, _clock) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_S3C2440_ADD(_tag, _clock, _config) \ + MCFG_DEVICE_ADD(_tag, S3C2440, _clock) \ + MCFG_DEVICE_CONFIG(_config) #define S3C2440_INTERFACE(name) \ const s3c2440_interface(name) = diff --git a/src/emu/machine/smc91c9x.h b/src/emu/machine/smc91c9x.h index 157202418ce..7fe418d9120 100644 --- a/src/emu/machine/smc91c9x.h +++ b/src/emu/machine/smc91c9x.h @@ -31,13 +31,13 @@ struct _smc91c9x_config DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_SMC91C94_ADD(_tag, _callback) \ - MDRV_DEVICE_ADD(_tag, SMC91C94, 0) \ - MDRV_DEVICE_CONFIG_DATAPTR(smc91c9x_config, interrupt, _callback) +#define MCFG_SMC91C94_ADD(_tag, _callback) \ + MCFG_DEVICE_ADD(_tag, SMC91C94, 0) \ + MCFG_DEVICE_CONFIG_DATAPTR(smc91c9x_config, interrupt, _callback) -#define MDRV_SMC91C96_ADD(_tag, _callback) \ - MDRV_DEVICE_ADD(_tag, SMC91C96, 0) \ - MDRV_DEVICE_CONFIG_DATAPTR(smc91c9x_config, interrupt, _callback) +#define MCFG_SMC91C96_ADD(_tag, _callback) \ + MCFG_DEVICE_ADD(_tag, SMC91C96, 0) \ + MCFG_DEVICE_CONFIG_DATAPTR(smc91c9x_config, interrupt, _callback) diff --git a/src/emu/machine/timekpr.h b/src/emu/machine/timekpr.h index ad9df486356..09374ab73db 100644 --- a/src/emu/machine/timekpr.h +++ b/src/emu/machine/timekpr.h @@ -24,17 +24,17 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_M48T02_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, M48T02, 0) +#define MCFG_M48T02_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, M48T02, 0) -#define MDRV_M48T35_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, M48T35, 0) +#define MCFG_M48T35_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, M48T35, 0) -#define MDRV_M48T58_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, M48T58, 0) +#define MCFG_M48T58_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, M48T58, 0) -#define MDRV_MK48T08_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, MK48T08, 0) +#define MCFG_MK48T08_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, MK48T08, 0) diff --git a/src/emu/machine/upd4701.h b/src/emu/machine/upd4701.h index 834aa06fc73..fd4059fd983 100644 --- a/src/emu/machine/upd4701.h +++ b/src/emu/machine/upd4701.h @@ -17,8 +17,8 @@ DECLARE_LEGACY_DEVICE(UPD4701, upd4701); -#define MDRV_UPD4701_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, UPD4701, 0) +#define MCFG_UPD4701_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, UPD4701, 0) /*************************************************************************** diff --git a/src/emu/machine/x2212.h b/src/emu/machine/x2212.h index e5ad95bacc0..aa47e398057 100644 --- a/src/emu/machine/x2212.h +++ b/src/emu/machine/x2212.h @@ -17,13 +17,13 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_X2212_ADD(_tag) \ - MDRV_DEVICE_ADD(_tag, X2212, 0) \ +#define MCFG_X2212_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, X2212, 0) \ // some systems (like many early Atari games) wire up the /STORE signal // to fire on power-down, effectively creating an "auto-save" functionality -#define MDRV_X2212_ADD_AUTOSAVE(_tag) \ - MDRV_DEVICE_ADD(_tag, X2212, 0) \ +#define MCFG_X2212_ADD_AUTOSAVE(_tag) \ + MCFG_DEVICE_ADD(_tag, X2212, 0) \ x2212_device_config::static_set_auto_save(device); \ diff --git a/src/emu/machine/z80ctc.h b/src/emu/machine/z80ctc.h index 405ddd0ed02..543295f4346 100644 --- a/src/emu/machine/z80ctc.h +++ b/src/emu/machine/z80ctc.h @@ -49,9 +49,9 @@ const int NOTIMER_3 = (1<<3); const z80ctc_interface (name)= -#define MDRV_Z80CTC_ADD(_tag, _clock, _intrf) \ - MDRV_DEVICE_ADD(_tag, Z80CTC, _clock) \ - MDRV_DEVICE_CONFIG(_intrf) +#define MCFG_Z80CTC_ADD(_tag, _clock, _intrf) \ + MCFG_DEVICE_ADD(_tag, Z80CTC, _clock) \ + MCFG_DEVICE_CONFIG(_intrf) diff --git a/src/emu/machine/z80dart.h b/src/emu/machine/z80dart.h index e8e78dfa2a3..00b3557e2e6 100644 --- a/src/emu/machine/z80dart.h +++ b/src/emu/machine/z80dart.h @@ -107,32 +107,32 @@ // DEVICE CONFIGURATION MACROS //************************************************************************** -#define MDRV_Z80DART_ADD(_tag, _clock, _config) \ - MDRV_DEVICE_ADD(_tag, Z80DART, _clock) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_Z80DART_ADD(_tag, _clock, _config) \ + MCFG_DEVICE_ADD(_tag, Z80DART, _clock) \ + MCFG_DEVICE_CONFIG(_config) -#define MDRV_Z80SIO0_ADD(_tag, _clock, _config) \ - MDRV_DEVICE_ADD(_tag, Z80SIO0, _clock) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_Z80SIO0_ADD(_tag, _clock, _config) \ + MCFG_DEVICE_ADD(_tag, Z80SIO0, _clock) \ + MCFG_DEVICE_CONFIG(_config) -#define MDRV_Z80SIO1_ADD(_tag, _clock, _config) \ - MDRV_DEVICE_ADD(_tag, Z80SIO1, _clock) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_Z80SIO1_ADD(_tag, _clock, _config) \ + MCFG_DEVICE_ADD(_tag, Z80SIO1, _clock) \ + MCFG_DEVICE_CONFIG(_config) -#define MDRV_Z80SIO2_ADD(_tag, _clock, _config) \ - MDRV_DEVICE_ADD(_tag, Z80SIO2, _clock) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_Z80SIO2_ADD(_tag, _clock, _config) \ + MCFG_DEVICE_ADD(_tag, Z80SIO2, _clock) \ + MCFG_DEVICE_CONFIG(_config) -#define MDRV_Z80SIO3_ADD(_tag, _clock, _config) \ - MDRV_DEVICE_ADD(_tag, Z80SIO3, _clock) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_Z80SIO3_ADD(_tag, _clock, _config) \ + MCFG_DEVICE_ADD(_tag, Z80SIO3, _clock) \ + MCFG_DEVICE_CONFIG(_config) -#define MDRV_Z80SIO4_ADD(_tag, _clock, _config) \ - MDRV_DEVICE_ADD(_tag, Z80SIO4, _clock) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_Z80SIO4_ADD(_tag, _clock, _config) \ + MCFG_DEVICE_ADD(_tag, Z80SIO4, _clock) \ + MCFG_DEVICE_CONFIG(_config) -#define MDRV_Z80DART_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag) +#define MCFG_Z80DART_REMOVE(_tag) \ + MCFG_DEVICE_REMOVE(_tag) #define Z80DART_INTERFACE(_name) \ const z80dart_interface (_name) = diff --git a/src/emu/machine/z80dma.h b/src/emu/machine/z80dma.h index efe15ff78ef..47643814d42 100644 --- a/src/emu/machine/z80dma.h +++ b/src/emu/machine/z80dma.h @@ -40,9 +40,9 @@ // DEVICE CONFIGURATION MACROS //************************************************************************** -#define MDRV_Z80DMA_ADD(_tag, _clock, _config) \ - MDRV_DEVICE_ADD(_tag, Z80DMA, _clock) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_Z80DMA_ADD(_tag, _clock, _config) \ + MCFG_DEVICE_ADD(_tag, Z80DMA, _clock) \ + MCFG_DEVICE_CONFIG(_config) #define Z80DMA_INTERFACE(_name) \ const z80dma_interface (_name) = diff --git a/src/emu/machine/z80pio.h b/src/emu/machine/z80pio.h index 3c5e5c493fb..26762e153b1 100644 --- a/src/emu/machine/z80pio.h +++ b/src/emu/machine/z80pio.h @@ -40,9 +40,9 @@ // DEVICE CONFIGURATION MACROS //************************************************************************** -#define MDRV_Z80PIO_ADD(_tag, _clock, _intrf) \ - MDRV_DEVICE_ADD(_tag, Z80PIO, _clock) \ - MDRV_DEVICE_CONFIG(_intrf) +#define MCFG_Z80PIO_ADD(_tag, _clock, _intrf) \ + MCFG_DEVICE_ADD(_tag, Z80PIO, _clock) \ + MCFG_DEVICE_CONFIG(_intrf) #define Z80PIO_INTERFACE(_name) \ const z80pio_interface (_name) = diff --git a/src/emu/machine/z80sio.h b/src/emu/machine/z80sio.h index b4c8f9bcfac..b50cf583c57 100644 --- a/src/emu/machine/z80sio.h +++ b/src/emu/machine/z80sio.h @@ -17,9 +17,9 @@ // DEVICE CONFIGURATION MACROS //************************************************************************** -#define MDRV_Z80SIO_ADD(_tag, _clock, _intrf) \ - MDRV_DEVICE_ADD(_tag, Z80SIO, _clock) \ - MDRV_DEVICE_CONFIG(_intrf) +#define MCFG_Z80SIO_ADD(_tag, _clock, _intrf) \ + MCFG_DEVICE_ADD(_tag, Z80SIO, _clock) \ + MCFG_DEVICE_CONFIG(_intrf) diff --git a/src/emu/machine/z80sti.h b/src/emu/machine/z80sti.h index fe3f1fa13a6..0a413a31cfc 100644 --- a/src/emu/machine/z80sti.h +++ b/src/emu/machine/z80sti.h @@ -40,9 +40,9 @@ // DEVICE CONFIGURATION MACROS //************************************************************************** -#define MDRV_Z80STI_ADD(_tag, _clock, _config) \ - MDRV_DEVICE_ADD((_tag), Z80STI, _clock) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_Z80STI_ADD(_tag, _clock, _config) \ + MCFG_DEVICE_ADD((_tag), Z80STI, _clock) \ + MCFG_DEVICE_CONFIG(_config) #define Z80STI_INTERFACE(name) const z80sti_interface (name) = diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h index 2bcdc4fcd44..2ef4f8dd6ee 100644 --- a/src/emu/mconfig.h +++ b/src/emu/mconfig.h @@ -211,90 +211,90 @@ device_config *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_config // importing data from other machine drivers -#define MDRV_FRAGMENT_ADD(_name) \ +#define MCFG_FRAGMENT_ADD(_name) \ MACHINE_CONFIG_NAME(_name)(config, owner); // core parameters -#define MDRV_QUANTUM_TIME(_time) \ +#define MCFG_QUANTUM_TIME(_time) \ config.m_minimum_quantum = ATTOTIME_IN_##_time; \ -#define MDRV_QUANTUM_PERFECT_CPU(_cputag) \ +#define MCFG_QUANTUM_PERFECT_CPU(_cputag) \ config.m_perfect_cpu_quantum = _cputag; \ -#define MDRV_WATCHDOG_VBLANK_INIT(_count) \ +#define MCFG_WATCHDOG_VBLANK_INIT(_count) \ config.m_watchdog_vblank_count = _count; \ -#define MDRV_WATCHDOG_TIME_INIT(_time) \ +#define MCFG_WATCHDOG_TIME_INIT(_time) \ config.m_watchdog_time = ATTOTIME_IN_##_time; \ // core functions -#define MDRV_NVRAM_HANDLER(_func) \ +#define MCFG_NVRAM_HANDLER(_func) \ config.m_nvram_handler = NVRAM_HANDLER_NAME(_func); \ -#define MDRV_MEMCARD_HANDLER(_func) \ +#define MCFG_MEMCARD_HANDLER(_func) \ config.m_memcard_handler = MEMCARD_HANDLER_NAME(_func); \ // core video parameters -#define MDRV_VIDEO_ATTRIBUTES(_flags) \ +#define MCFG_VIDEO_ATTRIBUTES(_flags) \ config.m_video_attributes = _flags; \ -#define MDRV_GFXDECODE(_gfx) \ +#define MCFG_GFXDECODE(_gfx) \ config.m_gfxdecodeinfo = GFXDECODE_NAME(_gfx); \ -#define MDRV_PALETTE_LENGTH(_length) \ +#define MCFG_PALETTE_LENGTH(_length) \ config.m_total_colors = _length; \ -#define MDRV_DEFAULT_LAYOUT(_layout) \ +#define MCFG_DEFAULT_LAYOUT(_layout) \ config.m_default_layout = &(_layout)[0]; \ // core machine functions -#define MDRV_MACHINE_START(_func) \ +#define MCFG_MACHINE_START(_func) \ driver_device_config_base::static_set_callback(owner, driver_device_config_base::CB_MACHINE_START, MACHINE_START_NAME(_func)); \ -#define MDRV_MACHINE_RESET(_func) \ +#define MCFG_MACHINE_RESET(_func) \ driver_device_config_base::static_set_callback(owner, driver_device_config_base::CB_MACHINE_RESET, MACHINE_RESET_NAME(_func)); \ // core sound functions -#define MDRV_SOUND_START(_func) \ +#define MCFG_SOUND_START(_func) \ driver_device_config_base::static_set_callback(owner, driver_device_config_base::CB_SOUND_START, SOUND_START_NAME(_func)); \ -#define MDRV_SOUND_RESET(_func) \ +#define MCFG_SOUND_RESET(_func) \ driver_device_config_base::static_set_callback(owner, driver_device_config_base::CB_SOUND_RESET, SOUND_RESET_NAME(_func)); \ // core video functions -#define MDRV_PALETTE_INIT(_func) \ +#define MCFG_PALETTE_INIT(_func) \ driver_device_config_base::static_set_palette_init(owner, PALETTE_INIT_NAME(_func)); \ -#define MDRV_VIDEO_START(_func) \ +#define MCFG_VIDEO_START(_func) \ driver_device_config_base::static_set_callback(owner, driver_device_config_base::CB_VIDEO_START, VIDEO_START_NAME(_func)); \ -#define MDRV_VIDEO_RESET(_func) \ +#define MCFG_VIDEO_RESET(_func) \ driver_device_config_base::static_set_callback(owner, driver_device_config_base::CB_VIDEO_RESET, VIDEO_RESET_NAME(_func)); \ -#define MDRV_VIDEO_EOF(_func) \ +#define MCFG_VIDEO_EOF(_func) \ driver_device_config_base::static_set_callback(owner, driver_device_config_base::CB_VIDEO_EOF, VIDEO_EOF_NAME(_func)); \ -#define MDRV_VIDEO_UPDATE(_func) \ +#define MCFG_VIDEO_UPDATE(_func) \ driver_device_config_base::static_set_video_update(owner, VIDEO_UPDATE_NAME(_func)); \ // add/remove devices -#define MDRV_DEVICE_ADD(_tag, _type, _clock) \ +#define MCFG_DEVICE_ADD(_tag, _type, _clock) \ device = config.device_add(owner, _tag, _type, _clock); \ -#define MDRV_DEVICE_REPLACE(_tag, _type, _clock) \ +#define MCFG_DEVICE_REPLACE(_tag, _type, _clock) \ device = config.device_replace(owner, _tag, _type, _clock); \ -#define MDRV_DEVICE_REMOVE(_tag) \ +#define MCFG_DEVICE_REMOVE(_tag) \ device = config.device_remove(owner, _tag); \ -#define MDRV_DEVICE_MODIFY(_tag) \ +#define MCFG_DEVICE_MODIFY(_tag) \ device = config.device_find(owner, _tag); \ diff --git a/src/emu/screen.h b/src/emu/screen.h index 4e61e71afa6..4b053cd8e4c 100644 --- a/src/emu/screen.h +++ b/src/emu/screen.h @@ -126,7 +126,7 @@ private: screen_type_enum m_type; // type of screen int m_width, m_height; // default total width/height (HTOTAL, VTOTAL) rectangle m_visarea; // default visible area (HBLANK end/start, VBLANK end/start) - bool m_oldstyle_vblank_supplied; // MDRV_SCREEN_VBLANK_TIME macro used + bool m_oldstyle_vblank_supplied; // MCFG_SCREEN_VBLANK_TIME macro used attoseconds_t m_refresh; // default refresh period attoseconds_t m_vblank; // duration of a VBLANK bitmap_format m_format; // bitmap format @@ -270,35 +270,35 @@ private: // SCREEN DEVICE CONFIGURATION MACROS //************************************************************************** -#define MDRV_SCREEN_ADD(_tag, _type) \ - MDRV_DEVICE_ADD(_tag, SCREEN, 0) \ - MDRV_SCREEN_TYPE(_type) \ +#define MCFG_SCREEN_ADD(_tag, _type) \ + MCFG_DEVICE_ADD(_tag, SCREEN, 0) \ + MCFG_SCREEN_TYPE(_type) \ -#define MDRV_SCREEN_MODIFY(_tag) \ - MDRV_DEVICE_MODIFY(_tag) +#define MCFG_SCREEN_MODIFY(_tag) \ + MCFG_DEVICE_MODIFY(_tag) -#define MDRV_SCREEN_FORMAT(_format) \ +#define MCFG_SCREEN_FORMAT(_format) \ screen_device_config::static_set_format(device, _format); \ -#define MDRV_SCREEN_TYPE(_type) \ +#define MCFG_SCREEN_TYPE(_type) \ screen_device_config::static_set_type(device, SCREEN_TYPE_##_type); \ -#define MDRV_SCREEN_RAW_PARAMS(_pixclock, _htotal, _hbend, _hbstart, _vtotal, _vbend, _vbstart) \ +#define MCFG_SCREEN_RAW_PARAMS(_pixclock, _htotal, _hbend, _hbstart, _vtotal, _vbend, _vbstart) \ screen_device_config::static_set_raw(device, _pixclock, _htotal, _hbend, _hbstart, _vtotal, _vbend, _vbstart); -#define MDRV_SCREEN_REFRESH_RATE(_rate) \ +#define MCFG_SCREEN_REFRESH_RATE(_rate) \ screen_device_config::static_set_refresh(device, HZ_TO_ATTOSECONDS(_rate)); \ -#define MDRV_SCREEN_VBLANK_TIME(_time) \ +#define MCFG_SCREEN_VBLANK_TIME(_time) \ screen_device_config::static_set_vblank_time(device, _time); \ -#define MDRV_SCREEN_SIZE(_width, _height) \ +#define MCFG_SCREEN_SIZE(_width, _height) \ screen_device_config::static_set_size(device, _width, _height); \ -#define MDRV_SCREEN_VISIBLE_AREA(_minx, _maxx, _miny, _maxy) \ +#define MCFG_SCREEN_VISIBLE_AREA(_minx, _maxx, _miny, _maxy) \ screen_device_config::static_set_visarea(device, _minx, _maxx, _miny, _maxy); \ -#define MDRV_SCREEN_DEFAULT_POSITION(_xscale, _xoffs, _yscale, _yoffs) \ +#define MCFG_SCREEN_DEFAULT_POSITION(_xscale, _xoffs, _yscale, _yoffs) \ screen_device_config::static_set_default_position(device, _xscale, _xoffs, _yscale, _yoffs); \ diff --git a/src/emu/softlist.h b/src/emu/softlist.h index adf2cdda21a..ed4cefe8b14 100644 --- a/src/emu/softlist.h +++ b/src/emu/softlist.h @@ -97,26 +97,26 @@ struct _software_list_config #define SOFTWARE_LIST_ORIGINAL_SYSTEM 0 #define SOFTWARE_LIST_COMPATIBLE_SYSTEM 1 -#define MDRV_SOFTWARE_LIST_CONFIG(_idx,_list,_list_type) \ - MDRV_DEVICE_CONFIG_DATAPTR_ARRAY(software_list_config, list_name, _idx, _list) \ - MDRV_DEVICE_CONFIG_DATA32(software_list_config, list_type, _list_type) +#define MCFG_SOFTWARE_LIST_CONFIG(_idx,_list,_list_type) \ + MCFG_DEVICE_CONFIG_DATAPTR_ARRAY(software_list_config, list_name, _idx, _list) \ + MCFG_DEVICE_CONFIG_DATA32(software_list_config, list_type, _list_type) -#define MDRV_SOFTWARE_LIST_ADD( _tag, _list ) \ - MDRV_DEVICE_ADD( _tag, SOFTWARE_LIST, 0 ) \ - MDRV_SOFTWARE_LIST_CONFIG(0,_list, SOFTWARE_LIST_ORIGINAL_SYSTEM) +#define MCFG_SOFTWARE_LIST_ADD( _tag, _list ) \ + MCFG_DEVICE_ADD( _tag, SOFTWARE_LIST, 0 ) \ + MCFG_SOFTWARE_LIST_CONFIG(0,_list, SOFTWARE_LIST_ORIGINAL_SYSTEM) -#define MDRV_SOFTWARE_LIST_COMPATIBLE_ADD( _tag, _list ) \ - MDRV_DEVICE_ADD( _tag, SOFTWARE_LIST, 0 ) \ - MDRV_SOFTWARE_LIST_CONFIG(0,_list, SOFTWARE_LIST_COMPATIBLE_SYSTEM) +#define MCFG_SOFTWARE_LIST_COMPATIBLE_ADD( _tag, _list ) \ + MCFG_DEVICE_ADD( _tag, SOFTWARE_LIST, 0 ) \ + MCFG_SOFTWARE_LIST_CONFIG(0,_list, SOFTWARE_LIST_COMPATIBLE_SYSTEM) -#define MDRV_SOFTWARE_LIST_MODIFY( _tag, _list ) \ - MDRV_DEVICE_MODIFY( _tag ) \ - MDRV_SOFTWARE_LIST_CONFIG(0,_list, SOFTWARE_LIST_ORIGINAL_SYSTEM) +#define MCFG_SOFTWARE_LIST_MODIFY( _tag, _list ) \ + MCFG_DEVICE_MODIFY( _tag ) \ + MCFG_SOFTWARE_LIST_CONFIG(0,_list, SOFTWARE_LIST_ORIGINAL_SYSTEM) -#define MDRV_SOFTWARE_LIST_COMPATIBLE_MODIFY( _tag, _list ) \ - MDRV_DEVICE_MODIFY( _tag ) \ - MDRV_SOFTWARE_LIST_CONFIG(0,_list, SOFTWARE_LIST_COMPATIBLE_SYSTEM) +#define MCFG_SOFTWARE_LIST_COMPATIBLE_MODIFY( _tag, _list ) \ + MCFG_DEVICE_MODIFY( _tag ) \ + MCFG_SOFTWARE_LIST_CONFIG(0,_list, SOFTWARE_LIST_COMPATIBLE_SYSTEM) #endif diff --git a/src/emu/sound.h b/src/emu/sound.h index b50539d7195..2ccee378dae 100644 --- a/src/emu/sound.h +++ b/src/emu/sound.h @@ -123,16 +123,16 @@ extern const device_type SPEAKER; ***************************************************************************/ /* add/remove speakers */ -#define MDRV_SPEAKER_ADD(_tag, _x, _y, _z) \ - MDRV_DEVICE_ADD(_tag, SPEAKER, 0) \ +#define MCFG_SPEAKER_ADD(_tag, _x, _y, _z) \ + MCFG_DEVICE_ADD(_tag, SPEAKER, 0) \ speaker_device_config::static_set_position(device, _x, _y, _z); \ -#define MDRV_SPEAKER_STANDARD_MONO(_tag) \ - MDRV_SPEAKER_ADD(_tag, 0.0, 0.0, 1.0) +#define MCFG_SPEAKER_STANDARD_MONO(_tag) \ + MCFG_SPEAKER_ADD(_tag, 0.0, 0.0, 1.0) -#define MDRV_SPEAKER_STANDARD_STEREO(_tagl, _tagr) \ - MDRV_SPEAKER_ADD(_tagl, -0.2, 0.0, 1.0) \ - MDRV_SPEAKER_ADD(_tagr, 0.2, 0.0, 1.0) +#define MCFG_SPEAKER_STANDARD_STEREO(_tagl, _tagr) \ + MCFG_SPEAKER_ADD(_tagl, -0.2, 0.0, 1.0) \ + MCFG_SPEAKER_ADD(_tagr, 0.2, 0.0, 1.0) diff --git a/src/emu/sound/asc.h b/src/emu/sound/asc.h index b074494e8c8..93c1a95cce5 100644 --- a/src/emu/sound/asc.h +++ b/src/emu/sound/asc.h @@ -39,20 +39,20 @@ enum // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_ASC_ADD(_tag, _clock, _type, _irqf) \ - MDRV_DEVICE_ADD(_tag, ASC, _clock) \ - MDRV_ASC_TYPE(_type) \ - MDRV_IRQ_FUNC(_irqf) +#define MCFG_ASC_ADD(_tag, _clock, _type, _irqf) \ + MCFG_DEVICE_ADD(_tag, ASC, _clock) \ + MCFG_ASC_TYPE(_type) \ + MCFG_IRQ_FUNC(_irqf) -#define MDRV_ASC_REPLACE(_tag, _clock, _type, _irqf) \ - MDRV_DEVICE_REPLACE(_tag, ASC, _clock) \ - MDRV_ASC_TYPE(_type) \ - MDRV_IRQ_FUNC(_irqf) +#define MCFG_ASC_REPLACE(_tag, _clock, _type, _irqf) \ + MCFG_DEVICE_REPLACE(_tag, ASC, _clock) \ + MCFG_ASC_TYPE(_type) \ + MCFG_IRQ_FUNC(_irqf) -#define MDRV_ASC_TYPE(_type) \ +#define MCFG_ASC_TYPE(_type) \ asc_device_config::static_set_type(device, _type); \ -#define MDRV_IRQ_FUNC(_irqf) \ +#define MCFG_IRQ_FUNC(_irqf) \ asc_device_config::static_set_irqf(device, _irqf); \ diff --git a/src/emu/sound/cdp1863.h b/src/emu/sound/cdp1863.h index 5557cb2c8d4..db00349c809 100644 --- a/src/emu/sound/cdp1863.h +++ b/src/emu/sound/cdp1863.h @@ -29,9 +29,9 @@ DECLARE_LEGACY_SOUND_DEVICE(CDP1863, cdp1863); -#define MDRV_CDP1863_ADD(_tag, _clock1, _clock2) \ - MDRV_SOUND_ADD(_tag, CDP1863, _clock1) \ - MDRV_DEVICE_CONFIG_DATA32(cdp1863_config, clock2, _clock2) +#define MCFG_CDP1863_ADD(_tag, _clock1, _clock2) \ + MCFG_SOUND_ADD(_tag, CDP1863, _clock1) \ + MCFG_DEVICE_CONFIG_DATA32(cdp1863_config, clock2, _clock2) #define CDP1863_INTERFACE(name) \ const cdp1863_interface (name) = diff --git a/src/emu/sound/cdp1864.h b/src/emu/sound/cdp1864.h index 990da43cc9e..d85a4fd5541 100644 --- a/src/emu/sound/cdp1864.h +++ b/src/emu/sound/cdp1864.h @@ -77,14 +77,14 @@ DECLARE_LEGACY_SOUND_DEVICE(CDP1864, cdp1864); -#define MDRV_CDP1864_ADD(_tag, _clock, _config) \ - MDRV_SOUND_ADD(_tag, CDP1864, _clock) \ - MDRV_DEVICE_CONFIG(_config) - -#define MDRV_CDP1864_SCREEN_ADD(_tag, _clock) \ - MDRV_SCREEN_ADD(_tag, RASTER) \ - MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) \ - MDRV_SCREEN_RAW_PARAMS(_clock, CDP1864_SCREEN_WIDTH, CDP1864_HBLANK_END, CDP1864_HBLANK_START, CDP1864_TOTAL_SCANLINES, CDP1864_SCANLINE_VBLANK_END, CDP1864_SCANLINE_VBLANK_START) +#define MCFG_CDP1864_ADD(_tag, _clock, _config) \ + MCFG_SOUND_ADD(_tag, CDP1864, _clock) \ + MCFG_DEVICE_CONFIG(_config) + +#define MCFG_CDP1864_SCREEN_ADD(_tag, _clock) \ + MCFG_SCREEN_ADD(_tag, RASTER) \ + MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) \ + MCFG_SCREEN_RAW_PARAMS(_clock, CDP1864_SCREEN_WIDTH, CDP1864_HBLANK_END, CDP1864_HBLANK_START, CDP1864_TOTAL_SCANLINES, CDP1864_SCANLINE_VBLANK_END, CDP1864_SCANLINE_VBLANK_START) #define CDP1864_INTERFACE(name) \ const cdp1864_interface (name) = diff --git a/src/emu/sound/cdp1869.h b/src/emu/sound/cdp1869.h index d6bcadd6ad4..0248bcdace2 100644 --- a/src/emu/sound/cdp1869.h +++ b/src/emu/sound/cdp1869.h @@ -137,22 +137,22 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_CDP1869_ADD(_tag, _pixclock, _config, _map) \ - MDRV_DEVICE_ADD(_tag, CDP1869, _pixclock) \ - MDRV_DEVICE_CONFIG(_config) \ - MDRV_DEVICE_ADDRESS_MAP(0, _map) - -#define MDRV_CDP1869_SCREEN_PAL_ADD(_tag, _clock) \ - MDRV_SCREEN_ADD(_tag, RASTER) \ - MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) \ - MDRV_SCREEN_RAW_PARAMS(_clock, CDP1869_SCREEN_WIDTH, CDP1869_HBLANK_END, CDP1869_HBLANK_START, CDP1869_TOTAL_SCANLINES_PAL, CDP1869_SCANLINE_VBLANK_END_PAL, CDP1869_SCANLINE_VBLANK_START_PAL) \ - MDRV_PALETTE_LENGTH(8+64) - -#define MDRV_CDP1869_SCREEN_NTSC_ADD(_tag, _clock) \ - MDRV_SCREEN_ADD(_tag, RASTER) \ - MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) \ - MDRV_SCREEN_RAW_PARAMS(_clock, CDP1869_SCREEN_WIDTH, CDP1869_HBLANK_END, CDP1869_HBLANK_START, CDP1869_TOTAL_SCANLINES_NTSC, CDP1869_SCANLINE_VBLANK_END_NTSC, CDP1869_SCANLINE_VBLANK_START_NTSC) \ - MDRV_PALETTE_LENGTH(8+64) +#define MCFG_CDP1869_ADD(_tag, _pixclock, _config, _map) \ + MCFG_DEVICE_ADD(_tag, CDP1869, _pixclock) \ + MCFG_DEVICE_CONFIG(_config) \ + MCFG_DEVICE_ADDRESS_MAP(0, _map) + +#define MCFG_CDP1869_SCREEN_PAL_ADD(_tag, _clock) \ + MCFG_SCREEN_ADD(_tag, RASTER) \ + MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) \ + MCFG_SCREEN_RAW_PARAMS(_clock, CDP1869_SCREEN_WIDTH, CDP1869_HBLANK_END, CDP1869_HBLANK_START, CDP1869_TOTAL_SCANLINES_PAL, CDP1869_SCANLINE_VBLANK_END_PAL, CDP1869_SCANLINE_VBLANK_START_PAL) \ + MCFG_PALETTE_LENGTH(8+64) + +#define MCFG_CDP1869_SCREEN_NTSC_ADD(_tag, _clock) \ + MCFG_SCREEN_ADD(_tag, RASTER) \ + MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) \ + MCFG_SCREEN_RAW_PARAMS(_clock, CDP1869_SCREEN_WIDTH, CDP1869_HBLANK_END, CDP1869_HBLANK_START, CDP1869_TOTAL_SCANLINES_NTSC, CDP1869_SCANLINE_VBLANK_END_NTSC, CDP1869_SCANLINE_VBLANK_START_NTSC) \ + MCFG_PALETTE_LENGTH(8+64) #define CDP1869_INTERFACE(_name) \ const cdp1869_interface (_name) = diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h index 071ca8e5969..f246d125829 100644 --- a/src/emu/sound/discrete.h +++ b/src/emu/sound/discrete.h @@ -4420,7 +4420,7 @@ enum * *************************************/ -#define MDRV_SOUND_CONFIG_DISCRETE(name) MDRV_SOUND_CONFIG(name##_discrete_interface) +#define MCFG_SOUND_CONFIG_DISCRETE(name) MCFG_SOUND_CONFIG(name##_discrete_interface) #define DISCRETE_SOUND_EXTERN(name) extern const discrete_sound_block name##_discrete_interface[] #define DISCRETE_SOUND_START(name) const discrete_sound_block name##_discrete_interface[] = { diff --git a/src/emu/sound/flt_rc.h b/src/emu/sound/flt_rc.h index 32b179aa453..56132a5684b 100644 --- a/src/emu/sound/flt_rc.h +++ b/src/emu/sound/flt_rc.h @@ -36,12 +36,12 @@ * Same as FLT_RC_HIGHPASS, but with standard frequency of 16 HZ * This filter may be setup just with * - * MDRV_SOUND_ADD("tag", FILTER_RC, 0) - * MDRV_SOUND_CONFIG(&flt_rc_ac_default) + * MCFG_SOUND_ADD("tag", FILTER_RC, 0) + * MCFG_SOUND_CONFIG(&flt_rc_ac_default) * * Default behaviour: * - * Without MDRV_SOUND_CONFIG, a disabled FLT_RC_LOWPASS is created + * Without MCFG_SOUND_CONFIG, a disabled FLT_RC_LOWPASS is created * */ diff --git a/src/emu/sound/ics2115.h b/src/emu/sound/ics2115.h index dbe6b8a5029..adac871d67a 100644 --- a/src/emu/sound/ics2115.h +++ b/src/emu/sound/ics2115.h @@ -9,15 +9,15 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_ICS2115_ADD(_tag, _clock, _irqf) \ - MDRV_DEVICE_ADD(_tag, ICS2115, _clock) \ - MDRV_IRQ_FUNC(_irqf) \ +#define MCFG_ICS2115_ADD(_tag, _clock, _irqf) \ + MCFG_DEVICE_ADD(_tag, ICS2115, _clock) \ + MCFG_IRQ_FUNC(_irqf) \ -#define MDRV_ICS2115_REPLACE(_tag, _clock, _irqf) \ - MDRV_DEVICE_REPLACE(_tag, ICS2115, _clock) \ - MDRV_IRQ_FUNC(_irqf) +#define MCFG_ICS2115_REPLACE(_tag, _clock, _irqf) \ + MCFG_DEVICE_REPLACE(_tag, ICS2115, _clock) \ + MCFG_IRQ_FUNC(_irqf) -#define MDRV_IRQ_FUNC(_irqf) \ +#define MCFG_IRQ_FUNC(_irqf) \ ics2115_device_config::static_set_irqf(device, _irqf); \ //************************************************************************** diff --git a/src/emu/sound/k056800.h b/src/emu/sound/k056800.h index bef69e59495..57c205b61a7 100644 --- a/src/emu/sound/k056800.h +++ b/src/emu/sound/k056800.h @@ -30,9 +30,9 @@ DECLARE_LEGACY_DEVICE(K056800, k056800); DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_K056800_ADD(_tag, _interface) \ - MDRV_DEVICE_ADD(_tag, K056800, 0) \ - MDRV_DEVICE_CONFIG(_interface) +#define MCFG_K056800_ADD(_tag, _interface) \ + MCFG_DEVICE_ADD(_tag, K056800, 0) \ + MCFG_DEVICE_CONFIG(_interface) /*************************************************************************** diff --git a/src/emu/sound/mos6560.h b/src/emu/sound/mos6560.h index 0203c4cfdc6..89c5fe67c20 100644 --- a/src/emu/sound/mos6560.h +++ b/src/emu/sound/mos6560.h @@ -94,9 +94,9 @@ DECLARE_LEGACY_SOUND_DEVICE(MOS656X, mos6560); DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_MOS656X_ADD(_tag, _interface) \ - MDRV_SOUND_ADD(_tag, MOS656X, 0) \ - MDRV_DEVICE_CONFIG(_interface) +#define MCFG_MOS656X_ADD(_tag, _interface) \ + MCFG_SOUND_ADD(_tag, MOS656X, 0) \ + MCFG_DEVICE_CONFIG(_interface) /*************************************************************************** diff --git a/src/emu/sound/okim6295.h b/src/emu/sound/okim6295.h index 8cdb8637271..e0cccc66381 100644 --- a/src/emu/sound/okim6295.h +++ b/src/emu/sound/okim6295.h @@ -31,15 +31,15 @@ enum // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MDRV_OKIM6295_ADD(_tag, _clock, _pin7) \ - MDRV_DEVICE_ADD(_tag, OKIM6295, _clock) \ - MDRV_OKIM6295_PIN7(_pin7) +#define MCFG_OKIM6295_ADD(_tag, _clock, _pin7) \ + MCFG_DEVICE_ADD(_tag, OKIM6295, _clock) \ + MCFG_OKIM6295_PIN7(_pin7) -#define MDRV_OKIM6295_REPLACE(_tag, _clock, _pin7) \ - MDRV_DEVICE_REPLACE(_tag, OKIM6295, _clock) \ - MDRV_OKIM6295_PIN7(_pin7) +#define MCFG_OKIM6295_REPLACE(_tag, _clock, _pin7) \ + MCFG_DEVICE_REPLACE(_tag, OKIM6295, _clock) \ + MCFG_OKIM6295_PIN7(_pin7) -#define MDRV_OKIM6295_PIN7(_pin7) \ +#define MCFG_OKIM6295_PIN7(_pin7) \ okim6295_device_config::static_set_pin7(device, _pin7); \ diff --git a/src/emu/sound/wave.h b/src/emu/sound/wave.h index 6d27ef62841..8421185d9ac 100644 --- a/src/emu/sound/wave.h +++ b/src/emu/sound/wave.h @@ -12,8 +12,8 @@ DECLARE_LEGACY_SOUND_DEVICE(WAVE, wave); -#define MDRV_SOUND_WAVE_ADD(_tag, _cass_tag) \ - MDRV_SOUND_ADD( _tag, WAVE, 0 ) \ - MDRV_DEVICE_CONFIG( _cass_tag ) +#define MCFG_SOUND_WAVE_ADD(_tag, _cass_tag) \ + MCFG_SOUND_ADD( _tag, WAVE, 0 ) \ + MCFG_DEVICE_CONFIG( _cass_tag ) #endif /* __WAVE_H__ */ diff --git a/src/emu/timer.h b/src/emu/timer.h index 516ceacc1e9..b78a8a7074f 100644 --- a/src/emu/timer.h +++ b/src/emu/timer.h @@ -76,31 +76,31 @@ struct timer_execution_state // TIMER DEVICE CONFIGURATION MACROS //************************************************************************** -#define MDRV_TIMER_ADD(_tag, _callback) \ - MDRV_DEVICE_ADD(_tag, TIMER, 0) \ +#define MCFG_TIMER_ADD(_tag, _callback) \ + MCFG_DEVICE_ADD(_tag, TIMER, 0) \ timer_device_config::static_configure_generic(device, _callback); \ -#define MDRV_TIMER_ADD_PERIODIC(_tag, _callback, _period) \ - MDRV_DEVICE_ADD(_tag, TIMER, 0) \ +#define MCFG_TIMER_ADD_PERIODIC(_tag, _callback, _period) \ + MCFG_DEVICE_ADD(_tag, TIMER, 0) \ timer_device_config::static_configure_periodic(device, _callback, ATTOTIME_IN_##_period); \ -#define MDRV_TIMER_ADD_SCANLINE(_tag, _callback, _screen, _first_vpos, _increment) \ - MDRV_DEVICE_ADD(_tag, TIMER, 0) \ +#define MCFG_TIMER_ADD_SCANLINE(_tag, _callback, _screen, _first_vpos, _increment) \ + MCFG_DEVICE_ADD(_tag, TIMER, 0) \ timer_device_config::static_configure_scanline(device, _callback, _screen, _first_vpos, _increment); \ -#define MDRV_TIMER_MODIFY(_tag) \ - MDRV_DEVICE_MODIFY(_tag) +#define MCFG_TIMER_MODIFY(_tag) \ + MCFG_DEVICE_MODIFY(_tag) -#define MDRV_TIMER_CALLBACK(_callback) \ +#define MCFG_TIMER_CALLBACK(_callback) \ timer_device_config::static_set_callback(device, _callback); \ -#define MDRV_TIMER_START_DELAY(_start_delay) \ +#define MCFG_TIMER_START_DELAY(_start_delay) \ timer_device_config::static_set_start_delay(device, ATTOTIME_IN_##_start_delay); \ -#define MDRV_TIMER_PARAM(_param) \ +#define MCFG_TIMER_PARAM(_param) \ timer_device_config::static_set_param(device, _param); \ -#define MDRV_TIMER_PTR(_ptr) \ +#define MCFG_TIMER_PTR(_ptr) \ timer_device_config::static_set_ptr(device, (void *)(_ptr)); \ diff --git a/src/emu/video/hd63484.h b/src/emu/video/hd63484.h index 206a47f3c53..26a5c742d89 100644 --- a/src/emu/video/hd63484.h +++ b/src/emu/video/hd63484.h @@ -28,9 +28,9 @@ struct _hd63484_interface DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_HD63484_ADD(_tag, _interface) \ - MDRV_DEVICE_ADD(_tag, HD63484, 0) \ - MDRV_DEVICE_CONFIG(_interface) +#define MCFG_HD63484_ADD(_tag, _interface) \ + MCFG_DEVICE_ADD(_tag, HD63484, 0) \ + MCFG_DEVICE_CONFIG(_interface) /*************************************************************************** diff --git a/src/emu/video/mc6845.h b/src/emu/video/mc6845.h index 2fe0d6b5d2d..e65d6e7f5a8 100644 --- a/src/emu/video/mc6845.h +++ b/src/emu/video/mc6845.h @@ -22,9 +22,9 @@ DECLARE_LEGACY_DEVICE(SY6545_1, sy6545_1); DECLARE_LEGACY_DEVICE(SY6845E, sy6845e); -#define MDRV_MC6845_ADD(_tag, _variant, _clock, _config) \ - MDRV_DEVICE_ADD(_tag, _variant, _clock) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_MC6845_ADD(_tag, _variant, _clock, _config) \ + MCFG_DEVICE_ADD(_tag, _variant, _clock) \ + MCFG_DEVICE_CONFIG(_config) /* callback definitions */ diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c index 4db64fad94f..3d2d1008373 100644 --- a/src/emu/video/pc_vga.c +++ b/src/emu/video/pc_vga.c @@ -180,29 +180,29 @@ static const unsigned short vga_colortable[] = }; MACHINE_CONFIG_FRAGMENT( pcvideo_vga ) - MDRV_SCREEN_ADD("screen", RASTER) - MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) - MDRV_SCREEN_SIZE(720, 480) - MDRV_SCREEN_VISIBLE_AREA(0,720-1, 0,480-1) - MDRV_PALETTE_LENGTH(0x100) - MDRV_PALETTE_INIT(vga) - - MDRV_VIDEO_START(vga) - MDRV_VIDEO_RESET(vga) - MDRV_VIDEO_UPDATE(pc_video) + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_SIZE(720, 480) + MCFG_SCREEN_VISIBLE_AREA(0,720-1, 0,480-1) + MCFG_PALETTE_LENGTH(0x100) + MCFG_PALETTE_INIT(vga) + + MCFG_VIDEO_START(vga) + MCFG_VIDEO_RESET(vga) + MCFG_VIDEO_UPDATE(pc_video) MACHINE_CONFIG_END MACHINE_CONFIG_FRAGMENT( pcvideo_pc1640 ) - MDRV_SCREEN_ADD("screen", RASTER) - MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) - MDRV_SCREEN_SIZE(720, 350) - MDRV_SCREEN_VISIBLE_AREA(0,720-1, 0,350-1) - MDRV_PALETTE_LENGTH(sizeof(ega_palette) / 3) - MDRV_PALETTE_INIT(ega) - - MDRV_VIDEO_START(ega) - MDRV_VIDEO_RESET(ega) - MDRV_VIDEO_UPDATE(pc_video) + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_SIZE(720, 350) + MCFG_SCREEN_VISIBLE_AREA(0,720-1, 0,350-1) + MCFG_PALETTE_LENGTH(sizeof(ega_palette) / 3) + MCFG_PALETTE_INIT(ega) + + MCFG_VIDEO_START(ega) + MCFG_VIDEO_RESET(ega) + MCFG_VIDEO_UPDATE(pc_video) MACHINE_CONFIG_END /***************************************************************************/ diff --git a/src/emu/video/s2636.h b/src/emu/video/s2636.h index fad925f7a22..d46d391a6d8 100644 --- a/src/emu/video/s2636.h +++ b/src/emu/video/s2636.h @@ -37,9 +37,9 @@ struct _s2636_interface DECLARE_LEGACY_DEVICE(S2636, s2636); -#define MDRV_S2636_ADD(_tag, _interface) \ - MDRV_DEVICE_ADD(_tag, S2636, 0) \ - MDRV_DEVICE_CONFIG(_interface) +#define MCFG_S2636_ADD(_tag, _interface) \ + MCFG_DEVICE_ADD(_tag, S2636, 0) \ + MCFG_DEVICE_CONFIG(_interface) /************************************* diff --git a/src/emu/video/saa5050.h b/src/emu/video/saa5050.h index 8426c5a1045..ffedce6046f 100644 --- a/src/emu/video/saa5050.h +++ b/src/emu/video/saa5050.h @@ -32,9 +32,9 @@ DECLARE_LEGACY_DEVICE(SAA5050, saa5050); DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_SAA5050_ADD(_tag, _interface) \ - MDRV_DEVICE_ADD(_tag, SAA5050, 0) \ - MDRV_DEVICE_CONFIG(_interface) +#define MCFG_SAA5050_ADD(_tag, _interface) \ + MCFG_DEVICE_ADD(_tag, SAA5050, 0) \ + MCFG_DEVICE_CONFIG(_interface) /*************************************************************************** diff --git a/src/emu/video/tlc34076.h b/src/emu/video/tlc34076.h index 0e5336cf088..8539b80b06e 100644 --- a/src/emu/video/tlc34076.h +++ b/src/emu/video/tlc34076.h @@ -30,9 +30,9 @@ DECLARE_LEGACY_DEVICE(TLC34076, tlc34076); DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_TLC34076_ADD(_tag, _res_sel) \ - MDRV_DEVICE_ADD(_tag, TLC34076, 0) \ - MDRV_DEVICE_CONFIG_DATA32(tlc34076_config, res_sel, _res_sel) +#define MCFG_TLC34076_ADD(_tag, _res_sel) \ + MCFG_DEVICE_ADD(_tag, TLC34076, 0) \ + MCFG_DEVICE_CONFIG_DATA32(tlc34076_config, res_sel, _res_sel) /*************************************************************************** diff --git a/src/emu/video/tms9927.h b/src/emu/video/tms9927.h index 02705e0d943..81ae2da2bb6 100644 --- a/src/emu/video/tms9927.h +++ b/src/emu/video/tms9927.h @@ -19,14 +19,14 @@ DECLARE_LEGACY_DEVICE(CRT5037, crt5037); DECLARE_LEGACY_DEVICE(CRT5057, crt5057); -#define MDRV_TMS9927_ADD(_tag, _clock, _config) \ - MDRV_DEVICE_ADD(_tag, TMS9927, _clock) \ - MDRV_DEVICE_CONFIG(_config) - -#define MDRV_TMS9927_RECONFIG(_tag, _clock, _config) \ - MDRV_DEVICE_MODIFY(_tag) \ - MDRV_DEVICE_CLOCK(_clock) \ - MDRV_DEVICE_CONFIG(_config) +#define MCFG_TMS9927_ADD(_tag, _clock, _config) \ + MCFG_DEVICE_ADD(_tag, TMS9927, _clock) \ + MCFG_DEVICE_CONFIG(_config) + +#define MCFG_TMS9927_RECONFIG(_tag, _clock, _config) \ + MCFG_DEVICE_MODIFY(_tag) \ + MCFG_DEVICE_CLOCK(_clock) \ + MCFG_DEVICE_CONFIG(_config) diff --git a/src/emu/video/tms9928a.c b/src/emu/video/tms9928a.c index 20ae9ecde1f..380f55c35ff 100644 --- a/src/emu/video/tms9928a.c +++ b/src/emu/video/tms9928a.c @@ -819,17 +819,17 @@ VIDEO_START( tms9928a ) MACHINE_CONFIG_FRAGMENT( tms9928a ) /* video hardware */ - MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) + MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) - MDRV_SCREEN_ADD("screen", RASTER) - MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) - MDRV_SCREEN_SIZE(LEFT_BORDER+32*8+RIGHT_BORDER, TOP_BORDER_60HZ+24*8+BOTTOM_BORDER_60HZ) - MDRV_SCREEN_VISIBLE_AREA(LEFT_BORDER-12, LEFT_BORDER+32*8+12-1, TOP_BORDER_60HZ-9, TOP_BORDER_60HZ+24*8+9-1) + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_SIZE(LEFT_BORDER+32*8+RIGHT_BORDER, TOP_BORDER_60HZ+24*8+BOTTOM_BORDER_60HZ) + MCFG_SCREEN_VISIBLE_AREA(LEFT_BORDER-12, LEFT_BORDER+32*8+12-1, TOP_BORDER_60HZ-9, TOP_BORDER_60HZ+24*8+9-1) - MDRV_PALETTE_LENGTH(TMS9928A_PALETTE_SIZE) - MDRV_PALETTE_INIT(tms9928a) + MCFG_PALETTE_LENGTH(TMS9928A_PALETTE_SIZE) + MCFG_PALETTE_INIT(tms9928a) - MDRV_VIDEO_START(tms9928a) - MDRV_VIDEO_UPDATE(tms9928a) + MCFG_VIDEO_START(tms9928a) + MCFG_VIDEO_UPDATE(tms9928a) MACHINE_CONFIG_END diff --git a/src/emu/video/voodoo.h b/src/emu/video/voodoo.h index 74a6646066e..5baf04b92ee 100644 --- a/src/emu/video/voodoo.h +++ b/src/emu/video/voodoo.h @@ -93,38 +93,38 @@ struct _voodoo_config DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MDRV_3DFX_VOODOO_ADD(_tag, _type, _clock, _fbmem, _screen) \ - MDRV_DEVICE_ADD(_tag, VOODOO_GRAPHICS, _clock) \ - MDRV_DEVICE_CONFIG_DATA32(voodoo_config, type, _type) \ - MDRV_DEVICE_CONFIG_DATA32(voodoo_config, fbmem, _fbmem) \ - MDRV_DEVICE_CONFIG_DATAPTR(voodoo_config, screen, _screen) +#define MCFG_3DFX_VOODOO_ADD(_tag, _type, _clock, _fbmem, _screen) \ + MCFG_DEVICE_ADD(_tag, VOODOO_GRAPHICS, _clock) \ + MCFG_DEVICE_CONFIG_DATA32(voodoo_config, type, _type) \ + MCFG_DEVICE_CONFIG_DATA32(voodoo_config, fbmem, _fbmem) \ + MCFG_DEVICE_CONFIG_DATAPTR(voodoo_config, screen, _screen) -#define MDRV_3DFX_VOODOO_1_ADD(_tag, _clock, _fbmem, _screen) \ - MDRV_3DFX_VOODOO_ADD(_tag, VOODOO_1, _clock, _fbmem, _screen) +#define MCFG_3DFX_VOODOO_1_ADD(_tag, _clock, _fbmem, _screen) \ + MCFG_3DFX_VOODOO_ADD(_tag, VOODOO_1, _clock, _fbmem, _screen) -#define MDRV_3DFX_VOODOO_2_ADD(_tag, _clock, _fbmem, _screen) \ - MDRV_3DFX_VOODOO_ADD(_tag, VOODOO_2, _clock, _fbmem, _screen) +#define MCFG_3DFX_VOODOO_2_ADD(_tag, _clock, _fbmem, _screen) \ + MCFG_3DFX_VOODOO_ADD(_tag, VOODOO_2, _clock, _fbmem, _screen) -#define MDRV_3DFX_VOODOO_BANSHEE_ADD(_tag, _clock, _fbmem, _screen) \ - MDRV_3DFX_VOODOO_ADD(_tag, VOODOO_BANSHEE, _clock, _fbmem, _screen) +#define MCFG_3DFX_VOODOO_BANSHEE_ADD(_tag, _clock, _fbmem, _screen) \ + MCFG_3DFX_VOODOO_ADD(_tag, VOODOO_BANSHEE, _clock, _fbmem, _screen) -#define MDRV_3DFX_VOODOO_3_ADD(_tag, _clock, _fbmem, _screen) \ - MDRV_3DFX_VOODOO_ADD(_tag, VOODOO_3, _clock, _fbmem, _screen) +#define MCFG_3DFX_VOODOO_3_ADD(_tag, _clock, _fbmem, _screen) \ + MCFG_3DFX_VOODOO_ADD(_tag, VOODOO_3, _clock, _fbmem, _screen) -#define MDRV_3DFX_VOODOO_TMU_MEMORY(_tmu, _tmumem) \ - MDRV_DEVICE_CONFIG_DATA32(voodoo_config, tmumem##_tmu, _tmumem) +#define MCFG_3DFX_VOODOO_TMU_MEMORY(_tmu, _tmumem) \ + MCFG_DEVICE_CONFIG_DATA32(voodoo_config, tmumem##_tmu, _tmumem) -#define MDRV_3DFX_VOODOO_VBLANK(_vblank) \ - MDRV_DEVICE_CONFIG_DATAPTR(voodoo_config, vblank, _vblank) +#define MCFG_3DFX_VOODOO_VBLANK(_vblank) \ + MCFG_DEVICE_CONFIG_DATAPTR(voodoo_config, vblank, _vblank) -#define MDRV_3DFX_VOODOO_STALL(_stall) \ - MDRV_DEVICE_CONFIG_DATAPTR(voodoo_config, stall, _stall) +#define MCFG_3DFX_VOODOO_STALL(_stall) \ + MCFG_DEVICE_CONFIG_DATAPTR(voodoo_config, stall, _stall) -#define MDRV_3DFX_VOODOO_CPU(_cputag) \ - MDRV_DEVICE_CONFIG_DATAPTR(voodoo_config, cputag, _cputag) +#define MCFG_3DFX_VOODOO_CPU(_cputag) \ + MCFG_DEVICE_CONFIG_DATAPTR(voodoo_config, cputag, _cputag) -#define MDRV_3DFX_VOODOO_MODIFY(_tag) \ - MDRV_DEVICE_MODIFY(_tag) +#define MCFG_3DFX_VOODOO_MODIFY(_tag) \ + MCFG_DEVICE_MODIFY(_tag) |