summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/nubus/nubus_48gc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/nubus/nubus_48gc.cpp')
-rw-r--r--src/devices/bus/nubus/nubus_48gc.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/devices/bus/nubus/nubus_48gc.cpp b/src/devices/bus/nubus/nubus_48gc.cpp
index 2be716827f1..7d7be92216d 100644
--- a/src/devices/bus/nubus/nubus_48gc.cpp
+++ b/src/devices/bus/nubus/nubus_48gc.cpp
@@ -41,8 +41,8 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type NUBUS_48GC = device_creator<nubus_48gc_device>;
-const device_type NUBUS_824GC = device_creator<nubus_824gc_device>;
+DEFINE_DEVICE_TYPE(NUBUS_48GC, nubus_48gc_device, "nb_48gc", "Apple 4*8 video card")
+DEFINE_DEVICE_TYPE(NUBUS_824GC, nubus_824gc_device, "nb_824gc", "Apple 8*24 video card")
//-------------------------------------------------
@@ -77,25 +77,25 @@ const tiny_rom_entry *nubus_824gc_device::device_rom_region() const
// jmfb_device - constructor
//-------------------------------------------------
-jmfb_device::jmfb_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),
- device_video_interface(mconfig, *this),
- device_nubus_card_interface(mconfig, *this), m_screen(nullptr), m_timer(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_stride(0), m_base(0), m_count(0), m_clutoffs(0), m_xres(0), m_yres(0), m_is824(false)
+jmfb_device::jmfb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, bool is824) :
+ device_t(mconfig, type, tag, owner, clock),
+ device_video_interface(mconfig, *this),
+ device_nubus_card_interface(mconfig, *this),
+ m_screen(nullptr), m_timer(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_stride(0), m_base(0), m_count(0), m_clutoffs(0), m_xres(0), m_yres(0),
+ m_is824(is824),
+ m_assembled_tag(util::string_format("%s:%s", tag, GC48_SCREEN_NAME))
{
- m_assembled_tag = std::string(tag).append(":").append(GC48_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
nubus_48gc_device::nubus_48gc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- jmfb_device(mconfig, NUBUS_48GC, "Apple 4*8 video card", tag, owner, clock, "nb_48gc", __FILE__)
+ jmfb_device(mconfig, NUBUS_48GC, tag, owner, clock, false)
{
- m_is824 = false;
}
nubus_824gc_device::nubus_824gc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- jmfb_device(mconfig, NUBUS_824GC, "Apple 8*24 video card", tag, owner, clock, "nb_824gc", __FILE__)
+ jmfb_device(mconfig, NUBUS_824GC, tag, owner, clock, true)
{
- m_is824 = true;
}
//-------------------------------------------------