summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/comx35/clm.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/comx35/clm.cpp')
-rw-r--r--src/devices/bus/comx35/clm.cpp31
1 files changed, 15 insertions, 16 deletions
diff --git a/src/devices/bus/comx35/clm.cpp b/src/devices/bus/comx35/clm.cpp
index 745606875f0..333566eda1a 100644
--- a/src/devices/bus/comx35/clm.cpp
+++ b/src/devices/bus/comx35/clm.cpp
@@ -137,16 +137,15 @@ GFXDECODE_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-void comx_clm_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(MC6845_TAG, FUNC(mc6845_device::screen_update));
- screen.set_size(80*8, 24*8);
- screen.set_visarea(0, 80*8-1, 0, 24*8-1);
- screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500));
- screen.set_refresh_hz(50);
-
- GFXDECODE(config, "gfxdecode", m_palette, gfx_comx_clm);
+MACHINE_CONFIG_START(comx_clm_device::device_add_mconfig)
+ MCFG_SCREEN_ADD_MONOCHROME(MC6845_SCREEN_TAG, RASTER, rgb_t::white())
+ MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update)
+ MCFG_SCREEN_SIZE(80*8, 24*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 80*8-1, 0, 24*8-1)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
+ MCFG_SCREEN_REFRESH_RATE(50)
+
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_comx_clm)
PALETTE(config, m_palette, palette_device::MONOCHROME);
MC6845(config, m_crtc, XTAL(14'318'181)/7);
@@ -154,7 +153,7 @@ void comx_clm_device::device_add_mconfig(machine_config &config)
m_crtc->set_show_border_area(true);
m_crtc->set_char_width(8);
m_crtc->set_update_row_callback(FUNC(comx_clm_device::crtc_update_row), this);
-}
+MACHINE_CONFIG_END
//**************************************************************************
@@ -215,7 +214,7 @@ int comx_clm_device::comx_ef4_r()
// comx_mrd_r - memory read
//-------------------------------------------------
-uint8_t comx_clm_device::comx_mrd_r(offs_t offset, int *extrom)
+uint8_t comx_clm_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom)
{
uint8_t data = 0xff;
@@ -229,7 +228,7 @@ uint8_t comx_clm_device::comx_mrd_r(offs_t offset, int *extrom)
}
else if (offset == 0xd801)
{
- data = m_crtc->register_r();
+ data = m_crtc->register_r(space, 0);
}
return data;
@@ -240,7 +239,7 @@ uint8_t comx_clm_device::comx_mrd_r(offs_t offset, int *extrom)
// comx_mwr_w - memory write
//-------------------------------------------------
-void comx_clm_device::comx_mwr_w(offs_t offset, uint8_t data)
+void comx_clm_device::comx_mwr_w(address_space &space, offs_t offset, uint8_t data)
{
if (offset >= 0xd000 && offset < 0xd800)
{
@@ -248,10 +247,10 @@ void comx_clm_device::comx_mwr_w(offs_t offset, uint8_t data)
}
else if (offset == 0xd800)
{
- m_crtc->address_w(data);
+ m_crtc->address_w(space, 0, data);
}
else if (offset == 0xd801)
{
- m_crtc->register_w(data);
+ m_crtc->register_w(space, 0, data);
}
}