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/miniboy7.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/drivers/miniboy7.cpp')
-rw-r--r-- | src/mame/drivers/miniboy7.cpp | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/src/mame/drivers/miniboy7.cpp b/src/mame/drivers/miniboy7.cpp index 55806601093..c72e1e188d5 100644 --- a/src/mame/drivers/miniboy7.cpp +++ b/src/mame/drivers/miniboy7.cpp @@ -259,13 +259,13 @@ MC6845_UPDATE_ROW( miniboy7_state::crtc_update_row ) void miniboy7_state::miniboy7_palette(palette_device &palette) const { /* - prom bits - 7654 3210 - ---- ---x red component?. - ---- --x- green component?. - ---- -x-- blue component?. - ---- x--- intensity?. - xxxx ---- unused. + prom bits + 7654 3210 + ---- ---x red component?. + ---- --x- green component?. + ---- -x-- blue component?. + ---- x--- intensity?. + xxxx ---- unused. */ /* 0000IBGR */ @@ -513,11 +513,11 @@ GFXDECODE_END * Machine Drivers * ***********************************/ -void miniboy7_state::miniboy7(machine_config &config) -{ +MACHINE_CONFIG_START(miniboy7_state::miniboy7) + /* basic machine hardware */ - M6502(config, m_maincpu, MASTER_CLOCK / 16); /* guess */ - m_maincpu->set_addrmap(AS_PROGRAM, &miniboy7_state::miniboy7_map); + MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK / 16) /* guess */ + MCFG_DEVICE_PROGRAM_MAP(miniboy7_map) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); @@ -529,14 +529,14 @@ void miniboy7_state::miniboy7(machine_config &config) pia.irqb_handler().set_inputline("maincpu", 0); /* video hardware */ - screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_refresh_hz(60); - screen.set_vblank_time(ATTOSECONDS_IN_USEC(0)); - screen.set_size((47+1)*8, (39+1)*8); /* Taken from MC6845, registers 00 & 04. Normally programmed with (value-1) */ - screen.set_visarea(0*8, 37*8-1, 0*8, 37*8-1); /* Taken from MC6845, registers 01 & 06 */ - screen.set_screen_update("crtc", FUNC(mc6845_device::screen_update)); + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_SIZE((47+1)*8, (39+1)*8) /* Taken from MC6845, registers 00 & 04. Normally programmed with (value-1) */ + MCFG_SCREEN_VISIBLE_AREA(0*8, 37*8-1, 0*8, 37*8-1) /* Taken from MC6845, registers 01 & 06 */ + MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) - GFXDECODE(config, m_gfxdecode, m_palette, gfx_miniboy7); + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_miniboy7) PALETTE(config, m_palette, FUNC(miniboy7_state::miniboy7_palette), 256); @@ -553,7 +553,8 @@ void miniboy7_state::miniboy7(machine_config &config) ay8910.add_route(ALL_OUTPUTS, "mono", 0.75); ay8910.port_a_write_callback().set(FUNC(miniboy7_state::ay_pa_w)); ay8910.port_b_write_callback().set(FUNC(miniboy7_state::ay_pb_w)); -} + +MACHINE_CONFIG_END /*********************************** |