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

3rdparty/softfloat/fsincos.c

@@ -95,7 +95,7 @@ INLINE floatx80 propagateFloatx80NaNOneArg(floatx80 a)
 | `zSigPtr', respectively.
 *----------------------------------------------------------------------------*/
 
-void normalizeFloatx80Subnormal(UINT64 aSig, INT32 *zExpPtr, UINT64 *zSigPtr)
+void normalizeFloatx80Subnormal(uint64_t aSig, int32_t *zExpPtr, uint64_t *zSigPtr)
 {
 	int shiftCount = countLeadingZeros64(aSig);
 	*zSigPtr = aSig<<shiftCount;
@@ -104,16 +104,16 @@ void normalizeFloatx80Subnormal(UINT64 aSig, INT32 *zExpPtr, UINT64 *zSigPtr)
 
 /* reduce trigonometric function argument using 128-bit precision
    M_PI approximation */
-static UINT64 argument_reduction_kernel(UINT64 aSig0, int Exp, UINT64 *zSig0, UINT64 *zSig1)
+static uint64_t argument_reduction_kernel(uint64_t aSig0, int Exp, uint64_t *zSig0, uint64_t *zSig1)
 {
-	UINT64 term0, term1, term2;
-	UINT64 aSig1 = 0;
+	uint64_t term0, term1, term2;
+	uint64_t aSig1 = 0;
 
 	shortShift128Left(aSig1, aSig0, Exp, &aSig1, &aSig0);
-	UINT64 q = estimateDiv128To64(aSig1, aSig0, FLOAT_PI_HI);
+	uint64_t q = estimateDiv128To64(aSig1, aSig0, FLOAT_PI_HI);
 	mul128By64To192(FLOAT_PI_HI, FLOAT_PI_LO, q, &term0, &term1, &term2);
 	sub128(aSig1, aSig0, term0, term1, zSig1, zSig0);
-	while ((INT64)(*zSig1) < 0) {
+	while ((int64_t)(*zSig1) < 0) {
 		--q;
 		add192(*zSig1, *zSig0, term2, 0, FLOAT_PI_HI, FLOAT_PI_LO, zSig1, zSig0, &term2);
 	}
@@ -121,9 +121,9 @@ static UINT64 argument_reduction_kernel(UINT64 aSig0, int Exp, UINT64 *zSig0, UI
 	return q;
 }
 
-static int reduce_trig_arg(int expDiff, int &zSign, UINT64 &aSig0, UINT64 &aSig1)
+static int reduce_trig_arg(int expDiff, int &zSign, uint64_t &aSig0, uint64_t &aSig1)
 {
-	UINT64 term0, term1, q = 0;
+	uint64_t term0, term1, q = 0;
 
 	if (expDiff < 0) {
 		shift128Right(aSig0, 0, 1, &aSig0, &aSig1);
@@ -251,7 +251,7 @@ INLINE void sincos_tiny_argument(floatx80 *sin_a, floatx80 *cos_a, floatx80 a)
 	if (cos_a) *cos_a = floatx80_one;
 }
 
-static floatx80 sincos_approximation(int neg, float128 r, UINT64 quotient)
+static floatx80 sincos_approximation(int neg, float128 r, uint64_t quotient)
 {
 	if (quotient & 0x1) {
 		r = poly_cos(r);
@@ -292,8 +292,8 @@ static floatx80 sincos_approximation(int neg, float128 r, UINT64 quotient)
 
 int sf_fsincos(floatx80 a, floatx80 *sin_a, floatx80 *cos_a)
 {
-	UINT64 aSig0, aSig1 = 0;
-	INT32 aExp, zExp, expDiff;
+	uint64_t aSig0, aSig1 = 0;
+	int32_t aExp, zExp, expDiff;
 	int aSign, zSign;
 	int q = 0;
 
@@ -303,7 +303,7 @@ int sf_fsincos(floatx80 a, floatx80 *sin_a, floatx80 *cos_a)
 
 	/* invalid argument */
 	if (aExp == 0x7FFF) {
-		if ((UINT64) (aSig0<<1)) {
+		if ((uint64_t) (aSig0<<1)) {
 			sincos_invalid(sin_a, cos_a, propagateFloatx80NaNOneArg(a));
 			return 0;
 		}
@@ -409,8 +409,8 @@ int floatx80_fcos(floatx80 &a)
 
 int floatx80_ftan(floatx80 &a)
 {
-	UINT64 aSig0, aSig1 = 0;
-	INT32 aExp, zExp, expDiff;
+	uint64_t aSig0, aSig1 = 0;
+	int32_t aExp, zExp, expDiff;
 	int aSign, zSign;
 	int q = 0;
 
@@ -420,7 +420,7 @@ int floatx80_ftan(floatx80 &a)
 
 	/* invalid argument */
 	if (aExp == 0x7FFF) {
-		if ((UINT64) (aSig0<<1))
+		if ((uint64_t) (aSig0<<1))
 		{
 			a = propagateFloatx80NaNOneArg(a);
 			return 0;

3rdparty/softfloat/fyl2x.c

@@ -100,7 +100,7 @@ INLINE floatx80 propagateFloatx80NaNOneArg(floatx80 a)
 | `zSigPtr', respectively.
 *----------------------------------------------------------------------------*/
 
-INLINE void normalizeFloatx80Subnormal(UINT64 aSig, INT32 *zExpPtr, UINT64 *zSigPtr)
+INLINE void normalizeFloatx80Subnormal(uint64_t aSig, int32_t *zExpPtr, uint64_t *zSigPtr)
 {
 	int shiftCount = countLeadingZeros64(aSig);
 	*zSigPtr = aSig<<shiftCount;
@@ -115,7 +115,7 @@ INLINE void normalizeFloatx80Subnormal(UINT64 aSig, INT32 *zExpPtr, UINT64 *zSig
 
 INLINE int floatx80_is_nan(floatx80 a)
 {
-	return ((a.high & 0x7FFF) == 0x7FFF) && (INT64) (a.low<<1);
+	return ((a.high & 0x7FFF) == 0x7FFF) && (int64_t) (a.low<<1);
 }
 
 /*----------------------------------------------------------------------------
@@ -253,18 +253,18 @@ static float128 poly_l2p1(float128 x)
 
 static floatx80 fyl2x(floatx80 a, floatx80 b)
 {
-	UINT64 aSig = extractFloatx80Frac(a);
-	INT32 aExp = extractFloatx80Exp(a);
+	uint64_t aSig = extractFloatx80Frac(a);
+	int32_t aExp = extractFloatx80Exp(a);
 	int aSign = extractFloatx80Sign(a);
-	UINT64 bSig = extractFloatx80Frac(b);
-	INT32 bExp = extractFloatx80Exp(b);
+	uint64_t bSig = extractFloatx80Frac(b);
+	int32_t bExp = extractFloatx80Exp(b);
 	int bSign = extractFloatx80Sign(b);
 
 	int zSign = bSign ^ 1;
 
 	if (aExp == 0x7FFF) {
-		if ((UINT64) (aSig<<1)
-				|| ((bExp == 0x7FFF) && (UINT64) (bSig<<1)))
+		if ((uint64_t) (aSig<<1)
+				|| ((bExp == 0x7FFF) && (uint64_t) (bSig<<1)))
 		{
 			return propagateFloatx80NaN(a, b);
 		}
@@ -284,14 +284,14 @@ invalid:
 	}
 	if (bExp == 0x7FFF)
 	{
-		if ((UINT64) (bSig<<1)) return propagateFloatx80NaN(a, b);
-		if (aSign && (UINT64)(aExp | aSig)) goto invalid;
+		if ((uint64_t) (bSig<<1)) return propagateFloatx80NaN(a, b);
+		if (aSign && (uint64_t)(aExp | aSig)) goto invalid;
 		if (aSig && (aExp == 0))
 			float_raise(float_flag_denormal);
 		if (aExp < 0x3FFF) {
 			return packFloatx80(zSign, 0x7FFF, U64(0x8000000000000000));
 		}
-		if (aExp == 0x3FFF && ((UINT64) (aSig<<1) == 0)) goto invalid;
+		if (aExp == 0x3FFF && ((uint64_t) (aSig<<1) == 0)) goto invalid;
 		return packFloatx80(bSign, 0x7FFF, U64(0x8000000000000000));
 	}
 	if (aExp == 0) {
@@ -313,7 +313,7 @@ invalid:
 		float_raise(float_flag_denormal);
 		normalizeFloatx80Subnormal(bSig, &bExp, &bSig);
 	}
-	if (aExp == 0x3FFF && ((UINT64) (aSig<<1) == 0))
+	if (aExp == 0x3FFF && ((uint64_t) (aSig<<1) == 0))
 		return packFloatx80(bSign, 0, 0);
 
 	float_raise(float_flag_inexact);
@@ -329,11 +329,11 @@ invalid:
 	/* using float128 for approximation */
 	/* ******************************** */
 
-	UINT64 zSig0, zSig1;
+	uint64_t zSig0, zSig1;
 	shift128Right(aSig<<1, 0, 16, &zSig0, &zSig1);
 	float128 x = packFloat128(0, aExp+0x3FFF, zSig0, zSig1);
 	x = poly_l2(x);
-	x = float128_add(x, int64_to_float128((INT64) ExpDiff));
+	x = float128_add(x, int64_to_float128((int64_t) ExpDiff));
 	return floatx80_mul(b, float128_to_floatx80(x));
 }
 
@@ -364,8 +364,8 @@ invalid:
 
 floatx80 fyl2xp1(floatx80 a, floatx80 b)
 {
-	INT32 aExp, bExp;
-	UINT64 aSig, bSig, zSig0, zSig1, zSig2;
+	int32_t aExp, bExp;
+	uint64_t aSig, bSig, zSig0, zSig1, zSig2;
 	int aSign, bSign;
 
 	aSig = extractFloatx80Frac(a);
@@ -377,8 +377,8 @@ floatx80 fyl2xp1(floatx80 a, floatx80 b)
 	int zSign = aSign ^ bSign;
 
 	if (aExp == 0x7FFF) {
-		if ((UINT64) (aSig<<1)
-				|| ((bExp == 0x7FFF) && (UINT64) (bSig<<1)))
+		if ((uint64_t) (aSig<<1)
+				|| ((bExp == 0x7FFF) && (uint64_t) (bSig<<1)))
 		{
 			return propagateFloatx80NaN(a, b);
 		}
@@ -398,7 +398,7 @@ invalid:
 	}
 	if (bExp == 0x7FFF)
 	{
-		if ((UINT64) (bSig<<1))
+		if ((uint64_t) (bSig<<1))
 			return propagateFloatx80NaN(a, b);
 
 		if (aExp == 0) {
@@ -436,17 +436,17 @@ invalid:
 	if (aExp < EXP_BIAS-70)
 	{
 		// first order approximation, return (a*b)/ln(2)
-		INT32 zExp = aExp + FLOAT_LN2INV_EXP - 0x3FFE;
+		int32_t zExp = aExp + FLOAT_LN2INV_EXP - 0x3FFE;
 
 	mul128By64To192(FLOAT_LN2INV_HI, FLOAT_LN2INV_LO, aSig, &zSig0, &zSig1, &zSig2);
-		if (0 < (INT64) zSig0) {
+		if (0 < (int64_t) zSig0) {
 			shortShift128Left(zSig0, zSig1, 1, &zSig0, &zSig1);
 			--zExp;
 		}
 
 		zExp = zExp + bExp - 0x3FFE;
 	mul128By64To192(zSig0, zSig1, bSig, &zSig0, &zSig1, &zSig2);
-		if (0 < (INT64) zSig0) {
+		if (0 < (int64_t) zSig0) {
 			shortShift128Left(zSig0, zSig1, 1, &zSig0, &zSig1);
 			--zExp;
 		}

3rdparty/softfloat/mamesf.h

@@ -24,15 +24,15 @@
 #include "assert.h"
 #include "osdcomm.h"
 
-typedef INT8 flag;
-typedef UINT8 uint8;
-typedef INT8 int8;
-typedef UINT16 uint16;
-typedef INT16 int16;
-typedef UINT32 uint32;
-typedef INT32 int32;
-typedef UINT64 uint64;
-typedef INT64 int64;
+typedef int8_t flag;
+typedef uint8_t uint8;
+typedef int8_t int8;
+typedef uint16_t uint16;
+typedef int16_t int16;
+typedef uint32_t uint32;
+typedef int32_t int32;
+typedef uint64_t uint64;
+typedef int64_t int64;
 
 /*----------------------------------------------------------------------------
 | Each of the following `typedef's defines a type that holds integers
@@ -40,14 +40,14 @@ typedef INT64 int64;
 | implementation of C, `bits16' and `sbits16' should be `typedef'ed to
 | `unsigned short int' and `signed short int' (or `short int'), respectively.
 *----------------------------------------------------------------------------*/
-typedef UINT8 bits8;
-typedef INT8 sbits8;
-typedef UINT16 bits16;
-typedef INT16 sbits16;
-typedef UINT32 bits32;
-typedef INT32 sbits32;
-typedef UINT64 bits64;
-typedef INT64 sbits64;
+typedef uint8_t bits8;
+typedef int8_t sbits8;
+typedef uint16_t bits16;
+typedef int16_t sbits16;
+typedef uint32_t bits32;
+typedef int32_t sbits32;
+typedef uint64_t bits64;
+typedef int64_t sbits64;
 
 /*----------------------------------------------------------------------------
 | The `LIT64' macro takes as its argument a textual integer literal and

scripts/build/complay.py

@@ -18,7 +18,7 @@ if len(sys.argv) < 4:
 srcfile = sys.argv[1]
 dstfile = sys.argv[2]
 varname = sys.argv[3]
-type = 'UINT8'
+type = 'uint8_t'
 
 try:
     myfile = open(srcfile, 'rb')

scripts/src/emu.lua

@@ -249,11 +249,11 @@ dependency {
 }
 
 custombuildtask {
-	{ MAME_DIR .. "scripts/font/NotoSans-Bold.bdc", GEN_DIR .. "emu/uismall.fh",     {  MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting NotoSans-Bold.bdc...", PYTHON .. " $(1) $(<) $(@) font_uismall UINT8" }},
+	{ MAME_DIR .. "scripts/font/NotoSans-Bold.bdc", GEN_DIR .. "emu/uismall.fh",     {  MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting NotoSans-Bold.bdc...", PYTHON .. " $(1) $(<) $(@) font_uismall uint8_t" }},
 }
 
 custombuildtask {
-	{ MAME_DIR .. "src/frontend/mame/ui/uicmd14.png"        , GEN_DIR .. "emu/ui/uicmd14.fh",  {  MAME_DIR.. "scripts/build/png2bdc.py",  MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting uicmd14.png...", PYTHON .. " $(1) $(<) temp_cmd.bdc", PYTHON .. " $(2) temp_cmd.bdc $(@) font_uicmd14 UINT8" }},
+	{ MAME_DIR .. "src/frontend/mame/ui/uicmd14.png"        , GEN_DIR .. "emu/ui/uicmd14.fh",  {  MAME_DIR.. "scripts/build/png2bdc.py",  MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting uicmd14.png...", PYTHON .. " $(1) $(<) temp_cmd.bdc", PYTHON .. " $(2) temp_cmd.bdc $(@) font_uicmd14 uint8_t" }},
 
 	layoutbuildtask("emu/layout", "dualhovu"),
 	layoutbuildtask("emu/layout", "dualhsxs"),

src/devices/bus/a1bus/a1bus.cpp

@@ -23,7 +23,7 @@ const device_type A1BUS_SLOT = &device_creator<a1bus_slot_device>;
 //-------------------------------------------------
 //  a1bus_slot_device - constructor
 //-------------------------------------------------
-a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 		device_t(mconfig, A1BUS_SLOT, "Apple I Slot", tag, owner, clock, "a1bus_slot", __FILE__),
 		device_slot_interface(mconfig, *this),
 	m_a1bus_tag(nullptr),
@@ -31,7 +31,7 @@ a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, const char *
 {
 }
 
-a1bus_slot_device::a1bus_slot_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) :
+a1bus_slot_device::a1bus_slot_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),
 		device_slot_interface(mconfig, *this), m_a1bus_tag(nullptr), m_a1bus_slottag(nullptr)
 {
@@ -75,14 +75,14 @@ void a1bus_device::static_set_cputag(device_t &device, const char *tag)
 //  a1bus_device - constructor
 //-------------------------------------------------
 
-a1bus_device::a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a1bus_device::a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 		device_t(mconfig, A1BUS, "Apple I Bus", tag, owner, clock, "a1bus", __FILE__), m_maincpu(nullptr),
 		m_out_irq_cb(*this),
 		m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr)
 {
 }
 
-a1bus_device::a1bus_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) :
+a1bus_device::a1bus_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), m_maincpu(nullptr),
 		m_out_irq_cb(*this),
 		m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr)
@@ -139,7 +139,7 @@ void a1bus_device::install_device(offs_t start, offs_t end, read8_delegate rhand
 	m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler);
 }
 
-void a1bus_device::install_bank(offs_t start, offs_t end, const char *tag, UINT8 *data)
+void a1bus_device::install_bank(offs_t start, offs_t end, const char *tag, uint8_t *data)
 {
 //  printf("install_bank: %s @ %x->%x\n", tag, start, end);
 	m_maincpu = machine().device<cpu_device>(m_cputag);
@@ -199,7 +199,7 @@ void device_a1bus_card_interface::install_device(offs_t start, offs_t end, read8
 	m_a1bus->install_device(start, end, rhandler, whandler);
 }
 
-void device_a1bus_card_interface::install_bank(offs_t start, offs_t end, char *tag, UINT8 *data)
+void device_a1bus_card_interface::install_bank(offs_t start, offs_t end, char *tag, uint8_t *data)
 {
 	m_a1bus->install_bank(start, end, tag, data);
 }

src/devices/bus/a1bus/a1bus.h

@@ -49,8 +49,8 @@ class a1bus_slot_device : public device_t,
 {
 public:
 	// construction/destruction
-	a1bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	a1bus_slot_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);
+	a1bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	a1bus_slot_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-level overrides
 	virtual void device_start() override;
@@ -72,8 +72,8 @@ class a1bus_device : public device_t
 {
 public:
 	// construction/destruction
-	a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	a1bus_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);
+	a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	a1bus_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);
 
 	// inline configuration
 	static void static_set_cputag(device_t &device, const char *tag);
@@ -87,7 +87,7 @@ public:
 	void set_nmi_line(int state);
 
 	void install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler);
-	void install_bank(offs_t start, offs_t end, const char *tag, UINT8 *data);
+	void install_bank(offs_t start, offs_t end, const char *tag, uint8_t *data);
 
 	DECLARE_WRITE_LINE_MEMBER( irq_w );
 	DECLARE_WRITE_LINE_MEMBER( nmi_w );
@@ -132,7 +132,7 @@ public:
 	void lower_slot_nmi() { m_a1bus->set_nmi_line(CLEAR_LINE); }
 
 	void install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler);
-	void install_bank(offs_t start, offs_t end, char *tag, UINT8 *data);
+	void install_bank(offs_t start, offs_t end, char *tag, uint8_t *data);
 
 	// inline configuration
 	static void static_set_a1bus_tag(device_t &device, const char *tag, const char *slottag);

src/devices/bus/a1bus/a1cassette.cpp

@@ -56,14 +56,14 @@ const tiny_rom_entry *a1bus_cassette_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 		device_t(mconfig, A1BUS_CASSETTE, "Apple I cassette board", tag, owner, clock, "a1cass", __FILE__),
 		device_a1bus_card_interface(mconfig, *this),
 		m_cassette(*this, "cassette"), m_rom(nullptr), m_cassette_output_flipflop(0)
 {
 }
 
-a1bus_cassette_device::a1bus_cassette_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) :
+a1bus_cassette_device::a1bus_cassette_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),
 		device_a1bus_card_interface(mconfig, *this),
 		m_cassette(*this, "cassette"), m_rom(nullptr), m_cassette_output_flipflop(0)

src/devices/bus/a1bus/a1cassette.h

@@ -24,8 +24,8 @@ class a1bus_cassette_device:
 {
 public:
 	// construction/destruction
-	a1bus_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	a1bus_cassette_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);
+	a1bus_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	a1bus_cassette_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);
 
 	// optional information overrides
 	virtual machine_config_constructor device_mconfig_additions() const override;
@@ -43,7 +43,7 @@ protected:
 	void cassette_toggle_output();
 
 private:
-	UINT8 *m_rom;
+	uint8_t *m_rom;
 	int m_cassette_output_flipflop;
 };
 

src/devices/bus/a1bus/a1cffa.cpp

@@ -51,14 +51,14 @@ const tiny_rom_entry *a1bus_cffa_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 		device_t(mconfig, A1BUS_CFFA, "CFFA Compact Flash for Apple I", tag, owner, clock, "cffa1", __FILE__),
 		device_a1bus_card_interface(mconfig, *this),
 		m_ata(*this, CFFA_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_writeprotect(false)
 {
 }
 
-a1bus_cffa_device::a1bus_cffa_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) :
+a1bus_cffa_device::a1bus_cffa_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),
 		device_a1bus_card_interface(mconfig, *this),
 		m_ata(*this, CFFA_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_writeprotect(false)

src/devices/bus/a1bus/a1cffa.h

@@ -25,8 +25,8 @@ class a1bus_cffa_device:
 {
 public:
 	// construction/destruction
-	a1bus_cffa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	a1bus_cffa_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);
+	a1bus_cffa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	a1bus_cffa_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);
 
 	// optional information overrides
 	virtual machine_config_constructor device_mconfig_additions() const override;
@@ -42,8 +42,8 @@ protected:
 	virtual void device_reset() override;
 
 private:
-	UINT8 *m_rom;
-	UINT16 m_lastdata;
+	uint8_t *m_rom;
+	uint16_t m_lastdata;
 	bool m_writeprotect;
 };
 

src/devices/bus/a2bus/a2alfam2.cpp

@@ -82,7 +82,7 @@ machine_config_constructor a2bus_aesms_device::device_mconfig_additions() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_sn76489_device::a2bus_sn76489_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) :
+a2bus_sn76489_device::a2bus_sn76489_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_sn1(*this, SN1_TAG),
@@ -92,13 +92,13 @@ a2bus_sn76489_device::a2bus_sn76489_device(const machine_config &mconfig, device
 {
 }
 
-a2bus_alfam2_device::a2bus_alfam2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_alfam2_device::a2bus_alfam2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_sn76489_device(mconfig, A2BUS_ALFAM2, "ALF MC1 / Apple Music II", tag, owner, clock, "a2alfam2", __FILE__)
 {
 	m_has4thsn = false;
 }
 
-a2bus_aesms_device::a2bus_aesms_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_aesms_device::a2bus_aesms_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_sn76489_device(mconfig, A2BUS_ALFAM2, "Applied Engineering Super Music Synthesizer", tag, owner, clock, "a2aesms", __FILE__)
 {
 	m_has4thsn = true;
@@ -125,7 +125,7 @@ void a2bus_sn76489_device::device_reset()
 	m_latch0 = m_latch1 = m_latch2 = m_latch3 = 0;
 }
 
-UINT8 a2bus_sn76489_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_sn76489_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	// SN76489 can't be read, it appears from the schematics this is what happens
 	switch (offset)
@@ -146,7 +146,7 @@ UINT8 a2bus_sn76489_device::read_c0nx(address_space &space, UINT8 offset)
 	return 0xff;
 }
 
-void a2bus_sn76489_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_sn76489_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	switch (offset)
 	{

src/devices/bus/a2bus/a2alfam2.h

@@ -25,7 +25,7 @@ class a2bus_sn76489_device:
 {
 public:
 	// construction/destruction
-	a2bus_sn76489_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);
+	a2bus_sn76489_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);
 
 	// optional information overrides
 	virtual machine_config_constructor device_mconfig_additions() const override;
@@ -40,12 +40,12 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
 	virtual bool take_c800() override;
 
 private:
-	UINT8 m_latch0, m_latch1, m_latch2, m_latch3;
+	uint8_t m_latch0, m_latch1, m_latch2, m_latch3;
 
 protected:
 	bool m_has4thsn;
@@ -54,13 +54,13 @@ protected:
 class a2bus_alfam2_device : public a2bus_sn76489_device
 {
 public:
-	a2bus_alfam2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_alfam2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 };
 
 class a2bus_aesms_device : public a2bus_sn76489_device
 {
 public:
-	a2bus_aesms_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_aesms_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	virtual machine_config_constructor device_mconfig_additions() const override;
 };

src/devices/bus/a2bus/a2applicard.cpp

@@ -75,14 +75,14 @@ const tiny_rom_entry *a2bus_applicard_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_applicard_device::a2bus_applicard_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) :
+a2bus_applicard_device::a2bus_applicard_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_z80(*this, Z80_TAG), m_bROMAtZ80Zero(false), m_z80stat(false), m_6502stat(false), m_toz80(0), m_to6502(0), m_z80rom(nullptr)
 {
 }
 
-a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_APPLICARD, "PCPI Applicard", tag, owner, clock, "a2aplcrd", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_z80(*this, Z80_TAG), m_bROMAtZ80Zero(false), m_z80stat(false), m_6502stat(false), m_toz80(0), m_to6502(0), m_z80rom(nullptr)
@@ -117,7 +117,7 @@ void a2bus_applicard_device::device_reset()
 	m_z80stat = false;
 }
 
-UINT8 a2bus_applicard_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_applicard_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	switch (offset & 0xf)
 	{
@@ -160,7 +160,7 @@ UINT8 a2bus_applicard_device::read_c0nx(address_space &space, UINT8 offset)
 	return 0xff;
 }
 
-void a2bus_applicard_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_applicard_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	switch (offset & 0xf)
 	{
@@ -184,7 +184,7 @@ void a2bus_applicard_device::write_c0nx(address_space &space, UINT8 offset, UINT
 
 READ8_MEMBER( a2bus_applicard_device::z80_io_r )
 {
-	UINT8 tmp = 0;
+	uint8_t tmp = 0;
 
 	switch (offset)
 	{

src/devices/bus/a2bus/a2applicard.h

@@ -24,8 +24,8 @@ class a2bus_applicard_device:
 {
 public:
 	// construction/destruction
-	a2bus_applicard_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);
-	a2bus_applicard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_applicard_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);
+	a2bus_applicard_device(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;
@@ -41,8 +41,8 @@ protected:
 	virtual const tiny_rom_entry *device_rom_region() const override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
 	virtual bool take_c800() override;
 
 	required_device<cpu_device> m_z80;
@@ -50,9 +50,9 @@ protected:
 private:
 	bool m_bROMAtZ80Zero;
 	bool m_z80stat, m_6502stat;
-	UINT8 m_toz80, m_to6502;
-	UINT8 m_z80ram[64*1024];
-	UINT8 *m_z80rom;
+	uint8_t m_toz80, m_to6502;
+	uint8_t m_z80ram[64*1024];
+	uint8_t *m_z80rom;
 };
 
 // device type definition

src/devices/bus/a2bus/a2arcadebd.cpp

@@ -57,7 +57,7 @@ machine_config_constructor a2bus_arcboard_device::device_mconfig_additions() con
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_ARCADEBOARD, "Third Millenium Engineering Arcade Board", tag, owner, clock, "a2arcbd", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_tms(*this, TMS_TAG),
@@ -65,7 +65,7 @@ a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, cons
 {
 }
 
-a2bus_arcboard_device::a2bus_arcboard_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) :
+a2bus_arcboard_device::a2bus_arcboard_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_tms(*this, TMS_TAG),
@@ -97,7 +97,7 @@ void a2bus_arcboard_device::device_reset()
     6 - AY data
 */
 
-UINT8 a2bus_arcboard_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_arcboard_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	switch (offset)
 	{
@@ -114,7 +114,7 @@ UINT8 a2bus_arcboard_device::read_c0nx(address_space &space, UINT8 offset)
 	return 0xff;
 }
 
-void a2bus_arcboard_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_arcboard_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	switch (offset)
 	{

src/devices/bus/a2bus/a2arcadebd.h

@@ -26,8 +26,8 @@ class a2bus_arcboard_device:
 {
 public:
 	// construction/destruction
-	a2bus_arcboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	a2bus_arcboard_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);
+	a2bus_arcboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	a2bus_arcboard_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);
 
 	// optional information overrides
 	virtual machine_config_constructor device_mconfig_additions() const override;
@@ -39,8 +39,8 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
 
 	required_device<tms9918a_device> m_tms;
 	required_device<ay8910_device> m_ay;

src/devices/bus/a2bus/a2bus.cpp

@@ -87,13 +87,13 @@ const device_type A2BUS_SLOT = &device_creator<a2bus_slot_device>;
 //-------------------------------------------------
 //  a2bus_slot_device - constructor
 //-------------------------------------------------
-a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 		device_t(mconfig, A2BUS_SLOT, "Apple II Slot", tag, owner, clock, "a2bus_slot", __FILE__),
 		device_slot_interface(mconfig, *this), m_a2bus_tag(nullptr), m_a2bus_slottag(nullptr)
 {
 }
 
-a2bus_slot_device::a2bus_slot_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) :
+a2bus_slot_device::a2bus_slot_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),
 		device_slot_interface(mconfig, *this), m_a2bus_tag(nullptr), m_a2bus_slottag(nullptr)
 {
@@ -137,7 +137,7 @@ void a2bus_device::static_set_cputag(device_t &device, const char *tag)
 //  a2bus_device - constructor
 //-------------------------------------------------
 
-a2bus_device::a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_device::a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 		device_t(mconfig, A2BUS, "Apple II Bus", tag, owner, clock, "a2bus", __FILE__), m_maincpu(nullptr), m_maincpu_space(nullptr),
 		m_out_irq_cb(*this),
 		m_out_nmi_cb(*this),
@@ -145,7 +145,7 @@ a2bus_device::a2bus_device(const machine_config &mconfig, const char *tag, devic
 {
 }
 
-a2bus_device::a2bus_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) :
+a2bus_device::a2bus_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), m_maincpu(nullptr), m_maincpu_space(nullptr),
 		m_out_irq_cb(*this),
 		m_out_nmi_cb(*this),
@@ -203,12 +203,12 @@ void a2bus_device::add_a2bus_card(int slot, device_a2bus_card_interface *card)
 	m_device_list[slot] = card;
 }
 
-UINT8 a2bus_device::get_a2bus_irq_mask()
+uint8_t a2bus_device::get_a2bus_irq_mask()
 {
 	return m_slot_irq_mask;
 }
 
-UINT8 a2bus_device::get_a2bus_nmi_mask()
+uint8_t a2bus_device::get_a2bus_nmi_mask()
 {
 	return m_slot_nmi_mask;
 }
@@ -246,26 +246,26 @@ void a2bus_device::set_maincpu_halt(int state)
 	m_maincpu->set_input_line(INPUT_LINE_HALT, state);
 }
 
-UINT8 a2bus_device::dma_r(address_space &space, UINT16 offset)
+uint8_t a2bus_device::dma_r(address_space &space, uint16_t offset)
 {
 	m_maincpu_space->set_debugger_access(space.debugger_access());
 
 	return m_maincpu_space->read_byte(offset);
 }
 
-void a2bus_device::dma_w(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_device::dma_w(address_space &space, uint16_t offset, uint8_t data)
 {
 	m_maincpu_space->set_debugger_access(space.debugger_access());
 
 	m_maincpu_space->write_byte(offset, data);
 }
 
-UINT8 a2bus_device::dma_nospace_r(UINT16 offset)
+uint8_t a2bus_device::dma_nospace_r(uint16_t offset)
 {
 	return m_maincpu_space->read_byte(offset);
 }
 
-void a2bus_device::dma_nospace_w(UINT16 offset, UINT8 data)
+void a2bus_device::dma_nospace_w(uint16_t offset, uint8_t data)
 {
 	m_maincpu_space->write_byte(offset, data);
 }

src/devices/bus/a2bus/a2bus.h

@@ -63,8 +63,8 @@ class a2bus_slot_device : public device_t,
 {
 public:
 	// construction/destruction
-	a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	a2bus_slot_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);
+	a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	a2bus_slot_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-level overrides
 	virtual void device_start() override;
@@ -88,8 +88,8 @@ class a2bus_device : public device_t
 	friend class a2bus_mcms2_device;
 public:
 	// construction/destruction
-	a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	a2bus_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);
+	a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	a2bus_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);
 
 	// inline configuration
 	static void static_set_cputag(device_t &device, const char *tag);
@@ -99,17 +99,17 @@ public:
 
 	void add_a2bus_card(int slot, device_a2bus_card_interface *card);
 	device_a2bus_card_interface *get_a2bus_card(int slot);
-	UINT8 get_a2bus_irq_mask();
-	UINT8 get_a2bus_nmi_mask();
+	uint8_t get_a2bus_irq_mask();
+	uint8_t get_a2bus_nmi_mask();
 
 	void set_irq_line(int state, int slot);
 	void set_nmi_line(int state, int slot);
 	void set_maincpu_halt(int state);
 	void recalc_inh(int slot);
-	UINT8 dma_r(address_space &space, UINT16 offset);
-	void dma_w(address_space &space, UINT16 offset, UINT8 data);
-	UINT8 dma_nospace_r(UINT16 offset);
-	void dma_nospace_w(UINT16 offset, UINT8 data);
+	uint8_t dma_r(address_space &space, uint16_t offset);
+	void dma_w(address_space &space, uint16_t offset, uint8_t data);
+	uint8_t dma_nospace_r(uint16_t offset);
+	void dma_nospace_w(uint16_t offset, uint8_t data);
 
 	DECLARE_WRITE_LINE_MEMBER( irq_w );
 	DECLARE_WRITE_LINE_MEMBER( nmi_w );
@@ -130,8 +130,8 @@ protected:
 	device_a2bus_card_interface *m_device_list[8];
 	const char *m_cputag;
 
-	UINT8 m_slot_irq_mask;
-	UINT8 m_slot_nmi_mask;
+	uint8_t m_slot_irq_mask;
+	uint8_t m_slot_nmi_mask;
 };
 
 
@@ -149,25 +149,25 @@ public:
 	device_a2bus_card_interface(const machine_config &mconfig, device_t &device);
 	virtual ~device_a2bus_card_interface();
 
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) { m_device.logerror("a2bus: unhandled read at C0n%x\n", offset); return 0; }       // C0nX - /DEVSEL
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) { m_device.logerror("a2bus: unhandled write %02x to C0n%x\n", data, offset); }
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) { return 0; }       // CnXX - /IOSEL
-	virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) { m_device.logerror("a2bus: unhandled write %02x to Cn%02x\n", data, offset); }
-	virtual UINT8 read_c800(address_space &space, UINT16 offset) { return 0; }      // C800 - /IOSTB
-	virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) {m_device.logerror("a2bus: unhandled write %02x to %04x\n", data, offset + 0xc800); }
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) { m_device.logerror("a2bus: unhandled read at C0n%x\n", offset); return 0; }       // C0nX - /DEVSEL
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) { m_device.logerror("a2bus: unhandled write %02x to C0n%x\n", data, offset); }
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) { return 0; }       // CnXX - /IOSEL
+	virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) { m_device.logerror("a2bus: unhandled write %02x to Cn%02x\n", data, offset); }
+	virtual uint8_t read_c800(address_space &space, uint16_t offset) { return 0; }      // C800 - /IOSTB
+	virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) {m_device.logerror("a2bus: unhandled write %02x to %04x\n", data, offset + 0xc800); }
 	virtual bool take_c800() { return true; }   // override and return false if your card doesn't take over the c800 space
