From 0ec2741440a76029b523a517eba3782904e609a2 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Fri, 23 Aug 2013 10:48:21 +0000
Subject: [PATCH] Fixed missing devices from XML (excluding legacy cpu) (nw)

---
 src/emu/cpu/m68000/m68000.h      |  1 +
 src/emu/cpu/m68000/m68kcpu.c     |  5 +++++
 src/emu/machine/mcf5206e.c       |  2 +-
 src/mame/machine/awboard.c       |  2 +-
 src/mame/machine/fd1089.c        |  8 ++++----
 src/mame/machine/fd1089.h        |  2 +-
 src/mame/machine/fd1094.c        |  2 +-
 src/mame/machine/naomibd.c       |  4 ++--
 src/mame/machine/naomibd.h       |  2 +-
 src/mame/machine/naomig1.c       |  4 ++--
 src/mame/machine/naomig1.h       |  2 +-
 src/mame/machine/naomigd.c       |  2 +-
 src/mame/machine/naomim1.c       |  2 +-
 src/mame/machine/naomim2.c       |  2 +-
 src/mame/machine/naomim4.c       |  2 +-
 src/mame/machine/naomirom.c      |  2 +-
 src/mame/video/sega16sp.c        | 24 ++++++++++++------------
 src/mame/video/sega16sp.h        |  4 ++--
 src/mess/machine/c64/reu.c       | 10 +++++-----
 src/mess/machine/c64/reu.h       |  2 +-
 src/mess/machine/gb_slot.c       |  2 +-
 src/mess/machine/ti99/videowrp.c | 10 ++++++++++
 src/mess/machine/ti99/videowrp.h | 10 ++++------
 23 files changed, 60 insertions(+), 46 deletions(-)

diff --git a/src/emu/cpu/m68000/m68000.h b/src/emu/cpu/m68000/m68000.h
index 2cffb1058a7..b9b181ebc92 100644
--- a/src/emu/cpu/m68000/m68000.h
+++ b/src/emu/cpu/m68000/m68000.h
@@ -407,6 +407,7 @@ class m68000_device : public m68000_base_device
 public:
 	// construction/destruction
 	m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 	m68000_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock,
 						const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source);
diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/emu/cpu/m68000/m68kcpu.c
index 94526192d7d..f1ee9e9afa0 100644
--- a/src/emu/cpu/m68000/m68kcpu.c
+++ b/src/emu/cpu/m68000/m68kcpu.c
@@ -2489,6 +2489,11 @@ m68000_device::m68000_device(const machine_config &mconfig, const char *tag, dev
 {
 }
 
+m68000_device::m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: m68000_base_device(mconfig, "M68000", tag, owner, clock, M68000, 16,24, shortname, source)
+{
+}
+
 void m68000_device::device_start()
 {
 	init_cpu_m68000();
diff --git a/src/emu/machine/mcf5206e.c b/src/emu/machine/mcf5206e.c
index bab4725afc0..8289d8abe69 100644
--- a/src/emu/machine/mcf5206e.c
+++ b/src/emu/machine/mcf5206e.c
@@ -829,7 +829,7 @@ const device_type MCF5206E_PERIPHERAL = &device_creator<mcf5206e_peripheral_devi
 //-------------------------------------------------
 
 mcf5206e_peripheral_device::mcf5206e_peripheral_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MCF5206E_PERIPHERAL, "MCF5206E Peripheral", tag, owner, clock, "mcf5206e", __FILE__),
+	: device_t(mconfig, MCF5206E_PERIPHERAL, "MCF5206E Peripheral", tag, owner, clock, "mcf5206e_peripheral", __FILE__),
 		device_memory_interface(mconfig, *this),
 		m_space_config("coldfire_regs", ENDIANNESS_BIG, 32,10, 0, NULL, *ADDRESS_MAP_NAME(coldfire_regs_map))
 
diff --git a/src/mame/machine/awboard.c b/src/mame/machine/awboard.c
index 9ad8e627fb8..4991b0afaa7 100644
--- a/src/mame/machine/awboard.c
+++ b/src/mame/machine/awboard.c
@@ -111,7 +111,7 @@ DEVICE_ADDRESS_MAP_START(submap, 16, aw_rom_board)
 ADDRESS_MAP_END
 
 aw_rom_board::aw_rom_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: naomi_g1_device(mconfig, AW_ROM_BOARD, "AW-ROM-BOARD", tag, owner, clock)
+	: naomi_g1_device(mconfig, AW_ROM_BOARD, "AW-ROM-BOARD", tag, owner, clock, "aw_rom_board", __FILE__)
 {
 	region_is_decrypted = false;
 	keyregion = 0;
diff --git a/src/mame/machine/fd1089.c b/src/mame/machine/fd1089.c
index 10582db70f2..fdb2a1c7d53 100644
--- a/src/mame/machine/fd1089.c
+++ b/src/mame/machine/fd1089.c
@@ -214,20 +214,20 @@ const fd1089_base_device::decrypt_parameters fd1089_base_device::s_data_params_a
 //  fd1089_base_device - constructor
 //-------------------------------------------------
 
-fd1089_base_device::fd1089_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: m68000_device(mconfig, tag, owner, clock)
+fd1089_base_device::fd1089_base_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)
+	: m68000_device(mconfig, tag, owner, clock, shortname, source)
 {
 	// override the name after the m68000 initializes
 	m_name.cpy(name);
 }
 
 fd1089a_device::fd1089a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: fd1089_base_device(mconfig, FD1089A, "FD1089A", tag, owner, clock)
+	: fd1089_base_device(mconfig, FD1089A, "FD1089A", tag, owner, clock, "fd1089a", __FILE__)
 {
 }
 
 fd1089b_device::fd1089b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: fd1089_base_device(mconfig, FD1089B, "FD1089B", tag, owner, clock)
+	: fd1089_base_device(mconfig, FD1089B, "FD1089B", tag, owner, clock, "fd1089b", __FILE__)
 {
 }
 
diff --git a/src/mame/machine/fd1089.h b/src/mame/machine/fd1089.h
index 6509c7f7488..a7c065954ca 100644
--- a/src/mame/machine/fd1089.h
+++ b/src/mame/machine/fd1089.h
@@ -37,7 +37,7 @@ class fd1089_base_device : public m68000_device
 {
 public:
 	// construction/destruction
-	fd1089_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	fd1089_base_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);
 
 	// explicit decryption helpers
 	void decrypt(offs_t baseaddr, UINT32 size, offs_t regionoffs, UINT16 *opcodesptr, UINT16 *dataptr) { decrypt(baseaddr, size, &m_plaintext[regionoffs/2], opcodesptr, dataptr); }
diff --git a/src/mame/machine/fd1094.c b/src/mame/machine/fd1094.c
index 160bc4b138d..aeda80410db 100644
--- a/src/mame/machine/fd1094.c
+++ b/src/mame/machine/fd1094.c
@@ -607,7 +607,7 @@ UINT16 *fd1094_decryption_cache::decrypted_opcodes(UINT8 state)
 
 
 fd1094_device::fd1094_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: m68000_device(mconfig, tag, owner, clock),
+	: m68000_device(mconfig, tag, owner, clock, "fd1094", __FILE__),
 		m_state(0x00),
 		m_irqmode(false),
 		m_cache(*this),
diff --git a/src/mame/machine/naomibd.c b/src/mame/machine/naomibd.c
index b89ab345966..696ef4c10e3 100644
--- a/src/mame/machine/naomibd.c
+++ b/src/mame/machine/naomibd.c
@@ -63,8 +63,8 @@ DEVICE_ADDRESS_MAP_START(submap, 16, naomi_board)
 	AM_RANGE(0x00, 0xff) AM_READ(default_r)
 ADDRESS_MAP_END
 
-naomi_board::naomi_board(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: naomi_g1_device(mconfig, type, name, tag, owner, clock)
+naomi_board::naomi_board(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: naomi_g1_device(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 	eeprom_tag = 0;
 }
diff --git a/src/mame/machine/naomibd.h b/src/mame/machine/naomibd.h
index 508baf07302..2807a6f8046 100644
--- a/src/mame/machine/naomibd.h
+++ b/src/mame/machine/naomibd.h
@@ -11,7 +11,7 @@
 class naomi_board : public naomi_g1_device
 {
 public:
-	naomi_board(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	naomi_board(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 	static void static_set_eeprom_tag(device_t &device, const char *_eeprom_tag);
 
diff --git a/src/mame/machine/naomig1.c b/src/mame/machine/naomig1.c
index f52305ebb16..8261c708c76 100644
--- a/src/mame/machine/naomig1.c
+++ b/src/mame/machine/naomig1.c
@@ -23,8 +23,8 @@ DEVICE_ADDRESS_MAP_START(amap, 32, naomi_g1_device)
 	AM_RANGE(0xf8, 0xfb) AM_READ(sb_gdlend_r)
 ADDRESS_MAP_END
 
-naomi_g1_device::naomi_g1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, type, name, tag, owner, clock, "naomi_g1", __FILE__),
+naomi_g1_device::naomi_g1_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)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 		irq_cb(*this)
 {
 }
diff --git a/src/mame/machine/naomig1.h b/src/mame/machine/naomig1.h
index 82d4b72483a..90fc0ed7440 100644
--- a/src/mame/machine/naomig1.h
+++ b/src/mame/machine/naomig1.h
@@ -16,7 +16,7 @@ public:
 
 	typedef delegate<void (UINT32 main_adr, void *dma_ptr, UINT32 length, UINT32 size, bool to_mainram)> dma_cb;
 
-	naomi_g1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	naomi_g1_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);
 	template<class _cb> void set_irq_cb(_cb cb) { irq_cb.set_callback(cb); }
 	void set_dma_cb(dma_cb _cb) { _dma_cb = _cb; }
 
diff --git a/src/mame/machine/naomigd.c b/src/mame/machine/naomigd.c
index ba2227d800d..2a5e8d5f4b7 100644
--- a/src/mame/machine/naomigd.c
+++ b/src/mame/machine/naomigd.c
@@ -325,7 +325,7 @@ void naomi_gdrom_board::write_from_qword(UINT8 *region, UINT64 qword)
 }
 
 naomi_gdrom_board::naomi_gdrom_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: naomi_board(mconfig, NAOMI_GDROM_BOARD, "NAOMI-GDROM-BOARD", tag, owner, clock)
+	: naomi_board(mconfig, NAOMI_GDROM_BOARD, "NAOMI-GDROM-BOARD", tag, owner, clock, "naomi_gdrom_board", __FILE__)
 {
 	image_tag = 0;
 	pic_tag = 0;
diff --git a/src/mame/machine/naomim1.c b/src/mame/machine/naomim1.c
index 8739fb743a0..809ee5d248b 100644
--- a/src/mame/machine/naomim1.c
+++ b/src/mame/machine/naomim1.c
@@ -11,7 +11,7 @@ DEVICE_ADDRESS_MAP_START(submap, 16, naomi_m1_board)
 ADDRESS_MAP_END
 
 naomi_m1_board::naomi_m1_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: naomi_board(mconfig, NAOMI_M1_BOARD, "NAOMI-M1-BOARD", tag, owner, clock)
+	: naomi_board(mconfig, NAOMI_M1_BOARD, "NAOMI-M1-BOARD", tag, owner, clock, "naomi_m1_board", __FILE__)
 {
 	key_tag = 0;
 }
diff --git a/src/mame/machine/naomim2.c b/src/mame/machine/naomim2.c
index 4af8c561218..93e3ef695d9 100644
--- a/src/mame/machine/naomim2.c
+++ b/src/mame/machine/naomim2.c
@@ -5,7 +5,7 @@
 const device_type NAOMI_M2_BOARD = &device_creator<naomi_m2_board>;
 
 naomi_m2_board::naomi_m2_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: naomi_board(mconfig, NAOMI_M2_BOARD, "NAOMI-M2-BOARD", tag, owner, clock)
+	: naomi_board(mconfig, NAOMI_M2_BOARD, "NAOMI-M2-BOARD", tag, owner, clock, "naomi_m2_board", __FILE__)
 {
 	key_tag = 0;
 }
diff --git a/src/mame/machine/naomim4.c b/src/mame/machine/naomim4.c
index fe8724272d0..de55be0d872 100644
--- a/src/mame/machine/naomim4.c
+++ b/src/mame/machine/naomim4.c
@@ -30,7 +30,7 @@ const UINT8 naomi_m4_board::k_sboxes[4][16] = {
 };
 
 naomi_m4_board::naomi_m4_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: naomi_board(mconfig, NAOMI_M4_BOARD, "NAOMI-M1-BOARD", tag, owner, clock)
+	: naomi_board(mconfig, NAOMI_M4_BOARD, "NAOMI-M1-BOARD", tag, owner, clock, "naomi_m4_board", __FILE__)
 {
 	key_tag = 0;
 }
diff --git a/src/mame/machine/naomirom.c b/src/mame/machine/naomirom.c
index 2cb92390c8b..eba11ea7163 100644
--- a/src/mame/machine/naomirom.c
+++ b/src/mame/machine/naomirom.c
@@ -5,7 +5,7 @@
 const device_type NAOMI_ROM_BOARD = &device_creator<naomi_rom_board>;
 
 naomi_rom_board::naomi_rom_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: naomi_board(mconfig, NAOMI_ROM_BOARD, "NAOMI-ROM-BOARD", tag, owner, clock)
+	: naomi_board(mconfig, NAOMI_ROM_BOARD, "NAOMI-ROM-BOARD", tag, owner, clock, "naomi_rom_board", __FILE__)
 {
 }
 
diff --git a/src/mame/video/sega16sp.c b/src/mame/video/sega16sp.c
index 0a856f73484..01e2cfea4bb 100644
--- a/src/mame/video/sega16sp.c
+++ b/src/mame/video/sega16sp.c
@@ -65,8 +65,8 @@ const device_type SEGA_YBOARD_SPRITES = &device_creator<sega_yboard_sprite_devic
 //  sega_16bit_sprite_device -- core constructor
 //-------------------------------------------------
 
-sega_16bit_sprite_device::sega_16bit_sprite_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner)
-	: sprite16_device_ind16(mconfig, type, name, tag, owner, "sega16sp", __FILE__),
+sega_16bit_sprite_device::sega_16bit_sprite_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, const char *shortname, const char *source)
+	: sprite16_device_ind16(mconfig, type, name, tag, owner, shortname, source),
 		m_flip(false)
 {
 	// default to 1:1 bank mapping
@@ -124,7 +124,7 @@ WRITE16_MEMBER( sega_16bit_sprite_device::draw_write )
 //-------------------------------------------------
 
 sega_hangon_sprite_device::sega_hangon_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: sega_16bit_sprite_device(mconfig, SEGA_HANGON_SPRITES, "Sega Hang On Sprites", tag, owner)
+	: sega_16bit_sprite_device(mconfig, SEGA_HANGON_SPRITES, "Sega Hang On Sprites", tag, owner, "sega_hangon_sprite", __FILE__)
 {
 	set_origin(189, -1);
 }
@@ -300,7 +300,7 @@ void sega_hangon_sprite_device::draw(bitmap_ind16 &bitmap, const rectangle &clip
 //-------------------------------------------------
 
 sega_sharrier_sprite_device::sega_sharrier_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: sega_16bit_sprite_device(mconfig, SEGA_SHARRIER_SPRITES, "Sega Space Harrier Sprites", tag, owner)
+	: sega_16bit_sprite_device(mconfig, SEGA_SHARRIER_SPRITES, "Sega Space Harrier Sprites", tag, owner, "sega_sharrier_sprite", __FILE__)
 {
 	set_origin(189, -1);
 }
@@ -487,7 +487,7 @@ void sega_sharrier_sprite_device::draw(bitmap_ind16 &bitmap, const rectangle &cl
 //-------------------------------------------------
 
 sega_sys16a_sprite_device::sega_sys16a_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: sega_16bit_sprite_device(mconfig, SEGA_SYS16A_SPRITES, "Sega System 16A Sprites", tag, owner)
+	: sega_16bit_sprite_device(mconfig, SEGA_SYS16A_SPRITES, "Sega System 16A Sprites", tag, owner, "sega_sys16a_sprite", __FILE__)
 {
 	set_origin(189, -1);
 }
@@ -661,7 +661,7 @@ void sega_sys16a_sprite_device::draw(bitmap_ind16 &bitmap, const rectangle &clip
 //-------------------------------------------------
 
 bootleg_sys16a_sprite_device::bootleg_sys16a_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: sega_16bit_sprite_device(mconfig, BOOTLEG_SYS16A_SPRITES, "Bootleg System 16A Sprites", tag, owner)
+	: sega_16bit_sprite_device(mconfig, BOOTLEG_SYS16A_SPRITES, "Bootleg System 16A Sprites", tag, owner, "bootleg_sys16a_sprite", __FILE__)
 {
 	m_addrmap[0] = 0;
 	m_addrmap[1] = 1;
@@ -844,7 +844,7 @@ void bootleg_sys16a_sprite_device::draw(bitmap_ind16 &bitmap, const rectangle &c
 //-------------------------------------------------
 
 sega_sys16b_sprite_device::sega_sys16b_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: sega_16bit_sprite_device(mconfig, SEGA_SYS16B_SPRITES, "Sega System 16B Sprites", tag, owner)
+	: sega_16bit_sprite_device(mconfig, SEGA_SYS16B_SPRITES, "Sega System 16B Sprites", tag, owner, "sega_16bit_sprite", __FILE__)
 {
 	set_origin(184, 0x00);
 }
@@ -1034,14 +1034,14 @@ void sega_sys16b_sprite_device::draw(bitmap_ind16 &bitmap, const rectangle &clip
 //-------------------------------------------------
 
 sega_outrun_sprite_device::sega_outrun_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: sega_16bit_sprite_device(mconfig, SEGA_OUTRUN_SPRITES, "Sega Out Run Sprites", tag, owner),
+	: sega_16bit_sprite_device(mconfig, SEGA_OUTRUN_SPRITES, "Sega Out Run Sprites", tag, owner, "sega_16bit_sprite", __FILE__),
 		m_is_xboard(false)
 {
 	set_origin(189, 0x00);
 }
 
-sega_outrun_sprite_device::sega_outrun_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, bool xboard_variant)
-	: sega_16bit_sprite_device(mconfig, SEGA_XBOARD_SPRITES, "Sega X-Board Sprites", tag, owner),
+sega_outrun_sprite_device::sega_outrun_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, bool xboard_variant, const char *shortname, const char *source)
+	: sega_16bit_sprite_device(mconfig, SEGA_XBOARD_SPRITES, "Sega X-Board Sprites", tag, owner, shortname, source),
 		m_is_xboard(true)
 {
 	set_origin(190, 0x00);
@@ -1053,7 +1053,7 @@ sega_outrun_sprite_device::sega_outrun_sprite_device(const machine_config &mconf
 //-------------------------------------------------
 
 sega_xboard_sprite_device::sega_xboard_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: sega_outrun_sprite_device(mconfig, tag, owner, clock, true)
+	: sega_outrun_sprite_device(mconfig, tag, owner, clock, true, "sega_xboard_sprite", __FILE__)
 {
 }
 
@@ -1245,7 +1245,7 @@ void sega_outrun_sprite_device::draw(bitmap_ind16 &bitmap, const rectangle &clip
 //-------------------------------------------------
 
 sega_yboard_sprite_device::sega_yboard_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: sega_16bit_sprite_device(mconfig, SEGA_YBOARD_SPRITES, "Sega Y-Board Sprites", tag, owner)
+	: sega_16bit_sprite_device(mconfig, SEGA_YBOARD_SPRITES, "Sega Y-Board Sprites", tag, owner, "sega_yboard_sprite", __FILE__)
 {
 	set_origin(0x600, 0x600);
 }
diff --git a/src/mame/video/sega16sp.h b/src/mame/video/sega16sp.h
index 22dd7cdd65b..4ffc5daa48b 100644
--- a/src/mame/video/sega16sp.h
+++ b/src/mame/video/sega16sp.h
@@ -93,7 +93,7 @@ class sega_16bit_sprite_device : public sprite16_device_ind16
 {
 protected:
 	// construction/destruction
-	sega_16bit_sprite_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner);
+	sega_16bit_sprite_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, const char *shortname, const char *source);
 
 public:
 	// live configuration
@@ -149,7 +149,7 @@ public:
 	// construction/destruction
 	sega_outrun_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 protected:
-	sega_outrun_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, bool xboard_variant);
+	sega_outrun_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, bool xboard_variant, const char *shortname, const char *source);
 
 	// subclass overrides
 	virtual void draw(bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mess/machine/c64/reu.c b/src/mess/machine/c64/reu.c
index 6f6444e0768..dbee229079a 100644
--- a/src/mess/machine/c64/reu.c
+++ b/src/mess/machine/c64/reu.c
@@ -80,8 +80,8 @@ machine_config_constructor c64_reu_cartridge_device::device_mconfig_additions()
 //  c64_reu_cartridge_device - constructor
 //-------------------------------------------------
 
-c64_reu_cartridge_device::c64_reu_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, int jp1, size_t ram_size) :
-	device_t(mconfig, type, name, tag, owner, clock, "c64_reu", __FILE__),
+c64_reu_cartridge_device::c64_reu_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, int jp1, size_t ram_size, const char *shortname, const char *source) :
+	device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 	device_c64_expansion_card_interface(mconfig, *this),
 	m_dmac(*this, MOS8726R1_TAG),
 	m_variant(variant),
@@ -91,13 +91,13 @@ c64_reu_cartridge_device::c64_reu_cartridge_device(const machine_config &mconfig
 }
 
 c64_reu1700_cartridge_device::c64_reu1700_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: c64_reu_cartridge_device(mconfig, C64_REU1700, "1700 REU", tag, owner, clock, TYPE_1700, 0, 128 * 1024) { }
+	: c64_reu_cartridge_device(mconfig, C64_REU1700, "1700 REU", tag, owner, clock, TYPE_1700, 0, 128 * 1024, "c64_1700reu", __FILE__) { }
 
 c64_reu1750_cartridge_device::c64_reu1750_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: c64_reu_cartridge_device(mconfig, C64_REU1750, "1750 REU", tag, owner, clock, TYPE_1750, 1, 256 * 1024) { }
+	: c64_reu_cartridge_device(mconfig, C64_REU1750, "1750 REU", tag, owner, clock, TYPE_1750, 1, 256 * 1024, "c64_1750reu", __FILE__) { }
 
 c64_reu1764_cartridge_device::c64_reu1764_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: c64_reu_cartridge_device(mconfig, C64_REU1764, "1764 REU", tag, owner, clock, TYPE_1764, 1, 512 * 1024) { }
+	: c64_reu_cartridge_device(mconfig, C64_REU1764, "1764 REU", tag, owner, clock, TYPE_1764, 1, 512 * 1024, "c64_1764reu", __FILE__) { }
 
 
 //-------------------------------------------------
diff --git a/src/mess/machine/c64/reu.h b/src/mess/machine/c64/reu.h
index 95f87cb5a6d..d2a0c4dc939 100644
--- a/src/mess/machine/c64/reu.h
+++ b/src/mess/machine/c64/reu.h
@@ -31,7 +31,7 @@ class c64_reu_cartridge_device : public device_t,
 {
 public:
 	// construction/destruction
-	c64_reu_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, int jp1, size_t ram_size);
+	c64_reu_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, int jp1, size_t ram_size, const char *shortname, const char *source);
 
 	// optional information overrides
 	virtual const rom_entry *device_rom_region() const;
diff --git a/src/mess/machine/gb_slot.c b/src/mess/machine/gb_slot.c
index a87afcc899d..612a5c9f19e 100644
--- a/src/mess/machine/gb_slot.c
+++ b/src/mess/machine/gb_slot.c
@@ -149,7 +149,7 @@ base_gb_cart_slot_device::base_gb_cart_slot_device(const machine_config &mconfig
 }
 
 gb_cart_slot_device::gb_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-						base_gb_cart_slot_device(mconfig, GB_CART_SLOT, "Game Boy Cartridge Slot", tag, owner, clock, "gba_cart_slot", __FILE__)
+						base_gb_cart_slot_device(mconfig, GB_CART_SLOT, "Game Boy Cartridge Slot", tag, owner, clock, "gb_cart_slot", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/ti99/videowrp.c b/src/mess/machine/ti99/videowrp.c
index a6d7ca06bd9..af91f8e9421 100644
--- a/src/mess/machine/ti99/videowrp.c
+++ b/src/mess/machine/ti99/videowrp.c
@@ -40,6 +40,16 @@ ti_exp_video_device::ti_exp_video_device(const machine_config &mconfig, const ch
 {
 }
 
+ti_sound_sn94624_device::ti_sound_sn94624_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+	: ti_sound_system_device(mconfig, TISOUND_94624, tag, "Onboard sound (SN94624)", owner, clock, "ti_sound_sn94624", __FILE__)
+{ 
+}
+
+ti_sound_sn76496_device::ti_sound_sn76496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+	: ti_sound_system_device(mconfig, TISOUND_76496, tag, "Onboard sound (SN76496)", owner, clock, "ti_sound_sn76496", __FILE__)
+{ 
+}
+
 /*****************************************************************************/
 /*
     Memory access (TI-99/4A and TI-99/8)
diff --git a/src/mess/machine/ti99/videowrp.h b/src/mess/machine/ti99/videowrp.h
index a0521154ed4..cf22686d9d6 100644
--- a/src/mess/machine/ti99/videowrp.h
+++ b/src/mess/machine/ti99/videowrp.h
@@ -87,8 +87,8 @@ struct ti_sound_config
 class ti_sound_system_device : public bus8z_device
 {
 public:
-	ti_sound_system_device(const machine_config &mconfig, device_type type, const char *tag, const char *name, device_t *owner, UINT32 clock)
-	: bus8z_device(mconfig, type, name, tag, owner, clock, "ti99_ss", __FILE__) { };
+	ti_sound_system_device(const machine_config &mconfig, device_type type, const char *tag, const char *name, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source) { };
 
 	// Cannot read from sound; just ignore silently
 	DECLARE_READ8Z_MEMBER(readz) { };
@@ -110,8 +110,7 @@ private:
 class ti_sound_sn94624_device : public ti_sound_system_device
 {
 public:
-	ti_sound_sn94624_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: ti_sound_system_device(mconfig, TISOUND_94624, tag, "Onboard sound (SN94624)", owner, clock) { }
+	ti_sound_sn94624_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 
 protected:
 	virtual machine_config_constructor device_mconfig_additions() const;
@@ -123,8 +122,7 @@ protected:
 class ti_sound_sn76496_device : public ti_sound_system_device
 {
 public:
-	ti_sound_sn76496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: ti_sound_system_device(mconfig, TISOUND_76496, tag, "Onboard sound (SN76496)", owner, clock) { }
+	ti_sound_sn76496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 
 protected:
 	virtual machine_config_constructor device_mconfig_additions() const;