Split implementation for legacy devices into a separate macro. Updated all

devices to use this macro in their .c file. This greatly reduces the amount
of work the linker has to do to combine all the instances, and reduces the
final binary size when building with symbols. Unfortunately, in order to do
it I had to switch back to macros from templates, but I can live with that
for legacy devices.

src/emu/devlegcy.h

@@ -139,6 +139,66 @@ enum
 //  MACROS
 //**************************************************************************
 
+// macro for declaring the configuration and device classes of a legacy device
+#define _DECLARE_LEGACY_DEVICE(name, basename, configclass, deviceclass, baseconfigclass, basedeviceclass) 		\
+																				\
+DEVICE_GET_INFO( basename ); 													\
+																				\
+class configclass;																\
+																				\
+class deviceclass : public basedeviceclass										\
+{																				\
+	friend class configclass;													\
+	deviceclass(running_machine &_machine, const configclass &config); 			\
+};																				\
+																				\
+class configclass : public baseconfigclass										\
+{																				\
+	configclass(const machine_config &mconfig, device_type type, const char *tag, const device_config *owner, UINT32 clock); \
+																				\
+public:																			\
+	static device_config *static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock); \
+	virtual device_t *alloc_device(running_machine &machine) const; 			\
+};																				\
+																				\
+const device_type name = configclass::static_alloc_device_config
+
+// macro for defining the implementation needed for configuration and device classes
+#define _DEFINE_LEGACY_DEVICE(name, basename, configclass, deviceclass, baseconfigclass, basedeviceclass) 		\
+																				\
+deviceclass::deviceclass(running_machine &_machine, const configclass &config) 	\
+		: basedeviceclass(_machine, config)										\
+	{																			\
+	}																			\
+																				\
+configclass::configclass(const machine_config &mconfig, device_type type, const char *tag, const device_config *owner, UINT32 clock) \
+	: baseconfigclass(mconfig, type, tag, owner, clock, DEVICE_GET_INFO_NAME(basename)) \
+{																				\
+}																				\
+																				\
+device_config *configclass::static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock) \
+{																				\
+	return global_alloc(configclass(mconfig, static_alloc_device_config, tag, owner, clock)); \
+}																				\
+																				\
+device_t *configclass::alloc_device(running_machine &machine) const 			\
+{																				\
+	return pool_alloc(machine_get_pool(machine), deviceclass(machine, *this)); 	\
+}
+
+// reduced macros that are easier to use, and map to the above two macros
+#define DECLARE_LEGACY_DEVICE(name, basename) _DECLARE_LEGACY_DEVICE(name, basename, basename##_device_config, basename##_device, legacy_device_config_base, legacy_device_base)
+#define DECLARE_LEGACY_SOUND_DEVICE(name, basename) _DECLARE_LEGACY_DEVICE(SOUND_##name, basename, basename##_sound_device_config, basename##_sound_device, legacy_sound_device_config_base, legacy_sound_device_base)
+#define DECLARE_LEGACY_NVRAM_DEVICE(name, basename) _DECLARE_LEGACY_DEVICE(name, basename, basename##_device_config, basename##_device, legacy_memory_device_config_base, legacy_memory_device_base)
+#define DECLARE_LEGACY_MEMORY_DEVICE(name, basename) _DECLARE_LEGACY_DEVICE(name, basename, basename##_device_config, basename##_device, legacy_nvram_device_config_base, legacy_nvram_device_base)
+
+#define DEFINE_LEGACY_DEVICE(name, basename) _DEFINE_LEGACY_DEVICE(name, basename, basename##_device_config, basename##_device, legacy_device_config_base, legacy_device_base)
+#define DEFINE_LEGACY_SOUND_DEVICE(name, basename) _DEFINE_LEGACY_DEVICE(SOUND_##name, basename, basename##_sound_device_config, basename##_sound_device, legacy_sound_device_config_base, legacy_sound_device_base)
+#define DEFINE_LEGACY_NVRAM_DEVICE(name, basename) _DEFINE_LEGACY_DEVICE(name, basename, basename##_device_config, basename##_device, legacy_memory_device_config_base, legacy_memory_device_base)
+#define DEFINE_LEGACY_MEMORY_DEVICE(name, basename) _DEFINE_LEGACY_DEVICE(name, basename, basename##_device_config, basename##_device, legacy_nvram_device_config_base, legacy_nvram_device_base)
+
+
+// macros to wrap legacy device functions
 #define DEVICE_GET_INFO_NAME(name)	device_get_config_##name
 #define DEVICE_GET_INFO(name)		void DEVICE_GET_INFO_NAME(name)(const device_config *device, UINT32 state, deviceinfo *info)
 #define DEVICE_GET_INFO_CALL(name)	DEVICE_GET_INFO_NAME(name)(device, state, info)
