summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/eeprom.cpp
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2016-11-19 22:59:24 +0100
committer Olivier Galibert <galibert@pobox.com>2016-11-19 22:59:24 +0100
commit53df201f3241d619ed62ff6fdb88a8939fb2be85 (patch)
tree027b49f9899528b271f576f4e20267442b3a311b /src/devices/machine/eeprom.cpp
parent8d233c0cc7a41337626305b5c3db26be7511549f (diff)
emucore: Kill generic_ptr [O. Galibert]
Diffstat (limited to 'src/devices/machine/eeprom.cpp')
-rw-r--r--src/devices/machine/eeprom.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/devices/machine/eeprom.cpp b/src/devices/machine/eeprom.cpp
index 7e3a552a4d4..f737e7a5c03 100644
--- a/src/devices/machine/eeprom.cpp
+++ b/src/devices/machine/eeprom.cpp
@@ -81,7 +81,7 @@ void eeprom_base_device::static_set_default_data(device_t &device, const uint8_t
{
eeprom_base_device &eeprom = downcast<eeprom_base_device &>(device);
assert(eeprom.m_data_bits == 8);
- eeprom.m_default_data.u8 = const_cast<uint8_t *>(data);
+ eeprom.m_default_data = data;
eeprom.m_default_data_size = size;
}
@@ -89,7 +89,7 @@ void eeprom_base_device::static_set_default_data(device_t &device, const uint16_
{
eeprom_base_device &eeprom = downcast<eeprom_base_device &>(device);
assert(eeprom.m_data_bits == 16);
- eeprom.m_default_data.u16 = const_cast<uint16_t *>(data);
+ eeprom.m_default_data = data;
eeprom.m_default_data_size = size / 2;
}
@@ -245,15 +245,15 @@ void eeprom_base_device::nvram_default()
internal_write(offs, default_value);
// handle hard-coded data from the driver
- if (m_default_data.u8 != nullptr)
+ if (m_default_data != nullptr)
{
osd_printf_verbose("Warning: Driver-specific EEPROM defaults are going away soon.\n");
for (offs_t offs = 0; offs < m_default_data_size; offs++)
{
if (m_data_bits == 8)
- internal_write(offs, m_default_data.u8[offs]);
+ internal_write(offs, static_cast<const u8 *>(m_default_data)[offs]);
else
- internal_write(offs, m_default_data.u16[offs]);
+ internal_write(offs, static_cast<const u16 *>(m_default_data)[offs]);
}
}