-	virtual UINT8 read_inh_rom(address_space &space, UINT16 offset) { return 0; }
-	virtual void write_inh_rom(address_space &space, UINT16 offset, UINT8 data) { }
-	virtual UINT16 inh_start() { return INH_START_INVALID; }
-	virtual UINT16 inh_end() { return INH_END_INVALID; }
+	virtual uint8_t read_inh_rom(address_space &space, uint16_t offset) { return 0; }
+	virtual void write_inh_rom(address_space &space, uint16_t offset, uint8_t data) { }
+	virtual uint16_t inh_start() { return INH_START_INVALID; }
+	virtual uint16_t inh_end() { return INH_END_INVALID; }
 	virtual int inh_type() { return INH_NONE; }
 
 	device_a2bus_card_interface *next() const { return m_next; }
 
 	void set_a2bus_device();
 
-	UINT32 get_slotromspace() { return 0xc000 | (m_slot<<8); }      // return Cn00 address for this slot
-	UINT32 get_slotiospace() { return 0xc080 + (m_slot<<4); }       // return C0n0 address for this slot
+	uint32_t get_slotromspace() { return 0xc000 | (m_slot<<8); }      // return Cn00 address for this slot
+	uint32_t get_slotiospace() { return 0xc080 + (m_slot<<4); }       // return C0n0 address for this slot
 
 	void raise_slot_irq() { m_a2bus->set_irq_line(ASSERT_LINE, m_slot); }
 	void lower_slot_irq() { m_a2bus->set_irq_line(CLEAR_LINE, m_slot); }
@@ -178,12 +178,12 @@ public:
 
 	// pass through the original address space if any for debugger protection
 	// when debugging e.g. coprocessor cards (Z80 SoftCard etc).
-	UINT8 slot_dma_read(address_space &space, UINT16 offset) { return m_a2bus->dma_r(space, offset); }
-	void slot_dma_write(address_space &space, UINT16 offset, UINT8 data) { m_a2bus->dma_w(space, offset, data); }
+	uint8_t slot_dma_read(address_space &space, uint16_t offset) { return m_a2bus->dma_r(space, offset); }
+	void slot_dma_write(address_space &space, uint16_t offset, uint8_t data) { m_a2bus->dma_w(space, offset, data); }
 
 	// these versions forego that protection for when the DMA isn't coming from a debuggable CPU device
-	UINT8 slot_dma_read_no_space(UINT16 offset) { return m_a2bus->dma_nospace_r(offset); }
-	void slot_dma_write_no_space(UINT16 offset, UINT8 data) { m_a2bus->dma_nospace_w(offset, data); }
+	uint8_t slot_dma_read_no_space(uint16_t offset) { return m_a2bus->dma_nospace_r(offset); }
+	void slot_dma_write_no_space(uint16_t offset, uint8_t data) { m_a2bus->dma_nospace_w(offset, data); }
 
 	// inline configuration
 	static void static_set_a2bus_tag(device_t &device, const char *tag, const char *slottag);

src/devices/bus/a2bus/a2cffa.cpp

