From c33fcbd66d08da3eab88b6fa6aa04d17ce737b53 Mon Sep 17 00:00:00 2001 From: arbee Date: Sat, 1 Oct 2022 10:50:52 -0400 Subject: mac.cpp: fix regression in maciisi [R. Belmont] --- src/mame/apple/mac.cpp | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/src/mame/apple/mac.cpp b/src/mame/apple/mac.cpp index 4d131413517..f57b263a907 100644 --- a/src/mame/apple/mac.cpp +++ b/src/mame/apple/mac.cpp @@ -555,17 +555,6 @@ void mac_state::add_via2(machine_config &config) m_via2->irq_handler().set(FUNC(mac_state::mac_via2_irq)); } -void mac_state::add_egret(machine_config &config, int type) -{ - EGRET(config, m_egret, type); - m_egret->reset_callback().set(FUNC(mac_state::egret_reset_w)); - m_egret->linechange_callback().set(m_macadb, FUNC(macadb_device::adb_linechange_w)); - m_egret->via_clock_callback().set(m_via1, FUNC(via6522_device::write_cb1)); - m_egret->via_data_callback().set(m_via1, FUNC(via6522_device::write_cb2)); - m_macadb->adb_data_callback().set(m_egret, FUNC(egret_device::set_adb_line)); - config.set_perfect_quantum(m_maincpu); -} - void mac_state::add_asc(machine_config &config, asc_device::asc_type type) { SPEAKER(config, "lspeaker").front_left(); @@ -828,12 +817,25 @@ void mac_state::maciici(machine_config &config) void mac_state::maciisi(machine_config &config) { - macii(config, false, asc_device::asc_type::ASC, false, true, true, 1); - M68030(config, m_maincpu, 20000000); m_maincpu->set_addrmap(AS_PROGRAM, &mac_state::maciici_map); m_maincpu->set_dasm_override(std::function(&mac68k_dasm_override), "mac68k_dasm_override"); + PALETTE(config, m_palette).set_entries(256); + + add_asc(config, asc_device::asc_type::ASC); + add_base_devices(config, true, 1); + add_scsi(config, true); + + add_via1_adb(config, true); + add_via2(config); + + RAM(config, m_ram); + m_ram->set_default_size("2M"); + m_ram->set_extra_options("8M,32M,64M,96M,128M"); + + SOFTWARE_LIST(config, "flop35_list").set_original("mac_flop"); + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); m_screen->set_raw(25175000, 800, 0, 640, 525, 0, 480); m_screen->set_size(640, 870); @@ -845,9 +847,16 @@ void mac_state::maciisi(machine_config &config) m_ram->set_default_size("2M"); m_ram->set_extra_options("4M,8M,16M,32M,48M,64M,128M"); - m_via1->writepb_handler().set(FUNC(mac_state::mac_via_out_b_egadb)); + MACADB(config, m_macadb, C15M); - add_egret(config, EGRET_344S0100); + m_via1->writepb_handler().set(FUNC(mac_state::mac_via_out_b_egadb)); + EGRET(config, m_egret, EGRET_344S0100); + m_egret->reset_callback().set(FUNC(mac_state::egret_reset_w)); + m_egret->linechange_callback().set(m_macadb, FUNC(macadb_device::adb_linechange_w)); + m_egret->via_clock_callback().set(m_via1, FUNC(via6522_device::write_cb1)); + m_egret->via_data_callback().set(m_via1, FUNC(via6522_device::write_cb2)); + m_macadb->adb_data_callback().set(m_egret, FUNC(egret_device::set_adb_line)); + config.set_perfect_quantum(m_maincpu); } static INPUT_PORTS_START( macadb ) -- cgit v1.2.3