diff options
Diffstat (limited to 'src/devices/machine/nvram.h')
-rw-r--r-- | src/devices/machine/nvram.h | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/devices/machine/nvram.h b/src/devices/machine/nvram.h index 2a982b590e1..15dd08fa9e0 100644 --- a/src/devices/machine/nvram.h +++ b/src/devices/machine/nvram.h @@ -21,32 +21,32 @@ #define MCFG_NVRAM_ADD_0FILL(_tag) \ MCFG_DEVICE_ADD(_tag, NVRAM, 0) \ - nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_ALL_0); + downcast<nvram_device &>(*device).set_default_value(nvram_device::DEFAULT_ALL_0); #define MCFG_NVRAM_ADD_1FILL(_tag) \ MCFG_DEVICE_ADD(_tag, NVRAM, 0) \ - nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_ALL_1); + downcast<nvram_device &>(*device).set_default_value(nvram_device::DEFAULT_ALL_1); #define MCFG_NVRAM_ADD_RANDOM_FILL(_tag) \ MCFG_DEVICE_ADD(_tag, NVRAM, 0) \ - nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_RANDOM); + downcast<nvram_device &>(*device).set_default_value(nvram_device::DEFAULT_RANDOM); #define MCFG_NVRAM_ADD_NO_FILL(_tag) \ MCFG_DEVICE_ADD(_tag, NVRAM, 0) \ - nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_NONE); + downcast<nvram_device &>(*device).set_default_value(nvram_device::DEFAULT_NONE); #define MCFG_NVRAM_ADD_CUSTOM_DRIVER(_tag, _class, _method) \ MCFG_DEVICE_ADD(_tag, NVRAM, 0) \ - nvram_device::static_set_custom_handler(*device, nvram_device::init_delegate(&_class::_method, #_class "::" #_method, nullptr, (_class *)nullptr)); + downcast<nvram_device &>(*device).set_custom_handler(nvram_device::init_delegate(&_class::_method, #_class "::" #_method, nullptr, (_class *)nullptr)); #define MCFG_NVRAM_REPLACE_0FILL(_tag) \ MCFG_DEVICE_REPLACE(_tag, NVRAM, 0) \ - nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_ALL_0); + downcast<nvram_device &>(*device).set_default_value(nvram_device::DEFAULT_ALL_0); #define MCFG_NVRAM_REPLACE_1FILL(_tag) \ MCFG_DEVICE_REPLACE(_tag, NVRAM, 0) \ - nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_ALL_1); + downcast<nvram_device &>(*device).set_default_value(nvram_device::DEFAULT_ALL_1); #define MCFG_NVRAM_REPLACE_RANDOM_FILL(_tag) \ MCFG_DEVICE_REPLACE(_tag, NVRAM, 0) \ - nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_RANDOM); + downcast<nvram_device &>(*device).set_default_value(*nvram_device::DEFAULT_RANDOM); #define MCFG_NVRAM_REPLACE_CUSTOM_DRIVER(_tag, _class, _method) \ MCFG_DEVICE_REPLACE(_tag, NVRAM, 0) \ - nvram_device::static_set_custom_handler(*device, nvram_device::init_delegate(&_class::_method, #_class "::" #_method, nullptr, (_class *)nullptr)); + downcast<nvram_device &>(*device).set_custom_handler(nvram_device::init_delegate(&_class::_method, #_class "::" #_method, nullptr, (_class *)nullptr)); //************************************************************************** @@ -76,8 +76,12 @@ public: nvram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // inline configuration helpers - static void static_set_default_value(device_t &device, default_value value); - static void static_set_custom_handler(device_t &device, init_delegate &&callback); + void set_default_value(default_value value) { m_default_value = value; } + template <typename Object> void set_custom_handler(Object &&cb) + { + m_default_value = DEFAULT_CUSTOM; + m_custom_handler = std::forward<Object>(cb); + } // controls void set_base(void *base, size_t length) { m_base = base; m_length = length; } |