@@ -83,20 +83,20 @@ const tiny_rom_entry *a2bus_cffa2_6502_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_cffa2000_device::a2bus_cffa2000_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) :
+a2bus_cffa2000_device::a2bus_cffa2000_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_ata(*this, CFFA2_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_lastreaddata(0), m_writeprotect(false), m_inwritecycle(false)
 {
 }
 
-a2bus_cffa2_device::a2bus_cffa2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_cffa2_device::a2bus_cffa2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_cffa2000_device(mconfig, A2BUS_CFFA2, "CFFA2000 Compact Flash (65C02 firmware, www.dreher.net)", tag, owner, clock, "a2cffa2", __FILE__),
 	device_nvram_interface(mconfig, *this)
 {
 }
 
-a2bus_cffa2_6502_device::a2bus_cffa2_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_cffa2_6502_device::a2bus_cffa2_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_cffa2000_device(mconfig, A2BUS_CFFA2, "CFFA2000 Compact Flash (6502 firmware, www.dreher.net)", tag, owner, clock, "a2cffa02", __FILE__),
 	device_nvram_interface(mconfig, *this)
 {
@@ -135,7 +135,7 @@ void a2bus_cffa2000_device::device_reset()
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_cffa2000_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_cffa2000_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	switch (offset)
 	{
@@ -176,7 +176,7 @@ UINT8 a2bus_cffa2000_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_cffa2000_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_cffa2000_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	m_inwritecycle = false;
 
@@ -220,7 +220,7 @@ void a2bus_cffa2000_device::write_c0nx(address_space &space, UINT8 offset, UINT8
     read_cnxx - called for reads from this card's cnxx space
 -------------------------------------------------*/
 
-UINT8 a2bus_cffa2000_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_cffa2000_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	int slotimg = m_slot * 0x100;
 
@@ -232,12 +232,12 @@ UINT8 a2bus_cffa2000_device::read_cnxx(address_space &space, UINT8 offset)
     read_c800 - called for reads from this card's c800 space
 -------------------------------------------------*/
 
-UINT8 a2bus_cffa2000_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_cffa2000_device::read_c800(address_space &space, uint16_t offset)
 {
 	return m_eeprom[offset+0x800];
 }
 
-void a2bus_cffa2000_device::write_c800(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_cffa2000_device::write_c800(address_space &space, uint16_t offset, uint8_t data)
 {
 	if (!m_writeprotect)
 	{

src/devices/bus/a2bus/a2cffa.h

@@ -26,7 +26,7 @@ class a2bus_cffa2000_device:
 {
 public:
 	// construction/destruction
-	a2bus_cffa2000_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);
+	a2bus_cffa2000_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);
 
 	// optional information overrides
 	virtual machine_config_constructor device_mconfig_additions() const override;
@@ -37,19 +37,19 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
-	virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
-	virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+	virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
+	virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
 
 	required_device<ata_interface_device> m_ata;
 
-	UINT8 *m_rom;
-	UINT8 m_eeprom[0x1000];
+	uint8_t *m_rom;
+	uint8_t m_eeprom[0x1000];
 
 private:
-	UINT16 m_lastdata, m_lastreaddata;
+	uint16_t m_lastdata, m_lastreaddata;
 	bool m_writeprotect;
 	bool m_inwritecycle;
 };
@@ -57,7 +57,7 @@ private:
 class a2bus_cffa2_device : public a2bus_cffa2000_device, public device_nvram_interface
 {
 public:
-	a2bus_cffa2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_cffa2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 protected:
 	// device_config_nvram_interface overrides
@@ -69,7 +69,7 @@ protected:
 class a2bus_cffa2_6502_device : public a2bus_cffa2000_device, public device_nvram_interface
 {
 public:
-	a2bus_cffa2_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_cffa2_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 	virtual const tiny_rom_entry *device_rom_region() const override;
 
 protected:

src/devices/bus/a2bus/a2corvus.cpp

@@ -101,14 +101,14 @@ const tiny_rom_entry *a2bus_corvus_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_corvus_device::a2bus_corvus_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) :
+a2bus_corvus_device::a2bus_corvus_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_corvushd(*this, CORVUS_HD_TAG), m_rom(nullptr)
 {
 }
 
-a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_CORVUS, "Corvus Flat Cable interface", tag, owner, clock, "a2corvus", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_corvushd(*this, CORVUS_HD_TAG), m_rom(nullptr)
@@ -136,7 +136,7 @@ void a2bus_corvus_device::device_reset()
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_corvus_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_corvus_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	switch (offset)
 	{
@@ -159,7 +159,7 @@ UINT8 a2bus_corvus_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_corvus_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_corvus_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	if (offset == 0)
 	{
@@ -171,7 +171,7 @@ void a2bus_corvus_device::write_c0nx(address_space &space, UINT8 offset, UINT8 d
     read_cnxx - called for reads from this card's cnxx space
 -------------------------------------------------*/
 
-UINT8 a2bus_corvus_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_corvus_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	// one slot image at the end of the ROM, it appears
 	return m_rom[offset+0x700];
@@ -181,7 +181,7 @@ UINT8 a2bus_corvus_device::read_cnxx(address_space &space, UINT8 offset)
     read_c800 - called for reads from this card's c800 space
 -------------------------------------------------*/
 
-UINT8 a2bus_corvus_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_corvus_device::read_c800(address_space &space, uint16_t offset)
 {
 	return m_rom[offset & 0x7ff];
 }

src/devices/bus/a2bus/a2corvus.h

@@ -26,8 +26,8 @@ class a2bus_corvus_device:
 {
 public:
 	// construction/destruction
-	a2bus_corvus_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);
-	a2bus_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_corvus_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);
+	a2bus_corvus_device(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;
@@ -40,13 +40,13 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
-	virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+	virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
 
 private:
-	UINT8 *m_rom;
+	uint8_t *m_rom;
 };
 
 // device type definition

src/devices/bus/a2bus/a2diskii.cpp

@@ -90,19 +90,19 @@ const tiny_rom_entry *a2bus_floppy_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_floppy_device::a2bus_floppy_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) :
+a2bus_floppy_device::a2bus_floppy_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),
 		device_a2bus_card_interface(mconfig, *this),
 		m_fdc(*this, FDC_TAG), m_rom(nullptr)
 {
 }
 
-a2bus_diskii_device::a2bus_diskii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_diskii_device::a2bus_diskii_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_floppy_device(mconfig, A2BUS_DISKII, "Apple Disk II controller", tag, owner, clock, "a2diskii", __FILE__)
 {
 }
 
-a2bus_iwmflop_device::a2bus_iwmflop_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_iwmflop_device::a2bus_iwmflop_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_floppy_device(mconfig, A2BUS_IWM_FDC, "Apple IWM floppy card", tag, owner, clock, "a2iwm_flop", __FILE__)
 {
 }
@@ -128,7 +128,7 @@ void a2bus_floppy_device::device_reset()
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_floppy_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_floppy_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	return m_fdc->read(offset);
 }
@@ -138,7 +138,7 @@ UINT8 a2bus_floppy_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_floppy_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_floppy_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	m_fdc->write(offset, data);
 }
@@ -147,7 +147,7 @@ void a2bus_floppy_device::write_c0nx(address_space &space, UINT8 offset, UINT8 d
     read_cnxx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_floppy_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_floppy_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	return m_rom[offset];
 }

src/devices/bus/a2bus/a2diskii.h

@@ -25,7 +25,7 @@ class a2bus_floppy_device:
 {
 public:
 	// construction/destruction
-	a2bus_floppy_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);
+	a2bus_floppy_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);
 
 	// optional information overrides
 	virtual machine_config_constructor device_mconfig_additions() const override;
@@ -36,26 +36,26 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
 
 	required_device<applefdc_base_device> m_fdc;
 
 private:
-	UINT8 *m_rom;
+	uint8_t *m_rom;
 };
 
 class a2bus_diskii_device: public a2bus_floppy_device
 {
 public:
-	a2bus_diskii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_diskii_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 };
 
 class a2bus_iwmflop_device: public a2bus_floppy_device
 {
 public:
-	a2bus_iwmflop_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_iwmflop_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	virtual machine_config_constructor device_mconfig_additions() const override;
 };

src/devices/bus/a2bus/a2diskiing.cpp

@@ -68,7 +68,7 @@ const tiny_rom_entry *a2bus_diskiing_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_diskiing_device::a2bus_diskiing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_diskiing_device::a2bus_diskiing_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_DISKIING, "Apple Disk II NG controller", tag, owner, clock, "a2diskiing", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_wozfdc(*this, WOZFDC_TAG),
@@ -98,7 +98,7 @@ void a2bus_diskiing_device::device_reset()
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_diskiing_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_diskiing_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	return m_wozfdc->read(space, offset);
 }
@@ -108,7 +108,7 @@ UINT8 a2bus_diskiing_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_diskiing_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_diskiing_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	m_wozfdc->write(space, offset, data);
 }
@@ -117,7 +117,7 @@ void a2bus_diskiing_device::write_c0nx(address_space &space, UINT8 offset, UINT8
     read_cnxx - called for reads from this card's cnxx space
 -------------------------------------------------*/
 
-UINT8 a2bus_diskiing_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_diskiing_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	return m_rom[offset];
 }

src/devices/bus/a2bus/a2diskiing.h

@@ -28,7 +28,7 @@ class a2bus_diskiing_device:
 {
 public:
 	// construction/destruction
-	a2bus_diskiing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_diskiing_device(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;
@@ -41,16 +41,16 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
 
 private:
 	required_device<diskii_fdc> m_wozfdc;
 	required_device<floppy_connector> floppy0;
 	required_device<floppy_connector> floppy1;
 
-	const UINT8 *m_rom;
+	const uint8_t *m_rom;
 };
 
 // device type definition

src/devices/bus/a2bus/a2dx1.cpp

@@ -49,7 +49,7 @@ machine_config_constructor a2bus_dx1_device::device_mconfig_additions() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_dx1_device::a2bus_dx1_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) :
+a2bus_dx1_device::a2bus_dx1_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_dac(*this, "dac"),
@@ -57,7 +57,7 @@ a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, device_type ty
 {
 }
 
-a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_DX1, "Decillonix DX-1", tag, owner, clock, "a2dx1", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_dac(*this, "dac"),
@@ -75,7 +75,7 @@ void a2bus_dx1_device::device_start()
 	set_a2bus_device();
 }
 
-UINT8 a2bus_dx1_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_dx1_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	switch (offset)
 	{
@@ -92,7 +92,7 @@ UINT8 a2bus_dx1_device::read_c0nx(address_space &space, UINT8 offset)
 	return 0xff;
 }
 
-void a2bus_dx1_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_dx1_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	switch (offset)
 	{

src/devices/bus/a2bus/a2dx1.h

@@ -25,8 +25,8 @@ class a2bus_dx1_device:
 {
 public:
 	// construction/destruction
-	a2bus_dx1_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);
-	a2bus_dx1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_dx1_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);
+	a2bus_dx1_device(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;
@@ -38,8 +38,8 @@ protected:
 	virtual void device_start() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
 	virtual bool take_c800() override;
 };
 

src/devices/bus/a2bus/a2eauxslot.cpp

@@ -25,7 +25,7 @@ const device_type A2EAUXSLOT_SLOT = &device_creator<a2eauxslot_slot_device>;
 //-------------------------------------------------
 //  a2eauxslot_slot_device - constructor
 //-------------------------------------------------
-a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 		device_t(mconfig, A2EAUXSLOT_SLOT, "Apple IIe AUX Slot", tag, owner, clock, "a2eauxslot_slot", __FILE__),
 		device_slot_interface(mconfig, *this),
 	m_a2eauxslot_tag(nullptr),
@@ -33,7 +33,7 @@ a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, co
 {
 }
 
-a2eauxslot_slot_device::a2eauxslot_slot_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) :
+a2eauxslot_slot_device::a2eauxslot_slot_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),
 		device_slot_interface(mconfig, *this), m_a2eauxslot_tag(nullptr), m_a2eauxslot_slottag(nullptr)
 {
@@ -77,14 +77,14 @@ void a2eauxslot_device::static_set_cputag(device_t &device, const char *tag)
 //  a2eauxslot_device - constructor
 //-------------------------------------------------
 
-a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 		device_t(mconfig, A2EAUXSLOT, "Apple IIe AUX Bus", tag, owner, clock, "a2eauxslot", __FILE__), m_maincpu(nullptr),
 		m_out_irq_cb(*this),
 		m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr)
 {
 }
 
-a2eauxslot_device::a2eauxslot_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) :
+a2eauxslot_device::a2eauxslot_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), m_maincpu(nullptr),
 		m_out_irq_cb(*this),
 		m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr)

src/devices/bus/a2bus/a2eauxslot.h

@@ -47,8 +47,8 @@ class a2eauxslot_slot_device : public device_t,
 {
 public:
 	// construction/destruction
-	a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	a2eauxslot_slot_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);
+	a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	a2eauxslot_slot_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-level overrides
 	virtual void device_start() override;
@@ -71,8 +71,8 @@ class a2eauxslot_device : public device_t
 {
 public:
 	// construction/destruction
-	a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	a2eauxslot_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);
+	a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	a2eauxslot_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);
 
 	// inline configuration
 	static void static_set_cputag(device_t &device, const char *tag);
@@ -118,11 +118,11 @@ public:
 	device_a2eauxslot_card_interface(const machine_config &mconfig, device_t &device);
 	virtual ~device_a2eauxslot_card_interface();
 
-	virtual UINT8 read_auxram(UINT16 offset) { printf("a2eauxslot: unhandled auxram read @ %04x\n", offset); return 0xff; }
-	virtual void write_auxram(UINT16 offset, UINT8 data) { printf("a2eauxslot: unhandled auxram write %02x @ %04x\n", data, offset); }
-	virtual void write_c07x(address_space &space, UINT8 offset, UINT8 data) {}
-	virtual UINT8 *get_vram_ptr() = 0;
-	virtual UINT8 *get_auxbank_ptr() = 0;
+	virtual uint8_t read_auxram(uint16_t offset) { printf("a2eauxslot: unhandled auxram read @ %04x\n", offset); return 0xff; }
+	virtual void write_auxram(uint16_t offset, uint8_t data) { printf("a2eauxslot: unhandled auxram write %02x @ %04x\n", data, offset); }
+	virtual void write_c07x(address_space &space, uint8_t offset, uint8_t data) {}
+	virtual uint8_t *get_vram_ptr() = 0;
+	virtual uint8_t *get_auxbank_ptr() = 0;
 	virtual bool allow_dhr() { return true; }
 
 	device_a2eauxslot_card_interface *next() const { return m_next; }

src/devices/bus/a2bus/a2echoii.cpp

@@ -48,14 +48,14 @@ machine_config_constructor a2bus_echoii_device::device_mconfig_additions() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_echoii_device::a2bus_echoii_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) :
+a2bus_echoii_device::a2bus_echoii_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_tms(*this, TMS_TAG)
 {
 }
 
-a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_ECHOII, "Street Electronics Echo II", tag, owner, clock, "a2echoii", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_tms(*this, TMS_TAG)
@@ -76,7 +76,7 @@ void a2bus_echoii_device::device_reset()
 {
 }
 
-UINT8 a2bus_echoii_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_echoii_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	switch (offset)
 	{
@@ -87,7 +87,7 @@ UINT8 a2bus_echoii_device::read_c0nx(address_space &space, UINT8 offset)
 	return 0;
 }
 
-void a2bus_echoii_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_echoii_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	switch (offset)
 	{

src/devices/bus/a2bus/a2echoii.h

@@ -25,8 +25,8 @@ class a2bus_echoii_device:
 {
 public:
 	// construction/destruction
-	a2bus_echoii_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);
-	a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_echoii_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);
+	a2bus_echoii_device(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;
@@ -38,8 +38,8 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
 	virtual bool take_c800() override;
 };
 

src/devices/bus/a2bus/a2eext80col.cpp

@@ -27,13 +27,13 @@ const device_type A2EAUX_EXT80COL = &device_creator<a2eaux_ext80col_device>;
 //  LIVE DEVICE
 //**************************************************************************
 
-a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 		device_t(mconfig, A2EAUX_EXT80COL, "Apple IIe Extended 80-Column Card", tag, owner, clock, "a2eext80", __FILE__),
 		device_a2eauxslot_card_interface(mconfig, *this)
 {
 }
 
-a2eaux_ext80col_device::a2eaux_ext80col_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) :
+a2eaux_ext80col_device::a2eaux_ext80col_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),
 		device_a2eauxslot_card_interface(mconfig, *this)
 {
@@ -54,22 +54,22 @@ void a2eaux_ext80col_device::device_reset()
 {
 }
 
-UINT8 a2eaux_ext80col_device::read_auxram(UINT16 offset)
+uint8_t a2eaux_ext80col_device::read_auxram(uint16_t offset)
 {
 	return m_ram[offset];
 }
 
-void a2eaux_ext80col_device::write_auxram(UINT16 offset, UINT8 data)
+void a2eaux_ext80col_device::write_auxram(uint16_t offset, uint8_t data)
 {
 	m_ram[offset] = data;
 }
 
-UINT8 *a2eaux_ext80col_device::get_vram_ptr()
+uint8_t *a2eaux_ext80col_device::get_vram_ptr()
 {
 	return &m_ram[0];
 }
 
-UINT8 *a2eaux_ext80col_device::get_auxbank_ptr()
+uint8_t *a2eaux_ext80col_device::get_auxbank_ptr()
 {
 	return &m_ram[0];
 }

src/devices/bus/a2bus/a2eext80col.h

@@ -24,21 +24,21 @@ class a2eaux_ext80col_device:
 {
 public:
 	// construction/destruction
-	a2eaux_ext80col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	a2eaux_ext80col_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);
+	a2eaux_ext80col_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	a2eaux_ext80col_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);
 
 protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
-	virtual UINT8 read_auxram(UINT16 offset) override;
-	virtual void write_auxram(UINT16 offset, UINT8 data) override;
-	virtual UINT8 *get_vram_ptr() override;
-	virtual UINT8 *get_auxbank_ptr() override;
+	virtual uint8_t read_auxram(uint16_t offset) override;
+	virtual void write_auxram(uint16_t offset, uint8_t data) override;
+	virtual uint8_t *get_vram_ptr() override;
+	virtual uint8_t *get_auxbank_ptr() override;
 	virtual bool allow_dhr() override { return true; }
 
 private:
-	UINT8 m_ram[64*1024];
+	uint8_t m_ram[64*1024];
 };
 
 // device type definition

src/devices/bus/a2bus/a2eramworks3.cpp

@@ -28,14 +28,14 @@ const device_type A2EAUX_RAMWORKS3 = &device_creator<a2eaux_ramworks3_device>;
 //  LIVE DEVICE
 //**************************************************************************
 
-a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 		device_t(mconfig, A2EAUX_RAMWORKS3, "Applied Engineering RamWorks III", tag, owner, clock, "a2erwks3", __FILE__),
 		device_a2eauxslot_card_interface(mconfig, *this),
 	m_bank(0)
 {
 }
 
-a2eaux_ramworks3_device::a2eaux_ramworks3_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) :
+a2eaux_ramworks3_device::a2eaux_ramworks3_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),
 		device_a2eauxslot_card_interface(mconfig, *this), m_bank(0)
 {
@@ -57,22 +57,22 @@ void a2eaux_ramworks3_device::device_reset()
 	m_bank = 0;
 }
 
-UINT8 a2eaux_ramworks3_device::read_auxram(UINT16 offset)
+uint8_t a2eaux_ramworks3_device::read_auxram(uint16_t offset)
 {
 	return m_ram[offset+m_bank];
 }
 
-void a2eaux_ramworks3_device::write_auxram(UINT16 offset, UINT8 data)
+void a2eaux_ramworks3_device::write_auxram(uint16_t offset, uint8_t data)
 {
 	m_ram[offset+m_bank] = data;
 }
 
-UINT8 *a2eaux_ramworks3_device::get_vram_ptr()
+uint8_t *a2eaux_ramworks3_device::get_vram_ptr()
 {
 	return &m_ram[0];
 }
 
-UINT8 *a2eaux_ramworks3_device::get_auxbank_ptr()
+uint8_t *a2eaux_ramworks3_device::get_auxbank_ptr()
 {
 	return &m_ram[m_bank];
 }
@@ -90,7 +90,7 @@ UINT8 *a2eaux_ramworks3_device::get_auxbank_ptr()
     However, the software will recognize and correctly use a configuration in which
     all of banks 00-7F are populated for a total of 8 megabytes.  So that's what we do.
 */
-void a2eaux_ramworks3_device::write_c07x(address_space &space, UINT8 offset, UINT8 data)
+void a2eaux_ramworks3_device::write_c07x(address_space &space, uint8_t offset, uint8_t data)
 {
 	// write to C073?
 	if (offset == 3)

src/devices/bus/a2bus/a2eramworks3.h

@@ -24,22 +24,22 @@ class a2eaux_ramworks3_device:
 {
 public:
 	// construction/destruction
-	a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	a2eaux_ramworks3_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);
+	a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	a2eaux_ramworks3_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);
 
 protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
-	virtual UINT8 read_auxram(UINT16 offset) override;
-	virtual void write_auxram(UINT16 offset, UINT8 data) override;
-	virtual UINT8 *get_vram_ptr() override;
-	virtual UINT8 *get_auxbank_ptr() override;
+	virtual uint8_t read_auxram(uint16_t offset) override;
+	virtual void write_auxram(uint16_t offset, uint8_t data) override;
+	virtual uint8_t *get_vram_ptr() override;
+	virtual uint8_t *get_auxbank_ptr() override;
 	virtual bool allow_dhr() override { return true; }
-	virtual void write_c07x(address_space &space, UINT8 offset, UINT8 data) override;
+	virtual void write_c07x(address_space &space, uint8_t offset, uint8_t data) override;
 
 private:
-	UINT8 m_ram[8*1024*1024];
+	uint8_t m_ram[8*1024*1024];
 	int m_bank;
 };
 

src/devices/bus/a2bus/a2estd80col.cpp

@@ -27,13 +27,13 @@ const device_type A2EAUX_STD80COL = &device_creator<a2eaux_std80col_device>;
 //  LIVE DEVICE
 //**************************************************************************
 
-a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 		device_t(mconfig, A2EAUX_STD80COL, "Apple IIe Standard 80-Column Card", tag, owner, clock, "a2estd80", __FILE__),
 		device_a2eauxslot_card_interface(mconfig, *this)
 {
 }
 