@@ -168,66 +228,6 @@ enum
 #define DEVICE_NVRAM_CALL(name)		DEVICE_NVRAM_NAME(name)(device, file, read_or_write)
 
 
-// defined types and such for a standard legacy device
-#define DECLARE_LEGACY_DEVICE(name, basename)			 		\
-	DEVICE_GET_INFO( basename ); 								\
-	typedef legacy_device<										\
-				DEVICE_GET_INFO_NAME(basename),					\
-				legacy_device_base								\
-			> basename##_device;								\
-	typedef legacy_device_config<								\
-				DEVICE_GET_INFO_NAME(basename),					\
-				legacy_device_config_base,						\
-				basename##_device								\
-			> basename##_device_config; 						\
-	const device_type name = basename##_device_config::static_alloc_device_config
-
-
-// defined types and such for a sound legacy device
-#define DECLARE_LEGACY_SOUND_DEVICE(name, basename) 			\
-	DEVICE_GET_INFO( basename ); 								\
-	typedef legacy_device<										\
-				DEVICE_GET_INFO_NAME(basename),					\
-				legacy_sound_device_base						\
-			> basename##_sound_device;							\
-	typedef legacy_device_config<								\
-				DEVICE_GET_INFO_NAME(basename),					\
-				legacy_sound_device_config_base,				\
-				basename##_sound_device							\
-			> basename##_sound_device_config;					\
-	const device_type SOUND_##name = basename##_sound_device_config::static_alloc_device_config
-
-
-// defined types and such for a memory legacy device
-#define DECLARE_LEGACY_MEMORY_DEVICE(name, basename)			\
-	DEVICE_GET_INFO( basename ); 								\
-	typedef legacy_device<										\
-				DEVICE_GET_INFO_NAME(basename),					\
-				legacy_memory_device_base						\
-			> basename##_device;								\
-	typedef legacy_device_config<								\
-				DEVICE_GET_INFO_NAME(basename),					\
-				legacy_memory_device_config_base,				\
-				basename##_device								\
-			> basename##_device_config; 						\
-	const device_type name = basename##_device_config::static_alloc_device_config
-
-
-// defined types and such for a memory legacy device
-#define DECLARE_LEGACY_NVRAM_DEVICE(name, basename)				\
-	DEVICE_GET_INFO( basename ); 								\
-	typedef legacy_device<										\
-				DEVICE_GET_INFO_NAME(basename),					\
-				legacy_nvram_device_base						\
-			> basename##_device;								\
-	typedef legacy_device_config<								\
-				DEVICE_GET_INFO_NAME(basename),					\
-				legacy_nvram_device_config_base,				\
-				basename##_device								\
-			> basename##_device_config; 						\
-	const device_type name = basename##_device_config::static_alloc_device_config
-
-
 
 //**************************************************************************
 //  DEVICE_CONFIGURATION_MACROS
@@ -531,62 +531,4 @@ protected:
 };
 
 
-// ======================> legacy_device_config
-
-// legacy_device_config template describes a new device_config derivative that implements
-// the old device callbacks
-template<
-	device_get_config_func _get_config,
-	class _config_base,
-	class _running_class
->
-class legacy_device_config : public _config_base
-{
-	// construction/destruction
-	legacy_device_config(const machine_config &mconfig, device_type type, const char *tag, const device_config *owner, UINT32 clock)
-		: _config_base(mconfig, type, tag, owner, clock, _get_config)
-	{
-	}
-	
-public:
-	// allocators
-	static device_config *static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	{
-		return global_alloc(legacy_device_config(mconfig, static_alloc_device_config, tag, owner, clock));
-	}
-	
-	virtual device_t *alloc_device(running_machine &machine) const
-	{
-		return pool_alloc(machine_get_pool(machine), _running_class(machine, *this));
-//		return auto_alloc(&machine, device_t(machine, *this));
-	}
-};
-
-
-
-// ======================> legacy_device
-
-// legacy_device template describes a new device_t derivative that implements
-// the old device callbacks
-template<
-	device_get_config_func _get_config,
-	class _device_base
->
-class legacy_device : public _device_base
-{
-	template<
-		device_get_config_func __get_config,
-		class __config_base,
-		class __running_class
-	>
-	friend class legacy_device_config;
-	
-	legacy_device(running_machine &_machine, const legacy_device_config_base &config)
-		: _device_base(_machine, config)
-	{
-	}
-};
-
-
-
 #endif	/* __DEVLEGCY_H__ */

src/emu/dimemory.h

@@ -127,7 +127,7 @@ public:
 		  m_internal_map(internal),
 		  m_default_map(defmap) { }
  
