diff options
Diffstat (limited to 'src/devices/bus/apricot/expansion/expansion.cpp')
-rw-r--r-- | src/devices/bus/apricot/expansion/expansion.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/devices/bus/apricot/expansion/expansion.cpp b/src/devices/bus/apricot/expansion/expansion.cpp index 8f99831b482..b5717d320a5 100644 --- a/src/devices/bus/apricot/expansion/expansion.cpp +++ b/src/devices/bus/apricot/expansion/expansion.cpp @@ -14,21 +14,19 @@ // EXPANSION SLOT DEVICE //************************************************************************** -const device_type APRICOT_EXPANSION_SLOT = device_creator<apricot_expansion_slot_device>; +DEFINE_DEVICE_TYPE(APRICOT_EXPANSION_SLOT, apricot_expansion_slot_device, "apricot_exp_slot", "Apricot Expansion Slot") //------------------------------------------------- // apricot_expansion_slot_device - constructor //------------------------------------------------- apricot_expansion_slot_device::apricot_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - device_t(mconfig, APRICOT_EXPANSION_SLOT, "Apricot Expansion Slot", tag, owner, clock, "apricot_exp_slot", __FILE__), - device_slot_interface(mconfig, *this) + apricot_expansion_slot_device(mconfig, APRICOT_EXPANSION_SLOT, tag, owner, clock) { } -apricot_expansion_slot_device::apricot_expansion_slot_device(const machine_config &mconfig, device_type type, const char *name, - const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) : - device_t(mconfig, type, name, tag, owner, clock, shortname, source), +apricot_expansion_slot_device::apricot_expansion_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : + device_t(mconfig, type, tag, owner, clock), device_slot_interface(mconfig, *this) { } @@ -53,14 +51,14 @@ void apricot_expansion_slot_device::device_start() // EXPANSION BUS DEVICE //************************************************************************** -const device_type APRICOT_EXPANSION_BUS = device_creator<apricot_expansion_bus_device>; +DEFINE_DEVICE_TYPE(APRICOT_EXPANSION_BUS, apricot_expansion_bus_device, "apricot_exp_bus", "Apricot Expansion Bus") //------------------------------------------------- // apricot_expansion_bus_device - constructor //------------------------------------------------- apricot_expansion_bus_device::apricot_expansion_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - device_t(mconfig, APRICOT_EXPANSION_BUS, "Apricot Expansion Bus", tag, owner, clock, "apricot_exp_bus", __FILE__), + device_t(mconfig, APRICOT_EXPANSION_BUS, tag, owner, clock), m_program(nullptr), m_io(nullptr), m_program_iop(nullptr), @@ -174,8 +172,8 @@ void apricot_expansion_bus_device::install_ram(offs_t addrstart, offs_t addrend, device_apricot_expansion_card_interface::device_apricot_expansion_card_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), - m_next(nullptr), - m_bus(nullptr) + m_bus(nullptr), + m_next(nullptr) { } |