summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/scsi
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-10-22 13:13:17 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-10-22 13:13:17 +0200
commitddb290d5f615019c33c42b8d94e5a5254cabcf33 (patch)
treea70f688b0df3acd19da7b1151e5902e3c6af3fa5 /src/devices/bus/scsi
parent333bff8de64dfaeb98134000412796b4fdef970b (diff)
NOTICE (TYPE NAME CONSOLIDATION)
Use standard uint64_t, uint32_t, uint16_t or uint8_t instead of UINT64, UINT32, UINT16 or UINT8 also use standard int64_t, int32_t, int16_t or int8_t instead of INT64, INT32, INT16 or INT8
Diffstat (limited to 'src/devices/bus/scsi')
-rw-r--r--src/devices/bus/scsi/acb4070.cpp4
-rw-r--r--src/devices/bus/scsi/acb4070.h32
-rw-r--r--src/devices/bus/scsi/cdu76s.cpp4
-rw-r--r--src/devices/bus/scsi/cdu76s.h4
-rw-r--r--src/devices/bus/scsi/d9060hd.cpp2
-rw-r--r--src/devices/bus/scsi/d9060hd.h2
-rw-r--r--src/devices/bus/scsi/omti5100.cpp8
-rw-r--r--src/devices/bus/scsi/omti5100.h6
-rw-r--r--src/devices/bus/scsi/pc9801_sasi.cpp2
-rw-r--r--src/devices/bus/scsi/pc9801_sasi.h2
-rw-r--r--src/devices/bus/scsi/s1410.cpp14
-rw-r--r--src/devices/bus/scsi/s1410.h6
-rw-r--r--src/devices/bus/scsi/sa1403d.cpp4
-rw-r--r--src/devices/bus/scsi/sa1403d.h4
-rw-r--r--src/devices/bus/scsi/scsi.cpp4
-rw-r--r--src/devices/bus/scsi/scsi.h4
-rw-r--r--src/devices/bus/scsi/scsicd.cpp4
-rw-r--r--src/devices/bus/scsi/scsicd.h4
-rw-r--r--src/devices/bus/scsi/scsihd.cpp4
-rw-r--r--src/devices/bus/scsi/scsihd.h4
-rw-r--r--src/devices/bus/scsi/scsihle.cpp12
-rw-r--r--src/devices/bus/scsi/scsihle.h22
22 files changed, 76 insertions, 76 deletions
diff --git a/src/devices/bus/scsi/acb4070.cpp b/src/devices/bus/scsi/acb4070.cpp
index 1503272b55c..695b9527842 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, const char *tag, device_t *owner, uint32_t clock)
: scsihd_device(mconfig, ACB4070, "ACB4070", tag, owner, clock, "acb4070", __FILE__)
{
}
@@ -48,7 +48,7 @@ void acb4070_device::ExecCommand()
}
}
-void acb4070_device::WriteData( UINT8 *data, int dataLength )
+void acb4070_device::WriteData( uint8_t *data, int dataLength )
{
switch( command[ 0 ] )
{
diff --git a/src/devices/bus/scsi/acb4070.h b/src/devices/bus/scsi/acb4070.h
index ea9b1583c28..b983aad0477 100644
--- a/src/devices/bus/scsi/acb4070.h
+++ b/src/devices/bus/scsi/acb4070.h
@@ -11,33 +11,33 @@ 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, const char *tag, device_t *owner, uint32_t clock);
virtual void ExecCommand() override;
- virtual void WriteData( UINT8 *data, int dataLength ) override;
+ virtual void WriteData( uint8_t *data, int dataLength ) override;
private:
struct adaptec_sense_t
{
// parameter list
- UINT8 reserved1[3];
- UINT8 length;
+ uint8_t reserved1[3];
+ uint8_t length;
// descriptor list
- UINT8 density;
- UINT8 reserved2[4];
- UINT8 block_size[3];
+ uint8_t density;
+ uint8_t reserved2[4];
+ uint8_t block_size[3];
// drive parameter list
- UINT8 format_code;
- UINT8 cylinder_count[2];
- UINT8 head_count;
- UINT8 reduced_write[2];
- UINT8 write_precomp[2];
- UINT8 landing_zone;
- UINT8 step_pulse_code;
- UINT8 bit_flags;
- UINT8 sectors_per_track;
+ uint8_t format_code;
+ uint8_t cylinder_count[2];
+ uint8_t head_count;
+ uint8_t reduced_write[2];
+ uint8_t write_precomp[2];
+ uint8_t landing_zone;
+ uint8_t step_pulse_code;
+ uint8_t bit_flags;
+ uint8_t sectors_per_track;
};
};
diff --git a/src/devices/bus/scsi/cdu76s.cpp b/src/devices/bus/scsi/cdu76s.cpp
index bb6a70390ed..b9256135b87 100644
--- a/src/devices/bus/scsi/cdu76s.cpp
+++ b/src/devices/bus/scsi/cdu76s.cpp
@@ -15,7 +15,7 @@ void sony_cdu76s_device::ExecCommand()
}
}
-void sony_cdu76s_device::ReadData( UINT8 *data, int dataLength )
+void sony_cdu76s_device::ReadData( uint8_t *data, int dataLength )
{
switch ( command[0] )
{
@@ -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, const char *tag, device_t *owner, uint32_t 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..0449254b958 100644
--- a/src/devices/bus/scsi/cdu76s.h
+++ b/src/devices/bus/scsi/cdu76s.h
@@ -19,10 +19,10 @@
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, const char *tag, device_t *owner, uint32_t clock);
virtual void ExecCommand() override;
- virtual void ReadData( UINT8 *data, int dataLength ) override;
+ virtual void ReadData( uint8_t *data, int dataLength ) override;
};
// device type definition
diff --git a/src/devices/bus/scsi/d9060hd.cpp b/src/devices/bus/scsi/d9060hd.cpp
index 3d212582a39..4ea264030eb 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, const char *tag, device_t *owner, uint32_t 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..979538a0b14 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, const char *tag, device_t *owner, uint32_t clock);
virtual void ExecCommand() override;
};
diff --git a/src/devices/bus/scsi/omti5100.cpp b/src/devices/bus/scsi/omti5100.cpp
index de40a68c32c..614f48a11a2 100644
--- a/src/devices/bus/scsi/omti5100.cpp
+++ b/src/devices/bus/scsi/omti5100.cpp
@@ -23,7 +23,7 @@ const tiny_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, const char *tag, device_t *owner, uint32_t clock)
: scsihd_device(mconfig, OMTI5100, "OMTI 5100", tag, owner, clock, "omti5100", __FILE__),
m_image0(*this, "image0"),
m_image1(*this, "image1")
@@ -95,7 +95,7 @@ void omti5100_device::ExecCommand()
int track = ((command[1]&0x1f)<<16 | command[2]<<8 | command[3]) / m_param[drive].sectors;
if(((track % m_param[drive].heads) <= info->heads) && (track < (info->cylinders * m_param[drive].heads)))
{
- std::vector<UINT8> sector(info->sectorbytes);
+ std::vector<uint8_t> sector(info->sectorbytes);
memset(&sector[0], 0xe5, info->sectorbytes);
m_phase = SCSI_PHASE_STATUS;
m_status_code = SCSI_STATUS_CODE_GOOD;
@@ -119,7 +119,7 @@ void omti5100_device::ExecCommand()
}
}
-void omti5100_device::ReadData( UINT8 *data, int dataLength )
+void omti5100_device::ReadData( uint8_t *data, int dataLength )
{
switch( command[ 0 ] )
{
@@ -136,7 +136,7 @@ void omti5100_device::ReadData( UINT8 *data, int dataLength )
}
}
-void omti5100_device::WriteData( UINT8 *data, int dataLength )
+void omti5100_device::WriteData( uint8_t *data, int dataLength )
{
switch( command[ 0 ] )
{
diff --git a/src/devices/bus/scsi/omti5100.h b/src/devices/bus/scsi/omti5100.h
index 63ac7b8a4dc..6d13f0f9bad 100644
--- a/src/devices/bus/scsi/omti5100.h
+++ b/src/devices/bus/scsi/omti5100.h
@@ -11,14 +11,14 @@
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, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
//virtual const rom_entry *device_rom_region() const;
virtual void ExecCommand() override;
- virtual void ReadData( UINT8 *data, int dataLength ) override;
- virtual void WriteData( UINT8 *data, int dataLength ) override;
+ virtual void ReadData( uint8_t *data, int dataLength ) override;
+ virtual void WriteData( uint8_t *data, int dataLength ) override;
void device_start() override;
private:
diff --git a/src/devices/bus/scsi/pc9801_sasi.cpp b/src/devices/bus/scsi/pc9801_sasi.cpp
index 619f9f074da..7fdbdd699c8 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, const char *tag, device_t *owner, uint32_t 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..1cbd9eb72af 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, const char *tag, device_t *owner, uint32_t clock);
virtual void ExecCommand() override;
};
diff --git a/src/devices/bus/scsi/s1410.cpp b/src/devices/bus/scsi/s1410.cpp
index b26b9b5aef7..d4d8ff84d29 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, const char *tag, device_t *owner, uint32_t clock)
: scsihd_device(mconfig, S1410, "Xebec S1410", tag, owner, clock, "s1410", __FILE__)
{
}
@@ -256,7 +256,7 @@ void s1410_device::ExecCommand()
if ((m_disk) && (m_blocks))
{
- std::vector<UINT8> data(m_sector_bytes);
+ std::vector<uint8_t> data(m_sector_bytes);
memset(&data[0], 0xc6, m_sector_bytes);
while (m_blocks > 0)
@@ -314,7 +314,7 @@ void s1410_device::ExecCommand()
}
}
-void s1410_device::WriteData( UINT8 *data, int dataLength )
+void s1410_device::WriteData( uint8_t *data, int dataLength )
{
switch( command[ 0 ] )
{
@@ -333,9 +333,9 @@ void s1410_device::WriteData( UINT8 *data, int dataLength )
break;
}
- UINT16 tracks = ((data[0]<<8)+data[1]);
- UINT8 heads = data[2];
- UINT32 capacity = tracks * heads * sectorsPerTrack * m_sector_bytes;
+ uint16_t tracks = ((data[0]<<8)+data[1]);
+ uint8_t heads = data[2];
+ uint32_t capacity = tracks * heads * sectorsPerTrack * m_sector_bytes;
logerror("S1410_CMD_INIT_DRIVE_PARAMS Tracks=%d, Heads=%d, Capacity=%d\n",tracks,heads,capacity);
}
@@ -347,7 +347,7 @@ void s1410_device::WriteData( UINT8 *data, int dataLength )
}
}
-void s1410_device::ReadData( UINT8 *data, int dataLength )
+void s1410_device::ReadData( uint8_t *data, int dataLength )
{
switch( command[ 0 ] )
{
diff --git a/src/devices/bus/scsi/s1410.h b/src/devices/bus/scsi/s1410.h
index c17d6e349ed..d76686529bf 100644
--- a/src/devices/bus/scsi/s1410.h
+++ b/src/devices/bus/scsi/s1410.h
@@ -17,15 +17,15 @@ 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, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
virtual machine_config_constructor device_mconfig_additions() const override;
virtual void ExecCommand() override;
- virtual void WriteData( UINT8 *data, int dataLength ) override;
- virtual void ReadData( UINT8 *data, int dataLength ) override;
+ virtual void WriteData( uint8_t *data, int dataLength ) override;
+ virtual void ReadData( uint8_t *data, int dataLength ) override;
};
diff --git a/src/devices/bus/scsi/sa1403d.cpp b/src/devices/bus/scsi/sa1403d.cpp
index 1e8e3a512cf..21f086b4218 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, const char *tag, device_t *owner, uint32_t clock)
: scsihd_device(mconfig, SA1403D, "Shugart SA1403D", tag, owner, clock, "sa1403d", __FILE__)
{
}
@@ -137,7 +137,7 @@ void sa1403d_device::ExecCommand()
}
}
-void sa1403d_device::WriteData( UINT8 *data, int dataLength )
+void sa1403d_device::WriteData( uint8_t *data, int dataLength )
{
switch( command[ 0 ] )
{
diff --git a/src/devices/bus/scsi/sa1403d.h b/src/devices/bus/scsi/sa1403d.h
index 3241b0aa782..3299527a8f8 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, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -26,7 +26,7 @@ public:
virtual ioport_constructor device_input_ports() const override;
virtual void ExecCommand() override;
- virtual void WriteData( UINT8 *data, int dataLength ) override;
+ virtual void WriteData( uint8_t *data, int dataLength ) override;
};
diff --git a/src/devices/bus/scsi/scsi.cpp b/src/devices/bus/scsi/scsi.cpp
index 118e2d58114..3df52a5d53d 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, const char *tag, device_t *owner, uint32_t 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, const char *tag, device_t *owner, uint32_t 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..81dfea08959 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, const char *tag, device_t *owner, uint32_t 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, const char *tag, device_t *owner, uint32_t 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..2f0cccef1e5 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, const char *tag, device_t *owner, uint32_t 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, const char *tag, device_t *owner, uint32_t 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..c7c2f377e50 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, const char *tag, device_t *owner, uint32_t clock);
+ scsicd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t 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..a822327ca92 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, const char *tag, device_t *owner, uint32_t 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, const char *tag, device_t *owner, uint32_t 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..1a312a79216 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, const char *tag, device_t *owner, uint32_t clock);
+ scsihd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t 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..96c89506444 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, const char *tag, device_t *owner, uint32_t 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"),
@@ -131,7 +131,7 @@ static const char *const phasenames[] =
#define LOG(level, ...) if(LOGLEVEL>=level) logerror(__VA_ARGS__)
-void scsihle_device::data_out(UINT8 data)
+void scsihle_device::data_out(uint8_t data)
{
// printf( "%s data out %02x\n", tag(), data );
output_data0(BIT(data, 0));
@@ -144,12 +144,12 @@ void scsihle_device::data_out(UINT8 data)
output_data7(BIT(data, 7));
}
-void scsihle_device::scsi_out_req_delay(UINT8 state)
+void scsihle_device::scsi_out_req_delay(uint8_t state)
{
req_timer->adjust(attotime::from_nsec(REQ_DELAY_NS),state);
}
-void scsihle_device::dump_bytes(UINT8 *buff, int count)
+void scsihle_device::dump_bytes(uint8_t *buff, int count)
{
int byteno;
@@ -317,7 +317,7 @@ void scsihle_device::scsibus_exec_command()
scsibus_read_data();
}
-UINT8 scsihle_device::scsibus_driveno(UINT8 drivesel)
+uint8_t scsihle_device::scsibus_driveno(uint8_t drivesel)
{
switch (drivesel)
{
@@ -333,7 +333,7 @@ UINT8 scsihle_device::scsibus_driveno(UINT8 drivesel)
}
}
-void scsihle_device::scsi_change_phase(UINT8 newphase)
+void scsihle_device::scsi_change_phase(uint8_t newphase)
{
LOG(1,"scsi_change_phase() from=%s, to=%s\n",phasenames[m_phase],phasenames[newphase]);
diff --git a/src/devices/bus/scsi/scsihle.h b/src/devices/bus/scsi/scsihle.h
index 4963210726c..72537d3b3b0 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, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual int GetDeviceID(); // hack for legacy_scsi_host_adapter::get_device
@@ -47,32 +47,32 @@ protected:
private:
required_ioport m_scsi_id;
- void data_out(UINT8 data);
- void scsi_out_req_delay(UINT8 state);
- void scsi_change_phase(UINT8 newphase);
+ void data_out(uint8_t data);
+ void scsi_out_req_delay(uint8_t state);
+ void scsi_change_phase(uint8_t newphase);
int get_scsi_cmd_len(int cbyte);
- UINT8 scsibus_driveno(UINT8 drivesel);
+ uint8_t scsibus_driveno(uint8_t drivesel);
void scsibus_read_data();
void scsibus_write_data();
void scsibus_exec_command();
void dump_command_bytes();
void dump_data_bytes(int count);
- void dump_bytes(UINT8 *buff, int count);
+ void dump_bytes(uint8_t *buff, int count);
emu_timer *req_timer;
emu_timer *sel_timer;
emu_timer *dataout_timer;
- UINT8 cmd_idx;
- UINT8 is_linked;
+ uint8_t cmd_idx;
+ uint8_t is_linked;
- UINT8 buffer[ 1024 ];
- UINT16 data_idx;
+ uint8_t buffer[ 1024 ];
+ uint16_t data_idx;
int bytes_left;
int data_last;
int scsiID;
- UINT8 m_input_data;
+ uint8_t m_input_data;
};
extern const input_device_default DEVICE_INPUT_DEFAULTS_NAME(SCSI_ID_0)[];