-	address_space_config(const char *name, endianness_t endian, UINT8 datawidth, UINT8 addrwidth, INT8 addrshift, UINT8 logwidth, UINT8 pageshift = 0, const addrmap_token *internal = NULL, const addrmap_token *defmap = NULL)
+	address_space_config(const char *name, endianness_t endian, UINT8 datawidth, UINT8 addrwidth, INT8 addrshift, UINT8 logwidth, UINT8 pageshift, const addrmap_token *internal = NULL, const addrmap_token *defmap = NULL)
 		: m_name(name),
 		  m_endianness(endian),
 		  m_databus_width(datawidth),

src/emu/machine/6522via.c

@@ -1181,3 +1181,6 @@ DEVICE_GET_INFO(via6522)
 		case DEVINFO_STR_CREDITS:						/* Nothing */								break;
 	}
 }
+
+
+DEFINE_LEGACY_DEVICE(VIA6522, via6522);

src/emu/machine/6526cia.c

@@ -1001,3 +1001,7 @@ DEVICE_GET_INFO(cia8520)
 		default:	DEVICE_GET_INFO_CALL(cia6526r1);	break;
 	}
 }
+
+DEFINE_LEGACY_DEVICE(MOS6526R1, cia6526r1);
+DEFINE_LEGACY_DEVICE(MOS6526R2, cia6526r2);
+DEFINE_LEGACY_DEVICE(MOS8520, cia8520);

src/emu/machine/6532riot.c

@@ -512,3 +512,6 @@ DEVICE_GET_INFO( riot6532 )
 		case DEVINFO_STR_CREDITS:						strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+
+DEFINE_LEGACY_DEVICE(RIOT6532, riot6532);

src/emu/machine/6821pia.c

@@ -1335,3 +1335,6 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_DERIVED_FEATURES	0
 #define DEVTEMPLATE_DERIVED_NAME		"6822 PIA"
 #include "devtempl.h"
+
+DEFINE_LEGACY_DEVICE(PIA6821, pia6821);
+DEFINE_LEGACY_DEVICE(PIA6822, pia6822);

src/emu/machine/6840ptm.c

@@ -843,3 +843,5 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_FEATURES	DT_HAS_START | DT_HAS_RESET
 #define DEVTEMPLATE_NAME		"6840 PTM"
 #include "devtempl.h"
+
+DEFINE_LEGACY_DEVICE(PTM6840, ptm6840);

src/emu/machine/6850acia.c

@@ -837,3 +837,5 @@ DEVICE_GET_INFO( acia6850 )
 		case DEVINFO_STR_CREDITS:						/* Nothing */									break;
 	}
 }
+
+DEFINE_LEGACY_DEVICE(ACIA6850, acia6850);

src/emu/machine/68681.c

@@ -794,3 +794,5 @@ DEVICE_GET_INFO(duart68681)
 		case DEVINFO_STR_CREDITS:				strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+DEFINE_LEGACY_DEVICE(DUART68681, duart68681);

src/emu/machine/74123.c

@@ -237,3 +237,5 @@ DEVICE_GET_INFO( ttl74123 )
 		case DEVINFO_STR_CREDITS:						strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+DEFINE_LEGACY_DEVICE(TTL74123, ttl74123);

src/emu/machine/74148.c

@@ -222,3 +222,5 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_NAME		"74148"
 #define DEVTEMPLATE_FAMILY		"TTL"
 #include "devtempl.h"
+
+DEFINE_LEGACY_DEVICE(TTL74148, ttl74148);

src/emu/machine/74153.c

@@ -184,3 +184,5 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_NAME		"74153"
 #define DEVTEMPLATE_FAMILY		"TTL"
 #include "devtempl.h"
+
+DEFINE_LEGACY_DEVICE(TTL74153, ttl74153);

src/emu/machine/7474.c

@@ -205,3 +205,5 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_NAME		"7474"
 #define DEVTEMPLATE_FAMILY		"TTL"
 #include "devtempl.h"
+
+DEFINE_LEGACY_DEVICE(TTL7474, ttl7474);

src/emu/machine/8237dma.c

@@ -673,3 +673,5 @@ DEVICE_GET_INFO( i8237 ) {
 	}
 }
 
+
+DEFINE_LEGACY_DEVICE(I8237, i8237);

src/emu/machine/8255ppi.c

@@ -640,3 +640,5 @@ DEVICE_GET_INFO(ppi8255) {
 	}
 }
 
+
+DEFINE_LEGACY_DEVICE(PPI8255, ppi8255);

src/emu/machine/8257dma.c

@@ -451,3 +451,6 @@ DEVICE_GET_INFO( i8257 )
 		case DEVINFO_STR_CREDITS:						strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+
