diff options
Diffstat (limited to 'src/devices/bus/msx_cart/msx_audio.cpp')
-rw-r--r-- | src/devices/bus/msx_cart/msx_audio.cpp | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/src/devices/bus/msx_cart/msx_audio.cpp b/src/devices/bus/msx_cart/msx_audio.cpp index 679c035b014..61f96ff1eaa 100644 --- a/src/devices/bus/msx_cart/msx_audio.cpp +++ b/src/devices/bus/msx_cart/msx_audio.cpp @@ -96,8 +96,9 @@ void msx_cart_msx_audio_hxmu900_device::device_add_mconfig(machine_config &confi void msx_cart_msx_audio_hxmu900_device::device_start() { // Install IO read/write handlers - io_space().install_write_handler(0xc0, 0xc1, write8sm_delegate(FUNC(y8950_device::write), m_y8950.target())); - io_space().install_read_handler(0xc0, 0xc1, read8sm_delegate(FUNC(y8950_device::read), m_y8950.target())); + address_space &space = machine().device<cpu_device>("maincpu")->space(AS_IO); + space.install_write_handler(0xc0, 0xc1, write8_delegate(FUNC(y8950_device::write), m_y8950.target())); + space.install_read_handler(0xc0, 0xc1, read8_delegate(FUNC(y8950_device::read), m_y8950.target())); } @@ -110,7 +111,7 @@ void msx_cart_msx_audio_hxmu900_device::initialize_cartridge() } -uint8_t msx_cart_msx_audio_hxmu900_device::read_cart(offs_t offset) +READ8_MEMBER(msx_cart_msx_audio_hxmu900_device::read_cart) { if (offset >= 0x4000 && offset < 0xC000) { @@ -200,10 +201,11 @@ WRITE_LINE_MEMBER(msx_cart_msx_audio_nms1205_device::midi_in) void msx_cart_msx_audio_nms1205_device::device_start() { // Install IO read/write handlers - io_space().install_write_handler(0xc0, 0xc1, write8sm_delegate(FUNC(y8950_device::write), m_y8950.target())); - io_space().install_read_handler(0xc0, 0xc1, read8sm_delegate(FUNC(y8950_device::read), m_y8950.target())); - io_space().install_write_handler(0x00, 0x01, write8sm_delegate(FUNC(acia6850_device::write), m_acia6850.target())); - io_space().install_read_handler(0x04, 0x05, read8sm_delegate(FUNC(acia6850_device::read), m_acia6850.target())); + address_space &space = machine().device<cpu_device>("maincpu")->space(AS_IO); + space.install_write_handler(0xc0, 0xc1, write8_delegate(FUNC(y8950_device::write), m_y8950.target())); + space.install_read_handler(0xc0, 0xc1, read8_delegate(FUNC(y8950_device::read), m_y8950.target())); + space.install_write_handler(0x00, 0x01, write8_delegate(FUNC(acia6850_device::write), m_acia6850.target())); + space.install_read_handler(0x04, 0x05, read8_delegate(FUNC(acia6850_device::read), m_acia6850.target())); } @@ -216,7 +218,7 @@ void msx_cart_msx_audio_nms1205_device::initialize_cartridge() } -uint8_t msx_cart_msx_audio_nms1205_device::read_cart(offs_t offset) +READ8_MEMBER(msx_cart_msx_audio_nms1205_device::read_cart) { if (offset >= 0x4000 && offset < 0xC000) { @@ -287,8 +289,9 @@ const tiny_rom_entry *msx_cart_msx_audio_fsca1_device::device_rom_region() const void msx_cart_msx_audio_fsca1_device::device_start() { // Install IO read/write handlers - io_space().install_write_handler(0xc0, 0xc3, write8sm_delegate(FUNC(msx_cart_msx_audio_fsca1_device::write_y8950), this)); - io_space().install_read_handler(0xc0, 0xc3, read8sm_delegate(FUNC(msx_cart_msx_audio_fsca1_device::read_y8950), this)); + 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_device::write_y8950), this)); + space.install_read_handler(0xc0, 0xc3, read8_delegate(FUNC(msx_cart_msx_audio_fsca1_device::read_y8950), this)); } @@ -301,7 +304,7 @@ void msx_cart_msx_audio_fsca1_device::initialize_cartridge() } -uint8_t msx_cart_msx_audio_fsca1_device::read_cart(offs_t offset) +READ8_MEMBER(msx_cart_msx_audio_fsca1_device::read_cart) { if (m_7ffe == 0 && (offset & 0xB000) == 0x3000) { @@ -311,7 +314,7 @@ uint8_t msx_cart_msx_audio_fsca1_device::read_cart(offs_t offset) } -void msx_cart_msx_audio_fsca1_device::write_cart(offs_t offset, uint8_t data) +WRITE8_MEMBER(msx_cart_msx_audio_fsca1_device::write_cart) { if (offset == 0x7ffe) { @@ -335,45 +338,45 @@ void msx_cart_msx_audio_fsca1_device::write_cart(offs_t offset, uint8_t data) } -void msx_cart_msx_audio_fsca1_device::write_y8950(offs_t offset, uint8_t data) +WRITE8_MEMBER(msx_cart_msx_audio_fsca1_device::write_y8950) { if (offset & 2) { if (m_7fff & 0x02) { - m_y8950->write(offset, data); + m_y8950->write(space, offset, data); } } else { if (m_7fff & 0x01) { - m_y8950->write(offset, data); + m_y8950->write(space, offset, data); } } } -uint8_t msx_cart_msx_audio_fsca1_device::read_y8950(offs_t offset) +READ8_MEMBER(msx_cart_msx_audio_fsca1_device::read_y8950) { if (offset & 2) { - return (m_7fff & 0x02) ? m_y8950->read(offset) : 0xff; + return (m_7fff & 0x02) ? m_y8950->read(space, offset) : 0xff; } else { - return (m_7fff & 0x01) ? m_y8950->read(offset) : 0xff; + return (m_7fff & 0x01) ? m_y8950->read(space, offset) : 0xff; } } -void msx_cart_msx_audio_fsca1_device::y8950_io_w(uint8_t data) +WRITE8_MEMBER(msx_cart_msx_audio_fsca1_device::y8950_io_w) { logerror("msx_fsca1::y8950_io_w: %02x\n", data); } -uint8_t msx_cart_msx_audio_fsca1_device::y8950_io_r() +READ8_MEMBER(msx_cart_msx_audio_fsca1_device::y8950_io_r) { return m_io_config->read(); } |