summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/wangpc/tig.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/wangpc/tig.cpp')
-rw-r--r--src/devices/bus/wangpc/tig.cpp47
1 files changed, 23 insertions, 24 deletions
diff --git a/src/devices/bus/wangpc/tig.cpp b/src/devices/bus/wangpc/tig.cpp
index f0c00ed3cc3..e9170b420cc 100644
--- a/src/devices/bus/wangpc/tig.cpp
+++ b/src/devices/bus/wangpc/tig.cpp
@@ -111,30 +111,29 @@ UPD7220_DISPLAY_PIXELS_MEMBER( wangpc_tig_device::hgdc_display_pixels )
//-------------------------------------------------
-// machine_config( wangpc_tig )
+// MACHINE_CONFIG_START( wangpc_tig )
//-------------------------------------------------
-void wangpc_tig_device::device_add_mconfig(machine_config &config)
-{
- screen_device &screen(SCREEN(config, SCREEN_TAG, SCREEN_TYPE_RASTER, rgb_t::green()));
- screen.set_screen_update(FUNC(wangpc_tig_device::screen_update));
- screen.set_size(80*10, 25*12);
- screen.set_visarea(0, 80*10-1, 0, 25*12-1);
- screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500));
- screen.set_refresh_hz(60);
+MACHINE_CONFIG_START(wangpc_tig_device::device_add_mconfig)
+ MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
+ MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, wangpc_tig_device, screen_update)
+ MCFG_SCREEN_SIZE(80*10, 25*12)
+ MCFG_SCREEN_VISIBLE_AREA(0, 80*10-1, 0, 25*12-1)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
+ MCFG_SCREEN_REFRESH_RATE(60)
PALETTE(config, m_palette, palette_device::MONOCHROME_HIGHLIGHT);
UPD7220(config, m_hgdc0, XTAL(52'832'000)/28);
m_hgdc0->set_addrmap(0, &wangpc_tig_device::upd7220_0_map);
- m_hgdc0->set_draw_text(FUNC(wangpc_tig_device::hgdc_draw_text));
+ m_hgdc0->set_draw_text_callback(FUNC(wangpc_tig_device::hgdc_draw_text), this);
m_hgdc0->set_screen(SCREEN_TAG);
UPD7220(config, m_hgdc1, XTAL(52'832'000)/28);
m_hgdc1->set_addrmap(0, &wangpc_tig_device::upd7220_1_map);
- m_hgdc1->set_display_pixels(FUNC(wangpc_tig_device::hgdc_display_pixels));
+ m_hgdc1->set_display_pixels_callback(FUNC(wangpc_tig_device::hgdc_display_pixels), this);
m_hgdc1->set_screen(SCREEN_TAG);
-}
+MACHINE_CONFIG_END
//**************************************************************************
@@ -196,7 +195,7 @@ uint32_t wangpc_tig_device::screen_update(screen_device &screen, bitmap_rgb32 &b
// wangpcbus_iorc_r - I/O read
//-------------------------------------------------
-uint16_t wangpc_tig_device::wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask)
+uint16_t wangpc_tig_device::wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask)
{
uint16_t data = 0xffff;
@@ -206,12 +205,12 @@ uint16_t wangpc_tig_device::wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask)
{
case 0x20/2:
case 0x22/2:
- data = m_hgdc0->read(offset);
+ data = m_hgdc0->read(space, offset);
break;
case 0x24/2:
case 0x26/2:
- data = m_hgdc1->read(offset);
+ data = m_hgdc1->read(space, offset);
break;
case 0xfe/2:
@@ -228,7 +227,7 @@ uint16_t wangpc_tig_device::wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask)
// wangpcbus_aiowc_w - I/O write
//-------------------------------------------------
-void wangpc_tig_device::wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint16_t data)
+void wangpc_tig_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data)
{
if (sad(offset) && ACCESSING_BITS_0_7)
{
@@ -243,12 +242,12 @@ void wangpc_tig_device::wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint
case 0x20/2:
case 0x22/2:
- m_hgdc0->write(offset, data);
+ m_hgdc0->write(space, offset, data);
break;
case 0x24/2:
case 0x26/2:
- m_hgdc1->write(offset, data);
+ m_hgdc1->write(space, offset, data);
break;
case 0x28/2:
@@ -275,17 +274,17 @@ void wangpc_tig_device::wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint
// wangpcbus_dack_r - DMA read
//-------------------------------------------------
-uint8_t wangpc_tig_device::wangpcbus_dack_r(int line)
+uint8_t wangpc_tig_device::wangpcbus_dack_r(address_space &space, int line)
{
uint8_t data;
if (DMA_GRAPHICS)
{
- data = m_hgdc1->dack_r();
+ data = m_hgdc1->dack_r(space, 0);
}
else
{
- data = m_hgdc0->dack_r();
+ data = m_hgdc0->dack_r(space, 0);
}
return data;
@@ -296,15 +295,15 @@ uint8_t wangpc_tig_device::wangpcbus_dack_r(int line)
// wangpcbus_dack_w - DMA write
//-------------------------------------------------
-void wangpc_tig_device::wangpcbus_dack_w(int line, uint8_t data)
+void wangpc_tig_device::wangpcbus_dack_w(address_space &space, int line, uint8_t data)
{
if (DMA_GRAPHICS)
{
- m_hgdc1->dack_w(data);
+ m_hgdc1->dack_w(space, 0, data);
}
else
{
- m_hgdc0->dack_w(data);
+ m_hgdc0->dack_w(space, 0, data);
}
}