diff options
Diffstat (limited to 'src/devices/bus/plus4/exp.cpp')
-rw-r--r-- | src/devices/bus/plus4/exp.cpp | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/src/devices/bus/plus4/exp.cpp b/src/devices/bus/plus4/exp.cpp index 83e8ad4277a..5ca28efd81d 100644 --- a/src/devices/bus/plus4/exp.cpp +++ b/src/devices/bus/plus4/exp.cpp @@ -36,7 +36,7 @@ DEFINE_DEVICE_TYPE(PLUS4_EXPANSION_SLOT, plus4_expansion_slot_device, "plus4_exp //------------------------------------------------- device_plus4_expansion_card_interface::device_plus4_expansion_card_interface(const machine_config &mconfig, device_t &device) : - device_slot_card_interface(mconfig, device), + device_interface(device, "plus4exp"), m_c1l(*this, "c1l"), m_c1h(*this, "c1h"), m_c2l(*this, "c2l"), @@ -70,38 +70,24 @@ device_plus4_expansion_card_interface::~device_plus4_expansion_card_interface() plus4_expansion_slot_device::plus4_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PLUS4_EXPANSION_SLOT, tag, owner, clock), - device_slot_interface(mconfig, *this), + device_single_card_slot_interface<device_plus4_expansion_card_interface>(mconfig, *this), device_image_interface(mconfig, *this), m_write_irq(*this), m_read_dma_cd(*this), m_write_dma_cd(*this), - m_write_aec(*this), m_card(nullptr) + m_write_aec(*this), + m_card(nullptr) { } //------------------------------------------------- -// device_validity_check - -//------------------------------------------------- - -void plus4_expansion_slot_device::device_validity_check(validity_checker &valid) const -{ - device_t *const carddev = get_card_device(); - if (carddev && !dynamic_cast<device_plus4_expansion_card_interface *>(carddev)) - osd_printf_error("Card device %s (%s) does not implement device_plus4_expansion_card_interface\n", carddev->tag(), carddev->name()); -} - - -//------------------------------------------------- // device_start - device-specific startup //------------------------------------------------- void plus4_expansion_slot_device::device_start() { - device_t *const carddev = get_card_device(); - m_card = dynamic_cast<device_plus4_expansion_card_interface *>(carddev); - if (carddev && !m_card) - fatalerror("Card device %s (%s) does not implement device_plus4_expansion_card_interface\n", carddev->tag(), carddev->name()); + m_card = get_card_device(); // resolve callbacks m_write_irq.resolve_safe(); @@ -110,6 +96,7 @@ void plus4_expansion_slot_device::device_start() m_write_aec.resolve_safe(); // inherit bus clock + // FIXME: this should be unnecessary as slots pass DERIVED_CLOCK(1, 1) through by default if (clock() == 0) { plus4_expansion_slot_device *root = machine().device<plus4_expansion_slot_device>(PLUS4_EXPANSION_SLOT_TAG); @@ -120,15 +107,6 @@ void plus4_expansion_slot_device::device_start() //------------------------------------------------- -// device_reset - device-specific reset -//------------------------------------------------- - -void plus4_expansion_slot_device::device_reset() -{ -} - - -//------------------------------------------------- // call_load - //------------------------------------------------- |