diff options
Diffstat (limited to 'src/devices/bus/msx_slot/rom.cpp')
-rw-r--r-- | src/devices/bus/msx_slot/rom.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/devices/bus/msx_slot/rom.cpp b/src/devices/bus/msx_slot/rom.cpp index 2d4593bed2b..5a6bef72e91 100644 --- a/src/devices/bus/msx_slot/rom.cpp +++ b/src/devices/bus/msx_slot/rom.cpp @@ -10,7 +10,7 @@ const device_type MSX_SLOT_ROM = &device_creator<msx_slot_rom_device>; msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_SLOT_ROM, "MSX Internal ROM", tag, owner, clock, "msx_slot_rom", __FILE__) , msx_internal_slot_interface() - , m_region(nullptr) + , m_rom_region(*this) , m_region_offset(0) , m_rom(nullptr) { @@ -20,7 +20,7 @@ msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, const ch msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , msx_internal_slot_interface() - , m_region(nullptr) + , m_rom_region(*this) , m_region_offset(0) , m_rom(nullptr) { @@ -31,25 +31,17 @@ void msx_slot_rom_device::set_rom_start(device_t &device, const char *region, UI { msx_slot_rom_device &dev = downcast<msx_slot_rom_device &>(device); - dev.m_region = region; + dev.m_rom_region.set_tag(region); dev.m_region_offset = offset; } void msx_slot_rom_device::device_start() { - assert(m_region != nullptr ); - - memory_region *m_rom_region = owner()->memregion(m_region); - // Sanity checks - if (m_rom_region == nullptr ) - { - fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag(), m_region); - } if (m_rom_region->bytes() < m_region_offset + m_size) { - fatalerror("Memory region '%s' is too small for rom slot '%s'\n", m_region, tag()); + fatalerror("Memory region '%s' is too small for rom slot '%s'\n", m_rom_region.finder_tag(), tag()); } m_rom = m_rom_region->base() + m_region_offset; |