summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/smsmcorp.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/smsmcorp.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/drivers/smsmcorp.cpp')
-rw-r--r--src/mame/drivers/smsmcorp.cpp37
1 files changed, 18 insertions, 19 deletions
diff --git a/src/mame/drivers/smsmcorp.cpp b/src/mame/drivers/smsmcorp.cpp
index 6839e4c8286..3ee0d75c1ba 100644
--- a/src/mame/drivers/smsmcorp.cpp
+++ b/src/mame/drivers/smsmcorp.cpp
@@ -551,15 +551,14 @@ void smsmfg_state::machine_reset()
m_communication_port_status = 0;
}
-void smsmfg_state::sms(machine_config &config)
-{
- I8088(config, m_maincpu, XTAL(24'000'000)/8);
- m_maincpu->set_addrmap(AS_PROGRAM, &smsmfg_state::sms_map);
+MACHINE_CONFIG_START(smsmfg_state::sms)
+ MCFG_DEVICE_ADD("maincpu", I8088, XTAL(24'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(sms_map)
- z80_device &soundcpu(Z80(config, "soundcpu", XTAL(16'000'000)/8));
- soundcpu.set_addrmap(AS_PROGRAM, &smsmfg_state::sub_map);
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(16'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
- config.m_minimum_quantum = attotime::from_hz(6000);
+ MCFG_QUANTUM_TIME(attotime::from_hz(6000))
i8255_device &ppi0(I8255A(config, "ppi8255_0"));
ppi0.out_pa_callback().set(FUNC(smsmfg_state::ppi0_a_w));
@@ -574,13 +573,13 @@ void smsmfg_state::sms(machine_config &config)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
/* video hardware */
- SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
- m_screen->set_refresh_hz(60);
- m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0));
- m_screen->set_size(0x1b0, 0x100);
- m_screen->set_visarea(0, 0x1af, 0, 0xff);
- m_screen->set_screen_update(FUNC(smsmfg_state::screen_update_sms));
- m_screen->set_palette("palette");
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(0x1b0, 0x100)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x1af, 0, 0xff)
+ MCFG_SCREEN_UPDATE_DRIVER(smsmfg_state, screen_update_sms)
+ MCFG_SCREEN_PALETTE("palette")
PALETTE(config, "palette", palette_device::BGR_3BIT);
@@ -588,16 +587,16 @@ void smsmfg_state::sms(machine_config &config)
SPEAKER(config, "mono").front_center();
AY8910(config, "aysnd", XTAL(16'000'000)/8).add_route(ALL_OUTPUTS, "mono", 0.25);
-}
+MACHINE_CONFIG_END
-void smsmfg_state::sureshot(machine_config &config)
-{
+MACHINE_CONFIG_START(smsmfg_state::sureshot)
sms(config);
- m_maincpu->set_addrmap(AS_PROGRAM, &smsmfg_state::sureshot_map);
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sureshot_map)
MCFG_MACHINE_START_OVERRIDE(smsmfg_state,sureshot)
-}
+MACHINE_CONFIG_END
/*************************************
*