diff options
author | 2016-01-16 12:24:11 +0100 | |
---|---|---|
committer | 2016-01-16 14:54:42 +0100 | |
commit | 1f90ceab075c4869298e963bf0a14a0aac2f1caa (patch) | |
tree | 49984b30e3c6da6a0be068dbfcd02882bdafdc08 /src/devices/bus/scsi | |
parent | 34161178c431b018cba0d0286951c69aee80e968 (diff) |
tags are now strings (nw)
fix start project for custom builds in Visual Studio (nw)
Diffstat (limited to 'src/devices/bus/scsi')
-rw-r--r-- | src/devices/bus/scsi/acb4070.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/scsi/acb4070.h | 2 | ||||
-rw-r--r-- | src/devices/bus/scsi/cdu76s.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/scsi/cdu76s.h | 2 | ||||
-rw-r--r-- | src/devices/bus/scsi/d9060hd.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/scsi/d9060hd.h | 2 | ||||
-rw-r--r-- | src/devices/bus/scsi/omti5100.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/scsi/omti5100.h | 2 | ||||
-rw-r--r-- | src/devices/bus/scsi/pc9801_sasi.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/scsi/pc9801_sasi.h | 2 | ||||
-rw-r--r-- | src/devices/bus/scsi/s1410.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/scsi/s1410.h | 2 | ||||
-rw-r--r-- | src/devices/bus/scsi/sa1403d.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/scsi/sa1403d.h | 2 | ||||
-rw-r--r-- | src/devices/bus/scsi/scsi.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/scsi/scsi.h | 4 | ||||
-rw-r--r-- | src/devices/bus/scsi/scsicd.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/scsi/scsicd.h | 4 | ||||
-rw-r--r-- | src/devices/bus/scsi/scsihd.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/scsi/scsihd.h | 4 | ||||
-rw-r--r-- | src/devices/bus/scsi/scsihle.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/scsi/scsihle.h | 2 |
22 files changed, 29 insertions, 29 deletions
diff --git a/src/devices/bus/scsi/acb4070.cpp b/src/devices/bus/scsi/acb4070.cpp index 1503272b55c..34c96e9d2ef 100644 --- a/src/devices/bus/scsi/acb4070.cpp +++ b/src/devices/bus/scsi/acb4070.cpp @@ -10,7 +10,7 @@ // device type definition const device_type ACB4070 = &device_creator<acb4070_device>; -acb4070_device::acb4070_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +acb4070_device::acb4070_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scsihd_device(mconfig, ACB4070, "ACB4070", tag, owner, clock, "acb4070", __FILE__) { } diff --git a/src/devices/bus/scsi/acb4070.h b/src/devices/bus/scsi/acb4070.h index ea9b1583c28..85d1fd4b296 100644 --- a/src/devices/bus/scsi/acb4070.h +++ b/src/devices/bus/scsi/acb4070.h @@ -11,7 +11,7 @@ class acb4070_device : public scsihd_device { public: // construction/destruction - acb4070_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + acb4070_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void ExecCommand() override; virtual void WriteData( UINT8 *data, int dataLength ) override; diff --git a/src/devices/bus/scsi/cdu76s.cpp b/src/devices/bus/scsi/cdu76s.cpp index bb6a70390ed..3eaf2b4c82a 100644 --- a/src/devices/bus/scsi/cdu76s.cpp +++ b/src/devices/bus/scsi/cdu76s.cpp @@ -41,7 +41,7 @@ void sony_cdu76s_device::ReadData( UINT8 *data, int dataLength ) // device type definition const device_type CDU76S = &device_creator<sony_cdu76s_device>; -sony_cdu76s_device::sony_cdu76s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sony_cdu76s_device::sony_cdu76s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scsicd_device(mconfig, CDU76S, "Sony CDU-76S", tag, owner, clock, "cdu76s", __FILE__) { } diff --git a/src/devices/bus/scsi/cdu76s.h b/src/devices/bus/scsi/cdu76s.h index d10a23c1246..5818c7da68a 100644 --- a/src/devices/bus/scsi/cdu76s.h +++ b/src/devices/bus/scsi/cdu76s.h @@ -19,7 +19,7 @@ class sony_cdu76s_device : public scsicd_device { public: - sony_cdu76s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sony_cdu76s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void ExecCommand() override; virtual void ReadData( UINT8 *data, int dataLength ) override; diff --git a/src/devices/bus/scsi/d9060hd.cpp b/src/devices/bus/scsi/d9060hd.cpp index 3d212582a39..de1dbe14bb0 100644 --- a/src/devices/bus/scsi/d9060hd.cpp +++ b/src/devices/bus/scsi/d9060hd.cpp @@ -10,7 +10,7 @@ // device type definition const device_type D9060HD = &device_creator<d9060hd_device>; -d9060hd_device::d9060hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +d9060hd_device::d9060hd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scsihd_device(mconfig, D9060HD, "D9060HD", tag, owner, clock, "d9060hd", __FILE__) { } diff --git a/src/devices/bus/scsi/d9060hd.h b/src/devices/bus/scsi/d9060hd.h index 2daed5e40af..c3460e9279e 100644 --- a/src/devices/bus/scsi/d9060hd.h +++ b/src/devices/bus/scsi/d9060hd.h @@ -11,7 +11,7 @@ class d9060hd_device : public scsihd_device { public: // construction/destruction - d9060hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + d9060hd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void ExecCommand() override; }; diff --git a/src/devices/bus/scsi/omti5100.cpp b/src/devices/bus/scsi/omti5100.cpp index 9dd436f4acb..82601f71e05 100644 --- a/src/devices/bus/scsi/omti5100.cpp +++ b/src/devices/bus/scsi/omti5100.cpp @@ -23,7 +23,7 @@ const rom_entry *omti5100_device::device_rom_region() const } #endif -omti5100_device::omti5100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +omti5100_device::omti5100_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scsihd_device(mconfig, OMTI5100, "OMTI 5100", tag, owner, clock, "omti5100", __FILE__), m_image0(*this, "image0"), m_image1(*this, "image1") diff --git a/src/devices/bus/scsi/omti5100.h b/src/devices/bus/scsi/omti5100.h index 63ac7b8a4dc..a1854c837b9 100644 --- a/src/devices/bus/scsi/omti5100.h +++ b/src/devices/bus/scsi/omti5100.h @@ -11,7 +11,7 @@ class omti5100_device : public scsihd_device { public: - omti5100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + omti5100_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; //virtual const rom_entry *device_rom_region() const; diff --git a/src/devices/bus/scsi/pc9801_sasi.cpp b/src/devices/bus/scsi/pc9801_sasi.cpp index 619f9f074da..688c2f48495 100644 --- a/src/devices/bus/scsi/pc9801_sasi.cpp +++ b/src/devices/bus/scsi/pc9801_sasi.cpp @@ -6,7 +6,7 @@ const device_type PC9801_SASI = &device_creator<pc9801_sasi_device>; -pc9801_sasi_device::pc9801_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +pc9801_sasi_device::pc9801_sasi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scsihd_device(mconfig, PC9801_SASI, "PC-9801 SASI Controller", tag, owner, clock, "pc9801_sasi", __FILE__) { } diff --git a/src/devices/bus/scsi/pc9801_sasi.h b/src/devices/bus/scsi/pc9801_sasi.h index b3e5816573d..f82e29b5c7e 100644 --- a/src/devices/bus/scsi/pc9801_sasi.h +++ b/src/devices/bus/scsi/pc9801_sasi.h @@ -9,7 +9,7 @@ class pc9801_sasi_device : public scsihd_device { public: // construction/destruction - pc9801_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pc9801_sasi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); virtual void ExecCommand() override; }; diff --git a/src/devices/bus/scsi/s1410.cpp b/src/devices/bus/scsi/s1410.cpp index 59b964ce4f2..f9400d662fc 100644 --- a/src/devices/bus/scsi/s1410.cpp +++ b/src/devices/bus/scsi/s1410.cpp @@ -192,7 +192,7 @@ machine_config_constructor s1410_device::device_mconfig_additions() const // s1410_device - constructor //------------------------------------------------- -s1410_device::s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +s1410_device::s1410_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scsihd_device(mconfig, S1410, "Xebec S1410", tag, owner, clock, "s1410", __FILE__) { } diff --git a/src/devices/bus/scsi/s1410.h b/src/devices/bus/scsi/s1410.h index 519c013b066..222f6c5b836 100644 --- a/src/devices/bus/scsi/s1410.h +++ b/src/devices/bus/scsi/s1410.h @@ -17,7 +17,7 @@ class s1410_device : public scsihd_device { public: // construction/destruction - s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + s1410_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/scsi/sa1403d.cpp b/src/devices/bus/scsi/sa1403d.cpp index 1abe47e0805..f320f1dd1e1 100644 --- a/src/devices/bus/scsi/sa1403d.cpp +++ b/src/devices/bus/scsi/sa1403d.cpp @@ -122,7 +122,7 @@ ioport_constructor sa1403d_device::device_input_ports() const // sa1403d_device - constructor //------------------------------------------------- -sa1403d_device::sa1403d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +sa1403d_device::sa1403d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scsihd_device(mconfig, SA1403D, "Shugart SA1403D", tag, owner, clock, "sa1403d", __FILE__) { } diff --git a/src/devices/bus/scsi/sa1403d.h b/src/devices/bus/scsi/sa1403d.h index 308be3b5b48..5c1ba288d61 100644 --- a/src/devices/bus/scsi/sa1403d.h +++ b/src/devices/bus/scsi/sa1403d.h @@ -18,7 +18,7 @@ class sa1403d_device : public scsihd_device { public: // construction/destruction - sa1403d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sa1403d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/scsi/scsi.cpp b/src/devices/bus/scsi/scsi.cpp index 118e2d58114..505ab78e228 100644 --- a/src/devices/bus/scsi/scsi.cpp +++ b/src/devices/bus/scsi/scsi.cpp @@ -3,7 +3,7 @@ #include "scsi.h" -SCSI_PORT_DEVICE::SCSI_PORT_DEVICE(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +SCSI_PORT_DEVICE::SCSI_PORT_DEVICE(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SCSI_PORT, "SCSI Port", tag, owner, clock, "scsi", __FILE__), m_bsy_handler(*this), m_sel_handler(*this), @@ -666,7 +666,7 @@ WRITE_LINE_MEMBER( SCSI_PORT_DEVICE::write_data7 ) const device_type SCSI_PORT = &device_creator<SCSI_PORT_DEVICE>; -SCSI_PORT_SLOT_device::SCSI_PORT_SLOT_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +SCSI_PORT_SLOT_device::SCSI_PORT_SLOT_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, SCSI_PORT_SLOT, "SCSI Connector", tag, owner, clock, "scsi_slot", __FILE__), device_slot_interface(mconfig, *this), m_dev(nullptr), diff --git a/src/devices/bus/scsi/scsi.h b/src/devices/bus/scsi/scsi.h index 19fec347f53..6995e14d741 100644 --- a/src/devices/bus/scsi/scsi.h +++ b/src/devices/bus/scsi/scsi.h @@ -99,7 +99,7 @@ class SCSI_PORT_DEVICE : public device_t public: // construction/destruction - SCSI_PORT_DEVICE(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + SCSI_PORT_DEVICE(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_bsy_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_bsy_handler.set_callback(object); } template<class _Object> static devcb_base &set_sel_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_sel_handler.set_callback(object); } @@ -229,7 +229,7 @@ class SCSI_PORT_SLOT_device : public device_t, friend class scsi_port_interface; public: - SCSI_PORT_SLOT_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + SCSI_PORT_SLOT_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); scsi_port_interface *dev() { return m_dev; } SCSI_PORT_DEVICE *port() { return m_port; } diff --git a/src/devices/bus/scsi/scsicd.cpp b/src/devices/bus/scsi/scsicd.cpp index 9ee7d92668f..89402bf2c5a 100644 --- a/src/devices/bus/scsi/scsicd.cpp +++ b/src/devices/bus/scsi/scsicd.cpp @@ -11,12 +11,12 @@ // device type definition const device_type SCSICD = &device_creator<scsicd_device>; -scsicd_device::scsicd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +scsicd_device::scsicd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scsihle_device(mconfig, SCSICD, "SCSI CD", tag, owner, clock, "scsicd", __FILE__) { } -scsicd_device::scsicd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +scsicd_device::scsicd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : scsihle_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/bus/scsi/scsicd.h b/src/devices/bus/scsi/scsicd.h index 3acfffe2ad6..34c457df7d1 100644 --- a/src/devices/bus/scsi/scsicd.h +++ b/src/devices/bus/scsi/scsicd.h @@ -17,8 +17,8 @@ class scsicd_device : public scsihle_device, { public: // construction/destruction - scsicd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - scsicd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + scsicd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + scsicd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual machine_config_constructor device_mconfig_additions() const override; protected: diff --git a/src/devices/bus/scsi/scsihd.cpp b/src/devices/bus/scsi/scsihd.cpp index 8774310d0b3..42e6c2d821f 100644 --- a/src/devices/bus/scsi/scsihd.cpp +++ b/src/devices/bus/scsi/scsihd.cpp @@ -11,12 +11,12 @@ // device type definition const device_type SCSIHD = &device_creator<scsihd_device>; -scsihd_device::scsihd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +scsihd_device::scsihd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : scsihle_device(mconfig, SCSIHD, "SCSI HD", tag, owner, clock, "scsihd", __FILE__) { } -scsihd_device::scsihd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +scsihd_device::scsihd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : scsihle_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/bus/scsi/scsihd.h b/src/devices/bus/scsi/scsihd.h index 41b535a15b1..645706090b5 100644 --- a/src/devices/bus/scsi/scsihd.h +++ b/src/devices/bus/scsi/scsihd.h @@ -17,8 +17,8 @@ class scsihd_device : public scsihle_device, { public: // construction/destruction - scsihd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - scsihd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + scsihd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + scsihd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual machine_config_constructor device_mconfig_additions() const override; protected: diff --git a/src/devices/bus/scsi/scsihle.cpp b/src/devices/bus/scsi/scsihle.cpp index e14d875881f..44e4e087f29 100644 --- a/src/devices/bus/scsi/scsihle.cpp +++ b/src/devices/bus/scsi/scsihle.cpp @@ -10,7 +10,7 @@ Base class for HLE'd SCSI devices. #include "scsihle.h" -scsihle_device::scsihle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +scsihle_device::scsihle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), scsi_port_interface(mconfig, *this), m_scsi_id(*this, "SCSI_ID"), @@ -133,7 +133,7 @@ static const char *const phasenames[] = void scsihle_device::data_out(UINT8 data) { -// printf( "%s data out %02x\n", tag(), data ); +// printf( "%s data out %02x\n", tag().c_str(), data ); output_data0(BIT(data, 0)); output_data1(BIT(data, 1)); output_data2(BIT(data, 2)); diff --git a/src/devices/bus/scsi/scsihle.h b/src/devices/bus/scsi/scsihle.h index 4963210726c..1308b606b01 100644 --- a/src/devices/bus/scsi/scsihle.h +++ b/src/devices/bus/scsi/scsihle.h @@ -22,7 +22,7 @@ class scsihle_device : public device_t, { public: // construction/destruction - scsihle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + scsihle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual int GetDeviceID(); // hack for legacy_scsi_host_adapter::get_device |