diff options
Diffstat (limited to 'src/devices/bus/c64/xl80.cpp')
-rw-r--r-- | src/devices/bus/c64/xl80.cpp | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/devices/bus/c64/xl80.cpp b/src/devices/bus/c64/xl80.cpp index fbeacd759b3..8e09508e2a3 100644 --- a/src/devices/bus/c64/xl80.cpp +++ b/src/devices/bus/c64/xl80.cpp @@ -123,14 +123,15 @@ GFXDECODE_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(c64_xl80_device::device_add_mconfig) - MCFG_SCREEN_ADD_MONOCHROME(MC6845_SCREEN_TAG, RASTER, rgb_t::white()) - MCFG_SCREEN_UPDATE_DEVICE(HD46505SP_TAG, h46505_device, screen_update) - MCFG_SCREEN_SIZE(80*8, 24*8) - MCFG_SCREEN_VISIBLE_AREA(0, 80*8-1, 0, 24*8-1) - MCFG_SCREEN_REFRESH_RATE(50) - - MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_c64_xl80) +void c64_xl80_device::device_add_mconfig(machine_config &config) +{ + screen_device &screen(SCREEN(config, MC6845_SCREEN_TAG, SCREEN_TYPE_RASTER, rgb_t::white())); + screen.set_screen_update(HD46505SP_TAG, FUNC(h46505_device::screen_update)); + screen.set_size(80*8, 24*8); + screen.set_visarea(0, 80*8-1, 0, 24*8-1); + screen.set_refresh_hz(50); + + GFXDECODE(config, "gfxdecode", m_palette, gfx_c64_xl80); PALETTE(config, m_palette, palette_device::MONOCHROME); H46505(config, m_crtc, XTAL(14'318'181) / 8); @@ -138,7 +139,7 @@ MACHINE_CONFIG_START(c64_xl80_device::device_add_mconfig) m_crtc->set_show_border_area(true); m_crtc->set_char_width(8); m_crtc->set_update_row_callback(FUNC(c64_xl80_device::crtc_update_row), this); -MACHINE_CONFIG_END +} @@ -185,13 +186,13 @@ void c64_xl80_device::device_reset() // c64_cd_r - cartridge data read //------------------------------------------------- -uint8_t c64_xl80_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) +uint8_t c64_xl80_device::c64_cd_r(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) { if (!io2 && BIT(offset, 2)) { if (offset & 0x01) { - data = m_crtc->register_r(space, 0); + data = m_crtc->register_r(); } } else if (offset >= 0x8000 && offset < 0x9000) @@ -211,7 +212,7 @@ uint8_t c64_xl80_device::c64_cd_r(address_space &space, offs_t offset, uint8_t d // c64_cd_w - cartridge data write //------------------------------------------------- -void c64_xl80_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) +void c64_xl80_device::c64_cd_w(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) { if (offset >= 0x9800 && offset < 0xa000) { @@ -221,11 +222,11 @@ void c64_xl80_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data { if (offset & 0x01) { - m_crtc->register_w(space, 0, data); + m_crtc->register_w(data); } else { - m_crtc->address_w(space, 0, data); + m_crtc->address_w(data); } } } |