From 87f88610db4fdee0f8398728c18919e0d7c50dce Mon Sep 17 00:00:00 2001 From: arbee Date: Fri, 18 Aug 2023 21:20:28 -0400 Subject: [PATCH] New working software list items ------------------------------- mac_cdrom: Apple Legacy Recovery System Software 7.0a9 ("Big Bang" pre-release) System Software 7.1 (US English) Performa CD (System 7.1.2P for Quadra 630 and LC/Performa 580) (US English) Power Macintosh 6100/7100/8100 CD (System Software 7.1.2P) (US English) System Software 7.5 (US English) System Software 7.5.3 (US English) Mac OS 7.6 (US English) Mac OS 7.6 (German) Mac OS 7.6.1 (US English) Mac OS 8 (Japanese) Mac OS 8.1 (US English) [R. Belmont] --- hash/mac_cdrom.xml | 158 ++++++++++++++++++++++++++++++++ src/mame/apple/f108.cpp | 1 + src/mame/apple/mac128.cpp | 6 +- src/mame/apple/macii.cpp | 3 + src/mame/apple/maciici.cpp | 1 + src/mame/apple/maciifx.cpp | 1 + src/mame/apple/maciivx.cpp | 1 + src/mame/apple/maclc.cpp | 7 ++ src/mame/apple/maclc3.cpp | 1 + src/mame/apple/macquadra605.cpp | 1 + src/mame/apple/macquadra700.cpp | 1 + src/mame/apple/macquadra800.cpp | 1 + 12 files changed, 180 insertions(+), 2 deletions(-) create mode 100755 hash/mac_cdrom.xml diff --git a/hash/mac_cdrom.xml b/hash/mac_cdrom.xml new file mode 100755 index 00000000000..799878e5c20 --- /dev/null +++ b/hash/mac_cdrom.xml @@ -0,0 +1,158 @@ + + + + + + Apple Legacy Recovery + 1998 + Apple + + + + + + + + + + System Software 7.0a9 ("Big Bang" pre-release) + 1991 + Apple + + + + + + + + + System Software 7.1 (US English) + 1992 + Apple + + + + + + + + + Performa CD (System 7.1.2P for Quadra 630 and LC/Performa 580) (US English) + 1994 + Apple + + + + + + + + + System Software 7.5 (US English) + 1994 + Apple + + + + + + + + + System Software 7.5.3 (US English) + 1996 + Apple + + + + + + + + + System Software 7.6 (US English) + 1997 + Apple + + + + + + + + + + Mac OS 7.6 (German) + 1997 + Apple + + + + + + + + + + Mac OS 7.6.1 (US English) + 1997 + Apple + + + + + + + + + + Mac OS 8 (Japanese) + 1997 + Apple + + + + + + + + + + Mac OS 8.1 (US English) + 1998 + Apple + + + + + + + + + + Power Macintosh 6100/7100/8100 CD (System Software 7.1.2P, US English) + 1994 + Apple + + + + + + + + + diff --git a/src/mame/apple/f108.cpp b/src/mame/apple/f108.cpp index 1c60940e7ed..fb483562f93 100644 --- a/src/mame/apple/f108.cpp +++ b/src/mame/apple/f108.cpp @@ -70,6 +70,7 @@ void f108_device::device_add_mconfig(machine_config &config) }); SOFTWARE_LIST(config, "hdd_list").set_original("mac_hdd"); + SOFTWARE_LIST(config, "cd_list").set_original("mac_cdrom").set_filter("MC68040"); SCC85C30(config, m_scc, 31.3344_MHz_XTAL/4); m_scc->configure_channels(3'686'400, 3'686'400, 3'686'400, 3'686'400); diff --git a/src/mame/apple/mac128.cpp b/src/mame/apple/mac128.cpp index e9283e88f80..1b3dceffcb6 100644 --- a/src/mame/apple/mac128.cpp +++ b/src/mame/apple/mac128.cpp @@ -1139,7 +1139,6 @@ void mac128_state::mac512ke(machine_config &config) SOFTWARE_LIST(config, "flop_mac35_orig").set_original("mac_flop_orig"); SOFTWARE_LIST(config, "flop_mac35_clean").set_original("mac_flop_clcracked"); SOFTWARE_LIST(config, "flop35_list").set_original("mac_flop"); - SOFTWARE_LIST(config, "hdd_list").set_original("mac_hdd"); } void mac128_state::mac128k(machine_config &config) @@ -1176,7 +1175,7 @@ void mac128_state::macplus(machine_config &config) NSCSI_CONNECTOR(config, "scsibus:1", mac_scsi_devices, nullptr); NSCSI_CONNECTOR(config, "scsibus:2", mac_scsi_devices, nullptr); NSCSI_CONNECTOR(config, "scsibus:3", mac_scsi_devices, nullptr); - NSCSI_CONNECTOR(config, "scsibus:4", mac_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:4", mac_scsi_devices, "cdrom"); NSCSI_CONNECTOR(config, "scsibus:5", mac_scsi_devices, nullptr); NSCSI_CONNECTOR(config, "scsibus:6", mac_scsi_devices, "harddisk"); NSCSI_CONNECTOR(config, "scsibus:7").option_set("ncr5380", NCR5380).machine_config([this](device_t *device) { @@ -1185,6 +1184,9 @@ void mac128_state::macplus(machine_config &config) adapter.drq_handler().set(*this, FUNC(mac128_state::scsi_drq_w)); }); + SOFTWARE_LIST(config, "hdd_list").set_original("mac_hdd"); + SOFTWARE_LIST(config, "cd_list").set_original("mac_cdrom").set_filter("MC68000"); + /* internal ram */ m_ram->set_default_size("4M"); m_ram->set_extra_options("1M,2M,2560K,4M"); diff --git a/src/mame/apple/macii.cpp b/src/mame/apple/macii.cpp index 55baa429023..903c8594bc6 100644 --- a/src/mame/apple/macii.cpp +++ b/src/mame/apple/macii.cpp @@ -1087,6 +1087,7 @@ void mac_state::macii(machine_config &config) m_scsihelp->timeout_error_callback().set(FUNC(mac_state::scsi_berr_w)); SOFTWARE_LIST(config, "hdd_list").set_original("mac_hdd"); + SOFTWARE_LIST(config, "cd_list").set_original("mac_cdrom").set_filter("MC68020"); nubus_device &nubus(NUBUS(config, "nubus", 0)); nubus.set_space(m_maincpu, AS_PROGRAM); @@ -1178,6 +1179,8 @@ void mac_state::maciix(machine_config &config) M68030(config.replace(), m_maincpu, C15M); m_maincpu->set_addrmap(AS_PROGRAM, &mac_state::macii_map); m_maincpu->set_dasm_override(std::function(&mac68k_dasm_override), "mac68k_dasm_override"); + + SOFTWARE_LIST(config.replace(), "cd_list").set_original("mac_cdrom").set_filter("MC68030"); } void mac_state::maciicx(machine_config &config) diff --git a/src/mame/apple/maciici.cpp b/src/mame/apple/maciici.cpp index 81fcc728000..9c887c39cb2 100644 --- a/src/mame/apple/maciici.cpp +++ b/src/mame/apple/maciici.cpp @@ -573,6 +573,7 @@ void maciici_state::maciici(machine_config &config) m_scsihelp->timeout_error_callback().set(FUNC(maciici_state::scsi_berr_w)); SOFTWARE_LIST(config, "hdd_list").set_original("mac_hdd"); + SOFTWARE_LIST(config, "cd_list").set_original("mac_cdrom").set_filter("MC68030,MC68030_32"); RAM(config, m_ram); m_ram->set_default_size("2M"); diff --git a/src/mame/apple/maciifx.cpp b/src/mame/apple/maciifx.cpp index 39ba732f2ac..127c2f4f13f 100644 --- a/src/mame/apple/maciifx.cpp +++ b/src/mame/apple/maciifx.cpp @@ -502,6 +502,7 @@ void maciifx_state::maciifx(machine_config &config) applefdintf_device::add_35_nc(config, m_floppy[1]); SOFTWARE_LIST(config, "flop35hd_list").set_original("mac_hdflop"); + SOFTWARE_LIST(config, "cd_list").set_original("mac_cdrom").set_filter("MC68030"); SCC85C30(config, m_scc, C7M); m_scc->configure_channels(3'686'400, 3'686'400, 3'686'400, 3'686'400); diff --git a/src/mame/apple/maciivx.cpp b/src/mame/apple/maciivx.cpp index c3e93739f4d..562fa38f67d 100644 --- a/src/mame/apple/maciivx.cpp +++ b/src/mame/apple/maciivx.cpp @@ -313,6 +313,7 @@ void maciivx_state::maciiv_base(machine_config &config) m_scsihelp->timeout_error_callback().set(FUNC(maciivx_state::scsi_berr_w)); SOFTWARE_LIST(config, "hdd_list").set_original("mac_hdd"); + SOFTWARE_LIST(config, "cd_list").set_original("mac_cdrom").set_filter("MC68030,MC68030_32"); SOFTWARE_LIST(config, "flop35hd_list").set_original("mac_hdflop"); SCC85C30(config, m_scc, C7M); diff --git a/src/mame/apple/maclc.cpp b/src/mame/apple/maclc.cpp index c8168adbdfe..5e0d3f0f03f 100644 --- a/src/mame/apple/maclc.cpp +++ b/src/mame/apple/maclc.cpp @@ -327,6 +327,7 @@ void maclc_state::maclc_base(machine_config &config) m_scsihelp->timeout_error_callback().set(FUNC(maclc_state::scsi_berr_w)); SOFTWARE_LIST(config, "hdd_list").set_original("mac_hdd"); + SOFTWARE_LIST(config, "cd_list").set_original("mac_cdrom").set_filter("MC68020"); SOFTWARE_LIST(config, "flop35hd_list").set_original("mac_hdflop"); SCC85C30(config, m_scc, C7M); @@ -394,6 +395,8 @@ void maclc_state::maclc2(machine_config &config) m_ram->set_default_size("4M"); m_ram->set_extra_options("6M,8M,10M"); m_v8->set_baseram_is_4M(true); + + SOFTWARE_LIST(config.replace(), "cd_list").set_original("mac_cdrom").set_filter("MC68030"); } void maclc_state::maccclas(machine_config &config) @@ -427,6 +430,8 @@ void maclc_state::maccclas(machine_config &config) m_ram->set_default_size("4M"); m_ram->set_extra_options("6M,8M,10M"); m_v8->set_baseram_is_4M(true); + + SOFTWARE_LIST(config.replace(), "cd_list").set_original("mac_cdrom").set_filter("MC68030"); } void maclc_state::macclas2(machine_config &config) @@ -449,6 +454,8 @@ void maclc_state::macclas2(machine_config &config) m_ram->set_default_size("4M"); m_ram->set_extra_options("6M,8M,10M"); m_v8->set_baseram_is_4M(true); + + SOFTWARE_LIST(config.replace(), "cd_list").set_original("mac_cdrom").set_filter("MC68030"); } ROM_START(maclc) diff --git a/src/mame/apple/maclc3.cpp b/src/mame/apple/maclc3.cpp index d43e8920d92..901dbc09c08 100644 --- a/src/mame/apple/maclc3.cpp +++ b/src/mame/apple/maclc3.cpp @@ -260,6 +260,7 @@ void macvail_state::maclc3_base(machine_config &config) m_scsihelp->timeout_error_callback().set(FUNC(macvail_state::scsi_berr_w)); SOFTWARE_LIST(config, "hdd_list").set_original("mac_hdd"); + SOFTWARE_LIST(config, "cd_list").set_original("mac_cdrom").set_filter("MC68030,MC68030_32"); SOFTWARE_LIST(config, "flop35hd_list").set_original("mac_hdflop"); SCC85C30(config, m_scc, C7M); diff --git a/src/mame/apple/macquadra605.cpp b/src/mame/apple/macquadra605.cpp index 59d8602d4c7..a9adfbe37c4 100644 --- a/src/mame/apple/macquadra605.cpp +++ b/src/mame/apple/macquadra605.cpp @@ -218,6 +218,7 @@ void quadra605_state::macqd605(machine_config &config) m_ram->set_extra_options("8M,16M,32M,64M,96M,128M,192M,256M,320M,384M,512M,640M"); SOFTWARE_LIST(config, "hdd_list").set_original("mac_hdd"); + SOFTWARE_LIST(config, "cd_list").set_original("mac_cdrom").set_filter("MC68040"); } void quadra605_state::maclc475(machine_config &config) diff --git a/src/mame/apple/macquadra700.cpp b/src/mame/apple/macquadra700.cpp index 5f2a95e03db..3045e8567af 100644 --- a/src/mame/apple/macquadra700.cpp +++ b/src/mame/apple/macquadra700.cpp @@ -639,6 +639,7 @@ void macquadra_state::macqd700(machine_config &config) m_ram->set_extra_options("8M,16M,32M,64M,68M,72M,80M,96M,128M"); SOFTWARE_LIST(config, "hdd_list").set_original("mac_hdd"); + SOFTWARE_LIST(config, "cd_list").set_original("mac_cdrom").set_filter("MC68040"); SOFTWARE_LIST(config, "flop_mac35_orig").set_original("mac_flop_orig"); SOFTWARE_LIST(config, "flop_mac35_clean").set_original("mac_flop_clcracked"); SOFTWARE_LIST(config, "flop35_list").set_original("mac_flop"); diff --git a/src/mame/apple/macquadra800.cpp b/src/mame/apple/macquadra800.cpp index b04008d6f24..60d5c690fdc 100644 --- a/src/mame/apple/macquadra800.cpp +++ b/src/mame/apple/macquadra800.cpp @@ -221,6 +221,7 @@ void quadra800_state::macqd800(machine_config &config) m_ram->set_extra_options("16M,32M,64M,96M,128M,192M,256M,320M,384M,512M,640M"); SOFTWARE_LIST(config, "hdd_list").set_original("mac_hdd"); + SOFTWARE_LIST(config, "cd_list").set_original("mac_cdrom").set_filter("MC68040"); SOFTWARE_LIST(config, "flop_mac35_orig").set_original("mac_flop_orig"); SOFTWARE_LIST(config, "flop_mac35_clean").set_original("mac_flop_clcracked"); SOFTWARE_LIST(config, "flop35_list").set_original("mac_flop");