diff options
author | 2023-08-21 20:16:33 -0400 | |
---|---|---|
committer | 2023-08-21 20:16:33 -0400 | |
commit | 3017f4ca8d2f31cc59be7d8b1567ff14d9727b39 (patch) | |
tree | b514b7101f74c866a90bf0a593e630f49fca2250 /src/mame/apple/macii.cpp | |
parent | 8d450606ba3d951db677c4aaa98d54ddeb4100ab (diff) |
bus/nscsi/cd.cpp: Improved the correctness of the Apple CD-ROM command set, including working audio commands. [R. Belmont]
bus/a2bus/a2scsi.cpp, apple/mac*.cpp: Added audio routing for the CD-ROM. Also moved Mac CD drives to SCSI ID 3 to match tradition. [R. Belmont]
Diffstat (limited to 'src/mame/apple/macii.cpp')
-rw-r--r-- | src/mame/apple/macii.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mame/apple/macii.cpp b/src/mame/apple/macii.cpp index 903c8594bc6..78a79e5ab2a 100644 --- a/src/mame/apple/macii.cpp +++ b/src/mame/apple/macii.cpp @@ -21,6 +21,7 @@ #include "macscsi.h" #include "mactoolbox.h" +#include "bus/nscsi/cd.h" #include "bus/nscsi/devices.h" #include "bus/macpds/macpds.h" #include "bus/nubus/nubus.h" @@ -1068,8 +1069,11 @@ void mac_state::macii(machine_config &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", mac_scsi_devices, nullptr); - NSCSI_CONNECTOR(config, "scsi:4", mac_scsi_devices, "cdrom"); + 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, "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", NCR53C80).machine_config([this](device_t *device) |