diff options
Diffstat (limited to 'src/mame/drivers/majorpkr.cpp')
-rw-r--r-- | src/mame/drivers/majorpkr.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mame/drivers/majorpkr.cpp b/src/mame/drivers/majorpkr.cpp index a632af8ca67..486413c360b 100644 --- a/src/mame/drivers/majorpkr.cpp +++ b/src/mame/drivers/majorpkr.cpp @@ -1004,12 +1004,13 @@ GFXDECODE_END * Machine Drivers * *************************/ -MACHINE_CONFIG_START(majorpkr_state::majorpkr) +void majorpkr_state::majorpkr(machine_config &config) +{ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK) // 6 MHz. - MCFG_DEVICE_PROGRAM_MAP(map) - MCFG_DEVICE_IO_MAP(portmap) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", majorpkr_state, irq0_line_hold) + z80_device &maincpu(Z80(config, "maincpu", CPU_CLOCK)); // 6 MHz. + maincpu.set_addrmap(AS_PROGRAM, &majorpkr_state::map); + maincpu.set_addrmap(AS_IO, &majorpkr_state::portmap); + maincpu.set_vblank_int("screen", FUNC(majorpkr_state::irq0_line_hold)); ADDRESS_MAP_BANK(config, "palette_bank").set_map(&majorpkr_state::palettebanks).set_options(ENDIANNESS_LITTLE, 8, 13, 0x800); ADDRESS_MAP_BANK(config, "vram_bank").set_map(&majorpkr_state::vrambanks).set_options(ENDIANNESS_LITTLE, 8, 13, 0x800); @@ -1017,10 +1018,10 @@ MACHINE_CONFIG_START(majorpkr_state::majorpkr) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(CRTC_CLOCK*16, (47+1)*16, 0, (36*16)-16, (36+1)*8, 0, (28*8)) // from CRTC registers. - MCFG_SCREEN_UPDATE_DRIVER(majorpkr_state, screen_update_majorpkr) - MCFG_SCREEN_PALETTE("palette") + screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); + screen.set_raw(CRTC_CLOCK*16, (47+1)*16, 0, (36*16)-16, (36+1)*8, 0, (28*8)); // from CRTC registers. + screen.set_screen_update(FUNC(majorpkr_state::screen_update_majorpkr)); + screen.set_palette("palette"); GFXDECODE(config, m_gfxdecode, "palette", gfx_majorpkr); @@ -1034,9 +1035,8 @@ MACHINE_CONFIG_START(majorpkr_state::majorpkr) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("oki", OKIM6295, OKI_CLOCK, okim6295_device::PIN7_HIGH) // clock frequency & pin 7 verified. - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) -MACHINE_CONFIG_END + OKIM6295(config, "oki", OKI_CLOCK, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 1.0); // clock frequency & pin 7 verified. +} /************************* |