summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/cbm2/exp.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/cbm2/exp.cpp')
-rw-r--r--src/devices/bus/cbm2/exp.cpp24
1 files changed, 8 insertions, 16 deletions
diff --git a/src/devices/bus/cbm2/exp.cpp b/src/devices/bus/cbm2/exp.cpp
index bcc2a654060..92c865006f7 100644
--- a/src/devices/bus/cbm2/exp.cpp
+++ b/src/devices/bus/cbm2/exp.cpp
@@ -35,11 +35,11 @@ DEFINE_DEVICE_TYPE(CBM2_EXPANSION_SLOT, cbm2_expansion_slot_device, "cbm2_expans
// device_cbm2_expansion_card_interface - constructor
//-------------------------------------------------
-device_cbm2_expansion_card_interface::device_cbm2_expansion_card_interface(const machine_config &mconfig, device_t &device)
- : device_slot_card_interface(mconfig, device),
- m_bank1(*this, "bank1"),
- m_bank2(*this, "bank2"),
- m_bank3(*this, "bank3")
+device_cbm2_expansion_card_interface::device_cbm2_expansion_card_interface(const machine_config &mconfig, device_t &device) :
+ device_interface(device, "cbm2exp"),
+ m_bank1(*this, "bank1"),
+ m_bank2(*this, "bank2"),
+ m_bank3(*this, "bank3")
{
m_slot = dynamic_cast<cbm2_expansion_slot_device *>(device.owner());
}
@@ -65,7 +65,7 @@ device_cbm2_expansion_card_interface::~device_cbm2_expansion_card_interface()
cbm2_expansion_slot_device::cbm2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CBM2_EXPANSION_SLOT, tag, owner, clock),
- device_slot_interface(mconfig, *this),
+ device_single_card_slot_interface<device_cbm2_expansion_card_interface>(mconfig, *this),
device_image_interface(mconfig, *this),
m_card(nullptr)
{
@@ -78,9 +78,10 @@ cbm2_expansion_slot_device::cbm2_expansion_slot_device(const machine_config &mco
void cbm2_expansion_slot_device::device_start()
{
- m_card = dynamic_cast<device_cbm2_expansion_card_interface *>(get_card_device());
+ m_card = get_card_device();
// inherit bus clock
+ // FIXME: this should be unnecessary as slots pass DERIVED_CLOCK(1, 1) through by default
if (clock() == 0)
{
cbm2_expansion_slot_device *root = machine().device<cbm2_expansion_slot_device>(CBM2_EXPANSION_SLOT_TAG);
@@ -91,15 +92,6 @@ void cbm2_expansion_slot_device::device_start()
//-------------------------------------------------
-// device_reset - device-specific reset
-//-------------------------------------------------
-
-void cbm2_expansion_slot_device::device_reset()
-{
-}
-
-
-//-------------------------------------------------
// call_load -
//-------------------------------------------------