diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/mame/etc | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/etc')
-rw-r--r-- | src/mame/etc/korgm1.cpp | 30 | ||||
-rw-r--r-- | src/mame/etc/template_device.cpp | 7 | ||||
-rw-r--r-- | src/mame/etc/unkfr.cpp | 5 |
3 files changed, 20 insertions, 22 deletions
diff --git a/src/mame/etc/korgm1.cpp b/src/mame/etc/korgm1.cpp index 6a5df1cd84c..fcc047054dd 100644 --- a/src/mame/etc/korgm1.cpp +++ b/src/mame/etc/korgm1.cpp @@ -167,32 +167,32 @@ PALETTE_INIT_MEMBER(korgm1_state, korgm1) { } -void korgm1_state::korgm1(machine_config &config) -{ +MACHINE_CONFIG_START(korgm1_state::korgm1) + /* basic machine hardware */ - V30(config, m_maincpu, MAIN_CLOCK); // V50 actually - m_maincpu->set_addrmap(AS_PROGRAM, &korgm1_state::korgm1_map); - m_maincpu->set_addrmap(AS_IO, &korgm1_state::korgm1_io); + MCFG_DEVICE_ADD("maincpu",V30,MAIN_CLOCK) // V50 actually + MCFG_DEVICE_PROGRAM_MAP(korgm1_map) + MCFG_DEVICE_IO_MAP(korgm1_io) - CXD1095(config, "pio", 0); + MCFG_DEVICE_ADD("pio", CXD1095, 0) /* video hardware */ /* TODO: LCD actually */ - screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_refresh_hz(60); - screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); - screen.set_screen_update(FUNC(korgm1_state::screen_update)); - screen.set_size(32*8, 32*8); - screen.set_visarea(0*8, 32*8-1, 0*8, 32*8-1); + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) + MCFG_SCREEN_UPDATE_DRIVER(korgm1_state, screen_update) + MCFG_SCREEN_SIZE(32*8, 32*8) + MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) - GFXDECODE(config, "gfxdecode", "palette", gfx_korgm1); + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_korgm1) - PALETTE(config, "palette").set_entries(8); + MCFG_PALETTE_ADD("palette", 8) /* sound hardware */ SPEAKER(config, "mono").front_center(); // AY8910(config, "aysnd", MAIN_CLOCK/4).add_route(ALL_OUTPUTS, "mono", 0.30); -} +MACHINE_CONFIG_END /*************************************************************************** diff --git a/src/mame/etc/template_device.cpp b/src/mame/etc/template_device.cpp index 21226b79b1b..d1adea3448b 100644 --- a/src/mame/etc/template_device.cpp +++ b/src/mame/etc/template_device.cpp @@ -40,10 +40,9 @@ xxx_device::xxx_device(const machine_config &mconfig, const char *tag, device_t // configuration addiitons //------------------------------------------------- -void xxx_device::device_add_mconfig(machine_config &config) -{ - //DEVICE(config, ...); -} +MACHINE_CONFIG_START(xxx_device::device_add_mconfig) + //MCFG_DEVICE_ADD(...) +MACHINE_CONFIG_END //------------------------------------------------- diff --git a/src/mame/etc/unkfr.cpp b/src/mame/etc/unkfr.cpp index 4e7c2e7f566..dd16171c298 100644 --- a/src/mame/etc/unkfr.cpp +++ b/src/mame/etc/unkfr.cpp @@ -60,9 +60,8 @@ static INPUT_PORTS_START( unkfr ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) INPUT_PORTS_END -void unkfr_state::unkfr(machine_config &config) -{ -} +MACHINE_CONFIG_START( unkfr_state::unkfr ) +MACHINE_CONFIG_END ROM_START( unkfr ) ROM_REGION( 0x800000, "unkroms", 0 ) |