summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine')
-rw-r--r--src/devices/machine/40105.cpp4
-rw-r--r--src/devices/machine/53c7xx.cpp2
-rw-r--r--src/devices/machine/53c810.cpp2
-rw-r--r--src/devices/machine/64h156.cpp2
-rw-r--r--src/devices/machine/6522via.cpp2
-rw-r--r--src/devices/machine/6525tpi.cpp2
-rw-r--r--src/devices/machine/6532riot.cpp2
-rw-r--r--src/devices/machine/68153bim.cpp6
-rw-r--r--src/devices/machine/6821pia.cpp2
-rw-r--r--src/devices/machine/68230pit.cpp2
-rw-r--r--src/devices/machine/68307.cpp3
-rw-r--r--src/devices/machine/68307.h2
-rw-r--r--src/devices/machine/68340.cpp2
-rw-r--r--src/devices/machine/68340.h14
-rw-r--r--src/devices/machine/6840ptm.cpp2
-rw-r--r--src/devices/machine/6850acia.cpp2
-rw-r--r--src/devices/machine/68561mpcc.cpp10
-rw-r--r--src/devices/machine/7200fifo.cpp2
-rw-r--r--src/devices/machine/7400.cpp2
-rw-r--r--src/devices/machine/7404.cpp2
-rw-r--r--src/devices/machine/74123.cpp2
-rw-r--r--src/devices/machine/74145.cpp2
-rw-r--r--src/devices/machine/74148.cpp2
-rw-r--r--src/devices/machine/74153.cpp2
-rw-r--r--src/devices/machine/74157.cpp4
-rw-r--r--src/devices/machine/74161.cpp8
-rw-r--r--src/devices/machine/74175.cpp4
-rw-r--r--src/devices/machine/74181.cpp2
-rw-r--r--src/devices/machine/7474.cpp2
-rw-r--r--src/devices/machine/8042kbdc.cpp2
-rw-r--r--src/devices/machine/82s129.cpp4
-rw-r--r--src/devices/machine/8364_paula.cpp2
-rw-r--r--src/devices/machine/8530scc.cpp2
-rw-r--r--src/devices/machine/aakart.cpp2
-rw-r--r--src/devices/machine/adc0808.cpp2
-rw-r--r--src/devices/machine/adc083x.cpp8
-rw-r--r--src/devices/machine/adc1038.cpp2
-rw-r--r--src/devices/machine/adc1213x.cpp6
-rw-r--r--src/devices/machine/aicartc.cpp2
-rw-r--r--src/devices/machine/akiko.cpp2
-rw-r--r--src/devices/machine/am2847.cpp6
-rw-r--r--src/devices/machine/am53cf96.cpp2
-rw-r--r--src/devices/machine/am9517a.cpp6
-rw-r--r--src/devices/machine/amigafdc.cpp2
-rw-r--r--src/devices/machine/appldriv.cpp2
-rw-r--r--src/devices/machine/applefdc.cpp4
-rw-r--r--src/devices/machine/at28c16.cpp2
-rw-r--r--src/devices/machine/at29x.cpp6
-rw-r--r--src/devices/machine/at45dbxx.cpp6
-rw-r--r--src/devices/machine/at_keybc.cpp2
-rw-r--r--src/devices/machine/ataflash.cpp8
-rw-r--r--src/devices/machine/ataintf.cpp4
-rw-r--r--src/devices/machine/atapicdr.cpp4
-rw-r--r--src/devices/machine/ay31015.cpp4
-rw-r--r--src/devices/machine/bankdev.cpp2
-rw-r--r--src/devices/machine/bcreader.cpp2
-rw-r--r--src/devices/machine/bcreader.h2
-rw-r--r--src/devices/machine/buffer.cpp2
-rw-r--r--src/devices/machine/cdp1852.cpp2
-rw-r--r--src/devices/machine/cdp1871.cpp2
-rw-r--r--src/devices/machine/cdp1879.cpp2
-rw-r--r--src/devices/machine/clock.cpp2
-rw-r--r--src/devices/machine/com8116.cpp2
-rw-r--r--src/devices/machine/corvushd.cpp2
-rw-r--r--src/devices/machine/cr511b.cpp2
-rw-r--r--src/devices/machine/cr589.cpp2
-rw-r--r--src/devices/machine/cs4031.cpp2
-rw-r--r--src/devices/machine/cs8221.cpp2
-rw-r--r--src/devices/machine/diablo_hd.cpp2
-rw-r--r--src/devices/machine/dm9334.cpp2
-rw-r--r--src/devices/machine/dmac.cpp2
-rw-r--r--src/devices/machine/dp8390.cpp4
-rw-r--r--src/devices/machine/ds1204.cpp2
-rw-r--r--src/devices/machine/ds128x.cpp2
-rw-r--r--src/devices/machine/ds1302.cpp2
-rw-r--r--src/devices/machine/ds1315.cpp6
-rw-r--r--src/devices/machine/ds1386.cpp4
-rw-r--r--src/devices/machine/ds2401.cpp2
-rw-r--r--src/devices/machine/ds2404.cpp2
-rw-r--r--src/devices/machine/ds75160a.cpp2
-rw-r--r--src/devices/machine/ds75161a.cpp2
-rw-r--r--src/devices/machine/e0516.cpp2
-rw-r--r--src/devices/machine/e05a03.cpp2
-rw-r--r--src/devices/machine/e05a30.cpp2
-rw-r--r--src/devices/machine/eeprompar.cpp2
-rw-r--r--src/devices/machine/eepromser.cpp2
-rw-r--r--src/devices/machine/er2055.cpp2
-rw-r--r--src/devices/machine/f3853.cpp2
-rw-r--r--src/devices/machine/fdc37c665gt.cpp2
-rw-r--r--src/devices/machine/fga002.cpp2
-rw-r--r--src/devices/machine/gayle.cpp2
-rw-r--r--src/devices/machine/gen_latch.cpp4
-rw-r--r--src/devices/machine/genpc.cpp15
-rw-r--r--src/devices/machine/genpc.h22
-rw-r--r--src/devices/machine/gt64xxx.cpp2
-rw-r--r--src/devices/machine/hd63450.cpp2
-rw-r--r--src/devices/machine/hd64610.cpp2
-rw-r--r--src/devices/machine/hdc92x4.cpp4
-rw-r--r--src/devices/machine/hp_taco.cpp2
-rw-r--r--src/devices/machine/i2cmem.cpp2
-rw-r--r--src/devices/machine/i6300esb.cpp4
-rw-r--r--src/devices/machine/i80130.cpp2
-rw-r--r--src/devices/machine/i8155.cpp4
-rw-r--r--src/devices/machine/i8212.cpp2
-rw-r--r--src/devices/machine/i8214.cpp2
-rw-r--r--src/devices/machine/i82371sb.cpp6
-rw-r--r--src/devices/machine/i82371sb.h2
-rw-r--r--src/devices/machine/i8243.cpp2
-rw-r--r--src/devices/machine/i82439hx.cpp2
-rw-r--r--src/devices/machine/i82439tx.cpp2
-rw-r--r--src/devices/machine/i8251.cpp4
-rw-r--r--src/devices/machine/i82541.cpp2
-rw-r--r--src/devices/machine/i8255.cpp4
-rw-r--r--src/devices/machine/i8257.cpp2
-rw-r--r--src/devices/machine/i8271.cpp2
-rw-r--r--src/devices/machine/i8279.cpp2
-rw-r--r--src/devices/machine/i82875p.cpp6
-rw-r--r--src/devices/machine/i8355.cpp2
-rw-r--r--src/devices/machine/idectrl.cpp6
-rw-r--r--src/devices/machine/idehd.cpp2
-rw-r--r--src/devices/machine/im6402.cpp2
-rw-r--r--src/devices/machine/input_merger.cpp4
-rw-r--r--src/devices/machine/ins8154.cpp2
-rw-r--r--src/devices/machine/ins8250.cpp8
-rw-r--r--src/devices/machine/intelfsh.cpp64
-rw-r--r--src/devices/machine/k033906.cpp2
-rw-r--r--src/devices/machine/k053252.cpp4
-rw-r--r--src/devices/machine/k053252.h24
-rw-r--r--src/devices/machine/k056230.cpp2
-rw-r--r--src/devices/machine/kb3600.cpp2
-rw-r--r--src/devices/machine/keyboard.cpp2
-rw-r--r--src/devices/machine/kr2376.cpp2
-rw-r--r--src/devices/machine/laserdsc.h7
-rw-r--r--src/devices/machine/latch.cpp2
-rw-r--r--src/devices/machine/latch8.cpp2
-rw-r--r--src/devices/machine/lc89510.cpp2
-rw-r--r--src/devices/machine/ldp1000.cpp2
-rw-r--r--src/devices/machine/ldp1450.cpp2
-rw-r--r--src/devices/machine/ldpr8210.cpp4
-rw-r--r--src/devices/machine/ldstub.cpp4
-rw-r--r--src/devices/machine/ldv1000.cpp2
-rw-r--r--src/devices/machine/ldvp931.cpp2
-rw-r--r--src/devices/machine/lh5810.cpp2
-rw-r--r--src/devices/machine/linflash.cpp6
-rw-r--r--src/devices/machine/lpc-acpi.cpp2
-rw-r--r--src/devices/machine/lpc-pit.cpp2
-rw-r--r--src/devices/machine/lpc-rtc.cpp2
-rw-r--r--src/devices/machine/lpci.cpp2
-rw-r--r--src/devices/machine/m6m80011ap.cpp2
-rw-r--r--src/devices/machine/mb14241.cpp2
-rw-r--r--src/devices/machine/mb3773.cpp2
-rw-r--r--src/devices/machine/mb8421.cpp2
-rw-r--r--src/devices/machine/mb87078.cpp2
-rw-r--r--src/devices/machine/mb8795.cpp2
-rw-r--r--src/devices/machine/mb89352.cpp2
-rw-r--r--src/devices/machine/mb89363b.cpp2
-rw-r--r--src/devices/machine/mb89371.cpp2
-rw-r--r--src/devices/machine/mc146818.cpp2
-rw-r--r--src/devices/machine/mc2661.cpp2
-rw-r--r--src/devices/machine/mc68328.cpp2
-rw-r--r--src/devices/machine/mc6843.cpp2
-rw-r--r--src/devices/machine/mc6846.cpp2
-rw-r--r--src/devices/machine/mc6852.cpp2
-rw-r--r--src/devices/machine/mc6854.cpp2
-rw-r--r--src/devices/machine/mc68681.cpp6
-rw-r--r--src/devices/machine/mc68901.cpp2
-rw-r--r--src/devices/machine/mccs1850.cpp2
-rw-r--r--src/devices/machine/mcf5206e.cpp2
-rw-r--r--src/devices/machine/microtch.cpp2
-rw-r--r--src/devices/machine/mm5740.cpp3
-rw-r--r--src/devices/machine/mm58167.cpp2
-rw-r--r--src/devices/machine/mm58274c.cpp2
-rw-r--r--src/devices/machine/mm74c922.cpp4
-rw-r--r--src/devices/machine/mos6526.cpp8
-rw-r--r--src/devices/machine/mos6529.cpp2
-rw-r--r--src/devices/machine/mos6530.cpp2
-rw-r--r--src/devices/machine/mos6530n.cpp4
-rw-r--r--src/devices/machine/mos6551.cpp2
-rw-r--r--src/devices/machine/mos6702.cpp2
-rw-r--r--src/devices/machine/mos8706.cpp2
-rw-r--r--src/devices/machine/mos8722.cpp2
-rw-r--r--src/devices/machine/mos8726.cpp2
-rw-r--r--src/devices/machine/mpu401.cpp2
-rw-r--r--src/devices/machine/msm5832.cpp2
-rw-r--r--src/devices/machine/msm58321.cpp2
-rw-r--r--src/devices/machine/msm6242.cpp10
-rw-r--r--src/devices/machine/ncr5380.cpp2
-rw-r--r--src/devices/machine/ncr5380n.cpp2
-rw-r--r--src/devices/machine/ncr5390.cpp2
-rw-r--r--src/devices/machine/ncr539x.cpp2
-rw-r--r--src/devices/machine/netlist.cpp22
-rw-r--r--src/devices/machine/nmc9306.cpp2
-rw-r--r--src/devices/machine/nsc810.cpp2
-rw-r--r--src/devices/machine/nscsi_bus.cpp4
-rw-r--r--src/devices/machine/nscsi_cb.cpp2
-rw-r--r--src/devices/machine/nscsi_cd.cpp2
-rw-r--r--src/devices/machine/nscsi_hd.cpp2
-rw-r--r--src/devices/machine/nscsi_s1410.cpp2
-rw-r--r--src/devices/machine/nvram.cpp2
-rw-r--r--src/devices/machine/pc_fdc.cpp4
-rw-r--r--src/devices/machine/pc_lpt.cpp2
-rw-r--r--src/devices/machine/pccard.cpp2
-rw-r--r--src/devices/machine/pcf8593.cpp2
-rw-r--r--src/devices/machine/pci-apic.cpp2
-rw-r--r--src/devices/machine/pci-ide.cpp2
-rw-r--r--src/devices/machine/pci-sata.cpp2
-rw-r--r--src/devices/machine/pci-smbus.cpp2
-rw-r--r--src/devices/machine/pci-usb.cpp4
-rw-r--r--src/devices/machine/pci.cpp4
-rw-r--r--src/devices/machine/pci9050.cpp2
-rw-r--r--src/devices/machine/pckeybrd.cpp4
-rw-r--r--src/devices/machine/pdc.cpp2
-rw-r--r--src/devices/machine/phi.cpp2
-rw-r--r--src/devices/machine/pic8259.cpp2
-rw-r--r--src/devices/machine/pit8253.cpp4
-rw-r--r--src/devices/machine/pla.cpp2
-rw-r--r--src/devices/machine/r10696.cpp2
-rw-r--r--src/devices/machine/r10788.cpp2
-rw-r--r--src/devices/machine/ra17xx.cpp2
-rw-r--r--src/devices/machine/ram.cpp2
-rw-r--r--src/devices/machine/ram.h2
-rw-r--r--src/devices/machine/rf5c296.cpp2
-rw-r--r--src/devices/machine/roc10937.cpp10
-rw-r--r--src/devices/machine/rp5c01.cpp2
-rw-r--r--src/devices/machine/rp5c15.cpp2
-rw-r--r--src/devices/machine/rp5h01.cpp2
-rw-r--r--src/devices/machine/rtc4543.cpp4
-rw-r--r--src/devices/machine/rtc65271.cpp2
-rw-r--r--src/devices/machine/rtc9701.cpp2
-rw-r--r--src/devices/machine/s2636.cpp4
-rw-r--r--src/devices/machine/s3520cf.cpp2
-rw-r--r--src/devices/machine/s3c2400.cpp7
-rw-r--r--src/devices/machine/s3c2410.cpp7
-rw-r--r--src/devices/machine/s3c2440.cpp15
-rw-r--r--src/devices/machine/s3c44b0.cpp8
-rw-r--r--src/devices/machine/scnxx562.cpp12
-rw-r--r--src/devices/machine/serflash.cpp2
-rw-r--r--src/devices/machine/smartmed.cpp4
-rw-r--r--src/devices/machine/smc91c9x.cpp4
-rw-r--r--src/devices/machine/smpc.cpp8
-rw-r--r--src/devices/machine/sonydriv.cpp2
-rw-r--r--src/devices/machine/spchrom.cpp2
-rw-r--r--src/devices/machine/steppers.cpp2
-rw-r--r--src/devices/machine/strata.cpp2
-rw-r--r--src/devices/machine/tc009xlvc.cpp5
-rw-r--r--src/devices/machine/terminal.cpp4
-rw-r--r--src/devices/machine/timekpr.cpp12
-rw-r--r--src/devices/machine/tmc0430.cpp2
-rw-r--r--src/devices/machine/tmp68301.cpp2
-rw-r--r--src/devices/machine/tms1024.cpp4
-rw-r--r--src/devices/machine/tms5501.cpp2
-rw-r--r--src/devices/machine/tms6100.cpp4
-rw-r--r--src/devices/machine/tms9901.cpp2
-rw-r--r--src/devices/machine/tms9902.cpp2
-rw-r--r--src/devices/machine/upd1990a.cpp4
-rw-r--r--src/devices/machine/upd4701.cpp2
-rw-r--r--src/devices/machine/upd4992.cpp2
-rw-r--r--src/devices/machine/upd7002.cpp2
-rw-r--r--src/devices/machine/upd71071.cpp2
-rw-r--r--src/devices/machine/upd765.cpp24
-rw-r--r--src/devices/machine/v3021.cpp2
-rw-r--r--src/devices/machine/vrc4373.cpp2
-rw-r--r--src/devices/machine/vt82c496.cpp2
-rw-r--r--src/devices/machine/vt83c461.cpp2
-rw-r--r--src/devices/machine/watchdog.cpp6
-rw-r--r--src/devices/machine/wd11c00_17.cpp2
-rw-r--r--src/devices/machine/wd2010.cpp2
-rw-r--r--src/devices/machine/wd33c93.cpp2
-rw-r--r--src/devices/machine/wd7600.cpp2
-rw-r--r--src/devices/machine/wd_fdc.cpp46
-rw-r--r--src/devices/machine/wozfdc.cpp4
-rw-r--r--src/devices/machine/x2212.cpp4
-rw-r--r--src/devices/machine/x76f041.cpp2
-rw-r--r--src/devices/machine/x76f100.cpp2
-rw-r--r--src/devices/machine/ym2148.cpp2
-rw-r--r--src/devices/machine/z80ctc.cpp2
-rw-r--r--src/devices/machine/z80dart.cpp18
-rw-r--r--src/devices/machine/z80dma.cpp2
-rw-r--r--src/devices/machine/z80pio.cpp2
-rw-r--r--src/devices/machine/z80scc.cpp20
-rw-r--r--src/devices/machine/z80sio.cpp6
-rw-r--r--src/devices/machine/z80sti.cpp2
-rw-r--r--src/devices/machine/z8536.cpp2
283 files changed, 550 insertions, 516 deletions
diff --git a/src/devices/machine/40105.cpp b/src/devices/machine/40105.cpp
index 5eab87e1bf2..1252e81f785 100644
--- a/src/devices/machine/40105.cpp
+++ b/src/devices/machine/40105.cpp
@@ -32,8 +32,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CD40105 = &device_creator<cmos_40105_device>;
-const device_type HC40105 = &device_creator<cmos_40105_device>;
+const device_type CD40105 = device_creator<cmos_40105_device>;
+const device_type HC40105 = device_creator<cmos_40105_device>;
//**************************************************************************
diff --git a/src/devices/machine/53c7xx.cpp b/src/devices/machine/53c7xx.cpp
index daabe348188..e84c4358901 100644
--- a/src/devices/machine/53c7xx.cpp
+++ b/src/devices/machine/53c7xx.cpp
@@ -52,7 +52,7 @@ static void ATTR_PRINTF(3,4) verbose_log(running_machine &machine, int level, co
// LIVE DEVICE
//**************************************************************************
-const device_type NCR53C7XX = &device_creator<ncr53c7xx_device>;
+const device_type NCR53C7XX = device_creator<ncr53c7xx_device>;
//-------------------------------------------------
// ncr53c7xx_device - constructor/destructor
diff --git a/src/devices/machine/53c810.cpp b/src/devices/machine/53c810.cpp
index cdbee6a288e..5564525869d 100644
--- a/src/devices/machine/53c810.cpp
+++ b/src/devices/machine/53c810.cpp
@@ -813,4 +813,4 @@ unsigned lsi53c810_device::lsi53c810_dasm(char *buf, uint32_t pc)
return result;
}
-const device_type LSI53C810 = &device_creator<lsi53c810_device>;
+const device_type LSI53C810 = device_creator<lsi53c810_device>;
diff --git a/src/devices/machine/64h156.cpp b/src/devices/machine/64h156.cpp
index dfebc6dd0bd..5ce4497c860 100644
--- a/src/devices/machine/64h156.cpp
+++ b/src/devices/machine/64h156.cpp
@@ -43,7 +43,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type C64H156 = &device_creator<c64h156_device>;
+const device_type C64H156 = device_creator<c64h156_device>;
diff --git a/src/devices/machine/6522via.cpp b/src/devices/machine/6522via.cpp
index 90c060038c1..80ecb5c2a8a 100644
--- a/src/devices/machine/6522via.cpp
+++ b/src/devices/machine/6522via.cpp
@@ -148,7 +148,7 @@ uint16_t via6522_device::get_counter1_value()
//**************************************************************************
// device type definition
-const device_type VIA6522 = &device_creator<via6522_device>;
+const device_type VIA6522 = device_creator<via6522_device>;
DEVICE_ADDRESS_MAP_START( map, 8, via6522_device )
AM_RANGE(0x00, 0x0f) AM_READWRITE(read, write)
diff --git a/src/devices/machine/6525tpi.cpp b/src/devices/machine/6525tpi.cpp
index 1658ce08d5b..be33b929b6b 100644
--- a/src/devices/machine/6525tpi.cpp
+++ b/src/devices/machine/6525tpi.cpp
@@ -104,7 +104,7 @@
#define CB_MANUAL_LEVEL ((m_cr & 0x40) ? 1 : 0)
-const device_type TPI6525 = &device_creator<tpi6525_device>;
+const device_type TPI6525 = device_creator<tpi6525_device>;
tpi6525_device::tpi6525_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TPI6525, "6525 TPI", tag, owner, clock, "tpi6525", __FILE__),
diff --git a/src/devices/machine/6532riot.cpp b/src/devices/machine/6532riot.cpp
index 94b56366d6d..c1b0fb03e7e 100644
--- a/src/devices/machine/6532riot.cpp
+++ b/src/devices/machine/6532riot.cpp
@@ -22,7 +22,7 @@ The timer seems to follow these rules:
//**************************************************************************
// device type definition
-const device_type RIOT6532 = &device_creator<riot6532_device>;
+const device_type RIOT6532 = device_creator<riot6532_device>;
enum
{
diff --git a/src/devices/machine/68153bim.cpp b/src/devices/machine/68153bim.cpp
index f086b16cd71..4d9bd20d07a 100644
--- a/src/devices/machine/68153bim.cpp
+++ b/src/devices/machine/68153bim.cpp
@@ -59,9 +59,9 @@
// DEVICE DEFINITIONS
//**************************************************************************
// device type definition
-const device_type MC68153_CHANNEL = &device_creator<bim68153_channel>;
-const device_type MC68153 = &device_creator<bim68153_device>;
-const device_type EI68C153 = &device_creator<ei68c153_device>;
+const device_type MC68153_CHANNEL = device_creator<bim68153_channel>;
+const device_type MC68153 = device_creator<bim68153_device>;
+const device_type EI68C153 = device_creator<ei68c153_device>;
//-------------------------------------------------
// device_mconfig_additions -
diff --git a/src/devices/machine/6821pia.cpp b/src/devices/machine/6821pia.cpp
index ab71db7bfa6..2d1e20859dc 100644
--- a/src/devices/machine/6821pia.cpp
+++ b/src/devices/machine/6821pia.cpp
@@ -55,7 +55,7 @@
//**************************************************************************
// device type definition
-const device_type PIA6821 = &device_creator<pia6821_device>;
+const device_type PIA6821 = device_creator<pia6821_device>;
template class device_finder<pia6821_device, false>;
template class device_finder<pia6821_device, true>;
diff --git a/src/devices/machine/68230pit.cpp b/src/devices/machine/68230pit.cpp
index f7351c20217..bf5cfec90b7 100644
--- a/src/devices/machine/68230pit.cpp
+++ b/src/devices/machine/68230pit.cpp
@@ -58,7 +58,7 @@
// DEVICE TYPE DEFINITIONS
//**************************************************************************
-const device_type PIT68230 = &device_creator<pit68230_device>;
+const device_type PIT68230 = device_creator<pit68230_device>;
//-------------------------------------------------
// pit68230_device - constructors
diff --git a/src/devices/machine/68307.cpp b/src/devices/machine/68307.cpp
index 58865272653..fbbf8400ad7 100644
--- a/src/devices/machine/68307.cpp
+++ b/src/devices/machine/68307.cpp
@@ -5,6 +5,9 @@
#include "emu.h"
#include "68307.h"
+const device_type M68307 = device_creator<m68307cpu_device>;
+
+
/* 68307 SERIAL Module */
/* all ports on this are 8-bit? */
diff --git a/src/devices/machine/68307.h b/src/devices/machine/68307.h
index b3e2cd4b8fd..c3ea6ea9286 100644
--- a/src/devices/machine/68307.h
+++ b/src/devices/machine/68307.h
@@ -122,7 +122,7 @@ protected:
virtual void device_reset() override;
};
-static const device_type M68307 = &device_creator<m68307cpu_device>;
+extern const device_type M68307;
#endif
diff --git a/src/devices/machine/68340.cpp b/src/devices/machine/68340.cpp
index 79b1e55331c..36d42b869fa 100644
--- a/src/devices/machine/68340.cpp
+++ b/src/devices/machine/68340.cpp
@@ -5,7 +5,7 @@
#include "emu.h"
#include "68340.h"
-
+const device_type M68340 = device_creator<m68340cpu_device>;
int m68340_calc_cs(m68340cpu_device *m68k, offs_t address)
diff --git a/src/devices/machine/68340.h b/src/devices/machine/68340.h
index c0c76f467e3..350021100a3 100644
--- a/src/devices/machine/68340.h
+++ b/src/devices/machine/68340.h
@@ -15,10 +15,8 @@
#include "68340tmu.h"
-
-
-
-class m68340cpu_device : public fscpu32_device {
+class m68340cpu_device : public fscpu32_device
+{
public:
m68340cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -58,17 +56,13 @@ public:
TIMER_CALLBACK_MEMBER(periodic_interrupt_timer_callback);
void start_68340_sim(void);
void do_timer_irq(void);
-protected:
+protected:
virtual void device_start() override;
virtual void device_reset() override;
};
-static const device_type M68340 = &device_creator<m68340cpu_device>;
-
-
-
-
+extern const device_type M68340;
#endif
diff --git a/src/devices/machine/6840ptm.cpp b/src/devices/machine/6840ptm.cpp
index 7532d47622b..883821cb039 100644
--- a/src/devices/machine/6840ptm.cpp
+++ b/src/devices/machine/6840ptm.cpp
@@ -63,7 +63,7 @@ const char *const ptm6840_device::opmode[] =
***************************************************************************/
// device type definition
-const device_type PTM6840 = &device_creator<ptm6840_device>;
+const device_type PTM6840 = device_creator<ptm6840_device>;
//-------------------------------------------------
// ptm6840_device - constructor
diff --git a/src/devices/machine/6850acia.cpp b/src/devices/machine/6850acia.cpp
index 9a84b9e0a72..567a0af6e9f 100644
--- a/src/devices/machine/6850acia.cpp
+++ b/src/devices/machine/6850acia.cpp
@@ -58,7 +58,7 @@ const int acia6850_device::transmitter_control[4][3] =
***************************************************************************/
// device type definition
-const device_type ACIA6850 = &device_creator<acia6850_device>;
+const device_type ACIA6850 = device_creator<acia6850_device>;
template class device_finder<acia6850_device, false>;
template class device_finder<acia6850_device, true>;
diff --git a/src/devices/machine/68561mpcc.cpp b/src/devices/machine/68561mpcc.cpp
index e44c53e3e88..ce96d058dab 100644
--- a/src/devices/machine/68561mpcc.cpp
+++ b/src/devices/machine/68561mpcc.cpp
@@ -86,11 +86,11 @@ FEATURES
// DEVICE DEFINITIONS
//**************************************************************************
// device type definition
-const device_type MPCC = &device_creator<mpcc_device>;
-const device_type MPCC68560 = &device_creator<mpcc68560_device>;
-const device_type MPCC68560A = &device_creator<mpcc68560A_device>;
-const device_type MPCC68561 = &device_creator<mpcc68561_device>;
-const device_type MPCC68561A = &device_creator<mpcc68561A_device>;
+const device_type MPCC = device_creator<mpcc_device>;
+const device_type MPCC68560 = device_creator<mpcc68560_device>;
+const device_type MPCC68560A = device_creator<mpcc68560A_device>;
+const device_type MPCC68561 = device_creator<mpcc68561_device>;
+const device_type MPCC68561A = device_creator<mpcc68561A_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/machine/7200fifo.cpp b/src/devices/machine/7200fifo.cpp
index 6a08e548aa4..b15f7f551c6 100644
--- a/src/devices/machine/7200fifo.cpp
+++ b/src/devices/machine/7200fifo.cpp
@@ -14,7 +14,7 @@
#include "machine/7200fifo.h"
-const device_type FIFO7200 = &device_creator<fifo7200_device>;
+const device_type FIFO7200 = device_creator<fifo7200_device>;
//-------------------------------------------------
// fifo7200_device - constructor
diff --git a/src/devices/machine/7400.cpp b/src/devices/machine/7400.cpp
index ef20c91df9a..fa189e91a7d 100644
--- a/src/devices/machine/7400.cpp
+++ b/src/devices/machine/7400.cpp
@@ -9,7 +9,7 @@
#include "emu.h"
#include "7400.h"
-const device_type TTL7400 = &device_creator<ttl7400_device>;
+const device_type TTL7400 = device_creator<ttl7400_device>;
ttl7400_device::ttl7400_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TTL7400, "7400 Quad 2-Input NAND Gate", tag, owner, clock, "7400", __FILE__)
diff --git a/src/devices/machine/7404.cpp b/src/devices/machine/7404.cpp
index 8491d848149..09251088c87 100644
--- a/src/devices/machine/7404.cpp
+++ b/src/devices/machine/7404.cpp
@@ -9,7 +9,7 @@
#include "emu.h"
#include "7404.h"
-const device_type TTL7404 = &device_creator<ttl7404_device>;
+const device_type TTL7404 = device_creator<ttl7404_device>;
ttl7404_device::ttl7404_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TTL7404, "5/7404 Hex Inverters", tag, owner, clock, "7404", __FILE__)
diff --git a/src/devices/machine/74123.cpp b/src/devices/machine/74123.cpp
index ad3cd7d2a0c..7fde031e7aa 100644
--- a/src/devices/machine/74123.cpp
+++ b/src/devices/machine/74123.cpp
@@ -22,7 +22,7 @@
//**************************************************************************
// device type definition
-const device_type TTL74123 = &device_creator<ttl74123_device>;
+const device_type TTL74123 = device_creator<ttl74123_device>;
//-------------------------------------------------
// ttl74123_device - constructor
diff --git a/src/devices/machine/74145.cpp b/src/devices/machine/74145.cpp
index 218a65829f5..4f6b3e2a7be 100644
--- a/src/devices/machine/74145.cpp
+++ b/src/devices/machine/74145.cpp
@@ -50,7 +50,7 @@
#include "coreutil.h"
-const device_type TTL74145 = &device_creator<ttl74145_device>;
+const device_type TTL74145 = device_creator<ttl74145_device>;
/***************************************************************************
DEVICE INTERFACE
diff --git a/src/devices/machine/74148.cpp b/src/devices/machine/74148.cpp
index 8786d2aa7b4..79a74f16a40 100644
--- a/src/devices/machine/74148.cpp
+++ b/src/devices/machine/74148.cpp
@@ -44,7 +44,7 @@
#include "machine/74148.h"
-const device_type TTL74148 = &device_creator<ttl74148_device>;
+const device_type TTL74148 = device_creator<ttl74148_device>;
ttl74148_device::ttl74148_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TTL74148, "74148 TTL", tag, owner, clock, "74148", __FILE__),
diff --git a/src/devices/machine/74153.cpp b/src/devices/machine/74153.cpp
index 42d08d48eae..143a5b07fea 100644
--- a/src/devices/machine/74153.cpp
+++ b/src/devices/machine/74153.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type TTL153 = &device_creator<ttl153_device>;
+const device_type TTL153 = device_creator<ttl153_device>;
//**************************************************************************
diff --git a/src/devices/machine/74157.cpp b/src/devices/machine/74157.cpp
index 88f7b1dd03d..b68dc1472e6 100644
--- a/src/devices/machine/74157.cpp
+++ b/src/devices/machine/74157.cpp
@@ -20,7 +20,7 @@
// 74LS157 DEVICE
//**************************************************************************
-const device_type LS157 = &device_creator<ls157_device>;
+const device_type LS157 = device_creator<ls157_device>;
//-------------------------------------------------
// ls157_device - constructor
@@ -211,7 +211,7 @@ void ls157_device::update_output()
// 74HCT157 DEVICE
//**************************************************************************
-const device_type HCT157 = &device_creator<hct157_device>;
+const device_type HCT157 = device_creator<hct157_device>;
hct157_device::hct157_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ls157_device(mconfig, HCT157, "74HCT157 Quad 2-to-1 Multiplexer", tag, owner, clock, "74hct157", __FILE__)
diff --git a/src/devices/machine/74161.cpp b/src/devices/machine/74161.cpp
index 96279e57f1b..2c81cdfcb1a 100644
--- a/src/devices/machine/74161.cpp
+++ b/src/devices/machine/74161.cpp
@@ -9,10 +9,10 @@
#include "emu.h"
#include "74161.h"
-const device_type TTL74160 = &device_creator<ttl74160_device>;
-const device_type TTL74161 = &device_creator<ttl74161_device>;
-const device_type TTL74162 = &device_creator<ttl74162_device>;
-const device_type TTL74163 = &device_creator<ttl74163_device>;
+const device_type TTL74160 = device_creator<ttl74160_device>;
+const device_type TTL74161 = device_creator<ttl74161_device>;
+const device_type TTL74162 = device_creator<ttl74162_device>;
+const device_type TTL74163 = device_creator<ttl74163_device>;
ttl7416x_device::ttl7416x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, bool synchronous_reset, uint8_t limit)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
diff --git a/src/devices/machine/74175.cpp b/src/devices/machine/74175.cpp
index 5de13e040f9..7c8135f4450 100644
--- a/src/devices/machine/74175.cpp
+++ b/src/devices/machine/74175.cpp
@@ -9,8 +9,8 @@
#include "emu.h"
#include "74175.h"
-const device_type TTL74174 = &device_creator<ttl74174_device>;
-const device_type TTL74175 = &device_creator<ttl74175_device>;
+const device_type TTL74174 = device_creator<ttl74174_device>;
+const device_type TTL74175 = device_creator<ttl74175_device>;
ttl741745_device::ttl741745_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
diff --git a/src/devices/machine/74181.cpp b/src/devices/machine/74181.cpp
index 8a2802b63d2..bcd2b8db332 100644
--- a/src/devices/machine/74181.cpp
+++ b/src/devices/machine/74181.cpp
@@ -16,7 +16,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type TTL74181 = &device_creator<ttl74181_device>;
+const device_type TTL74181 = device_creator<ttl74181_device>;
//**************************************************************************
diff --git a/src/devices/machine/7474.cpp b/src/devices/machine/7474.cpp
index 50852c76e0c..69178d9f57c 100644
--- a/src/devices/machine/7474.cpp
+++ b/src/devices/machine/7474.cpp
@@ -49,7 +49,7 @@
//**************************************************************************
// device type definition
-const device_type TTL7474 = &device_creator<ttl7474_device>;
+const device_type TTL7474 = device_creator<ttl7474_device>;
//-------------------------------------------------
// ttl7474_device - constructor
diff --git a/src/devices/machine/8042kbdc.cpp b/src/devices/machine/8042kbdc.cpp
index ff0dc3b6727..8c7d4b70dcd 100644
--- a/src/devices/machine/8042kbdc.cpp
+++ b/src/devices/machine/8042kbdc.cpp
@@ -191,7 +191,7 @@
#define LOG_KEYBOARD 0
#define LOG_ACCESSES 0
-const device_type KBDC8042 = &device_creator<kbdc8042_device>;
+const device_type KBDC8042 = device_creator<kbdc8042_device>;
//-------------------------------------------------
// kbdc8042_device - constructor
diff --git a/src/devices/machine/82s129.cpp b/src/devices/machine/82s129.cpp
index f8f8b754ee4..b705bd6e29e 100644
--- a/src/devices/machine/82s129.cpp
+++ b/src/devices/machine/82s129.cpp
@@ -11,8 +11,8 @@
const uint32_t prom82s129_base_device::PROM_SIZE = 256;
-const device_type PROM82S126 = &device_creator<prom82s126_device>;
-const device_type PROM82S129 = &device_creator<prom82s129_device>;
+const device_type PROM82S126 = device_creator<prom82s126_device>;
+const device_type PROM82S129 = device_creator<prom82s129_device>;
prom82s129_base_device::prom82s129_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
diff --git a/src/devices/machine/8364_paula.cpp b/src/devices/machine/8364_paula.cpp
index 496d78b916d..da535b75627 100644
--- a/src/devices/machine/8364_paula.cpp
+++ b/src/devices/machine/8364_paula.cpp
@@ -22,7 +22,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PAULA_8364 = &device_creator<paula_8364_device>;
+const device_type PAULA_8364 = device_creator<paula_8364_device>;
//*************************************************************************
diff --git a/src/devices/machine/8530scc.cpp b/src/devices/machine/8530scc.cpp
index ee7631d241c..7e042049e7c 100644
--- a/src/devices/machine/8530scc.cpp
+++ b/src/devices/machine/8530scc.cpp
@@ -12,7 +12,7 @@
#include "emu.h"
#include "8530scc.h"
-const device_type SCC8530 = &device_creator<scc8530_t>;
+const device_type SCC8530 = device_creator<scc8530_t>;
/***************************************************************************
diff --git a/src/devices/machine/aakart.cpp b/src/devices/machine/aakart.cpp
index 687a40e9481..6608ba32a3c 100644
--- a/src/devices/machine/aakart.cpp
+++ b/src/devices/machine/aakart.cpp
@@ -19,7 +19,7 @@ TODO:
//**************************************************************************
// device type definition
-const device_type AAKART = &device_creator<aakart_device>;
+const device_type AAKART = device_creator<aakart_device>;
#define HRST 0xff
#define RAK1 0xfe
diff --git a/src/devices/machine/adc0808.cpp b/src/devices/machine/adc0808.cpp
index 902133161d4..d55d14a2ed0 100644
--- a/src/devices/machine/adc0808.cpp
+++ b/src/devices/machine/adc0808.cpp
@@ -17,7 +17,7 @@
//**************************************************************************
// device type definition
-const device_type ADC0808 = &device_creator<adc0808_device>;
+const device_type ADC0808 = device_creator<adc0808_device>;
//-------------------------------------------------
// adc0808_device - constructor
diff --git a/src/devices/machine/adc083x.cpp b/src/devices/machine/adc083x.cpp
index 375bc442a93..d1666967f78 100644
--- a/src/devices/machine/adc083x.cpp
+++ b/src/devices/machine/adc083x.cpp
@@ -46,10 +46,10 @@ enum
TYPE DEFINITIONS
***************************************************************************/
-const device_type ADC0831 = &device_creator<adc0831_device>;
-const device_type ADC0832 = &device_creator<adc0832_device>;
-const device_type ADC0834 = &device_creator<adc0834_device>;
-const device_type ADC0838 = &device_creator<adc0838_device>;
+const device_type ADC0831 = device_creator<adc0831_device>;
+const device_type ADC0832 = device_creator<adc0832_device>;
+const device_type ADC0834 = device_creator<adc0834_device>;
+const device_type ADC0838 = device_creator<adc0838_device>;
adc083x_device::adc083x_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),
diff --git a/src/devices/machine/adc1038.cpp b/src/devices/machine/adc1038.cpp
index d0591c867b6..66f65878b65 100644
--- a/src/devices/machine/adc1038.cpp
+++ b/src/devices/machine/adc1038.cpp
@@ -13,7 +13,7 @@
#include "adc1038.h"
-const device_type ADC1038 = &device_creator<adc1038_device>;
+const device_type ADC1038 = device_creator<adc1038_device>;
adc1038_device::adc1038_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ADC1038, "ADC1038", tag, owner, clock, "adc1038", __FILE__), m_cycle(0), m_clk(0), m_adr(0), m_data_in(0), m_data_out(0), m_adc_data(0), m_sars(0),
diff --git a/src/devices/machine/adc1213x.cpp b/src/devices/machine/adc1213x.cpp
index ed501313156..d3c39ba036e 100644
--- a/src/devices/machine/adc1213x.cpp
+++ b/src/devices/machine/adc1213x.cpp
@@ -34,7 +34,7 @@
-const device_type ADC12130 = &device_creator<adc12130_device>;
+const device_type ADC12130 = device_creator<adc12130_device>;
adc12130_device::adc12130_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: adc12138_device(mconfig, ADC12130, "ADC12130", tag, owner, clock, "adc12130", __FILE__)
@@ -42,7 +42,7 @@ adc12130_device::adc12130_device(const machine_config &mconfig, const char *tag,
}
-const device_type ADC12132 = &device_creator<adc12132_device>;
+const device_type ADC12132 = device_creator<adc12132_device>;
adc12132_device::adc12132_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: adc12138_device(mconfig, ADC12132, "ADC12132", tag, owner, clock, "adc12132", __FILE__)
@@ -50,7 +50,7 @@ adc12132_device::adc12132_device(const machine_config &mconfig, const char *tag,
}
-const device_type ADC12138 = &device_creator<adc12138_device>;
+const device_type ADC12138 = device_creator<adc12138_device>;
adc12138_device::adc12138_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ADC12138, "ADC12138", tag, owner, clock, "adc12138", __FILE__)
diff --git a/src/devices/machine/aicartc.cpp b/src/devices/machine/aicartc.cpp
index f52c5269dab..864c9e5ced9 100644
--- a/src/devices/machine/aicartc.cpp
+++ b/src/devices/machine/aicartc.cpp
@@ -19,7 +19,7 @@
//**************************************************************************
// device type definition
-const device_type AICARTC = &device_creator<aicartc_device>;
+const device_type AICARTC = device_creator<aicartc_device>;
//**************************************************************************
diff --git a/src/devices/machine/akiko.cpp b/src/devices/machine/akiko.cpp
index a01a1c79dd4..e464f70431f 100644
--- a/src/devices/machine/akiko.cpp
+++ b/src/devices/machine/akiko.cpp
@@ -31,7 +31,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type AKIKO = &device_creator<akiko_device>;
+const device_type AKIKO = device_creator<akiko_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/machine/am2847.cpp b/src/devices/machine/am2847.cpp
index 574ddd81acc..93c288c6b68 100644
--- a/src/devices/machine/am2847.cpp
+++ b/src/devices/machine/am2847.cpp
@@ -9,9 +9,9 @@
#include "emu.h"
#include "am2847.h"
-const device_type AM2847 = &device_creator<am2847_device>;
-const device_type AM2849 = &device_creator<am2849_device>;
-const device_type TMS3409 = &device_creator<tms3409_device>;
+const device_type AM2847 = device_creator<am2847_device>;
+const device_type AM2849 = device_creator<am2849_device>;
+const device_type TMS3409 = device_creator<tms3409_device>;
am2847_base_device::am2847_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, size_t size)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
diff --git a/src/devices/machine/am53cf96.cpp b/src/devices/machine/am53cf96.cpp
index 60bfe25ddb0..d2770b383ce 100644
--- a/src/devices/machine/am53cf96.cpp
+++ b/src/devices/machine/am53cf96.cpp
@@ -191,4 +191,4 @@ void am53cf96_device::dma_write_data(int bytes, uint8_t *pData)
write_data(pData, bytes);
}
-const device_type AM53CF96 = &device_creator<am53cf96_device>;
+const device_type AM53CF96 = device_creator<am53cf96_device>;
diff --git a/src/devices/machine/am9517a.cpp b/src/devices/machine/am9517a.cpp
index a7b652a79ed..b29fdf7b13a 100644
--- a/src/devices/machine/am9517a.cpp
+++ b/src/devices/machine/am9517a.cpp
@@ -48,9 +48,9 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type AM9517A = &device_creator<am9517a_device>;
-const device_type V53_DMAU = &device_creator<upd71071_v53_device>;
-const device_type PCXPORT_DMAC = &device_creator<pcxport_dmac_device>;
+const device_type AM9517A = device_creator<am9517a_device>;
+const device_type V53_DMAU = device_creator<upd71071_v53_device>;
+const device_type PCXPORT_DMAC = device_creator<pcxport_dmac_device>;
//**************************************************************************
diff --git a/src/devices/machine/amigafdc.cpp b/src/devices/machine/amigafdc.cpp
index 89a626e46fc..188221d0052 100644
--- a/src/devices/machine/amigafdc.cpp
+++ b/src/devices/machine/amigafdc.cpp
@@ -12,7 +12,7 @@
#include "formats/ami_dsk.h"
#include "amigafdc.h"
-const device_type AMIGA_FDC = &device_creator<amiga_fdc>;
+const device_type AMIGA_FDC = device_creator<amiga_fdc>;
FLOPPY_FORMATS_MEMBER( amiga_fdc::floppy_formats )
FLOPPY_ADF_FORMAT
diff --git a/src/devices/machine/appldriv.cpp b/src/devices/machine/appldriv.cpp
index 47b4408657e..ef6a46dfb6d 100644
--- a/src/devices/machine/appldriv.cpp
+++ b/src/devices/machine/appldriv.cpp
@@ -291,7 +291,7 @@ int apple525_read_status(device_t *device)
}
// device type definition
-const device_type FLOPPY_APPLE = &device_creator<apple525_floppy_image_device>;
+const device_type FLOPPY_APPLE = device_creator<apple525_floppy_image_device>;
//-------------------------------------------------
// apple525_floppy_image_device - constructor
diff --git a/src/devices/machine/applefdc.cpp b/src/devices/machine/applefdc.cpp
index 8b0f6ed4cd2..6d9d10fbd13 100644
--- a/src/devices/machine/applefdc.cpp
+++ b/src/devices/machine/applefdc.cpp
@@ -565,7 +565,7 @@ uint8_t applefdc_base_device::get_lines()
APPLE FDC - Used on Apple II
***************************************************************************/
-const device_type APPLEFDC = &device_creator<applefdc_device>;
+const device_type APPLEFDC = device_creator<applefdc_device>;
applefdc_device::applefdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: applefdc_base_device(APPLEFDC_APPLE2, mconfig, APPLEFDC, "Apple FDC", tag, owner, clock, "apple_fdc", __FILE__)
@@ -578,7 +578,7 @@ applefdc_device::applefdc_device(const machine_config &mconfig, const char *tag,
IWM - Used on early Macs
***************************************************************************/
-const device_type IWM = &device_creator<iwm_device>;
+const device_type IWM = device_creator<iwm_device>;
iwm_device::iwm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: applefdc_base_device(APPLEFDC_IWM, mconfig, IWM, "Apple IWM (Integrated Woz Machine)", tag, owner, clock, "iwm", __FILE__)
diff --git a/src/devices/machine/at28c16.cpp b/src/devices/machine/at28c16.cpp
index 85db65f68d5..1ee69769c6f 100644
--- a/src/devices/machine/at28c16.cpp
+++ b/src/devices/machine/at28c16.cpp
@@ -33,7 +33,7 @@ ADDRESS_MAP_END
//**************************************************************************
// device type definition
-const device_type AT28C16 = &device_creator<at28c16_device>;
+const device_type AT28C16 = device_creator<at28c16_device>;
//-------------------------------------------------
// at28c16_device - constructor
diff --git a/src/devices/machine/at29x.cpp b/src/devices/machine/at29x.cpp
index c6dcf109fe0..2c56a1c45c2 100644
--- a/src/devices/machine/at29x.cpp
+++ b/src/devices/machine/at29x.cpp
@@ -521,6 +521,6 @@ void at29x_device::device_reset(void)
m_programming_last_offset = 0;
}
-const device_type AT29C020 = &device_creator<at29c020_device>;
-const device_type AT29C040 = &device_creator<at29c040_device>;
-const device_type AT29C040A = &device_creator<at29c040a_device>;
+const device_type AT29C020 = device_creator<at29c020_device>;
+const device_type AT29C040 = device_creator<at29c040_device>;
+const device_type AT29C040A = device_creator<at29c040a_device>;
diff --git a/src/devices/machine/at45dbxx.cpp b/src/devices/machine/at45dbxx.cpp
index 6788609cc56..e1b44c4ee0e 100644
--- a/src/devices/machine/at45dbxx.cpp
+++ b/src/devices/machine/at45dbxx.cpp
@@ -33,9 +33,9 @@
//**************************************************************************
// device type definition
-const device_type AT45DB041 = &device_creator<at45db041_device>;
-const device_type AT45DB081 = &device_creator<at45db081_device>;
-const device_type AT45DB161 = &device_creator<at45db161_device>;
+const device_type AT45DB041 = device_creator<at45db041_device>;
+const device_type AT45DB081 = device_creator<at45db081_device>;
+const device_type AT45DB161 = device_creator<at45db161_device>;
//**************************************************************************
diff --git a/src/devices/machine/at_keybc.cpp b/src/devices/machine/at_keybc.cpp
index 56b3907e638..d8db7bf8d46 100644
--- a/src/devices/machine/at_keybc.cpp
+++ b/src/devices/machine/at_keybc.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type AT_KEYBOARD_CONTROLLER = &device_creator<at_keyboard_controller_device>;
+const device_type AT_KEYBOARD_CONTROLLER = device_creator<at_keyboard_controller_device>;
// i/o map for the 8042
static ADDRESS_MAP_START( at_keybc_io, AS_IO, 8, at_keyboard_controller_device)
diff --git a/src/devices/machine/ataflash.cpp b/src/devices/machine/ataflash.cpp
index c70f0d82a33..3ecbf3488ae 100644
--- a/src/devices/machine/ataflash.cpp
+++ b/src/devices/machine/ataflash.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "ataflash.h"
-const device_type ATA_FLASH_PCCARD = &device_creator<ata_flash_pccard_device>;
+const device_type ATA_FLASH_PCCARD = device_creator<ata_flash_pccard_device>;
ata_flash_pccard_device::ata_flash_pccard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
ide_hdd_device(mconfig, ATA_FLASH_PCCARD, "ATA Flash PCCARD", tag, owner, clock, "ataflash", __FILE__)
@@ -117,7 +117,7 @@ attotime ata_flash_pccard_device::seek_time()
}
-const device_type TAITO_PCCARD1 = &device_creator<taito_pccard1_device>;
+const device_type TAITO_PCCARD1 = device_creator<taito_pccard1_device>;
taito_pccard1_device::taito_pccard1_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 1)", tag, owner, clock, "taito_pccard1", __FILE__),
@@ -208,7 +208,7 @@ bool taito_pccard1_device::is_ready()
return m_locked == 0;
}
-const device_type TAITO_PCCARD2 = &device_creator<taito_pccard2_device>;
+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__),
@@ -307,7 +307,7 @@ bool taito_pccard2_device::is_ready()
return !m_locked;
}
-const device_type TAITO_COMPACT_FLASH = &device_creator<taito_compact_flash_device>;
+const device_type TAITO_COMPACT_FLASH = device_creator<taito_compact_flash_device>;
taito_compact_flash_device::taito_compact_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
ata_flash_pccard_device(mconfig, TAITO_COMPACT_FLASH, "Taito Compact Flash", tag, owner, clock, "taito_cf", __FILE__),
diff --git a/src/devices/machine/ataintf.cpp b/src/devices/machine/ataintf.cpp
index 7ec7dd8838d..09ca1a04e8d 100644
--- a/src/devices/machine/ataintf.cpp
+++ b/src/devices/machine/ataintf.cpp
@@ -215,7 +215,7 @@ ata_interface_device::ata_interface_device(const machine_config &mconfig, device
}
-const device_type ATA_INTERFACE = &device_creator<ata_interface_device>;
+const device_type ATA_INTERFACE = device_creator<ata_interface_device>;
ata_interface_device::ata_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ATA_INTERFACE, "ATA Interface", tag, owner, clock, "ata_interface", __FILE__),
@@ -290,7 +290,7 @@ machine_config_constructor ata_interface_device::device_mconfig_additions() cons
//**************************************************************************
// device type definition
-const device_type ATA_SLOT = &device_creator<ata_slot_device>;
+const device_type ATA_SLOT = device_creator<ata_slot_device>;
//-------------------------------------------------
// ata_slot_device - constructor
diff --git a/src/devices/machine/atapicdr.cpp b/src/devices/machine/atapicdr.cpp
index 7bda20dc96e..a7aa4449517 100644
--- a/src/devices/machine/atapicdr.cpp
+++ b/src/devices/machine/atapicdr.cpp
@@ -8,8 +8,8 @@
#define T10MMC_GET_EVENT_STATUS_NOTIFICATION 0x4a
// device type definition
-const device_type ATAPI_CDROM = &device_creator<atapi_cdrom_device>;
-const device_type ATAPI_FIXED_CDROM = &device_creator<atapi_fixed_cdrom_device>;
+const device_type ATAPI_CDROM = device_creator<atapi_cdrom_device>;
+const device_type ATAPI_FIXED_CDROM = device_creator<atapi_fixed_cdrom_device>;
atapi_cdrom_device::atapi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
atapi_hle_device(mconfig, ATAPI_CDROM, "ATAPI CDROM", tag, owner, clock, "cdrom", __FILE__)
diff --git a/src/devices/machine/ay31015.cpp b/src/devices/machine/ay31015.cpp
index 47b6568bd47..d19bea1d61b 100644
--- a/src/devices/machine/ay31015.cpp
+++ b/src/devices/machine/ay31015.cpp
@@ -94,8 +94,8 @@ Start bit (low), Bit 0, Bit 1... highest bit, Parity bit (if enabled), 1-2 stop
-const device_type AY31015 = &device_creator<ay31015_device>;
-const device_type AY51013 = &device_creator<ay51013_device>;
+const device_type AY31015 = device_creator<ay31015_device>;
+const device_type AY51013 = device_creator<ay51013_device>;
ay31015_device::ay31015_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),
diff --git a/src/devices/machine/bankdev.cpp b/src/devices/machine/bankdev.cpp
index 71557056253..5c75b67e6f1 100644
--- a/src/devices/machine/bankdev.cpp
+++ b/src/devices/machine/bankdev.cpp
@@ -4,7 +4,7 @@
#include "bankdev.h"
// device type definition
-const device_type ADDRESS_MAP_BANK = &device_creator<address_map_bank_device>;
+const device_type ADDRESS_MAP_BANK = device_creator<address_map_bank_device>;
address_map_bank_device::address_map_bank_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock )
: device_t(mconfig, ADDRESS_MAP_BANK, "Address Map Bank", tag, owner, clock, "address_map_bank", __FILE__),
diff --git a/src/devices/machine/bcreader.cpp b/src/devices/machine/bcreader.cpp
index 9b286f49281..55cca371322 100644
--- a/src/devices/machine/bcreader.cpp
+++ b/src/devices/machine/bcreader.cpp
@@ -53,7 +53,7 @@
#include "bcreader.h"
// device type definition
-const device_type BARCODE_READER = &device_creator<barcode_reader_device>;
+const device_type BARCODE_READER = device_creator<barcode_reader_device>;
//-------------------------------------------------
// barcode_reader_device - constructor
diff --git a/src/devices/machine/bcreader.h b/src/devices/machine/bcreader.h
index 661c3008198..1e5da282b7a 100644
--- a/src/devices/machine/bcreader.h
+++ b/src/devices/machine/bcreader.h
@@ -54,7 +54,7 @@ protected:
extern const device_type BARCODE_READER;
// device type iterator
-typedef device_type_iterator<&device_creator<barcode_reader_device>, barcode_reader_device> barcode_reader_device_iterator;
+typedef device_type_iterator<BARCODE_READER, barcode_reader_device> barcode_reader_device_iterator;
#endif
diff --git a/src/devices/machine/buffer.cpp b/src/devices/machine/buffer.cpp
index 7497f49ecd4..b5d0839af5e 100644
--- a/src/devices/machine/buffer.cpp
+++ b/src/devices/machine/buffer.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "buffer.h"
-const device_type INPUT_BUFFER = &device_creator<input_buffer_device>;
+const device_type INPUT_BUFFER = device_creator<input_buffer_device>;
input_buffer_device::input_buffer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, INPUT_BUFFER, "Input Buffer", tag, owner, clock, "input_buffer", __FILE__),
diff --git a/src/devices/machine/cdp1852.cpp b/src/devices/machine/cdp1852.cpp
index 5539da4c40e..422d3ff5fe2 100644
--- a/src/devices/machine/cdp1852.cpp
+++ b/src/devices/machine/cdp1852.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CDP1852 = &device_creator<cdp1852_device>;
+const device_type CDP1852 = device_creator<cdp1852_device>;
diff --git a/src/devices/machine/cdp1871.cpp b/src/devices/machine/cdp1871.cpp
index 9e219c1e460..586597ce41b 100644
--- a/src/devices/machine/cdp1871.cpp
+++ b/src/devices/machine/cdp1871.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CDP1871 = &device_creator<cdp1871_device>;
+const device_type CDP1871 = device_creator<cdp1871_device>;
diff --git a/src/devices/machine/cdp1879.cpp b/src/devices/machine/cdp1879.cpp
index a4ed8e39a13..4cac4cf90fd 100644
--- a/src/devices/machine/cdp1879.cpp
+++ b/src/devices/machine/cdp1879.cpp
@@ -15,7 +15,7 @@
//**************************************************************************
// device type definition
-const device_type CDP1879 = &device_creator<cdp1879_device>;
+const device_type CDP1879 = device_creator<cdp1879_device>;
//-------------------------------------------------
// cdp1879_device - constructor
diff --git a/src/devices/machine/clock.cpp b/src/devices/machine/clock.cpp
index ea3b686399e..c1e291300db 100644
--- a/src/devices/machine/clock.cpp
+++ b/src/devices/machine/clock.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "clock.h"
-const device_type CLOCK = &device_creator<clock_device>;
+const device_type CLOCK = device_creator<clock_device>;
clock_device::clock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, CLOCK, "Clock", tag, owner, clock, "clock", __FILE__),
diff --git a/src/devices/machine/com8116.cpp b/src/devices/machine/com8116.cpp
index 389ef52ac63..db1fa072f14 100644
--- a/src/devices/machine/com8116.cpp
+++ b/src/devices/machine/com8116.cpp
@@ -24,7 +24,7 @@
//**************************************************************************
// device type definition
-const device_type COM8116 = &device_creator<com8116_device>;
+const device_type COM8116 = device_creator<com8116_device>;
// Parts with T after the number do not have an internal oscillator and require an external clock source
// The SMC/COM 5xxx parts are all dual 5v/12v parts, while the 8xxx parts are 5v only
diff --git a/src/devices/machine/corvushd.cpp b/src/devices/machine/corvushd.cpp
index 95cd4a17cb9..fa64568ce37 100644
--- a/src/devices/machine/corvushd.cpp
+++ b/src/devices/machine/corvushd.cpp
@@ -70,7 +70,7 @@
#include <ctype.h>
-const device_type CORVUS_HDC = &device_creator<corvus_hdc_t>;
+const device_type CORVUS_HDC = device_creator<corvus_hdc_t>;
corvus_hdc_t::corvus_hdc_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CORVUS_HDC, "Corvus Flat Cable HDC", tag, owner, clock, "corvus_hdc", __FILE__),
diff --git a/src/devices/machine/cr511b.cpp b/src/devices/machine/cr511b.cpp
index 2e268662f85..11b084a3b7b 100644
--- a/src/devices/machine/cr511b.cpp
+++ b/src/devices/machine/cr511b.cpp
@@ -17,7 +17,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CR511B = &device_creator<cr511b_device>;
+const device_type CR511B = device_creator<cr511b_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/machine/cr589.cpp b/src/devices/machine/cr589.cpp
index faf430c8ec7..99f90c257ce 100644
--- a/src/devices/machine/cr589.cpp
+++ b/src/devices/machine/cr589.cpp
@@ -138,7 +138,7 @@ void matsushita_cr589_device::WriteData( uint8_t *data, int dataLength )
}
// device type definition
-const device_type CR589 = &device_creator<matsushita_cr589_device>;
+const device_type CR589 = device_creator<matsushita_cr589_device>;
matsushita_cr589_device::matsushita_cr589_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
atapi_cdrom_device(mconfig, CR589, "Matsushita CR589 CD-ROM Drive", tag, owner, clock, "cr589", __FILE__),
diff --git a/src/devices/machine/cs4031.cpp b/src/devices/machine/cs4031.cpp
index e6aaddeac85..669f301e9e4 100644
--- a/src/devices/machine/cs4031.cpp
+++ b/src/devices/machine/cs4031.cpp
@@ -44,7 +44,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CS4031 = &device_creator<cs4031_device>;
+const device_type CS4031 = device_creator<cs4031_device>;
const char* cs4031_device::m_register_names[] =
{
diff --git a/src/devices/machine/cs8221.cpp b/src/devices/machine/cs8221.cpp
index 2d3d0e2f218..bc94f1e19af 100644
--- a/src/devices/machine/cs8221.cpp
+++ b/src/devices/machine/cs8221.cpp
@@ -27,7 +27,7 @@
#define LOG_REGISTER 1
#define LOG_MEMORY 1
-const device_type CS8221 = &device_creator<cs8221_device>;
+const device_type CS8221 = device_creator<cs8221_device>;
static const char *const register_names[] =
diff --git a/src/devices/machine/diablo_hd.cpp b/src/devices/machine/diablo_hd.cpp
index 4325a8ec941..c49ce231005 100644
--- a/src/devices/machine/diablo_hd.cpp
+++ b/src/devices/machine/diablo_hd.cpp
@@ -1454,4 +1454,4 @@ machine_config_constructor diablo_hd_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( diablo_drive );
}
-const device_type DIABLO_HD = &device_creator<diablo_hd_device>;
+const device_type DIABLO_HD = device_creator<diablo_hd_device>;
diff --git a/src/devices/machine/dm9334.cpp b/src/devices/machine/dm9334.cpp
index c890e7a09cf..5a673f7cf24 100644
--- a/src/devices/machine/dm9334.cpp
+++ b/src/devices/machine/dm9334.cpp
@@ -9,7 +9,7 @@
#include "emu.h"
#include "dm9334.h"
-const device_type DM9334 = &device_creator<dm9334_device>;
+const device_type DM9334 = device_creator<dm9334_device>;
dm9334_device::dm9334_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, DM9334, "National Semiconductor 9334/DM9334 8-Bit Addressable Latch", tag, owner, clock, "dm9334", __FILE__)
diff --git a/src/devices/machine/dmac.cpp b/src/devices/machine/dmac.cpp
index e493eba7536..cd0911f9995 100644
--- a/src/devices/machine/dmac.cpp
+++ b/src/devices/machine/dmac.cpp
@@ -27,7 +27,7 @@ BOARDS:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type DMAC = &device_creator<dmac_device>;
+const device_type DMAC = device_creator<dmac_device>;
//**************************************************************************
diff --git a/src/devices/machine/dp8390.cpp b/src/devices/machine/dp8390.cpp
index 64f6fcbb407..6057260da34 100644
--- a/src/devices/machine/dp8390.cpp
+++ b/src/devices/machine/dp8390.cpp
@@ -6,8 +6,8 @@
#define DP8390_BYTE_ORDER(w) ((m_regs.dcr & 3) == 3 ? ((data << 8) | (data >> 8)) : data)
#define LOOPBACK (!(m_regs.dcr & 8) && (m_regs.tcr & 6))
-const device_type DP8390D = &device_creator<dp8390d_device>;
-const device_type RTL8019A = &device_creator<rtl8019a_device>;
+const device_type DP8390D = device_creator<dp8390d_device>;
+const device_type RTL8019A = device_creator<rtl8019a_device>;
dp8390d_device::dp8390d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: dp8390_device(mconfig, DP8390D, "DP8390D", tag, owner, clock, 10.0f, "dp8390d", __FILE__) {
diff --git a/src/devices/machine/ds1204.cpp b/src/devices/machine/ds1204.cpp
index 62df5bce313..8e326ab451f 100644
--- a/src/devices/machine/ds1204.cpp
+++ b/src/devices/machine/ds1204.cpp
@@ -27,7 +27,7 @@ inline void ATTR_PRINTF( 3, 4 ) ds1204_device::verboselog( int n_level, const ch
}
// device type definition
-const device_type DS1204 = &device_creator<ds1204_device>;
+const device_type DS1204 = device_creator<ds1204_device>;
ds1204_device::ds1204_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock )
: device_t( mconfig, DS1204, "DS1204", tag, owner, clock, "ds1204", __FILE__ ),
diff --git a/src/devices/machine/ds128x.cpp b/src/devices/machine/ds128x.cpp
index a7068f59f31..88b40ac3d9c 100644
--- a/src/devices/machine/ds128x.cpp
+++ b/src/devices/machine/ds128x.cpp
@@ -5,7 +5,7 @@
/// TODO: Only DV2/DV1/DV0 == 0/1/0 is supported as the chip only has a 15 stage divider and not 22.
-const device_type DS12885 = &device_creator<ds12885_device>;
+const device_type DS12885 = device_creator<ds12885_device>;
//-------------------------------------------------
// ds12885_device - constructor
diff --git a/src/devices/machine/ds1302.cpp b/src/devices/machine/ds1302.cpp
index a89bfed7c24..8050523f65a 100644
--- a/src/devices/machine/ds1302.cpp
+++ b/src/devices/machine/ds1302.cpp
@@ -66,7 +66,7 @@ enum
//**************************************************************************
// device type definition
-const device_type DS1302 = &device_creator<ds1302_device>;
+const device_type DS1302 = device_creator<ds1302_device>;
//-------------------------------------------------
diff --git a/src/devices/machine/ds1315.cpp b/src/devices/machine/ds1315.cpp
index dbdc56b231e..6056f4e075e 100644
--- a/src/devices/machine/ds1315.cpp
+++ b/src/devices/machine/ds1315.cpp
@@ -26,11 +26,11 @@
#include "coreutil.h"
-const device_type DS1315 = &device_creator<ds1315_device>;
+const device_type DS1315 = device_creator<ds1315_device>;
ds1315_device::ds1315_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, DS1315, "Dallas Semiconductor DS1315", tag, owner, clock, "ds1315", __FILE__), m_mode(), m_count(0)
- {
+ : device_t(mconfig, DS1315, "Dallas Semiconductor DS1315", tag, owner, clock, "ds1315", __FILE__), m_mode(), m_count(0)
+{
}
//-------------------------------------------------
diff --git a/src/devices/machine/ds1386.cpp b/src/devices/machine/ds1386.cpp
index 5846f44ab32..74c5d14fdf5 100644
--- a/src/devices/machine/ds1386.cpp
+++ b/src/devices/machine/ds1386.cpp
@@ -27,8 +27,8 @@
#define HOURS_12_24 (0x40)
#define HOURS_AM_PM (0x20)
-const device_type DS1386_8K = &device_creator<ds1386_8k_device>;
-const device_type DS1386_32K = &device_creator<ds1386_32k_device>;
+const device_type DS1386_8K = device_creator<ds1386_8k_device>;
+const device_type DS1386_32K = device_creator<ds1386_32k_device>;
ds1386_device::ds1386_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, size_t size)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
diff --git a/src/devices/machine/ds2401.cpp b/src/devices/machine/ds2401.cpp
index 663b89ce493..c0a6b4bce00 100644
--- a/src/devices/machine/ds2401.cpp
+++ b/src/devices/machine/ds2401.cpp
@@ -27,7 +27,7 @@ inline void ds2401_device::verboselog(int n_level, const char *s_fmt, ...)
}
// device type definition
-const device_type DS2401 = &device_creator<ds2401_device>;
+const device_type DS2401 = device_creator<ds2401_device>;
ds2401_device::ds2401_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, DS2401, "DS2401", tag, owner, clock, "ds2401", __FILE__), m_state(0), m_bit(0), m_shift(0), m_byte(0), m_rx(false), m_tx(false), m_timer_main(nullptr), m_timer_reset(nullptr)
diff --git a/src/devices/machine/ds2404.cpp b/src/devices/machine/ds2404.cpp
index 08d4667da97..7d1dbfcf103 100644
--- a/src/devices/machine/ds2404.cpp
+++ b/src/devices/machine/ds2404.cpp
@@ -18,7 +18,7 @@
//**************************************************************************
// device type definition
-const device_type DS2404 = &device_creator<ds2404_device>;
+const device_type DS2404 = device_creator<ds2404_device>;
//-------------------------------------------------
// ds2404_device - constructor
diff --git a/src/devices/machine/ds75160a.cpp b/src/devices/machine/ds75160a.cpp
index c7d1dfa544d..1accfc2ace2 100644
--- a/src/devices/machine/ds75160a.cpp
+++ b/src/devices/machine/ds75160a.cpp
@@ -15,7 +15,7 @@
// DEVICE TYPE DEFINITIONS
//**************************************************************************
-const device_type DS75160A = &device_creator<ds75160a_device>;
+const device_type DS75160A = device_creator<ds75160a_device>;
diff --git a/src/devices/machine/ds75161a.cpp b/src/devices/machine/ds75161a.cpp
index 2e3fac35883..5c35c4717e2 100644
--- a/src/devices/machine/ds75161a.cpp
+++ b/src/devices/machine/ds75161a.cpp
@@ -15,7 +15,7 @@
// DEVICE TYPE DEFINITIONS
//**************************************************************************
-const device_type DS75161A = &device_creator<ds75161a_device>;
+const device_type DS75161A = device_creator<ds75161a_device>;
diff --git a/src/devices/machine/e0516.cpp b/src/devices/machine/e0516.cpp
index 2643583caf8..d4b83533e5f 100644
--- a/src/devices/machine/e0516.cpp
+++ b/src/devices/machine/e0516.cpp
@@ -32,7 +32,7 @@ enum
//**************************************************************************
// device type definition
-const device_type E0516 = &device_creator<e0516_device>;
+const device_type E0516 = device_creator<e0516_device>;
//-------------------------------------------------
// e0516_device - constructor
diff --git a/src/devices/machine/e05a03.cpp b/src/devices/machine/e05a03.cpp
index 4f031f3da28..b7c5d66bee2 100644
--- a/src/devices/machine/e05a03.cpp
+++ b/src/devices/machine/e05a03.cpp
@@ -14,7 +14,7 @@
DEVICE INTERFACE
*****************************************************************************/
-const device_type E05A03 = &device_creator<e05a03_device>;
+const device_type E05A03 = device_creator<e05a03_device>;
e05a03_device::e05a03_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, E05A03, "E05A03", tag, owner, clock, "e05a03", __FILE__),
diff --git a/src/devices/machine/e05a30.cpp b/src/devices/machine/e05a30.cpp
index 6f34b42d24c..5ff64619ffa 100644
--- a/src/devices/machine/e05a30.cpp
+++ b/src/devices/machine/e05a30.cpp
@@ -20,7 +20,7 @@
DEVICE INTERFACE
*****************************************************************************/
-const device_type E05A30 = &device_creator<e05a30_device>;
+const device_type E05A30 = device_creator<e05a30_device>;
e05a30_device::e05a30_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, E05A30, "E05A30", tag, owner, clock, "e05a30", __FILE__),
diff --git a/src/devices/machine/eeprompar.cpp b/src/devices/machine/eeprompar.cpp
index cf92b2db69e..46b721d2983 100644
--- a/src/devices/machine/eeprompar.cpp
+++ b/src/devices/machine/eeprompar.cpp
@@ -121,7 +121,7 @@ eeprom_parallel_##_lowercase##_device::eeprom_parallel_##_lowercase##_device(con
{ \
static_set_size(*this, _cells, _bits); \
} \
-const device_type EEPROM_PARALLEL_##_uppercase = &device_creator<eeprom_parallel_##_lowercase##_device>;
+const device_type EEPROM_PARALLEL_##_uppercase = device_creator<eeprom_parallel_##_lowercase##_device>;
// standard 28XX class of 8-bit EEPROMs
DEFINE_PARALLEL_EEPROM_DEVICE(28xx, 2804, 2804, 8, 512)
DEFINE_PARALLEL_EEPROM_DEVICE(28xx, 2816, 2816, 8, 2048)
diff --git a/src/devices/machine/eepromser.cpp b/src/devices/machine/eepromser.cpp
index 90e03109f76..fb59b51c269 100644
--- a/src/devices/machine/eepromser.cpp
+++ b/src/devices/machine/eepromser.cpp
@@ -1133,7 +1133,7 @@ eeprom_serial_##_lowercase##_##_bits##bit_device::eeprom_serial_##_lowercase##_#
static_set_size(*this, _cells, _bits); \
static_set_address_bits(*this, _addrbits); \
} \
-const device_type EEPROM_SERIAL_##_uppercase##_##_bits##BIT = &device_creator<eeprom_serial_##_lowercase##_##_bits##bit_device>;
+const device_type EEPROM_SERIAL_##_uppercase##_##_bits##BIT = device_creator<eeprom_serial_##_lowercase##_##_bits##bit_device>;
// standard 93CX6 class of 16-bit EEPROMs
DEFINE_SERIAL_EEPROM_DEVICE(93cxx, 93c06, 93C06, 16, 16, 6)
DEFINE_SERIAL_EEPROM_DEVICE(93cxx, 93c46, 93C46, 16, 64, 6)
diff --git a/src/devices/machine/er2055.cpp b/src/devices/machine/er2055.cpp
index 5953419156e..aee6839a658 100644
--- a/src/devices/machine/er2055.cpp
+++ b/src/devices/machine/er2055.cpp
@@ -17,7 +17,7 @@
//**************************************************************************
// device type definition
-const device_type ER2055 = &device_creator<er2055_device>;
+const device_type ER2055 = device_creator<er2055_device>;
static ADDRESS_MAP_START( er2055_map, AS_PROGRAM, 8, er2055_device )
AM_RANGE(0x0000, 0x003f) AM_RAM
diff --git a/src/devices/machine/f3853.cpp b/src/devices/machine/f3853.cpp
index dd9e80434b1..512a783c2f2 100644
--- a/src/devices/machine/f3853.cpp
+++ b/src/devices/machine/f3853.cpp
@@ -43,7 +43,7 @@
//**************************************************************************
// device type definition
-const device_type F3853 = &device_creator<f3853_device>;
+const device_type F3853 = device_creator<f3853_device>;
//-------------------------------------------------
// f3853_device - constructor
diff --git a/src/devices/machine/fdc37c665gt.cpp b/src/devices/machine/fdc37c665gt.cpp
index 8883bbb0b40..d4151a98b9d 100644
--- a/src/devices/machine/fdc37c665gt.cpp
+++ b/src/devices/machine/fdc37c665gt.cpp
@@ -59,4 +59,4 @@ machine_config_constructor fdc37c665gt_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME(fdc37c665gt);
}
-const device_type FDC37C665GT = &device_creator<fdc37c665gt_device>;
+const device_type FDC37C665GT = device_creator<fdc37c665gt_device>;
diff --git a/src/devices/machine/fga002.cpp b/src/devices/machine/fga002.cpp
index 72e989153cc..3fcef596746 100644
--- a/src/devices/machine/fga002.cpp
+++ b/src/devices/machine/fga002.cpp
@@ -64,7 +64,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
// device type definition
-const device_type FGA002 = &device_creator<fga002_device>;
+const device_type FGA002 = device_creator<fga002_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/machine/gayle.cpp b/src/devices/machine/gayle.cpp
index 5e281c62511..58cdc33ede3 100644
--- a/src/devices/machine/gayle.cpp
+++ b/src/devices/machine/gayle.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type GAYLE = &device_creator<gayle_device>;
+const device_type GAYLE = device_creator<gayle_device>;
//**************************************************************************
diff --git a/src/devices/machine/gen_latch.cpp b/src/devices/machine/gen_latch.cpp
index 76efe7c5c72..1cf2841a6fa 100644
--- a/src/devices/machine/gen_latch.cpp
+++ b/src/devices/machine/gen_latch.cpp
@@ -14,8 +14,8 @@
// DEVICE TYPE DEFINITIONS
//**************************************************************************
-const device_type GENERIC_LATCH_8 = &device_creator<generic_latch_8_device>;
-const device_type GENERIC_LATCH_16 = &device_creator<generic_latch_16_device>;
+const device_type GENERIC_LATCH_8 = device_creator<generic_latch_8_device>;
+const device_type GENERIC_LATCH_16 = device_creator<generic_latch_16_device>;
//**************************************************************************
diff --git a/src/devices/machine/genpc.cpp b/src/devices/machine/genpc.cpp
index af575f674ab..ec4e631ca42 100644
--- a/src/devices/machine/genpc.cpp
+++ b/src/devices/machine/genpc.cpp
@@ -9,12 +9,15 @@
#include "emu.h"
#include "machine/genpc.h"
+
+#include "imagedev/cassette.h"
#include "machine/i8255.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
-#include "sound/speaker.h"
#include "machine/ram.h"
-#include "imagedev/cassette.h"
+#include "sound/spkrdev.h"
+#include "speaker.h"
+
#define VERBOSE_PIO 0 /* PIO (keyboard controller) */
@@ -386,7 +389,7 @@ WRITE8_MEMBER( ibm5160_mb_device::nmi_enable_w )
// GLOBAL VARIABLES
//**************************************************************************
-const device_type IBM5160_MOTHERBOARD = &device_creator<ibm5160_mb_device>;
+const device_type IBM5160_MOTHERBOARD = device_creator<ibm5160_mb_device>;
//**************************************************************************
// DEVICE CONFIGURATION
@@ -573,7 +576,7 @@ void ibm5160_mb_device::device_reset()
// GLOBAL VARIABLES
//**************************************************************************
-const device_type IBM5150_MOTHERBOARD = &device_creator<ibm5150_mb_device>;
+const device_type IBM5150_MOTHERBOARD = device_creator<ibm5150_mb_device>;
//**************************************************************************
// DEVICE CONFIGURATION
@@ -755,7 +758,7 @@ WRITE8_MEMBER( ibm5150_mb_device::pc_ppi_portb_w )
// GLOBAL VARIABLES
//**************************************************************************
-const device_type EC1841_MOTHERBOARD = &device_creator<ec1841_mb_device>;
+const device_type EC1841_MOTHERBOARD = device_creator<ec1841_mb_device>;
static MACHINE_CONFIG_FRAGMENT( ec1841_mb_config )
MCFG_FRAGMENT_ADD(ibm5160_mb_config)
@@ -918,4 +921,4 @@ DEVICE_ADDRESS_MAP_START( map, 8, pc_noppi_mb_device )
AM_RANGE(0x00a0, 0x00a1) AM_WRITE(nmi_enable_w)
ADDRESS_MAP_END
-const device_type PCNOPPI_MOTHERBOARD = &device_creator<pc_noppi_mb_device>;
+const device_type PCNOPPI_MOTHERBOARD = device_creator<pc_noppi_mb_device>;
diff --git a/src/devices/machine/genpc.h b/src/devices/machine/genpc.h
index 9c982c3fccd..abd6c78974d 100644
--- a/src/devices/machine/genpc.h
+++ b/src/devices/machine/genpc.h
@@ -6,20 +6,22 @@
*
****************************************************************************/
-#ifndef GENPC_H_
-#define GENPC_H_
+#ifndef MAME_DEVICES_MACHINE_GENPC_H
+#define MAME_DEVICES_MACHINE_GENPC_H
-#include "machine/ins8250.h"
-#include "machine/i8255.h"
+#include "imagedev/cassette.h"
#include "machine/am9517a.h"
-#include "bus/isa/isa.h"
-#include "bus/isa/isa_cards.h"
-#include "bus/pc_kbd/pc_kbdc.h"
+#include "machine/i8255.h"
+#include "machine/ins8250.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
-#include "sound/speaker.h"
-#include "imagedev/cassette.h"
#include "machine/ram.h"
+#include "sound/spkrdev.h"
+
+#include "bus/isa/isa.h"
+#include "bus/isa/isa_cards.h"
+#include "bus/pc_kbd/pc_kbdc.h"
+
#define MCFG_IBM5160_MOTHERBOARD_ADD(_tag, _cputag) \
MCFG_DEVICE_ADD(_tag, IBM5160_MOTHERBOARD, 0) \
@@ -192,4 +194,4 @@ public:
extern const device_type PCNOPPI_MOTHERBOARD;
-#endif /* GENPC_H_ */
+#endif // MAME_DEVICES_MACHINE_GENPC_H
diff --git a/src/devices/machine/gt64xxx.cpp b/src/devices/machine/gt64xxx.cpp
index f433d68bdb1..71f6504817c 100644
--- a/src/devices/machine/gt64xxx.cpp
+++ b/src/devices/machine/gt64xxx.cpp
@@ -13,7 +13,7 @@
#define LOG_DMA (0)
#define LOG_PCI (0)
-const device_type GT64XXX = &device_creator<gt64xxx_device>;
+const device_type GT64XXX = device_creator<gt64xxx_device>;
DEVICE_ADDRESS_MAP_START(config_map, 32, gt64xxx_device)
AM_INHERIT_FROM(pci_device::config_map)
diff --git a/src/devices/machine/hd63450.cpp b/src/devices/machine/hd63450.cpp
index a0aa3e3b503..2185103a484 100644
--- a/src/devices/machine/hd63450.cpp
+++ b/src/devices/machine/hd63450.cpp
@@ -9,7 +9,7 @@
#include "emu.h"
#include "hd63450.h"
-const device_type HD63450 = &device_creator<hd63450_device>;
+const device_type HD63450 = device_creator<hd63450_device>;
hd63450_device::hd63450_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, HD63450, "Hitachi HD63450", tag, owner, clock, "hd63450", __FILE__),
diff --git a/src/devices/machine/hd64610.cpp b/src/devices/machine/hd64610.cpp
index 80a08dd50e2..885f0ae8b3c 100644
--- a/src/devices/machine/hd64610.cpp
+++ b/src/devices/machine/hd64610.cpp
@@ -20,7 +20,7 @@
// device type definition
-const device_type HD64610 = &device_creator<hd64610_device>;
+const device_type HD64610 = device_creator<hd64610_device>;
//**************************************************************************
diff --git a/src/devices/machine/hdc92x4.cpp b/src/devices/machine/hdc92x4.cpp
index e5473bb5ae5..cda79df1137 100644
--- a/src/devices/machine/hdc92x4.cpp
+++ b/src/devices/machine/hdc92x4.cpp
@@ -4823,5 +4823,5 @@ void hdc92x4_device::device_reset()
m_out_dmarq(CLEAR_LINE);
}
-const device_type HDC9224 = &device_creator<hdc9224_device>;
-const device_type HDC9234 = &device_creator<hdc9234_device>;
+const device_type HDC9224 = device_creator<hdc9224_device>;
+const device_type HDC9234 = device_creator<hdc9234_device>;
diff --git a/src/devices/machine/hp_taco.cpp b/src/devices/machine/hp_taco.cpp
index 0f427765875..4a43b71686d 100644
--- a/src/devices/machine/hp_taco.cpp
+++ b/src/devices/machine/hp_taco.cpp
@@ -277,7 +277,7 @@ static const hp_taco_device::tape_pos_t tape_holes[] = {
};
// Device type definition
-const device_type HP_TACO = &device_creator<hp_taco_device>;
+const device_type HP_TACO = device_creator<hp_taco_device>;
// Constructors
hp_taco_device::hp_taco_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname)
diff --git a/src/devices/machine/i2cmem.cpp b/src/devices/machine/i2cmem.cpp
index 02aa54d2771..e04fbd5f845 100644
--- a/src/devices/machine/i2cmem.cpp
+++ b/src/devices/machine/i2cmem.cpp
@@ -58,7 +58,7 @@ static inline void ATTR_PRINTF( 3, 4 ) verboselog( device_t *device, int n_level
//**************************************************************************
// device type definition
-const device_type I2CMEM = &device_creator<i2cmem_device>;
+const device_type I2CMEM = device_creator<i2cmem_device>;
//**************************************************************************
diff --git a/src/devices/machine/i6300esb.cpp b/src/devices/machine/i6300esb.cpp
index 056725c69de..6879a02aeb3 100644
--- a/src/devices/machine/i6300esb.cpp
+++ b/src/devices/machine/i6300esb.cpp
@@ -3,8 +3,8 @@
#include "emu.h"
#include "i6300esb.h"
-const device_type I6300ESB_WATCHDOG = &device_creator<i6300esb_watchdog_device>;
-const device_type I6300ESB_LPC = &device_creator<i6300esb_lpc_device>;
+const device_type I6300ESB_WATCHDOG = device_creator<i6300esb_watchdog_device>;
+const device_type I6300ESB_LPC = device_creator<i6300esb_lpc_device>;
DEVICE_ADDRESS_MAP_START(map, 32, i6300esb_watchdog_device)
ADDRESS_MAP_END
diff --git a/src/devices/machine/i80130.cpp b/src/devices/machine/i80130.cpp
index 38990cbe508..fb11dc8480d 100644
--- a/src/devices/machine/i80130.cpp
+++ b/src/devices/machine/i80130.cpp
@@ -16,7 +16,7 @@
//**************************************************************************
// device type definition
-const device_type I80130 = &device_creator<i80130_device>;
+const device_type I80130 = device_creator<i80130_device>;
DEVICE_ADDRESS_MAP_START( rom_map, 16, i80130_device )
diff --git a/src/devices/machine/i8155.cpp b/src/devices/machine/i8155.cpp
index aca33145518..4bdcbf81963 100644
--- a/src/devices/machine/i8155.cpp
+++ b/src/devices/machine/i8155.cpp
@@ -19,8 +19,8 @@
// device type definitions
-const device_type I8155 = &device_creator<i8155_device>;
-const device_type I8156 = &device_creator<i8155_device>;
+const device_type I8155 = device_creator<i8155_device>;
+const device_type I8156 = device_creator<i8155_device>;
//**************************************************************************
diff --git a/src/devices/machine/i8212.cpp b/src/devices/machine/i8212.cpp
index a9b12e5937c..7d59c5c09ad 100644
--- a/src/devices/machine/i8212.cpp
+++ b/src/devices/machine/i8212.cpp
@@ -24,7 +24,7 @@
//**************************************************************************
// device type definition
-const device_type I8212 = &device_creator<i8212_device>;
+const device_type I8212 = device_creator<i8212_device>;
//-------------------------------------------------
// i8212_device - constructor
diff --git a/src/devices/machine/i8214.cpp b/src/devices/machine/i8214.cpp
index 4efeb83bf2a..a1f0977baca 100644
--- a/src/devices/machine/i8214.cpp
+++ b/src/devices/machine/i8214.cpp
@@ -12,7 +12,7 @@
// device type definition
-const device_type I8214 = &device_creator<i8214_device>;
+const device_type I8214 = device_creator<i8214_device>;
//**************************************************************************
diff --git a/src/devices/machine/i82371sb.cpp b/src/devices/machine/i82371sb.cpp
index 9ae8c1fdb70..d9dbf235c71 100644
--- a/src/devices/machine/i82371sb.cpp
+++ b/src/devices/machine/i82371sb.cpp
@@ -4,11 +4,15 @@
#include "emu.h"
#include "i82371sb.h"
#include "cpu/i386/i386.h"
+
#include "bus/pc_kbd/keyboards.h"
// VGA-HACK
#include "video/pc_vga.h"
// end-VGA-HACK
-const device_type I82371SB_ISA = &device_creator<i82371sb_isa_device>;
+#include "speaker.h"
+
+
+const device_type I82371SB_ISA = device_creator<i82371sb_isa_device>;
DEVICE_ADDRESS_MAP_START(config_map, 32, i82371sb_isa_device)
AM_RANGE(0x4c, 0x4f) AM_READWRITE8 (iort_r, iort_w, 0x000000ff)
diff --git a/src/devices/machine/i82371sb.h b/src/devices/machine/i82371sb.h
index b35fe2f988a..a64343e232d 100644
--- a/src/devices/machine/i82371sb.h
+++ b/src/devices/machine/i82371sb.h
@@ -15,7 +15,7 @@
#include "machine/ataintf.h"
#include "machine/at_keybc.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
#include "machine/ram.h"
#include "machine/nvram.h"
diff --git a/src/devices/machine/i8243.cpp b/src/devices/machine/i8243.cpp
index 241888bb31a..cc3e23211e8 100644
--- a/src/devices/machine/i8243.cpp
+++ b/src/devices/machine/i8243.cpp
@@ -16,7 +16,7 @@
//**************************************************************************
// device type definition
-const device_type I8243 = &device_creator<i8243_device>;
+const device_type I8243 = device_creator<i8243_device>;
//-------------------------------------------------
// i8243_device - constructor
diff --git a/src/devices/machine/i82439hx.cpp b/src/devices/machine/i82439hx.cpp
index 9ed288c3346..b1dd2ccd5d7 100644
--- a/src/devices/machine/i82439hx.cpp
+++ b/src/devices/machine/i82439hx.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "i82439hx.h"
-const device_type I82439HX = &device_creator<i82439hx_host_device>;
+const device_type I82439HX = device_creator<i82439hx_host_device>;
DEVICE_ADDRESS_MAP_START(config_map, 32, i82439hx_host_device)
AM_RANGE(0x50, 0x53) AM_READWRITE8(pcon_r, pcon_w, 0x000000ff)
diff --git a/src/devices/machine/i82439tx.cpp b/src/devices/machine/i82439tx.cpp
index 565dfe0c546..35d82cd8216 100644
--- a/src/devices/machine/i82439tx.cpp
+++ b/src/devices/machine/i82439tx.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "i82439tx.h"
-const device_type I82439TX_NEW = &device_creator<i82439tx_host_device>;
+const device_type I82439TX_NEW = device_creator<i82439tx_host_device>;
DEVICE_ADDRESS_MAP_START(config_map, 32, i82439tx_host_device)
AM_RANGE(0x50, 0x53) AM_READWRITE8(pcon_r, pcon_w, 0x000000ff)
diff --git a/src/devices/machine/i8251.cpp b/src/devices/machine/i8251.cpp
index 2c33c6decb3..048e4bc9947 100644
--- a/src/devices/machine/i8251.cpp
+++ b/src/devices/machine/i8251.cpp
@@ -30,8 +30,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type I8251 = &device_creator<i8251_device>;
-const device_type V53_SCU = &device_creator<v53_scu_device>;
+const device_type I8251 = device_creator<i8251_device>;
+const device_type V53_SCU = device_creator<v53_scu_device>;
template class device_finder<i8251_device, false>;
template class device_finder<i8251_device, true>;
diff --git a/src/devices/machine/i82541.cpp b/src/devices/machine/i82541.cpp
index b319d7cce4f..6ddd492aae9 100644
--- a/src/devices/machine/i82541.cpp
+++ b/src/devices/machine/i82541.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "i82541.h"
-const device_type I82541 = &device_creator<i82541_device>;
+const device_type I82541 = device_creator<i82541_device>;
DEVICE_ADDRESS_MAP_START(registers_map, 32, i82541_device)
ADDRESS_MAP_END
diff --git a/src/devices/machine/i8255.cpp b/src/devices/machine/i8255.cpp
index 75023183392..522c27a18d4 100644
--- a/src/devices/machine/i8255.cpp
+++ b/src/devices/machine/i8255.cpp
@@ -63,8 +63,8 @@ enum
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type I8255 = &device_creator<i8255_device>;
-const device_type I8255A = &device_creator<i8255_device>;
+const device_type I8255 = device_creator<i8255_device>;
+const device_type I8255A = device_creator<i8255_device>;
//**************************************************************************
diff --git a/src/devices/machine/i8257.cpp b/src/devices/machine/i8257.cpp
index bc4be4bbb22..a36b670ddc1 100644
--- a/src/devices/machine/i8257.cpp
+++ b/src/devices/machine/i8257.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type I8257 = &device_creator<i8257_device>;
+const device_type I8257 = device_creator<i8257_device>;
diff --git a/src/devices/machine/i8271.cpp b/src/devices/machine/i8271.cpp
index f4f0c08a55c..8a2509050c0 100644
--- a/src/devices/machine/i8271.cpp
+++ b/src/devices/machine/i8271.cpp
@@ -4,7 +4,7 @@
#include "emu.h"
#include "i8271.h"
-const device_type I8271 = &device_creator<i8271_device>;
+const device_type I8271 = device_creator<i8271_device>;
i8271_device::i8271_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, I8271, "Intel 8271", tag, owner, clock, "i8271", __FILE__), ready_connected(false), mode(0), main_phase(0),
diff --git a/src/devices/machine/i8279.cpp b/src/devices/machine/i8279.cpp
index 59b78d73553..d279219c8d9 100644
--- a/src/devices/machine/i8279.cpp
+++ b/src/devices/machine/i8279.cpp
@@ -84,7 +84,7 @@ that uses this feature.
//**************************************************************************
// device type definition
-const device_type I8279 = &device_creator<i8279_device>;
+const device_type I8279 = device_creator<i8279_device>;
//-------------------------------------------------
// i8279_device - constructor
diff --git a/src/devices/machine/i82875p.cpp b/src/devices/machine/i82875p.cpp
index cc16a951610..21e7850ccf7 100644
--- a/src/devices/machine/i82875p.cpp
+++ b/src/devices/machine/i82875p.cpp
@@ -3,9 +3,9 @@
#include "emu.h"
#include "i82875p.h"
-const device_type I82875P_HOST = &device_creator<i82875p_host_device>;
-const device_type I82875P_AGP = &device_creator<i82875p_agp_device>;
-const device_type I82875P_OVERFLOW = &device_creator<i82875p_overflow_device>;
+const device_type I82875P_HOST = device_creator<i82875p_host_device>;
+const device_type I82875P_AGP = device_creator<i82875p_agp_device>;
+const device_type I82875P_OVERFLOW = device_creator<i82875p_overflow_device>;
DEVICE_ADDRESS_MAP_START(agp_translation_map, 32, i82875p_host_device)
ADDRESS_MAP_END
diff --git a/src/devices/machine/i8355.cpp b/src/devices/machine/i8355.cpp
index bb3731aab58..0d4850e1f59 100644
--- a/src/devices/machine/i8355.cpp
+++ b/src/devices/machine/i8355.cpp
@@ -39,7 +39,7 @@ enum
//**************************************************************************
// device type definition
-const device_type I8355 = &device_creator<i8355_device>;
+const device_type I8355 = device_creator<i8355_device>;
// default address map
static ADDRESS_MAP_START( i8355, AS_0, 8, i8355_device )
diff --git a/src/devices/machine/idectrl.cpp b/src/devices/machine/idectrl.cpp
index 8a4729e490d..7320f4b7b37 100644
--- a/src/devices/machine/idectrl.cpp
+++ b/src/devices/machine/idectrl.cpp
@@ -25,7 +25,7 @@
CONSTANTS
***************************************************************************/
-const device_type IDE_CONTROLLER = &device_creator<ide_controller_device>;
+const device_type IDE_CONTROLLER = device_creator<ide_controller_device>;
ide_controller_device::ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
ata_interface_device(mconfig, IDE_CONTROLLER, "IDE Controller", tag, owner, clock, "ide_controller", __FILE__)
@@ -88,7 +88,7 @@ WRITE16_MEMBER( ide_controller_device::write_cs1 )
}
-const device_type IDE_CONTROLLER_32 = &device_creator<ide_controller_32_device>;
+const device_type IDE_CONTROLLER_32 = device_creator<ide_controller_32_device>;
ide_controller_32_device::ide_controller_32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
ide_controller_device(mconfig, IDE_CONTROLLER, "IDE Controller (32 bit)", tag, owner, clock, "ide_controller32", __FILE__)
@@ -167,7 +167,7 @@ WRITE32_MEMBER(ide_controller_32_device::write_cs1)
#define IDE_BUSMASTER_STATUS_ERROR 0x02
#define IDE_BUSMASTER_STATUS_IRQ 0x04
-const device_type BUS_MASTER_IDE_CONTROLLER = &device_creator<bus_master_ide_controller_device>;
+const device_type BUS_MASTER_IDE_CONTROLLER = device_creator<bus_master_ide_controller_device>;
bus_master_ide_controller_device::bus_master_ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
ide_controller_32_device(mconfig, BUS_MASTER_IDE_CONTROLLER, "Bus Master IDE Controller", tag, owner, clock, "bus_master_ide_controller", __FILE__),
diff --git a/src/devices/machine/idehd.cpp b/src/devices/machine/idehd.cpp
index 4a5d59f9344..e5637dade4c 100644
--- a/src/devices/machine/idehd.cpp
+++ b/src/devices/machine/idehd.cpp
@@ -774,7 +774,7 @@ void ata_mass_storage_device::process_command()
//**************************************************************************
// device type definition
-const device_type IDE_HARDDISK = &device_creator<ide_hdd_device>;
+const device_type IDE_HARDDISK = device_creator<ide_hdd_device>;
//-------------------------------------------------
// ide_hdd_device - constructor
diff --git a/src/devices/machine/im6402.cpp b/src/devices/machine/im6402.cpp
index 6bb1729f647..df2c5b809b1 100644
--- a/src/devices/machine/im6402.cpp
+++ b/src/devices/machine/im6402.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type IM6402 = &device_creator<im6402_device>;
+const device_type IM6402 = device_creator<im6402_device>;
diff --git a/src/devices/machine/input_merger.cpp b/src/devices/machine/input_merger.cpp
index 27c9c0b2dd3..e77e24f794b 100644
--- a/src/devices/machine/input_merger.cpp
+++ b/src/devices/machine/input_merger.cpp
@@ -20,8 +20,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type INPUT_MERGER_ACTIVE_HIGH = &device_creator<input_merger_active_high_device>;
-const device_type INPUT_MERGER_ACTIVE_LOW = &device_creator<input_merger_active_low_device>;
+const device_type INPUT_MERGER_ACTIVE_HIGH = device_creator<input_merger_active_high_device>;
+const device_type INPUT_MERGER_ACTIVE_LOW = device_creator<input_merger_active_low_device>;
//**************************************************************************
diff --git a/src/devices/machine/ins8154.cpp b/src/devices/machine/ins8154.cpp
index 4183756f2b1..7d58a299a27 100644
--- a/src/devices/machine/ins8154.cpp
+++ b/src/devices/machine/ins8154.cpp
@@ -36,7 +36,7 @@ enum
//**************************************************************************
// device type definition
-const device_type INS8154 = &device_creator<ins8154_device>;
+const device_type INS8154 = device_creator<ins8154_device>;
//-------------------------------------------------
// ins8154_device - constructor
diff --git a/src/devices/machine/ins8250.cpp b/src/devices/machine/ins8250.cpp
index c0d55d6a12d..5ebebc9f0b9 100644
--- a/src/devices/machine/ins8250.cpp
+++ b/src/devices/machine/ins8250.cpp
@@ -87,10 +87,10 @@ History:
#include "emu.h"
#include "machine/ins8250.h"
-const device_type INS8250 = &device_creator<ins8250_device>;
-const device_type NS16450 = &device_creator<ns16450_device>;
-const device_type NS16550 = &device_creator<ns16550_device>;
-const device_type PC16552D = &device_creator<pc16552_device>;
+const device_type INS8250 = device_creator<ins8250_device>;
+const device_type NS16450 = device_creator<ns16450_device>;
+const device_type NS16550 = device_creator<ns16550_device>;
+const device_type PC16552D = device_creator<pc16552_device>;
ins8250_uart_device::ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, uint32_t clock, const char *shortname)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
diff --git a/src/devices/machine/intelfsh.cpp b/src/devices/machine/intelfsh.cpp
index fcc24af7904..844cb0db4f9 100644
--- a/src/devices/machine/intelfsh.cpp
+++ b/src/devices/machine/intelfsh.cpp
@@ -78,38 +78,38 @@ enum
//**************************************************************************
// device type definition
-const device_type INTEL_28F016S5 = &device_creator<intel_28f016s5_device>;
-const device_type SHARP_LH28F016S = &device_creator<sharp_lh28f016s_device>;
-const device_type SHARP_LH28F016S_16BIT = &device_creator<sharp_lh28f016s_16bit_device>;
-const device_type ATMEL_29C010 = &device_creator<atmel_29c010_device>;
-const device_type AMD_29F010 = &device_creator<amd_29f010_device>;
-const device_type AMD_29F040 = &device_creator<amd_29f040_device>;
-const device_type AMD_29F080 = &device_creator<amd_29f080_device>;
-const device_type AMD_29F400T = &device_creator<amd_29f400t_device>;
-const device_type AMD_29F800T = &device_creator<amd_29f800t_device>;
-const device_type AMD_29LV200T = &device_creator<amd_29lv200t_device>;
-const device_type FUJITSU_29F160T = &device_creator<fujitsu_29f160t_device>;
-const device_type FUJITSU_29F016A = &device_creator<fujitsu_29f016a_device>;
-const device_type FUJITSU_29DL16X = &device_creator<fujitsu_29dl16x_device>;
-const device_type INTEL_E28F400B = &device_creator<intel_e28f400b_device>;
-const device_type MACRONIX_29L001MC = &device_creator<macronix_29l001mc_device>;
-const device_type MACRONIX_29LV160TMC = &device_creator<macronix_29lv160tmc_device>;
-const device_type TMS_29F040 = &device_creator<tms_29f040_device>;
-
-const device_type PANASONIC_MN63F805MNP = &device_creator<panasonic_mn63f805mnp_device>;
-const device_type SANYO_LE26FV10N1TS = &device_creator<sanyo_le26fv10n1ts_device>;
-const device_type SST_28SF040 = &device_creator<sst_28sf040_device>;
-const device_type SST_39VF020 = &device_creator<sst_39vf020_device>;
-
-const device_type SHARP_LH28F400 = &device_creator<sharp_lh28f400_device>;
-const device_type INTEL_E28F008SA = &device_creator<intel_e28f008sa_device>;
-const device_type INTEL_TE28F160 = &device_creator<intel_te28f160_device>;
-const device_type INTEL_TE28F320 = &device_creator<intel_te28f320_device>;
-const device_type SHARP_UNK128MBIT = &device_creator<sharp_unk128mbit_device>;
-const device_type INTEL_28F320J3D = &device_creator<intel_28f320j3d_device>;
-const device_type INTEL_28F320J5 = &device_creator<intel_28f320j5_device>;
-
-const device_type SST_39VF400A = &device_creator<sst_39vf400a_device>;
+const device_type INTEL_28F016S5 = device_creator<intel_28f016s5_device>;
+const device_type SHARP_LH28F016S = device_creator<sharp_lh28f016s_device>;
+const device_type SHARP_LH28F016S_16BIT = device_creator<sharp_lh28f016s_16bit_device>;
+const device_type ATMEL_29C010 = device_creator<atmel_29c010_device>;
+const device_type AMD_29F010 = device_creator<amd_29f010_device>;
+const device_type AMD_29F040 = device_creator<amd_29f040_device>;
+const device_type AMD_29F080 = device_creator<amd_29f080_device>;
+const device_type AMD_29F400T = device_creator<amd_29f400t_device>;
+const device_type AMD_29F800T = device_creator<amd_29f800t_device>;
+const device_type AMD_29LV200T = device_creator<amd_29lv200t_device>;
+const device_type FUJITSU_29F160T = device_creator<fujitsu_29f160t_device>;
+const device_type FUJITSU_29F016A = device_creator<fujitsu_29f016a_device>;
+const device_type FUJITSU_29DL16X = device_creator<fujitsu_29dl16x_device>;
+const device_type INTEL_E28F400B = device_creator<intel_e28f400b_device>;
+const device_type MACRONIX_29L001MC = device_creator<macronix_29l001mc_device>;
+const device_type MACRONIX_29LV160TMC = device_creator<macronix_29lv160tmc_device>;
+const device_type TMS_29F040 = device_creator<tms_29f040_device>;
+
+const device_type PANASONIC_MN63F805MNP = device_creator<panasonic_mn63f805mnp_device>;
+const device_type SANYO_LE26FV10N1TS = device_creator<sanyo_le26fv10n1ts_device>;
+const device_type SST_28SF040 = device_creator<sst_28sf040_device>;
+const device_type SST_39VF020 = device_creator<sst_39vf020_device>;
+
+const device_type SHARP_LH28F400 = device_creator<sharp_lh28f400_device>;
+const device_type INTEL_E28F008SA = device_creator<intel_e28f008sa_device>;
+const device_type INTEL_TE28F160 = device_creator<intel_te28f160_device>;
+const device_type INTEL_TE28F320 = device_creator<intel_te28f320_device>;
+const device_type SHARP_UNK128MBIT = device_creator<sharp_unk128mbit_device>;
+const device_type INTEL_28F320J3D = device_creator<intel_28f320j3d_device>;
+const device_type INTEL_28F320J5 = device_creator<intel_28f320j5_device>;
+
+const device_type SST_39VF400A = device_creator<sst_39vf400a_device>;
//**************************************************************************
diff --git a/src/devices/machine/k033906.cpp b/src/devices/machine/k033906.cpp
index 1bc22070ccb..6e0fc522895 100644
--- a/src/devices/machine/k033906.cpp
+++ b/src/devices/machine/k033906.cpp
@@ -15,7 +15,7 @@
//**************************************************************************
// device type definition
-const device_type K033906 = &device_creator<k033906_device>;
+const device_type K033906 = device_creator<k033906_device>;
//-------------------------------------------------
// k033906_device - constructor
diff --git a/src/devices/machine/k053252.cpp b/src/devices/machine/k053252.cpp
index bcd41295f9b..b13035ffcf4 100644
--- a/src/devices/machine/k053252.cpp
+++ b/src/devices/machine/k053252.cpp
@@ -62,8 +62,10 @@ TODO:
#include "emu.h"
#include "k053252.h"
+#include "screen.h"
-const device_type K053252 = &device_creator<k053252_device>;
+
+const device_type K053252 = device_creator<k053252_device>;
k053252_device::k053252_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, K053252, "K053252 Timing/Interrupt", tag, owner, clock, "k053252", __FILE__)
diff --git a/src/devices/machine/k053252.h b/src/devices/machine/k053252.h
index 577654559c8..1927c99cb3b 100644
--- a/src/devices/machine/k053252.h
+++ b/src/devices/machine/k053252.h
@@ -2,10 +2,10 @@
// copyright-holders:Angelo Salese
/** Konami 053252 **/
/* CRT and interrupt control unit */
-#pragma once
+#ifndef MAME_DEVICES_MACHINE_K053252_H
+#define MAME_DEVICES_MACHINE_K053252_H
-#ifndef __K053252_H__
-#define __K053252_H__
+#pragma once
#define MCFG_K053252_INT1_EN_CB(_devcb) \
@@ -30,19 +30,17 @@
k053252_device::static_set_slave_screen(*device, "^" _tag);
-class k053252_device : public device_t,
- public device_video_interface
+class k053252_device : public device_t, public device_video_interface
{
public:
k053252_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~k053252_device() {}
- template<class _Object> static devcb_base &set_int1_en_callback(device_t &device, _Object object) { return downcast<k053252_device &>(device).m_int1_en_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_int2_en_callback(device_t &device, _Object object) { return downcast<k053252_device &>(device).m_int2_en_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_int1_ack_callback(device_t &device, _Object object) { return downcast<k053252_device &>(device).m_int1_ack_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_int2_ack_callback(device_t &device, _Object object) { return downcast<k053252_device &>(device).m_int2_ack_cb.set_callback(object); }
- //template<class _Object> static devcb_base &set_int_time_callback(device_t &device, _Object object) { return downcast<k053252_device &>(device).m_int_time_cb.set_callback(object); }
- static void set_offsets(device_t &device, int offsx, int offsy) { downcast<k053252_device &>(device).m_offsx = offsx; downcast<k053252_device &>(device).m_offsy = offsy;}
+ template <class Object> static devcb_base &set_int1_en_callback(device_t &device, Object &&obj) { return downcast<k053252_device &>(device).m_int1_en_cb.set_callback(std::forward<Object>(obj)); }
+ template <class Object> static devcb_base &set_int2_en_callback(device_t &device, Object &&obj) { return downcast<k053252_device &>(device).m_int2_en_cb.set_callback(std::forward<Object>(obj)); }
+ template <class Object> static devcb_base &set_int1_ack_callback(device_t &device, Object &&obj) { return downcast<k053252_device &>(device).m_int1_ack_cb.set_callback(std::forward<Object>(obj)); }
+ template <class Object> static devcb_base &set_int2_ack_callback(device_t &device, Object &&obj) { return downcast<k053252_device &>(device).m_int2_ack_cb.set_callback(std::forward<Object>(obj)); }
+ //template <class Object> static devcb_base &set_int_time_callback(device_t &device, Object &&obj) { return downcast<k053252_device &>(device).m_int_time_cb.set_callback(std::forward<Object>(obj)); }
+ static void set_offsets(device_t &device, int offsx, int offsy) { downcast<k053252_device &>(device).m_offsx = offsx; downcast<k053252_device &>(device).m_offsy = offsy; }
DECLARE_READ8_MEMBER( read ); // CCU registers
DECLARE_WRITE8_MEMBER( write );
@@ -82,4 +80,4 @@ protected:
extern const device_type K053252;
-#endif /* __K033906_H__ */
+#endif // MAME_DEVICES_MACHINE_K053252_H
diff --git a/src/devices/machine/k056230.cpp b/src/devices/machine/k056230.cpp
index d666813951b..11d47320f2d 100644
--- a/src/devices/machine/k056230.cpp
+++ b/src/devices/machine/k056230.cpp
@@ -15,7 +15,7 @@
//**************************************************************************
// device type definition
-const device_type K056230 = &device_creator<k056230_device>;
+const device_type K056230 = device_creator<k056230_device>;
//-------------------------------------------------
// k056230_device - constructor
diff --git a/src/devices/machine/kb3600.cpp b/src/devices/machine/kb3600.cpp
index dc371ce8ef3..a3ade5080de 100644
--- a/src/devices/machine/kb3600.cpp
+++ b/src/devices/machine/kb3600.cpp
@@ -33,7 +33,7 @@
//**************************************************************************
// devices
-const device_type AY3600 = &device_creator<ay3600_device>;
+const device_type AY3600 = device_creator<ay3600_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/machine/keyboard.cpp b/src/devices/machine/keyboard.cpp
index cd4f9b01bc0..2e9fa529424 100644
--- a/src/devices/machine/keyboard.cpp
+++ b/src/devices/machine/keyboard.cpp
@@ -234,7 +234,7 @@ INPUT_PORTS_END
DEVICE TYPE GLOBALS
***************************************************************************/
-device_type const GENERIC_KEYBOARD = &device_creator<generic_keyboard_device>;
+device_type const GENERIC_KEYBOARD = device_creator<generic_keyboard_device>;
diff --git a/src/devices/machine/kr2376.cpp b/src/devices/machine/kr2376.cpp
index 8133143fd22..fc68a848b0f 100644
--- a/src/devices/machine/kr2376.cpp
+++ b/src/devices/machine/kr2376.cpp
@@ -64,7 +64,7 @@ static const uint8_t KR2376_KEY_CODES[3][8][11] =
};
-const device_type KR2376 = &device_creator<kr2376_device>;
+const device_type KR2376 = device_creator<kr2376_device>;
kr2376_device::kr2376_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, KR2376, "SMC KR2376", tag, owner, clock, "kr2376", __FILE__),
diff --git a/src/devices/machine/laserdsc.h b/src/devices/machine/laserdsc.h
index b69dec3ff86..6065fda25ba 100644
--- a/src/devices/machine/laserdsc.h
+++ b/src/devices/machine/laserdsc.h
@@ -10,9 +10,10 @@
#pragma once
-#ifndef __LASERDSC_H__
-#define __LASERDSC_H__
+#ifndef MAME_DEVICES_MACHINE_LASERDSC_H
+#define MAME_DEVICES_MACHINE_LASERDSC_H
+#include "screen.h"
#include "vbiparse.h"
#include "avhuff.h"
@@ -412,4 +413,4 @@ inline int laserdisc_device::chapter_from_metadata(const vbi_metadata &metadata)
}
-#endif
+#endif // MAME_DEVICES_MACHINE_LASERDSC_H
diff --git a/src/devices/machine/latch.cpp b/src/devices/machine/latch.cpp
index b6e04c6ec97..6cf14e413ea 100644
--- a/src/devices/machine/latch.cpp
+++ b/src/devices/machine/latch.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "latch.h"
-const device_type OUTPUT_LATCH = &device_creator<output_latch_device>;
+const device_type OUTPUT_LATCH = device_creator<output_latch_device>;
output_latch_device::output_latch_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, OUTPUT_LATCH, "Output Latch", tag, owner, clock, "output_latch", __FILE__),
diff --git a/src/devices/machine/latch8.cpp b/src/devices/machine/latch8.cpp
index ff01e9113a2..f7e392db05d 100644
--- a/src/devices/machine/latch8.cpp
+++ b/src/devices/machine/latch8.cpp
@@ -143,7 +143,7 @@ WRITE8_MEMBER( latch8_device::bit5_w ) { bitx_w(5, offset, data); }
WRITE8_MEMBER( latch8_device::bit6_w ) { bitx_w(6, offset, data); }
WRITE8_MEMBER( latch8_device::bit7_w ) { bitx_w(7, offset, data); }
-const device_type LATCH8 = &device_creator<latch8_device>;
+const device_type LATCH8 = device_creator<latch8_device>;
latch8_device::latch8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, LATCH8, "8 bit latch", tag, owner, clock, "latch8", __FILE__),
diff --git a/src/devices/machine/lc89510.cpp b/src/devices/machine/lc89510.cpp
index daa1498085f..c1cbb62b2e6 100644
--- a/src/devices/machine/lc89510.cpp
+++ b/src/devices/machine/lc89510.cpp
@@ -9,7 +9,7 @@
#include "emu.h"
#include "lc89510.h"
-const device_type LC89510 = &device_creator<lc89510_device>;
+const device_type LC89510 = device_creator<lc89510_device>;
lc89510_device::lc89510_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, LC89510, "lc89510_device", tag, owner, clock, "lc89510", __FILE__)
diff --git a/src/devices/machine/ldp1000.cpp b/src/devices/machine/ldp1000.cpp
index 2c9e8535a34..42bd30443dd 100644
--- a/src/devices/machine/ldp1000.cpp
+++ b/src/devices/machine/ldp1000.cpp
@@ -27,7 +27,7 @@ ROM_END
//**************************************************************************
// device type definition
-const device_type SONY_LDP1000 = &device_creator<sony_ldp1000_device>;
+const device_type SONY_LDP1000 = device_creator<sony_ldp1000_device>;
//**************************************************************************
diff --git a/src/devices/machine/ldp1450.cpp b/src/devices/machine/ldp1450.cpp
index f30a154f013..2e07e47b061 100644
--- a/src/devices/machine/ldp1450.cpp
+++ b/src/devices/machine/ldp1450.cpp
@@ -34,7 +34,7 @@ ROM_END
//**************************************************************************
// device type definition
-const device_type SONY_LDP1450 = &device_creator<sony_ldp1450_device>;
+const device_type SONY_LDP1450 = device_creator<sony_ldp1450_device>;
//**************************************************************************
diff --git a/src/devices/machine/ldpr8210.cpp b/src/devices/machine/ldpr8210.cpp
index 834b38f056f..6412d1f587a 100644
--- a/src/devices/machine/ldpr8210.cpp
+++ b/src/devices/machine/ldpr8210.cpp
@@ -68,8 +68,8 @@
//**************************************************************************
// devices
-const device_type PIONEER_PR8210 = &device_creator<pioneer_pr8210_device>;
-const device_type SIMUTREK_SPECIAL = &device_creator<simutrek_special_device>;
+const device_type PIONEER_PR8210 = device_creator<pioneer_pr8210_device>;
+const device_type SIMUTREK_SPECIAL = device_creator<simutrek_special_device>;
// bitmaps for the characters
diff --git a/src/devices/machine/ldstub.cpp b/src/devices/machine/ldstub.cpp
index 7c9e0cb0033..219df8ec3d3 100644
--- a/src/devices/machine/ldstub.cpp
+++ b/src/devices/machine/ldstub.cpp
@@ -17,5 +17,5 @@
//**************************************************************************
// device type definition
-const device_type PIONEER_PR7820 = &device_creator<pioneer_pr7820_device>;
-const device_type PHILLIPS_22VP932 = &device_creator<phillips_22vp932_device>;
+const device_type PIONEER_PR7820 = device_creator<pioneer_pr7820_device>;
+const device_type PHILLIPS_22VP932 = device_creator<phillips_22vp932_device>;
diff --git a/src/devices/machine/ldv1000.cpp b/src/devices/machine/ldv1000.cpp
index e1b4f8e1a70..47ffb93c5c4 100644
--- a/src/devices/machine/ldv1000.cpp
+++ b/src/devices/machine/ldv1000.cpp
@@ -52,7 +52,7 @@
//**************************************************************************
// devices
-const device_type PIONEER_LDV1000 = &device_creator<pioneer_ldv1000_device>;
+const device_type PIONEER_LDV1000 = device_creator<pioneer_ldv1000_device>;
diff --git a/src/devices/machine/ldvp931.cpp b/src/devices/machine/ldvp931.cpp
index 258b049da00..6c488e57a1d 100644
--- a/src/devices/machine/ldvp931.cpp
+++ b/src/devices/machine/ldvp931.cpp
@@ -45,7 +45,7 @@
//**************************************************************************
// devices
-const device_type PHILLIPS_22VP931 = &device_creator<phillips_22vp931_device>;
+const device_type PHILLIPS_22VP931 = device_creator<phillips_22vp931_device>;
diff --git a/src/devices/machine/lh5810.cpp b/src/devices/machine/lh5810.cpp
index a0a5ad0590d..590037aa940 100644
--- a/src/devices/machine/lh5810.cpp
+++ b/src/devices/machine/lh5810.cpp
@@ -17,7 +17,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type LH5810 = &device_creator<lh5810_device>;
+const device_type LH5810 = device_creator<lh5810_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/machine/linflash.cpp b/src/devices/machine/linflash.cpp
index 416eb23102d..a068997240c 100644
--- a/src/devices/machine/linflash.cpp
+++ b/src/devices/machine/linflash.cpp
@@ -34,7 +34,7 @@ WRITE16_MEMBER( linear_flash_pccard_device::write_memory )
}
-const device_type LINEAR_FLASH_PCCARD_16MB = &device_creator<linear_flash_pccard_16mb_device>;
+const device_type LINEAR_FLASH_PCCARD_16MB = device_creator<linear_flash_pccard_16mb_device>;
static ADDRESS_MAP_START(linear_flash_pccard_16mb, AS_0, 16, linear_flash_pccard_16mb_device)
ADDRESS_MAP_UNMAP_HIGH
@@ -71,7 +71,7 @@ machine_config_constructor linear_flash_pccard_16mb_device::device_mconfig_addit
}
-const device_type LINEAR_FLASH_PCCARD_32MB = &device_creator<linear_flash_pccard_32mb_device>;
+const device_type LINEAR_FLASH_PCCARD_32MB = device_creator<linear_flash_pccard_32mb_device>;
static ADDRESS_MAP_START(linear_flash_pccard_32mb, AS_0, 16, linear_flash_pccard_32mb_device)
ADDRESS_MAP_UNMAP_HIGH
@@ -124,7 +124,7 @@ machine_config_constructor linear_flash_pccard_32mb_device::device_mconfig_addit
}
-const device_type LINEAR_FLASH_PCCARD_64MB = &device_creator<linear_flash_pccard_64mb_device>;
+const device_type LINEAR_FLASH_PCCARD_64MB = device_creator<linear_flash_pccard_64mb_device>;
static ADDRESS_MAP_START(linear_flash_pccard_64mb, AS_0, 16, linear_flash_pccard_64mb_device)
ADDRESS_MAP_UNMAP_HIGH
diff --git a/src/devices/machine/lpc-acpi.cpp b/src/devices/machine/lpc-acpi.cpp
index 902a66701bc..0b18a7fe15b 100644
--- a/src/devices/machine/lpc-acpi.cpp
+++ b/src/devices/machine/lpc-acpi.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "lpc-acpi.h"
-const device_type LPC_ACPI = &device_creator<lpc_acpi_device>;
+const device_type LPC_ACPI = device_creator<lpc_acpi_device>;
DEVICE_ADDRESS_MAP_START(map, 32, lpc_acpi_device)
AM_RANGE(0x00, 0x03) AM_READWRITE16(pm1_sts_r, pm1_sts_w, 0x0000ffff)
diff --git a/src/devices/machine/lpc-pit.cpp b/src/devices/machine/lpc-pit.cpp
index b79b174e0bc..803c7fd0aee 100644
--- a/src/devices/machine/lpc-pit.cpp
+++ b/src/devices/machine/lpc-pit.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "lpc-pit.h"
-const device_type LPC_PIT = &device_creator<lpc_pit_device>;
+const device_type LPC_PIT = device_creator<lpc_pit_device>;
DEVICE_ADDRESS_MAP_START(map, 32, lpc_pit_device)
AM_RANGE(0x40, 0x43) AM_READWRITE8(status_r, access_w, 0x00ffffff)
diff --git a/src/devices/machine/lpc-rtc.cpp b/src/devices/machine/lpc-rtc.cpp
index 277d4b1f9cd..65c49650e0c 100644
--- a/src/devices/machine/lpc-rtc.cpp
+++ b/src/devices/machine/lpc-rtc.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "lpc-rtc.h"
-const device_type LPC_RTC = &device_creator<lpc_rtc_device>;
+const device_type LPC_RTC = device_creator<lpc_rtc_device>;
DEVICE_ADDRESS_MAP_START(map, 32, lpc_rtc_device)
AM_RANGE(0x70, 0x77) AM_READWRITE8(index_r, index_w, 0x00ff00ff)
diff --git a/src/devices/machine/lpci.cpp b/src/devices/machine/lpci.cpp
index c5b53baa840..ac94da1be17 100644
--- a/src/devices/machine/lpci.cpp
+++ b/src/devices/machine/lpci.cpp
@@ -80,7 +80,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type PCI_BUS_LEGACY = &device_creator<pci_bus_legacy_device>;
+const device_type PCI_BUS_LEGACY = device_creator<pci_bus_legacy_device>;
//**************************************************************************
// LIVE DEVICE
diff --git a/src/devices/machine/m6m80011ap.cpp b/src/devices/machine/m6m80011ap.cpp
index be1d92b2079..9fedabf18a9 100644
--- a/src/devices/machine/m6m80011ap.cpp
+++ b/src/devices/machine/m6m80011ap.cpp
@@ -16,7 +16,7 @@ Template for skeleton device
//**************************************************************************
// device type definition
-const device_type M6M80011AP = &device_creator<m6m80011ap_device>;
+const device_type M6M80011AP = device_creator<m6m80011ap_device>;
//**************************************************************************
diff --git a/src/devices/machine/mb14241.cpp b/src/devices/machine/mb14241.cpp
index 4a462fb6c5b..c341fe8679e 100644
--- a/src/devices/machine/mb14241.cpp
+++ b/src/devices/machine/mb14241.cpp
@@ -15,7 +15,7 @@
//-------------------------------------------------
-const device_type MB14241 = &device_creator<mb14241_device>;
+const device_type MB14241 = device_creator<mb14241_device>;
mb14241_device::mb14241_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MB14241, "MB14241 Data Shifter", tag, owner, clock, "mb14241", __FILE__), m_shift_data(0), m_shift_count(0)
diff --git a/src/devices/machine/mb3773.cpp b/src/devices/machine/mb3773.cpp
index 72a4dda7845..18239981249 100644
--- a/src/devices/machine/mb3773.cpp
+++ b/src/devices/machine/mb3773.cpp
@@ -23,7 +23,7 @@
//**************************************************************************
// device type definition
-const device_type MB3773 = &device_creator<mb3773_device>;
+const device_type MB3773 = device_creator<mb3773_device>;
//-------------------------------------------------
// mb3773_device - constructor
diff --git a/src/devices/machine/mb8421.cpp b/src/devices/machine/mb8421.cpp
index 53eaa818f90..0e7532b1740 100644
--- a/src/devices/machine/mb8421.cpp
+++ b/src/devices/machine/mb8421.cpp
@@ -15,7 +15,7 @@
#include "machine/mb8421.h"
-const device_type MB8421 = &device_creator<mb8421_device>;
+const device_type MB8421 = device_creator<mb8421_device>;
//-------------------------------------------------
// mb8421_device - constructor
diff --git a/src/devices/machine/mb87078.cpp b/src/devices/machine/mb87078.cpp
index 5e0199697bb..cab6460f412 100644
--- a/src/devices/machine/mb87078.cpp
+++ b/src/devices/machine/mb87078.cpp
@@ -102,7 +102,7 @@ static const int mb87078_gain_percent[66] = {
DEVICE INTERFACE
*****************************************************************************/
-const device_type MB87078 = &device_creator<mb87078_device>;
+const device_type MB87078 = device_creator<mb87078_device>;
mb87078_device::mb87078_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MB87078, "MB87078 Volume Controller", tag, owner, clock, "mb87078", __FILE__),
diff --git a/src/devices/machine/mb8795.cpp b/src/devices/machine/mb8795.cpp
index a427780578e..bf3aadba660 100644
--- a/src/devices/machine/mb8795.cpp
+++ b/src/devices/machine/mb8795.cpp
@@ -4,7 +4,7 @@
#include "emu.h"
#include "mb8795.h"
-const device_type MB8795 = &device_creator<mb8795_device>;
+const device_type MB8795 = device_creator<mb8795_device>;
DEVICE_ADDRESS_MAP_START(map, 8, mb8795_device)
AM_RANGE(0x0, 0x0) AM_READWRITE(txstat_r, txstat_w)
diff --git a/src/devices/machine/mb89352.cpp b/src/devices/machine/mb89352.cpp
index a679e8081e4..ad27bae81e0 100644
--- a/src/devices/machine/mb89352.cpp
+++ b/src/devices/machine/mb89352.cpp
@@ -108,7 +108,7 @@
* Device config
*/
-const device_type MB89352A = &device_creator<mb89352_device>;
+const device_type MB89352A = device_creator<mb89352_device>;
/*
diff --git a/src/devices/machine/mb89363b.cpp b/src/devices/machine/mb89363b.cpp
index f4584971424..1f854473f21 100644
--- a/src/devices/machine/mb89363b.cpp
+++ b/src/devices/machine/mb89363b.cpp
@@ -81,7 +81,7 @@
-extern const device_type MB89363B = &device_creator<mb89363b_device>;
+const device_type MB89363B = device_creator<mb89363b_device>;
mb89363b_device::mb89363b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/machine/mb89371.cpp b/src/devices/machine/mb89371.cpp
index d9ec2f12e48..90bc2097df8 100644
--- a/src/devices/machine/mb89371.cpp
+++ b/src/devices/machine/mb89371.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
#include "mb89371.h"
-const device_type MB89371 = &device_creator<mb89371_device>;
+const device_type MB89371 = device_creator<mb89371_device>;
mb89371_device::mb89371_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock )
: device_t(mconfig, MB89371, "MB89371 Dual Serial UART", tag, owner, clock, "mb89371", __FILE__)
diff --git a/src/devices/machine/mc146818.cpp b/src/devices/machine/mc146818.cpp
index 0b7b9d66d2b..a6ebb615a5b 100644
--- a/src/devices/machine/mc146818.cpp
+++ b/src/devices/machine/mc146818.cpp
@@ -25,7 +25,7 @@
// device type definition
-const device_type MC146818 = &device_creator<mc146818_device>;
+const device_type MC146818 = device_creator<mc146818_device>;
//-------------------------------------------------
// mc146818_device - constructor
diff --git a/src/devices/machine/mc2661.cpp b/src/devices/machine/mc2661.cpp
index 2548fbb50e3..8f79893aadd 100644
--- a/src/devices/machine/mc2661.cpp
+++ b/src/devices/machine/mc2661.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type MC2661 = &device_creator<mc2661_device>;
+const device_type MC2661 = device_creator<mc2661_device>;
diff --git a/src/devices/machine/mc68328.cpp b/src/devices/machine/mc68328.cpp
index 052565ae315..6b548a62a00 100644
--- a/src/devices/machine/mc68328.cpp
+++ b/src/devices/machine/mc68328.cpp
@@ -28,7 +28,7 @@ static inline void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, co
}
}
-const device_type MC68328 = &device_creator<mc68328_device>;
+const device_type MC68328 = device_creator<mc68328_device>;
mc68328_device::mc68328_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/machine/mc6843.cpp b/src/devices/machine/mc6843.cpp
index a7b0684d2cd..64b09f2de8d 100644
--- a/src/devices/machine/mc6843.cpp
+++ b/src/devices/machine/mc6843.cpp
@@ -72,7 +72,7 @@ static const char *const mc6843_cmd[16] =
-const device_type MC6843 = &device_creator<mc6843_device>;
+const device_type MC6843 = device_creator<mc6843_device>;
mc6843_device::mc6843_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MC6843, "MC6843 floppy controller", tag, owner, clock, "mc6843", __FILE__),
diff --git a/src/devices/machine/mc6846.cpp b/src/devices/machine/mc6846.cpp
index d2cbc0ecdbb..a250c67b15b 100644
--- a/src/devices/machine/mc6846.cpp
+++ b/src/devices/machine/mc6846.cpp
@@ -43,7 +43,7 @@
#define FACTOR ((m_tcr & 4) ? 8 : 1)
-const device_type MC6846 = &device_creator<mc6846_device>;
+const device_type MC6846 = device_creator<mc6846_device>;
mc6846_device::mc6846_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MC6846, "MC6846 Programmable Timer", tag, owner, clock, "mc6846", __FILE__),
diff --git a/src/devices/machine/mc6852.cpp b/src/devices/machine/mc6852.cpp
index b07597b6417..39291a0ea65 100644
--- a/src/devices/machine/mc6852.cpp
+++ b/src/devices/machine/mc6852.cpp
@@ -29,7 +29,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type MC6852 = &device_creator<mc6852_device>;
+const device_type MC6852 = device_creator<mc6852_device>;
diff --git a/src/devices/machine/mc6854.cpp b/src/devices/machine/mc6854.cpp
index 079d138966e..1164b35308e 100644
--- a/src/devices/machine/mc6854.cpp
+++ b/src/devices/machine/mc6854.cpp
@@ -165,7 +165,7 @@ static const int word_length[4] = { 5, 6, 7, 8 };
-const device_type MC6854 = &device_creator<mc6854_device>;
+const device_type MC6854 = device_creator<mc6854_device>;
mc6854_device::mc6854_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MC6854, "MC6854 ADLC", tag, owner, clock, "mc6854", __FILE__),
diff --git a/src/devices/machine/mc68681.cpp b/src/devices/machine/mc68681.cpp
index 7428929ab3c..cc3c88d4103 100644
--- a/src/devices/machine/mc68681.cpp
+++ b/src/devices/machine/mc68681.cpp
@@ -56,9 +56,9 @@ static const int baud_rate_ACR_1[] = { 75, 110, 134, 150, 300, 600, 1200, 2000,
#define CHAND_TAG "chd"
// device type definition
-const device_type MC68681 = &device_creator<mc68681_device>;
-const device_type SC28C94 = &device_creator<sc28c94_device>;
-const device_type MC68681_CHANNEL = &device_creator<mc68681_channel>;
+const device_type MC68681 = device_creator<mc68681_device>;
+const device_type SC28C94 = device_creator<sc28c94_device>;
+const device_type MC68681_CHANNEL = device_creator<mc68681_channel>;
MACHINE_CONFIG_FRAGMENT( duart68681 )
MCFG_DEVICE_ADD(CHANA_TAG, MC68681_CHANNEL, 0)
diff --git a/src/devices/machine/mc68901.cpp b/src/devices/machine/mc68901.cpp
index fa6256f1871..5239cceb660 100644
--- a/src/devices/machine/mc68901.cpp
+++ b/src/devices/machine/mc68901.cpp
@@ -49,7 +49,7 @@
// device type definition
-const device_type MC68901 = &device_creator<mc68901_device>;
+const device_type MC68901 = device_creator<mc68901_device>;
//**************************************************************************
diff --git a/src/devices/machine/mccs1850.cpp b/src/devices/machine/mccs1850.cpp
index f7937780d47..0a39b833529 100644
--- a/src/devices/machine/mccs1850.cpp
+++ b/src/devices/machine/mccs1850.cpp
@@ -100,7 +100,7 @@ enum
//**************************************************************************
// device type definition
-const device_type MCCS1850 = &device_creator<mccs1850_device>;
+const device_type MCCS1850 = device_creator<mccs1850_device>;
diff --git a/src/devices/machine/mcf5206e.cpp b/src/devices/machine/mcf5206e.cpp
index 5b69889de56..c9e18c24cc7 100644
--- a/src/devices/machine/mcf5206e.cpp
+++ b/src/devices/machine/mcf5206e.cpp
@@ -822,7 +822,7 @@ WRITE16_MEMBER( mcf5206e_peripheral_device::TCN1_w)
//**************************************************************************
// device type definition
-const device_type MCF5206E_PERIPHERAL = &device_creator<mcf5206e_peripheral_device>;
+const device_type MCF5206E_PERIPHERAL = device_creator<mcf5206e_peripheral_device>;
//-------------------------------------------------
// mcf5206e_peripheral_device - constructor
diff --git a/src/devices/machine/microtch.cpp b/src/devices/machine/microtch.cpp
index a9e309eb5d5..93c51dc8208 100644
--- a/src/devices/machine/microtch.cpp
+++ b/src/devices/machine/microtch.cpp
@@ -16,7 +16,7 @@
#define LOG 0
-const device_type MICROTOUCH = &device_creator<microtouch_device>;
+const device_type MICROTOUCH = device_creator<microtouch_device>;
microtouch_device::microtouch_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, MICROTOUCH, "Microtouch Touchscreen", tag, owner, clock, "microtouch", __FILE__),
diff --git a/src/devices/machine/mm5740.cpp b/src/devices/machine/mm5740.cpp
index 9756dd95938..fc535c42438 100644
--- a/src/devices/machine/mm5740.cpp
+++ b/src/devices/machine/mm5740.cpp
@@ -11,12 +11,13 @@
#include <algorithm>
+
//**************************************************************************
// GLOBAL VARIABLES
//**************************************************************************
// devices
-const device_type MM5740 = &device_creator<mm5740_device>;
+const device_type MM5740 = device_creator<mm5740_device>;
//**************************************************************************
// DEVICE DEFINITIONS
diff --git a/src/devices/machine/mm58167.cpp b/src/devices/machine/mm58167.cpp
index 0cf17b48ce9..e84dbad17e9 100644
--- a/src/devices/machine/mm58167.cpp
+++ b/src/devices/machine/mm58167.cpp
@@ -17,7 +17,7 @@
//**************************************************************************
// device type definition
-const device_type MM58167 = &device_creator<mm58167_device>;
+const device_type MM58167 = device_creator<mm58167_device>;
// registers (0-7 are the live data, 8-f are the setting for the compare IRQ)
typedef enum
diff --git a/src/devices/machine/mm58274c.cpp b/src/devices/machine/mm58274c.cpp
index fe29117ce3a..491ace25a34 100644
--- a/src/devices/machine/mm58274c.cpp
+++ b/src/devices/machine/mm58274c.cpp
@@ -44,7 +44,7 @@ enum
-const device_type MM58274C = &device_creator<mm58274c_device>;
+const device_type MM58274C = device_creator<mm58274c_device>;
mm58274c_device::mm58274c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/machine/mm74c922.cpp b/src/devices/machine/mm74c922.cpp
index 1b44783abc6..1effb4ac144 100644
--- a/src/devices/machine/mm74c922.cpp
+++ b/src/devices/machine/mm74c922.cpp
@@ -23,8 +23,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type MM74C922 = &device_creator<mm74c922_device>;
-const device_type MM74C923 = &device_creator<mm74c922_device>;
+const device_type MM74C922 = device_creator<mm74c922_device>;
+const device_type MM74C923 = device_creator<mm74c922_device>;
diff --git a/src/devices/machine/mos6526.cpp b/src/devices/machine/mos6526.cpp
index c5f08a68530..265f4eabb6c 100644
--- a/src/devices/machine/mos6526.cpp
+++ b/src/devices/machine/mos6526.cpp
@@ -112,10 +112,10 @@ enum
// DEVICE TYPE DEFINITIONS
//**************************************************************************
-const device_type MOS6526 = &device_creator<mos6526_device>;
-const device_type MOS6526A = &device_creator<mos6526a_device>;
-const device_type MOS8520 = &device_creator<mos8520_device>;
-const device_type MOS5710 = &device_creator<mos5710_device>;
+const device_type MOS6526 = device_creator<mos6526_device>;
+const device_type MOS6526A = device_creator<mos6526a_device>;
+const device_type MOS8520 = device_creator<mos8520_device>;
+const device_type MOS5710 = device_creator<mos5710_device>;
diff --git a/src/devices/machine/mos6529.cpp b/src/devices/machine/mos6529.cpp
index 297ab50ae1e..d3e3c5a7764 100644
--- a/src/devices/machine/mos6529.cpp
+++ b/src/devices/machine/mos6529.cpp
@@ -24,7 +24,7 @@
//**************************************************************************
// device type definition
-const device_type MOS6529 = &device_creator<mos6529_device>;
+const device_type MOS6529 = device_creator<mos6529_device>;
diff --git a/src/devices/machine/mos6530.cpp b/src/devices/machine/mos6530.cpp
index 2a32917d0c4..ce3b0d67b71 100644
--- a/src/devices/machine/mos6530.cpp
+++ b/src/devices/machine/mos6530.cpp
@@ -38,7 +38,7 @@ enum
DEVICE INTERFACE
***************************************************************************/
-const device_type MOS6530 = &device_creator<mos6530_device>;
+const device_type MOS6530 = device_creator<mos6530_device>;
mos6530_device::mos6530_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MOS6530, "MOS6530 RRIOT", tag, owner, clock, "mos6530", __FILE__),
diff --git a/src/devices/machine/mos6530n.cpp b/src/devices/machine/mos6530n.cpp
index e5b290e2cca..ffa182b831c 100644
--- a/src/devices/machine/mos6530n.cpp
+++ b/src/devices/machine/mos6530n.cpp
@@ -25,8 +25,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type MOS6530n = &device_creator<mos6530_t>;
-const device_type MOS6532n = &device_creator<mos6532_t>;
+const device_type MOS6530n = device_creator<mos6530_t>;
+const device_type MOS6532n = device_creator<mos6532_t>;
DEVICE_ADDRESS_MAP_START( rom_map, 8, mos6530_t )
diff --git a/src/devices/machine/mos6551.cpp b/src/devices/machine/mos6551.cpp
index 594c9ac35a7..9ae4ee3253c 100644
--- a/src/devices/machine/mos6551.cpp
+++ b/src/devices/machine/mos6551.cpp
@@ -11,7 +11,7 @@
#define LOG 0
-const device_type MOS6551 = &device_creator<mos6551_device>;
+const device_type MOS6551 = device_creator<mos6551_device>;
mos6551_device::mos6551_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, MOS6551, "MOS6551", tag, owner, clock, "mos6551", __FILE__),
diff --git a/src/devices/machine/mos6702.cpp b/src/devices/machine/mos6702.cpp
index b1e54f894d5..69268f6341e 100644
--- a/src/devices/machine/mos6702.cpp
+++ b/src/devices/machine/mos6702.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type MOS6702 = &device_creator<mos6702_device>;
+const device_type MOS6702 = device_creator<mos6702_device>;
diff --git a/src/devices/machine/mos8706.cpp b/src/devices/machine/mos8706.cpp
index d42be7a5c99..d3127eb4e58 100644
--- a/src/devices/machine/mos8706.cpp
+++ b/src/devices/machine/mos8706.cpp
@@ -24,7 +24,7 @@
//**************************************************************************
// device type definition
-const device_type MOS8706 = &device_creator<mos8706_device>;
+const device_type MOS8706 = device_creator<mos8706_device>;
diff --git a/src/devices/machine/mos8722.cpp b/src/devices/machine/mos8722.cpp
index 93e5c34c328..1472320cf57 100644
--- a/src/devices/machine/mos8722.cpp
+++ b/src/devices/machine/mos8722.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type MOS8722 = &device_creator<mos8722_device>;
+const device_type MOS8722 = device_creator<mos8722_device>;
diff --git a/src/devices/machine/mos8726.cpp b/src/devices/machine/mos8726.cpp
index b8e0f280ff4..39d4f450fa8 100644
--- a/src/devices/machine/mos8726.cpp
+++ b/src/devices/machine/mos8726.cpp
@@ -29,7 +29,7 @@
// DEVICE TYPE DEFINITIONS
//**************************************************************************
-const device_type MOS8726 = &device_creator<mos8726_device>;
+const device_type MOS8726 = device_creator<mos8726_device>;
diff --git a/src/devices/machine/mpu401.cpp b/src/devices/machine/mpu401.cpp
index 95a82ea029e..cc65d695476 100644
--- a/src/devices/machine/mpu401.cpp
+++ b/src/devices/machine/mpu401.cpp
@@ -91,7 +91,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type MPU401 = &device_creator<mpu401_device>;
+const device_type MPU401 = device_creator<mpu401_device>;
//-------------------------------------------------
// machine_config_additions - device-specific
diff --git a/src/devices/machine/msm5832.cpp b/src/devices/machine/msm5832.cpp
index 361f9b7ba71..e5db53f3ec8 100644
--- a/src/devices/machine/msm5832.cpp
+++ b/src/devices/machine/msm5832.cpp
@@ -23,7 +23,7 @@
// device type definition
-const device_type MSM5832 = &device_creator<msm5832_device>;
+const device_type MSM5832 = device_creator<msm5832_device>;
//**************************************************************************
diff --git a/src/devices/machine/msm58321.cpp b/src/devices/machine/msm58321.cpp
index c34f107fa9b..ed0ed62d8b9 100644
--- a/src/devices/machine/msm58321.cpp
+++ b/src/devices/machine/msm58321.cpp
@@ -21,7 +21,7 @@
// device type definition
-const device_type MSM58321 = &device_creator<msm58321_device>;
+const device_type MSM58321 = device_creator<msm58321_device>;
//**************************************************************************
diff --git a/src/devices/machine/msm6242.cpp b/src/devices/machine/msm6242.cpp
index e02732da8c7..fec76467966 100644
--- a/src/devices/machine/msm6242.cpp
+++ b/src/devices/machine/msm6242.cpp
@@ -54,11 +54,11 @@ enum
//**************************************************************************
// device type definitions
-const device_type MSM6242 = &device_creator<msm6242_device>;
-const device_type RTC62421 = &device_creator<rtc62421_device>;
-const device_type RTC62423 = &device_creator<rtc62423_device>;
-const device_type RTC72421 = &device_creator<rtc72421_device>;
-const device_type RTC72423 = &device_creator<rtc72423_device>;
+const device_type MSM6242 = device_creator<msm6242_device>;
+const device_type RTC62421 = device_creator<rtc62421_device>;
+const device_type RTC62423 = device_creator<rtc62423_device>;
+const device_type RTC72421 = device_creator<rtc72421_device>;
+const device_type RTC72423 = device_creator<rtc72423_device>;
//**************************************************************************
diff --git a/src/devices/machine/ncr5380.cpp b/src/devices/machine/ncr5380.cpp
index 37c05421424..23e1ab1b821 100644
--- a/src/devices/machine/ncr5380.cpp
+++ b/src/devices/machine/ncr5380.cpp
@@ -72,7 +72,7 @@ static int get_cmd_len(int cbyte)
// LIVE DEVICE
//**************************************************************************
-const device_type NCR5380 = &device_creator<ncr5380_device>;
+const device_type NCR5380 = device_creator<ncr5380_device>;
//-------------------------------------------------
// ncr5380_device - constructor/destructor
diff --git a/src/devices/machine/ncr5380n.cpp b/src/devices/machine/ncr5380n.cpp
index 84e1c08184e..c8b66fcf3f4 100644
--- a/src/devices/machine/ncr5380n.cpp
+++ b/src/devices/machine/ncr5380n.cpp
@@ -17,7 +17,7 @@
#include "emu.h"
#include "ncr5380n.h"
-const device_type NCR5380N = &device_creator<ncr5380n_device>;
+const device_type NCR5380N = device_creator<ncr5380n_device>;
DEVICE_ADDRESS_MAP_START(map, 8, ncr5380n_device)
AM_RANGE(0x0, 0x0) AM_READWRITE(scsidata_r, outdata_w)
diff --git a/src/devices/machine/ncr5390.cpp b/src/devices/machine/ncr5390.cpp
index 4fc9257a009..f5fb37be436 100644
--- a/src/devices/machine/ncr5390.cpp
+++ b/src/devices/machine/ncr5390.cpp
@@ -6,7 +6,7 @@
#define DELAY_HACK
-const device_type NCR5390 = &device_creator<ncr5390_device>;
+const device_type NCR5390 = device_creator<ncr5390_device>;
DEVICE_ADDRESS_MAP_START(map, 8, ncr5390_device)
AM_RANGE(0x0, 0x0) AM_READWRITE(tcount_lo_r, tcount_lo_w)
diff --git a/src/devices/machine/ncr539x.cpp b/src/devices/machine/ncr539x.cpp
index 67959d7fa08..ac7cfcd7698 100644
--- a/src/devices/machine/ncr539x.cpp
+++ b/src/devices/machine/ncr539x.cpp
@@ -110,7 +110,7 @@ static int get_cmd_len(int cbyte)
// LIVE DEVICE
//**************************************************************************
-const device_type NCR539X = &device_creator<ncr539x_device>;
+const device_type NCR539X = device_creator<ncr539x_device>;
//-------------------------------------------------
// ncr539x_device - constructor/destructor
diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp
index cc80ab894e3..3adb760553a 100644
--- a/src/devices/machine/netlist.cpp
+++ b/src/devices/machine/netlist.cpp
@@ -30,21 +30,21 @@
//#define LOG_DEV_CALLS(x) printf x
#define LOG_DEV_CALLS(x) do { } while (0)
-const device_type NETLIST_CORE = &device_creator<netlist_mame_device_t>;
-const device_type NETLIST_CPU = &device_creator<netlist_mame_cpu_device_t>;
-const device_type NETLIST_SOUND = &device_creator<netlist_mame_sound_device_t>;
+const device_type NETLIST_CORE = device_creator<netlist_mame_device_t>;
+const device_type NETLIST_CPU = device_creator<netlist_mame_cpu_device_t>;
+const device_type NETLIST_SOUND = device_creator<netlist_mame_sound_device_t>;
/* subdevices */
-const device_type NETLIST_ANALOG_INPUT = &device_creator<netlist_mame_analog_input_t>;
-const device_type NETLIST_INT_INPUT = &device_creator<netlist_mame_int_input_t>;
-const device_type NETLIST_RAM_POINTER = &device_creator<netlist_ram_pointer_t>;
-const device_type NETLIST_LOGIC_INPUT = &device_creator<netlist_mame_logic_input_t>;
-const device_type NETLIST_STREAM_INPUT = &device_creator<netlist_mame_stream_input_t>;
+const device_type NETLIST_ANALOG_INPUT = device_creator<netlist_mame_analog_input_t>;
+const device_type NETLIST_INT_INPUT = device_creator<netlist_mame_int_input_t>;
+const device_type NETLIST_RAM_POINTER = device_creator<netlist_ram_pointer_t>;
+const device_type NETLIST_LOGIC_INPUT = device_creator<netlist_mame_logic_input_t>;
+const device_type NETLIST_STREAM_INPUT = device_creator<netlist_mame_stream_input_t>;
-const device_type NETLIST_LOGIC_OUTPUT = &device_creator<netlist_mame_logic_output_t>;
-const device_type NETLIST_ANALOG_OUTPUT = &device_creator<netlist_mame_analog_output_t>;
-const device_type NETLIST_STREAM_OUTPUT = &device_creator<netlist_mame_stream_output_t>;
+const device_type NETLIST_LOGIC_OUTPUT = device_creator<netlist_mame_logic_output_t>;
+const device_type NETLIST_ANALOG_OUTPUT = device_creator<netlist_mame_analog_output_t>;
+const device_type NETLIST_STREAM_OUTPUT = device_creator<netlist_mame_stream_output_t>;
// ----------------------------------------------------------------------------------------
// Special netlist extension devices ....
diff --git a/src/devices/machine/nmc9306.cpp b/src/devices/machine/nmc9306.cpp
index aa495a7791e..95ebedd10c7 100644
--- a/src/devices/machine/nmc9306.cpp
+++ b/src/devices/machine/nmc9306.cpp
@@ -56,7 +56,7 @@ enum
//**************************************************************************
// device type definition
-const device_type NMC9306 = &device_creator<nmc9306_device>;
+const device_type NMC9306 = device_creator<nmc9306_device>;
//-------------------------------------------------
// nmc9306_device - constructor
diff --git a/src/devices/machine/nsc810.cpp b/src/devices/machine/nsc810.cpp
index 6f6753955c6..a5314ecc3ab 100644
--- a/src/devices/machine/nsc810.cpp
+++ b/src/devices/machine/nsc810.cpp
@@ -21,7 +21,7 @@
#define LOG (1)
-const device_type NSC810 = &device_creator<nsc810_device>;
+const device_type NSC810 = device_creator<nsc810_device>;
nsc810_device::nsc810_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NSC810, "National Semiconductor NSC810", tag, owner, clock, "nsc810", __FILE__), m_portA_latch(0), m_portB_latch(0), m_portC_latch(0),
diff --git a/src/devices/machine/nscsi_bus.cpp b/src/devices/machine/nscsi_bus.cpp
index b06e892f58d..819290ea904 100644
--- a/src/devices/machine/nscsi_bus.cpp
+++ b/src/devices/machine/nscsi_bus.cpp
@@ -3,8 +3,8 @@
#include "emu.h"
#include "nscsi_bus.h"
-const device_type NSCSI_BUS = &device_creator<nscsi_bus_device>;
-const device_type NSCSI_CONNECTOR = &device_creator<nscsi_connector>;
+const device_type NSCSI_BUS = device_creator<nscsi_bus_device>;
+const device_type NSCSI_CONNECTOR = device_creator<nscsi_connector>;
nscsi_bus_device::nscsi_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NSCSI_BUS, "NSCSI Bus", tag, owner, clock, "nscsi_bus", __FILE__), data(0), ctrl(0)
diff --git a/src/devices/machine/nscsi_cb.cpp b/src/devices/machine/nscsi_cb.cpp
index aecf59d00b9..71e83f9a807 100644
--- a/src/devices/machine/nscsi_cb.cpp
+++ b/src/devices/machine/nscsi_cb.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "nscsi_cb.h"
-const device_type NSCSI_CB = &device_creator<nscsi_callback_device>;
+const device_type NSCSI_CB = device_creator<nscsi_callback_device>;
nscsi_callback_device::nscsi_callback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nscsi_device(mconfig, NSCSI_CB, "SCSI callback (new)", tag, owner, clock, "nscsi_cb", __FILE__),
diff --git a/src/devices/machine/nscsi_cd.cpp b/src/devices/machine/nscsi_cd.cpp
index d17e3f1e09b..8488907ee64 100644
--- a/src/devices/machine/nscsi_cd.cpp
+++ b/src/devices/machine/nscsi_cd.cpp
@@ -4,7 +4,7 @@
#include "machine/nscsi_cd.h"
#include "imagedev/chd_cd.h"
-const device_type NSCSI_CDROM = &device_creator<nscsi_cdrom_device>;
+const device_type NSCSI_CDROM = device_creator<nscsi_cdrom_device>;
nscsi_cdrom_device::nscsi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
nscsi_full_device(mconfig, NSCSI_CDROM, "SCSI CDROM", tag, owner, clock, "scsi_cdrom", __FILE__), cdrom(nullptr), bytes_per_sector(0), lba(0), cur_lba(0), blocks(0)
diff --git a/src/devices/machine/nscsi_hd.cpp b/src/devices/machine/nscsi_hd.cpp
index 3a493c08550..e45f78036d1 100644
--- a/src/devices/machine/nscsi_hd.cpp
+++ b/src/devices/machine/nscsi_hd.cpp
@@ -4,7 +4,7 @@
#include "machine/nscsi_hd.h"
#include "imagedev/harddriv.h"
-const device_type NSCSI_HARDDISK = &device_creator<nscsi_harddisk_device>;
+const device_type NSCSI_HARDDISK = device_creator<nscsi_harddisk_device>;
nscsi_harddisk_device::nscsi_harddisk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
nscsi_full_device(mconfig, NSCSI_HARDDISK, "SCSI HARDDISK", tag, owner, clock, "scsi_harddisk", __FILE__), harddisk(nullptr), lba(0), cur_lba(0), blocks(0), bytes_per_sector(0)
diff --git a/src/devices/machine/nscsi_s1410.cpp b/src/devices/machine/nscsi_s1410.cpp
index 554ba24a11d..f35d30976ff 100644
--- a/src/devices/machine/nscsi_s1410.cpp
+++ b/src/devices/machine/nscsi_s1410.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "machine/nscsi_s1410.h"
-const device_type NSCSI_S1410 = &device_creator<nscsi_s1410_device>;
+const device_type NSCSI_S1410 = device_creator<nscsi_s1410_device>;
nscsi_s1410_device::nscsi_s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
nscsi_harddisk_device(mconfig, NSCSI_S1410, "S1410", tag, owner, clock, "scsi_s1410", __FILE__)
diff --git a/src/devices/machine/nvram.cpp b/src/devices/machine/nvram.cpp
index b265bad4831..d18709234e4 100644
--- a/src/devices/machine/nvram.cpp
+++ b/src/devices/machine/nvram.cpp
@@ -16,7 +16,7 @@
//**************************************************************************
// device type definition
-const device_type NVRAM = &device_creator<nvram_device>;
+const device_type NVRAM = device_creator<nvram_device>;
//-------------------------------------------------
// nvram_device - constructor
diff --git a/src/devices/machine/pc_fdc.cpp b/src/devices/machine/pc_fdc.cpp
index 9806abf6903..2698b43e06c 100644
--- a/src/devices/machine/pc_fdc.cpp
+++ b/src/devices/machine/pc_fdc.cpp
@@ -16,8 +16,8 @@
#include "emu.h"
#include "machine/pc_fdc.h"
-const device_type PC_FDC_XT = &device_creator<pc_fdc_xt_device>;
-const device_type PC_FDC_AT = &device_creator<pc_fdc_at_device>;
+const device_type PC_FDC_XT = device_creator<pc_fdc_xt_device>;
+const device_type PC_FDC_AT = device_creator<pc_fdc_at_device>;
static MACHINE_CONFIG_FRAGMENT( cfg )
MCFG_UPD765A_ADD("upd765", false, false)
diff --git a/src/devices/machine/pc_lpt.cpp b/src/devices/machine/pc_lpt.cpp
index 93652755d84..d1676fc1232 100644
--- a/src/devices/machine/pc_lpt.cpp
+++ b/src/devices/machine/pc_lpt.cpp
@@ -10,7 +10,7 @@
#include "pc_lpt.h"
-const device_type PC_LPT = &device_creator<pc_lpt_device>;
+const device_type PC_LPT = device_creator<pc_lpt_device>;
pc_lpt_device::pc_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, PC_LPT, "PC-LPT", tag, owner, clock, "pc_lpt", __FILE__),
diff --git a/src/devices/machine/pccard.cpp b/src/devices/machine/pccard.cpp
index a5ba5bd7235..dbbec3ce98f 100644
--- a/src/devices/machine/pccard.cpp
+++ b/src/devices/machine/pccard.cpp
@@ -25,7 +25,7 @@ WRITE16_MEMBER( pccard_interface::write_reg )
//printf("unhandled register write %08x %04x %04x\n", offset, data, mem_mask);
}
-const device_type PCCARD_SLOT = &device_creator<pccard_slot_device>;
+const device_type PCCARD_SLOT = device_creator<pccard_slot_device>;
pccard_slot_device::pccard_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PCCARD_SLOT, "PCCARD SLOT", tag, owner, clock, "pccard", __FILE__),
diff --git a/src/devices/machine/pcf8593.cpp b/src/devices/machine/pcf8593.cpp
index 77527bf4621..5acab4ec7dc 100644
--- a/src/devices/machine/pcf8593.cpp
+++ b/src/devices/machine/pcf8593.cpp
@@ -40,7 +40,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type PCF8593 = &device_creator<pcf8593_device>;
+const device_type PCF8593 = device_creator<pcf8593_device>;
//-------------------------------------------------
diff --git a/src/devices/machine/pci-apic.cpp b/src/devices/machine/pci-apic.cpp
index 2595289d0d1..26246eb675c 100644
--- a/src/devices/machine/pci-apic.cpp
+++ b/src/devices/machine/pci-apic.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "pci-apic.h"
-const device_type APIC = &device_creator<apic_device>;
+const device_type APIC = device_creator<apic_device>;
apic_device::apic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: pci_device(mconfig, APIC, "I/O Advanced Programmable Interrupt Controller", tag, owner, clock, "apic", __FILE__)
diff --git a/src/devices/machine/pci-ide.cpp b/src/devices/machine/pci-ide.cpp
index 9c533e62655..3030cbb08f7 100644
--- a/src/devices/machine/pci-ide.cpp
+++ b/src/devices/machine/pci-ide.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "pci-ide.h"
-const device_type IDE_PCI = &device_creator<ide_pci_device>;
+const device_type IDE_PCI = device_creator<ide_pci_device>;
ide_pci_device::ide_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: pci_device(mconfig, IDE_PCI, "IDE PCI interface", tag, owner, clock, "ide_pci", __FILE__),
diff --git a/src/devices/machine/pci-sata.cpp b/src/devices/machine/pci-sata.cpp
index a77bd4ada49..178bc4b12ce 100644
--- a/src/devices/machine/pci-sata.cpp
+++ b/src/devices/machine/pci-sata.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "pci-sata.h"
-const device_type SATA = &device_creator<sata_device>;
+const device_type SATA = device_creator<sata_device>;
sata_device::sata_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: pci_device(mconfig, SATA, "SATA AHCI interface", tag, owner, clock, "sata", __FILE__)
diff --git a/src/devices/machine/pci-smbus.cpp b/src/devices/machine/pci-smbus.cpp
index f1cc7a98976..36d9cf1be93 100644
--- a/src/devices/machine/pci-smbus.cpp
+++ b/src/devices/machine/pci-smbus.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "pci-smbus.h"
-const device_type SMBUS = &device_creator<smbus_device>;
+const device_type SMBUS = device_creator<smbus_device>;
DEVICE_ADDRESS_MAP_START(map, 32, smbus_device)
AM_RANGE(0x00, 0x03) AM_READWRITE8 (hst_sts_r, hst_sts_w, 0x000000ff)
diff --git a/src/devices/machine/pci-usb.cpp b/src/devices/machine/pci-usb.cpp
index f44d2a6ce5b..f2f714e4612 100644
--- a/src/devices/machine/pci-usb.cpp
+++ b/src/devices/machine/pci-usb.cpp
@@ -3,8 +3,8 @@
#include "emu.h"
#include "pci-usb.h"
-const device_type USB_UHCI = &device_creator<usb_uhci_device>;
-const device_type USB_EHCI = &device_creator<usb_ehci_device>;
+const device_type USB_UHCI = device_creator<usb_uhci_device>;
+const device_type USB_EHCI = device_creator<usb_ehci_device>;
DEVICE_ADDRESS_MAP_START(map, 32, usb_uhci_device)
ADDRESS_MAP_END
diff --git a/src/devices/machine/pci.cpp b/src/devices/machine/pci.cpp
index caaef7bcdb2..42c830d19f6 100644
--- a/src/devices/machine/pci.cpp
+++ b/src/devices/machine/pci.cpp
@@ -3,8 +3,8 @@
#include "emu.h"
#include "pci.h"
-const device_type PCI_ROOT = &device_creator<pci_root_device>;
-const device_type PCI_BRIDGE = &device_creator<pci_bridge_device>;
+const device_type PCI_ROOT = device_creator<pci_root_device>;
+const device_type PCI_BRIDGE = device_creator<pci_bridge_device>;
DEVICE_ADDRESS_MAP_START(config_map, 32, pci_device)
AM_RANGE(0x00, 0x03) AM_READ16 (vendor_r, 0x0000ffff)
diff --git a/src/devices/machine/pci9050.cpp b/src/devices/machine/pci9050.cpp
index da70aab3a22..fe624ffefc8 100644
--- a/src/devices/machine/pci9050.cpp
+++ b/src/devices/machine/pci9050.cpp
@@ -24,7 +24,7 @@
#include "emu.h"
#include "pci9050.h"
-const device_type PCI9050 = &device_creator<pci9050_device>;
+const device_type PCI9050 = device_creator<pci9050_device>;
DEVICE_ADDRESS_MAP_START(map, 32, pci9050_device)
AM_RANGE(0x00, 0x0f) AM_READWRITE(lasrr_r, lasrr_w )
diff --git a/src/devices/machine/pckeybrd.cpp b/src/devices/machine/pckeybrd.cpp
index 4b6e7713dcd..76ace041e78 100644
--- a/src/devices/machine/pckeybrd.cpp
+++ b/src/devices/machine/pckeybrd.cpp
@@ -275,8 +275,8 @@ const at_keyboard_device::extended_keyboard_code at_keyboard_device::m_extended_
};
-const device_type PC_KEYB = &device_creator<pc_keyboard_device>;
-const device_type AT_KEYB = &device_creator<at_keyboard_device>;
+const device_type PC_KEYB = device_creator<pc_keyboard_device>;
+const device_type AT_KEYB = device_creator<at_keyboard_device>;
pc_keyboard_device::pc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PC_KEYB, "PC Keyboard", tag, owner, clock, "pc_keyb", __FILE__),
diff --git a/src/devices/machine/pdc.cpp b/src/devices/machine/pdc.cpp
index e050c78e5eb..f13a810f96a 100644
--- a/src/devices/machine/pdc.cpp
+++ b/src/devices/machine/pdc.cpp
@@ -113,7 +113,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PDC = &device_creator<pdc_device>;
+const device_type PDC = device_creator<pdc_device>;
//-------------------------------------------------
// ROM( PDC )
diff --git a/src/devices/machine/phi.cpp b/src/devices/machine/phi.cpp
index 18166c068cc..3d0015f4648 100644
--- a/src/devices/machine/phi.cpp
+++ b/src/devices/machine/phi.cpp
@@ -167,7 +167,7 @@ enum {
#define CONTROLLER_ADDR 0x1e // PHI always has this address when it's a controller
// Device type definition
-const device_type PHI = &device_creator<phi_device>;
+const device_type PHI = device_creator<phi_device>;
// Constructors
phi_device::phi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname)
diff --git a/src/devices/machine/pic8259.cpp b/src/devices/machine/pic8259.cpp
index ec2dbb67165..ecd15713912 100644
--- a/src/devices/machine/pic8259.cpp
+++ b/src/devices/machine/pic8259.cpp
@@ -428,7 +428,7 @@ void pic8259_device::device_reset()
m_master = m_sp_en_func();
}
-const device_type PIC8259 = &device_creator<pic8259_device>;
+const device_type PIC8259 = device_creator<pic8259_device>;
pic8259_device::pic8259_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, PIC8259, "8259 PIC", tag, owner, clock, "pit8259", __FILE__)
diff --git a/src/devices/machine/pit8253.cpp b/src/devices/machine/pit8253.cpp
index 87f669b2b3e..32cae233483 100644
--- a/src/devices/machine/pit8253.cpp
+++ b/src/devices/machine/pit8253.cpp
@@ -43,7 +43,7 @@ enum
#define LOG2(msg) do { if (VERBOSE >= 2) logerror msg; } while (0)
-const device_type PIT8253 = &device_creator<pit8253_device>;
+const device_type PIT8253 = device_creator<pit8253_device>;
pit8253_device::pit8253_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
@@ -69,7 +69,7 @@ pit8253_device::pit8253_device(const machine_config &mconfig, device_type type,
}
-const device_type PIT8254 = &device_creator<pit8254_device>;
+const device_type PIT8254 = device_creator<pit8254_device>;
pit8254_device::pit8254_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: pit8253_device(mconfig, PIT8254, "8254 PIT", tag, owner, clock, "pit8254", __FILE__)
diff --git a/src/devices/machine/pla.cpp b/src/devices/machine/pla.cpp
index 0686dd878fe..2c9b844b57d 100644
--- a/src/devices/machine/pla.cpp
+++ b/src/devices/machine/pla.cpp
@@ -12,7 +12,7 @@
#include "plaparse.h"
-const device_type PLA = &device_creator<pla_device>;
+const device_type PLA = device_creator<pla_device>;
//-------------------------------------------------
// pla_device - constructor
diff --git a/src/devices/machine/r10696.cpp b/src/devices/machine/r10696.cpp
index e04484fa32e..f3a353b7ec0 100644
--- a/src/devices/machine/r10696.cpp
+++ b/src/devices/machine/r10696.cpp
@@ -45,7 +45,7 @@
*
*************************************/
-const device_type R10696 = &device_creator<r10696_device>;
+const device_type R10696 = device_creator<r10696_device>;
r10696_device::r10696_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, R10696, "Rockwell 10696", tag, owner, clock, "r10696", __FILE__),
diff --git a/src/devices/machine/r10788.cpp b/src/devices/machine/r10788.cpp
index f3efa531930..75a486c1915 100644
--- a/src/devices/machine/r10788.cpp
+++ b/src/devices/machine/r10788.cpp
@@ -52,7 +52,7 @@
*
*************************************/
-const device_type R10788 = &device_creator<r10788_device>;
+const device_type R10788 = device_creator<r10788_device>;
r10788_device::r10788_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, R10788, "Rockwell 10788", tag, owner, clock, "r10788", __FILE__),
diff --git a/src/devices/machine/ra17xx.cpp b/src/devices/machine/ra17xx.cpp
index ae948c4e903..6324a70c9d7 100644
--- a/src/devices/machine/ra17xx.cpp
+++ b/src/devices/machine/ra17xx.cpp
@@ -53,7 +53,7 @@
*
*************************************/
-const device_type RA17XX = &device_creator<ra17xx_device>;
+const device_type RA17XX = device_creator<ra17xx_device>;
ra17xx_device::ra17xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, RA17XX, "Rockwell A17XX", tag, owner, clock, "ra17xx", __FILE__),
diff --git a/src/devices/machine/ram.cpp b/src/devices/machine/ram.cpp
index 2872499ca31..49ff027ed0f 100644
--- a/src/devices/machine/ram.cpp
+++ b/src/devices/machine/ram.cpp
@@ -21,7 +21,7 @@
*****************************************************************************/
// device type definition
-const device_type RAM = &device_creator<ram_device>;
+const device_type RAM = device_creator<ram_device>;
template class device_finder<ram_device, false>;
template class device_finder<ram_device, true>;
diff --git a/src/devices/machine/ram.h b/src/devices/machine/ram.h
index 30f2e289b9c..86a85c341a6 100644
--- a/src/devices/machine/ram.h
+++ b/src/devices/machine/ram.h
@@ -90,7 +90,7 @@ private:
extern const device_type RAM;
// device iterator
-typedef device_type_iterator<&device_creator<ram_device>, ram_device> ram_device_iterator;
+typedef device_type_iterator<RAM, ram_device> ram_device_iterator;
extern template class device_finder<ram_device, false>;
extern template class device_finder<ram_device, true>;
diff --git a/src/devices/machine/rf5c296.cpp b/src/devices/machine/rf5c296.cpp
index 4c6ce622f3a..abb0884b9e2 100644
--- a/src/devices/machine/rf5c296.cpp
+++ b/src/devices/machine/rf5c296.cpp
@@ -5,7 +5,7 @@
// rf5c296 is very inaccurate at that point, it hardcodes the gnet config
-const device_type RF5C296 = &device_creator<rf5c296_device>;
+const device_type RF5C296 = device_creator<rf5c296_device>;
rf5c296_device::rf5c296_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PCCARD_SLOT, "PCCARD SLOT", tag, owner, clock, "pccard", __FILE__), m_rf5c296_reg(0), m_pccard(nullptr), m_pccard_name(nullptr)
diff --git a/src/devices/machine/roc10937.cpp b/src/devices/machine/roc10937.cpp
index 009e5109bbc..3be5f16a2a1 100644
--- a/src/devices/machine/roc10937.cpp
+++ b/src/devices/machine/roc10937.cpp
@@ -244,7 +244,7 @@ void rocvfd_t::shift_clock(int state)
}
///////////////////////////////////////////////////////////////////////////
-const device_type ROC10937 = &device_creator<roc10937_t>;
+const device_type ROC10937 = device_creator<roc10937_t>;
roc10937_t::roc10937_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: rocvfd_t(mconfig, ROC10937, "Rockwell 10937 VFD controller and compatible", tag, owner, clock, "roc10937", __FILE__)
@@ -252,7 +252,7 @@ roc10937_t::roc10937_t(const machine_config &mconfig, const char *tag, device_t
m_port_val=0;
}
-const device_type MSC1937 = &device_creator<msc1937_t>;
+const device_type MSC1937 = device_creator<msc1937_t>;
msc1937_t::msc1937_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: rocvfd_t(mconfig, MSC1937, "OKI MSC1937 VFD controller", tag, owner, clock, "msc1937", __FILE__)
@@ -260,7 +260,7 @@ msc1937_t::msc1937_t(const machine_config &mconfig, const char *tag, device_t *o
m_port_val=0;
}
-const device_type MIC10937 = &device_creator<mic10937_t>;
+const device_type MIC10937 = device_creator<mic10937_t>;
mic10937_t::mic10937_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: rocvfd_t(mconfig, MIC10937, "Micrel MIC10937 VFD controller", tag, owner, clock, "mic10937", __FILE__)
@@ -268,7 +268,7 @@ mic10937_t::mic10937_t(const machine_config &mconfig, const char *tag, device_t
m_port_val=0;
}
-const device_type S16LF01 = &device_creator<s16lf01_t>;
+const device_type S16LF01 = device_creator<s16lf01_t>;
s16lf01_t::s16lf01_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: rocvfd_t(mconfig, S16LF01, "Samsung 16LF01 Series VFD controller and compatible", tag, owner, clock, "s16lf01", __FILE__)
@@ -327,7 +327,7 @@ void rocvfd_t::write_char(int data)
}
}
-const device_type ROC10957 = &device_creator<roc10957_t>;
+const device_type ROC10957 = device_creator<roc10957_t>;
roc10957_t::roc10957_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: rocvfd_t(mconfig, ROC10957, "Rockwell 10957 VFD controller and compatible", tag, owner, clock, "roc10957", __FILE__)
diff --git a/src/devices/machine/rp5c01.cpp b/src/devices/machine/rp5c01.cpp
index c07b5353c3c..a7b9a3ec067 100644
--- a/src/devices/machine/rp5c01.cpp
+++ b/src/devices/machine/rp5c01.cpp
@@ -21,7 +21,7 @@
// device type definition
-const device_type RP5C01 = &device_creator<rp5c01_device>;
+const device_type RP5C01 = device_creator<rp5c01_device>;
//**************************************************************************
diff --git a/src/devices/machine/rp5c15.cpp b/src/devices/machine/rp5c15.cpp
index 944d13302e9..4c5d73c044c 100644
--- a/src/devices/machine/rp5c15.cpp
+++ b/src/devices/machine/rp5c15.cpp
@@ -106,7 +106,7 @@ enum
//**************************************************************************
// devices
-const device_type RP5C15 = &device_creator<rp5c15_device>;
+const device_type RP5C15 = device_creator<rp5c15_device>;
diff --git a/src/devices/machine/rp5h01.cpp b/src/devices/machine/rp5h01.cpp
index debc6e32094..2bf8dbdc6ee 100644
--- a/src/devices/machine/rp5h01.cpp
+++ b/src/devices/machine/rp5h01.cpp
@@ -30,7 +30,7 @@ uint8_t const rp5h01_device::s_initial_data[0x10] =
// rp5h01_device - constructor
//-------------------------------------------------
-const device_type RP5H01 = &device_creator<rp5h01_device>;
+const device_type RP5H01 = device_creator<rp5h01_device>;
rp5h01_device::rp5h01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, RP5H01, "RP5H01 6/7-bit Counter", tag, owner, clock, "rp5h01", __FILE__)
diff --git a/src/devices/machine/rtc4543.cpp b/src/devices/machine/rtc4543.cpp
index 725329fb988..761f1c0246b 100644
--- a/src/devices/machine/rtc4543.cpp
+++ b/src/devices/machine/rtc4543.cpp
@@ -40,7 +40,7 @@ const char *rtc4543_device::s_reg_names[7] =
//**************************************************************************
// device type definition
-const device_type RTC4543 = &device_creator<rtc4543_device>;
+const device_type RTC4543 = device_creator<rtc4543_device>;
//-------------------------------------------------
@@ -347,7 +347,7 @@ void rtc4543_device::update_effective()
//**************************************************************************
// device type definition
-const device_type JRC6355E = &device_creator<jrc6355e_device>;
+const device_type JRC6355E = device_creator<jrc6355e_device>;
//-------------------------------------------------
diff --git a/src/devices/machine/rtc65271.cpp b/src/devices/machine/rtc65271.cpp
index edcb44880ba..f45091efbc6 100644
--- a/src/devices/machine/rtc65271.cpp
+++ b/src/devices/machine/rtc65271.cpp
@@ -646,7 +646,7 @@ TIMER_CALLBACK_MEMBER(rtc65271_device::rtc_end_update_cb)
}
// device type definition
-const device_type RTC65271 = &device_creator<rtc65271_device>;
+const device_type RTC65271 = device_creator<rtc65271_device>;
//-------------------------------------------------
// rtc65271_device - constructor
diff --git a/src/devices/machine/rtc9701.cpp b/src/devices/machine/rtc9701.cpp
index 8a2bbc8915e..7d3b8b5867a 100644
--- a/src/devices/machine/rtc9701.cpp
+++ b/src/devices/machine/rtc9701.cpp
@@ -23,7 +23,7 @@ ALLOW_SAVE_TYPE(rtc9701_state_t);
//**************************************************************************
// device type definition
-const device_type rtc9701 = &device_creator<rtc9701_device>;
+const device_type rtc9701 = device_creator<rtc9701_device>;
//**************************************************************************
diff --git a/src/devices/machine/s2636.cpp b/src/devices/machine/s2636.cpp
index 569f9d12599..3302a9b92c5 100644
--- a/src/devices/machine/s2636.cpp
+++ b/src/devices/machine/s2636.cpp
@@ -121,6 +121,8 @@
#include "emu.h"
#include "machine/s2636.h"
+#include "screen.h"
+
int const s2636_device::OFFS_OBJ[s2636_device::OBJ_COUNT] = { 0x000, 0x010, 0x020, 0x040 };
@@ -153,7 +155,7 @@ uint16_t const s2636_device::SCORE_FONT[16][5] =
*
*************************************/
-const device_type S2636 = &device_creator<s2636_device>;
+const device_type S2636 = device_creator<s2636_device>;
s2636_device::s2636_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, S2636, "Signetics 2636", tag, owner, clock, "s2636", __FILE__)
diff --git a/src/devices/machine/s3520cf.cpp b/src/devices/machine/s3520cf.cpp
index f0f80d4c7fa..d1e0235dcb7 100644
--- a/src/devices/machine/s3520cf.cpp
+++ b/src/devices/machine/s3520cf.cpp
@@ -24,7 +24,7 @@ TODO:
//**************************************************************************
// device type definition
-const device_type S3520CF = &device_creator<s3520cf_device>;
+const device_type S3520CF = device_creator<s3520cf_device>;
//**************************************************************************
diff --git a/src/devices/machine/s3c2400.cpp b/src/devices/machine/s3c2400.cpp
index 361410acf5c..f844585dc45 100644
--- a/src/devices/machine/s3c2400.cpp
+++ b/src/devices/machine/s3c2400.cpp
@@ -9,9 +9,12 @@
*******************************************************************************/
#include "emu.h"
+#include "machine/s3c2400.h"
+
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
-#include "machine/s3c2400.h"
+#include "screen.h"
+
#define VERBOSE_LEVEL ( 0 )
@@ -38,7 +41,7 @@ uint32_t s3c2400_device::screen_update(screen_device &screen, bitmap_rgb32 &bitm
return s3c24xx_video_update(screen, bitmap, cliprect);
}
-const device_type S3C2400 = &device_creator<s3c2400_device>;
+const device_type S3C2400 = device_creator<s3c2400_device>;
s3c2400_device::s3c2400_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, S3C2400, "Samsung S3C2400", tag, owner, clock, "s3c2400", __FILE__),
diff --git a/src/devices/machine/s3c2410.cpp b/src/devices/machine/s3c2410.cpp
index 0b1f00be67a..ff4fbbd060c 100644
--- a/src/devices/machine/s3c2410.cpp
+++ b/src/devices/machine/s3c2410.cpp
@@ -9,9 +9,12 @@
*******************************************************************************/
#include "emu.h"
+#include "machine/s3c2410.h"
+
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
-#include "machine/s3c2410.h"
+#include "screen.h"
+
#define VERBOSE_LEVEL ( 0 )
@@ -38,7 +41,7 @@ uint32_t s3c2410_device::screen_update(screen_device &screen, bitmap_rgb32 &bitm
return s3c24xx_video_update(screen, bitmap, cliprect);
}
-const device_type S3C2410 = &device_creator<s3c2410_device>;
+const device_type S3C2410 = device_creator<s3c2410_device>;
s3c2410_device::s3c2410_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, S3C2410, "S3C2410 MCU", tag, owner, clock, "s3c2410", __FILE__),
diff --git a/src/devices/machine/s3c2440.cpp b/src/devices/machine/s3c2440.cpp
index f55686203ab..43c145bf544 100644
--- a/src/devices/machine/s3c2440.cpp
+++ b/src/devices/machine/s3c2440.cpp
@@ -9,9 +9,12 @@
*******************************************************************************/
#include "emu.h"
+#include "machine/s3c2440.h"
+
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
-#include "machine/s3c2440.h"
+#include "screen.h"
+
#define VERBOSE_LEVEL ( 0 )
@@ -21,10 +24,10 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, c
{
va_list v;
char buf[32768];
- va_start( v, s_fmt);
- vsprintf( buf, s_fmt, v);
- va_end( v);
- device.logerror( "%s: %s", device.machine().describe_context( ), buf);
+ va_start(v, s_fmt);
+ vsprintf(buf, s_fmt, v);
+ va_end(v);
+ device.logerror("%s: %s", device.machine().describe_context( ), buf);
}
}
@@ -38,7 +41,7 @@ uint32_t s3c2440_device::screen_update(screen_device &screen, bitmap_rgb32 &bitm
return s3c24xx_video_update( screen, bitmap, cliprect);
}
-const device_type S3C2440 = &device_creator<s3c2440_device>;
+const device_type S3C2440 = device_creator<s3c2440_device>;
s3c2440_device::s3c2440_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, S3C2440, "Samsung S3C2440", tag, owner, clock, "s3c2440", __FILE__),
diff --git a/src/devices/machine/s3c44b0.cpp b/src/devices/machine/s3c44b0.cpp
index 826a94ae600..ae5f9b0a4f2 100644
--- a/src/devices/machine/s3c44b0.cpp
+++ b/src/devices/machine/s3c44b0.cpp
@@ -9,11 +9,15 @@
*******************************************************************************/
#include "emu.h"
+#include "machine/s3c44b0.h"
+
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
-#include "machine/s3c44b0.h"
+#include "screen.h"
+
#include "coreutil.h"
+
#define VERBOSE_LEVEL ( 0 )
static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...)
@@ -29,7 +33,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, c
}
}
-const device_type S3C44B0 = &device_creator<s3c44b0_device>;
+const device_type S3C44B0 = device_creator<s3c44b0_device>;
s3c44b0_device::s3c44b0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, S3C44B0, "Samsung S3C44B0", tag, owner, clock, "s3c44b0", __FILE__), m_cpu(nullptr),
diff --git a/src/devices/machine/scnxx562.cpp b/src/devices/machine/scnxx562.cpp
index c7ce9cbac0b..576ab8e312e 100644
--- a/src/devices/machine/scnxx562.cpp
+++ b/src/devices/machine/scnxx562.cpp
@@ -115,12 +115,12 @@ DONE (x) (p=partly) NMOS CMOS
// DEVICE DEFINITIONS
//**************************************************************************
// device type definition
-const device_type DUSCC = &device_creator<duscc_device>;
-const device_type DUSCC_CHANNEL = &device_creator<duscc_channel>;
-const device_type DUSCC26562 = &device_creator<duscc26562_device>;
-const device_type DUSCC26C562 = &device_creator<duscc26C562_device>;
-const device_type DUSCC68562 = &device_creator<duscc68562_device>;
-const device_type DUSCC68C562 = &device_creator<duscc68C562_device>;
+const device_type DUSCC = device_creator<duscc_device>;
+const device_type DUSCC_CHANNEL = device_creator<duscc_channel>;
+const device_type DUSCC26562 = device_creator<duscc26562_device>;
+const device_type DUSCC26C562 = device_creator<duscc26C562_device>;
+const device_type DUSCC68562 = device_creator<duscc68562_device>;
+const device_type DUSCC68C562 = device_creator<duscc68C562_device>;
//-------------------------------------------------
// device_mconfig_additions -
diff --git a/src/devices/machine/serflash.cpp b/src/devices/machine/serflash.cpp
index 8ba5cf91ad4..37248396495 100644
--- a/src/devices/machine/serflash.cpp
+++ b/src/devices/machine/serflash.cpp
@@ -16,7 +16,7 @@ ALLOW_SAVE_TYPE(flash_state_t);
//**************************************************************************
// device type definition
-const device_type SERFLASH = &device_creator<serflash_device>;
+const device_type SERFLASH = device_creator<serflash_device>;
//-------------------------------------------------
// serflash_device - constructor
diff --git a/src/devices/machine/smartmed.cpp b/src/devices/machine/smartmed.cpp
index 202a0bc5e68..b8e8014d415 100644
--- a/src/devices/machine/smartmed.cpp
+++ b/src/devices/machine/smartmed.cpp
@@ -70,7 +70,7 @@ enum
};
-const device_type NAND = &device_creator<nand_device>;
+const device_type NAND = device_creator<nand_device>;
nand_device::nand_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, NAND, "NAND Flash Memory", tag, owner, clock, "nand", __FILE__),
@@ -777,7 +777,7 @@ void nand_device::device_reset()
}
-const device_type SMARTMEDIA = &device_creator<smartmedia_image_device>;
+const device_type SMARTMEDIA = device_creator<smartmedia_image_device>;
smartmedia_image_device::smartmedia_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nand_device(mconfig, SMARTMEDIA, "SmartMedia Flash ROM", tag, owner, clock, "smartmedia", __FILE__),
diff --git a/src/devices/machine/smc91c9x.cpp b/src/devices/machine/smc91c9x.cpp
index 3ac4bed1312..1a44d1ad74b 100644
--- a/src/devices/machine/smc91c9x.cpp
+++ b/src/devices/machine/smc91c9x.cpp
@@ -181,7 +181,7 @@ void smc91c9x_device::device_reset()
}
-const device_type SMC91C94 = &device_creator<smc91c94_device>;
+const device_type SMC91C94 = device_creator<smc91c94_device>;
smc91c94_device::smc91c94_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: smc91c9x_device(mconfig, SMC91C94, "SMC91C94 Ethernet Controller", tag, owner, clock, "smc91c94", __FILE__)
@@ -189,7 +189,7 @@ smc91c94_device::smc91c94_device(const machine_config &mconfig, const char *tag,
}
-const device_type SMC91C96 = &device_creator<smc91c96_device>;
+const device_type SMC91C96 = device_creator<smc91c96_device>;
smc91c96_device::smc91c96_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: smc91c9x_device(mconfig, SMC91C96, "SMC91C96", tag, owner, clock, "smc91c96", __FILE__)
diff --git a/src/devices/machine/smpc.cpp b/src/devices/machine/smpc.cpp
index 749f5bc8f8b..f854566e57d 100644
--- a/src/devices/machine/smpc.cpp
+++ b/src/devices/machine/smpc.cpp
@@ -149,10 +149,14 @@ TODO:
*/
#include "emu.h"
-#include "coreutil.h"
-#include "includes/saturn.h"
#include "machine/smpc.h"
+#include "includes/saturn.h" // FIXME: this is a dependency from devices on MAME
+
#include "machine/eepromser.h"
+#include "screen.h"
+
+#include "coreutil.h"
+
#define LOG_SMPC 0
#define LOG_PAD_CMD 0
diff --git a/src/devices/machine/sonydriv.cpp b/src/devices/machine/sonydriv.cpp
index 8bede7912a0..64b09eebe90 100644
--- a/src/devices/machine/sonydriv.cpp
+++ b/src/devices/machine/sonydriv.cpp
@@ -525,7 +525,7 @@ void sony_set_speed(int speed)
}
// device type definition
-const device_type FLOPPY_SONY = &device_creator<sonydriv_floppy_image_device>;
+const device_type FLOPPY_SONY = device_creator<sonydriv_floppy_image_device>;
//-------------------------------------------------
// sonydriv_floppy_image_device - constructor
diff --git a/src/devices/machine/spchrom.cpp b/src/devices/machine/spchrom.cpp
index 10e5ea2fc1e..60396aca84e 100644
--- a/src/devices/machine/spchrom.cpp
+++ b/src/devices/machine/spchrom.cpp
@@ -23,7 +23,7 @@
#define TMS5220_ADDRESS_MASK 0x3FFFFUL /* 18-bit mask for tms5220 address */
// device type definition
-const device_type SPEECHROM = &device_creator<speechrom_device>;
+const device_type SPEECHROM = device_creator<speechrom_device>;
speechrom_device::speechrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SPEECHROM, "SPEECHROM", tag, owner, clock, "speechrom", __FILE__), m_speechrom_data(nullptr), m_speechROMlen(0),
diff --git a/src/devices/machine/steppers.cpp b/src/devices/machine/steppers.cpp
index 8164e3706fd..20a33cb27c9 100644
--- a/src/devices/machine/steppers.cpp
+++ b/src/devices/machine/steppers.cpp
@@ -41,7 +41,7 @@
#include "emu.h"
#include "steppers.h"
-const device_type STEPPER = &device_creator<stepper_device>;
+const device_type STEPPER = device_creator<stepper_device>;
stepper_device::stepper_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, STEPPER, "Stepper Motor", tag, owner, clock, "stepper", __FILE__),
diff --git a/src/devices/machine/strata.cpp b/src/devices/machine/strata.cpp
index 8736f75c3db..7b729614028 100644
--- a/src/devices/machine/strata.cpp
+++ b/src/devices/machine/strata.cpp
@@ -44,7 +44,7 @@
#define SET_BLOCKLOCK(block) (m_blocklock[(block) >> 3] |= 1 << ((block) & 7))
#define CLEAR_BLOCKLOCK(block) (m_blocklock[(block) >> 3] &= ~(1 << ((block) & 7)))
-const device_type STRATAFLASH = &device_creator<strataflash_device>;
+const device_type STRATAFLASH = device_creator<strataflash_device>;
strataflash_device::strataflash_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, STRATAFLASH, "Intel 28F640J5", tag, owner, clock, "strataflash", __FILE__),
diff --git a/src/devices/machine/tc009xlvc.cpp b/src/devices/machine/tc009xlvc.cpp
index 1bd2f989cc1..f8c289fa4d1 100644
--- a/src/devices/machine/tc009xlvc.cpp
+++ b/src/devices/machine/tc009xlvc.cpp
@@ -14,7 +14,10 @@
#include "emu.h"
#include "machine/tc009xlvc.h"
-const device_type TC0091LVC = &device_creator<tc0091lvc_device>;
+#include "screen.h"
+
+
+const device_type TC0091LVC = device_creator<tc0091lvc_device>;
READ8_MEMBER(tc0091lvc_device::tc0091lvc_paletteram_r)
diff --git a/src/devices/machine/terminal.cpp b/src/devices/machine/terminal.cpp
index c5c291c21c9..5a34a04a304 100644
--- a/src/devices/machine/terminal.cpp
+++ b/src/devices/machine/terminal.cpp
@@ -2,6 +2,8 @@
// copyright-holders:Miodrag Milanovic
#include "emu.h"
#include "machine/terminal.h"
+#include "screen.h"
+#include "speaker.h"
#define KEYBOARD_TAG "keyboard"
@@ -444,4 +446,4 @@ ioport_constructor generic_terminal_device::device_input_ports() const
return INPUT_PORTS_NAME(generic_terminal);
}
-const device_type GENERIC_TERMINAL = &device_creator<generic_terminal_device>;
+const device_type GENERIC_TERMINAL = device_creator<generic_terminal_device>;
diff --git a/src/devices/machine/timekpr.cpp b/src/devices/machine/timekpr.cpp
index 3cbef2330d4..d63b6984609 100644
--- a/src/devices/machine/timekpr.cpp
+++ b/src/devices/machine/timekpr.cpp
@@ -19,12 +19,12 @@
#include "machine/timehelp.h"
// device type definition
-const device_type M48T02 = &device_creator<m48t02_device>;
-const device_type M48T35 = &device_creator<m48t35_device>;
-const device_type M48T37 = &device_creator<m48t37_device>;
-const device_type M48T58 = &device_creator<m48t58_device>;
-const device_type MK48T08 = &device_creator<mk48t08_device>;
-const device_type MK48T12 = &device_creator<mk48t12_device>;
+const device_type M48T02 = device_creator<m48t02_device>;
+const device_type M48T35 = device_creator<m48t35_device>;
+const device_type M48T37 = device_creator<m48t37_device>;
+const device_type M48T58 = device_creator<m48t58_device>;
+const device_type MK48T08 = device_creator<mk48t08_device>;
+const device_type MK48T12 = device_creator<mk48t12_device>;
/***************************************************************************
diff --git a/src/devices/machine/tmc0430.cpp b/src/devices/machine/tmc0430.cpp
index d2547467abe..d3adcb1a5b1 100644
--- a/src/devices/machine/tmc0430.cpp
+++ b/src/devices/machine/tmc0430.cpp
@@ -363,4 +363,4 @@ int tmc0430_device::debug_get_address()
return m_address;
}
-const device_type TMC0430 = &device_creator<tmc0430_device>;
+const device_type TMC0430 = device_creator<tmc0430_device>;
diff --git a/src/devices/machine/tmp68301.cpp b/src/devices/machine/tmp68301.cpp
index bd5326a08e6..3a4f5e47ebf 100644
--- a/src/devices/machine/tmp68301.cpp
+++ b/src/devices/machine/tmp68301.cpp
@@ -19,7 +19,7 @@
#include "emu.h"
#include "machine/tmp68301.h"
-const device_type TMP68301 = &device_creator<tmp68301_device>;
+const device_type TMP68301 = device_creator<tmp68301_device>;
static ADDRESS_MAP_START( tmp68301_regs, AS_0, 16, tmp68301_device )
// AM_RANGE(0x000,0x3ff) AM_RAM
diff --git a/src/devices/machine/tms1024.cpp b/src/devices/machine/tms1024.cpp
index e0f98ef00df..7dc30c4437a 100644
--- a/src/devices/machine/tms1024.cpp
+++ b/src/devices/machine/tms1024.cpp
@@ -18,8 +18,8 @@
#include "machine/tms1024.h"
-const device_type TMS1024 = &device_creator<tms1024_device>;
-const device_type TMS1025 = &device_creator<tms1025_device>;
+const device_type TMS1024 = device_creator<tms1024_device>;
+const device_type TMS1025 = device_creator<tms1025_device>;
//-------------------------------------------------
// constructor
diff --git a/src/devices/machine/tms5501.cpp b/src/devices/machine/tms5501.cpp
index 868ba213e1b..70e9ab0ebb8 100644
--- a/src/devices/machine/tms5501.cpp
+++ b/src/devices/machine/tms5501.cpp
@@ -27,7 +27,7 @@ const uint8_t tms5501_device::rst_vector[] = { 0xc7, 0xcf, 0xd7, 0xdf, 0xe7, 0xe
//**************************************************************************
// device type definition
-const device_type TMS5501 = &device_creator<tms5501_device>;
+const device_type TMS5501 = device_creator<tms5501_device>;
// I/O address map
diff --git a/src/devices/machine/tms6100.cpp b/src/devices/machine/tms6100.cpp
index eade390ffee..2ffc32d1638 100644
--- a/src/devices/machine/tms6100.cpp
+++ b/src/devices/machine/tms6100.cpp
@@ -26,7 +26,7 @@
// device definitions
-const device_type TMS6100 = &device_creator<tms6100_device>;
+const device_type TMS6100 = device_creator<tms6100_device>;
tms6100_device::tms6100_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)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
@@ -44,7 +44,7 @@ tms6100_device::tms6100_device(const machine_config &mconfig, const char *tag, d
{
}
-const device_type M58819 = &device_creator<m58819_device>;
+const device_type M58819 = device_creator<m58819_device>;
m58819_device::m58819_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: tms6100_device(mconfig, M58819, "M58819S", tag, owner, clock, "m58819s", __FILE__)
diff --git a/src/devices/machine/tms9901.cpp b/src/devices/machine/tms9901.cpp
index a00b12693e4..c27d790d375 100644
--- a/src/devices/machine/tms9901.cpp
+++ b/src/devices/machine/tms9901.cpp
@@ -670,4 +670,4 @@ void tms9901_device::device_start(void)
save_item(NAME(m_clock_read_register));
}
-const device_type TMS9901 = &device_creator<tms9901_device>;
+const device_type TMS9901 = device_creator<tms9901_device>;
diff --git a/src/devices/machine/tms9902.cpp b/src/devices/machine/tms9902.cpp
index 96f64376769..7e2db622d31 100644
--- a/src/devices/machine/tms9902.cpp
+++ b/src/devices/machine/tms9902.cpp
@@ -853,4 +853,4 @@ void tms9902_device::device_start()
m_sendtimer = timer_alloc(SENDTIMER);
}
-const device_type TMS9902 = &device_creator<tms9902_device>;
+const device_type TMS9902 = device_creator<tms9902_device>;
diff --git a/src/devices/machine/upd1990a.cpp b/src/devices/machine/upd1990a.cpp
index c64f9f5a871..7a71e318380 100644
--- a/src/devices/machine/upd1990a.cpp
+++ b/src/devices/machine/upd1990a.cpp
@@ -32,8 +32,8 @@
//**************************************************************************
// device type definition
-const device_type UPD1990A = &device_creator<upd1990a_device>;
-const device_type UPD4990A = &device_creator<upd4990a_device>;
+const device_type UPD1990A = device_creator<upd1990a_device>;
+const device_type UPD4990A = device_creator<upd4990a_device>;
diff --git a/src/devices/machine/upd4701.cpp b/src/devices/machine/upd4701.cpp
index bc3f4656908..9fd7b6de7b7 100644
--- a/src/devices/machine/upd4701.cpp
+++ b/src/devices/machine/upd4701.cpp
@@ -16,7 +16,7 @@
#define MASK_SWITCHES ( 7 )
#define MASK_COUNTER ( 0xfff )
-const device_type UPD4701 = &device_creator<upd4701_device>;
+const device_type UPD4701 = device_creator<upd4701_device>;
upd4701_device::upd4701_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, UPD4701, "uPD4701 Encoder", tag, owner, clock, "upd4701", __FILE__), m_cs(0), m_xy(0), m_ul(0), m_resetx(0), m_resety(0), m_latchx(0), m_latchy(0),
diff --git a/src/devices/machine/upd4992.cpp b/src/devices/machine/upd4992.cpp
index 2e87bd63ecb..95e76c5cdc1 100644
--- a/src/devices/machine/upd4992.cpp
+++ b/src/devices/machine/upd4992.cpp
@@ -22,7 +22,7 @@
//**************************************************************************
// device type definition
-const device_type UPD4992 = &device_creator<upd4992_device>;
+const device_type UPD4992 = device_creator<upd4992_device>;
//**************************************************************************
diff --git a/src/devices/machine/upd7002.cpp b/src/devices/machine/upd7002.cpp
index ba7d2e36ade..17335ddde26 100644
--- a/src/devices/machine/upd7002.cpp
+++ b/src/devices/machine/upd7002.cpp
@@ -16,7 +16,7 @@
/* Device Interface */
-const device_type UPD7002 = &device_creator<upd7002_device>;
+const device_type UPD7002 = device_creator<upd7002_device>;
upd7002_device::upd7002_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, UPD7002, "uPD7002", tag, owner, clock, "upd7002", __FILE__), m_status(0), m_data1(0), m_data0(0), m_digitalvalue(0), m_conversion_counter(0)
diff --git a/src/devices/machine/upd71071.cpp b/src/devices/machine/upd71071.cpp
index 9dd7ef3affa..fadebc5cb83 100644
--- a/src/devices/machine/upd71071.cpp
+++ b/src/devices/machine/upd71071.cpp
@@ -90,7 +90,7 @@
#include "machine/upd71071.h"
-const device_type UPD71071 = &device_creator<upd71071_device>;
+const device_type UPD71071 = device_creator<upd71071_device>;
upd71071_device::upd71071_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, UPD71071, "NEC uPD71071", tag, owner, clock, "upd71071", __FILE__),
diff --git a/src/devices/machine/upd765.cpp b/src/devices/machine/upd765.cpp
index f287929ceb3..9cde0a8515c 100644
--- a/src/devices/machine/upd765.cpp
+++ b/src/devices/machine/upd765.cpp
@@ -7,18 +7,18 @@
#define LOG 0
-const device_type UPD765A = &device_creator<upd765a_device>;
-const device_type UPD765B = &device_creator<upd765b_device>;
-const device_type I8272A = &device_creator<i8272a_device>;
-const device_type UPD72065 = &device_creator<upd72065_device>;
-const device_type SMC37C78 = &device_creator<smc37c78_device>;
-const device_type N82077AA = &device_creator<n82077aa_device>;
-const device_type PC_FDC_SUPERIO = &device_creator<pc_fdc_superio_device>;
-const device_type DP8473 = &device_creator<dp8473_device>;
-const device_type PC8477A = &device_creator<pc8477a_device>;
-const device_type WD37C65C = &device_creator<wd37c65c_device>;
-const device_type MCS3201 = &device_creator<mcs3201_device>;
-const device_type TC8566AF = &device_creator<tc8566af_device>;
+const device_type UPD765A = device_creator<upd765a_device>;
+const device_type UPD765B = device_creator<upd765b_device>;
+const device_type I8272A = device_creator<i8272a_device>;
+const device_type UPD72065 = device_creator<upd72065_device>;
+const device_type SMC37C78 = device_creator<smc37c78_device>;
+const device_type N82077AA = device_creator<n82077aa_device>;
+const device_type PC_FDC_SUPERIO = device_creator<pc_fdc_superio_device>;
+const device_type DP8473 = device_creator<dp8473_device>;
+const device_type PC8477A = device_creator<pc8477a_device>;
+const device_type WD37C65C = device_creator<wd37c65c_device>;
+const device_type MCS3201 = device_creator<mcs3201_device>;
+const device_type TC8566AF = device_creator<tc8566af_device>;
DEVICE_ADDRESS_MAP_START(map, 8, upd765a_device)
AM_RANGE(0x0, 0x0) AM_READ(msr_r)
diff --git a/src/devices/machine/v3021.cpp b/src/devices/machine/v3021.cpp
index 73f984fd67c..c448ac3a4ea 100644
--- a/src/devices/machine/v3021.cpp
+++ b/src/devices/machine/v3021.cpp
@@ -22,7 +22,7 @@
//**************************************************************************
// device type definition
-const device_type v3021 = &device_creator<v3021_device>;
+const device_type v3021 = device_creator<v3021_device>;
//**************************************************************************
diff --git a/src/devices/machine/vrc4373.cpp b/src/devices/machine/vrc4373.cpp
index d3ec703aaa8..e542b0223ed 100644
--- a/src/devices/machine/vrc4373.cpp
+++ b/src/devices/machine/vrc4373.cpp
@@ -7,7 +7,7 @@
#define LOG_NILE_MASTER (0)
#define LOG_NILE_TARGET (0)
-const device_type VRC4373 = &device_creator<vrc4373_device>;
+const device_type VRC4373 = device_creator<vrc4373_device>;
DEVICE_ADDRESS_MAP_START(config_map, 32, vrc4373_device)
AM_RANGE(0x40, 0x43) AM_READWRITE (pcictrl_r, pcictrl_w)
diff --git a/src/devices/machine/vt82c496.cpp b/src/devices/machine/vt82c496.cpp
index 5449b91a8e4..2abaac5a449 100644
--- a/src/devices/machine/vt82c496.cpp
+++ b/src/devices/machine/vt82c496.cpp
@@ -13,7 +13,7 @@
IMPLEMENTATION
***************************************************************************/
-const device_type VT82C496 = &device_creator<vt82c496_device>;
+const device_type VT82C496 = device_creator<vt82c496_device>;
vt82c496_device::vt82c496_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/machine/vt83c461.cpp b/src/devices/machine/vt83c461.cpp
index d93e98c08e9..781fc34b9ca 100644
--- a/src/devices/machine/vt83c461.cpp
+++ b/src/devices/machine/vt83c461.cpp
@@ -17,7 +17,7 @@
#define VT83C461_CONFIG_DATA 3
-const device_type VT83C461 = &device_creator<vt83c461_device>;
+const device_type VT83C461 = device_creator<vt83c461_device>;
vt83c461_device::vt83c461_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
ide_controller_32_device(mconfig, VT83C461, "VIA VT83C461", tag, owner, clock, "vt83c461", __FILE__),
diff --git a/src/devices/machine/watchdog.cpp b/src/devices/machine/watchdog.cpp
index 74f0083df72..9c4d05de71d 100644
--- a/src/devices/machine/watchdog.cpp
+++ b/src/devices/machine/watchdog.cpp
@@ -9,15 +9,17 @@
***************************************************************************/
#include "emu.h"
-#include "emuopts.h"
#include "watchdog.h"
+#include "emuopts.h"
+#include "screen.h"
+
//**************************************************************************
// WATCHDOG TIMER DEVICE
//**************************************************************************
-const device_type WATCHDOG_TIMER = &device_creator<watchdog_timer_device>;
+const device_type WATCHDOG_TIMER = device_creator<watchdog_timer_device>;
//-------------------------------------------------
// watchdog_timer_device - constructor
diff --git a/src/devices/machine/wd11c00_17.cpp b/src/devices/machine/wd11c00_17.cpp
index 694dab86c2b..d6b21f43330 100644
--- a/src/devices/machine/wd11c00_17.cpp
+++ b/src/devices/machine/wd11c00_17.cpp
@@ -37,7 +37,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type WD11C00_17 = &device_creator<wd11c00_17_device>;
+const device_type WD11C00_17 = device_creator<wd11c00_17_device>;
//**************************************************************************
diff --git a/src/devices/machine/wd2010.cpp b/src/devices/machine/wd2010.cpp
index 6bd76a488e7..8ed394f5b60 100644
--- a/src/devices/machine/wd2010.cpp
+++ b/src/devices/machine/wd2010.cpp
@@ -132,7 +132,7 @@ static const int SECTOR_SIZES[4] = { 256, 512, 1024, 128 };
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type WD2010 = &device_creator<wd2010_device>;
+const device_type WD2010 = device_creator<wd2010_device>;
//**************************************************************************
diff --git a/src/devices/machine/wd33c93.cpp b/src/devices/machine/wd33c93.cpp
index 9489bea0485..ba20d5c324a 100644
--- a/src/devices/machine/wd33c93.cpp
+++ b/src/devices/machine/wd33c93.cpp
@@ -804,4 +804,4 @@ int wd33c93_device::get_dma_count()
return get_xfer_count();
}
-const device_type WD33C93 = &device_creator<wd33c93_device>;
+const device_type WD33C93 = device_creator<wd33c93_device>;
diff --git a/src/devices/machine/wd7600.cpp b/src/devices/machine/wd7600.cpp
index 8fbdb4f469a..436079e6374 100644
--- a/src/devices/machine/wd7600.cpp
+++ b/src/devices/machine/wd7600.cpp
@@ -15,7 +15,7 @@
#include "emu.h"
#include "machine/wd7600.h"
-const device_type WD7600 = &device_creator<wd7600_device>;
+const device_type WD7600 = device_creator<wd7600_device>;
#define LOG (1)
diff --git a/src/devices/machine/wd_fdc.cpp b/src/devices/machine/wd_fdc.cpp
index f54fb564c39..f64c1117ed4 100644
--- a/src/devices/machine/wd_fdc.cpp
+++ b/src/devices/machine/wd_fdc.cpp
@@ -5,29 +5,29 @@
#include "debugger.h"
-const device_type FD1771 = &device_creator<fd1771_t>;
-const device_type FD1781 = &device_creator<fd1781_t>;
-const device_type FD1791 = &device_creator<fd1791_t>;
-const device_type FD1792 = &device_creator<fd1792_t>;
-const device_type FD1793 = &device_creator<fd1793_t>;
-const device_type KR1818VG93 = &device_creator<kr1818vg93_t>;
-const device_type FD1794 = &device_creator<fd1794_t>;
-const device_type FD1795 = &device_creator<fd1795_t>;
-const device_type FD1797 = &device_creator<fd1797_t>;
-const device_type MB8866 = &device_creator<mb8866_t>;
-const device_type MB8876 = &device_creator<mb8876_t>;
-const device_type MB8877 = &device_creator<mb8877_t>;
-const device_type FD1761 = &device_creator<fd1761_t>;
-const device_type FD1763 = &device_creator<fd1763_t>;
-const device_type FD1765 = &device_creator<fd1765_t>;
-const device_type FD1767 = &device_creator<fd1767_t>;
-const device_type WD2791 = &device_creator<wd2791_t>;
-const device_type WD2793 = &device_creator<wd2793_t>;
-const device_type WD2795 = &device_creator<wd2795_t>;
-const device_type WD2797 = &device_creator<wd2797_t>;
-const device_type WD1770 = &device_creator<wd1770_t>;
-const device_type WD1772 = &device_creator<wd1772_t>;
-const device_type WD1773 = &device_creator<wd1773_t>;
+const device_type FD1771 = device_creator<fd1771_t>;
+const device_type FD1781 = device_creator<fd1781_t>;
+const device_type FD1791 = device_creator<fd1791_t>;
+const device_type FD1792 = device_creator<fd1792_t>;
+const device_type FD1793 = device_creator<fd1793_t>;
+const device_type KR1818VG93 = device_creator<kr1818vg93_t>;
+const device_type FD1794 = device_creator<fd1794_t>;
+const device_type FD1795 = device_creator<fd1795_t>;
+const device_type FD1797 = device_creator<fd1797_t>;
+const device_type MB8866 = device_creator<mb8866_t>;
+const device_type MB8876 = device_creator<mb8876_t>;
+const device_type MB8877 = device_creator<mb8877_t>;
+const device_type FD1761 = device_creator<fd1761_t>;
+const device_type FD1763 = device_creator<fd1763_t>;
+const device_type FD1765 = device_creator<fd1765_t>;
+const device_type FD1767 = device_creator<fd1767_t>;
+const device_type WD2791 = device_creator<wd2791_t>;
+const device_type WD2793 = device_creator<wd2793_t>;
+const device_type WD2795 = device_creator<wd2795_t>;
+const device_type WD2797 = device_creator<wd2797_t>;
+const device_type WD1770 = device_creator<wd1770_t>;
+const device_type WD1772 = device_creator<wd1772_t>;
+const device_type WD1773 = device_creator<wd1773_t>;
/*
Debugging flags. Set to 0 or 1.
diff --git a/src/devices/machine/wozfdc.cpp b/src/devices/machine/wozfdc.cpp
index 22a76b941fe..0c40cbc55d2 100644
--- a/src/devices/machine/wozfdc.cpp
+++ b/src/devices/machine/wozfdc.cpp
@@ -21,8 +21,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type DISKII_FDC = &device_creator<diskii_fdc>;
-const device_type APPLEIII_FDC = &device_creator<appleiii_fdc>;
+const device_type DISKII_FDC = device_creator<diskii_fdc>;
+const device_type APPLEIII_FDC = device_creator<appleiii_fdc>;
#define DISKII_P6_REGION "diskii_rom_p6"
diff --git a/src/devices/machine/x2212.cpp b/src/devices/machine/x2212.cpp
index cb8cbe013d4..abd92ad1b7e 100644
--- a/src/devices/machine/x2212.cpp
+++ b/src/devices/machine/x2212.cpp
@@ -31,8 +31,8 @@ ADDRESS_MAP_END
//**************************************************************************
// device type definition
-const device_type X2212 = &device_creator<x2212_device>;
-const device_type X2210 = &device_creator<x2210_device>;
+const device_type X2212 = device_creator<x2212_device>;
+const device_type X2210 = device_creator<x2210_device>;
//-------------------------------------------------
// x2212_device - constructor
diff --git a/src/devices/machine/x76f041.cpp b/src/devices/machine/x76f041.cpp
index 682ecaff8de..e0a1280aff7 100644
--- a/src/devices/machine/x76f041.cpp
+++ b/src/devices/machine/x76f041.cpp
@@ -32,7 +32,7 @@ inline void ATTR_PRINTF( 3, 4 ) x76f041_device::verboselog( int n_level, const c
}
// device type definition
-const device_type X76F041 = &device_creator<x76f041_device>;
+const device_type X76F041 = device_creator<x76f041_device>;
x76f041_device::x76f041_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock )
: device_t( mconfig, X76F041, "X76F041 Flash", tag, owner, clock, "x76f041", __FILE__ ),
diff --git a/src/devices/machine/x76f100.cpp b/src/devices/machine/x76f100.cpp
index 7a03bf7bed1..4ff06be9f84 100644
--- a/src/devices/machine/x76f100.cpp
+++ b/src/devices/machine/x76f100.cpp
@@ -30,7 +30,7 @@ inline void ATTR_PRINTF( 3, 4 ) x76f100_device::verboselog( int n_level, const c
}
// device type definition
-const device_type X76F100 = &device_creator<x76f100_device>;
+const device_type X76F100 = device_creator<x76f100_device>;
x76f100_device::x76f100_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock )
: device_t( mconfig, X76F100, "X76F100 Flash", tag, owner, clock, "x76f100", __FILE__ ),
diff --git a/src/devices/machine/ym2148.cpp b/src/devices/machine/ym2148.cpp
index 4f2e5d696ae..c36ad7b2bf3 100644
--- a/src/devices/machine/ym2148.cpp
+++ b/src/devices/machine/ym2148.cpp
@@ -13,7 +13,7 @@ TODO:
#include "ym2148.h"
-const device_type YM2148 = &device_creator<ym2148_device>;
+const device_type YM2148 = device_creator<ym2148_device>;
ym2148_device::ym2148_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/machine/z80ctc.cpp b/src/devices/machine/z80ctc.cpp
index d70afe55281..302572e9a90 100644
--- a/src/devices/machine/z80ctc.cpp
+++ b/src/devices/machine/z80ctc.cpp
@@ -72,7 +72,7 @@ const int WAITING_FOR_TRIG = 0x100;
//**************************************************************************
// device type definition
-const device_type Z80CTC = &device_creator<z80ctc_device>;
+const device_type Z80CTC = device_creator<z80ctc_device>;
//-------------------------------------------------
// z80ctc_device - constructor
diff --git a/src/devices/machine/z80dart.cpp b/src/devices/machine/z80dart.cpp
index 20c6ef31008..56613998b12 100644
--- a/src/devices/machine/z80dart.cpp
+++ b/src/devices/machine/z80dart.cpp
@@ -52,15 +52,15 @@
//**************************************************************************
// device type definition
-const device_type Z80DART = &device_creator<z80dart_device>;
-const device_type Z80DART_CHANNEL = &device_creator<z80dart_channel>;
-const device_type Z80SIO0 = &device_creator<z80sio0_device>;
-const device_type Z80SIO1 = &device_creator<z80sio1_device>;
-const device_type Z80SIO2 = &device_creator<z80sio2_device>;
-const device_type Z80SIO3 = &device_creator<z80sio3_device>;
-const device_type Z80SIO4 = &device_creator<z80sio4_device>;
-const device_type I8274 = &device_creator<i8274_device>;
-const device_type UPD7201 = &device_creator<upd7201_device>;
+const device_type Z80DART = device_creator<z80dart_device>;
+const device_type Z80DART_CHANNEL = device_creator<z80dart_channel>;
+const device_type Z80SIO0 = device_creator<z80sio0_device>;
+const device_type Z80SIO1 = device_creator<z80sio1_device>;
+const device_type Z80SIO2 = device_creator<z80sio2_device>;
+const device_type Z80SIO3 = device_creator<z80sio3_device>;
+const device_type Z80SIO4 = device_creator<z80sio4_device>;
+const device_type I8274 = device_creator<i8274_device>;
+const device_type UPD7201 = device_creator<upd7201_device>;
//-------------------------------------------------
diff --git a/src/devices/machine/z80dma.cpp b/src/devices/machine/z80dma.cpp
index 58eb6587cfa..782f7d75ee7 100644
--- a/src/devices/machine/z80dma.cpp
+++ b/src/devices/machine/z80dma.cpp
@@ -140,7 +140,7 @@ const int TM_SEARCH_TRANSFER = 0x03;
//**************************************************************************
// device type definition
-const device_type Z80DMA = &device_creator<z80dma_device>;
+const device_type Z80DMA = device_creator<z80dma_device>;
//-------------------------------------------------
// z80dma_device - constructor
diff --git a/src/devices/machine/z80pio.cpp b/src/devices/machine/z80pio.cpp
index f7e8927f181..bfa58c80f84 100644
--- a/src/devices/machine/z80pio.cpp
+++ b/src/devices/machine/z80pio.cpp
@@ -32,7 +32,7 @@
//**************************************************************************
// device type definition
-const device_type Z80PIO = &device_creator<z80pio_device>;
+const device_type Z80PIO = device_creator<z80pio_device>;
//-------------------------------------------------
// z80pio_device - constructor
diff --git a/src/devices/machine/z80scc.cpp b/src/devices/machine/z80scc.cpp
index fc50eb65024..06ccfbe3812 100644
--- a/src/devices/machine/z80scc.cpp
+++ b/src/devices/machine/z80scc.cpp
@@ -134,16 +134,16 @@ DONE (x) (p=partly) NMOS CMOS ESCC EMSCC
// DEVICE DEFINITIONS
//**************************************************************************
// device type definition
-const device_type Z80SCC = &device_creator<z80scc_device>;
-const device_type Z80SCC_CHANNEL = &device_creator<z80scc_channel>;
-const device_type SCC8030 = &device_creator<scc8030_device>;
-const device_type SCC80C30 = &device_creator<scc80C30_device>;
-const device_type SCC80230 = &device_creator<scc80230_device>;
-const device_type SCC8530N = &device_creator<scc8530_device>; // remove trailing N when 8530scc.c is fully replaced and removed
-const device_type SCC85C30 = &device_creator<scc85C30_device>;
-const device_type SCC85230 = &device_creator<scc85230_device>;
-const device_type SCC85233 = &device_creator<scc85233_device>;
-const device_type SCC8523L = &device_creator<scc8523L_device>;
+const device_type Z80SCC = device_creator<z80scc_device>;
+const device_type Z80SCC_CHANNEL = device_creator<z80scc_channel>;
+const device_type SCC8030 = device_creator<scc8030_device>;
+const device_type SCC80C30 = device_creator<scc80C30_device>;
+const device_type SCC80230 = device_creator<scc80230_device>;
+const device_type SCC8530N = device_creator<scc8530_device>; // remove trailing N when 8530scc.c is fully replaced and removed
+const device_type SCC85C30 = device_creator<scc85C30_device>;
+const device_type SCC85230 = device_creator<scc85230_device>;
+const device_type SCC85233 = device_creator<scc85233_device>;
+const device_type SCC8523L = device_creator<scc8523L_device>;
//-------------------------------------------------
// device_mconfig_additions -
diff --git a/src/devices/machine/z80sio.cpp b/src/devices/machine/z80sio.cpp
index 3d7d262c7fc..a7972eeec15 100644
--- a/src/devices/machine/z80sio.cpp
+++ b/src/devices/machine/z80sio.cpp
@@ -96,9 +96,9 @@
//**************************************************************************
// device type definition
-const device_type Z80SIO = &device_creator<z80sio_device>;
-const device_type Z80SIO_CHANNEL = &device_creator<z80sio_channel>;
-const device_type UPD7201N = &device_creator<upd7201N_device>; // Remove trailing N when z80dart.cpp's 7201 implementation is fully replaced
+const device_type Z80SIO = device_creator<z80sio_device>;
+const device_type Z80SIO_CHANNEL = device_creator<z80sio_channel>;
+const device_type UPD7201N = device_creator<upd7201N_device>; // Remove trailing N when z80dart.cpp's 7201 implementation is fully replaced
//-------------------------------------------------
// device_mconfig_additions -
diff --git a/src/devices/machine/z80sti.cpp b/src/devices/machine/z80sti.cpp
index fb0e42fd725..c86cb6d659e 100644
--- a/src/devices/machine/z80sti.cpp
+++ b/src/devices/machine/z80sti.cpp
@@ -24,7 +24,7 @@
// device type definition
-const device_type Z80STI = &device_creator<z80sti_device>;
+const device_type Z80STI = device_creator<z80sti_device>;
diff --git a/src/devices/machine/z8536.cpp b/src/devices/machine/z8536.cpp
index 4c36ab242ec..d4240605c5e 100644
--- a/src/devices/machine/z8536.cpp
+++ b/src/devices/machine/z8536.cpp
@@ -26,7 +26,7 @@
// device type definition
-const device_type Z8536 = &device_creator<z8536_device>;
+const device_type Z8536 = device_creator<z8536_device>;
//**************************************************************************