-a2eaux_std80col_device::a2eaux_std80col_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) :
+a2eaux_std80col_device::a2eaux_std80col_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),
 		device_a2eauxslot_card_interface(mconfig, *this)
 {
@@ -53,7 +53,7 @@ void a2eaux_std80col_device::device_reset()
 {
 }
 
-UINT8 a2eaux_std80col_device::read_auxram(UINT16 offset)
+uint8_t a2eaux_std80col_device::read_auxram(uint16_t offset)
 {
 	if (offset < 0x800)
 	{
@@ -63,7 +63,7 @@ UINT8 a2eaux_std80col_device::read_auxram(UINT16 offset)
 	return 0xff;
 }
 
-void a2eaux_std80col_device::write_auxram(UINT16 offset, UINT8 data)
+void a2eaux_std80col_device::write_auxram(uint16_t offset, uint8_t data)
 {
 	if (offset < 0x800)
 	{
@@ -71,12 +71,12 @@ void a2eaux_std80col_device::write_auxram(UINT16 offset, UINT8 data)
 	}
 }
 
-UINT8 *a2eaux_std80col_device::get_vram_ptr()
+uint8_t *a2eaux_std80col_device::get_vram_ptr()
 {
 	return &m_ram[0];
 }
 
-UINT8 *a2eaux_std80col_device::get_auxbank_ptr()
+uint8_t *a2eaux_std80col_device::get_auxbank_ptr()
 {
 	return &m_ram[0];
 }

src/devices/bus/a2bus/a2estd80col.h

@@ -24,21 +24,21 @@ class a2eaux_std80col_device:
 {
 public:
 	// construction/destruction
-	a2eaux_std80col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	a2eaux_std80col_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);
+	a2eaux_std80col_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	a2eaux_std80col_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);
 
 protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
-	virtual UINT8 read_auxram(UINT16 offset) override;
-	virtual void write_auxram(UINT16 offset, UINT8 data) override;
-	virtual UINT8 *get_vram_ptr() override;
-	virtual UINT8 *get_auxbank_ptr() override;
+	virtual uint8_t read_auxram(uint16_t offset) override;
+	virtual void write_auxram(uint16_t offset, uint8_t data) override;
+	virtual uint8_t *get_vram_ptr() override;
+	virtual uint8_t *get_auxbank_ptr() override;
 	virtual bool allow_dhr() override { return false; }  // we don't allow DHR
 
 private:
-	UINT8 m_ram[2*1024];
+	uint8_t m_ram[2*1024];
 };
 
 // device type definition

src/devices/bus/a2bus/a2hsscsi.cpp

@@ -113,7 +113,7 @@ const tiny_rom_entry *a2bus_hsscsi_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_hsscsi_device::a2bus_hsscsi_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) :
+a2bus_hsscsi_device::a2bus_hsscsi_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_ncr5380(*this, SCSI_5380_TAG),
@@ -121,7 +121,7 @@ a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, device_t
 {
 }
 
-a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_HSSCSI, "Apple II High-Speed SCSI Card", tag, owner, clock, "a2hsscsi", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_ncr5380(*this, SCSI_5380_TAG),
@@ -163,7 +163,7 @@ void a2bus_hsscsi_device::device_reset()
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_hsscsi_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_hsscsi_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	switch (offset)
 	{
@@ -200,7 +200,7 @@ UINT8 a2bus_hsscsi_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_hsscsi_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_hsscsi_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	switch (offset)
 	{
@@ -263,13 +263,13 @@ void a2bus_hsscsi_device::write_c0nx(address_space &space, UINT8 offset, UINT8 d
     read_cnxx - called for reads from this card's cnxx space
 -------------------------------------------------*/
 
-UINT8 a2bus_hsscsi_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_hsscsi_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	// one slot image at the start of the ROM, it appears
 	return m_rom[offset];
 }
 
-void a2bus_hsscsi_device::write_cnxx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_hsscsi_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data)
 {
 //  printf("Write %02x to cn%02x (PC=%x)\n", data, offset, space.device().safe_pc());
 }
@@ -278,7 +278,7 @@ void a2bus_hsscsi_device::write_cnxx(address_space &space, UINT8 offset, UINT8 d
     read_c800 - called for reads from this card's c800 space
 -------------------------------------------------*/
 
-UINT8 a2bus_hsscsi_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_hsscsi_device::read_c800(address_space &space, uint16_t offset)
 {
 	// bankswitched RAM at c800-cbff
 	// bankswitched ROM at cc00-cfff
@@ -301,7 +301,7 @@ UINT8 a2bus_hsscsi_device::read_c800(address_space &space, UINT16 offset)
 /*-------------------------------------------------
     write_c800 - called for writes to this card's c800 space
 -------------------------------------------------*/
-void a2bus_hsscsi_device::write_c800(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_hsscsi_device::write_c800(address_space &space, uint16_t offset, uint8_t data)
 {
 	if (offset < 0x400)
 	{

src/devices/bus/a2bus/a2hsscsi.h

@@ -25,8 +25,8 @@ class a2bus_hsscsi_device:
 {
 public:
 	// construction/destruction
-	a2bus_hsscsi_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);
-	a2bus_hsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_hsscsi_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);
+	a2bus_hsscsi_device(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;
@@ -42,21 +42,21 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
-	virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
-	virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+	virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
+	virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
 
 private:
-	UINT8 *m_rom;
-	UINT8 m_ram[8192];  // 8 banks of 1024 bytes
+	uint8_t *m_rom;
+	uint8_t m_ram[8192];  // 8 banks of 1024 bytes
 	int m_rambank, m_rombank;
-	UINT8 m_drq;
-	UINT8 m_bank;
+	uint8_t m_drq;
+	uint8_t m_bank;
 	bool m_816block;
-	UINT8 m_c0ne, m_c0nf;
+	uint8_t m_c0ne, m_c0nf;
 };
 
 // device type definition

src/devices/bus/a2bus/a2lang.cpp

@@ -34,14 +34,14 @@ const device_type A2BUS_LANG = &device_creator<a2bus_lang_device>;
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_lang_device::a2bus_lang_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_lang_device::a2bus_lang_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 		device_t(mconfig, A2BUS_LANG, "Apple II Language Card", tag, owner, clock, "a2lang", __FILE__),
 		device_a2bus_card_interface(mconfig, *this)
 {
 	last_offset = -1;
 }
 
-a2bus_lang_device::a2bus_lang_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) :
+a2bus_lang_device::a2bus_lang_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),
 		device_a2bus_card_interface(mconfig, *this)
 {
@@ -70,7 +70,7 @@ void a2bus_lang_device::device_reset()
 
 void a2bus_lang_device::langcard_touch(offs_t offset)
 {
-	UINT32 val, mask;
+	uint32_t val, mask;
 
 	if (LOG_LANGCARD)
 		logerror("language card bankswitch read, offset: $c08%0x\n", offset);
@@ -104,7 +104,7 @@ void a2bus_lang_device::langcard_touch(offs_t offset)
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_lang_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_lang_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	apple2_state *state = machine().driver_data<apple2_state>();
 
@@ -138,7 +138,7 @@ UINT8 a2bus_lang_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_lang_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_lang_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	langcard_touch(offset);
 	last_offset = -1;

src/devices/bus/a2bus/a2lang.h

@@ -24,15 +24,15 @@ class a2bus_lang_device:
 {
 public:
 	// construction/destruction
-	a2bus_lang_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	a2bus_lang_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);
+	a2bus_lang_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	a2bus_lang_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);
 
 protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
 
 private:
 	void langcard_touch(offs_t offset);

src/devices/bus/a2bus/a2mcms.cpp

@@ -68,14 +68,14 @@ machine_config_constructor a2bus_mcms1_device::device_mconfig_additions() const
 //  LIVE DEVICE - Card 1
 //**************************************************************************
 
-a2bus_mcms1_device::a2bus_mcms1_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) :
+a2bus_mcms1_device::a2bus_mcms1_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_mcms(*this, ENGINE_TAG)
 {
 }
 
-a2bus_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_MCMS1, "Mountain Computer Music System (card 1)", tag, owner, clock, "a2mcms1", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_mcms(*this, ENGINE_TAG)
@@ -99,7 +99,7 @@ void a2bus_mcms1_device::device_reset()
 
 // read once at c0n0 to disable 125 Hz IRQs
 // read once at c0n1 to enable 125 Hz IRQs
-UINT8 a2bus_mcms1_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_mcms1_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	if (offset == 0)
 	{
@@ -114,13 +114,13 @@ UINT8 a2bus_mcms1_device::read_c0nx(address_space &space, UINT8 offset)
 }
 
 // read at Cn00: light gun in bit 7, bits 0-5 = 'random' number
-UINT8 a2bus_mcms1_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_mcms1_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	return m_mcms->get_pen_rand();
 }
 
 // write 0-255 to Cn00 to set the master volume
-void a2bus_mcms1_device::write_cnxx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_mcms1_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data)
 {
 	if (offset == 0)
 	{
@@ -149,13 +149,13 @@ WRITE_LINE_MEMBER(a2bus_mcms1_device::irq_w)
 //  LIVE DEVICE - Card 2
 //**************************************************************************
 
-a2bus_mcms2_device::a2bus_mcms2_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) :
+a2bus_mcms2_device::a2bus_mcms2_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),
 	device_a2bus_card_interface(mconfig, *this), m_card1(nullptr), m_engine(nullptr)
 {
 }
 
-a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_MCMS2, "Mountain Computer Music System (card 2)", tag, owner, clock, "a2mcms2", __FILE__),
 	device_a2bus_card_interface(mconfig, *this), m_card1(nullptr), m_engine(nullptr)
 {
@@ -183,14 +183,14 @@ void a2bus_mcms2_device::device_reset()
 }
 
 // here to soak up false reads from indexed accesses
-UINT8 a2bus_mcms2_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_mcms2_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	return 0xff;
 }
 
 // write once to c0n0 to disable the card (reset also disables)
 // write twice to c0n1 to enable the card (value doesn't matter)
-void a2bus_mcms2_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_mcms2_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	if (offset == 0)
 	{
@@ -202,7 +202,7 @@ void a2bus_mcms2_device::write_c0nx(address_space &space, UINT8 offset, UINT8 da
 	}
 }
 
-void a2bus_mcms2_device::write_cnxx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_mcms2_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data)
 {
 	m_engine->voiceregs_w(space, offset, data);
 }
@@ -212,7 +212,7 @@ void a2bus_mcms2_device::write_cnxx(address_space &space, UINT8 offset, UINT8 da
     Sound device implementation
 */
 
-mcms_device::mcms_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mcms_device::mcms_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 	: device_t(mconfig, MCMS, "Mountain Computer Music System engine", tag, owner, clock, "msmseng", __FILE__),
 	device_sound_interface(mconfig, *this),
 	m_write_irq(*this), m_stream(nullptr), m_timer(nullptr), m_clrtimer(nullptr), m_pBusDevice(nullptr), m_enabled(false), m_mastervol(0), m_rand(0)
@@ -272,9 +272,9 @@ void mcms_device::sound_stream_update(sound_stream &stream, stream_sample_t **in
 {
 	stream_sample_t *outL, *outR;
 	int i, v;
-	UINT16 wptr;
-	INT8 sample;
-	INT32 mixL, mixR;
+	uint16_t wptr;
+	int8_t sample;
+	int32_t mixL, mixR;
 
 	outL = outputs[1];
 	outR = outputs[0];

src/devices/bus/a2bus/a2mcms.h

@@ -26,11 +26,11 @@ class mcms_device : public device_t, public device_sound_interface
 {
 public:
 	// construction/destruction
-	mcms_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	mcms_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	DECLARE_WRITE8_MEMBER(voiceregs_w);
 	DECLARE_WRITE8_MEMBER(control_w);
-	UINT8 get_pen_rand(void) { m_stream->update(); return m_rand; }
+	uint8_t get_pen_rand(void) { m_stream->update(); return m_rand; }
 
 	void set_bus_device(a2bus_mcms1_device *pDev) { m_pBusDevice = pDev; }
 
@@ -50,12 +50,12 @@ private:
 	emu_timer *m_timer, *m_clrtimer;
 	a2bus_mcms1_device *m_pBusDevice;
 	bool m_enabled;
-	UINT8 m_vols[16];
-	UINT8 m_table[16];
-	UINT16 m_freq[16];
-	UINT16 m_acc[16];
-	UINT8 m_mastervol;
-	UINT8 m_rand;
+	uint8_t m_vols[16];
+	uint8_t m_table[16];
+	uint16_t m_freq[16];
+	uint16_t m_acc[16];
+	uint8_t m_mastervol;
+	uint8_t m_rand;
 };
 
 // card 1
@@ -65,8 +65,8 @@ class a2bus_mcms1_device:
 {
 public:
 	// construction/destruction
-	a2bus_mcms1_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);
-	a2bus_mcms1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_mcms1_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);
+	a2bus_mcms1_device(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;
@@ -83,9 +83,9 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
-	virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+	virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override;
 	virtual bool take_c800() override { return false; }
 };
 
@@ -96,17 +96,17 @@ class a2bus_mcms2_device:
 {
 public:
 	// construction/destruction
-	a2bus_mcms2_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);
-	a2bus_mcms2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_mcms2_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);
+	a2bus_mcms2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override;
 	virtual bool take_c800() override { return false; }
 
 private:

src/devices/bus/a2bus/a2memexp.cpp

@@ -73,13 +73,13 @@ const tiny_rom_entry *a2bus_ramfactor_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_memexp_device::a2bus_memexp_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) :
+a2bus_memexp_device::a2bus_memexp_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),
 	device_a2bus_card_interface(mconfig, *this), m_isramfactor(false), m_bankhior(0), m_addrmask(0), m_rom(nullptr), m_wptr(0), m_liveptr(0)
 {
 }
 
