summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/msx_cart/msx_audio_kb.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/msx_cart/msx_audio_kb.cpp')
-rw-r--r--src/devices/bus/msx_cart/msx_audio_kb.cpp37
1 files changed, 18 insertions, 19 deletions
diff --git a/src/devices/bus/msx_cart/msx_audio_kb.cpp b/src/devices/bus/msx_cart/msx_audio_kb.cpp
index e606e0ffae9..2bfa98758e9 100644
--- a/src/devices/bus/msx_cart/msx_audio_kb.cpp
+++ b/src/devices/bus/msx_cart/msx_audio_kb.cpp
@@ -4,13 +4,13 @@
#include "msx_audio_kb.h"
-const device_type MSX_AUDIO_KBDC_PORT = device_creator<msx_audio_kbdc_port_device>;
+DEFINE_DEVICE_TYPE(MSX_AUDIO_KBDC_PORT, msx_audio_kbdc_port_device, "msx_audio_kbdc_port", "MSX Audio keyboard connector port")
msx_audio_kbdc_port_device::msx_audio_kbdc_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MSX_AUDIO_KBDC_PORT, "MSX Audio keyboard connector port", tag, owner, clock, "msx_audio_kbdc_port", __FILE__),
- device_slot_interface(mconfig, *this),
- m_keyboard(nullptr)
+ : device_t(mconfig, MSX_AUDIO_KBDC_PORT, tag, owner, clock)
+ , device_slot_interface(mconfig, *this)
+ , m_keyboard(nullptr)
{
}
@@ -40,16 +40,15 @@ READ8_MEMBER(msx_audio_kbdc_port_device::read)
}
-extern const device_type MSX_AUDIO_KB_HXMU901;
-extern const device_type MSX_AUDIO_KB_NMS1160;
+DECLARE_DEVICE_TYPE(MSX_AUDIO_KB_HXMU901, msx_hxmu901_device)
+DECLARE_DEVICE_TYPE(MSX_AUDIO_KB_NMS1160, msx_nms1160_device)
-class msx_hxmu901 : public device_t
- , public msx_audio_kb_port_interface
+class msx_hxmu901_device : public device_t, public msx_audio_kb_port_interface
{
public:
- msx_hxmu901(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MSX_AUDIO_KB_HXMU901, "Toshiba HXMU901", tag, owner, clock, "hxmu901", __FILE__)
+ msx_hxmu901_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, MSX_AUDIO_KB_HXMU901, tag, owner, clock)
, msx_audio_kb_port_interface(mconfig, *this)
, m_row(0)
, m_keyboard(*this, "KEY.%u", 0)
@@ -169,22 +168,22 @@ static INPUT_PORTS_START( hxmu901)
INPUT_PORTS_END
-ioport_constructor msx_hxmu901::device_input_ports() const
+ioport_constructor msx_hxmu901_device::device_input_ports() const
{
return INPUT_PORTS_NAME( hxmu901 );
}
-class msx_nms1160 : public device_t
- , public msx_audio_kb_port_interface
+class msx_nms1160_device : public device_t, public msx_audio_kb_port_interface
{
public:
- msx_nms1160(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MSX_AUDIO_KB_NMS1160, "Philips NMS-1160", tag, owner, clock, "nms1160", __FILE__)
+ msx_nms1160_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, MSX_AUDIO_KB_NMS1160, tag, owner, clock)
, msx_audio_kb_port_interface(mconfig, *this)
, m_row(0)
, m_keyboard(*this, "KEY.%u", 0)
- { }
+ {
+ }
virtual ioport_constructor device_input_ports() const override;
@@ -298,15 +297,15 @@ static INPUT_PORTS_START( nms1160 )
INPUT_PORTS_END
-ioport_constructor msx_nms1160::device_input_ports() const
+ioport_constructor msx_nms1160_device::device_input_ports() const
{
return INPUT_PORTS_NAME( nms1160 );
}
-const device_type MSX_AUDIO_KB_HXMU901 = device_creator<msx_hxmu901>;
-const device_type MSX_AUDIO_KB_NMS1160 = device_creator<msx_nms1160>;
+DEFINE_DEVICE_TYPE(MSX_AUDIO_KB_HXMU901, msx_hxmu901_device, "hxmu901", "Toshiba HXMU901")
+DEFINE_DEVICE_TYPE(MSX_AUDIO_KB_NMS1160, msx_nms1160_device, "nms1160", "Philips NMS-1160")
SLOT_INTERFACE_START( msx_audio_keyboards )