+DEFINE_LEGACY_DEVICE(I8257, i8257);

src/emu/machine/adc083x.c

@@ -531,3 +531,9 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_DERIVED_FEATURES	0
 #define DEVTEMPLATE_DERIVED_NAME		"A/D Converters 0838"
 #include "devtempl.h"
+
+
+DEFINE_LEGACY_DEVICE(ADC0831, adc0831);
+DEFINE_LEGACY_DEVICE(ADC0832, adc0832);
+DEFINE_LEGACY_DEVICE(ADC0834, adc0834);
+DEFINE_LEGACY_DEVICE(ADC0838, adc0838);

src/emu/machine/adc1038.c

@@ -172,3 +172,6 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_NAME		"A/D Converters 1038"
 #define DEVTEMPLATE_FAMILY		"National Semiconductor A/D Converters 1038"
 #include "devtempl.h"
+
+
+DEFINE_LEGACY_DEVICE(ADC1038, adc1038);

src/emu/machine/adc1213x.c

@@ -370,3 +370,8 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_DERIVED_FEATURES	0
 #define DEVTEMPLATE_DERIVED_NAME		"A/D Converter 12132"
 #include "devtempl.h"
+
+
+DEFINE_LEGACY_DEVICE(ADC12130, adc12130);
+DEFINE_LEGACY_DEVICE(ADC12132, adc12132);
+DEFINE_LEGACY_DEVICE(ADC12138, adc12138);

src/emu/machine/at28c16.c

@@ -229,3 +229,6 @@ DEVICE_GET_INFO(at28c16)
 		case DEVINFO_STR_CREDITS:				strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+
+DEFINE_LEGACY_NVRAM_DEVICE(AT28C16, at28c16);

src/emu/machine/cdp1852.c

@@ -228,3 +228,6 @@ DEVICE_GET_INFO( cdp1852 )
 		case DEVINFO_STR_CREDITS:						strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+
+DEFINE_LEGACY_DEVICE(CDP1852, cdp1852);

src/emu/machine/ds1302.c

@@ -225,3 +225,6 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_NAME		"Dallas DS1302 RTC"
 #define DEVTEMPLATE_FAMILY		"Dallas DS1302 RTC"
 #include "devtempl.h"
+
+
+DEFINE_LEGACY_DEVICE(DS1302, ds1302);

src/emu/machine/ds2404.c

@@ -353,3 +353,6 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_NAME		"DS2404"
 #define DEVTEMPLATE_FAMILY		"NVRAM"
 #include "devtempl.h"
+
+
+DEFINE_LEGACY_NVRAM_DEVICE(DS2404, ds2404);

src/emu/machine/f3853.c

@@ -229,3 +229,5 @@ DEVICE_GET_INFO( f3853 )
 	}
 }
 
+
+DEFINE_LEGACY_DEVICE(F3853, f3853);

src/emu/machine/i2cmemdev.c

@@ -474,3 +474,6 @@ DEVICE_GET_INFO( i2cmem )
 		case DEVINFO_STR_CREDITS:				strcpy( info->s, "Copyright Nicola Salmoria and the MAME Team" ); break;
 	}
 }
+
+
+DEFINE_LEGACY_NVRAM_DEVICE(I2CMEM, i2cmem);

src/emu/machine/i8243.c

@@ -184,3 +184,6 @@ DEVICE_GET_INFO( i8243 )
 		case DEVINFO_STR_CREDITS:						/* Nothing */							break;
 	}
 }
+
+
+DEFINE_LEGACY_DEVICE(I8243, i8243);

src/emu/machine/i8255a.c

@@ -904,3 +904,6 @@ DEVICE_GET_INFO( i8255a )
 		case DEVINFO_STR_CREDITS:						strcpy(info->s, "Copyright MESS Team");		break;
 	}
 }
+
+
+DEFINE_LEGACY_DEVICE(I8255A, i8255a);

src/emu/machine/idectrl.c

@@ -1979,3 +1979,6 @@ DEVICE_GET_INFO( ide_controller )
 		case DEVINFO_STR_CREDITS:				strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+
+DEFINE_LEGACY_DEVICE(IDE_CONTROLLER, ide_controller);

src/emu/machine/ins8154.c

@@ -267,3 +267,6 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_VERSION				"1.1"
 #define DEVTEMPLATE_CREDITS				"Copyright MESS Team"
 #include "devtempl.h"
+
+
+DEFINE_LEGACY_DEVICE(INS8154, ins8154);

src/emu/machine/ins8250.c

@@ -700,3 +700,11 @@ DEVICE_GET_INFO( pc16550d )
 	}
 }
 
