summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/wolfpack.cpp
diff options
context:
space:
mode:
authorGravatarGravatar andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committerGravatarGravatar andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /src/mame/drivers/wolfpack.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/drivers/wolfpack.cpp')
-rw-r--r--src/mame/drivers/wolfpack.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/mame/drivers/wolfpack.cpp b/src/mame/drivers/wolfpack.cpp
index 611f453464f..da7cb3e1449 100644
--- a/src/mame/drivers/wolfpack.cpp
+++ b/src/mame/drivers/wolfpack.cpp
@@ -306,31 +306,31 @@ static GFXDECODE_START( gfx_wolfpack )
GFXDECODE_END
-void wolfpack_state::wolfpack(machine_config &config)
-{
+MACHINE_CONFIG_START(wolfpack_state::wolfpack)
+
/* basic machine hardware */
- M6502(config, m_maincpu, 12096000 / 16);
- m_maincpu->set_addrmap(AS_PROGRAM, &wolfpack_state::main_map);
+ MCFG_DEVICE_ADD("maincpu", M6502, 12096000 / 16)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
- SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
- m_screen->set_refresh_hz(60);
- m_screen->set_size(512, 262);
- m_screen->set_visarea(0, 511, 16, 239);
- m_screen->set_screen_update(FUNC(wolfpack_state::screen_update));
- m_screen->screen_vblank().set(FUNC(wolfpack_state::screen_vblank));
- m_screen->set_palette(m_palette);
-
- GFXDECODE(config, m_gfxdecode, m_palette, gfx_wolfpack);
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(512, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 511, 16, 239)
+ MCFG_SCREEN_UPDATE_DRIVER(wolfpack_state, screen_update)
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, wolfpack_state, screen_vblank))
+ MCFG_SCREEN_PALETTE(m_palette)
+
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, m_palette, gfx_wolfpack)
PALETTE(config, m_palette, FUNC(wolfpack_state::wolfpack_palette), 12, 8);
/* sound hardware */
SPEAKER(config, "mono").front_center();
- S14001A(config, m_s14001a, 20000); /* RC Clock (C=100pf, R=470K-670K ohms, adjustable) ranging from 14925.37313hz to 21276.59574hz, likely factory set to 20000hz since anything below 19500 is too slow */
- m_s14001a->add_route(ALL_OUTPUTS, "mono", 1.00);
-}
+ MCFG_DEVICE_ADD("speech", S14001A, 20000) /* RC Clock (C=100pf, R=470K-670K ohms, adjustable) ranging from 14925.37313hz to 21276.59574hz, likely factory set to 20000hz since anything below 19500 is too slow */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+MACHINE_CONFIG_END
ROM_START( wolfpack )