summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess/machine
diff options
context:
space:
mode:
author smf- <smf-@users.noreply.github.com>2012-09-06 07:34:28 +0000
committer smf- <smf-@users.noreply.github.com>2012-09-06 07:34:28 +0000
commit24f0842e1b61067972740d0365f017d01fac405d (patch)
tree5df852c3964444df1916d1807b83b6d058e9b66d /src/mess/machine
parenta50849088e1406403ffdef0c15b97e74923c3bee (diff)
Split out callbacks from scsibus_device into scscb_device, eventually this will be a SCSI device. SCSIBus_interface is no longer required and has been removed. [smf]
Diffstat (limited to 'src/mess/machine')
-rw-r--r--src/mess/machine/a2scsi.c6
-rw-r--r--src/mess/machine/abc_hdc.c10
-rw-r--r--src/mess/machine/abc_hdc.h2
-rw-r--r--src/mess/machine/abc_xebec.c10
-rw-r--r--src/mess/machine/abc_xebec.h2
-rw-r--r--src/mess/machine/d9060.c10
-rw-r--r--src/mess/machine/e01.c12
-rw-r--r--src/mess/machine/lux4105.c14
-rw-r--r--src/mess/machine/x68k_scsiext.c6
9 files changed, 37 insertions, 35 deletions
diff --git a/src/mess/machine/a2scsi.c b/src/mess/machine/a2scsi.c
index 171f15dc487..2609be4ce99 100644
--- a/src/mess/machine/a2scsi.c
+++ b/src/mess/machine/a2scsi.c
@@ -36,17 +36,13 @@ const device_type A2BUS_SCSI = &device_creator<a2bus_scsi_device>;
#define SCSI_ROM_REGION "scsi_rom"
#define SCSI_5380_TAG "scsi:ncr5380"
-static const SCSIBus_interface scsibus_intf =
-{
-};
-
static const struct NCR5380interface a2scsi_5380_intf =
{
NULL // IRQ handler (unconnected according to schematic)
};
MACHINE_CONFIG_FRAGMENT( scsi )
- MCFG_SCSIBUS_ADD("scsi", scsibus_intf)
+ MCFG_SCSIBUS_ADD("scsi")
MCFG_NCR5380_ADD(SCSI_5380_TAG, (XTAL_28_63636MHz/4), a2scsi_5380_intf)
MACHINE_CONFIG_END
diff --git a/src/mess/machine/abc_hdc.c b/src/mess/machine/abc_hdc.c
index a155d0e1129..b87ed3808b4 100644
--- a/src/mess/machine/abc_hdc.c
+++ b/src/mess/machine/abc_hdc.c
@@ -8,6 +8,9 @@
*********************************************************************/
#include "abc_hdc.h"
+#include "machine/scsibus.h"
+#include "machine/scsicb.h"
+#include "machine/scsihd.h"
@@ -85,10 +88,10 @@ static const z80_daisy_config daisy_chain[] =
//-------------------------------------------------
-// SCSIBus_interface sasi_intf
+// SCSICB_interface sasi_intf
//-------------------------------------------------
-static const SCSIBus_interface sasi_intf =
+static const SCSICB_interface sasi_intf =
{
NULL,
DEVCB_NULL,
@@ -111,8 +114,9 @@ static MACHINE_CONFIG_FRAGMENT( abc_hdc )
MCFG_CPU_IO_MAP(abc_hdc_io)
MCFG_CPU_CONFIG(daisy_chain)
- MCFG_SCSIBUS_ADD(SASIBUS_TAG, sasi_intf)
+ MCFG_SCSIBUS_ADD(SASIBUS_TAG)
MCFG_SCSIDEV_ADD(SASIBUS_TAG ":harddisk0", SCSIHD, SCSI_ID_0)
+ MCFG_SCSICB_ADD(SASIBUS_TAG ":host", sasi_intf)
MACHINE_CONFIG_END
diff --git a/src/mess/machine/abc_hdc.h b/src/mess/machine/abc_hdc.h
index 191a273744e..0bdd3e06c62 100644
--- a/src/mess/machine/abc_hdc.h
+++ b/src/mess/machine/abc_hdc.h
@@ -17,8 +17,6 @@
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/abcbus.h"
-#include "machine/scsibus.h"
-#include "machine/scsihd.h"
diff --git a/src/mess/machine/abc_xebec.c b/src/mess/machine/abc_xebec.c
index 39396c5b9ba..53e385a050a 100644
--- a/src/mess/machine/abc_xebec.c
+++ b/src/mess/machine/abc_xebec.c
@@ -8,6 +8,9 @@
*********************************************************************/
#include "abc_xebec.h"
+#include "machine/scsibus.h"
+#include "machine/scsicb.h"
+#include "machine/scsihd.h"
@@ -78,10 +81,10 @@ static const z80_daisy_config daisy_chain[] =
//-------------------------------------------------
-// SCSIBus_interface sasi_intf
+// SCSICB_interface sasi_intf
//-------------------------------------------------
-static const SCSIBus_interface sasi_intf =
+static const SCSICB_interface sasi_intf =
{
NULL,
DEVCB_NULL,
@@ -104,8 +107,9 @@ static MACHINE_CONFIG_FRAGMENT( abc_xebec )
MCFG_CPU_IO_MAP(abc_xebec_io)
MCFG_CPU_CONFIG(daisy_chain)
- MCFG_SCSIBUS_ADD(SASIBUS_TAG, sasi_intf)
+ MCFG_SCSIBUS_ADD(SASIBUS_TAG)
MCFG_SCSIDEV_ADD(SASIBUS_TAG ":harddisk0", SCSIHD, SCSI_ID_0)
+ MCFG_SCSICB_ADD(SASIBUS_TAG ":host", sasi_intf)
MACHINE_CONFIG_END
diff --git a/src/mess/machine/abc_xebec.h b/src/mess/machine/abc_xebec.h
index 793ddbb4e72..4d5457729a0 100644
--- a/src/mess/machine/abc_xebec.h
+++ b/src/mess/machine/abc_xebec.h
@@ -17,8 +17,6 @@
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/abcbus.h"
-#include "machine/scsibus.h"
-#include "machine/scsihd.h"
diff --git a/src/mess/machine/d9060.c b/src/mess/machine/d9060.c
index 5f16324d94b..e251e3ae196 100644
--- a/src/mess/machine/d9060.c
+++ b/src/mess/machine/d9060.c
@@ -8,6 +8,7 @@
**********************************************************************/
#include "d9060.h"
+#include "machine/scsicb.h"
#include "machine/d9060hd.h"
@@ -136,7 +137,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
-// SCSIBus_interface sasi_intf
+// SCSICB_interface sasi_intf
//-------------------------------------------------
WRITE_LINE_MEMBER( base_d9060_device::req_w )
@@ -144,7 +145,7 @@ WRITE_LINE_MEMBER( base_d9060_device::req_w )
m_via->write_ca1(!state);
}
-static const SCSIBus_interface sasi_intf =
+static const SCSICB_interface sasi_intf =
{
NULL,
DEVCB_NULL,
@@ -152,7 +153,7 @@ static const SCSIBus_interface sasi_intf =
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
- DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, base_d9060_device, req_w),
+ DEVCB_DEVICE_LINE_MEMBER("^^", base_d9060_device, req_w),
DEVCB_NULL
};
@@ -459,8 +460,9 @@ static MACHINE_CONFIG_FRAGMENT( d9060 )
MCFG_VIA6522_ADD(M6522_TAG, XTAL_4MHz/4, via_intf)
- MCFG_SCSIBUS_ADD(SASIBUS_TAG, sasi_intf)
+ MCFG_SCSIBUS_ADD(SASIBUS_TAG)
MCFG_SCSIDEV_ADD(SASIBUS_TAG ":harddisk0", D9060HD, SCSI_ID_0)
+ MCFG_SCSICB_ADD(SASIBUS_TAG ":host", sasi_intf)
MACHINE_CONFIG_END
diff --git a/src/mess/machine/e01.c b/src/mess/machine/e01.c
index c414bcf00d9..2cac1732a7e 100644
--- a/src/mess/machine/e01.c
+++ b/src/mess/machine/e01.c
@@ -54,6 +54,7 @@
*/
#include "e01.h"
+#include "machine/scsicb.h"
#include "machine/scsihd.h"
@@ -259,7 +260,7 @@ static const wd17xx_interface fdc_intf =
//-------------------------------------------------
-// SCSIBus_interface scsi_intf
+// SCSICB_interface scsi_intf
//-------------------------------------------------
WRITE_LINE_MEMBER( e01_device::scsi_bsy_w )
@@ -281,15 +282,15 @@ WRITE_LINE_MEMBER( e01_device::scsi_req_w )
update_interrupts();
}
-static const SCSIBus_interface scsi_intf =
+static const SCSICB_interface scsi_intf =
{
NULL,
- DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, e01_device, scsi_bsy_w),
+ DEVCB_DEVICE_LINE_MEMBER("^^", e01_device, scsi_bsy_w),
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
- DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, e01_device, scsi_req_w),
+ DEVCB_DEVICE_LINE_MEMBER("^^", e01_device, scsi_req_w),
DEVCB_NULL
};
@@ -347,8 +348,9 @@ static MACHINE_CONFIG_FRAGMENT( e01 )
MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(e01_floppy_interface)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, e01_centronics_intf)
- MCFG_SCSIBUS_ADD(SCSIBUS_TAG, scsi_intf)
+ MCFG_SCSIBUS_ADD(SCSIBUS_TAG)
MCFG_SCSIDEV_ADD(SCSIBUS_TAG ":harddisk0", SCSIHD, SCSI_ID_0)
+ MCFG_SCSICB_ADD(SCSIBUS_TAG ":host", scsi_intf)
// internal ram
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mess/machine/lux4105.c b/src/mess/machine/lux4105.c
index b8c65ea5fa4..287fa3985e5 100644
--- a/src/mess/machine/lux4105.c
+++ b/src/mess/machine/lux4105.c
@@ -8,6 +8,7 @@
*********************************************************************/
#include "lux4105.h"
+#include "machine/scsicb.h"
#include "machine/scsihd.h"
#include "machine/s1410.h"
@@ -29,7 +30,7 @@ const device_type LUXOR_4105 = &device_creator<luxor_4105_device>;
//-------------------------------------------------
-// SCSIBus_interface sasi_intf
+// SCSICB_interface sasi_intf
//-------------------------------------------------
WRITE_LINE_MEMBER( luxor_4105_device::sasi_bsy_w )
@@ -62,15 +63,15 @@ WRITE_LINE_MEMBER( luxor_4105_device::sasi_req_w )
update_trrq_int();
}
-static const SCSIBus_interface sasi_intf =
+static const SCSICB_interface sasi_intf =
{
NULL,
- DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, luxor_4105_device, sasi_bsy_w),
+ DEVCB_DEVICE_LINE_MEMBER("^^", luxor_4105_device, sasi_bsy_w),
DEVCB_NULL,
DEVCB_NULL,
- DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, luxor_4105_device, sasi_io_w),
+ DEVCB_DEVICE_LINE_MEMBER("^^", luxor_4105_device, sasi_io_w),
DEVCB_NULL,
- DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, luxor_4105_device, sasi_req_w),
+ DEVCB_DEVICE_LINE_MEMBER("^^", luxor_4105_device, sasi_req_w),
DEVCB_NULL
};
@@ -80,8 +81,9 @@ static const SCSIBus_interface sasi_intf =
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( luxor_4105 )
- MCFG_SCSIBUS_ADD(SASIBUS_TAG, sasi_intf)
+ MCFG_SCSIBUS_ADD(SASIBUS_TAG)
MCFG_SCSIDEV_ADD(SASIBUS_TAG ":harddisk0", S1410, SCSI_ID_0)
+ MCFG_SCSICB_ADD(SASIBUS_TAG ":host", sasi_intf)
MACHINE_CONFIG_END
diff --git a/src/mess/machine/x68k_scsiext.c b/src/mess/machine/x68k_scsiext.c
index 516ed13bb92..4627592dcc8 100644
--- a/src/mess/machine/x68k_scsiext.c
+++ b/src/mess/machine/x68k_scsiext.c
@@ -18,10 +18,6 @@
const device_type X68K_SCSIEXT = &device_creator<x68k_scsiext_device>;
-static const SCSIBus_interface scsibus_intf =
-{
-};
-
static const mb89352_interface mb89352_intf =
{
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER,x68k_scsiext_device,irq_w),
@@ -44,7 +40,7 @@ const rom_entry *x68k_scsiext_device::device_rom_region() const
// device machine config
static MACHINE_CONFIG_FRAGMENT( x68k_scsiext )
- MCFG_SCSIBUS_ADD("scsi", scsibus_intf)
+ MCFG_SCSIBUS_ADD("scsi")
MCFG_SCSIDEV_ADD("scsi:harddisk0", SCSIHD, SCSI_ID_0)
MCFG_SCSIDEV_ADD("scsi:harddisk1", SCSIHD, SCSI_ID_1)
MCFG_SCSIDEV_ADD("scsi:harddisk2", SCSIHD, SCSI_ID_2)