+
+
+DEFINE_LEGACY_DEVICE(INS8250, ins8250);
+DEFINE_LEGACY_DEVICE(INS8250A, ins8250a);
+DEFINE_LEGACY_DEVICE(NS16450, ns16450);
+DEFINE_LEGACY_DEVICE(NS16550, ns16550);
+DEFINE_LEGACY_DEVICE(NS16550A, ns16550a);
+DEFINE_LEGACY_DEVICE(PC16550D, pc16550d);

src/emu/machine/k033906.c

@@ -167,3 +167,6 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_NAME		"Konami 033906"
 #define DEVTEMPLATE_FAMILY		"Konami PCI Bridge 033906"
 #include "devtempl.h"
+
+
+DEFINE_LEGACY_DEVICE(K033906, k033906);

src/emu/machine/k056230.c

@@ -141,3 +141,6 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_NAME		"Konami 056230"
 #define DEVTEMPLATE_FAMILY		"Konami Network Board 056230"
 #include "devtempl.h"
+
+
+DEFINE_LEGACY_DEVICE(K056230, k056230);

src/emu/machine/latch8.c

@@ -254,3 +254,6 @@ DEVICE_GET_INFO( latch8 )
 		case DEVINFO_STR_CREDITS:						strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+
+DEFINE_LEGACY_DEVICE(LATCH8, latch8);

src/emu/machine/ldcore.c

@@ -1662,3 +1662,7 @@ DEVICE_GET_INFO( laserdisc )
 		case DEVINFO_STR_CREDITS:				strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+
+DEFINE_LEGACY_DEVICE(LASERDISC, laserdisc);
+DEFINE_LEGACY_SOUND_DEVICE(LASERDISC, laserdisc_sound);

src/emu/machine/mb14241.c

@@ -75,3 +75,6 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_NAME		"MB14241"
 #define DEVTEMPLATE_FAMILY		"MB14241 Shifter IC"
 #include "devtempl.h"
+
+
+DEFINE_LEGACY_DEVICE(MB14241, mb14241);

src/emu/machine/mb3773.c

@@ -112,3 +112,6 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_NAME		"Fujistu MB3773"
 #define DEVTEMPLATE_FAMILY		"Fujistu Power Supply Monitor"
 #include "devtempl.h"
+
+
+DEFINE_LEGACY_DEVICE(MB3773, mb3773);

src/emu/machine/mb87078.c

@@ -274,3 +274,5 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_FAMILY		"Fujitsu Volume Controller MB87078"
 #include "devtempl.h"
 
+
+DEFINE_LEGACY_DEVICE(MB87078, mb87078);

src/emu/machine/msm6242.c

@@ -199,3 +199,6 @@ WRITE16_HANDLER( msm6242_lsb_w )
 		msm6242_w(space, offset, data);
 }
 #endif
+
+
+DEFINE_LEGACY_DEVICE(MSM6242, msm6242);

src/emu/machine/pci.c

@@ -263,3 +263,6 @@ DEVICE_GET_INFO( pci_bus )
 		case DEVINFO_STR_CREDITS:				strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+
+DEFINE_LEGACY_DEVICE(PCI_BUS, pci_bus);

src/emu/machine/pd4990a.c

@@ -532,3 +532,6 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_NAME		"NEC uPD4990A"
 #define DEVTEMPLATE_FAMILY		"NEC uPD4990A Calendar & Clock"
 #include "devtempl.h"
+
+
+DEFINE_LEGACY_DEVICE(UPD4990A, upd4990a);

src/emu/machine/pic8259.c

@@ -458,3 +458,5 @@ DEVICE_GET_INFO( pic8259 ) {
 	}
 }
 
+
+DEFINE_LEGACY_DEVICE(PIC8259, pic8259);

src/emu/machine/pit8253.c

@@ -1188,3 +1188,7 @@ DEVICE_GET_INFO( pit8254 ) {
 		default:									DEVICE_GET_INFO_CALL(pit8253);				break;
 	}
 }
+
+
+DEFINE_LEGACY_DEVICE(PIT8253, pit8253);
+DEFINE_LEGACY_DEVICE(PIT8254, pit8254);

src/emu/machine/rp5h01.c

@@ -211,3 +211,6 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_NAME		"RP5H01"
 #define DEVTEMPLATE_FAMILY		"RP5H01"
 #include "devtempl.h"
+
+
+DEFINE_LEGACY_DEVICE(RP5H01, rp5h01);

src/emu/machine/rtc65271.c

@@ -717,3 +717,6 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_NAME		"RTC65271"
 #define DEVTEMPLATE_FAMILY		"RTC"
 #include "devtempl.h"
+
+
+DEFINE_LEGACY_NVRAM_DEVICE(RTC65271, rtc65271);