-a2bus_memexpapple_device::a2bus_memexpapple_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_memexpapple_device::a2bus_memexpapple_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_memexp_device(mconfig, A2BUS_MEMEXP, "Apple II Memory Expansion Card", tag, owner, clock, "a2memexp", __FILE__)
 {
 	m_isramfactor = false;
@@ -87,7 +87,7 @@ a2bus_memexpapple_device::a2bus_memexpapple_device(const machine_config &mconfig
 	m_addrmask = 0xfffff;
 }
 
-a2bus_ramfactor_device::a2bus_ramfactor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ramfactor_device::a2bus_ramfactor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_memexp_device(mconfig, A2BUS_RAMFACTOR, "Applied Engineering RamFactor", tag, owner, clock, "a2ramfac", __FILE__)
 {
 	m_isramfactor = true;
@@ -106,7 +106,7 @@ void a2bus_memexp_device::device_start()
 
 	m_rom = device().machine().root_device().memregion(this->subtag(MEMEXP_ROM_REGION).c_str())->base();
 
-	memset(m_ram, 0xff, 1024*1024*sizeof(UINT8));
+	memset(m_ram, 0xff, 1024*1024*sizeof(uint8_t));
 
 	save_item(NAME(m_regs));
 	save_item(NAME(m_ram));
@@ -116,7 +116,7 @@ void a2bus_memexp_device::device_start()
 
 void a2bus_memexp_device::device_reset()
 {
-	memset(m_regs, 0, sizeof(UINT8) * 0x10);
+	memset(m_regs, 0, sizeof(uint8_t) * 0x10);
 	m_wptr = m_liveptr = 0;
 }
 
@@ -125,9 +125,9 @@ void a2bus_memexp_device::device_reset()
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_memexp_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_memexp_device::read_c0nx(address_space &space, uint8_t offset)
 {
-	UINT8 retval = m_regs[offset];
+	uint8_t retval = m_regs[offset];
 
 	if (offset == 3)
 	{
@@ -149,7 +149,7 @@ UINT8 a2bus_memexp_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_memexp_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_memexp_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 //    printf("Write %02x to c0n%x (PC=%x)\n", data, offset, space.device().safe_pc());
 
@@ -201,7 +201,7 @@ void a2bus_memexp_device::write_c0nx(address_space &space, UINT8 offset, UINT8 d
     read_cnxx - called for reads from this card's cnxx space
 -------------------------------------------------*/
 
-UINT8 a2bus_memexp_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_memexp_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	int slotimg = m_slot * 0x100;
 
@@ -218,7 +218,7 @@ UINT8 a2bus_memexp_device::read_cnxx(address_space &space, UINT8 offset)
     read_c800 - called for reads from this card's c800 space
 -------------------------------------------------*/
 
-UINT8 a2bus_memexp_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_memexp_device::read_c800(address_space &space, uint16_t offset)
 {
 	// c70a diags confirm: bit 1 of cn0F banks in the second half of the ROM
 	if ((m_isramfactor) && (m_regs[0xf] & 0x01))

src/devices/bus/a2bus/a2memexp.h

@@ -24,14 +24,14 @@ class a2bus_memexp_device:
 {
 public:
 	// construction/destruction
-	a2bus_memexp_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);
+	a2bus_memexp_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);
 
 	// optional information overrides
 	virtual machine_config_constructor device_mconfig_additions() const override;
 	virtual const tiny_rom_entry *device_rom_region() const override;
 
 	bool m_isramfactor;
-	UINT8 m_bankhior;
+	uint8_t m_bankhior;
 	int m_addrmask;
 
 protected:
@@ -39,28 +39,28 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
-	virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+	virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
 
 private:
-	UINT8 *m_rom;
-	UINT8 m_regs[0x10];
-	UINT8 m_ram[8*1024*1024];
+	uint8_t *m_rom;
+	uint8_t m_regs[0x10];
+	uint8_t m_ram[8*1024*1024];
 	int m_wptr, m_liveptr;
 };
 
 class a2bus_memexpapple_device : public a2bus_memexp_device
 {
 public:
-	a2bus_memexpapple_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_memexpapple_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 };
 
 class a2bus_ramfactor_device : public a2bus_memexp_device
 {
 public:
-	a2bus_ramfactor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_ramfactor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };

src/devices/bus/a2bus/a2midi.cpp

@@ -59,7 +59,7 @@ machine_config_constructor a2bus_midi_device::device_mconfig_additions() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 		device_t(mconfig, A2BUS_MIDI, "6850 MIDI card", tag, owner, clock, "a2midi", __FILE__),
 		device_a2bus_card_interface(mconfig, *this),
 		m_ptm(*this, MIDI_PTM_TAG),
@@ -68,7 +68,7 @@ a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, const char *
 {
 }
 
-a2bus_midi_device::a2bus_midi_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) :
+a2bus_midi_device::a2bus_midi_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),
 		device_a2bus_card_interface(mconfig, *this),
 		m_ptm(*this, MIDI_PTM_TAG),
@@ -96,7 +96,7 @@ void a2bus_midi_device::device_reset()
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_midi_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_midi_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	// PTM at C0n0-C0n7, ACIA at C0n8-C0n9, drum sync (?) at C0nA-C0nB
 
@@ -110,7 +110,7 @@ UINT8 a2bus_midi_device::read_c0nx(address_space &space, UINT8 offset)
 	}
 	else if (offset == 9)
 	{
-		UINT8 ret = m_acia->data_r(space, 0);
+		uint8_t ret = m_acia->data_r(space, 0);
 		return ret;
 	}
 
@@ -121,7 +121,7 @@ UINT8 a2bus_midi_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_midi_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_midi_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	if (offset < 8)
 	{

src/devices/bus/a2bus/a2midi.h

@@ -25,8 +25,8 @@ class a2bus_midi_device:
 {
 public:
 	// construction/destruction
-	a2bus_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	a2bus_midi_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);
+	a2bus_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	a2bus_midi_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);
 
 	// optional information overrides
 	virtual machine_config_constructor device_mconfig_additions() const override;
@@ -39,8 +39,8 @@ protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
 
 	required_device<ptm6840_device> m_ptm;
 	required_device<acia6850_device> m_acia;

src/devices/bus/a2bus/a2mockingboard.cpp

@@ -120,7 +120,7 @@ machine_config_constructor a2bus_echoplus_device::device_mconfig_additions() con
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_ayboard_device::a2bus_ayboard_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) :
+a2bus_ayboard_device::a2bus_ayboard_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_via1(*this, VIA1_TAG),
@@ -132,21 +132,21 @@ a2bus_ayboard_device::a2bus_ayboard_device(const machine_config &mconfig, device
 {
 }
 
-a2bus_mockingboard_device::a2bus_mockingboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_mockingboard_device::a2bus_mockingboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_ayboard_device(mconfig, A2BUS_MOCKINGBOARD, "Sweet Micro Systems Mockingboard", tag, owner, clock, "a2mockbd", __FILE__)
 {
 	m_isPhasor = false;
 	m_PhasorNative = false;
 }
 
-a2bus_phasor_device::a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_phasor_device::a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_ayboard_device(mconfig, A2BUS_PHASOR, "Applied Engineering Phasor", tag, owner, clock, "a2phasor", __FILE__)
 {
 	m_isPhasor = true;
 	m_PhasorNative = false;
 }
 
-a2bus_echoplus_device::a2bus_echoplus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_echoplus_device::a2bus_echoplus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_ayboard_device(mconfig, A2BUS_ECHOPLUS, "Street Electronics Echo Plus", tag, owner, clock, "a2echop", __FILE__),
 	m_tms(*this, E2P_TMS_TAG)
 {
@@ -176,12 +176,12 @@ void a2bus_ayboard_device::device_reset()
     read_cnxx - called for reads from this card's cnxx space
 -------------------------------------------------*/
 
-UINT8 a2bus_ayboard_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_ayboard_device::read_cnxx(address_space &space, uint8_t offset)
 {
 //    printf("Mockingboard(%d): read @ Cn%02X (PC=%x)\n", m_slot, offset, space.device().safe_pc());
 	if (m_isPhasor)
 	{
-		UINT8 retVal = 0;
+		uint8_t retVal = 0;
 		int viaSel;
 
 		if (m_PhasorNative)
@@ -227,7 +227,7 @@ UINT8 a2bus_ayboard_device::read_cnxx(address_space &space, UINT8 offset)
     write_cnxx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_ayboard_device::write_cnxx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_ayboard_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data)
 {
 	if (m_isPhasor)
 	{
@@ -488,7 +488,7 @@ WRITE8_MEMBER( a2bus_ayboard_device::via2_out_b )
 	}
 }
 
-UINT8 a2bus_ayboard_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_ayboard_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	if (m_isPhasor)
 	{
@@ -498,7 +498,7 @@ UINT8 a2bus_ayboard_device::read_c0nx(address_space &space, UINT8 offset)
 	return 0xff;
 }
 
-void a2bus_ayboard_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_ayboard_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	if (m_isPhasor)
 	{
@@ -506,7 +506,7 @@ void a2bus_ayboard_device::write_c0nx(address_space &space, UINT8 offset, UINT8
 	}
 }
 
-UINT8 a2bus_echoplus_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_echoplus_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	switch (offset)
 	{
@@ -517,7 +517,7 @@ UINT8 a2bus_echoplus_device::read_c0nx(address_space &space, UINT8 offset)
 	return 0;
 }
 
-void a2bus_echoplus_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_echoplus_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	switch (offset)
 	{

src/devices/bus/a2bus/a2mockingboard.h

@@ -27,7 +27,7 @@ class a2bus_ayboard_device:
 {
 public:
 	// construction/destruction
-	a2bus_ayboard_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);
+	a2bus_ayboard_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);
 
 	// optional information overrides
 	virtual machine_config_constructor device_mconfig_additions() const override;
@@ -44,10 +44,10 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
-	virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+	virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override;
 
 	required_device<via6522_device> m_via1;
 	required_device<via6522_device> m_via2;
@@ -59,19 +59,19 @@ protected:
 	bool m_isPhasor, m_PhasorNative;
 
 private:
-	UINT8 m_porta1, m_porta2;
+	uint8_t m_porta1, m_porta2;
 };
 
 class a2bus_mockingboard_device : public a2bus_ayboard_device
 {
 public:
-	a2bus_mockingboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_mockingboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 };
 
 class a2bus_phasor_device : public a2bus_ayboard_device
 {
 public:
-	a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	virtual machine_config_constructor device_mconfig_additions() const override;
 };
@@ -79,10 +79,10 @@ public:
 class a2bus_echoplus_device : public a2bus_ayboard_device
 {
 public:
-	a2bus_echoplus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_echoplus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
 
 	required_device<tms5220_device> m_tms;
 

src/devices/bus/a2bus/a2pic.cpp

@@ -98,7 +98,7 @@ const tiny_rom_entry *a2bus_pic_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 		device_t(mconfig, A2BUS_PIC, "Apple Parallel Interface Card", tag, owner, clock, "a2pic", __FILE__),
 		device_a2bus_card_interface(mconfig, *this),
 		m_dsw1(*this, "DSW1"),
@@ -109,7 +109,7 @@ a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, const char *ta
 {
 }
 
-a2bus_pic_device::a2bus_pic_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) :
+a2bus_pic_device::a2bus_pic_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),
 		device_a2bus_card_interface(mconfig, *this),
 		m_dsw1(*this, "DSW1"),
@@ -163,7 +163,7 @@ void a2bus_pic_device::device_timer(emu_timer &timer, device_timer_id tid, int p
     read_cnxx - called for reads from this card's cnxx space
 -------------------------------------------------*/
 
-UINT8 a2bus_pic_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_pic_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	m_autostrobe = true;
 
@@ -179,9 +179,9 @@ UINT8 a2bus_pic_device::read_cnxx(address_space &space, UINT8 offset)
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_pic_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_pic_device::read_c0nx(address_space &space, uint8_t offset)
 {
-	UINT8 rv = 0;
+	uint8_t rv = 0;
 
 	switch (offset)
 	{
@@ -222,7 +222,7 @@ UINT8 a2bus_pic_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_pic_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_pic_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	switch (offset)
 	{
@@ -255,7 +255,7 @@ WRITE_LINE_MEMBER( a2bus_pic_device::ack_w )
 {
 	if (m_started)
 	{
-		UINT8 dsw1 = m_dsw1->read();
+		uint8_t dsw1 = m_dsw1->read();
 
 		if (dsw1 & 0x10)    // negative polarity
 		{

src/devices/bus/a2bus/a2pic.h

@@ -24,8 +24,8 @@ class a2bus_pic_device:
 {
 public:
 	// construction/destruction
-	a2bus_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	a2bus_pic_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);
+	a2bus_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	a2bus_pic_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);
 
 	// optional information overrides
 	virtual machine_config_constructor device_mconfig_additions() const override;
@@ -41,9 +41,9 @@ protected:
 	virtual void device_reset() override;
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
 
 	required_device<centronics_device> m_ctx;
 	required_device<input_buffer_device> m_ctx_data_in;
@@ -53,9 +53,9 @@ protected:
 	void clear_strobe();
 
 private:
-	UINT8 *m_rom;
+	uint8_t *m_rom;
 	bool m_started;
-	UINT8 m_ack;
+	uint8_t m_ack;
 	bool m_irqenable;
 	bool m_autostrobe;
 	emu_timer *m_timer;

src/devices/bus/a2bus/a2sam.cpp

@@ -47,7 +47,7 @@ machine_config_constructor a2bus_sam_device::device_mconfig_additions() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_sam_device::a2bus_sam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_sam_device::a2bus_sam_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_SAM, "Don't Ask Software SAM", tag, owner, clock, "a2sam", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_dac(*this, "dac")
@@ -68,7 +68,7 @@ void a2bus_sam_device::device_reset()
 {
 }
 
-void a2bus_sam_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_sam_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	m_dac->write(data);
 }

src/devices/bus/a2bus/a2sam.h

@@ -25,7 +25,7 @@ class a2bus_sam_device:
 {
 public:
 	// construction/destruction
-	a2bus_sam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_sam_device(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;
@@ -37,7 +37,7 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
 	virtual bool take_c800() override;
 };
 

src/devices/bus/a2bus/a2scsi.cpp

@@ -106,7 +106,7 @@ const tiny_rom_entry *a2bus_scsi_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_scsi_device::a2bus_scsi_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) :
+a2bus_scsi_device::a2bus_scsi_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_ncr5380(*this, SCSI_5380_TAG),
@@ -114,7 +114,7 @@ a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, device_type
 {
 }
 
-a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_SCSI, "Apple II SCSI Card", tag, owner, clock, "a2scsi", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_ncr5380(*this, SCSI_5380_TAG),
@@ -154,7 +154,7 @@ void a2bus_scsi_device::device_reset()
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_scsi_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_scsi_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	switch (offset)
 	{
@@ -194,7 +194,7 @@ UINT8 a2bus_scsi_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_scsi_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_scsi_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	switch (offset)
 	{
@@ -262,13 +262,13 @@ void a2bus_scsi_device::write_c0nx(address_space &space, UINT8 offset, UINT8 dat
     read_cnxx - called for reads from this card's cnxx space
 -------------------------------------------------*/
 
-UINT8 a2bus_scsi_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_scsi_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	// one slot image at the start of the ROM, it appears
 	return m_rom[offset];
 }
 
-void a2bus_scsi_device::write_cnxx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_scsi_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data)
 {
 	// there are writes to cn0A, possibly misguided C0nA (bank select?) writes?
 //  printf("Write %02x to cn%02x (PC=%x)\n", data, offset, space.device().safe_pc());
@@ -278,7 +278,7 @@ void a2bus_scsi_device::write_cnxx(address_space &space, UINT8 offset, UINT8 dat
     read_c800 - called for reads from this card's c800 space
 -------------------------------------------------*/
 
-UINT8 a2bus_scsi_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_scsi_device::read_c800(address_space &space, uint16_t offset)
 {
 	// bankswitched RAM at c800-cbff
 	// bankswitched ROM at cc00-cfff
@@ -301,7 +301,7 @@ UINT8 a2bus_scsi_device::read_c800(address_space &space, UINT16 offset)
 /*-------------------------------------------------
     write_c800 - called for writes to this card's c800 space
 -------------------------------------------------*/
-void a2bus_scsi_device::write_c800(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_scsi_device::write_c800(address_space &space, uint16_t offset, uint8_t data)
 {
 	if (offset < 0x400)
 	{

src/devices/bus/a2bus/a2scsi.h

@@ -25,8 +25,8 @@ class a2bus_scsi_device:
 {
 public:
 	// construction/destruction
-	a2bus_scsi_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);
-	a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_scsi_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);
+	a2bus_scsi_device(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;
@@ -42,19 +42,19 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
-	virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
-	virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+	virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
+	virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
 
 private:
-	UINT8 *m_rom;
-	UINT8 m_ram[8192];  // 8 banks of 1024 bytes
+	uint8_t *m_rom;
+	uint8_t m_ram[8192];  // 8 banks of 1024 bytes
 	int m_rambank, m_rombank;
-	UINT8 m_drq;
-	UINT8 m_bank;
+	uint8_t m_drq;
+	uint8_t m_bank;
 	bool m_816block;
 };
 

src/devices/bus/a2bus/a2softcard.cpp

@@ -51,14 +51,14 @@ machine_config_constructor a2bus_softcard_device::device_mconfig_additions() con
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_softcard_device::a2bus_softcard_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) :
+a2bus_softcard_device::a2bus_softcard_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_z80(*this, Z80_TAG), m_bEnabled(false), m_FirstZ80Boot(false)
 {
 }
 
-a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_SOFTCARD, "Microsoft SoftCard", tag, owner, clock, "a2softcard", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_z80(*this, Z80_TAG), m_bEnabled(false), m_FirstZ80Boot(false)
@@ -86,7 +86,7 @@ void a2bus_softcard_device::device_reset()
 	m_z80->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
 }
 
-void a2bus_softcard_device::write_cnxx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_softcard_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data)
 {
 	if (!m_bEnabled)
 	{

src/devices/bus/a2bus/a2softcard.h

@@ -24,8 +24,8 @@ class a2bus_softcard_device:
 {
 public:
 	// construction/destruction
-	a2bus_softcard_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);
-	a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_softcard_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);
+	a2bus_softcard_device(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;
@@ -38,7 +38,7 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override;
+	virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override;
 	virtual bool take_c800() override;
 
 	required_device<cpu_device> m_z80;

src/devices/bus/a2bus/a2ssc.cpp

@@ -127,7 +127,7 @@ const tiny_rom_entry *a2bus_ssc_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 		device_t(mconfig, A2BUS_SSC, "Apple Super Serial Card", tag, owner, clock, "a2ssc", __FILE__),
 		device_a2bus_card_interface(mconfig, *this),
 		m_dsw1(*this, "DSW1"),
@@ -137,7 +137,7 @@ a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, const char *ta
 {
 }
 
-a2bus_ssc_device::a2bus_ssc_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) :
+a2bus_ssc_device::a2bus_ssc_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),
 		device_a2bus_card_interface(mconfig, *this),
 		m_dsw1(*this, "DSW1"),
@@ -168,7 +168,7 @@ void a2bus_ssc_device::device_reset()
     read_cnxx - called for reads from this card's cnxx space
 -------------------------------------------------*/
 
-UINT8 a2bus_ssc_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_ssc_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	return m_rom[(offset&0xff)+0x700];
 }
@@ -177,7 +177,7 @@ UINT8 a2bus_ssc_device::read_cnxx(address_space &space, UINT8 offset)
     read_c800 - called for reads from this card's c800 space
 -------------------------------------------------*/
 
-UINT8 a2bus_ssc_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_ssc_device::read_c800(address_space &space, uint16_t offset)
 {
 	return m_rom[offset];
 }
@@ -186,7 +186,7 @@ UINT8 a2bus_ssc_device::read_c800(address_space &space, UINT16 offset)
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_ssc_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_ssc_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	// dips at C0n1/C0n2, ACIA at C0n8/9/A/B
 
@@ -212,7 +212,7 @@ UINT8 a2bus_ssc_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_ssc_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_ssc_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	switch (offset)
 	{

src/devices/bus/a2bus/a2ssc.h

@@ -24,8 +24,8 @@ class a2bus_ssc_device:
 {
 public:
 	// construction/destruction
-	a2bus_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	a2bus_ssc_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);
+	a2bus_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	a2bus_ssc_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);
 
 	// optional information overrides
 	virtual machine_config_constructor device_mconfig_additions() const override;
@@ -40,15 +40,15 @@ protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
-	virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+	virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
 
 	required_device<mos6551_device> m_acia;
 
 private:
-	UINT8 *m_rom;
+	uint8_t *m_rom;
 	bool m_started;
 };
 

src/devices/bus/a2bus/a2swyft.cpp

@@ -45,13 +45,13 @@ const tiny_rom_entry *a2bus_swyft_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 		device_t(mconfig, A2BUS_SWYFT, "IAI SwyftCard", tag, owner, clock, "a2swyft", __FILE__),
 		device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_rombank(0), m_inh_state(0)
 {
 }
 
-a2bus_swyft_device::a2bus_swyft_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) :
+a2bus_swyft_device::a2bus_swyft_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),
 		device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_rombank(0), m_inh_state(0)
 {
@@ -79,7 +79,7 @@ void a2bus_swyft_device::device_reset()
 	recalc_slot_inh();
 }
 
-UINT8 a2bus_swyft_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_swyft_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	switch (offset)
 	{
@@ -105,7 +105,7 @@ UINT8 a2bus_swyft_device::read_c0nx(address_space &space, UINT8 offset)
 	return 0xff;
 }
 
-void a2bus_swyft_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_swyft_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	switch (offset)
 	{
@@ -129,7 +129,7 @@ void a2bus_swyft_device::write_c0nx(address_space &space, UINT8 offset, UINT8 da
 	}
 }
 
-UINT8 a2bus_swyft_device::read_inh_rom(address_space &space, UINT16 offset)
+uint8_t a2bus_swyft_device::read_inh_rom(address_space &space, uint16_t offset)
 {
 	offset -= 0xd000;
 

src/devices/bus/a2bus/a2swyft.h

@@ -24,8 +24,8 @@ class a2bus_swyft_device:
 {
 public:
 	// construction/destruction
-	a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	a2bus_swyft_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);
+	a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	a2bus_swyft_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 const tiny_rom_entry *device_rom_region() const override;
 
@@ -33,15 +33,15 @@ protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_inh_rom(address_space &space, UINT16 offset) override;
-	virtual UINT16 inh_start() override { return 0xd000; }
-	virtual UINT16 inh_end() override { return 0xffff; }
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_inh_rom(address_space &space, uint16_t offset) override;
+	virtual uint16_t inh_start() override { return 0xd000; }
+	virtual uint16_t inh_end() override { return 0xffff; }
 	virtual int inh_type() override;
 
 private:
-	UINT8 *m_rom;
+	uint8_t *m_rom;
 	int m_rombank;
 	int m_inh_state;
 };

src/devices/bus/a2bus/a2themill.cpp

@@ -67,14 +67,14 @@ machine_config_constructor a2bus_themill_device::device_mconfig_additions() cons
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_themill_device::a2bus_themill_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) :
+a2bus_themill_device::a2bus_themill_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_6809(*this, M6809_TAG), m_bEnabled(false), m_flipAddrSpace(false), m_6809Mode(false), m_status(0)
 {
 }
 
-a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_THEMILL, "Stellation Two The Mill", tag, owner, clock, "a2themill", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_6809(*this, M6809_TAG), m_bEnabled(false), m_flipAddrSpace(false), m_6809Mode(false), m_status(0)
@@ -106,12 +106,12 @@ void a2bus_themill_device::device_reset()
 	m_6809->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
 }
 
-UINT8 a2bus_themill_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_themill_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	return m_status;
 }
 
-void a2bus_themill_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_themill_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	switch (offset)
 	{

src/devices/bus/a2bus/a2themill.h

@@ -24,8 +24,8 @@ class a2bus_themill_device:
 {
 public:
 	// construction/destruction
-	a2bus_themill_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);
-	a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_themill_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);
+	a2bus_themill_device(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;
@@ -38,8 +38,8 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
 	virtual bool take_c800() override;
 
 	required_device<cpu_device> m_6809;
@@ -48,7 +48,7 @@ private:
 	bool m_bEnabled;
 	bool m_flipAddrSpace;
 	bool m_6809Mode;
-	UINT8 m_status;
+	uint8_t m_status;
 };
 
 // device type definition

src/devices/bus/a2bus/a2thunderclock.cpp

@@ -76,14 +76,14 @@ const tiny_rom_entry *a2bus_thunderclock_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_thunderclock_device::a2bus_thunderclock_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) :
+a2bus_thunderclock_device::a2bus_thunderclock_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_upd1990ac(*this, THUNDERCLOCK_UPD1990_TAG), m_rom(nullptr), m_dataout(0)
 {
 }
 
-a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_THUNDERCLOCK, "ThunderWare ThunderClock Plus", tag, owner, clock, "a2thunpl", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_upd1990ac(*this, THUNDERCLOCK_UPD1990_TAG), m_rom(nullptr), m_dataout(0)
@@ -114,7 +114,7 @@ void a2bus_thunderclock_device::device_reset()
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_thunderclock_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_thunderclock_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	return (m_dataout << 7);
 }
@@ -124,7 +124,7 @@ UINT8 a2bus_thunderclock_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_thunderclock_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_thunderclock_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	// uPD1990AC hookup:
 	// bit 0 = DATA IN?
@@ -151,7 +151,7 @@ void a2bus_thunderclock_device::write_c0nx(address_space &space, UINT8 offset, U
     read_cnxx - called for reads from this card's cnxx space
 -------------------------------------------------*/
 
-UINT8 a2bus_thunderclock_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_thunderclock_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	// ROM is primarily a c800 image, but the first page is also the CnXX ROM
 	return m_rom[offset];
@@ -161,7 +161,7 @@ UINT8 a2bus_thunderclock_device::read_cnxx(address_space &space, UINT8 offset)
     read_c800 - called for reads from this card's c800 space
 -------------------------------------------------*/
 
-UINT8 a2bus_thunderclock_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_thunderclock_device::read_c800(address_space &space, uint16_t offset)
 {
 	return m_rom[offset];
 }

src/devices/bus/a2bus/a2thunderclock.h

@@ -25,8 +25,8 @@ class a2bus_thunderclock_device:
 {
 public:
 	// construction/destruction
-	a2bus_thunderclock_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);
-	a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_thunderclock_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);
+	a2bus_thunderclock_device(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;
@@ -39,15 +39,15 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
-	virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+	virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
 
 	required_device<upd1990a_device> m_upd1990ac;
 
 private:
-	UINT8 *m_rom;
+	uint8_t *m_rom;
 	int m_dataout;
 };
 

src/devices/bus/a2bus/a2ultraterm.cpp

@@ -138,19 +138,19 @@ const tiny_rom_entry *a2bus_ultratermenh_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_videx160_device::a2bus_videx160_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) :
+a2bus_videx160_device::a2bus_videx160_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),
 	device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_chrrom(nullptr), m_framecnt(0), m_ctrl1(0), m_ctrl2(0),
 	m_crtc(*this, ULTRATERM_MC6845_NAME), m_rambank(0)
 {
 }
 
-a2bus_ultraterm_device::a2bus_ultraterm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ultraterm_device::a2bus_ultraterm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_videx160_device(mconfig, A2BUS_ULTRATERM, "Videx UltraTerm (original)", tag, owner, clock, "a2ulttrm", __FILE__)
 {
 }
 
-a2bus_ultratermenh_device::a2bus_ultratermenh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ultratermenh_device::a2bus_ultratermenh_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_videx160_device(mconfig, A2BUS_ULTRATERMENH, "Videx UltraTerm (enhanced //e)", tag, owner, clock, "a2ultrme", __FILE__)
 {
 }
