summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/msx_cart/msx_audio.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/msx_cart/msx_audio.cpp')
-rw-r--r--src/devices/bus/msx_cart/msx_audio.cpp76
1 files changed, 38 insertions, 38 deletions
diff --git a/src/devices/bus/msx_cart/msx_audio.cpp b/src/devices/bus/msx_cart/msx_audio.cpp
index 19a48299e7c..7ed03d4255e 100644
--- a/src/devices/bus/msx_cart/msx_audio.cpp
+++ b/src/devices/bus/msx_cart/msx_audio.cpp
@@ -67,13 +67,13 @@ and/or http://ngs.no.coocan.jp/doc/wiki.cgi/datapack?page=4.2+MSX-AUDIO+%B3%C8%C
#include "speaker.h"
-const device_type MSX_CART_MSX_AUDIO_HXMU900 = device_creator<msx_cart_msx_audio_hxmu900>;
-const device_type MSX_CART_MSX_AUDIO_NMS1205 = device_creator<msx_cart_msx_audio_nms1205>;
-const device_type MSX_CART_MSX_AUDIO_FSCA1 = device_creator<msx_cart_msx_audio_fsca1>;
+DEFINE_DEVICE_TYPE(MSX_CART_MSX_AUDIO_HXMU900, msx_cart_msx_audio_hxmu900_device, "msx_audio_hxmu900", "MSX Cartridge - MSX-AUDIO HX-MU900")
+DEFINE_DEVICE_TYPE(MSX_CART_MSX_AUDIO_NMS1205, msx_cart_msx_audio_nms1205_device, "msx_audio_nms1205", "MSX Cartridge - MSX-AUDIO NMS-1205")
+DEFINE_DEVICE_TYPE(MSX_CART_MSX_AUDIO_FSCA1, msx_cart_msx_audio_fsca1_device, "msx_audio_fsca1", "MSX Cartridge - MSX-AUDIO FS-CA1")
-msx_cart_msx_audio_hxmu900::msx_cart_msx_audio_hxmu900(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MSX_CART_MSX_AUDIO_HXMU900, "MSX Cartridge - MSX-AUDIO HX-MU900", tag, owner, clock, "msx_audio_hxmu900", __FILE__)
+msx_cart_msx_audio_hxmu900_device::msx_cart_msx_audio_hxmu900_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, MSX_CART_MSX_AUDIO_HXMU900, tag, owner, clock)
, msx_cart_interface(mconfig, *this)
, m_y8950(*this, "y8950")
{
@@ -92,13 +92,13 @@ static MACHINE_CONFIG_FRAGMENT( msx_audio_hxmu900 )
MACHINE_CONFIG_END
-machine_config_constructor msx_cart_msx_audio_hxmu900::device_mconfig_additions() const
+machine_config_constructor msx_cart_msx_audio_hxmu900_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( msx_audio_hxmu900 );
}
-void msx_cart_msx_audio_hxmu900::device_start()
+void msx_cart_msx_audio_hxmu900_device::device_start()
{
// Install IO read/write handlers
address_space &space = machine().device<cpu_device>("maincpu")->space(AS_IO);
@@ -107,7 +107,7 @@ void msx_cart_msx_audio_hxmu900::device_start()
}
-void msx_cart_msx_audio_hxmu900::initialize_cartridge()
+void msx_cart_msx_audio_hxmu900_device::initialize_cartridge()
{
if (get_rom_size() < 0x8000)
{
@@ -116,7 +116,7 @@ void msx_cart_msx_audio_hxmu900::initialize_cartridge()
}
-READ8_MEMBER(msx_cart_msx_audio_hxmu900::read_cart)
+READ8_MEMBER(msx_cart_msx_audio_hxmu900_device::read_cart)
{
if (offset >= 0x4000 && offset < 0xC000)
{
@@ -129,8 +129,8 @@ READ8_MEMBER(msx_cart_msx_audio_hxmu900::read_cart)
-msx_cart_msx_audio_nms1205::msx_cart_msx_audio_nms1205(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MSX_CART_MSX_AUDIO_NMS1205, "MSX Cartridge - MSX-AUDIO NMS-1205", tag, owner, clock, "msx_audio_nms1205", __FILE__)
+msx_cart_msx_audio_nms1205_device::msx_cart_msx_audio_nms1205_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, MSX_CART_MSX_AUDIO_NMS1205, tag, owner, clock)
, msx_cart_interface(mconfig, *this)
, m_y8950(*this, "y8950")
, m_acia6850(*this, "acia6850")
@@ -148,7 +148,7 @@ static MACHINE_CONFIG_FRAGMENT( msx_audio_nms1205 )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_Y8950_KEYBOARD_WRITE_HANDLER(DEVWRITE8("kbdc", msx_audio_kbdc_port_device, write))
MCFG_Y8950_KEYBOARD_READ_HANDLER(DEVREAD8("kbdc", msx_audio_kbdc_port_device, read))
- MCFG_Y8950_IRQ_HANDLER(WRITELINE(msx_cart_msx_audio_nms1205, irq_write))
+ MCFG_Y8950_IRQ_HANDLER(WRITELINE(msx_cart_msx_audio_nms1205_device, irq_write))
MCFG_MSX_AUDIO_KBDC_PORT_ADD("kbdc", msx_audio_keyboards, nullptr)
@@ -157,7 +157,7 @@ static MACHINE_CONFIG_FRAGMENT( msx_audio_nms1205 )
MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd))
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(WRITELINE(msx_cart_msx_audio_nms1205, midi_in))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(msx_cart_msx_audio_nms1205_device, midi_in))
MCFG_MIDI_PORT_ADD("mdthru", midiout_slot, "midiout")
@@ -165,7 +165,7 @@ static MACHINE_CONFIG_FRAGMENT( msx_audio_nms1205 )
MACHINE_CONFIG_END
-machine_config_constructor msx_cart_msx_audio_nms1205::device_mconfig_additions() const
+machine_config_constructor msx_cart_msx_audio_nms1205_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( msx_audio_nms1205 );
}
@@ -176,13 +176,13 @@ ROM_START( msx_nms1205 )
ROM_END
-const tiny_rom_entry *msx_cart_msx_audio_nms1205::device_rom_region() const
+const tiny_rom_entry *msx_cart_msx_audio_nms1205_device::device_rom_region() const
{
return ROM_NAME( msx_nms1205 );
}
-WRITE_LINE_MEMBER(msx_cart_msx_audio_nms1205::irq_write)
+WRITE_LINE_MEMBER(msx_cart_msx_audio_nms1205_device::irq_write)
{
// Trigger IRQ on the maincpu
// The 8950 seems to trigger an irq on reset, this causes an infinite loop of continuously triggering
@@ -192,7 +192,7 @@ WRITE_LINE_MEMBER(msx_cart_msx_audio_nms1205::irq_write)
}
-WRITE_LINE_MEMBER(msx_cart_msx_audio_nms1205::midi_in)
+WRITE_LINE_MEMBER(msx_cart_msx_audio_nms1205_device::midi_in)
{
// MIDI in signals is sent to both the 6850 and the MIDI thru output port
m_acia6850->write_rxd(state);
@@ -200,7 +200,7 @@ WRITE_LINE_MEMBER(msx_cart_msx_audio_nms1205::midi_in)
}
-void msx_cart_msx_audio_nms1205::device_start()
+void msx_cart_msx_audio_nms1205_device::device_start()
{
// Install IO read/write handlers
address_space &space = machine().device<cpu_device>("maincpu")->space(AS_IO);
@@ -213,7 +213,7 @@ void msx_cart_msx_audio_nms1205::device_start()
}
-void msx_cart_msx_audio_nms1205::initialize_cartridge()
+void msx_cart_msx_audio_nms1205_device::initialize_cartridge()
{
if (get_rom_size() < 0x8000)
{
@@ -222,7 +222,7 @@ void msx_cart_msx_audio_nms1205::initialize_cartridge()
}
-READ8_MEMBER(msx_cart_msx_audio_nms1205::read_cart)
+READ8_MEMBER(msx_cart_msx_audio_nms1205_device::read_cart)
{
if (offset >= 0x4000 && offset < 0xC000)
{
@@ -237,8 +237,8 @@ READ8_MEMBER(msx_cart_msx_audio_nms1205::read_cart)
-msx_cart_msx_audio_fsca1::msx_cart_msx_audio_fsca1(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MSX_CART_MSX_AUDIO_FSCA1, "MSX Cartridge - MSX-AUDIO FS-CA1", tag, owner, clock, "msx_audio_fsca1", __FILE__)
+msx_cart_msx_audio_fsca1_device::msx_cart_msx_audio_fsca1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, MSX_CART_MSX_AUDIO_FSCA1, tag, owner, clock)
, msx_cart_interface(mconfig, *this)
, m_y8950(*this, "y8950")
, m_io_config(*this, "CONFIG")
@@ -256,14 +256,14 @@ static MACHINE_CONFIG_FRAGMENT( msx_audio_fsca1 )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_Y8950_KEYBOARD_WRITE_HANDLER(DEVWRITE8("kbdc", msx_audio_kbdc_port_device, write))
MCFG_Y8950_KEYBOARD_READ_HANDLER(DEVREAD8("kbdc", msx_audio_kbdc_port_device, read))
- MCFG_Y8950_IO_READ_HANDLER(READ8(msx_cart_msx_audio_fsca1, y8950_io_r))
- MCFG_Y8950_IO_WRITE_HANDLER(WRITE8(msx_cart_msx_audio_fsca1, y8950_io_w))
+ MCFG_Y8950_IO_READ_HANDLER(READ8(msx_cart_msx_audio_fsca1_device, y8950_io_r))
+ MCFG_Y8950_IO_WRITE_HANDLER(WRITE8(msx_cart_msx_audio_fsca1_device, y8950_io_w))
MCFG_MSX_AUDIO_KBDC_PORT_ADD("kbdc", msx_audio_keyboards, nullptr)
MACHINE_CONFIG_END
-machine_config_constructor msx_cart_msx_audio_fsca1::device_mconfig_additions() const
+machine_config_constructor msx_cart_msx_audio_fsca1_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( msx_audio_fsca1 );
}
@@ -278,7 +278,7 @@ static INPUT_PORTS_START( msx_audio_fsca1 )
INPUT_PORTS_END
-ioport_constructor msx_cart_msx_audio_fsca1::device_input_ports() const
+ioport_constructor msx_cart_msx_audio_fsca1_device::device_input_ports() const
{
return INPUT_PORTS_NAME( msx_audio_fsca1 );
}
@@ -289,22 +289,22 @@ ROM_START( msx_fsca1 )
ROM_END
-const tiny_rom_entry *msx_cart_msx_audio_fsca1::device_rom_region() const
+const tiny_rom_entry *msx_cart_msx_audio_fsca1_device::device_rom_region() const
{
return ROM_NAME( msx_fsca1 );
}
-void msx_cart_msx_audio_fsca1::device_start()
+void msx_cart_msx_audio_fsca1_device::device_start()
{
// Install IO read/write handlers
address_space &space = machine().device<cpu_device>("maincpu")->space(AS_IO);
- space.install_write_handler(0xc0, 0xc3, write8_delegate(FUNC(msx_cart_msx_audio_fsca1::write_y8950), this));
- space.install_read_handler(0xc0, 0xc3, read8_delegate(FUNC(msx_cart_msx_audio_fsca1::read_y8950), this));
+ space.install_write_handler(0xc0, 0xc3, write8_delegate(FUNC(msx_cart_msx_audio_fsca1_device::write_y8950), this));
+ space.install_read_handler(0xc0, 0xc3, read8_delegate(FUNC(msx_cart_msx_audio_fsca1_device::read_y8950), this));
}
-void msx_cart_msx_audio_fsca1::initialize_cartridge()
+void msx_cart_msx_audio_fsca1_device::initialize_cartridge()
{
if (get_rom_size() < 0x20000)
{
@@ -313,7 +313,7 @@ void msx_cart_msx_audio_fsca1::initialize_cartridge()
}
-READ8_MEMBER(msx_cart_msx_audio_fsca1::read_cart)
+READ8_MEMBER(msx_cart_msx_audio_fsca1_device::read_cart)
{
if (m_7ffe == 0 && (offset & 0xB000) == 0x3000)
{
@@ -323,7 +323,7 @@ READ8_MEMBER(msx_cart_msx_audio_fsca1::read_cart)
}
-WRITE8_MEMBER(msx_cart_msx_audio_fsca1::write_cart)
+WRITE8_MEMBER(msx_cart_msx_audio_fsca1_device::write_cart)
{
if (offset == 0x7ffe)
{
@@ -343,11 +343,11 @@ WRITE8_MEMBER(msx_cart_msx_audio_fsca1::write_cart)
return;
}
- logerror("msx_cart_msx_audio_fsca1: Unhandled write %02x to %04x\n", data, offset);
+ logerror("msx_cart_msx_audio_fsca1_device: Unhandled write %02x to %04x\n", data, offset);
}
-WRITE8_MEMBER(msx_cart_msx_audio_fsca1::write_y8950)
+WRITE8_MEMBER(msx_cart_msx_audio_fsca1_device::write_y8950)
{
if (offset & 2)
{
@@ -366,7 +366,7 @@ WRITE8_MEMBER(msx_cart_msx_audio_fsca1::write_y8950)
}
-READ8_MEMBER(msx_cart_msx_audio_fsca1::read_y8950)
+READ8_MEMBER(msx_cart_msx_audio_fsca1_device::read_y8950)
{
if (offset & 2)
{
@@ -379,13 +379,13 @@ READ8_MEMBER(msx_cart_msx_audio_fsca1::read_y8950)
}
-WRITE8_MEMBER(msx_cart_msx_audio_fsca1::y8950_io_w)
+WRITE8_MEMBER(msx_cart_msx_audio_fsca1_device::y8950_io_w)
{
logerror("msx_fsca1::y8950_io_w: %02x\n", data);
}
-READ8_MEMBER(msx_cart_msx_audio_fsca1::y8950_io_r)
+READ8_MEMBER(msx_cart_msx_audio_fsca1_device::y8950_io_r)
{
return m_io_config->read();
}