summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/lasso.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/lasso.cpp')
-rw-r--r--src/mame/drivers/lasso.cpp24
1 files changed, 8 insertions, 16 deletions
diff --git a/src/mame/drivers/lasso.cpp b/src/mame/drivers/lasso.cpp
index 82992ea8cd6..cf307aab66f 100644
--- a/src/mame/drivers/lasso.cpp
+++ b/src/mame/drivers/lasso.cpp
@@ -510,20 +510,17 @@ MACHINE_CONFIG_START(lasso_state::base)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(lasso_state, screen_update_lasso)
- MCFG_SCREEN_PALETTE("palette")
+ MCFG_SCREEN_PALETTE(m_palette)
- MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lasso)
+ GFXDECODE(config, m_gfxdecode, m_palette, gfx_lasso);
/* sound hardware */
SPEAKER(config, "speaker").front_center();
GENERIC_LATCH_8(config, m_soundlatch);
- MCFG_DEVICE_ADD("sn76489.1", SN76489, 2000000)
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
-
- MCFG_DEVICE_ADD("sn76489.2", SN76489, 2000000)
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
+ SN76489(config, m_sn_1, 2000000).add_route(ALL_OUTPUTS, "speaker", 1.0);
+ SN76489(config, m_sn_2, 2000000).add_route(ALL_OUTPUTS, "speaker", 1.0);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(lasso_state::lasso)
@@ -533,8 +530,7 @@ MACHINE_CONFIG_START(lasso_state::lasso)
MCFG_DEVICE_ADD("blitter", M6502, 11289000/16) /* guess */
MCFG_DEVICE_PROGRAM_MAP(lasso_coprocessor_map)
- MCFG_PALETTE_ADD("palette", 0x40)
- MCFG_PALETTE_INIT_OWNER(lasso_state, lasso)
+ PALETTE(config, m_palette, FUNC(lasso_state::lasso_palette), 0x40);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(lasso_state::chameleo)
@@ -548,8 +544,7 @@ MACHINE_CONFIG_START(lasso_state::chameleo)
MCFG_DEVICE_PROGRAM_MAP(chameleo_audio_map)
/* video hardware */
- MCFG_PALETTE_ADD("palette", 0x40)
- MCFG_PALETTE_INIT_OWNER(lasso_state, lasso)
+ PALETTE(config, m_palette, FUNC(lasso_state::lasso_palette), 0x40);
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(lasso_state, screen_update_chameleo)
@@ -574,9 +569,7 @@ MACHINE_CONFIG_START(lasso_state::wwjgtin)
MCFG_SCREEN_UPDATE_DRIVER(lasso_state, screen_update_wwjgtin)
MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_wwjgtin) // Has 1 additional layer
- MCFG_PALETTE_ADD("palette", 0x40 + 16*16)
- MCFG_PALETTE_INDIRECT_ENTRIES(64)
- MCFG_PALETTE_INIT_OWNER(lasso_state,wwjgtin)
+ PALETTE(config, m_palette, FUNC(lasso_state::wwjgtin_palette), 0x40 + 16*16, 64);
MCFG_VIDEO_START_OVERRIDE(lasso_state,wwjgtin)
/* sound hardware */
@@ -600,7 +593,7 @@ MACHINE_CONFIG_START(lasso_state::pinbo)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pinbo)
- MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256)
+ PALETTE(config, m_palette, palette_device::RGB_444_PROMS, "proms", 256);
MCFG_VIDEO_START_OVERRIDE(lasso_state,pinbo)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(lasso_state, screen_update_chameleo)
@@ -610,7 +603,6 @@ MACHINE_CONFIG_START(lasso_state::pinbo)
MCFG_DEVICE_REMOVE("sn76489.2")
AY8910(config, "ay1", XTAL(18'000'000)/12).add_route(ALL_OUTPUTS, "speaker", 0.55);
-
AY8910(config, "ay2", XTAL(18'000'000)/12).add_route(ALL_OUTPUTS, "speaker", 0.55);
MACHINE_CONFIG_END