summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/mpu4dealem.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/mpu4dealem.cpp')
-rw-r--r--src/mame/drivers/mpu4dealem.cpp31
1 files changed, 15 insertions, 16 deletions
diff --git a/src/mame/drivers/mpu4dealem.cpp b/src/mame/drivers/mpu4dealem.cpp
index 73db940923c..0b599667a2e 100644
--- a/src/mame/drivers/mpu4dealem.cpp
+++ b/src/mame/drivers/mpu4dealem.cpp
@@ -107,16 +107,16 @@ void mpu4dealem_state::dealem_palette(palette_device &palette) const
bit0 = BIT(*color_prom, 0);
bit1 = BIT(*color_prom, 1);
bit2 = BIT(*color_prom, 2);
- int const r = combine_weights(weights_r, bit0, bit1, bit2);
+ int const r = combine_3_weights(weights_r, bit0, bit1, bit2);
/* green component */
bit0 = BIT(*color_prom, 3);
bit1 = BIT(*color_prom, 4);
bit2 = BIT(*color_prom, 5);
- int const g = combine_weights(weights_g, bit0, bit1, bit2);
+ int const g = combine_3_weights(weights_g, bit0, bit1, bit2);
/* blue component */
bit0 = BIT(*color_prom, 6);
bit1 = BIT(*color_prom, 7);
- int const b = combine_weights(weights_b, bit0, bit1);
+ int const b = combine_2_weights(weights_b, bit0, bit1);
palette.set_pen_color(i, rgb_t(r, g, b));
color_prom++;
@@ -196,13 +196,12 @@ MACHINE_RESET_MEMBER(mpu4dealem_state,dealem_vid)
/* machine driver for Zenitone Deal 'Em board */
-void mpu4dealem_state::dealem(machine_config &config)
-{
+MACHINE_CONFIG_START(mpu4dealem_state::dealem)
MCFG_MACHINE_START_OVERRIDE(mpu4dealem_state,mod2) /* main mpu4 board initialisation */
MCFG_MACHINE_RESET_OVERRIDE(mpu4dealem_state,dealem_vid)
- M6809(config, m_maincpu, MPU4_MASTER_CLOCK/4);
- m_maincpu->set_addrmap(AS_PROGRAM, &mpu4dealem_state::dealem_memmap);
+ MCFG_DEVICE_ADD("maincpu", M6809, MPU4_MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(dealem_memmap)
mpu4_common(config);
@@ -215,23 +214,23 @@ void mpu4dealem_state::dealem(machine_config &config)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
/* video hardware */
- screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
- screen.set_size((54+1)*8, (32+1)*8); /* Taken from 6845 init, registers 00 & 04. Normally programmed with (value-1) */
- screen.set_visarea(0*8, 40*8-1, 0*8, 31*8-1); /* Taken from 6845 init, registers 01 & 06 */
- screen.set_refresh_hz(56); /* Measured accurately from the flip-flop, but 6845 handles this */
- screen.set_screen_update(FUNC(mpu4dealem_state::screen_update_dealem));
- screen.set_palette(m_palette);
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_SIZE((54+1)*8, (32+1)*8) /* Taken from 6845 init, registers 00 & 04. Normally programmed with (value-1) */
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 31*8-1) /* Taken from 6845 init, registers 01 & 06 */
+ MCFG_SCREEN_REFRESH_RATE(56) /* Measured accurately from the flip-flop, but 6845 handles this */
+ MCFG_SCREEN_UPDATE_DRIVER(mpu4dealem_state, screen_update_dealem)
+ MCFG_SCREEN_PALETTE("palette")
- GFXDECODE(config, m_gfxdecode, m_palette, gfx_dealem);
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dealem)
- PALETTE(config, m_palette, FUNC(mpu4dealem_state::dealem_palette), 32);
+ PALETTE(config, "palette", FUNC(mpu4dealem_state::dealem_palette), 32);
hd6845_device &crtc(HD6845(config, "crtc", MPU4_MASTER_CLOCK / 4 / 8)); /* HD68B45 */
crtc.set_screen("screen");
crtc.set_show_border_area(false);
crtc.set_char_width(8);
crtc.out_vsync_callback().set(FUNC(mpu4dealem_state::dealem_vsync_changed));
-}
+MACHINE_CONFIG_END