summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/sfbonus.cpp
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /src/mame/drivers/sfbonus.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/drivers/sfbonus.cpp')
-rw-r--r--src/mame/drivers/sfbonus.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/mame/drivers/sfbonus.cpp b/src/mame/drivers/sfbonus.cpp
index 75b6ecea05f..f7c17308650 100644
--- a/src/mame/drivers/sfbonus.cpp
+++ b/src/mame/drivers/sfbonus.cpp
@@ -1376,28 +1376,27 @@ void sfbonus_state::ramdac_map(address_map &map)
}
-void sfbonus_state::sfbonus(machine_config &config)
-{
- Z80(config, m_maincpu, 6000000); // custom packaged z80 CPU ?? Mhz
- m_maincpu->set_addrmap(AS_PROGRAM, &sfbonus_state::sfbonus_map);
- m_maincpu->set_addrmap(AS_IO, &sfbonus_state::sfbonus_io);
- m_maincpu->set_vblank_int("screen", FUNC(sfbonus_state::irq0_line_hold));
- //m_maincpu->set_periodic_int(FUNC(sfbonus_state::nmi_line_pulse), attotime::from_hz(100));
+MACHINE_CONFIG_START(sfbonus_state::sfbonus)
+ MCFG_DEVICE_ADD("maincpu", Z80, 6000000) // custom packaged z80 CPU ?? Mhz
+ MCFG_DEVICE_PROGRAM_MAP(sfbonus_map)
+ MCFG_DEVICE_IO_MAP(sfbonus_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sfbonus_state, irq0_line_hold)
+ //MCFG_DEVICE_PERIODIC_INT_DRIVER(sfbonus_state, nmi_line_pulse, 100)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- GFXDECODE(config, m_gfxdecode, m_palette, gfx_sfbonus);
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sfbonus)
- screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
- screen.set_refresh_hz(60);
- screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
- screen.set_size(128*8, 64*8);
- screen.set_visarea(0*8, 512-1, 0*8, 288-1);
- screen.set_screen_update(FUNC(sfbonus_state::screen_update_sfbonus));
- screen.set_palette(m_palette);
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(128*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 288-1)
+ MCFG_SCREEN_UPDATE_DRIVER(sfbonus_state, screen_update_sfbonus)
+ MCFG_SCREEN_PALETTE("palette")
- PALETTE(config, m_palette).set_entries(0x100*2); // *2 for priority workaraound / custom drawing
+ MCFG_PALETTE_ADD("palette", 0x100*2) // *2 for priority workaraound / custom drawing
ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette));
ramdac.set_addrmap(0, &sfbonus_state::ramdac_map);
@@ -1405,8 +1404,9 @@ void sfbonus_state::sfbonus(machine_config &config)
/* Parrot 3 seems fine at 1 Mhz, but Double Challenge isn't? */
SPEAKER(config, "mono").front_center();
- OKIM6295(config, "oki", 1000000, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 1.00); // clock frequency & pin 7 not verified
-}
+ MCFG_DEVICE_ADD("oki", OKIM6295, 1000000, okim6295_device::PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+MACHINE_CONFIG_END
/* Super Ball */
ROM_START( suprball )