Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-07 02:50:50 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

apple/mac128.cpp, macquadra700.cpp: Make all of the SCSI buses be consistently named "scsi" across all emulated Macs. [R. Belmont]

Browse Source
This commit is contained in:
arbee 2024-07-17 22:55:01 -04:00
parent 950913e3af
commit c6c302f924
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/mame/apple/mac128.cpp
View File

@ -143,9 +143,9 @@ public:
m_adbmodem(*this, "adbmodem"),
m_macadb(*this, "macadb"),
m_ram(*this, RAM_TAG),
m_scsibus(*this, "scsibus"),
m_scsibus(*this, "scsi"),
m_scsihelp(*this, "scsihelp"),
m_ncr5380(*this, "scsibus:7:ncr5380"),
m_ncr5380(*this, "scsi:7:ncr5380"),
m_iwm(*this, "fdc"),
m_floppy(*this, "fdc:%d", 0U),
m_mackbd(*this, "kbd"),
@ -1179,19 +1179,19 @@ void mac128_state::macplus(machine_config &config)
SPEAKER(config, "rspeaker").front_right();
NSCSI_BUS(config, m_scsibus);
NSCSI_CONNECTOR(config, "scsibus:0", mac_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsibus:1", mac_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsibus:2", mac_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsibus:3").option_set("cdrom", NSCSI_CDROM_APPLE).machine_config(
NSCSI_CONNECTOR(config, "scsi:0", mac_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi:1", mac_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi:2", mac_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi:3").option_set("cdrom", NSCSI_CDROM_APPLE).machine_config(
[](device_t *device)
{
device->subdevice<cdda_device>("cdda")->add_route(0, "^^lspeaker", 1.0);
device->subdevice<cdda_device>("cdda")->add_route(1, "^^rspeaker", 1.0);
});
NSCSI_CONNECTOR(config, "scsibus:4", mac_scsi_devices, nullptr);
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) {
NSCSI_CONNECTOR(config, "scsi:4", mac_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi:5", mac_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi:6", mac_scsi_devices, "harddisk");
NSCSI_CONNECTOR(config, "scsi:7").option_set("ncr5380", NCR5380).machine_config([this](device_t *device) {
ncr5380_device &adapter = downcast<ncr5380_device &>(*device);
adapter.irq_handler().set(*this, FUNC(mac128_state::scsi_irq_w));
adapter.drq_handler().set(*this, FUNC(mac128_state::scsi_drq_w));
@ -1235,7 +1235,7 @@ void mac128_state::macse(machine_config &config)
m_scsihelp->cpu_halt_callback().set_inputline(m_maincpu, INPUT_LINE_HALT);
m_scsihelp->timeout_error_callback().set(FUNC(mac128_state::scsi_berr_w));
subdevice<nscsi_connector>("scsibus:7")->set_option_machine_config("ncr5380", [this](device_t *device) {
subdevice<nscsi_connector>("scsi:7")->set_option_machine_config("ncr5380", [this](device_t *device) {
ncr5380_device &adapter = downcast<ncr5380_device &>(*device);
adapter.irq_handler().set(*this, FUNC(mac128_state::scsi_irq_w));
adapter.drq_handler().set(m_scsihelp, FUNC(mac_scsi_helper_device::drq_w));
@ -1284,10 +1284,10 @@ void mac128_state::macclasc(machine_config &config)
{
macsefd(config);
config.device_remove("pds");
config.device_remove("sepds");
// config.device_remove("pds");
// config.device_remove("sepds");
NSCSI_CONNECTOR(config.replace(), "scsibus:7").option_set("ncr5380", NCR53C80).machine_config([this](device_t *device) {
NSCSI_CONNECTOR(config.replace(), "scsi:7").option_set("ncr5380", NCR53C80).machine_config([this](device_t *device) {
ncr5380_device &adapter = downcast<ncr5380_device &>(*device);
adapter.irq_handler().set(*this, FUNC(mac128_state::scsi_irq_w));
adapter.drq_handler().set(m_scsihelp, FUNC(mac_scsi_helper_device::drq_w));

21
src/mame/apple/macquadra700.cpp
View File

@ -69,8 +69,8 @@ public:
m_ram(*this, RAM_TAG),
m_swim(*this, "fdc"),
m_floppy(*this, "fdc:%d", 0U),
m_scsibus1(*this, "scsi1"),
m_ncr1(*this, "scsi1:7:ncr53c96"),
m_scsibus1(*this, "scsi"),
m_ncr1(*this, "scsi:7:ncr53c96"),
m_sonic(*this, "sonic"),
m_dafb(*this, "dafb"),
m_easc(*this, "easc"),
@ -770,17 +770,17 @@ void eclipse_state::via2_out_b_q900(u8 data)
// SCSI bus and devices
NSCSI_BUS(config, m_scsibus1);
NSCSI_CONNECTOR(config, "scsi1:0", mac_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi1:1", mac_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi1:2", mac_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi1:3").option_set("cdrom", NSCSI_CDROM_APPLE).machine_config([](device_t *device)
NSCSI_CONNECTOR(config, "scsi:0", mac_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi:1", mac_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi:2", mac_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi:3").option_set("cdrom", NSCSI_CDROM_APPLE).machine_config([](device_t *device)
{
device->subdevice<cdda_device>("cdda")->add_route(0, "^^lspeaker", 1.0);
device->subdevice<cdda_device>("cdda")->add_route(1, "^^rspeaker", 1.0); });
NSCSI_CONNECTOR(config, "scsi1:4", mac_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi1:5", mac_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi1:6", mac_scsi_devices, "harddisk");
NSCSI_CONNECTOR(config, "scsi1:7").option_set("ncr53c96", NCR53C96).clock(50_MHz_XTAL / 2).machine_config([this](device_t *device)
NSCSI_CONNECTOR(config, "scsi:4", mac_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi:5", mac_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi:6", mac_scsi_devices, "harddisk");
NSCSI_CONNECTOR(config, "scsi:7").option_set("ncr53c96", NCR53C96).clock(50_MHz_XTAL / 2).machine_config([this](device_t *device)
{
ncr53c96_device &adapter = downcast<ncr53c96_device &>(*device);
@ -830,6 +830,7 @@ void eclipse_state::via2_out_b_q900(u8 data)
SOFTWARE_LIST(config, "hdd_list").set_original("mac_hdd");
SOFTWARE_LIST(config, "cd_list").set_original("mac_cdrom").set_filter("MC68040");
SOFTWARE_LIST(config, "cd_apple_dev").set_original("apple_devcd");
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");