summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/msx_cart/yamaha.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/msx_cart/yamaha.cpp')
-rw-r--r--src/devices/bus/msx_cart/yamaha.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/devices/bus/msx_cart/yamaha.cpp b/src/devices/bus/msx_cart/yamaha.cpp
index 9296779f1b3..e6f7dc844fe 100644
--- a/src/devices/bus/msx_cart/yamaha.cpp
+++ b/src/devices/bus/msx_cart/yamaha.cpp
@@ -131,22 +131,22 @@ void msx_cart_sfg_device::check_irq()
{
if (m_ym2151_irq_state != CLEAR_LINE || m_ym2148_irq_state != CLEAR_LINE)
{
- irq_out(ASSERT_LINE);
+ m_out_irq_cb(ASSERT_LINE);
}
else
{
- irq_out(CLEAR_LINE);
+ m_out_irq_cb(CLEAR_LINE);
}
}
-uint8_t msx_cart_sfg_device::read_cart(offs_t offset)
+READ8_MEMBER(msx_cart_sfg_device::read_cart)
{
switch (offset & 0x3fff)
{
case 0x3ff0: // YM-2151 status read
case 0x3ff1: // YM-2151 status read mirror?
- return m_ym2151->status_r();
+ return m_ym2151->status_r(space, 0);
case 0x3ff2: // YM-2148 keyboard column read
case 0x3ff3: // YM-2148 --
@@ -155,7 +155,7 @@ uint8_t msx_cart_sfg_device::read_cart(offs_t offset)
case 0x3ff6: // YM-2148 MIDI UART status register
// ------x- - 1 = received a byte/receive buffer full?
// -------x - 1 = ready to send next byte/send buffer empty?
- return m_ym2148->read(offset & 7);
+ return m_ym2148->read(space, offset & 7);
}
if (offset < 0x8000)
@@ -167,16 +167,16 @@ uint8_t msx_cart_sfg_device::read_cart(offs_t offset)
}
-void msx_cart_sfg_device::write_cart(offs_t offset, uint8_t data)
+WRITE8_MEMBER(msx_cart_sfg_device::write_cart)
{
switch (offset & 0x3fff)
{
case 0x3ff0: // YM-2151 register
- m_ym2151->register_w(data);
+ m_ym2151->register_w(space, 0, data);
break;
case 0x3ff1: // YM-2151 data
- m_ym2151->data_w(data);
+ m_ym2151->data_w(space, 0, data);
break;
case 0x3ff2: // YM-2148 write keyboard row
@@ -191,7 +191,7 @@ void msx_cart_sfg_device::write_cart(offs_t offset, uint8_t data)
// x------- - 1 = reset
// -----x-- - 1 = enable receiving / sending midi data
// -------x - 1 = enable receiving / sending midi data
- m_ym2148->write(offset & 7, data);
+ m_ym2148->write(space, offset & 7, data);
break;
default: