diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/vtech/memexp/memexp.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/vtech/memexp/memexp.cpp')
-rw-r--r-- | src/devices/bus/vtech/memexp/memexp.cpp | 44 |
1 files changed, 20 insertions, 24 deletions
diff --git a/src/devices/bus/vtech/memexp/memexp.cpp b/src/devices/bus/vtech/memexp/memexp.cpp index 90f51da7345..e7f61e5d048 100644 --- a/src/devices/bus/vtech/memexp/memexp.cpp +++ b/src/devices/bus/vtech/memexp/memexp.cpp @@ -30,8 +30,8 @@ DEFINE_DEVICE_TYPE(VTECH_MEMEXP_SLOT, vtech_memexp_slot_device, "vtech_memexp_sl vtech_memexp_slot_device::vtech_memexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, VTECH_MEMEXP_SLOT, tag, owner, clock), device_slot_interface(mconfig, *this), - m_program(*this, finder_base::DUMMY_TAG, -1), - m_io(*this, finder_base::DUMMY_TAG, -1), + m_program(nullptr), + m_io(nullptr), m_cart(nullptr), m_int_handler(*this), m_nmi_handler(*this), @@ -48,28 +48,6 @@ vtech_memexp_slot_device::~vtech_memexp_slot_device() } //------------------------------------------------- -// device_config_complete - perform any -// operations now that the configuration is -// complete -//------------------------------------------------- - -void vtech_memexp_slot_device::device_config_complete() -{ - // for passthrough connectors, use the parent slot's spaces - if (dynamic_cast<device_vtech_memexp_interface *>(owner()) != nullptr) - { - auto parent = dynamic_cast<vtech_memexp_slot_device *>(owner()->owner()); - if (parent != nullptr) - { - if (m_program.finder_tag() == finder_base::DUMMY_TAG) - m_program.set_tag(parent->m_program, parent->m_program.spacenum()); - if (m_io.finder_tag() == finder_base::DUMMY_TAG) - m_io.set_tag(parent->m_io, parent->m_io.spacenum()); - } - } -} - -//------------------------------------------------- // device_start - device-specific startup //------------------------------------------------- @@ -89,6 +67,24 @@ void vtech_memexp_slot_device::device_reset() { } +//------------------------------------------------- +// set_program_space - set address space we are attached to +//------------------------------------------------- + +void vtech_memexp_slot_device::set_program_space(address_space *program) +{ + m_program = program; +} + +//------------------------------------------------- +// set_io_space - set address space we are attached to +//------------------------------------------------- + +void vtech_memexp_slot_device::set_io_space(address_space *io) +{ + m_io = io; +} + //************************************************************************** // CARTRIDGE INTERFACE |