@@ -188,7 +188,7 @@ void a2bus_videx160_device::device_reset()
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_videx160_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_videx160_device::read_c0nx(address_space &space, uint8_t offset)
 {
 //    printf("Read c0n%x (PC=%x)\n", offset, space.device().safe_pc());
 
@@ -217,7 +217,7 @@ UINT8 a2bus_videx160_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_videx160_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_videx160_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 //    printf("Write %02x to c0n%x (PC=%x)\n", data, offset, space.device().safe_pc());
 
@@ -258,7 +258,7 @@ void a2bus_videx160_device::write_c0nx(address_space &space, UINT8 offset, UINT8
     read_cnxx - called for reads from this card's cnxx space
 -------------------------------------------------*/
 
-UINT8 a2bus_videx160_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_videx160_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	return m_rom[offset+(m_slot * 0x100)];
 }
@@ -267,7 +267,7 @@ UINT8 a2bus_videx160_device::read_cnxx(address_space &space, UINT8 offset)
     write_cnxx - called for writes to this card's cnxx space
     the firmware writes here to switch in our $C800 a lot
 -------------------------------------------------*/
-void a2bus_videx160_device::write_cnxx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_videx160_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data)
 {
 }
 
@@ -275,7 +275,7 @@ void a2bus_videx160_device::write_cnxx(address_space &space, UINT8 offset, UINT8
     read_c800 - called for reads from this card's c800 space
 -------------------------------------------------*/
 
-UINT8 a2bus_videx160_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_videx160_device::read_c800(address_space &space, uint16_t offset)
 {
 	// ROM at c800-cbff
 	// bankswitched RAM at cc00-cdff
@@ -298,7 +298,7 @@ UINT8 a2bus_videx160_device::read_c800(address_space &space, UINT16 offset)
 /*-------------------------------------------------
     write_c800 - called for writes to this card's c800 space
 -------------------------------------------------*/
-void a2bus_videx160_device::write_c800(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_videx160_device::write_c800(address_space &space, uint16_t offset, uint8_t data)
 {
 	if (offset >= 0x400)
 	{
@@ -309,18 +309,18 @@ void a2bus_videx160_device::write_c800(address_space &space, UINT16 offset, UINT
 
 MC6845_UPDATE_ROW( a2bus_videx160_device::crtc_update_row )
 {
-	UINT32  *p = &bitmap.pix32(y);
-	UINT16  chr_base = ra;
+	uint32_t  *p = &bitmap.pix32(y);
+	uint16_t  chr_base = ra;
 	int i;
 
 	for ( i = 0; i < x_count; i++ )
 	{
-		UINT16 offset = ( ma + i );
-		UINT8 chr = m_ram[ offset ];
-		UINT8 data = m_chrrom[ chr_base + (chr * 16) ];
-		UINT8 fg = 2;
-		UINT8 bg = 0;
-		UINT8 tmp;
+		uint16_t offset = ( ma + i );
+		uint8_t chr = m_ram[ offset ];
+		uint8_t data = m_chrrom[ chr_base + (chr * 16) ];
+		uint8_t fg = 2;
+		uint8_t bg = 0;
+		uint8_t tmp;
 
 		// apply attributes
 		if (!(m_ctrl2 & CT2_USEDIPS))

src/devices/bus/a2bus/a2ultraterm.h

@@ -25,7 +25,7 @@ class a2bus_videx160_device:
 {
 public:
 	// construction/destruction
-	a2bus_videx160_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);
+	a2bus_videx160_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);
 
 	// optional information overrides
 	virtual machine_config_constructor device_mconfig_additions() const override;
@@ -33,22 +33,22 @@ public:
 	DECLARE_WRITE_LINE_MEMBER(vsync_changed);
 	MC6845_UPDATE_ROW(crtc_update_row);
 
-	UINT8 *m_rom, *m_chrrom;
-	UINT8 m_ram[256*16];
+	uint8_t *m_rom, *m_chrrom;
+	uint8_t m_ram[256*16];
 	int m_framecnt;
-	UINT8 m_ctrl1, m_ctrl2;
+	uint8_t m_ctrl1, m_ctrl2;
 
 protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
-	virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
-	virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+	virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
+	virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
 
 	required_device<mc6845_device> m_crtc;
 
@@ -59,7 +59,7 @@ private:
 class a2bus_ultraterm_device : public a2bus_videx160_device
 {
 public:
-	a2bus_ultraterm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_ultraterm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
@@ -67,7 +67,7 @@ public:
 class a2bus_ultratermenh_device : public a2bus_videx160_device
 {
 public:
-	a2bus_ultratermenh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_ultratermenh_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };

src/devices/bus/a2bus/a2videoterm.cpp

@@ -172,7 +172,7 @@ const tiny_rom_entry *a2bus_aevm80_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_videx80_device::a2bus_videx80_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) :
+a2bus_videx80_device::a2bus_videx80_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),
 	device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_chrrom(nullptr), m_framecnt(0),
 	m_crtc(*this, VIDEOTERM_MC6845_NAME), m_rambank(0),
@@ -180,32 +180,32 @@ a2bus_videx80_device::a2bus_videx80_device(const machine_config &mconfig, device
 {
 }
 
-a2bus_videoterm_device::a2bus_videoterm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_videoterm_device::a2bus_videoterm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_videx80_device(mconfig, A2BUS_VIDEOTERM, "Videx VideoTerm", tag, owner, clock, "a2vidtrm", __FILE__)
 {
 }
 
-a2bus_ap16_device::a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ap16_device::a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_videx80_device(mconfig, A2BUS_IBSAP16, "IBS AP-16 80 column card", tag, owner, clock, "a2ap16", __FILE__)
 {
 }
 
-a2bus_ap16alt_device::a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ap16alt_device::a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_videx80_device(mconfig, A2BUS_IBSAP16ALT, "IBS AP-16 80 column card (alt. version)", tag, owner, clock, "a2ap16a", __FILE__)
 {
 }
 
-a2bus_vtc1_device::a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_vtc1_device::a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_videx80_device(mconfig, A2BUS_VTC1, "Unknown VideoTerm clone #1", tag, owner, clock, "a2vtc1", __FILE__)
 {
 }
 
-a2bus_vtc2_device::a2bus_vtc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_vtc2_device::a2bus_vtc2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_videx80_device(mconfig, A2BUS_VTC2, "Unknown VideoTerm clone #2", tag, owner, clock, "a2vtc2", __FILE__)
 {
 }
 
-a2bus_aevm80_device::a2bus_aevm80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_aevm80_device::a2bus_aevm80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_videx80_device(mconfig, A2BUS_AEVIEWMASTER80, "Applied Engineering Viewmaster 80", tag, owner, clock, "a2aevm80", __FILE__)
 {
 }
@@ -241,7 +241,7 @@ void a2bus_videx80_device::device_reset()
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_videx80_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_videx80_device::read_c0nx(address_space &space, uint8_t offset)
 {
 //    printf("Read c0n%x (PC=%x)\n", offset, space.device().safe_pc());
 
@@ -260,7 +260,7 @@ UINT8 a2bus_videx80_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_videx80_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_videx80_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 //    printf("Write %02x to c0n%x (PC=%x)\n", data, offset, space.device().safe_pc());
 
@@ -280,17 +280,17 @@ void a2bus_videx80_device::write_c0nx(address_space &space, UINT8 offset, UINT8
     read_cnxx - called for reads from this card's cnxx space
 -------------------------------------------------*/
 
-UINT8 a2bus_videx80_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_videx80_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	return m_rom[offset+0x300];
 }
 
-UINT8 a2bus_ap16_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_ap16_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	return m_rom[offset+0x1f00];
 }
 
-UINT8 a2bus_ap16alt_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_ap16alt_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	return m_rom[offset+0xb00];
 }
@@ -299,7 +299,7 @@ UINT8 a2bus_ap16alt_device::read_cnxx(address_space &space, UINT8 offset)
     write_cnxx - called for writes to this card's cnxx space
     the firmware writes here to switch in our $C800 a lot
 -------------------------------------------------*/
-void a2bus_videx80_device::write_cnxx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_videx80_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data)
 {
 }
 
@@ -307,7 +307,7 @@ void a2bus_videx80_device::write_cnxx(address_space &space, UINT8 offset, UINT8
     read_c800 - called for reads from this card's c800 space
 -------------------------------------------------*/
 
-UINT8 a2bus_videx80_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_videx80_device::read_c800(address_space &space, uint16_t offset)
 {
 	// ROM at c800-cbff
 	// bankswitched RAM at cc00-cdff
@@ -325,7 +325,7 @@ UINT8 a2bus_videx80_device::read_c800(address_space &space, UINT16 offset)
 /*-------------------------------------------------
     write_c800 - called for writes to this card's c800 space
 -------------------------------------------------*/
-void a2bus_videx80_device::write_c800(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_videx80_device::write_c800(address_space &space, uint16_t offset, uint8_t data)
 {
 	if (offset >= 0x400)
 	{
@@ -337,17 +337,17 @@ void a2bus_videx80_device::write_c800(address_space &space, UINT16 offset, UINT8
 MC6845_UPDATE_ROW( a2bus_videx80_device::crtc_update_row )
 {
 	const rgb_t *palette = m_palette->palette()->entry_list_raw();
-	UINT32  *p = &bitmap.pix32(y);
-	UINT16  chr_base = ra; //( ra & 0x08 ) ? 0x800 | ( ra & 0x07 ) : ra;
+	uint32_t  *p = &bitmap.pix32(y);
+	uint16_t  chr_base = ra; //( ra & 0x08 ) ? 0x800 | ( ra & 0x07 ) : ra;
 	int i;
 
 	for ( i = 0; i < x_count; i++ )
 	{
-		UINT16 offset = ( ma + i ) & 0x7ff;
-		UINT8 chr = m_ram[ offset ];
-		UINT8 data = m_chrrom[ chr_base + chr * 16 ];
-		UINT8 fg = 15;
-		UINT8 bg = 0;
+		uint16_t offset = ( ma + i ) & 0x7ff;
+		uint8_t chr = m_ram[ offset ];
+		uint8_t data = m_chrrom[ chr_base + chr * 16 ];
+		uint8_t fg = 15;
+		uint8_t bg = 0;
 
 		if ( i == cursor_x )
 		{

src/devices/bus/a2bus/a2videoterm.h

@@ -25,7 +25,7 @@ class a2bus_videx80_device:
 {
 public:
 	// construction/destruction
-	a2bus_videx80_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);
+	a2bus_videx80_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);
 
 	// optional information overrides
 	virtual machine_config_constructor device_mconfig_additions() const override;
@@ -33,8 +33,8 @@ public:
 	DECLARE_WRITE_LINE_MEMBER(vsync_changed);
 	MC6845_UPDATE_ROW(crtc_update_row);
 
-	UINT8 *m_rom, *m_chrrom;
-	UINT8 m_ram[512*4];
+	uint8_t *m_rom, *m_chrrom;
+	uint8_t m_ram[512*4];
 	int m_framecnt;
 
 protected:
@@ -42,12 +42,12 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
-	virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
-	virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+	virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
+	virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
 
 	required_device<mc6845_device> m_crtc;
 
@@ -60,7 +60,7 @@ public:
 class a2bus_videoterm_device : public a2bus_videx80_device
 {
 public:
-	a2bus_videoterm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_videoterm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
@@ -68,28 +68,28 @@ public:
 class a2bus_ap16_device : public a2bus_videx80_device
 {
 public:
-	a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	virtual const tiny_rom_entry *device_rom_region() const override;
 
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
 };
 
 
 class a2bus_ap16alt_device : public a2bus_videx80_device
 {
 public:
-	a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	virtual const tiny_rom_entry *device_rom_region() const override;
 
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
 };
 
 class a2bus_vtc1_device : public a2bus_videx80_device
 {
 public:
-	a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
@@ -97,7 +97,7 @@ public:
 class a2bus_vtc2_device : public a2bus_videx80_device
 {
 public:
-	a2bus_vtc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_vtc2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
@@ -105,7 +105,7 @@ public:
 class a2bus_aevm80_device : public a2bus_videx80_device
 {
 public:
-	a2bus_aevm80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_aevm80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };

src/devices/bus/a2bus/a2vulcan.cpp

@@ -114,19 +114,19 @@ const tiny_rom_entry *a2bus_vulcangold_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_vulcanbase_device::a2bus_vulcanbase_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) :
+a2bus_vulcanbase_device::a2bus_vulcanbase_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_ata(*this, VULCAN_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_rombank(0), m_rambank(0), m_last_read_was_0(false)
 {
 }
 
-a2bus_vulcan_device::a2bus_vulcan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_vulcan_device::a2bus_vulcan_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_vulcanbase_device(mconfig, A2BUS_VULCAN, "Applied Engineering Vulcan IDE controller", tag, owner, clock, "a2vulcan", __FILE__)
 {
 }
 
-a2bus_vulcangold_device::a2bus_vulcangold_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_vulcangold_device::a2bus_vulcangold_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_vulcanbase_device(mconfig, A2BUS_VULCAN, "Applied Engineering Vulcan Gold IDE controller", tag, owner, clock, "a2vulgld", __FILE__)
 {
 }
@@ -169,7 +169,7 @@ void a2bus_vulcanbase_device::device_reset()
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_vulcanbase_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_vulcanbase_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	switch (offset)
 	{
@@ -212,7 +212,7 @@ UINT8 a2bus_vulcanbase_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_vulcanbase_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_vulcanbase_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	switch (offset)
 	{
@@ -266,7 +266,7 @@ void a2bus_vulcanbase_device::write_c0nx(address_space &space, UINT8 offset, UIN
     read_cnxx - called for reads from this card's cnxx space
 -------------------------------------------------*/
 
-UINT8 a2bus_vulcanbase_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_vulcanbase_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	int slotimg = m_slot * 0x100;
 
@@ -278,7 +278,7 @@ UINT8 a2bus_vulcanbase_device::read_cnxx(address_space &space, UINT8 offset)
     read_c800 - called for reads from this card's c800 space
 -------------------------------------------------*/
 
-UINT8 a2bus_vulcanbase_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_vulcanbase_device::read_c800(address_space &space, uint16_t offset)
 {
 	offset &= 0x7ff;
 	if (offset < 0x400) // c800-cbff is banked RAM window, cc00-cfff is banked ROM window
@@ -291,7 +291,7 @@ UINT8 a2bus_vulcanbase_device::read_c800(address_space &space, UINT16 offset)
 	return m_rom[offset+m_rombank];
 }
 
-void a2bus_vulcanbase_device::write_c800(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_vulcanbase_device::write_c800(address_space &space, uint16_t offset, uint8_t data)
 {
 	offset &= 0x7ff;
 	if (offset < 0x400)

src/devices/bus/a2bus/a2vulcan.h

@@ -25,7 +25,7 @@ class a2bus_vulcanbase_device:
 {
 public:
 	// construction/destruction
-	a2bus_vulcanbase_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);
+	a2bus_vulcanbase_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);
 
 	// optional information overrides
 	virtual machine_config_constructor device_mconfig_additions() const override;
@@ -35,19 +35,19 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
-	virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
-	virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+	virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
+	virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
 
 	required_device<ata_interface_device> m_ata;
 
-	UINT8 *m_rom;
-	UINT8 m_ram[8*1024];
+	uint8_t *m_rom;
+	uint8_t m_ram[8*1024];
 
 private:
-	UINT16 m_lastdata;
+	uint16_t m_lastdata;
 	int m_rombank, m_rambank;
 	bool m_last_read_was_0;
 };
@@ -55,7 +55,7 @@ private:
 class a2bus_vulcan_device : public a2bus_vulcanbase_device
 {
 public:
-	a2bus_vulcan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_vulcan_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 	virtual const tiny_rom_entry *device_rom_region() const override;
 
 protected:
@@ -67,7 +67,7 @@ protected:
 class a2bus_vulcangold_device : public a2bus_vulcanbase_device
 {
 public:
-	a2bus_vulcangold_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_vulcangold_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
 

src/devices/bus/a2bus/a2zipdrive.cpp

@@ -69,14 +69,14 @@ const tiny_rom_entry *a2bus_zipdrivebase_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_zipdrivebase_device::a2bus_zipdrivebase_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) :
+a2bus_zipdrivebase_device::a2bus_zipdrivebase_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_ata(*this, ZIPDRIVE_ATA_TAG), m_rom(nullptr), m_lastdata(0)
 {
 }
 
-a2bus_zipdrive_device::a2bus_zipdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_zipdrive_device::a2bus_zipdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	a2bus_zipdrivebase_device(mconfig, A2BUS_ZIPDRIVE, "Zip Technologies ZipDrive", tag, owner, clock, "a2zipdrv", __FILE__)
 {
 }
@@ -105,7 +105,7 @@ void a2bus_zipdrivebase_device::device_reset()
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_zipdrivebase_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_zipdrivebase_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	switch (offset)
 	{
@@ -140,7 +140,7 @@ UINT8 a2bus_zipdrivebase_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_zipdrivebase_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_zipdrivebase_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	switch (offset)
 	{
@@ -178,7 +178,7 @@ void a2bus_zipdrivebase_device::write_c0nx(address_space &space, UINT8 offset, U
     read_cnxx - called for reads from this card's cnxx space
 -------------------------------------------------*/
 
-UINT8 a2bus_zipdrivebase_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_zipdrivebase_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	int slotimg = m_slot * 0x100;
 
@@ -190,7 +190,7 @@ UINT8 a2bus_zipdrivebase_device::read_cnxx(address_space &space, UINT8 offset)
     read_c800 - called for reads from this card's c800 space
 -------------------------------------------------*/
 
-UINT8 a2bus_zipdrivebase_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_zipdrivebase_device::read_c800(address_space &space, uint16_t offset)
 {
 	offset &= 0x7ff;
 

src/devices/bus/a2bus/a2zipdrive.h

@@ -27,7 +27,7 @@ class a2bus_zipdrivebase_device:
 {
 public:
 	// construction/destruction
-	a2bus_zipdrivebase_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);
+	a2bus_zipdrivebase_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);
 
 	// optional information overrides
 	virtual machine_config_constructor device_mconfig_additions() const override;
@@ -38,23 +38,23 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
-	virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+	virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
 
 	required_device<ata_interface_device> m_ata;
 
-	UINT8 *m_rom;
+	uint8_t *m_rom;
 
 private:
-	UINT16 m_lastdata;
+	uint16_t m_lastdata;
 };
 
 class a2bus_zipdrive_device : public a2bus_zipdrivebase_device
 {
 public:
-	a2bus_zipdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_zipdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 };
 
 // device type definition

src/devices/bus/a2bus/corvfdc01.cpp

@@ -110,7 +110,7 @@ const tiny_rom_entry *a2bus_corvfdc01_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_corvfdc01_device::a2bus_corvfdc01_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) :
+a2bus_corvfdc01_device::a2bus_corvfdc01_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_wdfdc(*this, FDC01_FDC_TAG),
@@ -121,7 +121,7 @@ a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, de
 {
 }
 
-a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_CORVFDC01, "Corvus Systems Floppy Controller", tag, owner, clock, "crvfdc01", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_wdfdc(*this, FDC01_FDC_TAG),
@@ -158,7 +158,7 @@ void a2bus_corvfdc01_device::device_reset()
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_corvfdc01_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_corvfdc01_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	switch (offset)
 	{
@@ -191,7 +191,7 @@ UINT8 a2bus_corvfdc01_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_corvfdc01_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_corvfdc01_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	int current_drive;
 	floppy_image_device *floppy = nullptr;
@@ -259,7 +259,7 @@ void a2bus_corvfdc01_device::write_c0nx(address_space &space, UINT8 offset, UINT
     read_cnxx - called for reads from this card's cnxx space
 -------------------------------------------------*/
 
-UINT8 a2bus_corvfdc01_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_corvfdc01_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	return m_rom[offset & 0x1f];
 }

src/devices/bus/a2bus/corvfdc01.h

@@ -26,8 +26,8 @@ class a2bus_corvfdc01_device:
 {
 public:
 	// construction/destruction
-	a2bus_corvfdc01_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);
-	a2bus_corvfdc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_corvfdc01_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);
+	a2bus_corvfdc01_device(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;
@@ -43,9 +43,9 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
 
 	required_device<fd1793_t> m_wdfdc;
 	required_device<floppy_connector> m_con1;
@@ -54,8 +54,8 @@ protected:
 	required_device<floppy_connector> m_con4;
 
 private:
-	UINT8 *m_rom;
-	UINT8 m_fdc_local_status, m_fdc_local_command;
+	uint8_t *m_rom;
+	uint8_t m_fdc_local_status, m_fdc_local_command;
 	floppy_image_device *m_curfloppy;
 };
 

src/devices/bus/a2bus/corvfdc02.cpp

@@ -80,7 +80,7 @@ const tiny_rom_entry *a2bus_corvfdc02_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_corvfdc02_device::a2bus_corvfdc02_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) :
+a2bus_corvfdc02_device::a2bus_corvfdc02_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_fdc(*this, FDC02_FDC_TAG),
@@ -91,7 +91,7 @@ a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, de
 {
 }
 
-a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_CORVFDC02, "Corvus Systems Buffered Floppy Controller", tag, owner, clock, "crvfdc02", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_fdc(*this, FDC02_FDC_TAG),
@@ -140,7 +140,7 @@ void a2bus_corvfdc02_device::device_timer(emu_timer &timer, device_timer_id id,
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_corvfdc02_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_corvfdc02_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	switch (offset)
 	{
@@ -176,7 +176,7 @@ UINT8 a2bus_corvfdc02_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_corvfdc02_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_corvfdc02_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	floppy_image_device *floppy = nullptr;
 
@@ -250,7 +250,7 @@ void a2bus_corvfdc02_device::write_c0nx(address_space &space, UINT8 offset, UINT
     read_cnxx - called for reads from this card's cnxx space
 -------------------------------------------------*/
 
-UINT8 a2bus_corvfdc02_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_corvfdc02_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	return m_rom[offset & 0x1f];
 }

src/devices/bus/a2bus/corvfdc02.h

@@ -26,8 +26,8 @@ class a2bus_corvfdc02_device:
 {
 public:
 	// construction/destruction
-	a2bus_corvfdc02_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);
-	a2bus_corvfdc02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_corvfdc02_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);
+	a2bus_corvfdc02_device(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;
@@ -44,9 +44,9 @@ protected:
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
 
 	required_device<upd765a_device> m_fdc;
 	required_device<floppy_connector> m_con1;
@@ -55,10 +55,10 @@ protected:
 	required_device<floppy_connector> m_con4;
 
 private:
-	UINT8 *m_rom;
-	UINT8 m_fdc_local_status, m_fdc_local_command;
-	UINT16 m_bufptr;
-	UINT8 m_buffer[2048];   // 1x6116 SRAM
+	uint8_t *m_rom;
+	uint8_t m_fdc_local_status, m_fdc_local_command;
+	uint16_t m_bufptr;
+	uint8_t m_buffer[2048];   // 1x6116 SRAM
 	floppy_image_device *m_curfloppy;
 	bool m_in_drq;
 	emu_timer *m_timer;

src/devices/bus/a2bus/ezcgi.cpp

@@ -96,42 +96,42 @@ machine_config_constructor a2bus_ezcgi_9958_device::device_mconfig_additions() c
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_EZCGI, "E-Z Color Graphics Interface", tag, owner, clock, "a2ezcgi", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_tms(*this, TMS_TAG)
 {
 }
 
-a2bus_ezcgi_device::a2bus_ezcgi_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) :
+a2bus_ezcgi_device::a2bus_ezcgi_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_tms(*this, TMS_TAG)
 {
 }
 
-a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_EZCGI_9938, "E-Z Color Graphics Interface (TMS9938)", tag, owner, clock, "a2ezcgi3", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_tms(*this, TMS_TAG)
 {
 }
 
-a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_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) :
+a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_tms(*this, TMS_TAG)
 {
 }
 
-a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_EZCGI_9958, "E-Z Color Graphics Interface (TMS9958)", tag, owner, clock, "a2ezcgi5", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_tms(*this, TMS_TAG)
 {
 }
 
-a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_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) :
+a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_tms(*this, TMS_TAG)
@@ -178,7 +178,7 @@ void a2bus_ezcgi_9958_device::device_reset()
     1 - TMS write
 */
 
-UINT8 a2bus_ezcgi_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_ezcgi_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	switch (offset)
 	{
@@ -192,7 +192,7 @@ UINT8 a2bus_ezcgi_device::read_c0nx(address_space &space, UINT8 offset)
 	return 0xff;
 }
 
-void a2bus_ezcgi_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_ezcgi_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	switch (offset)
 	{
@@ -206,7 +206,7 @@ void a2bus_ezcgi_device::write_c0nx(address_space &space, UINT8 offset, UINT8 da
 	}
 }
 
-UINT8 a2bus_ezcgi_9938_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_ezcgi_9938_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	switch (offset)
 	{
@@ -220,7 +220,7 @@ UINT8 a2bus_ezcgi_9938_device::read_c0nx(address_space &space, UINT8 offset)
 	return 0xff;
 }
 
-void a2bus_ezcgi_9938_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_ezcgi_9938_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	switch (offset)
 	{
@@ -242,7 +242,7 @@ void a2bus_ezcgi_9938_device::write_c0nx(address_space &space, UINT8 offset, UIN
 	}
 }
 
-UINT8 a2bus_ezcgi_9958_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_ezcgi_9958_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	switch (offset)
 	{
@@ -256,7 +256,7 @@ UINT8 a2bus_ezcgi_9958_device::read_c0nx(address_space &space, UINT8 offset)
 	return 0xff;
 }
 
-void a2bus_ezcgi_9958_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_ezcgi_9958_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	switch (offset)
 	{

src/devices/bus/a2bus/ezcgi.h

@@ -28,8 +28,8 @@ class a2bus_ezcgi_device:
 {
 public:
 	// construction/destruction
-	a2bus_ezcgi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	a2bus_ezcgi_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);
+	a2bus_ezcgi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	a2bus_ezcgi_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);
 
 	// optional information overrides
 	virtual machine_config_constructor device_mconfig_additions() const override;
@@ -41,8 +41,8 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
 
 	required_device<tms9918a_device> m_tms;
 };
@@ -53,8 +53,8 @@ class a2bus_ezcgi_9938_device:
 {
 public:
 	// construction/destruction
-	a2bus_ezcgi_9938_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	a2bus_ezcgi_9938_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);
+	a2bus_ezcgi_9938_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	a2bus_ezcgi_9938_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);
 
 	// optional information overrides
 	virtual machine_config_constructor device_mconfig_additions() const override;
@@ -66,8 +66,8 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
 
 	required_device<v9938_device> m_tms;
 };
@@ -78,8 +78,8 @@ class a2bus_ezcgi_9958_device:
 {
 public:
 	// construction/destruction
-	a2bus_ezcgi_9958_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	a2bus_ezcgi_9958_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);
+	a2bus_ezcgi_9958_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	a2bus_ezcgi_9958_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);
 
 	// optional information overrides
 	virtual machine_config_constructor device_mconfig_additions() const override;
@@ -91,8 +91,8 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
 
 	required_device<v9958_device> m_tms;
 };

src/devices/bus/a2bus/laser128.cpp

@@ -42,14 +42,14 @@ machine_config_constructor a2bus_laser128_device::device_mconfig_additions() con
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_laser128_device::a2bus_laser128_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) :
+a2bus_laser128_device::a2bus_laser128_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),
 	device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_slot7_bank(0), m_slot7_ram_bank(0)
 
 {
 }
 
-a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_LASER128, "VTech Laser 128 Internal Device", tag, owner, clock, "a2laser128", __FILE__),
 	device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_slot7_bank(0), m_slot7_ram_bank(0)
 {
@@ -75,21 +75,21 @@ void a2bus_laser128_device::device_reset()
 	m_slot7_ram_bank = 0;
 }
 
-UINT8 a2bus_laser128_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_laser128_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	return 0x00;
 }
 
-void a2bus_laser128_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_laser128_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 }
 
-UINT8 a2bus_laser128_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_laser128_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	return m_rom[offset + (m_slot * 0x100) + 0x4000];
 }
 
-UINT8 a2bus_laser128_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_laser128_device::read_c800(address_space &space, uint16_t offset)
 {
 	switch (m_slot)
 	{
@@ -116,7 +116,7 @@ UINT8 a2bus_laser128_device::read_c800(address_space &space, UINT16 offset)
 	return 0xff;
 }
 
-void a2bus_laser128_device::write_c800(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_laser128_device::write_c800(address_space &space, uint16_t offset, uint8_t data)
 {
 	if ((m_slot == 7) && (offset < 0x400))
 	{

src/devices/bus/a2bus/laser128.h

@@ -24,8 +24,8 @@ class a2bus_laser128_device:
 {
 public:
 	// construction/destruction
-	a2bus_laser128_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);
-	a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_laser128_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);
+	a2bus_laser128_device(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;
@@ -35,16 +35,16 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
-	virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
-	virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+	virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
+	virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
 	virtual bool take_c800() override;
 
 private:
-	UINT8 *m_rom;
-	UINT8 m_slot7_ram[0x800];
+	uint8_t *m_rom;
+	uint8_t m_slot7_ram[0x800];
 	int m_slot7_bank, m_slot7_ram_bank;
 };
 

src/devices/bus/a2bus/mouse.cpp

@@ -172,7 +172,7 @@ const tiny_rom_entry *a2bus_mouse_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_mouse_device::a2bus_mouse_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) :
+a2bus_mouse_device::a2bus_mouse_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_pia(*this, MOUSE_PIA_TAG),
@@ -186,7 +186,7 @@ a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, device_typ
 	m_rom_bank = 0;
 }
 
-a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_MOUSE, "Apple II Mouse Card", tag, owner, clock, "a2mouse", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_pia(*this, MOUSE_PIA_TAG),
@@ -261,7 +261,7 @@ void a2bus_mouse_device::device_reset()
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_mouse_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_mouse_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	return m_pia->read(space, offset & 3);
 }
@@ -271,7 +271,7 @@ UINT8 a2bus_mouse_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_mouse_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_mouse_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	m_pia->write(space, offset & 3, data);
 }
@@ -280,7 +280,7 @@ void a2bus_mouse_device::write_c0nx(address_space &space, UINT8 offset, UINT8 da
     read_cnxx - called for reads from this card's cnxx space
 -------------------------------------------------*/
 
-UINT8 a2bus_mouse_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_mouse_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	return m_rom[offset+m_rom_bank];
 }
@@ -333,7 +333,7 @@ WRITE8_MEMBER(a2bus_mouse_device::mcu_ddr_a_w)
 
 READ8_MEMBER(a2bus_mouse_device::mcu_port_b_r)
 {
-	UINT8 b_in = m_port_b_in;
+	uint8_t b_in = m_port_b_in;
 
 	// clear the gates, leave everything else alone between pulses
 	m_port_b_in &= 0x85;
@@ -435,7 +435,7 @@ WRITE8_MEMBER(a2bus_mouse_device::mcu_timer_w)
 	if (recalc)
 	{
 		// recalculate the timer now
-		UINT32 m_ticks = 2043600 / 4;
+		uint32_t m_ticks = 2043600 / 4;
 		m_ticks /= prescale[m_timer_ctl & 7];
 		m_ticks /= (int)(m_timer_cnt + 1);
 		m_timer->adjust(attotime::from_hz((double)m_ticks), TIMER_68705, attotime::from_hz((double)m_ticks));

src/devices/bus/a2bus/mouse.h

@@ -26,8 +26,8 @@ class a2bus_mouse_device:
 {
 public:
 	// construction/destruction
-	a2bus_mouse_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);
-	a2bus_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_mouse_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);
+	a2bus_mouse_device(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;
@@ -59,30 +59,30 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
 
 	required_device<pia6821_device> m_pia;
 	required_device<m68705_device> m_mcu;
 	required_ioport m_mouseb, m_mousex, m_mousey;
 
 private:
-	UINT8 *m_rom;
+	uint8_t *m_rom;
 	bool m_started;
 	int m_rom_bank;
-	UINT8 m_ddr_a;
-	UINT8 m_ddr_b;
-	UINT8 m_ddr_c;
-	UINT8 m_port_a_out;
-	UINT8 m_port_b_out;
-	UINT8 m_port_c_out;
-	UINT8 m_port_a_in;
-	UINT8 m_port_b_in;
-	UINT8 m_port_c_in;
-	UINT8 m_timer_cnt;
-	UINT8 m_timer_ctl;
-	UINT8 m_mask_option;
+	uint8_t m_ddr_a;
+	uint8_t m_ddr_b;
+	uint8_t m_ddr_c;
+	uint8_t m_port_a_out;
+	uint8_t m_port_b_out;
+	uint8_t m_port_c_out;
+	uint8_t m_port_a_in;
+	uint8_t m_port_b_in;
+	uint8_t m_port_c_in;
+	uint8_t m_timer_cnt;
+	uint8_t m_timer_ctl;
+	uint8_t m_mask_option;
 	int last_mx, last_my, count_x, count_y;
 	emu_timer *m_timer, *m_read_timer;
 };

src/devices/bus/a2bus/pc_xporter.cpp

@@ -181,7 +181,7 @@ machine_config_constructor a2bus_pcxporter_device::device_mconfig_additions() co
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_pcxporter_device::a2bus_pcxporter_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) :
+a2bus_pcxporter_device::a2bus_pcxporter_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_v30(*this, "v30"),
@@ -194,7 +194,7 @@ a2bus_pcxporter_device::a2bus_pcxporter_device(const machine_config &mconfig, de
 {
 }
 
-a2bus_pcxporter_device::a2bus_pcxporter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_pcxporter_device::a2bus_pcxporter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_PCXPORTER, "Applied Engineering PC Transporter", tag, owner, clock, "a2pcxport", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_v30(*this, "v30"),
@@ -243,7 +243,7 @@ void a2bus_pcxporter_device::device_reset()
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_pcxporter_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_pcxporter_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	switch (offset)
 	{
@@ -260,7 +260,7 @@ UINT8 a2bus_pcxporter_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_pcxporter_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_pcxporter_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	switch (offset)
 	{
@@ -274,13 +274,13 @@ void a2bus_pcxporter_device::write_c0nx(address_space &space, UINT8 offset, UINT
     read_cnxx - called for reads from this card's cnxx space
 -------------------------------------------------*/
 
-UINT8 a2bus_pcxporter_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_pcxporter_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	// read only to trigger C800?
 	return 0xff;
 }
 
-void a2bus_pcxporter_device::write_cnxx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_pcxporter_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data)
 {
 	printf("Write %02x to cn%02x (PC=%x)\n", data, offset, space.device().safe_pc());
 }
@@ -289,7 +289,7 @@ void a2bus_pcxporter_device::write_cnxx(address_space &space, UINT8 offset, UINT
     read_c800 - called for reads from this card's c800 space
 -------------------------------------------------*/
 
-UINT8 a2bus_pcxporter_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_pcxporter_device::read_c800(address_space &space, uint16_t offset)
 {
 //  printf("Read C800 at %x\n", offset + 0xc800);
 
@@ -299,7 +299,7 @@ UINT8 a2bus_pcxporter_device::read_c800(address_space &space, UINT16 offset)
 	}
 	else
 	{
-		UINT8 rv;
+		uint8_t rv;
 
 		switch (offset)
 		{
@@ -337,7 +337,7 @@ UINT8 a2bus_pcxporter_device::read_c800(address_space &space, UINT16 offset)
 /*-------------------------------------------------
     write_c800 - called for writes to this card's c800 space
 -------------------------------------------------*/
-void a2bus_pcxporter_device::write_c800(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_pcxporter_device::write_c800(address_space &space, uint16_t offset, uint8_t data)
 {
 	if (offset < 0x400)
 	{

src/devices/bus/a2bus/pc_xporter.h

@@ -34,8 +34,8 @@ class a2bus_pcxporter_device:
 {
 public:
 	// construction/destruction
-	a2bus_pcxporter_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);
-	a2bus_pcxporter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_pcxporter_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);
+	a2bus_pcxporter_device(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;
@@ -51,22 +51,22 @@ public:
 	optional_device<pc_kbdc_device>  m_pc_kbdc;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
-	virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
-	virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+	virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
+	virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
 
-	UINT8   m_u73_q2;
-	UINT8   m_out1;
+	uint8_t   m_u73_q2;
+	uint8_t   m_out1;
 	int m_dma_channel;
-	UINT8 m_dma_offset[4];
-	UINT8 m_pc_spkrdata;
-	UINT8 m_pit_out2;
+	uint8_t m_dma_offset[4];
+	uint8_t m_pc_spkrdata;
+	uint8_t m_pit_out2;
 	bool m_cur_eop;
 
-	UINT8 m_nmi_enabled;
+	uint8_t m_nmi_enabled;
 
 	// interface to the keyboard
 	DECLARE_WRITE_LINE_MEMBER( keyboard_clock_w );
@@ -103,14 +103,14 @@ protected:
 	virtual void device_reset() override;
 
 private:
-	UINT8 m_ram[768*1024];
-	UINT8 m_c800_ram[0x400];
-	UINT8 m_regs[0x400];
-	UINT32 m_offset;
+	uint8_t m_ram[768*1024];
+	uint8_t m_c800_ram[0x400];
+	uint8_t m_regs[0x400];
+	uint32_t m_offset;
 	address_space *m_pcmem_space, *m_pcio_space;
 	bool m_reset_during_halt;
 
-	UINT8 m_6845_reg;
+	uint8_t m_6845_reg;
 
 	void pc_select_dma_channel(int channel, bool state);
 };

src/devices/bus/a2bus/ramcard128k.cpp

@@ -28,13 +28,13 @@ const device_type A2BUS_RAMCARD128K = &device_creator<a2bus_ssramcard_device>;
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_ssramcard_device::a2bus_ssramcard_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) :
+a2bus_ssramcard_device::a2bus_ssramcard_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),
 	device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0), m_main_bank(0)
 {
 }
 
-a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_RAMCARD128K, "Saturn Systems 128K Extended Language Card", tag, owner, clock, "ssram128", __FILE__),
 	device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0), m_main_bank(0)
 {
@@ -139,7 +139,7 @@ void a2bus_ssramcard_device::do_io(int offset)
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_ssramcard_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_ssramcard_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	do_io(offset & 0xf);
 	return 0xff;
@@ -150,12 +150,12 @@ UINT8 a2bus_ssramcard_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_ssramcard_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_ssramcard_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	do_io(offset & 0xf);
 }
 
-UINT8 a2bus_ssramcard_device::read_inh_rom(address_space &space, UINT16 offset)
+uint8_t a2bus_ssramcard_device::read_inh_rom(address_space &space, uint16_t offset)
 {
 	assert(m_inh_state & INH_READ); // this should never happen
 
@@ -167,7 +167,7 @@ UINT8 a2bus_ssramcard_device::read_inh_rom(address_space &space, UINT16 offset)
 	return m_ram[(offset & 0x1fff) + 0x2000 + m_main_bank];
 }
 
-void a2bus_ssramcard_device::write_inh_rom(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_ssramcard_device::write_inh_rom(address_space &space, uint16_t offset, uint8_t data)
 {
 	// are writes enabled?
 	if (!(m_inh_state & INH_WRITE))

src/devices/bus/a2bus/ramcard128k.h

@@ -24,20 +24,20 @@ class a2bus_ssramcard_device:
 {
 public:
 	// construction/destruction
-	a2bus_ssramcard_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);
-	a2bus_ssramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_ssramcard_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);
+	a2bus_ssramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_inh_rom(address_space &space, UINT16 offset) override;
-	virtual void write_inh_rom(address_space &space, UINT16 offset, UINT8 data) override;
-	virtual UINT16 inh_start() override { return 0xd000; }
-	virtual UINT16 inh_end() override { return 0xffff; }
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_inh_rom(address_space &space, uint16_t offset) override;
+	virtual void write_inh_rom(address_space &space, uint16_t offset, uint8_t data) override;
+	virtual uint16_t inh_start() override { return 0xd000; }
+	virtual uint16_t inh_end() override { return 0xffff; }
 	virtual int inh_type() override;
 
 private:
@@ -47,7 +47,7 @@ private:
 	int m_last_offset;
 	int m_dxxx_bank;
 	int m_main_bank;
-	UINT8 m_ram[128*1024];
+	uint8_t m_ram[128*1024];
 };
 
 // device type definition

src/devices/bus/a2bus/ramcard16k.cpp

@@ -28,13 +28,13 @@ const device_type A2BUS_RAMCARD16K = &device_creator<a2bus_ramcard_device>;
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_ramcard_device::a2bus_ramcard_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) :
+a2bus_ramcard_device::a2bus_ramcard_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),
 	device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0)
 {
 }
 
-a2bus_ramcard_device::a2bus_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ramcard_device::a2bus_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_RAMCARD16K, "Apple II 16K Language Card", tag, owner, clock, "a2ram16k", __FILE__),
 	device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0)
 {
@@ -119,7 +119,7 @@ void a2bus_ramcard_device::do_io(int offset)
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_ramcard_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_ramcard_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	do_io(offset & 0xf);
 	return 0xff;
@@ -130,12 +130,12 @@ UINT8 a2bus_ramcard_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_ramcard_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_ramcard_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	do_io(offset & 0xf);
 }
 
-UINT8 a2bus_ramcard_device::read_inh_rom(address_space &space, UINT16 offset)
+uint8_t a2bus_ramcard_device::read_inh_rom(address_space &space, uint16_t offset)
 {
 	assert(m_inh_state & INH_READ); // this should never happen
 
@@ -147,7 +147,7 @@ UINT8 a2bus_ramcard_device::read_inh_rom(address_space &space, UINT16 offset)
 	return m_ram[(offset & 0x1fff) + 0x2000];
 }
 
-void a2bus_ramcard_device::write_inh_rom(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_ramcard_device::write_inh_rom(address_space &space, uint16_t offset, uint8_t data)
 {
 	// are writes enabled?
 	if (!(m_inh_state & INH_WRITE))

src/devices/bus/a2bus/ramcard16k.h

@@ -24,20 +24,20 @@ class a2bus_ramcard_device:
 {
 public:
 	// construction/destruction
-	a2bus_ramcard_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);
-	a2bus_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_ramcard_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);
+	a2bus_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_inh_rom(address_space &space, UINT16 offset) override;
-	virtual void write_inh_rom(address_space &space, UINT16 offset, UINT8 data) override;
-	virtual UINT16 inh_start() override { return 0xd000; }
-	virtual UINT16 inh_end() override { return 0xffff; }
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_inh_rom(address_space &space, uint16_t offset) override;
+	virtual void write_inh_rom(address_space &space, uint16_t offset, uint8_t data) override;
+	virtual uint16_t inh_start() override { return 0xd000; }
+	virtual uint16_t inh_end() override { return 0xffff; }
 	virtual int inh_type() override;
 
 private:
@@ -46,7 +46,7 @@ private:
 	int m_inh_state;
 	int m_last_offset;
 	int m_dxxx_bank;
-	UINT8 m_ram[16*1024];
+	uint8_t m_ram[16*1024];
 };
 
 // device type definition

src/devices/bus/a2bus/timemasterho.cpp

@@ -121,7 +121,7 @@ const tiny_rom_entry *a2bus_timemasterho_device::device_rom_region() const
 //  LIVE DEVICE
 //**************************************************************************
 
-a2bus_timemasterho_device::a2bus_timemasterho_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) :
+a2bus_timemasterho_device::a2bus_timemasterho_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),
 	device_a2bus_card_interface(mconfig, *this),
 	m_pia(*this, TIMEMASTER_PIA_TAG),
@@ -131,7 +131,7 @@ a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconf
 	m_started = false;
 }
 
-a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, A2BUS_TIMEMASTERHO, "Applied Engineering TimeMaster H.O.", tag, owner, clock, "a2tmstho", __FILE__),
 	device_a2bus_card_interface(mconfig, *this),
 	m_pia(*this, TIMEMASTER_PIA_TAG),