src/emu/machine/smc91c9x.c

@@ -632,3 +632,8 @@ DEVICE_GET_INFO( smc91c96 )
 		default:								DEVICE_GET_INFO_CALL(smc91c9x);			break;
 	}
 }
+
+
+DEFINE_LEGACY_DEVICE(SMC91C94, smc91c94);
+DEFINE_LEGACY_DEVICE(SMC91C96, smc91c96);
+

src/emu/machine/timekpr.c

@@ -524,3 +524,9 @@ DEVICE_GET_INFO( mk48t08 )
 		default:										DEVICE_GET_INFO_CALL(timekeeper);			break;
 	}
 }
+
+
+DEFINE_LEGACY_NVRAM_DEVICE(M48T02, m48t02);
+DEFINE_LEGACY_NVRAM_DEVICE(M48T35, m48t35);
+DEFINE_LEGACY_NVRAM_DEVICE(M48T58, m48t58);
+DEFINE_LEGACY_NVRAM_DEVICE(MK48T08, mk48t08);

src/emu/machine/tms6100.c

@@ -277,3 +277,6 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_DERIVED_NAME		"M58819"
 #include "devtempl.h"
 
+
+DEFINE_LEGACY_DEVICE(TMS6100, tms6100);
+DEFINE_LEGACY_DEVICE(M58819, m58819);

src/emu/machine/upd4701.c

@@ -312,3 +312,6 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_NAME		"NEC uPD4701 Encoder"
 #define DEVTEMPLATE_FAMILY		"NEC uPD4701 Encoder"
 #include "devtempl.h"
+
+
+DEFINE_LEGACY_DEVICE(UPD4701, upd4701);

src/emu/machine/x2212.c

@@ -152,3 +152,5 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_CLASS		DEVICE_CLASS_PERIPHERAL
 #include "devtempl.h"
 
+
+DEFINE_LEGACY_NVRAM_DEVICE(X2212, x2212);

src/emu/sound/2151intf.c

@@ -140,3 +140,6 @@ DEVICE_GET_INFO( ym2151 )
 		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+
+DEFINE_LEGACY_SOUND_DEVICE(YM2151, ym2151);

src/emu/sound/2203intf.c

@@ -206,3 +206,6 @@ DEVICE_GET_INFO( ym2203 )
 		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+
+DEFINE_LEGACY_SOUND_DEVICE(YM2203, ym2203);

src/emu/sound/2413intf.c

@@ -141,3 +141,6 @@ DEVICE_GET_INFO( ym2413 )
 		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+
+DEFINE_LEGACY_SOUND_DEVICE(YM2413, ym2413);

src/emu/sound/2608intf.c

@@ -232,3 +232,6 @@ DEVICE_GET_INFO( ym2608 )
 		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+
+DEFINE_LEGACY_SOUND_DEVICE(YM2608, ym2608);

src/emu/sound/2610intf.c

@@ -256,3 +256,7 @@ DEVICE_GET_INFO( ym2610b )
 		default:										DEVICE_GET_INFO_CALL(ym2610);				break;
 	}
 }
+
+
+DEFINE_LEGACY_SOUND_DEVICE(YM2610, ym2610);
+DEFINE_LEGACY_SOUND_DEVICE(YM2610B, ym2610b);

src/emu/sound/2612intf.c

@@ -198,3 +198,7 @@ DEVICE_GET_INFO( ym3438 )
 		default:										DEVICE_GET_INFO_CALL(ym2612);						break;
 	}
 }
+
+
+DEFINE_LEGACY_SOUND_DEVICE(YM2612, ym2612);
+DEFINE_LEGACY_SOUND_DEVICE(YM3438, ym3438);

src/emu/sound/262intf.c

@@ -158,3 +158,5 @@ DEVICE_GET_INFO( ymf262 )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(YMF262, ymf262);

src/emu/sound/3526intf.c

@@ -165,3 +165,6 @@ DEVICE_GET_INFO( ym3526 )
 		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+
+DEFINE_LEGACY_SOUND_DEVICE(YM3526, ym3526);

src/emu/sound/3812intf.c

@@ -166,3 +166,6 @@ DEVICE_GET_INFO( ym3812 )
 		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+
+DEFINE_LEGACY_SOUND_DEVICE(YM3812, ym3812);

src/emu/sound/8950intf.c

@@ -200,3 +200,6 @@ DEVICE_GET_INFO( y8950 )
 		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+
+DEFINE_LEGACY_SOUND_DEVICE(Y8950, y8950);

src/emu/sound/aica.c

@@ -1334,3 +1334,6 @@ DEVICE_GET_INFO( aica )
 	}
 }
 
+
+
+DEFINE_LEGACY_SOUND_DEVICE(AICA, aica);

