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/ondra.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/drivers/ondra.cpp')
-rw-r--r-- | src/mame/drivers/ondra.cpp | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/mame/drivers/ondra.cpp b/src/mame/drivers/ondra.cpp index 040e09fb591..12c9f073cd2 100644 --- a/src/mame/drivers/ondra.cpp +++ b/src/mame/drivers/ondra.cpp @@ -122,39 +122,38 @@ WRITE_LINE_MEMBER(ondra_state::vblank_irq) } /* Machine driver */ -void ondra_state::ondra(machine_config &config) -{ +MACHINE_CONFIG_START(ondra_state::ondra) /* basic machine hardware */ - Z80(config, m_maincpu, 2000000); - m_maincpu->set_addrmap(AS_PROGRAM, &ondra_state::ondra_mem); - m_maincpu->set_addrmap(AS_IO, &ondra_state::ondra_io); + MCFG_DEVICE_ADD("maincpu", Z80, 2000000) + MCFG_DEVICE_PROGRAM_MAP(ondra_mem) + MCFG_DEVICE_IO_MAP(ondra_io) /* video hardware */ - screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_refresh_hz(50); - screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */ - screen.set_size(320, 256); - screen.set_visarea(0, 320-1, 0, 256-1); - screen.set_screen_update(FUNC(ondra_state::screen_update_ondra)); - screen.set_palette("palette"); - screen.screen_vblank().set(FUNC(ondra_state::vblank_irq)); + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_REFRESH_RATE(50) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ + MCFG_SCREEN_SIZE(320, 256) + MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-1) + MCFG_SCREEN_UPDATE_DRIVER(ondra_state, screen_update_ondra) + MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ondra_state, vblank_irq)) PALETTE(config, "palette", palette_device::MONOCHROME); // sound hardware SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.25); + WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); - CASSETTE(config, m_cassette); - m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED); - m_cassette->set_interface("ondra_cass"); + MCFG_CASSETTE_ADD( "cassette" ) + MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED) + MCFG_CASSETTE_INTERFACE("ondra_cass") - SOFTWARE_LIST(config, "cass_list").set_original("ondra"); + MCFG_SOFTWARE_LIST_ADD("cass_list","ondra") /* internal ram */ RAM(config, RAM_TAG).set_default_size("64K").set_default_value(0x00); -} +MACHINE_CONFIG_END /* ROM definition */ |