diff options
Diffstat (limited to 'src/mame/drivers/tx0.cpp')
-rw-r--r-- | src/mame/drivers/tx0.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/mame/drivers/tx0.cpp b/src/mame/drivers/tx0.cpp index 2cf0317154a..0a905600d53 100644 --- a/src/mame/drivers/tx0.cpp +++ b/src/mame/drivers/tx0.cpp @@ -216,7 +216,7 @@ static const uint8_t tx0_colors[] = 0x80,0x80,0x80 /* light gray */ }; -static const uint8_t tx0_palette[] = +static const uint8_t tx0_pens[] = { pen_panel_bg, pen_panel_caption, /* captions */ pen_typewriter_bg, pen_black, /* black typing in typewriter */ @@ -230,7 +230,7 @@ static GFXDECODE_START( gfx_tx0 ) GFXDECODE_END /* Initialise the palette */ -PALETTE_INIT_MEMBER(tx0_state, tx0) +void tx0_state::tx0_palette(palette_device &palette) const { /* rgb components for the two color emissions */ const double r1 = .1, g1 = .1, b1 = .924, r2 = .7, g2 = .7, b2 = .076; @@ -298,7 +298,7 @@ PALETTE_INIT_MEMBER(tx0_state, tx0) /* set up palette for text */ for( i = 0; i < 6; i++ ) - palette.set_pen_indirect(total_colors_needed + i, tx0_palette[i]); + palette.set_pen_indirect(total_colors_needed + i, tx0_pens[i]); } @@ -1563,22 +1563,20 @@ MACHINE_CONFIG_START(tx0_state::tx0_64kw) MCFG_SCREEN_VISIBLE_AREA(0, virtual_width-1, 0, virtual_height-1) MCFG_SCREEN_UPDATE_DRIVER(tx0_state, screen_update_tx0) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tx0_state, screen_vblank_tx0)) - MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_PALETTE(m_palette) CRT(config, m_crt, 0); m_crt->set_num_levels(pen_crt_num_levels); m_crt->set_offsets(crt_window_offset_x, crt_window_offset_y); m_crt->set_size(crt_window_width, crt_window_height); - MCFG_DEVICE_ADD("readt", TX0_READTAPE, 0) - MCFG_DEVICE_ADD("punch", TX0_PUNCHTAPE, 0) - MCFG_DEVICE_ADD("typewriter", TX0_PRINTER, 0) - MCFG_DEVICE_ADD("magtape", TX0_MAGTAPE, 0) + TX0_READTAPE(config, "readt", 0); + TX0_PUNCHTAPE(config, "punch", 0); + TX0_PRINTER(config, "typewriter", 0); + TX0_MAGTAPE(config, "magtape", 0); - MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tx0) - MCFG_PALETTE_ADD("palette", total_colors_needed + sizeof(tx0_palette)) - MCFG_PALETTE_INDIRECT_ENTRIES(total_colors_needed) - MCFG_PALETTE_INIT_OWNER(tx0_state, tx0) + GFXDECODE(config, m_gfxdecode, m_palette, gfx_tx0); + PALETTE(config, m_palette, FUNC(tx0_state::tx0_palette), total_colors_needed + sizeof(tx0_pens), total_colors_needed); MACHINE_CONFIG_END MACHINE_CONFIG_START(tx0_state::tx0_8kw) |