diff options
Diffstat (limited to 'src/devices/bus/plus4/sid.cpp')
-rw-r--r-- | src/devices/bus/plus4/sid.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/devices/bus/plus4/sid.cpp b/src/devices/bus/plus4/sid.cpp index 1ebfdafd657..f97deec6310 100644 --- a/src/devices/bus/plus4/sid.cpp +++ b/src/devices/bus/plus4/sid.cpp @@ -64,13 +64,13 @@ const tiny_rom_entry *plus4_sid_cartridge_device::device_rom_region() const // device_add_mconfig - add device configuration //------------------------------------------------- -void plus4_sid_cartridge_device::device_add_mconfig(machine_config &config) -{ +MACHINE_CONFIG_START(plus4_sid_cartridge_device::device_add_mconfig) SPEAKER(config, "speaker").front_center(); - MOS8580(config, m_sid, XTAL(17'734'470)/20).add_route(ALL_OUTPUTS, "speaker", 1.0); + MCFG_DEVICE_ADD(MOS8580_TAG, MOS8580, XTAL(17'734'470)/20) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) - VCS_CONTROL_PORT(config, m_joy, vcs_control_port_devices, nullptr); -} + MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr) +MACHINE_CONFIG_END @@ -114,15 +114,15 @@ void plus4_sid_cartridge_device::device_reset() // plus4_cd_r - cartridge data read //------------------------------------------------- -uint8_t plus4_sid_cartridge_device::plus4_cd_r(offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) +uint8_t plus4_sid_cartridge_device::plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) { if ((offset >= 0xfe80 && offset < 0xfea0) || (offset >= 0xfd40 && offset < 0xfd60)) { - data = m_sid->read(offset & 0x1f); + data = m_sid->read(space, offset & 0x1f); } else if (offset >= 0xfd80 && offset < 0xfd90) { - data = m_joy->joy_r(machine().dummy_space(), 0); + data = m_joy->joy_r(space, 0); } return data; @@ -133,11 +133,11 @@ uint8_t plus4_sid_cartridge_device::plus4_cd_r(offs_t offset, uint8_t data, int // plus4_cd_w - cartridge data write //------------------------------------------------- -void plus4_sid_cartridge_device::plus4_cd_w(offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) +void plus4_sid_cartridge_device::plus4_cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) { if ((offset >= 0xfe80 && offset < 0xfea0) || (offset >= 0xfd40 && offset < 0xfd60)) { - m_sid->write(offset & 0x1f, data); + m_sid->write(space, offset & 0x1f, data); } } |