From 10be60357aa39ddd381b5d807d463ef4787deeba Mon Sep 17 00:00:00 2001 From: AJR Date: Tue, 7 Jan 2025 20:47:31 -0500 Subject: microsoft/jazz.cpp: Revert SCSI controller to 53C94 type due to flaws in 53CF94 emulation --- src/mame/microsoft/jazz.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/mame/microsoft/jazz.cpp b/src/mame/microsoft/jazz.cpp index 77d39e64019..e133cb8e1cb 100644 --- a/src/mame/microsoft/jazz.cpp +++ b/src/mame/microsoft/jazz.cpp @@ -155,7 +155,7 @@ protected: required_device m_vram; required_device m_mct_adr; required_device m_scsibus; - required_device m_scsi; + required_device m_scsi; required_device m_fdc; required_device m_rtc; required_device m_nvram; @@ -220,7 +220,7 @@ void jazz_state::mct_map(address_map &map) map(0x80000000, 0x80000fff).m(m_mct_adr, FUNC(mct_adr_device::map)); map(0x80001000, 0x800010ff).m(m_net, FUNC(dp83932c_device::map)).umask32(0x0000ffff); - map(0x80002000, 0x8000200f).m(m_scsi, FUNC(ncr53cf94_device::map)); + map(0x80002000, 0x8000200f).m(m_scsi, FUNC(ncr53c94_device::map)); map(0x80003000, 0x8000300f).m(m_fdc, FUNC(n82077aa_device::map)); // LE: only reads 4000 @@ -310,16 +310,17 @@ void jazz_state::jazz(machine_config &config) NSCSI_CONNECTOR(config, "scsi:6", jazz_scsi_devices, "cdrom"); // scsi host adapter - NSCSI_CONNECTOR(config, "scsi:7").option_set("ncr53cf94", NCR53CF94).clock(24_MHz_XTAL).machine_config( + // FIXME: refuses to POST with correct NCR53CF94 device + NSCSI_CONNECTOR(config, "scsi:7").option_set("ncr53cf94", NCR53C94).clock(24_MHz_XTAL).machine_config( [this] (device_t *device) { - ncr53cf94_device &adapter = downcast(*device); + ncr53c94_device &adapter = downcast(*device); adapter.irq_handler_cb().set(m_mct_adr, FUNC(mct_adr_device::irq<5>)); adapter.drq_handler_cb().set(m_mct_adr, FUNC(mct_adr_device::drq<0>)); - subdevice(":mct_adr")->dma_r_cb<0>().set(adapter, FUNC(ncr53cf94_device::dma_r)); - subdevice(":mct_adr")->dma_w_cb<0>().set(adapter, FUNC(ncr53cf94_device::dma_w)); + subdevice(":mct_adr")->dma_r_cb<0>().set(adapter, FUNC(ncr53c94_device::dma_r)); + subdevice(":mct_adr")->dma_w_cb<0>().set(adapter, FUNC(ncr53c94_device::dma_w)); }); // floppy controller and drive -- cgit v1.2.3