diff options
author | Ivan Vangelista <mesgnet@yahoo.it> | 2019-02-15 16:43:19 +0100 |
---|---|---|
committer | Ivan Vangelista <mesgnet@yahoo.it> | 2019-02-15 16:43:19 +0100 |
commit | 417dab47cb633c447ba469f7b3a6460ed774422f (patch) | |
tree | 44bf728f7e811c77933bc124873b9b6774540438 /src/mame/drivers/vaportra.cpp | |
parent | 34d7ece8b20bc4f8a9ae6ee591c453209b939f2e (diff) |
mame\drivers: removed most MACHINE_CONFIG and MCFG macros for drivers starting with u and v (nw)
Diffstat (limited to 'src/mame/drivers/vaportra.cpp')
-rw-r--r-- | src/mame/drivers/vaportra.cpp | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/src/mame/drivers/vaportra.cpp b/src/mame/drivers/vaportra.cpp index a2f29a0299e..4f7015df8a4 100644 --- a/src/mame/drivers/vaportra.cpp +++ b/src/mame/drivers/vaportra.cpp @@ -207,30 +207,30 @@ void vaportra_state::machine_reset() m_priority[1] = 0; } -MACHINE_CONFIG_START(vaportra_state::vaportra) - +void vaportra_state::vaportra(machine_config &config) +{ /* basic machine hardware */ - MCFG_DEVICE_ADD(m_maincpu, M68000,XTAL(24'000'000)/2) /* Custom chip 59 */ - MCFG_DEVICE_PROGRAM_MAP(main_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vaportra_state, irq6_line_assert) + M68000(config, m_maincpu, XTAL(24'000'000)/2); /* Custom chip 59 */ + m_maincpu->set_addrmap(AS_PROGRAM, &vaportra_state::main_map); + m_maincpu->set_vblank_int("screen", FUNC(vaportra_state::irq6_line_assert)); H6280(config, m_audiocpu, XTAL(24'000'000)/4); /* Custom chip 45; Audio section crystal is 32.220 MHz but CPU clock is confirmed as coming from the 24MHz crystal (6Mhz exactly on the CPU) */ m_audiocpu->set_addrmap(AS_PROGRAM, &vaportra_state::sound_map); m_audiocpu->add_route(ALL_OUTPUTS, "mono", 0); // internal sound unused /* video hardware */ - MCFG_DEVICE_ADD(m_spriteram, BUFFERED_SPRITERAM16) + BUFFERED_SPRITERAM16(config, m_spriteram); - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(58) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529)) - MCFG_SCREEN_SIZE(32*8, 32*8) - MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) - MCFG_SCREEN_UPDATE_DRIVER(vaportra_state, screen_update) - MCFG_SCREEN_PALETTE("colors") + screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); + screen.set_refresh_hz(58); + screen.set_vblank_time(ATTOSECONDS_IN_USEC(529)); + screen.set_size(32*8, 32*8); + screen.set_visarea(0*8, 32*8-1, 1*8, 31*8-1); + screen.set_screen_update(FUNC(vaportra_state::screen_update)); + screen.set_palette(m_palette); GFXDECODE(config, "gfxdecode", m_palette, gfx_vaportra); - MCFG_PALETTE_ADD(m_palette, 1280) + PALETTE(config, m_palette).set_entries(1280); DECO16IC(config, m_deco_tilegen[0], 0); m_deco_tilegen[0]->set_split(0); @@ -274,20 +274,17 @@ MACHINE_CONFIG_START(vaportra_state::vaportra) GENERIC_LATCH_8(config, m_soundlatch); m_soundlatch->data_pending_callback().set_inputline(m_audiocpu, 0); - MCFG_DEVICE_ADD("ym1", YM2203, XTAL(32'220'000)/8) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) + YM2203(config, "ym1", XTAL(32'220'000)/8).add_route(ALL_OUTPUTS, "mono", 0.60); ym2151_device &ym2(YM2151(config, "ym2", XTAL(32'220'000)/9)); // uses a preset LS163 to force the odd speed ym2.irq_handler().set_inputline(m_audiocpu, 1); /* IRQ2 */ ym2.add_route(0, "mono", 0.60); ym2.add_route(1, "mono", 0.60); - MCFG_DEVICE_ADD("oki1", OKIM6295, XTAL(32'220'000)/32, okim6295_device::PIN7_HIGH) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) + OKIM6295(config, "oki1", XTAL(32'220'000)/32, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 0.75); - MCFG_DEVICE_ADD("oki2", OKIM6295, XTAL(32'220'000)/16, okim6295_device::PIN7_HIGH) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) -MACHINE_CONFIG_END + OKIM6295(config, "oki2", XTAL(32'220'000)/16, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 0.60); +} /******************************************************************************/ |