src/emu/sound/astrocde.c

@@ -330,3 +330,6 @@ DEVICE_GET_INFO( astrocade )
 		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+
+DEFINE_LEGACY_SOUND_DEVICE(ASTROCADE, astrocade);

src/emu/sound/ay8910.c

@@ -1071,3 +1071,13 @@ WRITE8_DEVICE_HANDLER( ay8910_data_w )
 	ay8910_data_address_w(device, 0, data);
 #endif
 }
+
+
+DEFINE_LEGACY_SOUND_DEVICE(AY8910, ay8910);
+DEFINE_LEGACY_SOUND_DEVICE(AY8912, ay8912);
+DEFINE_LEGACY_SOUND_DEVICE(AY8913, ay8913);
+DEFINE_LEGACY_SOUND_DEVICE(AY8930, ay8930);
+DEFINE_LEGACY_SOUND_DEVICE(YM2149, ym2149);
+DEFINE_LEGACY_SOUND_DEVICE(YM3439, ym3439);
+DEFINE_LEGACY_SOUND_DEVICE(YMZ284, ymz284);
+DEFINE_LEGACY_SOUND_DEVICE(YMZ294, ymz294);

src/emu/sound/beep.c

@@ -188,3 +188,6 @@ DEVICE_GET_INFO( beep )
 		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright The MESS Team"); break;
 	}
 }
+
+
+DEFINE_LEGACY_SOUND_DEVICE(BEEP, beep);

src/emu/sound/bsmt2000.c

@@ -482,3 +482,6 @@ DEVICE_GET_INFO( bsmt2000 )
 		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+
+DEFINE_LEGACY_SOUND_DEVICE(BSMT2000, bsmt2000);

src/emu/sound/c140.c

@@ -525,3 +525,5 @@ DEVICE_GET_INFO( c140 )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(C140, c140);

src/emu/sound/c352.c

@@ -600,3 +600,5 @@ DEVICE_GET_INFO( c352 )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(C352, c352);

src/emu/sound/c6280.c

@@ -372,3 +372,5 @@ DEVICE_GET_INFO( c6280 )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(C6280, c6280);

src/emu/sound/cdda.c

@@ -317,3 +317,5 @@ DEVICE_GET_INFO( cdda )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(CDDA, cdda);

src/emu/sound/cdp1863.c

@@ -227,3 +227,6 @@ DEVICE_GET_INFO( cdp1863 )
 		case DEVINFO_STR_CREDITS:						strcpy(info->s, "Copyright MESS Team");		break;
 	}
 }
+
+
+DEFINE_LEGACY_SOUND_DEVICE(CDP1863, cdp1863);

src/emu/sound/cdp1864.c

@@ -518,3 +518,6 @@ DEVICE_GET_INFO( cdp1864 )
 		case DEVINFO_STR_CREDITS:						strcpy(info->s, "Copyright MESS Team");				break;
 	}
 }
+
+
+DEFINE_LEGACY_SOUND_DEVICE(CDP1864, cdp1864);

src/emu/sound/cdp1869.c

@@ -943,3 +943,6 @@ DEVICE_GET_INFO( cdp1869 )
 		case DEVINFO_STR_CREDITS:						strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+
+DEFINE_LEGACY_SOUND_DEVICE(CDP1869, cdp1869);

src/emu/sound/cem3394.c

@@ -586,3 +586,5 @@ DEVICE_GET_INFO( cem3394 )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(CEM3394, cem3394);

src/emu/sound/dac.c

@@ -155,3 +155,6 @@ DEVICE_GET_INFO( dac )
 		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
 	}
 }
+
+
+DEFINE_LEGACY_SOUND_DEVICE(DAC, dac);

src/emu/sound/digitalk.c

@@ -704,3 +704,6 @@ WRITE8_DEVICE_HANDLER( digitalker_data_w )
 	digitalker *dg = get_safe_token(device);
 	dg->data = data;
 }
+
+
+DEFINE_LEGACY_SOUND_DEVICE(DIGITALKER, digitalker);

src/emu/sound/discrete.c

@@ -1087,3 +1087,5 @@ DEVICE_GET_INFO( discrete )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(DISCRETE, discrete);

src/emu/sound/dmadac.c

@@ -262,3 +262,5 @@ DEVICE_GET_INFO( dmadac )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(DMADAC, dmadac);

src/emu/sound/es5503.c

@@ -527,3 +527,5 @@ DEVICE_GET_INFO( es5503 )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(ES5503, es5503);

src/emu/sound/es5506.c

@@ -2130,3 +2130,6 @@ DEVICE_GET_INFO( es5506 )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(ES5505, es5505);
+DEFINE_LEGACY_SOUND_DEVICE(ES5506, es5506);