@@ -164,7 +164,7 @@ void a2bus_timemasterho_device::device_reset()
     read_c0nx - called for reads from this card's c0nx space
 -------------------------------------------------*/
 
-UINT8 a2bus_timemasterho_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_timemasterho_device::read_c0nx(address_space &space, uint8_t offset)
 {
 	if (offset <= 3)
 	{
@@ -179,7 +179,7 @@ UINT8 a2bus_timemasterho_device::read_c0nx(address_space &space, UINT8 offset)
     write_c0nx - called for writes to this card's c0nx space
 -------------------------------------------------*/
 
-void a2bus_timemasterho_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_timemasterho_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
 {
 	if (offset <= 3)
 	{
@@ -191,7 +191,7 @@ void a2bus_timemasterho_device::write_c0nx(address_space &space, UINT8 offset, U
     read_cnxx - called for reads from this card's cnxx space
 -------------------------------------------------*/
 
-UINT8 a2bus_timemasterho_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_timemasterho_device::read_cnxx(address_space &space, uint8_t offset)
 {
 	if (m_started)
 	{
@@ -209,7 +209,7 @@ UINT8 a2bus_timemasterho_device::read_cnxx(address_space &space, UINT8 offset)
     read_c800 - called for reads from this card's c800 space
 -------------------------------------------------*/
 
-UINT8 a2bus_timemasterho_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_timemasterho_device::read_c800(address_space &space, uint16_t offset)
 {
 	return m_rom[offset+0xc00];
 }
@@ -242,7 +242,7 @@ WRITE8_MEMBER(a2bus_timemasterho_device::pia_out_b)
 
 void a2bus_timemasterho_device::update_irqs()
 {
-	UINT8 dip = 0;
+	uint8_t dip = 0;
 
 	if (m_started)
 	{

src/devices/bus/a2bus/timemasterho.h

@@ -26,8 +26,8 @@ class a2bus_timemasterho_device:
 {
 public:
 	// construction/destruction
-	a2bus_timemasterho_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);
-	a2bus_timemasterho_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a2bus_timemasterho_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);
+	a2bus_timemasterho_device(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;
@@ -44,10 +44,10 @@ protected:
 	virtual void device_reset() override;
 
 	// overrides of standard a2bus slot functions
-	virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
-	virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
-	virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
-	virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
+	virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+	virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+	virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
 
 	required_device<pia6821_device> m_pia;
 	required_device<msm5832_device> m_msm5832;
@@ -56,7 +56,7 @@ protected:
 private:
 	void update_irqs();
 
-	UINT8 *m_rom;
+	uint8_t *m_rom;
 	bool m_irqa, m_irqb;
 	bool m_started;
 };

src/devices/bus/a7800/a78_slot.cpp

@@ -62,7 +62,7 @@ device_a78_cart_interface::~device_a78_cart_interface ()
 //  rom_alloc - alloc the space for the cart
 //-------------------------------------------------
 
-void device_a78_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_a78_cart_interface::rom_alloc(uint32_t size, const char *tag)
 {
 	if (m_rom == nullptr)
 	{
@@ -86,7 +86,7 @@ void device_a78_cart_interface::rom_alloc(UINT32 size, const char *tag)
 //  ram_alloc - alloc the space for the on-cart RAM
 //-------------------------------------------------
 
-void device_a78_cart_interface::ram_alloc(UINT32 size)
+void device_a78_cart_interface::ram_alloc(uint32_t size)
 {
 	m_ram.resize(size);
 	device().save_item(NAME(m_ram));
@@ -97,7 +97,7 @@ void device_a78_cart_interface::ram_alloc(UINT32 size)
 //  ram_alloc - alloc the space for the on-cart RAM
 //-------------------------------------------------
 
-void device_a78_cart_interface::nvram_alloc(UINT32 size)
+void device_a78_cart_interface::nvram_alloc(uint32_t size)
 {
 	m_nvram.resize(size);
 	device().save_item(NAME(m_nvram));
@@ -112,7 +112,7 @@ void device_a78_cart_interface::nvram_alloc(UINT32 size)
 //-------------------------------------------------
 //  a78_cart_slot_device - constructor
 //-------------------------------------------------
-a78_cart_slot_device::a78_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a78_cart_slot_device::a78_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 						device_t(mconfig, A78_CART_SLOT, "Atari 7800 Cartridge Slot", tag, owner, clock, "a78_cart_slot", __FILE__),
 						device_image_interface(mconfig, *this),
 						device_slot_interface(mconfig, *this), m_cart(nullptr), m_type(0)
@@ -346,7 +346,7 @@ image_init_result a78_cart_slot_device::call_load()
 {
 	if (m_cart)
 	{
-		UINT32 len;
+		uint32_t len;
 
 		if (software_entry() != nullptr)
 		{
@@ -449,7 +449,7 @@ image_init_result a78_cart_slot_device::call_load()
 				osd_printf_info("Run it through the expansion to exploit this feature.\n");
 			}
 
-			internal_header_logging((UINT8 *)head, length());
+			internal_header_logging((uint8_t *)head, length());
 
 			m_cart->rom_alloc(len, tag());
 			fread(m_cart->get_rom_base(), len);
@@ -523,7 +523,7 @@ std::string a78_cart_slot_device::get_default_card_software()
 	if (open_image_file(mconfig().options()))
 	{
 		const char *slot_string;
-		std::vector<UINT8> head(128);
+		std::vector<uint8_t> head(128);
 		int type = A78_TYPE0, mapper;
 
 		// Load and check the header
@@ -714,14 +714,14 @@ WRITE8_MEMBER(a78_cart_slot_device::write_40xx)
 
  -------------------------------------------------*/
 
-void a78_cart_slot_device::internal_header_logging(UINT8 *header, UINT32 len)
+void a78_cart_slot_device::internal_header_logging(uint8_t *header, uint32_t len)
 {
 	char head_title[35];
-	UINT32 head_length = (header[49] << 24) | (header[50] << 16) | (header[51] << 8) | header[52];
-	UINT16 head_mapper = (header[53] << 8) | header[54];
-	UINT8 head_ctrl1 = header[55];
-	UINT8 head_ctrl2 = header[56];
-	UINT8 head_ispal = header[57];
+	uint32_t head_length = (header[49] << 24) | (header[50] << 16) | (header[51] << 8) | header[52];
+	uint16_t head_mapper = (header[53] << 8) | header[54];
+	uint8_t head_ctrl1 = header[55];
+	uint8_t head_ctrl2 = header[56];
+	uint8_t head_ispal = header[57];
 	std::string cart_mapper, ctrl1, ctrl2;
 	memcpy(head_title, header + 0x11, 0x20);
 

src/devices/bus/a7800/a78_slot.h

@@ -55,24 +55,24 @@ public:
 	virtual DECLARE_WRITE8_MEMBER(write_30xx) {}
 	virtual DECLARE_WRITE8_MEMBER(write_40xx) {}
 
-	void rom_alloc(UINT32 size, const char *tag);
-	void ram_alloc(UINT32 size);
-	void nvram_alloc(UINT32 size);
-	UINT8* get_rom_base() { return m_rom; }
-	UINT8* get_ram_base() { return &m_ram[0]; }
-	UINT8* get_nvram_base() { return &m_nvram[0]; }
-	UINT32 get_rom_size() { return m_rom_size; }
-	UINT32 get_ram_size() { return m_ram.size(); }
-	UINT32 get_nvram_size() { return m_nvram.size(); }
+	void rom_alloc(uint32_t size, const char *tag);
+	void ram_alloc(uint32_t size);
+	void nvram_alloc(uint32_t size);
+	uint8_t* get_rom_base() { return m_rom; }
+	uint8_t* get_ram_base() { return &m_ram[0]; }
+	uint8_t* get_nvram_base() { return &m_nvram[0]; }
+	uint32_t get_rom_size() { return m_rom_size; }
+	uint32_t get_ram_size() { return m_ram.size(); }
+	uint32_t get_nvram_size() { return m_nvram.size(); }
 
 protected:
 	// internal state
-	UINT8 *m_rom;
-	UINT32 m_rom_size;
-	std::vector<UINT8> m_ram;
-	std::vector<UINT8> m_nvram; // HiScore cart can save scores!
+	uint8_t *m_rom;
+	uint32_t m_rom_size;
+	std::vector<uint8_t> m_ram;
+	std::vector<uint8_t> m_nvram; // HiScore cart can save scores!
 	// helpers
-	UINT32 m_base_rom;
+	uint32_t m_base_rom;
 	int m_bank_mask;
 };
 
@@ -88,7 +88,7 @@ class a78_cart_slot_device : public device_t,
 {
 public:
 	// construction/destruction
-	a78_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a78_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 	virtual ~a78_cart_slot_device();
 
 	// device-level overrides
@@ -132,7 +132,7 @@ private:
 
 	image_verify_result verify_header(char *header);
 	int validate_header(int head, bool log);
-	void internal_header_logging(UINT8 *header, UINT32 len);
+	void internal_header_logging(uint8_t *header, uint32_t len);
 };
 
 

src/devices/bus/a7800/cpuwiz.cpp

@@ -40,24 +40,24 @@ const device_type A78_ROM_MEGACART = &device_creator<a78_megacart_device>;
 const device_type A78_ROM_P450_VB = &device_creator<a78_rom_p450_vb_device>;
 
 
-a78_versaboard_device::a78_versaboard_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)
+a78_versaboard_device::a78_versaboard_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)
 					: a78_rom_sg_device(mconfig, type, name, tag, owner, clock, shortname, source), m_ram_bank(0)
 				{
 }
 
-a78_versaboard_device::a78_versaboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_versaboard_device::a78_versaboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 					: a78_rom_sg_device(mconfig, A78_ROM_VERSABOARD, "Atari 7800 VersaBoard Cart", tag, owner, clock, "a78_versaboard", __FILE__), m_ram_bank(0)
 				{
 }
 
 
-a78_megacart_device::a78_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_megacart_device::a78_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 					: a78_versaboard_device(mconfig, A78_ROM_MEGACART, "Atari 7800 MegaCart+", tag, owner, clock, "a78_megacart", __FILE__)
 {
 }
 
 
-a78_rom_p450_vb_device::a78_rom_p450_vb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_p450_vb_device::a78_rom_p450_vb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 					: a78_versaboard_device(mconfig, A78_ROM_P450_VB, "Atari 7800 VersaBoard + POKEY @ 0x0450 Cart", tag, owner, clock, "a78_versapokey", __FILE__),
 						m_pokey450(*this, "pokey450")
 {

src/devices/bus/a7800/cpuwiz.h

@@ -13,8 +13,8 @@ class a78_versaboard_device : public a78_rom_sg_device
 {
 public:
 	// construction/destruction
-	a78_versaboard_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);
-	a78_versaboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a78_versaboard_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);
+	a78_versaboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	// device-level overrides
 	virtual void device_start() override;
@@ -35,7 +35,7 @@ class a78_megacart_device : public a78_versaboard_device
 {
 public:
 	// construction/destruction
-	a78_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a78_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	// reading and writing
 	virtual DECLARE_WRITE8_MEMBER(write_40xx) override;
@@ -50,7 +50,7 @@ class a78_rom_p450_vb_device : public a78_versaboard_device
 {
 public:
 	// construction/destruction
-	a78_rom_p450_vb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a78_rom_p450_vb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	// device-level overrides
 	virtual machine_config_constructor device_mconfig_additions() const override;

src/devices/bus/a7800/hiscore.cpp

@@ -20,7 +20,7 @@
 const device_type A78_HISCORE = &device_creator<a78_hiscore_device>;
 
 
-a78_hiscore_device::a78_hiscore_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_hiscore_device::a78_hiscore_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 					: a78_rom_device(mconfig, A78_HISCORE, "Atari 7800 High Score Cart", tag, owner, clock, "a78_highscore", __FILE__),
 						m_hscslot(*this, "hsc_slot")
 {

src/devices/bus/a7800/hiscore.h

@@ -13,7 +13,7 @@ class a78_hiscore_device : public a78_rom_device
 {
 public:
 	// construction/destruction
-	a78_hiscore_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	a78_hiscore_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	// device-level overrides
 	virtual machine_config_constructor device_mconfig_additions() const override;

src/devices/bus/a7800/rom.cpp

@@ -42,102 +42,102 @@ const device_type A78_ROM_P450_SG_RAM = &device_creator<a78_rom_p450_sg_ram_devi
 const device_type A78_ROM_P450_SG9 = &device_creator<a78_rom_p450_sg9_device>;
 
 
-a78_rom_device::a78_rom_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)
+a78_rom_device::a78_rom_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),
 						device_a78_cart_interface( mconfig, *this )
 {
 }
 
-a78_rom_device::a78_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_device::a78_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 					: device_t(mconfig, A78_ROM, "Atari 7800 ROM Carts w/no Bankswitch", tag, owner, clock, "a78_rom", __FILE__),
 						device_a78_cart_interface( mconfig, *this )
 {
 }
 
-a78_rom_pokey_device::a78_rom_pokey_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)
+a78_rom_pokey_device::a78_rom_pokey_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)
 					: a78_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
 						m_pokey(*this, "pokey")
 {
 }
 
-a78_rom_pokey_device::a78_rom_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_pokey_device::a78_rom_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 					: a78_rom_device(mconfig, A78_ROM_POKEY, "Atari 7800 ROM Carts w/no Bankswitch + POKEY", tag, owner, clock, "a78_rom_pok", __FILE__),
 						m_pokey(*this, "pokey")
 {
 }
 
 
-a78_rom_sg_device::a78_rom_sg_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)
+a78_rom_sg_device::a78_rom_sg_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)
 					: a78_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_bank(0)
 				{
 }
 
-a78_rom_sg_device::a78_rom_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_sg_device::a78_rom_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 					: a78_rom_device(mconfig, A78_ROM_SG, "Atari 7800 ROM Carts w/SuperGame Bankswitch", tag, owner, clock, "a78_rom_sg", __FILE__), m_bank(0)
 				{
 }
 
-a78_rom_sg_pokey_device::a78_rom_sg_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_sg_pokey_device::a78_rom_sg_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 					: a78_rom_sg_device(mconfig, A78_ROM_SG_POKEY, "Atari 7800 ROM Carts w/SuperGame Bankswitch + POKEY", tag, owner, clock, "a78_rom_sgp", __FILE__),
 						m_pokey(*this, "pokey")
 {
 }
 
 
-a78_rom_sg_ram_device::a78_rom_sg_ram_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)
+a78_rom_sg_ram_device::a78_rom_sg_ram_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)
 					: a78_rom_sg_device(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 }
 
-a78_rom_sg_ram_device::a78_rom_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_sg_ram_device::a78_rom_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 					: a78_rom_sg_device(mconfig, A78_ROM_SG_RAM, "Atari 7800 ROM Carts w/SuperGame Bankswitch + RAM", tag, owner, clock, "a78_rom_sgr", __FILE__)
 {
 }
 
 
-a78_rom_sg9_device::a78_rom_sg9_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)
+a78_rom_sg9_device::a78_rom_sg9_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)
 					: a78_rom_sg_device(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 }
 
-a78_rom_sg9_device::a78_rom_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_sg9_device::a78_rom_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 					: a78_rom_sg_device(mconfig, A78_ROM_SG9, "Atari 7800 ROM Carts w/SuperGame 9Banks", tag, owner, clock, "a78_rom_sg9", __FILE__)
 {
 }
 
 
-a78_rom_abs_device::a78_rom_abs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_abs_device::a78_rom_abs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 					: a78_rom_device(mconfig, A78_ROM_ABSOLUTE, "Atari 7800 ROM Carts w/Absolute Bankswitch", tag, owner, clock, "a78_rom_abs", __FILE__), m_bank(0)
 				{
 }
 
 
-a78_rom_act_device::a78_rom_act_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_act_device::a78_rom_act_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 					: a78_rom_device(mconfig, A78_ROM_ACTIVISION, "Atari 7800 ROM Carts w/Activision Bankswitch", tag, owner, clock, "a78_rom_act", __FILE__), m_bank(0)
 				{
 }
 
 
 
-a78_rom_p450_device::a78_rom_p450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_p450_device::a78_rom_p450_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 					: a78_rom_device(mconfig, A78_ROM_P450, "Atari 7800 ROM Carts w/POKEY @ 0x0450", tag, owner, clock, "a78_p450_t0", __FILE__),
 						m_pokey450(*this, "pokey450")
 {
 }
 
-a78_rom_p450_pokey_device::a78_rom_p450_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_p450_pokey_device::a78_rom_p450_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 					: a78_rom_pokey_device(mconfig, A78_ROM_P450_POKEY, "Atari 7800 ROM Carts w/no Bankswitch + POKEY + POKEY @ 0x0450", tag, owner, clock, "a78_p450_t1", __FILE__),
 						m_pokey450(*this, "pokey450")
 {
 }
 
-a78_rom_p450_sg_ram_device::a78_rom_p450_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_p450_sg_ram_device::a78_rom_p450_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 					: a78_rom_sg_ram_device(mconfig, A78_ROM_P450_SG_RAM, "Atari 7800 ROM Carts w/SuperGame Bankswitch + RAM + POKEY @ 0x0450", tag, owner, clock, "a78_p450_t6", __FILE__),
 						m_pokey450(*this, "pokey450")
 {
 }
 
-a78_rom_p450_sg9_device::a78_rom_p450_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_p450_sg9_device::a78_rom_p450_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 					: a78_rom_sg9_device(mconfig, A78_ROM_P450_SG9, "Atari 7800 ROM Carts w/SuperGame 9Banks + POKEY @ 0x0450", tag, owner, clock, "a78_p450_ta", __FILE__),
 						m_pokey450(*this, "pokey450")
 {
@@ -438,8 +438,8 @@ WRITE8_MEMBER(a78_rom_abs_device::write_40xx)
 
 READ8_MEMBER(a78_rom_act_device::read_40xx)
 {
-	UINT8 data = 0xff;
-	UINT16 addr = offset & 0x1fff;
+	uint8_t data = 0xff;
+	uint16_t addr = offset & 0x1fff;
 
 	// offset goes from 0 to 0xc000
 	switch (offset & 0xe000)