summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/cbmiec
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/cbmiec
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/cbmiec')
-rw-r--r--src/devices/bus/cbmiec/c1526.cpp6
-rw-r--r--src/devices/bus/cbmiec/c1526.h6
-rw-r--r--src/devices/bus/cbmiec/c1541.cpp36
-rw-r--r--src/devices/bus/cbmiec/c1541.h28
-rw-r--r--src/devices/bus/cbmiec/c1571.cpp24
-rw-r--r--src/devices/bus/cbmiec/c1571.h12
-rw-r--r--src/devices/bus/cbmiec/c1581.cpp10
-rw-r--r--src/devices/bus/cbmiec/c1581.h6
-rw-r--r--src/devices/bus/cbmiec/c64_nl10.cpp2
-rw-r--r--src/devices/bus/cbmiec/c64_nl10.h2
-rw-r--r--src/devices/bus/cbmiec/cbmiec.cpp4
-rw-r--r--src/devices/bus/cbmiec/cbmiec.h4
-rw-r--r--src/devices/bus/cbmiec/cmdhd.cpp2
-rw-r--r--src/devices/bus/cbmiec/cmdhd.h2
-rw-r--r--src/devices/bus/cbmiec/diag264_lb_iec.cpp2
-rw-r--r--src/devices/bus/cbmiec/diag264_lb_iec.h2
-rw-r--r--src/devices/bus/cbmiec/fd2000.cpp8
-rw-r--r--src/devices/bus/cbmiec/fd2000.h6
-rw-r--r--src/devices/bus/cbmiec/interpod.cpp2
-rw-r--r--src/devices/bus/cbmiec/interpod.h2
-rw-r--r--src/devices/bus/cbmiec/serialbox.cpp2
-rw-r--r--src/devices/bus/cbmiec/serialbox.h2
-rw-r--r--src/devices/bus/cbmiec/vic1515.cpp2
-rw-r--r--src/devices/bus/cbmiec/vic1515.h2
-rw-r--r--src/devices/bus/cbmiec/vic1520.cpp2
-rw-r--r--src/devices/bus/cbmiec/vic1520.h2
26 files changed, 89 insertions, 89 deletions
diff --git a/src/devices/bus/cbmiec/c1526.cpp b/src/devices/bus/cbmiec/c1526.cpp
index b9f240fde45..d33b9d026c2 100644
--- a/src/devices/bus/cbmiec/c1526.cpp
+++ b/src/devices/bus/cbmiec/c1526.cpp
@@ -170,7 +170,7 @@ ioport_constructor c4023_t::device_input_ports() const
// c1526_base_t - constructor
//-------------------------------------------------
-c1526_base_t:: c1526_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+c1526_base_t:: c1526_base_t(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)
{
}
@@ -180,7 +180,7 @@ c1526_base_t:: c1526_base_t(const machine_config &mconfig, device_type type, con
// c1526_t - constructor
//-------------------------------------------------
-c1526_t::c1526_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c1526_t::c1526_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
c1526_base_t(mconfig, C1526, "MPS802/C1526 Printer", tag, owner, clock, "c1526", __FILE__),
device_cbm_iec_interface(mconfig, *this)
{
@@ -191,7 +191,7 @@ c1526_t::c1526_t(const machine_config &mconfig, const char *tag, device_t *owner
// c4023_t - constructor
//-------------------------------------------------
-c4023_t::c4023_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c4023_t::c4023_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
c1526_base_t(mconfig, C4023, "C4023 Printer", tag, owner, clock, "c4023", __FILE__),
device_ieee488_interface(mconfig, *this)
{
diff --git a/src/devices/bus/cbmiec/c1526.h b/src/devices/bus/cbmiec/c1526.h
index d8ab0567905..c3a127c4580 100644
--- a/src/devices/bus/cbmiec/c1526.h
+++ b/src/devices/bus/cbmiec/c1526.h
@@ -28,7 +28,7 @@ class c1526_base_t : public device_t
{
public:
// construction/destruction
- c1526_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ c1526_base_t(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);
protected:
// device-level overrides
@@ -44,7 +44,7 @@ class c1526_t : public c1526_base_t,
{
public:
// construction/destruction
- c1526_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1526_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -66,7 +66,7 @@ class c4023_t : public c1526_base_t,
{
public:
// construction/destruction
- c4023_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c4023_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp
index 3a763c1f53e..c5c2aaa2741 100644
--- a/src/devices/bus/cbmiec/c1541.cpp
+++ b/src/devices/bus/cbmiec/c1541.cpp
@@ -590,7 +590,7 @@ READ8_MEMBER( c1541_base_t::via0_pb_r )
*/
- UINT8 data;
+ uint8_t data;
// data in
data = !m_bus->data_r() && !m_ga->atn_r();
@@ -687,7 +687,7 @@ READ8_MEMBER( c1541_base_t::via1_pb_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// write protect sense
data |= !m_floppy->wpt_r() << 4;
@@ -999,7 +999,7 @@ inline void c1541_base_t::set_iec_data()
// c1541_base_t - constructor
//-------------------------------------------------
-c1541_base_t:: c1541_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+c1541_base_t:: c1541_base_t(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),
device_cbm_iec_interface(mconfig, *this),
device_c64_floppy_parallel_interface(mconfig, *this),
@@ -1020,7 +1020,7 @@ c1541_base_t:: c1541_base_t(const machine_config &mconfig, device_type type, con
// c1540_t - constructor
//-------------------------------------------------
-c1540_t::c1540_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1540_t::c1540_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, C1540, "C1540", tag, owner, clock, "c1540", __FILE__) { }
@@ -1028,7 +1028,7 @@ c1540_t::c1540_t(const machine_config &mconfig, const char *tag, device_t *owner
// c1541_t - constructor
//-------------------------------------------------
-c1541_t::c1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1541_t::c1541_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, C1541, "C1541", tag, owner, clock, "c1541", __FILE__) { }
@@ -1036,7 +1036,7 @@ c1541_t::c1541_t(const machine_config &mconfig, const char *tag, device_t *owner
// c1541c_t - constructor
//-------------------------------------------------
-c1541c_t::c1541c_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1541c_t::c1541c_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, C1541C, "C1541C", tag, owner, clock, "c1541c", __FILE__) { }
@@ -1044,7 +1044,7 @@ c1541c_t::c1541c_t(const machine_config &mconfig, const char *tag, device_t *own
// c1541ii_t - constructor
//-------------------------------------------------
-c1541ii_t::c1541ii_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1541ii_t::c1541ii_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, C1541II, "C1541-II", tag, owner, clock, "c1541ii", __FILE__) { }
@@ -1052,7 +1052,7 @@ c1541ii_t::c1541ii_t(const machine_config &mconfig, const char *tag, device_t *o
// sx1541_t - constructor
//-------------------------------------------------
-sx1541_t::sx1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sx1541_t::sx1541_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, SX1541, "SX1541", tag, owner, clock, "sx1541", __FILE__) { }
@@ -1060,7 +1060,7 @@ sx1541_t::sx1541_t(const machine_config &mconfig, const char *tag, device_t *own
// fsd1_t - constructor
//-------------------------------------------------
-fsd1_t::fsd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fsd1_t::fsd1_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, FSD1, "FSD-1", tag, owner, clock, "fsd1", __FILE__) { }
@@ -1068,7 +1068,7 @@ fsd1_t::fsd1_t(const machine_config &mconfig, const char *tag, device_t *owner,
// fsd2_t - constructor
//-------------------------------------------------
-fsd2_t::fsd2_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fsd2_t::fsd2_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, FSD2, "FSD-2", tag, owner, clock, "fsd2", __FILE__) { }
@@ -1076,7 +1076,7 @@ fsd2_t::fsd2_t(const machine_config &mconfig, const char *tag, device_t *owner,
// csd1_t - constructor
//-------------------------------------------------
-csd1_t::csd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+csd1_t::csd1_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, CSD1, "CSD-1", tag, owner, clock, "csd1", __FILE__) { }
@@ -1084,7 +1084,7 @@ csd1_t::csd1_t(const machine_config &mconfig, const char *tag, device_t *owner,
// c1541_dolphin_dos_t - constructor
//-------------------------------------------------
-c1541_dolphin_dos_t::c1541_dolphin_dos_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1541_dolphin_dos_t::c1541_dolphin_dos_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, C1541_DOLPHIN_DOS, "C1541 Dolphin-DOS 2.0", tag, owner, clock, "c1541dd", __FILE__) { }
@@ -1092,7 +1092,7 @@ c1541_dolphin_dos_t::c1541_dolphin_dos_t(const machine_config &mconfig, const ch
// c1541_professional_dos_v1_t - constructor
//-------------------------------------------------
-c1541_professional_dos_v1_t::c1541_professional_dos_v1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1541_professional_dos_v1_t::c1541_professional_dos_v1_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, C1541_PROFESSIONAL_DOS_V1, "C1541 Professional-DOS v1", tag, owner, clock, "c1541pd", __FILE__) { }
@@ -1100,7 +1100,7 @@ c1541_professional_dos_v1_t::c1541_professional_dos_v1_t(const machine_config &m
// c1541_prologic_dos_classic_t - constructor
//-------------------------------------------------
-c1541_prologic_dos_classic_t::c1541_prologic_dos_classic_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1541_prologic_dos_classic_t::c1541_prologic_dos_classic_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, C1541_PROLOGIC_DOS_CLASSIC, "C1541 ProLogic-DOS Classic", tag, owner, clock, "c1541pdc", __FILE__),
m_pia(*this, MC6821_TAG),
m_cent_data_out(*this, "cent_data_out"),
@@ -1113,7 +1113,7 @@ c1541_prologic_dos_classic_t::c1541_prologic_dos_classic_t(const machine_config
// indus_gt_t - constructor
//-------------------------------------------------
-indus_gt_t::indus_gt_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+indus_gt_t::indus_gt_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, INDUS_GT, "Indus GT", tag, owner, clock, "indusgt", __FILE__) { }
@@ -1137,11 +1137,11 @@ void fsd2_t::device_start()
c1541_base_t::device_start();
// decrypt ROM
- UINT8 *rom = memregion(M6502_TAG)->base();
+ uint8_t *rom = memregion(M6502_TAG)->base();
for (offs_t offset = 0; offset < 0x4000; offset++)
{
- UINT8 data = BITSWAP8(rom[offset], 7, 6, 5, 3, 4, 2, 1, 0);
+ uint8_t data = BITSWAP8(rom[offset], 7, 6, 5, 3, 4, 2, 1, 0);
rom[offset] = data;
}
@@ -1195,7 +1195,7 @@ void c1541_base_t::cbm_iec_reset(int state)
// parallel_data_w -
//-------------------------------------------------
-void c1541_base_t::parallel_data_w(UINT8 data)
+void c1541_base_t::parallel_data_w(uint8_t data)
{
m_parallel_data = data;
}
diff --git a/src/devices/bus/cbmiec/c1541.h b/src/devices/bus/cbmiec/c1541.h
index 7192089e65a..a2ca5a9fed5 100644
--- a/src/devices/bus/cbmiec/c1541.h
+++ b/src/devices/bus/cbmiec/c1541.h
@@ -42,7 +42,7 @@ class c1541_base_t : public device_t,
{
public:
// construction/destruction
- c1541_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ c1541_base_t(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);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -72,7 +72,7 @@ protected:
virtual void cbm_iec_reset(int state) override;
// device_c64_floppy_parallel_interface overrides
- virtual void parallel_data_w(UINT8 data) override;
+ virtual void parallel_data_w(uint8_t data) override;
virtual void parallel_strobe_w(int state) override;
enum
@@ -105,7 +105,7 @@ class c1540_t : public c1541_base_t
{
public:
// construction/destruction
- c1540_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1540_t(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;
@@ -118,7 +118,7 @@ class c1541_t : public c1541_base_t
{
public:
// construction/destruction
- c1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1541_t(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;
@@ -131,7 +131,7 @@ class c1541c_t : public c1541_base_t
{
public:
// construction/destruction
- c1541c_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1541c_t(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;
@@ -148,7 +148,7 @@ class c1541ii_t : public c1541_base_t
{
public:
// construction/destruction
- c1541ii_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1541ii_t(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;
@@ -161,7 +161,7 @@ class sx1541_t : public c1541_base_t
{
public:
// construction/destruction
- sx1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sx1541_t(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;
@@ -174,7 +174,7 @@ class fsd1_t : public c1541_base_t
{
public:
// construction/destruction
- fsd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fsd1_t(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;
@@ -187,7 +187,7 @@ class fsd2_t : public c1541_base_t
{
public:
// construction/destruction
- fsd2_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fsd2_t(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;
@@ -203,7 +203,7 @@ class csd1_t : public c1541_base_t
{
public:
// construction/destruction
- csd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ csd1_t(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;
@@ -216,7 +216,7 @@ class c1541_dolphin_dos_t : public c1541_base_t
{
public:
// construction/destruction
- c1541_dolphin_dos_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1541_dolphin_dos_t(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;
@@ -230,7 +230,7 @@ class c1541_professional_dos_v1_t : public c1541_base_t
{
public:
// construction/destruction
- c1541_professional_dos_v1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1541_professional_dos_v1_t(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;
@@ -244,7 +244,7 @@ class c1541_prologic_dos_classic_t : public c1541_base_t
{
public:
// construction/destruction
- c1541_prologic_dos_classic_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1541_prologic_dos_classic_t(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;
@@ -274,7 +274,7 @@ class indus_gt_t : public c1541_base_t
{
public:
// construction/destruction
- indus_gt_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ indus_gt_t(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;
diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp
index b7d98b8b15d..e0118b1b868 100644
--- a/src/devices/bus/cbmiec/c1571.cpp
+++ b/src/devices/bus/cbmiec/c1571.cpp
@@ -193,7 +193,7 @@ READ8_MEMBER( c1571_t::via0_pa_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// track 0 sense
data |= (m_floppy->trk00_r() ? 0x01 : 0x00);
@@ -232,7 +232,7 @@ WRITE8_MEMBER( c1571_t::via0_pa_w )
if (m_1_2mhz != clock_1_2)
{
- UINT32 clock = clock_1_2 ? XTAL_16MHz/8 : XTAL_16MHz/16;
+ uint32_t clock = clock_1_2 ? XTAL_16MHz/8 : XTAL_16MHz/16;
m_maincpu->set_unscaled_clock(clock);
m_cia->set_unscaled_clock(clock);
@@ -274,7 +274,7 @@ WRITE8_MEMBER( c1571cr_t::via0_pa_w )
if (m_1_2mhz != clock_1_2)
{
- UINT32 clock = clock_1_2 ? XTAL_16MHz/8 : XTAL_16MHz/16;
+ uint32_t clock = clock_1_2 ? XTAL_16MHz/8 : XTAL_16MHz/16;
m_maincpu->set_unscaled_clock(clock);
m_cia->set_unscaled_clock(clock);
@@ -303,7 +303,7 @@ READ8_MEMBER( c1571_t::via0_pb_r )
*/
- UINT8 data;
+ uint8_t data;
// data in
data = !m_bus->data_r();
@@ -381,7 +381,7 @@ WRITE8_MEMBER( c1571cr_t::via0_pb_w )
READ8_MEMBER( c1571_t::via1_r )
{
- UINT8 data = m_via1->read(space, offset);
+ uint8_t data = m_via1->read(space, offset);
m_ga->ted_w(!m_1_2mhz);
m_ga->ted_w(1);
@@ -421,7 +421,7 @@ READ8_MEMBER( c1571_t::via1_pb_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// write protect sense
data |= !m_floppy->wpt_r() << 4;
@@ -830,7 +830,7 @@ ioport_constructor c1571_t::device_input_ports() const
// c1571_t - constructor
//-------------------------------------------------
-c1571_t::c1571_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+c1571_t::c1571_t(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),
device_cbm_iec_interface(mconfig, *this),
device_c64_floppy_parallel_interface(mconfig, *this),
@@ -853,7 +853,7 @@ c1571_t::c1571_t(const machine_config &mconfig, device_type type, const char *na
{
}
-c1571_t::c1571_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1571_t::c1571_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, C1571, "C1571", tag, owner, clock, "c1571", __FILE__),
device_cbm_iec_interface(mconfig, *this),
device_c64_floppy_parallel_interface(mconfig, *this),
@@ -881,7 +881,7 @@ c1571_t::c1571_t(const machine_config &mconfig, const char *tag, device_t *owner
// c1570_t - constructor
//-------------------------------------------------
-c1570_t::c1570_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1570_t::c1570_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1571_t(mconfig, C1570, "C1570", tag, owner, clock, "c1570", __FILE__)
{
}
@@ -891,7 +891,7 @@ c1570_t::c1570_t(const machine_config &mconfig, const char *tag, device_t *owner
// c1571cr_t - constructor
//-------------------------------------------------
-c1571cr_t::c1571cr_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1571cr_t::c1571cr_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1571_t(mconfig, C1571CR, "C1571CR", tag, owner, clock, "c1571cr", __FILE__)
{
}
@@ -901,7 +901,7 @@ c1571cr_t::c1571cr_t(const machine_config &mconfig, const char *tag, device_t *o
// mini_chief_t - constructor
//-------------------------------------------------
-mini_chief_t::mini_chief_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mini_chief_t::mini_chief_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1571_t(mconfig, MINI_CHIEF, "ICT Mini Chief", tag, owner, clock, "minichif", __FILE__)
{
}
@@ -999,7 +999,7 @@ void c1571_t::cbm_iec_reset(int state)
// parallel_data_w -
//-------------------------------------------------
-void c1571_t::parallel_data_w(UINT8 data)
+void c1571_t::parallel_data_w(uint8_t data)
{
m_parallel_data = data;
}
diff --git a/src/devices/bus/cbmiec/c1571.h b/src/devices/bus/cbmiec/c1571.h
index 74d90080615..64635542f4d 100644
--- a/src/devices/bus/cbmiec/c1571.h
+++ b/src/devices/bus/cbmiec/c1571.h
@@ -44,8 +44,8 @@ class c1571_t : public device_t,
{
public:
// construction/destruction
- c1571_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- c1571_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1571_t(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);
+ c1571_t(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;
@@ -89,7 +89,7 @@ protected:
virtual void cbm_iec_reset(int state) override;
// device_c64_floppy_parallel_interface overrides
- virtual void parallel_data_w(UINT8 data) override;
+ virtual void parallel_data_w(uint8_t data) override;
virtual void parallel_strobe_w(int state) override;
enum
@@ -131,7 +131,7 @@ class c1570_t : public c1571_t
{
public:
// construction/destruction
- c1570_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1570_t(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;
@@ -145,7 +145,7 @@ class c1571cr_t : public c1571_t
{
public:
// construction/destruction
- c1571cr_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1571cr_t(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;
@@ -162,7 +162,7 @@ class mini_chief_t : public c1571_t
{
public:
// construction/destruction
- mini_chief_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mini_chief_t(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;
diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp
index 1bfcad12218..005370fa3d8 100644
--- a/src/devices/bus/cbmiec/c1581.cpp
+++ b/src/devices/bus/cbmiec/c1581.cpp
@@ -131,7 +131,7 @@ READ8_MEMBER( c1581_t::cia_pa_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// ready
//data |= !m_floppy->ready_r() << 1;
@@ -192,7 +192,7 @@ READ8_MEMBER( c1581_t::cia_pb_r )
*/
- UINT8 data;
+ uint8_t data;
// data in
data = !m_bus->data_r();
@@ -326,7 +326,7 @@ ioport_constructor c1581_t::device_input_ports() const
// c1581_t - constructor
//-------------------------------------------------
-c1581_t::c1581_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+c1581_t::c1581_t(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),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
@@ -342,7 +342,7 @@ c1581_t::c1581_t(const machine_config &mconfig, device_type type, const char *na
{
}
-c1581_t::c1581_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1581_t::c1581_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, C1581, "C1581", tag, owner, clock, "c1581", __FILE__),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
@@ -363,7 +363,7 @@ c1581_t::c1581_t(const machine_config &mconfig, const char *tag, device_t *owner
// c1563_t - constructor
//-------------------------------------------------
-c1563_t::c1563_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1563_t::c1563_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1581_t(mconfig, C1563, "C1563", tag, owner, clock, "c1563", __FILE__) { }
diff --git a/src/devices/bus/cbmiec/c1581.h b/src/devices/bus/cbmiec/c1581.h
index 0694bc77ab8..e09d0579ebf 100644
--- a/src/devices/bus/cbmiec/c1581.h
+++ b/src/devices/bus/cbmiec/c1581.h
@@ -39,8 +39,8 @@ class c1581_t : public device_t,
{
public:
// construction/destruction
- c1581_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- c1581_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1581_t(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);
+ c1581_t(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;
@@ -96,7 +96,7 @@ class c1563_t : public c1581_t
{
public:
// construction/destruction
- c1563_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1563_t(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;
diff --git a/src/devices/bus/cbmiec/c64_nl10.cpp b/src/devices/bus/cbmiec/c64_nl10.cpp
index 9ee058adf80..4b9e2afa033 100644
--- a/src/devices/bus/cbmiec/c64_nl10.cpp
+++ b/src/devices/bus/cbmiec/c64_nl10.cpp
@@ -46,7 +46,7 @@ const tiny_rom_entry *c64_nl10_interface_device::device_rom_region() const
// c64_nl10_interface_device - constructor
//-------------------------------------------------
-c64_nl10_interface_device::c64_nl10_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c64_nl10_interface_device::c64_nl10_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, C64_NL10_INTERFACE, "Star NL-10 C64 Interface Cartridge", tag, owner, clock, "c64_nl10", __FILE__),
device_cbm_iec_interface(mconfig, *this)
{
diff --git a/src/devices/bus/cbmiec/c64_nl10.h b/src/devices/bus/cbmiec/c64_nl10.h
index 99da4a2c141..556cb01d12d 100644
--- a/src/devices/bus/cbmiec/c64_nl10.h
+++ b/src/devices/bus/cbmiec/c64_nl10.h
@@ -27,7 +27,7 @@ class c64_nl10_interface_device : public device_t,
{
public:
// construction/destruction
- c64_nl10_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_nl10_interface_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;
diff --git a/src/devices/bus/cbmiec/cbmiec.cpp b/src/devices/bus/cbmiec/cbmiec.cpp
index 7e893614f3f..a9f47da877f 100644
--- a/src/devices/bus/cbmiec/cbmiec.cpp
+++ b/src/devices/bus/cbmiec/cbmiec.cpp
@@ -245,7 +245,7 @@ device_cbm_iec_interface::~device_cbm_iec_interface()
// cbm_iec_slot_device - constructor
//-------------------------------------------------
-cbm_iec_slot_device::cbm_iec_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cbm_iec_slot_device::cbm_iec_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CBM_IEC_SLOT, "CBM IEC slot", tag, owner, clock, "cbm_iec_slot", __FILE__),
device_slot_interface(mconfig, *this), m_address(0)
{
@@ -282,7 +282,7 @@ void cbm_iec_slot_device::device_start()
// cbm_iec_device - constructor
//-------------------------------------------------
-cbm_iec_device::cbm_iec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cbm_iec_device::cbm_iec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, CBM_IEC, "CBM IEC bus", tag, owner, clock, "cbm_iec", __FILE__),
m_write_srq(*this),
m_write_atn(*this),
diff --git a/src/devices/bus/cbmiec/cbmiec.h b/src/devices/bus/cbmiec/cbmiec.h
index 5be1ff5f818..8ba9b8b2f02 100644
--- a/src/devices/bus/cbmiec/cbmiec.h
+++ b/src/devices/bus/cbmiec/cbmiec.h
@@ -76,7 +76,7 @@ class cbm_iec_device : public device_t
{
public:
// construction/destruction
- cbm_iec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm_iec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _write> void set_srq_callback(_write wr) { m_write_srq.set_callback(wr); }
template<class _write> void set_atn_callback(_write wr) { m_write_atn.set_callback(wr); }
@@ -159,7 +159,7 @@ class cbm_iec_slot_device : public device_t,
{
public:
// construction/destruction
- cbm_iec_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm_iec_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void set_address(int address) { m_address = address; }
int get_address() { return m_address; }
diff --git a/src/devices/bus/cbmiec/cmdhd.cpp b/src/devices/bus/cbmiec/cmdhd.cpp
index ef26f7be706..5300b9ef859 100644
--- a/src/devices/bus/cbmiec/cmdhd.cpp
+++ b/src/devices/bus/cbmiec/cmdhd.cpp
@@ -108,7 +108,7 @@ machine_config_constructor cmd_hd_device::device_mconfig_additions() const
// cmd_hd_device - constructor
//-------------------------------------------------
-cmd_hd_device::cmd_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cmd_hd_device::cmd_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, CMD_HD, "HD", tag, owner, clock, "cmdhd", __FILE__),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
diff --git a/src/devices/bus/cbmiec/cmdhd.h b/src/devices/bus/cbmiec/cmdhd.h
index 9869531b05d..40a08021f12 100644
--- a/src/devices/bus/cbmiec/cmdhd.h
+++ b/src/devices/bus/cbmiec/cmdhd.h
@@ -40,7 +40,7 @@ class cmd_hd_device : public device_t,
{
public:
// construction/destruction
- cmd_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cmd_hd_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;
diff --git a/src/devices/bus/cbmiec/diag264_lb_iec.cpp b/src/devices/bus/cbmiec/diag264_lb_iec.cpp
index d9c2e5ed303..2fc5544dd7b 100644
--- a/src/devices/bus/cbmiec/diag264_lb_iec.cpp
+++ b/src/devices/bus/cbmiec/diag264_lb_iec.cpp
@@ -26,7 +26,7 @@ const device_type DIAG264_SERIAL_LOOPBACK = &device_creator<diag264_serial_loopb
// diag264_serial_loopback_device - constructor
//-------------------------------------------------
-diag264_serial_loopback_device::diag264_serial_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+diag264_serial_loopback_device::diag264_serial_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, DIAG264_SERIAL_LOOPBACK, "Diag264 Serial Loopback", tag, owner, clock, "diag264_serial_loopback", __FILE__),
device_cbm_iec_interface(mconfig, *this)
{
diff --git a/src/devices/bus/cbmiec/diag264_lb_iec.h b/src/devices/bus/cbmiec/diag264_lb_iec.h
index b76c1fc696e..f58b15e23fb 100644
--- a/src/devices/bus/cbmiec/diag264_lb_iec.h
+++ b/src/devices/bus/cbmiec/diag264_lb_iec.h
@@ -27,7 +27,7 @@ class diag264_serial_loopback_device : public device_t,
{
public:
// construction/destruction
- diag264_serial_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ diag264_serial_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp
index c9040a6c657..91d4e66b74d 100644
--- a/src/devices/bus/cbmiec/fd2000.cpp
+++ b/src/devices/bus/cbmiec/fd2000.cpp
@@ -168,7 +168,7 @@ READ8_MEMBER( fd2000_device::via_pb_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// FDC interrupt
data |= m_fdc->get_irq() << 7;
@@ -274,7 +274,7 @@ machine_config_constructor fd2000_device::device_mconfig_additions() const
// fd2000_device - constructor
//-------------------------------------------------
-fd2000_device::fd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fd2000_device::fd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, FD2000, "FD-2000", tag, owner, clock, "fd2000", __FILE__),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, G65SC02PI2_TAG),
@@ -284,7 +284,7 @@ fd2000_device::fd2000_device(const machine_config &mconfig, const char *tag, dev
{
}
-fd2000_device::fd2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+fd2000_device::fd2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, uint32_t variant, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, R65C02P4_TAG),
@@ -299,7 +299,7 @@ fd2000_device::fd2000_device(const machine_config &mconfig, device_type type, co
// fd4000_device - constructor
//-------------------------------------------------
-fd4000_device::fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fd4000_device::fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: fd2000_device(mconfig, FD4000, "FD-4000", tag, owner, clock, TYPE_FD4000, "fd4000", __FILE__ ) { }
diff --git a/src/devices/bus/cbmiec/fd2000.h b/src/devices/bus/cbmiec/fd2000.h
index 4a660cd218d..f5c0218ae62 100644
--- a/src/devices/bus/cbmiec/fd2000.h
+++ b/src/devices/bus/cbmiec/fd2000.h
@@ -39,8 +39,8 @@ class fd2000_device : public device_t,
{
public:
// construction/destruction
- fd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- fd2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ fd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ fd2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, uint32_t variant, const char *shortname, const char *source);
enum
{
@@ -84,7 +84,7 @@ class fd4000_device : public fd2000_device
{
public:
// construction/destruction
- fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
diff --git a/src/devices/bus/cbmiec/interpod.cpp b/src/devices/bus/cbmiec/interpod.cpp
index ebf1a6b3776..b109773722b 100644
--- a/src/devices/bus/cbmiec/interpod.cpp
+++ b/src/devices/bus/cbmiec/interpod.cpp
@@ -153,7 +153,7 @@ machine_config_constructor interpod_device::device_mconfig_additions() const
// interpod_device - constructor
//-------------------------------------------------
-interpod_device::interpod_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+interpod_device::interpod_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, INTERPOD, "Interpod", tag, owner, clock, "interpod", __FILE__),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, R6502_TAG),
diff --git a/src/devices/bus/cbmiec/interpod.h b/src/devices/bus/cbmiec/interpod.h
index 833bcd94a35..28fb987eac8 100644
--- a/src/devices/bus/cbmiec/interpod.h
+++ b/src/devices/bus/cbmiec/interpod.h
@@ -49,7 +49,7 @@ class interpod_device : public device_t,
{
public:
// construction/destruction
- interpod_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ interpod_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;
diff --git a/src/devices/bus/cbmiec/serialbox.cpp b/src/devices/bus/cbmiec/serialbox.cpp
index 617a4c3eded..8642eb5dbd9 100644
--- a/src/devices/bus/cbmiec/serialbox.cpp
+++ b/src/devices/bus/cbmiec/serialbox.cpp
@@ -93,7 +93,7 @@ machine_config_constructor serial_box_device::device_mconfig_additions() const
// serial_box_device - constructor
//-------------------------------------------------
-serial_box_device::serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+serial_box_device::serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SERIAL_BOX, "Serial Box", tag, owner, clock, "serbox", __FILE__),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG)
diff --git a/src/devices/bus/cbmiec/serialbox.h b/src/devices/bus/cbmiec/serialbox.h
index 090ebdfb091..550a501a2a7 100644
--- a/src/devices/bus/cbmiec/serialbox.h
+++ b/src/devices/bus/cbmiec/serialbox.h
@@ -36,7 +36,7 @@ class serial_box_device : public device_t,
{
public:
// construction/destruction
- serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ serial_box_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;
diff --git a/src/devices/bus/cbmiec/vic1515.cpp b/src/devices/bus/cbmiec/vic1515.cpp
index c1ab23f427a..e831ad7f8c3 100644
--- a/src/devices/bus/cbmiec/vic1515.cpp
+++ b/src/devices/bus/cbmiec/vic1515.cpp
@@ -108,7 +108,7 @@ ioport_constructor vic1515_t::device_input_ports() const
// vic1515_t - constructor
//-------------------------------------------------
-vic1515_t::vic1515_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vic1515_t::vic1515_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VIC1515, "VIC-1515", tag, owner, clock, "vic1515", __FILE__),
device_cbm_iec_interface(mconfig, *this)
{
diff --git a/src/devices/bus/cbmiec/vic1515.h b/src/devices/bus/cbmiec/vic1515.h
index 9cf6a53b3d1..998bb1de4f4 100644
--- a/src/devices/bus/cbmiec/vic1515.h
+++ b/src/devices/bus/cbmiec/vic1515.h
@@ -28,7 +28,7 @@ class vic1515_t : public device_t,
{
public:
// construction/destruction
- vic1515_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic1515_t(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;
diff --git a/src/devices/bus/cbmiec/vic1520.cpp b/src/devices/bus/cbmiec/vic1520.cpp
index 9d62de41bb6..8122887bd5f 100644
--- a/src/devices/bus/cbmiec/vic1520.cpp
+++ b/src/devices/bus/cbmiec/vic1520.cpp
@@ -136,7 +136,7 @@ ioport_constructor vic1520_t::device_input_ports() const
// vic1520_t - constructor
//-------------------------------------------------
-vic1520_t::vic1520_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vic1520_t::vic1520_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VIC1520, "VIC-1520", tag, owner, clock, "vic1520", __FILE__),
device_cbm_iec_interface(mconfig, *this)
{
diff --git a/src/devices/bus/cbmiec/vic1520.h b/src/devices/bus/cbmiec/vic1520.h
index 9f893766bf8..4405f0da327 100644
--- a/src/devices/bus/cbmiec/vic1520.h
+++ b/src/devices/bus/cbmiec/vic1520.h
@@ -28,7 +28,7 @@ class vic1520_t : public device_t,
{
public:
// construction/destruction
- vic1520_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic1520_t(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;