summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2021-05-08 13:01:38 -0400
committer AJR <ajrhacker@users.noreply.github.com>2021-05-08 13:02:41 -0400
commit7ed1de96c98facd20f49ab7122f66b24884ebe4d (patch)
tree0601096faeba824a1ba518ffb1925b2a740f739c /src/mame/includes
parent173a0cf3b6d5dd7d8b3fd06da9c1f332bdf7f83f (diff)
mac.cpp, mac128.cpp, macprtb.cpp, macpwrbk030.cpp, macquadra.cpp: Add helper device to permit use of "new" SCSI bus and 53(C)80 emulation with macse and laterHEADmaster
Diffstat (limited to 'src/mame/includes')
-rw-r--r--src/mame/includes/mac.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/mame/includes/mac.h b/src/mame/includes/mac.h
index 05dd48a6f5f..4ab3bddd2ec 100644
--- a/src/mame/includes/mac.h
+++ b/src/mame/includes/mac.h
@@ -14,6 +14,8 @@
#include "machine/8530scc.h"
#include "machine/6522via.h"
+#include "machine/ncr5380n.h"
+#include "machine/nscsi_bus.h"
#include "machine/ram.h"
#include "machine/timer.h"
#include "machine/egret.h"
@@ -22,8 +24,8 @@
#include "bus/nubus/nubus.h"
#include "bus/macpds/macpds.h"
#include "machine/applefdintf.h"
-#include "machine/ncr5380.h"
#include "machine/macrtc.h"
+#include "machine/macscsi.h"
#include "sound/asc.h"
#include "sound/dac.h"
#include "cpu/m68000/m68000.h"
@@ -59,7 +61,8 @@ public:
m_macadb(*this, "macadb"),
m_ram(*this, RAM_TAG),
m_scc(*this, "scc"),
- m_ncr5380(*this, "ncr5380"),
+ m_ncr5380(*this, "scsi:7:ncr5380"),
+ m_scsihelp(*this, "scsihelp"),
m_fdc(*this, "fdc"),
m_floppy(*this, "fdc:%d", 0U),
m_rtc(*this, "rtc"),
@@ -196,7 +199,8 @@ private:
optional_device<macadb_device> m_macadb;
required_device<ram_device> m_ram;
required_device<scc8530_legacy_device> m_scc;
- optional_device<ncr5380_device> m_ncr5380;
+ required_device<ncr53c80_device> m_ncr5380;
+ required_device<mac_scsi_helper_device> m_scsihelp;
required_device<applefdintf_device> m_fdc;
required_device_array<floppy_connector, 2> m_floppy;
optional_device<rtc3430042_device> m_rtc;
@@ -286,6 +290,7 @@ private:
void macii_scsi_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
uint32_t macii_scsi_drq_r(offs_t offset, uint32_t mem_mask = ~0);
void macii_scsi_drq_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void scsi_berr_w(uint8_t data);
uint32_t rbv_ramdac_r();
void rbv_ramdac_w(offs_t offset, uint32_t data);