diff options
author | Vas Crabb <vas@vastheman.com> | 2019-03-26 11:13:37 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2019-03-26 11:13:37 +1100 |
commit | 97b67170277437131adf6ed4d60139c172529e4f (patch) | |
tree | 7a5cbf608f191075f1612b1af15832c206a3fe2d /src/mame/drivers/calomega.cpp | |
parent | b380514764cf857469bae61c11143a19f79a74c5 (diff) |
(nw) Clean up the mess on master
This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and
c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at
598cd5227223c3b04ca31f0dbc1981256d9ea3ff.
Before pushing, please check that what you're about to push is sane.
Check your local commit log and ensure there isn't anything out-of-place
before pushing to mainline. When things like this happen, it wastes
everyone's time. I really don't need this in a week when real work⢠is
busting my balls and I'm behind where I want to be with preparing for
MAME release.
Diffstat (limited to 'src/mame/drivers/calomega.cpp')
-rw-r--r-- | src/mame/drivers/calomega.cpp | 69 |
1 files changed, 35 insertions, 34 deletions
diff --git a/src/mame/drivers/calomega.cpp b/src/mame/drivers/calomega.cpp index ab1c504dae1..7ab70433082 100644 --- a/src/mame/drivers/calomega.cpp +++ b/src/mame/drivers/calomega.cpp @@ -2570,11 +2570,12 @@ WRITE_LINE_MEMBER(calomega_state::write_acia_clock) * Machine Drivers * *************************************************/ -MACHINE_CONFIG_START(calomega_state::sys903) +void calomega_state::sys903(machine_config &config) +{ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M6502, CPU_CLOCK) /* confirmed */ - MCFG_DEVICE_PROGRAM_MAP(sys903_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", calomega_state, irq0_line_hold) + M6502(config, m_maincpu, CPU_CLOCK); /* confirmed */ + m_maincpu->set_addrmap(AS_PROGRAM, &calomega_state::sys903_map); + m_maincpu->set_vblank_int("screen", FUNC(calomega_state::irq0_line_hold)); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); @@ -2588,13 +2589,13 @@ MACHINE_CONFIG_START(calomega_state::sys903) m_pia[1]->writepb_handler().set(FUNC(calomega_state::s903_mux_w)); /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MCFG_SCREEN_SIZE((39+1)*8, (31+1)*8) /* Taken from MC6845 init, registers 00 & 04. Normally programmed with (value-1) */ - MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 31*8-1) /* Taken from MC6845 init, registers 01 & 06 */ - MCFG_SCREEN_UPDATE_DRIVER(calomega_state, screen_update_calomega) - MCFG_SCREEN_PALETTE(m_palette) + 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((39+1)*8, (31+1)*8); /* Taken from MC6845 init, registers 00 & 04. Normally programmed with (value-1) */ + screen.set_visarea(0*8, 32*8-1, 0*8, 31*8-1); /* Taken from MC6845 init, registers 01 & 06 */ + screen.set_screen_update(FUNC(calomega_state::screen_update_calomega)); + screen.set_palette(m_palette); GFXDECODE(config, m_gfxdecode, m_palette, gfx_calomega); PALETTE(config, m_palette, FUNC(calomega_state::calomega_palette), 256); // or 128? is the upper half of the PROMs really valid colors? @@ -2614,35 +2615,35 @@ MACHINE_CONFIG_START(calomega_state::sys903) ACIA6850(config, m_acia6850_0, 0); m_acia6850_0->txd_handler().set(FUNC(calomega_state::write_acia_tx)); - MCFG_DEVICE_ADD("aciabaud", CLOCK, UART_CLOCK) - MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, calomega_state, write_acia_clock)) -MACHINE_CONFIG_END + clock_device &aciabaud(CLOCK(config, "aciabaud", UART_CLOCK)); + aciabaud.signal_handler().set(FUNC(calomega_state::write_acia_clock)); +} -MACHINE_CONFIG_START(calomega_state::s903mod) +void calomega_state::s903mod(machine_config &config) +{ sys903(config); /* basic machine hardware */ - MCFG_DEVICE_MODIFY("maincpu") - MCFG_DEVICE_PROGRAM_MAP(s903mod_map) + m_maincpu->set_addrmap(AS_PROGRAM, &calomega_state::s903mod_map); /* sound hardware */ subdevice<ay8912_device>("ay8912")->port_a_read_callback().set_constant(0); - MCFG_DEVICE_REMOVE("acia6850_0") + config.device_remove("acia6850_0"); - MCFG_DEVICE_REMOVE("aciabaud") -MACHINE_CONFIG_END + config.device_remove("aciabaud"); +} -MACHINE_CONFIG_START(calomega_state::sys905) +void calomega_state::sys905(machine_config &config) +{ sys903(config); /* basic machine hardware */ - MCFG_DEVICE_MODIFY("maincpu") - MCFG_DEVICE_PROGRAM_MAP(sys905_map) + m_maincpu->set_addrmap(AS_PROGRAM, &calomega_state::sys905_map); m_pia[0]->readpa_handler().set(FUNC(calomega_state::s905_mux_port_r)); m_pia[0]->writepb_handler().set(FUNC(calomega_state::lamps_905_w)); @@ -2652,19 +2653,20 @@ MACHINE_CONFIG_START(calomega_state::sys905) /* sound hardware */ subdevice<ay8912_device>("ay8912")->port_a_read_callback().set_constant(0); - MCFG_DEVICE_REMOVE("acia6850_0") + config.device_remove("acia6850_0"); - MCFG_DEVICE_REMOVE("aciabaud") -MACHINE_CONFIG_END + config.device_remove("aciabaud"); +} -MACHINE_CONFIG_START(calomega_state::sys906) +void calomega_state::sys906(machine_config &config) +{ sys903(config); /* basic machine hardware */ - MCFG_DEVICE_REPLACE("maincpu", M65C02, CPU_CLOCK) /* guess */ - MCFG_DEVICE_PROGRAM_MAP(sys906_map) + M65C02(config.replace(), m_maincpu, CPU_CLOCK); /* guess */ + m_maincpu->set_addrmap(AS_PROGRAM, &calomega_state::sys906_map); m_pia[0]->readpa_handler().set(FUNC(calomega_state::pia0_ain_r)); m_pia[0]->readpb_handler().set(FUNC(calomega_state::pia0_bin_r)); @@ -2677,15 +2679,14 @@ MACHINE_CONFIG_START(calomega_state::sys906) m_pia[1]->writepa_handler().set(FUNC(calomega_state::pia1_aout_w)); m_pia[1]->writepb_handler().set(FUNC(calomega_state::pia1_bout_w)); - MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_sys906) + m_gfxdecode->set_info(gfx_sys906); /* sound hardware */ subdevice<ay8912_device>("ay8912")->port_a_read_callback().set_ioport("SW2"); /* From PCB pic. Value is stored at $0539 */ - MCFG_DEVICE_REMOVE("acia6850_0") - - MCFG_DEVICE_REMOVE("aciabaud") -MACHINE_CONFIG_END + config.device_remove("acia6850_0"); + config.device_remove("aciabaud"); +} /************************************************* |