diff options
Diffstat (limited to 'src/devices/bus/pet/hsg.cpp')
-rw-r--r-- | src/devices/bus/pet/hsg.cpp | 66 |
1 files changed, 32 insertions, 34 deletions
diff --git a/src/devices/bus/pet/hsg.cpp b/src/devices/bus/pet/hsg.cpp index 7c6e7c657d6..5288b632174 100644 --- a/src/devices/bus/pet/hsg.cpp +++ b/src/devices/bus/pet/hsg.cpp @@ -91,39 +91,37 @@ void cbm8000_hsg_b_device::hsg_b_map(address_map &map) // device_add_mconfig - add device configuration //------------------------------------------------- -void cbm8000_hsg_a_device::device_add_mconfig(machine_config &config) -{ - screen_device &screen(SCREEN(config, SCREEN_TAG, SCREEN_TYPE_RASTER, rgb_t::green())); - screen.set_screen_update(EF9365_TAG, FUNC(ef9365_device::screen_update)); - screen.set_size(512, 512); - screen.set_visarea(0, 512-1, 0, 512-1); - screen.set_refresh_hz(25); +MACHINE_CONFIG_START(cbm8000_hsg_a_device::device_add_mconfig) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) + MCFG_SCREEN_UPDATE_DEVICE(EF9365_TAG, ef9365_device, screen_update) + MCFG_SCREEN_SIZE(512, 512) + MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 512-1) + MCFG_SCREEN_REFRESH_RATE(25) PALETTE(config, "palette", palette_device::MONOCHROME); - EF9365(config, m_gdc, 1750000); - m_gdc->set_screen(SCREEN_TAG); - m_gdc->set_addrmap(0, &cbm8000_hsg_a_device::hsg_a_map); - m_gdc->set_palette_tag("palette"); - m_gdc->set_nb_bitplanes(1); - m_gdc->set_display_mode(ef9365_device::DISPLAY_MODE_512x512); -} - -void cbm8000_hsg_b_device::device_add_mconfig(machine_config &config) -{ - screen_device &screen(SCREEN(config, SCREEN_TAG, SCREEN_TYPE_RASTER, rgb_t::green())); - screen.set_screen_update(EF9366_TAG, FUNC(ef9365_device::screen_update)); - screen.set_size(512, 256); - screen.set_visarea(0, 512-1, 0, 256-1); - screen.set_refresh_hz(50); + MCFG_DEVICE_ADD(EF9365_TAG, EF9365, 1750000) + MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) + MCFG_DEVICE_ADDRESS_MAP(0, hsg_a_map) + MCFG_EF936X_PALETTE("palette") + MCFG_EF936X_BITPLANES_CNT(1); + MCFG_EF936X_DISPLAYMODE(DISPLAY_MODE_512x512); +MACHINE_CONFIG_END + +MACHINE_CONFIG_START(cbm8000_hsg_b_device::device_add_mconfig) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) + MCFG_SCREEN_UPDATE_DEVICE(EF9366_TAG, ef9365_device, screen_update) + MCFG_SCREEN_SIZE(512, 256) + MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) + MCFG_SCREEN_REFRESH_RATE(50) PALETTE(config, "palette", palette_device::MONOCHROME); - EF9365(config, m_gdc, 1750000); //EF9366 - m_gdc->set_screen(SCREEN_TAG); - m_gdc->set_addrmap(0, &cbm8000_hsg_b_device::hsg_b_map); - m_gdc->set_palette_tag("palette"); - m_gdc->set_nb_bitplanes(1); - m_gdc->set_display_mode(ef9365_device::DISPLAY_MODE_512x256); -} + MCFG_DEVICE_ADD(EF9366_TAG, EF9365, 1750000) + MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) + MCFG_DEVICE_ADDRESS_MAP(0, hsg_b_map) + MCFG_EF936X_PALETTE("palette") + MCFG_EF936X_BITPLANES_CNT(1); + MCFG_EF936X_DISPLAYMODE(DISPLAY_MODE_512x256); +MACHINE_CONFIG_END @@ -178,7 +176,7 @@ void cbm8000_hsg_device::device_reset() // pet_norom_r - NO ROM read //------------------------------------------------- -int cbm8000_hsg_device::pet_norom_r(offs_t offset, int sel) +int cbm8000_hsg_device::pet_norom_r(address_space &space, offs_t offset, int sel) { return !(offset >= 0x9000 && offset < 0xaf00); } @@ -188,7 +186,7 @@ int cbm8000_hsg_device::pet_norom_r(offs_t offset, int sel) // pet_bd_r - buffered data read //------------------------------------------------- -uint8_t cbm8000_hsg_device::pet_bd_r(offs_t offset, uint8_t data, int &sel) +uint8_t cbm8000_hsg_device::pet_bd_r(address_space &space, offs_t offset, uint8_t data, int &sel) { switch (sel) { @@ -224,7 +222,7 @@ uint8_t cbm8000_hsg_device::pet_bd_r(offs_t offset, uint8_t data, int &sel) } else if (offset >= 0xaf70 && offset < 0xaf80) { - data = m_gdc->data_r(offset & 0x0f); + data = m_gdc->data_r(space, offset & 0x0f); } break; } @@ -237,7 +235,7 @@ uint8_t cbm8000_hsg_device::pet_bd_r(offs_t offset, uint8_t data, int &sel) // pet_bd_w - buffered data write //------------------------------------------------- -void cbm8000_hsg_device::pet_bd_w(offs_t offset, uint8_t data, int &sel) +void cbm8000_hsg_device::pet_bd_w(address_space &space, offs_t offset, uint8_t data, int &sel) { if (offset == 0xaf00) { @@ -258,6 +256,6 @@ void cbm8000_hsg_device::pet_bd_w(offs_t offset, uint8_t data, int &sel) } else if (offset >= 0xaf70 && offset < 0xaf80) { - m_gdc->data_w(offset & 0x0f, data); + m_gdc->data_w(space, offset & 0x0f, data); } } |