fix some device validation errors, also fix uninitialised members in some devices using constructor delegation (nw)

src/devices/bus/nes/namcot.cpp

@@ -75,12 +75,12 @@ nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, device
 }
 
 nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-					: nes_nrom_device(mconfig, NES_NAMCOT175, "NES Cart Namcot 340 PCB", tag, owner, clock, "nes_namcot340", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
+					: nes_nrom_device(mconfig, NES_NAMCOT340, "NES Cart Namcot 340 PCB", tag, owner, clock, "nes_namcot340", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
 				{
 }
 
 nes_namcot175_device::nes_namcot175_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-					: nes_namcot340_device(mconfig, NES_NAMCOT340, "NES Cart Namcot 175 PCB", tag, owner, clock, "nes_namcot175", __FILE__), m_wram_protect(0)
+					: nes_namcot340_device(mconfig, NES_NAMCOT175, "NES Cart Namcot 175 PCB", tag, owner, clock, "nes_namcot175", __FILE__), m_wram_protect(0)
 				{
 }
 

src/devices/bus/pc_kbd/keytro.cpp

@@ -378,13 +378,33 @@ ROM_END
 
 
 pc_kbd_keytronic_pc3270_device::pc_kbd_keytronic_pc3270_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
-	device_t(mconfig, PC_KBD_KEYTRONIC_PC3270, "Keytronic PC3270", tag, owner, clock, "keytronic_pc3270", __FILE__),
+	pc_kbd_keytronic_pc3270_device(mconfig, PC_KBD_KEYTRONIC_PC3270, "Keytronic PC3270", tag, owner, clock, "keytronic_pc3270", __FILE__)
+{
+}
+
+
+pc_kbd_keytronic_pc3270_device::pc_kbd_keytronic_pc3270_device(
+		machine_config const &mconfig,
+		device_type type,
+		char const *name,
+		char const *tag,
+		device_t *owner,
+		uint32_t clock,
+		char const *shortname,
+		char const *source) :
+	device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 	device_pc_kbd_interface(mconfig, *this),
 	m_cpu(*this, "kb_keytr"), m_p1(0), m_p1_data(0), m_p2(0), m_p3(0), m_last_write_addr(0)
 {
 }
 
 
+pc_kbd_keytronic_pc3270_at_device::pc_kbd_keytronic_pc3270_at_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	pc_kbd_keytronic_pc3270_device(mconfig, PC_KBD_KEYTRONIC_PC3270_AT, "Keytronic PC3270 AT", tag, owner, clock, "keytronic_pc3270_at", __FILE__)
+{
+}
+
+
 //-------------------------------------------------
 //  device_start - device-specific startup
 //-------------------------------------------------

src/devices/bus/pc_kbd/keytro.h

@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef __KB_KEYTRO_H__
+#ifndef MAME_BUS_PC_KBD_KEYTRO_H
-#define __KB_KEYTRO_H__
+#define MAME_BUS_PC_KBD_KEYTRO_H
 
 #include "pc_kbdc.h"
 
@@ -44,6 +44,16 @@ public:
 	DECLARE_WRITE8_MEMBER( p3_write );
 
 protected:
+	pc_kbd_keytronic_pc3270_device(
+			machine_config const &mconfig,
+			device_type type,
+			char const *name,
+			char const *tag,
+			device_t *owner,
+			uint32_t clock,
+			char const *shortname,
+			char const *source);
+
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
@@ -60,10 +70,7 @@ class pc_kbd_keytronic_pc3270_at_device : public pc_kbd_keytronic_pc3270_device
 {
 public:
 	// construction/destruction
-	pc_kbd_keytronic_pc3270_at_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	pc_kbd_keytronic_pc3270_at_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-		: pc_kbd_keytronic_pc3270_device(mconfig, tag, owner, clock)
-	{
-	}
 
 	virtual ioport_constructor device_input_ports() const override;
 };
@@ -73,4 +80,4 @@ public:
 extern const device_type PC_KBD_KEYTRONIC_PC3270;
 extern const device_type PC_KBD_KEYTRONIC_PC3270_AT;
 
-#endif  /* __KB_KEYTRO_H__ */
+#endif // MAME_BUS_PC_KBD_KEYTRO_H

src/devices/bus/scv/rom.cpp

@@ -54,12 +54,12 @@ scv_rom32ram8_device::scv_rom32ram8_device(const machine_config &mconfig, const
 }
 
 scv_rom64_device::scv_rom64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-					: scv_rom8_device(mconfig, SCV_ROM16K, "SCV 64K Carts", tag, owner, clock, "scv_rom64", __FILE__), m_bank_base(0)
+					: scv_rom8_device(mconfig, SCV_ROM64K, "SCV 64K Carts", tag, owner, clock, "scv_rom64", __FILE__), m_bank_base(0)
 				{
 }
 
 scv_rom128_device::scv_rom128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-					: scv_rom8_device(mconfig, SCV_ROM32K, "SCV 128K Carts", tag, owner, clock, "scv_rom128", __FILE__), m_bank_base(0)
+					: scv_rom8_device(mconfig, SCV_ROM128K, "SCV 128K Carts", tag, owner, clock, "scv_rom128", __FILE__), m_bank_base(0)
 				{
 }
 

src/devices/bus/sunkbd/hlekbd.cpp

@@ -1211,7 +1211,7 @@ hle_type5_gb_device::hle_type5_gb_device(
 		uint32_t clock)
 	: hle_type4_device_base(
 			mconfig,
-			SUN_TYPE5_HLE_KEYBOARD,
+			SUN_TYPE5_GB_HLE_KEYBOARD,
 			"Sun Type 5 Keyboard (Great Britain - HLE)",
 			tag,
 			owner,
@@ -1250,7 +1250,7 @@ hle_type5_se_device::hle_type5_se_device(
 		uint32_t clock)
 	: hle_type4_device_base(
 			mconfig,
-			SUN_TYPE5_HLE_KEYBOARD,
+			SUN_TYPE5_SE_HLE_KEYBOARD,
 			"Sun Type 5 Keyboard (Sweden - HLE)",
 			tag,
 			owner,
@@ -1289,7 +1289,7 @@ hle_type5_jp_device::hle_type5_jp_device(
 		uint32_t clock)
 	: hle_type4_device_base(
 			mconfig,
-			SUN_TYPE5_HLE_KEYBOARD,
+			SUN_TYPE5_JP_HLE_KEYBOARD,
 			"Sun Type 5 Keyboard (Japan - HLE)",
 			tag,
 			owner,

src/devices/bus/vc4000/slot.cpp

@@ -87,7 +87,7 @@ vc4000_cart_slot_device::vc4000_cart_slot_device(
 		uint32_t clock,
 		const char *shortname,
 		const char *source)
-	: device_t(mconfig, VC4000_CART_SLOT, name, tag, owner, clock, shortname, source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 	, device_image_interface(mconfig, *this)
 	, device_slot_interface(mconfig, *this)
 	, m_type(VC4000_STD)

src/devices/cpu/clipper/clipper.cpp

@@ -33,13 +33,13 @@ const device_type CLIPPER_C300 = device_creator<clipper_c300_device>;
 const device_type CLIPPER_C400 = device_creator<clipper_c400_device>;
 
 clipper_c100_device::clipper_c100_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
-	: clipper_device(mconfig, CLIPPER_C100, "C100 CLIPPER", tag, owner, clock, "C100", __FILE__) { }
+	: clipper_device(mconfig, CLIPPER_C100, "C100 CLIPPER", tag, owner, clock, "c100", __FILE__) { }
 
 clipper_c300_device::clipper_c300_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
-	: clipper_device(mconfig, CLIPPER_C300, "C300 CLIPPER", tag, owner, clock, "C300", __FILE__) { }
+	: clipper_device(mconfig, CLIPPER_C300, "C300 CLIPPER", tag, owner, clock, "c300", __FILE__) { }
 
 clipper_c400_device::clipper_c400_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
-	: clipper_device(mconfig, CLIPPER_C400, "C400 CLIPPER", tag, owner, clock, "C400", __FILE__) { }
+	: clipper_device(mconfig, CLIPPER_C400, "C400 CLIPPER", tag, owner, clock, "c400", __FILE__) { }
 
 clipper_device::clipper_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, u32 clock, const char *shortname, const char *source)
 	: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source),

src/devices/cpu/hphybrid/hphybrid.cpp

@@ -106,38 +106,34 @@ const device_type HP_5061_3011 = device_creator<hp_5061_3011_cpu_device>;
 
 WRITE_LINE_MEMBER(hp_hybrid_cpu_device::dmar_w)
 {
-				if (state) {
+	if (state)
 		BIT_SET(m_flags , HPHYBRID_DMAR_BIT);
-				} else {
+	else
 		BIT_CLR(m_flags , HPHYBRID_DMAR_BIT);
-				}
 }
 
 WRITE_LINE_MEMBER(hp_hybrid_cpu_device::halt_w)
 {
-		if (state) {
+	if (state)
 		BIT_SET(m_flags , HPHYBRID_HALT_BIT);
-		} else {
+	else
 		BIT_CLR(m_flags , HPHYBRID_HALT_BIT);
-		}
 }
 
 WRITE_LINE_MEMBER(hp_hybrid_cpu_device::status_w)
 {
-		if (state) {
+	if (state)
 		BIT_SET(m_flags , HPHYBRID_STS_BIT);
-		} else {
+	else
 		BIT_CLR(m_flags , HPHYBRID_STS_BIT);
-		}
 }
 
 WRITE_LINE_MEMBER(hp_hybrid_cpu_device::flag_w)
 {
-		if (state) {
+	if (state)
 		BIT_SET(m_flags , HPHYBRID_FLG_BIT);
-		} else {
+	else
 		BIT_CLR(m_flags , HPHYBRID_FLG_BIT);
-		}
 }
 
 uint8_t hp_hybrid_cpu_device::pa_r(void) const
@@ -146,10 +142,10 @@ uint8_t hp_hybrid_cpu_device::pa_r(void) const
 }
 
 hp_hybrid_cpu_device::hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname , uint8_t addrwidth)
-		: cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
+	: cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
-			m_pa_changed_func(*this),
+	, m_pa_changed_func(*this)
-			m_program_config("program", ENDIANNESS_BIG, 16, addrwidth, -1),
+	, m_program_config("program", ENDIANNESS_BIG, 16, addrwidth, -1)
-			m_io_config("io", ENDIANNESS_BIG, 16, 6, -1)
+	, m_io_config("io", ENDIANNESS_BIG, 16, 6, -1)
 {
 }
 
@@ -246,12 +242,11 @@ void hp_hybrid_cpu_device::execute_run()
 void hp_hybrid_cpu_device::execute_set_input(int inputnum, int state)
 {
 	if (inputnum < HPHYBRID_INT_LVLS) {
-								if (state) {
+		if (state)
 			BIT_SET(m_flags , HPHYBRID_IRH_BIT + inputnum);
-								} else {
+		else
 			BIT_CLR(m_flags , HPHYBRID_IRH_BIT + inputnum);
 	}
-				}
 }
 
 /**
@@ -1126,8 +1121,8 @@ void hp_hybrid_cpu_device::WIO(uint8_t pa , uint8_t ic , uint16_t v)
 }
 
 hp_5061_3001_cpu_device::hp_5061_3001_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-		: hp_hybrid_cpu_device(mconfig, HP_5061_3001, "HP-5061-3001", tag, owner, clock, "5061-3001", 22),
+	: hp_hybrid_cpu_device(mconfig, HP_5061_3001, "HP-5061-3001", tag, owner, clock, "5061_3001", 22)
-			m_boot_mode(false)
+	, m_boot_mode(false)
 {
 }
 
@@ -1364,11 +1359,10 @@ uint16_t hp_5061_3001_cpu_device::execute_no_bpc_ioc(uint16_t opcode)
 			tmp_ar2 = get_ar2();
 			carry = do_dec_add(BIT(m_flags , HPHYBRID_DC_BIT) , tmp_ar2 , m_reg_B);
 			set_ar2(tmp_ar2);
-						if (carry) {
+			if (carry)
 				BIT_SET(m_flags, HPHYBRID_DC_BIT);
-						} else {
+			else
 				BIT_CLR(m_flags, HPHYBRID_DC_BIT);
-						}
 			break;
 
 		case 0x7220:
@@ -1397,11 +1391,10 @@ uint16_t hp_5061_3001_cpu_device::execute_no_bpc_ioc(uint16_t opcode)
 				tmp_ar2 = get_ar2();
 				carry = do_dec_add(BIT(m_flags , HPHYBRID_DC_BIT) , tmp_ar2 , get_ar1());
 				set_ar2(tmp_ar2);
-						if (carry) {
+				if (carry)
 					BIT_SET(m_flags, HPHYBRID_DC_BIT);
-						} else {
+				else
 					BIT_CLR(m_flags, HPHYBRID_DC_BIT);
-						}
 				break;
 
 		case 0x7340:
@@ -1438,9 +1431,8 @@ uint16_t hp_5061_3001_cpu_device::execute_no_bpc_ioc(uint16_t opcode)
 			tmp_ar2 = get_ar2();
 			for (n = m_reg_B & 0xf; n > 0; n--) {
 				m_icount -= 13;
-								if (do_dec_add(BIT(m_flags , HPHYBRID_DC_BIT) , tmp_ar2 , tmp_ar)) {
+				if (do_dec_add(BIT(m_flags , HPHYBRID_DC_BIT) , tmp_ar2 , tmp_ar))
 					m_reg_A++;
-								}
 				BIT_CLR(m_flags , HPHYBRID_DC_BIT);
 			}
 			set_ar2(tmp_ar2);
@@ -1693,7 +1685,7 @@ void hp_5061_3001_cpu_device::enter_isr(void)
 }
 
 hp_5061_3011_cpu_device::hp_5061_3011_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-		: hp_hybrid_cpu_device(mconfig, HP_5061_3011, "HP-5061-3011", tag, owner, clock, "5061-3011", 16)
+	: hp_hybrid_cpu_device(mconfig, HP_5061_3011, "HP-5061-3011", tag, owner, clock, "5061_3011", 16)
 {
 }
 

src/devices/cpu/mcs51/mcs51.cpp

@@ -350,7 +350,7 @@ i80c52_device::i80c52_device(const machine_config &mconfig, device_type type, co
 }
 
 i80c52_device::i80c52_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: i8052_device(mconfig, I80C52, "I80C52", tag, owner, clock, "i80C52", 13, 8, FEATURE_I80C52 | FEATURE_CMOS)
+	: i8052_device(mconfig, I80C52, "I80C52", tag, owner, clock, "i80c52", 13, 8, FEATURE_I80C52 | FEATURE_CMOS)
 {
 }
 

src/devices/cpu/nec/nec.cpp

@@ -156,7 +156,7 @@ v33_device::v33_device(const machine_config &mconfig, const char *tag, device_t
 
 
 v33a_device::v33a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: nec_common_device(mconfig, V33A, "V33A", tag, owner, clock, "v33A", __FILE__, true, BYTE_XOR_LE(0), 6, 1, V33_TYPE)
+	: nec_common_device(mconfig, V33A, "V33A", tag, owner, clock, "v33a", __FILE__, true, BYTE_XOR_LE(0), 6, 1, V33_TYPE)
 {
 }
 

src/devices/cpu/sh2/sh2.cpp

@@ -229,12 +229,12 @@ sh2_device::sh2_device(const machine_config &mconfig, device_type type, const ch
 }
 
 sh2a_device::sh2a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: sh2_device(mconfig, SH1, "SH-2A", tag, owner, clock, "sh2a", __FILE__, CPU_TYPE_SH2, ADDRESS_MAP_NAME(sh7021_map), 28 )
+	: sh2_device(mconfig, SH2A, "SH-2A", tag, owner, clock, "sh2a", __FILE__, CPU_TYPE_SH2, ADDRESS_MAP_NAME(sh7021_map), 28)
 {
 }
 
 sh1_device::sh1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: sh2_device(mconfig, SH1, "SH-1", tag, owner, clock, "sh1", __FILE__, CPU_TYPE_SH1, ADDRESS_MAP_NAME(sh7032_map), 28 )
+	: sh2_device(mconfig, SH1, "SH-1", tag, owner, clock, "sh1", __FILE__, CPU_TYPE_SH1, ADDRESS_MAP_NAME(sh7032_map), 28)
 {
 }
 

src/devices/machine/68561mpcc.cpp

@@ -141,59 +141,29 @@ mpcc_device::mpcc_device(const machine_config &mconfig, device_type type, const
 }
 
 mpcc_device::mpcc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: device_t(mconfig, MPCC, "Rockwell MPCC", tag, owner, clock, "mpcc", __FILE__),
+	: mpcc_device(mconfig, MPCC, "Rockwell MPCC", tag, owner, clock, TYPE_MPCC, "mpcc", __FILE__)
-	  device_serial_interface(mconfig, *this),
-	  m_variant(TYPE_MPCC),
-	  m_rxc(0),
-	  m_txc(0),
-	  m_brg_rate(0),
-	  m_rcv(0),
-	  m_rxd(0),
-	  m_tra(0),
-	  m_out_txd_cb(*this),
-	  m_out_dtr_cb(*this),
-	  m_out_rts_cb(*this),
-	  m_out_rtxc_cb(*this),
-	  m_out_trxc_cb(*this),
-	  m_out_int_cb(*this),
-	  m_rsr(0),
-	  m_rcr(0),
-	  m_rdr(0),
-	  m_rivnr(0),
-	  m_rier(0),
-	  m_tsr(0),
-	  m_tcr(0),
-	  m_tdr(0),
-	  m_tivnr(0),
-	  m_tier(0),
-	  m_sisr(0),
-	  m_sicr(0),
-	  m_sivnr(0),
-	  m_sier(0),
-	  m_psr1(0),
-	  m_psr2(0),
-	  m_ar1(0),
-	  m_ar2(0),
-	  m_brdr1(0),
-	  m_brdr2(0),
-	  m_ccr(0),
-	  m_ecr(0)
 {
-	for (auto & elem : m_int_state)
-		elem = 0;
 }
 
 mpcc68560_device::mpcc68560_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: mpcc_device(mconfig, MPCC68560, "MPCC 68560", tag, owner, clock, TYPE_MPCC68560, "mpcc68560", __FILE__){ }
+	: mpcc_device(mconfig, MPCC68560, "MPCC 68560", tag, owner, clock, TYPE_MPCC68560, "mpcc68560", __FILE__)
+{
+}
 
 mpcc68560A_device::mpcc68560A_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: mpcc_device(mconfig, MPCC68560A, "MPCC 68560A", tag, owner, clock, TYPE_MPCC68560A, "mpcc68560A", __FILE__){ }
+	: mpcc_device(mconfig, MPCC68560A, "MPCC 68560A", tag, owner, clock, TYPE_MPCC68560A, "mpcc68560a", __FILE__)
+{
+}
 
 mpcc68561_device::mpcc68561_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: mpcc_device(mconfig, MPCC68561, "MPCC 68561", tag, owner, clock, TYPE_MPCC68561, "mpcc68561", __FILE__){ }
+	: mpcc_device(mconfig, MPCC68561, "MPCC 68561", tag, owner, clock, TYPE_MPCC68561, "mpcc68561", __FILE__)
+{
+}
 
 mpcc68561A_device::mpcc68561A_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: mpcc_device(mconfig, MPCC68561A, "MPCC 68561A", tag, owner, clock, TYPE_MPCC68561A, "mpcc68561A", __FILE__){ }
+	: mpcc_device(mconfig, MPCC68561A, "MPCC 68561A", tag, owner, clock, TYPE_MPCC68561A, "mpcc68561a", __FILE__)
+{
+}
 
 //-------------------------------------------------
 //  device_start - device-specific startup

src/devices/machine/ataflash.cpp

@@ -211,7 +211,7 @@ bool taito_pccard1_device::is_ready()
 const device_type TAITO_PCCARD2 = device_creator<taito_pccard2_device>;
 
 taito_pccard2_device::taito_pccard2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
-	ata_flash_pccard_device(mconfig, TAITO_PCCARD1, "Taito PC-CARD (Type 2)", tag, owner, clock, "taito_pccard2", __FILE__),
+	ata_flash_pccard_device(mconfig, TAITO_PCCARD2, "Taito PC-CARD (Type 2)", tag, owner, clock, "taito_pccard2", __FILE__),
 	m_locked(false)
 {
 }

src/devices/machine/z80scc.cpp

@@ -191,32 +191,14 @@ z80scc_device::z80scc_device(const machine_config &mconfig, device_type type, co
 	m_out_rxdrqb_cb(*this),
 	m_out_txdrqb_cb(*this),
 	m_variant(variant),
-	m_wr0_ptrbits(0){
+	m_wr0_ptrbits(0)
+{
 	for (auto & elem : m_int_state)
 		elem = 0;
 }
 
 z80scc_device::z80scc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: device_t(mconfig, Z80SCC, "Z80 SCC", tag, owner, clock, "z80scc", __FILE__),
+	: z80scc_device(mconfig, Z80SCC, "Z80 SCC", tag, owner, clock, TYPE_Z80SCC, "z80scc", __FILE__)
-		device_z80daisy_interface(mconfig, *this),
-		m_chanA(*this, CHANA_TAG),
-		m_chanB(*this, CHANB_TAG),
-		m_out_txda_cb(*this),
-		m_out_dtra_cb(*this),
-		m_out_rtsa_cb(*this),
-		m_out_wrdya_cb(*this),
-		m_out_synca_cb(*this),
-		m_out_txdb_cb(*this),
-		m_out_dtrb_cb(*this),
-		m_out_rtsb_cb(*this),
-		m_out_wrdyb_cb(*this),
-		m_out_syncb_cb(*this),
-		m_out_int_cb(*this),
-		m_out_rxdrqa_cb(*this),
-		m_out_txdrqa_cb(*this),
-		m_out_rxdrqb_cb(*this),
-		m_out_txdrqb_cb(*this),
-		m_variant(TYPE_Z80SCC)
 {
 	for (auto & elem : m_int_state)
 		elem = 0;
@@ -226,7 +208,7 @@ scc8030_device::scc8030_device(const machine_config &mconfig, const char *tag, d
 	: z80scc_device(mconfig, SCC8030, "SCC 8030", tag, owner, clock, TYPE_SCC8030, "scc8030", __FILE__){ }
 
 scc80C30_device::scc80C30_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: z80scc_device(mconfig, SCC80C30, "SCC 80C30", tag, owner, clock, TYPE_SCC80C30, "scc80C30", __FILE__){ }
+	: z80scc_device(mconfig, SCC80C30, "SCC 80C30", tag, owner, clock, TYPE_SCC80C30, "scc80c30", __FILE__){ }
 
 scc80230_device::scc80230_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 	: z80scc_device(mconfig, SCC80230, "SCC 80230", tag, owner, clock, TYPE_SCC80230, "scc80230", __FILE__){ }
@@ -235,7 +217,7 @@ scc8530_device::scc8530_device(const machine_config &mconfig, const char *tag, d
 	: z80scc_device(mconfig, SCC8530N, "SCC 8530", tag, owner, clock, TYPE_SCC8530, "scc8530", __FILE__){ }
 
 scc85C30_device::scc85C30_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: z80scc_device(mconfig, SCC85C30, "SCC 85C30", tag, owner, clock, TYPE_SCC85C30, "scc85C30", __FILE__){ }
+	: z80scc_device(mconfig, SCC85C30, "SCC 85C30", tag, owner, clock, TYPE_SCC85C30, "scc85c30", __FILE__){ }
 
 scc85230_device::scc85230_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 	: z80scc_device(mconfig, SCC85230, "SCC 85230", tag, owner, clock, TYPE_SCC85230, "scc85230", __FILE__){ }
@@ -244,7 +226,7 @@ scc85233_device::scc85233_device(const machine_config &mconfig, const char *tag,
 	: z80scc_device(mconfig, SCC85233, "SCC 85233", tag, owner, clock, TYPE_SCC85233, "scc85233", __FILE__){ }
 
 scc8523L_device::scc8523L_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: z80scc_device(mconfig, SCC8523L, "SCC 8523L", tag, owner, clock, TYPE_SCC8523L, "scc8523L", __FILE__){ }
+	: z80scc_device(mconfig, SCC8523L, "SCC 8523L", tag, owner, clock, TYPE_SCC8523L, "scc8523l", __FILE__){ }
 
 //-------------------------------------------------
 //  device_start - device-specific startup