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/atarisy1.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/drivers/atarisy1.cpp')
-rw-r--r-- | src/mame/drivers/atarisy1.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/mame/drivers/atarisy1.cpp b/src/mame/drivers/atarisy1.cpp index 7c9b8fbff0b..251ecf21fb5 100644 --- a/src/mame/drivers/atarisy1.cpp +++ b/src/mame/drivers/atarisy1.cpp @@ -261,7 +261,7 @@ READ8_MEMBER(atarisy1_state::adc_r) if (!m_adc.found()) return 0xff; - int value = m_adc->data_r(); + int value = m_adc->data_r(space, 0); if (!machine().side_effects_disabled()) adc_w(space, offset, 0); @@ -275,7 +275,7 @@ WRITE8_MEMBER(atarisy1_state::adc_w) if (!m_adc.found()) return; - m_adc->address_offset_start_w(offset & 7, 0); + m_adc->address_offset_start_w(space, offset & 7, 0); /* the A4 bit enables/disables joystick IRQs */ m_ajsint->in_w<0>(!BIT(offset, 3)); @@ -724,14 +724,14 @@ void atarisy1_state::add_adc(machine_config &config) m_ajsint->output_handler().set(FUNC(atarisy1_state::joystick_int)); } -void atarisy1_state::atarisy1(machine_config &config) -{ +MACHINE_CONFIG_START(atarisy1_state::atarisy1) + /* basic machine hardware */ - M68010(config, m_maincpu, ATARI_CLOCK_14MHz/2); - m_maincpu->set_addrmap(AS_PROGRAM, &atarisy1_state::main_map); + MCFG_DEVICE_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2) + MCFG_DEVICE_PROGRAM_MAP(main_map) - M6502(config, m_audiocpu, ATARI_CLOCK_14MHz/8); - m_audiocpu->set_addrmap(AS_PROGRAM, &atarisy1_state::sound_map); + MCFG_DEVICE_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8) + MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_MACHINE_START_OVERRIDE(atarisy1_state,atarisy1) MCFG_MACHINE_RESET_OVERRIDE(atarisy1_state,atarisy1) @@ -747,29 +747,29 @@ void atarisy1_state::atarisy1(machine_config &config) WATCHDOG_TIMER(config, "watchdog"); - TIMER(config, m_scanline_timer).configure_generic(FUNC(atarisy1_state::atarisy1_int3_callback)); - TIMER(config, m_int3off_timer).configure_generic(FUNC(atarisy1_state::atarisy1_int3off_callback)); - TIMER(config, m_yscroll_reset_timer).configure_generic(FUNC(atarisy1_state::atarisy1_reset_yscroll_callback)); + MCFG_TIMER_DRIVER_ADD("scan_timer", atarisy1_state, atarisy1_int3_callback) + MCFG_TIMER_DRIVER_ADD("int3off_timer", atarisy1_state, atarisy1_int3off_callback) + MCFG_TIMER_DRIVER_ADD("yreset_timer", atarisy1_state, atarisy1_reset_yscroll_callback) /* video hardware */ - GFXDECODE(config, m_gfxdecode, m_palette, gfx_atarisy1); + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_atarisy1) PALETTE(config, m_palette).set_format(palette_device::IRGB_4444, 1024); - TILEMAP(config, m_playfield_tilemap, m_gfxdecode, 2, 8,8, TILEMAP_SCAN_ROWS, 64,64).set_info_callback(FUNC(atarisy1_state::get_playfield_tile_info)); - TILEMAP(config, m_alpha_tilemap, m_gfxdecode, 2, 8,8, TILEMAP_SCAN_ROWS, 64,32, 0).set_info_callback(FUNC(atarisy1_state::get_alpha_tile_info)); + MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, atarisy1_state, get_playfield_tile_info, 8,8, SCAN_ROWS, 64,64) + MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", "gfxdecode", 2, atarisy1_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0) ATARI_MOTION_OBJECTS(config, m_mob, 0, m_screen, atarisy1_state::s_mob_config); m_mob->set_gfxdecode(m_gfxdecode); - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_video_attributes(VIDEO_UPDATE_BEFORE_VBLANK); + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) /* note: these parameters are from published specs, not derived */ /* video timing comes from an 82S163 (H) and an 82S129 (V) */ - m_screen->set_raw(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240); - m_screen->set_screen_update(FUNC(atarisy1_state::screen_update_atarisy1)); - m_screen->set_palette(m_palette); - m_screen->screen_vblank().set(FUNC(atarisy1_state::video_int_write_line)); + MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE_DRIVER(atarisy1_state, screen_update_atarisy1) + MCFG_SCREEN_PALETTE(m_palette) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, atarisy1_state, video_int_write_line)) MCFG_VIDEO_START_OVERRIDE(atarisy1_state,atarisy1) @@ -784,13 +784,13 @@ void atarisy1_state::atarisy1(machine_config &config) ymsnd.add_route(0, "lspeaker", 0.80); ymsnd.add_route(1, "rspeaker", 0.80); - pokey_device &pokey(POKEY(config, "pokey", ATARI_CLOCK_14MHz/8)); - pokey.add_route(ALL_OUTPUTS, "lspeaker", 0.40); - pokey.add_route(ALL_OUTPUTS, "rspeaker", 0.40); + MCFG_DEVICE_ADD("pokey", POKEY, ATARI_CLOCK_14MHz/8) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) - TMS5220C(config, m_tms, ATARI_CLOCK_14MHz/2/11); - m_tms->add_route(ALL_OUTPUTS, "lspeaker", 1.0); - m_tms->add_route(ALL_OUTPUTS, "rspeaker", 1.0); + MCFG_DEVICE_ADD("tms", TMS5220C, ATARI_CLOCK_14MHz/2/11) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) /* via */ via6522_device &via(VIA6522(config, "via6522_0", ATARI_CLOCK_14MHz/8)); @@ -798,7 +798,7 @@ void atarisy1_state::atarisy1(machine_config &config) via.readpb_handler().set(FUNC(atarisy1_state::via_pb_r)); via.writepa_handler().set(FUNC(atarisy1_state::via_pa_w)); via.writepb_handler().set(FUNC(atarisy1_state::via_pb_w)); -} +MACHINE_CONFIG_END void atarisy1_state::marble(machine_config &config) { |