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/drivers/majorpkr.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
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 486413c360b..a632af8ca67 100644 --- a/src/mame/drivers/majorpkr.cpp +++ b/src/mame/drivers/majorpkr.cpp @@ -1004,13 +1004,12 @@ GFXDECODE_END * Machine Drivers * *************************/ -void majorpkr_state::majorpkr(machine_config &config) -{ +MACHINE_CONFIG_START(majorpkr_state::majorpkr) /* basic machine hardware */ - 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)); + 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) 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); @@ -1018,10 +1017,10 @@ void majorpkr_state::majorpkr(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); /* video hardware */ - 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"); + 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") GFXDECODE(config, m_gfxdecode, "palette", gfx_majorpkr); @@ -1035,8 +1034,9 @@ void majorpkr_state::majorpkr(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); - OKIM6295(config, "oki", OKI_CLOCK, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 1.0); // clock frequency & pin 7 verified. -} + 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 /************************* |