src/emu/sound/es8712.c

@@ -407,3 +407,5 @@ DEVICE_GET_INFO( es8712 )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(ES8712, es8712);

src/emu/sound/flt_rc.c

@@ -137,3 +137,5 @@ DEVICE_GET_INFO( filter_rc )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(FILTER_RC, filter_rc);

src/emu/sound/flt_vol.c

@@ -72,3 +72,5 @@ DEVICE_GET_INFO( filter_volume )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(FILTER_VOLUME, filter_volume);

src/emu/sound/gaelco.c

@@ -337,3 +337,6 @@ DEVICE_GET_INFO( gaelco_cg1v )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(GAELCO_GAE1, gaelco_gae1);
+DEFINE_LEGACY_SOUND_DEVICE(GAELCO_CG1V, gaelco_cg1v);

src/emu/sound/hc55516.c

@@ -343,3 +343,8 @@ DEVICE_GET_INFO( mc3418 )
 		default:										DEVICE_GET_INFO_CALL(hc55516);					break;
 	}
 }
+
+
+DEFINE_LEGACY_SOUND_DEVICE(HC55516, hc55516);
+DEFINE_LEGACY_SOUND_DEVICE(MC3417, mc3417);
+DEFINE_LEGACY_SOUND_DEVICE(MC3418, mc3418);

src/emu/sound/ics2115.c

@@ -618,3 +618,5 @@ DEVICE_GET_INFO( ics2115 )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(ICS2115, ics2115);

src/emu/sound/iremga20.c

@@ -293,3 +293,5 @@ DEVICE_GET_INFO( iremga20 )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(IREMGA20, iremga20);

src/emu/sound/k005289.c

@@ -274,3 +274,5 @@ DEVICE_GET_INFO( k005289 )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(K005289, k005289);

src/emu/sound/k007232.c

@@ -473,3 +473,5 @@ DEVICE_GET_INFO( k007232 )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(K007232, k007232);

src/emu/sound/k051649.c

@@ -244,3 +244,5 @@ DEVICE_GET_INFO( k051649 )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(K051649, k051649);

src/emu/sound/k053260.c

@@ -438,3 +438,5 @@ DEVICE_GET_INFO( k053260 )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(K053260, k053260);

src/emu/sound/k054539.c

@@ -706,3 +706,5 @@ DEVICE_GET_INFO( k054539 )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(K054539, k054539);

src/emu/sound/k056800.c

@@ -172,3 +172,6 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_NAME		"Konami 056800 MIRAC"
 #define DEVTEMPLATE_FAMILY		"Konami custom"
 #include "devtempl.h"
+
+
+DEFINE_LEGACY_DEVICE(K056800, k056800);

src/emu/sound/mos6560.c

@@ -952,3 +952,6 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_NAME				"MOS 6560 / 6561 VIC"
 #define DEVTEMPLATE_FAMILY				"MOS Video Interface Chip"
 #include "devtempl.h"
+
+
+DEFINE_LEGACY_SOUND_DEVICE(MOS656X, mos6560);

src/emu/sound/msm5205.c

@@ -326,3 +326,5 @@ DEVICE_GET_INFO( msm5205 )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(MSM5205, msm5205);

src/emu/sound/msm5232.c

@@ -835,3 +835,5 @@ DEVICE_GET_INFO( msm5232 )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(MSM5232, msm5232);

src/emu/sound/multipcm.c

@@ -700,3 +700,4 @@ DEVICE_GET_INFO( multipcm )
 }
 
 
+DEFINE_LEGACY_SOUND_DEVICE(MULTIPCM, multipcm);

src/emu/sound/n63701x.c

@@ -185,3 +185,5 @@ DEVICE_GET_INFO( namco_63701x )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(NAMCO_63701X, namco_63701x);

src/emu/sound/namco.c

@@ -877,3 +877,7 @@ DEVICE_GET_INFO( namco_cus30 )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(NAMCO, namco);
+DEFINE_LEGACY_SOUND_DEVICE(NAMCO_15XX, namco_15xx);
+DEFINE_LEGACY_SOUND_DEVICE(NAMCO_CUS30, namco_cus30);

src/emu/sound/nes_apu.c

@@ -792,3 +792,5 @@ DEVICE_GET_INFO( nesapu )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(NES, nesapu);

src/emu/sound/nile.c

@@ -259,3 +259,5 @@ DEVICE_GET_INFO( nile )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(NILE, nile);

src/emu/sound/okim6258.c

@@ -381,3 +381,5 @@ DEVICE_GET_INFO( okim6258 )
 	}
 }
 
+
+DEFINE_LEGACY_SOUND_DEVICE(OKIM6258, okim6258);